diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 117d5283a5829a041489fab37377c9c82bd566a3..7a42cda2e4f9b82f66952bd62af8df94f6ecce06 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -482,7 +482,7 @@ bool doCommand
             topoSet& currentSet = currentSetPtr();
 
             Info<< "    Set:" << currentSet.name()
-                << "  Size:" << currentSet.size()
+                << "  Size:" << returnReduce(currentSet.size(), sumOp<label>())
                 << "  Action:" << actionName
                 << endl;
 
@@ -579,7 +579,9 @@ bool doCommand
                     );
 
                     Info<< "    Writing " << currentSet.name()
-                        << " (size " << currentSet.size() << ") to "
+                        << " (size "
+                        << returnReduce(currentSet.size(), sumOp<label>())
+                        << ") to "
                         << currentSet.instance()/currentSet.local()
                            /currentSet.name()
                         << " and to vtk file " << vtkName << endl << endl;
@@ -589,7 +591,9 @@ bool doCommand
                 else
                 {
                     Info<< "    Writing " << currentSet.name()
-                        << " (size " << currentSet.size() << ") to "
+                        << " (size "
+                        << returnReduce(currentSet.size(), sumOp<label>())
+                        << ") to "
                         << currentSet.instance()/currentSet.local()
                            /currentSet.name() << endl << endl;
                 }
@@ -642,9 +646,9 @@ enum commandStatus
 void printMesh(const Time& runTime, const polyMesh& mesh)
 {
     Info<< "Time:" << runTime.timeName()
-        << "  cells:" << mesh.nCells()
-        << "  faces:" << mesh.nFaces()
-        << "  points:" << mesh.nPoints()
+        << "  cells:" << mesh.globalData().nTotalCells()
+        << "  faces:" << mesh.globalData().nTotalFaces()
+        << "  points:" << mesh.globalData().nTotalPoints()
         << "  patches:" << mesh.boundaryMesh().size()
         << "  bb:" << mesh.bounds() << nl;
 }
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index 5c39ebd5037d15aeec2460418fbe42fa3b071738..f72bcb6e5ebc2288038a6670e98a605ab554c401 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -51,7 +51,7 @@ using namespace Foam;
 void massPropertiesSolid
 (
     const pointField& pts,
-    const triFaceList triFaces,
+    const triFaceList& triFaces,
     scalar density,
     scalar& mass,
     vector& cM,
@@ -208,7 +208,7 @@ void massPropertiesSolid
 void massPropertiesShell
 (
     const pointField& pts,
-    const triFaceList triFaces,
+    const triFaceList& triFaces,
     scalar density,
     scalar& mass,
     vector& cM,
diff --git a/src/ODE/ODESolvers/KRR4/KRR4.C b/src/ODE/ODESolvers/KRR4/KRR4.C
index 95927e01b65a21e54bfbcc8374330c84284e8757..09df33ad9d1d970bc4b8315861d5fddce4a1a759 100644
--- a/src/ODE/ODESolvers/KRR4/KRR4.C
+++ b/src/ODE/ODESolvers/KRR4/KRR4.C
@@ -58,17 +58,17 @@ const scalar
 Foam::KRR4::KRR4(const ODE& ode)
 :
     ODESolver(ode),
-    yTemp_(n_),
-    dydxTemp_(n_),
-    g1_(n_),
-    g2_(n_),
-    g3_(n_),
-    g4_(n_),
-    yErr_(n_),
-    dfdx_(n_),
-    dfdy_(n_, n_),
-    a_(n_, n_),
-    pivotIndices_(n_)
+    yTemp_(n_, 0.0),
+    dydxTemp_(n_, 0.0),
+    g1_(n_, 0.0),
+    g2_(n_, 0.0),
+    g3_(n_, 0.0),
+    g4_(n_, 0.0),
+    yErr_(n_, 0.0),
+    dfdx_(n_, 0.0),
+    dfdy_(n_, n_, 0.0),
+    a_(n_, n_, 0.0),
+    pivotIndices_(n_, 0.0)
 {}
 
 
diff --git a/src/ODE/ODESolvers/RK/RK.C b/src/ODE/ODESolvers/RK/RK.C
index dd17c4aee56d08a1112c46ab738d0fb74feedf4f..3b74eb8f4578080c3e438e02a81d021700e81822 100644
--- a/src/ODE/ODESolvers/RK/RK.C
+++ b/src/ODE/ODESolvers/RK/RK.C
@@ -57,14 +57,14 @@ const scalar
 Foam::RK::RK(const ODE& ode)
 :
     ODESolver(ode),
-    yTemp_(n_),
-    ak2_(n_),
-    ak3_(n_),
-    ak4_(n_),
-    ak5_(n_),
-    ak6_(n_),
-    yErr_(n_),
-    yTemp2_(n_)
+    yTemp_(n_, 0.0),
+    ak2_(n_, 0.0),
+    ak3_(n_, 0.0),
+    ak4_(n_, 0.0),
+    ak5_(n_, 0.0),
+    ak6_(n_, 0.0),
+    yErr_(n_, 0.0),
+    yTemp2_(n_, 0.0)
 {}
 
 
diff --git a/src/ODE/ODESolvers/SIBS/SIBS.C b/src/ODE/ODESolvers/SIBS/SIBS.C
index 41f73e78a16174f543b6d985e99e95e574d935ed..acaa5c9e765773f66e5dd5ecbcf469b2a0e415a5 100644
--- a/src/ODE/ODESolvers/SIBS/SIBS.C
+++ b/src/ODE/ODESolvers/SIBS/SIBS.C
@@ -50,17 +50,17 @@ namespace Foam
 Foam::SIBS::SIBS(const ODE& ode)
 :
     ODESolver(ode),
-    a_(iMaxX_),
-    alpha_(kMaxX_, kMaxX_),
-    d_p_(n_, kMaxX_),
-    x_p_(kMaxX_),
-    err_(kMaxX_),
-
-    yTemp_(n_),
-    ySeq_(n_),
-    yErr_(n_),
-    dfdx_(n_),
-    dfdy_(n_, n_),
+    a_(iMaxX_, 0.0),
+    alpha_(kMaxX_, kMaxX_, 0.0),
+    d_p_(n_, kMaxX_, 0.0),
+    x_p_(kMaxX_, 0.0),
+    err_(kMaxX_, 0.0),
+
+    yTemp_(n_, 0.0),
+    ySeq_(n_, 0.0),
+    yErr_(n_, 0.0),
+    dfdx_(n_, 0.0),
+    dfdy_(n_, n_, 0.0),
     first_(1),
     epsOld_(-1.0)
 {}
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index 0939c060e1e80274a94aeebd78a15f6d345fb324..3a670f39a46c31306a83c0d569f84b155b980a79 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -21,12 +21,11 @@ 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
-
 \*---------------------------------------------------------------------------*/
 
 #include "triangle.H"
 #include "IOstreams.H"
+#include "triPointRef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -152,7 +151,37 @@ inline Point tetrahedron<Point, PointRef>::circumCentre() const
     vector ba = b ^ a;
     vector ca = c ^ a;
 
-    return a_ + 0.5*(a + (lambda*ba - mu*ca)/((c & ba) + ROOTVSMALL));
+    vector num = lambda*ba - mu*ca;
+    scalar denom = (c & ba);
+
+    if (Foam::mag(denom) < ROOTVSMALL)
+    {
+        // Degenerate tet. Use test of the individual triangles.
+        {
+            point triCentre = triPointRef(a_, b_, c_).circumCentre();
+            if (magSqr(d_ - triCentre) < magSqr(a_ - triCentre))
+            {
+                return triCentre;
+            }
+        }
+        {
+            point triCentre = triPointRef(a_, b_, d_).circumCentre();
+            if (magSqr(c_ - triCentre) < magSqr(a_ - triCentre))
+            {
+                return triCentre;
+            }
+        }
+        {
+            point triCentre = triPointRef(a_, c_, d_).circumCentre();
+            if (magSqr(b_ - triCentre) < magSqr(a_ - triCentre))
+            {
+                return triCentre;
+            }
+        }
+        return triPointRef(b_, c_, d_).circumCentre();
+    }
+
+    return a_ + 0.5*(a + num/denom);
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
index 8ce372e8ff4fa343c981927d0dcdc42ff0878953..864ed53770188f845a477b9d19e988ab7f4abe20 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
@@ -39,7 +39,7 @@ Foam::IObasicSourceList::IObasicSourceList
             "sourcesProperties",
             mesh.time().constant(),
             mesh,
-            IOobject::MUST_READ,
+            IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE
         )
     ),
diff --git a/src/thermophysicalModels/basicSolidThermo/Make/files b/src/thermophysicalModels/basicSolidThermo/Make/files
index c5e9c11d42de2e9d83acbc50c497047a302f504c..635a3adbeed452840d1a28d013435c30d30767ca 100644
--- a/src/thermophysicalModels/basicSolidThermo/Make/files
+++ b/src/thermophysicalModels/basicSolidThermo/Make/files
@@ -1,5 +1,5 @@
 basicSolidThermo/basicSolidThermo.C
-basicSolidThermo/newBasicSolidThermo.C
+basicSolidThermo/basicSolidThermoNew.C
 
 constSolidThermo/constSolidThermo.C
 directionalKSolidThermo/directionalKSolidThermo.C
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
index cc12c10e111232e51f34523c65cc54c569704630..f93a89bc7393a5113e12a69372551f3fd98e853a 100644
--- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
@@ -50,7 +50,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class basicSolidThermo Declaration
+                      Class basicSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicSolidThermo
@@ -109,8 +109,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~basicSolidThermo();
+    virtual ~basicSolidThermo();
 
 
     // Member functions
@@ -204,7 +203,7 @@ public:
         //- Read thermophysicalProperties dictionary
         virtual bool read() = 0;
 
-        // Ostream Operator
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const basicSolidThermo& s);
 };
 
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/newBasicSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/newBasicSolidThermo.C
deleted file mode 100644
index b308cfea1ec35cadc5b629dbbaff8c002336b018..0000000000000000000000000000000000000000
--- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/newBasicSolidThermo.C
+++ /dev/null
@@ -1,77 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 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 "basicSolidThermo.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::basicSolidThermo> Foam::basicSolidThermo::New
-(
-    const fvMesh& mesh
-)
-{
-    if (debug)
-    {
-        Info<< "basicSolidThermo::New(const fvMesh&): "
-            << "constructing basicSolidThermo"
-            << endl;
-    }
-
-    const word thermoType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "solidThermophysicalProperties",
-                mesh.time().constant(),
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("thermoType")
-    );
-
-    meshConstructorTable::iterator cstrIter =
-        meshConstructorTablePtr_->find(thermoType);
-
-    if (cstrIter == meshConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "basicSolidThermo::New(const fvMesh&, const word&)"
-        )   << "Unknown solidThermo type " << thermoType
-            << endl << endl
-            << "Valid solidThermo types are :" << endl
-            << meshConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<basicSolidThermo>(cstrIter()(mesh));
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
index 33966637dbfbd4b9bfc913f6085b87e8549c90fc..aff314ae7314d9e41b4fd87ae1021887508d5b41 100644
--- a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class constSolidThermo Declaration
+                      Class constSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class constSolidThermo
@@ -159,11 +159,8 @@ public:
             //- Read solidThermophysicalProperties dictionary
             bool read(const dictionary&);
 
-
-
-        // Ostream Operator
-
-        friend Ostream& operator<<(Ostream& os, const constSolidThermo& s);
+            //- Ostream Operator
+            friend Ostream& operator<<(Ostream& os, const constSolidThermo& s);
 };
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
index 1e06ece31a8d927b55069942266107ec0109a68e..908db0b62af79ac2d1abecd0cfa1f15f22e25d9b 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
@@ -309,8 +309,8 @@ void Foam::directionalKSolidThermo::correct()
 }
 
 
-const Foam::volSymmTensorField& Foam::directionalKSolidThermo::
-directionalK() const
+const Foam::volSymmTensorField&
+Foam::directionalKSolidThermo::directionalK() const
 {
     return directionalK_;
 }
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
index b0fcfd5c8cd9f5f58736962a79c0efb5cd805c1b..e1ee3cba9fe1d4d55cb3d681efabe8ccd9c9ac6a 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class directionalKSolidThermo Declaration
+                  Class directionalKSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class directionalKSolidThermo
@@ -99,8 +99,8 @@ public:
         directionalKSolidThermo(const fvMesh& mesh);
 
 
-    // Destructor
-        virtual ~directionalKSolidThermo();
+    //- Destructor
+    virtual ~directionalKSolidThermo();
 
 
     // Member Functions
@@ -136,14 +136,12 @@ public:
             //- Read the directionalKSolidThermo properties
             bool read(const dictionary& dict);
 
-
-        // Ostream Operator
-
-        friend Ostream& operator<<
-        (
-            Ostream& os,
-            const directionalKSolidThermo& s
-        );
+            //- Ostream Operator
+            friend Ostream& operator<<
+            (
+                Ostream& os,
+                const directionalKSolidThermo& s
+            );
 };
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
index 03fad75d4a590f38ee6074e79add55a7a9d48197..9e08c9bd164e919ba97fc4119840efc505145303 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
@@ -31,7 +31,6 @@ License
 
 Foam::interpolateSolid::interpolateSolid(const dictionary& dict)
 {
-
     read(dict);
 
     Info<< "Constructed directionalKSolidThermo with samples" << nl
@@ -108,4 +107,6 @@ bool Foam::interpolateSolid::read(const dictionary& dict)
     sigmaSValues_ = Field<scalar>(dict.lookup("sigmaSValues"));
     return true;
 }
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
index 20d72d35db39fc438e9631910f6213f181e12d57..41c6468d48ea6f6e8144b7156d7ba6ee8892cd4b 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class interpolateSolid Declaration
+                     Class interpolateSolid Declaration
 \*---------------------------------------------------------------------------*/
 
 class interpolateSolid
@@ -77,8 +77,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~interpolateSolid();
+    virtual ~interpolateSolid();
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
index 24bb8ac6954aa66ed7c8b734aedb4e7f2bd67a90..d604b160be84671280295d20d77b284b711cb50f 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class interpolatedSolidThermo Declaration
+                  Class interpolatedSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class interpolatedSolidThermo
@@ -119,14 +119,12 @@ public:
             //- Read the interpolatedSolidThermo properties
             bool read(const dictionary& dict);
 
-
-        // Ostream Operator
-
-        friend Ostream& operator<<
-        (
-            Ostream& os,
-            const interpolatedSolidThermo& s
-        );
+            //- Ostream Operator
+            friend Ostream& operator<<
+            (
+                Ostream& os,
+                const interpolatedSolidThermo& s
+            );
 };
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
index 6366d8e473a738c3655804c9964d7c7525b01136..a54e386c381cf594cf5566d5fbe867aaa343c197 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class isotropicKSolidThermo Declaration
+                  Class isotropicKSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class isotropicKSolidThermo
@@ -71,9 +71,10 @@ public:
         isotropicKSolidThermo(const fvMesh& mesh);
 
 
-    // Destructor
+    //- Destructor
     virtual ~isotropicKSolidThermo();
 
+
     // Member functions
 
         //- Update properties
@@ -102,9 +103,7 @@ public:
         //- Write properties
         virtual bool writeData(Ostream& os) const;
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<
         (
             Ostream& os,
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
index 54519fe2f9bb99328caa3d56dffd3b2e9ab186b5..ed9a33753e6f39cf35c6d4101e917ca232c8ca1f 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
@@ -43,8 +43,9 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class multiComponentSolidMixture Declaration
+                 Class multiComponentSolidMixture Declaration
 \*---------------------------------------------------------------------------*/
+
 template<class ThermoSolidType>
 class multiComponentSolidMixture
 :
@@ -65,6 +66,7 @@ class multiComponentSolidMixture
         //- Return molar fraction for component i in celli and at T
         scalar X(label i, label celli, scalar T) const;
 
+
 public:
 
 
@@ -75,9 +77,8 @@ public:
 
 
     //- Destructor
-
-        virtual ~multiComponentSolidMixture()
-        {}
+    virtual ~multiComponentSolidMixture()
+    {}
 
 
     // Member Functions
@@ -92,7 +93,7 @@ public:
         void read(const dictionary&);
 
 
-        // Cell based properties.
+        // Cell-based properties
 
             //- Density
             virtual scalar rho(scalar T, label celli) const;
@@ -118,9 +119,8 @@ public:
             //- Total enthalpy
             virtual scalar h(scalar T, label celli) const;
 
-            //- Cp
+            //- Specific heat capacity
             virtual scalar Cp(scalar T, label celli) const;
-
 };
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H
index d13de54c2b9f4d8252c35a8b76685fe8f93ed32c..8db3a8fd28f828f7cd30cad8ddf80a75cce82a6b 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class reactingSolidMixture Declaration
+                    Class reactingSolidMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ThermoSolidType>
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
index 9824445cfc8a808c81d594ba0a1cb4f416f3feaa..569525e20d4db5e33b82e34155d2496a464eddf1 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
@@ -104,8 +104,7 @@ void Foam::solidMixtureThermo<MixtureType>::correct()
 
 
 template<class MixtureType>
-const Foam::volScalarField&
-Foam::solidMixtureThermo<MixtureType>::K() const
+const Foam::volScalarField& Foam::solidMixtureThermo<MixtureType>::K() const
 {
     return K_;
 }
@@ -220,8 +219,7 @@ Foam::solidMixtureThermo<MixtureType>::Hf() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::rho
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::rho
 (
     const label patchI
 ) const
@@ -243,8 +241,7 @@ Foam::solidMixtureThermo<MixtureType>::rho
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::Cp
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::Cp
 (
     const label patchI
 ) const
@@ -266,8 +263,7 @@ Foam::solidMixtureThermo<MixtureType>::Cp
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::hs
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::hs
 (
     const label patchI
 ) const
@@ -289,8 +285,7 @@ Foam::solidMixtureThermo<MixtureType>::hs
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::K
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::K
 (
     const label patchI
 ) const
@@ -312,8 +307,7 @@ Foam::solidMixtureThermo<MixtureType>::K
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::Hf
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::Hf
 (
     const label patchI
 ) const
@@ -335,8 +329,7 @@ Foam::solidMixtureThermo<MixtureType>::Hf
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::sigmaS
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::sigmaS
 (
     const label patchI
 ) const
@@ -359,8 +352,7 @@ Foam::solidMixtureThermo<MixtureType>::sigmaS
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::kappa
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::kappa
 (
     const label patchI
 ) const
@@ -383,8 +375,7 @@ Foam::solidMixtureThermo<MixtureType>::kappa
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::emissivity
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::emissivity
 (
     const label patchI
 ) const
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
index d9b2fdf157a19e95a309ddbe279d1794f2c2c82c..a8c2f9e3e4c93ba932242d3f6aa704d8e1368576 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                  Class solidMixtureThermo Declaration
+                    Class solidMixtureThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class MixtureType>
@@ -81,8 +81,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~solidMixtureThermo();
+    virtual ~solidMixtureThermo();
 
 
     // Member functions
@@ -122,8 +121,8 @@ public:
 
         // Patches variables
 
-       
-            //- Density [kg/m3]     
+
+            //- Density [kg/m3]
             virtual tmp<scalarField> rho(const label patchI) const;
 
             //- Specific heat capacity [J/(kg.K)]
@@ -148,13 +147,11 @@ public:
             virtual tmp<scalarField> emissivity(const label patchI) const;
 
 
-
         //- Read thermophysicalProperties dictionary
         virtual bool read();
 
         //- Write the basicSolidThermo properties
         virtual bool writeData(Ostream& os) const;
-
 };
 
 
diff --git a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C b/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
index cb6440c60458d3058c6a76fcd582bbd84aef598e..23fa254e2ce10d0b0edda42335d7104420328928 100644
--- a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
+++ b/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
@@ -73,17 +73,16 @@ Foam::autoPtr<Foam::pointSolidMixture> Foam::pointSolidMixture::New
     const dictionary& thermophysicalProperties
 )
 {
-    return autoPtr<pointSolidMixture>(new
-pointSolidMixture(thermophysicalProperties));
+    return autoPtr<pointSolidMixture>
+    (
+        new pointSolidMixture(thermophysicalProperties)
+    );
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalarField Foam::pointSolidMixture::X
-(
-    const scalarField& Y
-) const
+Foam::scalarField Foam::pointSolidMixture::X(const scalarField& Y) const
 {
     scalarField X(Y.size());
     scalar rhoInv = 0.0;
@@ -97,10 +96,7 @@ Foam::scalarField Foam::pointSolidMixture::X
 }
 
 
-Foam::scalar Foam::pointSolidMixture::rho
-(
-    const scalarField& X
-) const
+Foam::scalar Foam::pointSolidMixture::rho(const scalarField& X) const
 {
     scalar val = 0.0;
     forAll(properties_, i)
@@ -111,10 +107,7 @@ Foam::scalar Foam::pointSolidMixture::rho
 }
 
 
-Foam::scalar Foam::pointSolidMixture::Cp
-(
-    const scalarField& Y
-) const
+Foam::scalar Foam::pointSolidMixture::Cp(const scalarField& Y) const
 {
     scalar val = 0.0;
     forAll(properties_, i)
diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H b/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
index fba0d739ae843b34a5775124a0c1569a7f83cce0..540e00dbaa4a158efe424733f835354e4d1038bc 100644
--- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
+++ b/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
@@ -55,7 +55,7 @@ Ostream& operator<<
 
 
 /*---------------------------------------------------------------------------*\
-                            Class pointSolid Declaration
+                       Class pointSolid Declaration
 \*---------------------------------------------------------------------------*/
 
 class pointSolid
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
index adc76f9f4fa8f7405774c8ba5deb6f644943adbe..d9dffce684eb28cb10a0f971453a7b8883a3ad10 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
@@ -115,7 +115,9 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     Prt_(0.85),
     kappa_(0.41),
-    E_(9.8)
+    E_(9.8),
+    hsName_("hs")
+
 {
     checkType();
 }
@@ -133,7 +135,9 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
     Prt_(ptf.Prt_),
     kappa_(ptf.kappa_),
-    E_(ptf.E_)
+    E_(ptf.E_),
+    hsName_(ptf.hsName_)
+
 {}
 
 
@@ -148,7 +152,8 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF, dict),
     Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    hsName_(dict.lookupOrDefault<word>("hs", "hs"))
 {
     checkType();
 }
@@ -163,7 +168,8 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField
     fixedValueFvPatchScalarField(awfpsf),
     Prt_(awfpsf.Prt_),
     kappa_(awfpsf.kappa_),
-    E_(awfpsf.E_)
+    E_(awfpsf.E_),
+    hsName_(awfpsf.hsName_)
 {
     checkType();
 }
@@ -179,7 +185,8 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField
     fixedValueFvPatchScalarField(awfpsf, iF),
     Prt_(awfpsf.Prt_),
     kappa_(awfpsf.kappa_),
-    E_(awfpsf.E_)
+    E_(awfpsf.E_),
+    hsName_(awfpsf.hsName_)
 {
     checkType();
 }
@@ -209,7 +216,7 @@ void alphaSgsJayatillekeWallFunctionFvPatchScalarField::evaluate
 
     const scalarField& rhow = lesModel.rho().boundaryField()[patchI];
     const fvPatchScalarField& hw =
-        patch().lookupPatchField<volScalarField, scalar>("h");
+        patch().lookupPatchField<volScalarField, scalar>(hsName_);
 
     const scalarField& ry = patch().deltaCoeffs();
 
@@ -312,6 +319,7 @@ void alphaSgsJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
     os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
     os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
     os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    os.writeKeyword("hs") << hsName_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
index b06ba8c1c2f28c24fb389cbd3adc7f8223aeecf6..940d5fa263058940e96160352d9113bf147520d3 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
@@ -66,6 +66,9 @@ class alphaSgsJayatillekeWallFunctionFvPatchScalarField
         //- E coefficient
         scalar E_;
 
+        //- Name of (sensible/total) enthalpy field
+        word hsName_;
+
 
         // Solution parameters
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/options b/src/turbulenceModels/compressible/turbulenceModel/Make/options
index 1a60c8b98c64d49964d8c053e9737c5ca5ce8c7c..4f1694a48e6d5ee9fda733ec7c9c619ead89bb22 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/options
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude
 
 LIB_LIBS = \
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 52ff388f45fcdf3c42a68563f4a987a662b017cb..3fbcdd8d4746e95506194706e6480405abdd022e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -45,5 +45,67 @@ timePrecision   6;
 
 runTimeModifiable true;
 
+functions
+{
+    convergenceChecks
+    {
+        type           residualControl;
+        functionObjectLibs ("libjobControl.so");
+        outputControl  timeStep;
+        outputInterval 1;
+
+        maxResiduals
+        {
+            p       1e-2;
+            U       1e-3;
+            "(k|epsilon|omega)" 1e-3;
+        }
+    }
+
+    streamLines
+    {
+        type            streamLine;
+
+        // Where to load it from (if not already in solver)
+        functionObjectLibs ("libfieldFunctionObjects.so");
+
+        // Output every
+        outputControl   outputTime;
+        // outputInterval 10;
+
+        setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
+
+        // Velocity field to use for tracking.
+        U U;
+
+        // Tracked forwards (+U) or backwards (-U)
+        trackForward    true;
+
+        // Names of fields to sample. Should contain above velocity field!
+        fields (p k U);
+
+        // Steps particles can travel before being removed
+        lifeTime        10000;
+
+        // Number of steps per cell (estimate). Set to 1 to disable subcycling.
+        nSubCycle 5;
+
+        // Cloud name to use
+        cloudName       particleTracks;
+
+        // Seeding method. See the sampleSets in sampleDict.
+        seedSampleSet   uniform;  //cloud;//triSurfaceMeshPointSet;
+
+        uniformCoeffs
+        {
+            type        uniform;
+            axis        x;  //distance;
+
+            start       (-0.0205 0.001  0.00001);
+            end         (-0.0205 0.0251 0.00001);
+            nPoints     10;
+        }
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
index dbff87ae2a1e88981992ab0e6c29340154ccb0b2..ae1244f70ede47149eb8ab452fe43ca99d7b9b0b 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut
@@ -37,8 +37,8 @@ boundaryField
     "terrain_.*"
     {
         type            nutkRoughWallFunction;
-        Ks              0.2; //Ks = 20 Z0
-        Cs              0.5;
+        Ks              uniform 0.2; //Ks = 20 Z0
+        Cs              uniform 0.5;
         value           uniform 0.0;
     }
 
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/sourcesProperties b/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/sourcesProperties
index 90b086769aa416a30f27e32c1cc9415f9d602513..65578ad1e92ceb7383007625bb35e90a3f4de03d 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/sourcesProperties
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/sourcesProperties
@@ -18,10 +18,10 @@ FoamFile
 disk1
 {
     typeModel       actuationDiskSource;
-    active          on;            // on/off switch
-    timeStart       0.0;           // start time
+    active          on;             // on/off switch
+    timeStart       0.0;            // start time
     duration        1000.0;         // duration
-    selectionMode   cellSet;       // cellSet // points //cellZone
+    selectionMode   cellZone;       // cellSet // points //cellZone
     cellSet         actuationDisk1; // cellSet name when selectionMode = cellSet
     cellZone        actuationDisk1; // cellZone name when selectionMode = cellZone
 
@@ -37,10 +37,10 @@ disk1
 disk2
 {
     typeModel       actuationDiskSource;
-    active          on;            // on/off switch
-    timeStart       0.0;           // start time
+    active          on;             // on/off switch
+    timeStart       0.0;            // start time
     duration        1000.0;         // duration
-    selectionMode   cellSet;       // cellSet // points //cellZone
+    selectionMode   cellZone;       // cellSet // points //cellZone
     cellSet         actuationDisk2; // cellSet name when selectionMode = cellSet
     cellZone        actuationDisk2; // cellZone name when selectionMode = cellZone
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index aa49989c5bfbf5a72f69b85801b06614574dda5d..c40ce42cf8c252cfc620a4d4000ad9ae9f00a918 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -40,7 +40,7 @@ solvers
         smoother        GaussSeidel;
         nPreSweeps      0;             
         nPostSweeps     2;             
-        nBottomSweeps   2;             
+        nFinestSweeps   2;             
         cacheAgglomeration false;      
         nCellsInCoarsestLevel 10;      
         agglomerator    faceAreaPair;  
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
index 66a8e350d9f3322c44ff180916fcb8e7f7cd6e54..9d09fcfdb310b02e24dd1f46a3a1a1f07d007c76 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
index 66a8e350d9f3322c44ff180916fcb8e7f7cd6e54..9d09fcfdb310b02e24dd1f46a3a1a1f07d007c76 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
index b8143ab07b6bde61118c87472b921b8cf1938b59..3f91dae6d45f68b6e7189df4f364a9c4e0e9bbcc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        GaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
index b6d29c62411c5de3132b6f22d6de8c7efa0bff9f..0cd58c354f14767e3f27d9fd8dc8cedc81b26a37 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
@@ -40,7 +40,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
index 11a72d517a651a00bb96bf98b8540c55b2310cd5..12812ad7218bde5b129b2eddba0c00bc08d743a0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
index 11a72d517a651a00bb96bf98b8540c55b2310cd5..12812ad7218bde5b129b2eddba0c00bc08d743a0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
index 11a72d517a651a00bb96bf98b8540c55b2310cd5..12812ad7218bde5b129b2eddba0c00bc08d743a0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
index 11a72d517a651a00bb96bf98b8540c55b2310cd5..12812ad7218bde5b129b2eddba0c00bc08d743a0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
index 11a72d517a651a00bb96bf98b8540c55b2310cd5..12812ad7218bde5b129b2eddba0c00bc08d743a0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
index b2f497532fad48f5c00c520d2bf3c669d4c99924..3764ff4c6e98cd88af8282252a37ae33ef21d45e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
index 06e675ebf85f570e80d44f5c633bbd07d06c9076..38782da87020e87530b47f46cdf6832e1488c3d3 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index 143bfa585a677c989e06b4f2f189a8a194fe67e5..c194ad7907aace307b01bbd3eb2838e426804298 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        GaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration off;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index c58dfc3740ae3103676050b3eca8b4ba0fc379fe..cd28739cd7bbdcc97784148bcb64b293b7daf187 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -28,7 +28,7 @@ solvers
             smoother        GaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
-            nBottomSweeps   2;
+            nFinestSweeps   2;
             cacheAgglomeration off;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;