diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 9f9d9f6dd4..eb40b7665b 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/UEqn.H
@@ -14,4 +14,3 @@
     ).initialResidual();
 
     maxResidual = max(eqnResidual, maxResidual);
-
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
index 18b915b16b..c0daa0e7ca 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
@@ -12,6 +12,7 @@
       - fvm::laplacian(muEff, U)
       - (fvc::grad(U) & fvc::grad(muEff))
     //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
+    //- fvc::div(rho*turbulence->nuEff()*dev(fvc::grad(U)().T()))
     );
 
     if (oCorr == nOuterCorr-1)
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
index 2ab9a8b3cc..9704392a10 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
@@ -53,18 +53,18 @@ patches
         name sidePatches;
 
         // Type of new patch
-	dictionary
-	{
+        dictionary
+        {
             type cyclic;
 
-	    // Optional: explicitly set transformation tensor.
+            // Optional: explicitly set transformation tensor.
             // Used when matching and synchronising points.
             //transform translational;
             //separationVector (-2289 0 0);
-	    transform rotational;
-	    rotationAxis (1 0 0);
+            transform rotational;
+            rotationAxis (1 0 0);
             rotationCentre (0 0 0);
-	}
+        }
 
         // How to construct: either from 'patches' or 'set'
         constructFrom patches;
@@ -80,10 +80,10 @@ patches
         name bottom;
 
         // Type of new patch
-	dictionary
-	{
+        dictionary
+        {
             type wall;
-	}
+        }
 
         constructFrom set;
 
diff --git a/bin/foamLog b/bin/foamLog
index 47968aa120..06b2a2c5dc 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -452,5 +452,6 @@ done
 #-----------------------------
 myEcho "Generated XY files for:"
 getAllQueries $DBFILE $LOG
+myEcho "End"
 
 #------------------------------------------------------------------------------
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index e608e4695b..7bff2143ec 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -345,6 +345,9 @@ $(globalMeshData)/globalIndex.C
 
 $(polyMesh)/syncTools/syncTools.C
 
+zone = $(polyMesh)/zones/zone
+$(zone)/zone.C
+
 cellZone = $(polyMesh)/zones/cellZone
 $(cellZone)/cellZone.C
 $(cellZone)/newCellZone.C
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
index 5c98efd84a..b6800dceb6 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
@@ -114,6 +114,7 @@ public:
                 return index_ > -1;
             }
 
+
         // Edit
 
             //- Update
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
index ff8041fc60..a7672104da 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    A subset of mesh cells.
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellZone.H"
@@ -45,59 +42,9 @@ namespace Foam
     addToRunTimeSelectionTable(cellZone, cellZone, dictionary);
 }
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-const Foam::Map<Foam::label>& Foam::cellZone::cellLookupMap() const
-{
-    if (!cellLookupMapPtr_)
-    {
-        calcCellLookupMap();
-    }
-
-    return *cellLookupMapPtr_;
-}
-
-
-void Foam::cellZone::calcCellLookupMap() const
-{
-    if (debug)
-    {
-        Info<< "void cellZone::calcCellLookupMap() const : "
-            << "Calculating cell lookup map"
-            << endl;
-    }
-
-    if (cellLookupMapPtr_)
-    {
-        FatalErrorIn
-        (
-            "void cellZone::calcCellLookupMap() const"
-        )   << "cell lookup map already calculated"
-            << abort(FatalError);
-    }
-
-    const labelList& addr = *this;
-
-    cellLookupMapPtr_ = new Map<label>(2*addr.size());
-    Map<label>& clm = *cellLookupMapPtr_;
-
-    forAll (addr, cellI)
-    {
-        clm.insert(addr[cellI], cellI);
-    }
-
-    if (debug)
-    {
-        Info<< "void cellZone::calcCellLookupMap() const : "
-            << "Finished calculating cell lookup map"
-            << endl;
-    }
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::cellZone::cellZone
 (
     const word& name,
@@ -106,11 +53,8 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone(name, addr, index),
+    zoneMesh_(zm)
 {}
 
 
@@ -122,15 +66,11 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone(name, addr, index),
+    zoneMesh_(zm)
 {}
 
 
-// Construct from dictionary
 Foam::cellZone::cellZone
 (
     const word& name,
@@ -139,16 +79,11 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(dict.lookup("cellLabels")),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone("cell", name, dict, index),
+    zoneMesh_(zm)
 {}
 
 
-// Construct given the original zone and resetting the
-//  cell list and zone mesh information
 Foam::cellZone::cellZone
 (
     const cellZone& cz,
@@ -157,11 +92,8 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(cz.name()),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone(cz, addr, index),
+    zoneMesh_(zm)
 {}
 
 Foam::cellZone::cellZone
@@ -172,38 +104,22 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(cz.name()),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone(cz, addr, index),
+    zoneMesh_(zm)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::cellZone::~cellZone()
-{
-    clearAddressing();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::label Foam::cellZone::whichCell(const label globalCellID) const
 {
-    const Map<label>& clm = cellLookupMap();
-
-    Map<label>::const_iterator clmIter = clm.find(globalCellID);
-
-    if (clmIter == clm.end())
-    {
-        return -1;
-    }
-    else
-    {
-        return clmIter();
-    }
+    return zone::localID(globalCellID);
 }
 
 
@@ -213,45 +129,9 @@ const Foam::cellZoneMesh& Foam::cellZone::zoneMesh() const
 }
 
 
-void Foam::cellZone::clearAddressing()
-{
-    deleteDemandDrivenData(cellLookupMapPtr_);
-}
-
-
 bool Foam::cellZone::checkDefinition(const bool report) const
 {
-    const labelList& addr = *this;
-
-    bool boundaryError = false;
-
-    forAll(addr, i)
-    {
-        if (addr[i] < 0 || addr[i] >= zoneMesh_.mesh().nCells())
-        {
-            boundaryError = true;
-
-            if (report)
-            {
-                SeriousErrorIn
-                (
-                    "bool cellZone::checkDefinition("
-                    "const bool report) const"
-                )   << "Zone " << name()
-                    << " contains invalid cell label " << addr[i] << nl
-                    << "Valid cell labels are 0.."
-                    << zoneMesh_.mesh().nCells()-1 << endl;
-            }
-        }
-    }
-    return boundaryError;
-}
-
-
-void Foam::cellZone::write(Ostream& os) const
-{
-    os  << nl << name()
-        << nl << static_cast<const labelList&>(*this);
+    return zone::checkDefinition(zoneMesh_.mesh().nCells(), report);
 }
 
 
@@ -284,10 +164,10 @@ void Foam::cellZone::operator=(const labelList& addr)
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const cellZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const cellZone& cz)
 {
-    p.write(os);
-    os.check("Ostream& operator<<(Ostream& f, const cellZone& p");
+    cz.write(os);
+    os.check("Ostream& operator<<(Ostream& os, const cellZone& cz");
     return os;
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index b133eee436..67c9c2f52f 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -42,12 +42,8 @@ SourceFiles
 #ifndef cellZone_H
 #define cellZone_H
 
-#include "labelList.H"
-#include "typeInfo.H"
-#include "dictionary.H"
+#include "zone.H"
 #include "cellZoneMeshFwd.H"
-#include "pointFieldFwd.H"
-#include "Map.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,36 +62,22 @@ Ostream& operator<<(Ostream&, const cellZone&);
 
 class cellZone
 :
-    public labelList
+    public zone
 {
-    // Private data
 
-        //- Name of zone
-        word name_;
+protected:
 
-        //- Index of zone
-        label index_;
+    // Protected data
 
         //- Reference to zone list
         const cellZoneMesh& zoneMesh_;
 
-        // Demand-driven private data
-
-            //- Map of cell labels in zone for fast location lookup
-            mutable Map<label>* cellLookupMapPtr_;
-
 
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
         cellZone(const cellZone&);
 
-        //- Return map of local cell indices
-        const Map<label>& cellLookupMap() const;
-
-        //- Build map of local cell indices
-        void calcCellLookupMap() const;
-
 
 public:
 
@@ -208,45 +190,19 @@ public:
 
 
     //- Destructor
-
-        virtual ~cellZone();
+    virtual ~cellZone();
 
 
     // Member Functions
 
-        //- Return name
-        const word& name() const
-        {
-            return name_;
-        }
-
-        //- Map storing the local cell index for every global cell
-        //  index.  Used to find out the index of cell in the zone from
-        //  the known global cell index.  If the cell is not in the
-        //  zone, returns -1
+        //- Helper function to re-direct to zone::localID(...)
         label whichCell(const label globalCellID) const;
 
-        //- Return the index of this zone in zone list
-        label index() const
-        {
-            return index_;
-        }
-
         //- Return zoneMesh reference
         const cellZoneMesh& zoneMesh() const;
 
-        //- Clear addressing
-        void clearAddressing();
-
         //- Check zone definition. Return true if in error.
-        bool checkDefinition(const bool report = false) const;
-
-        //- Correct patch after moving points
-        virtual void movePoints(const pointField&)
-        {}
-
-        //- Write
-        virtual void write(Ostream&) const;
+        virtual bool checkDefinition(const bool report = false) const;
 
         //- Write dictionary
         virtual void writeDict(Ostream&) const;
@@ -261,8 +217,9 @@ public:
         void operator=(const labelList&);
 
 
-    // Ostream Operator
+    // I-O
 
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream&, const cellZone&);
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
index 1905c9beda..607f47511a 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
@@ -22,15 +22,11 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellZone.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
@@ -61,7 +57,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
             "const label, const cellZoneMesh&)",
             dict
         )   << "Unknown cellZone type " << zoneType << endl << endl
-            << "Valid cellZone types are :" << endl
+            << "Valid cellZone types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
@@ -70,6 +66,4 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index d4cc0a2843..e56730bd9e 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    A subset of mesh faces.
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceZone.H"
@@ -100,54 +97,6 @@ void Foam::faceZone::calcFaceZonePatch() const
 }
 
 
-const Foam::Map<Foam::label>& Foam::faceZone::faceLookupMap() const
-{
-    if (!faceLookupMapPtr_)
-    {
-        calcFaceLookupMap();
-    }
-
-    return *faceLookupMapPtr_;
-}
-
-
-void Foam::faceZone::calcFaceLookupMap() const
-{
-    if (debug)
-    {
-        Info<< "void faceZone::calcFaceLookupMap() const : "
-            << "Calculating face lookup map"
-            << endl;
-    }
-
-    if (faceLookupMapPtr_)
-    {
-        FatalErrorIn
-        (
-            "void faceZone::calcFaceLookupMap() const"
-        )   << "face lookup map already calculated"
-            << abort(FatalError);
-    }
-
-    const labelList& addr = *this;
-
-    faceLookupMapPtr_ = new Map<label>(2*addr.size());
-    Map<label>& flm = *faceLookupMapPtr_;
-
-    forAll (addr, faceI)
-    {
-        flm.insert(addr[faceI], faceI);
-    }
-
-    if (debug)
-    {
-        Info<< "void faceZone::calcFaceLookupMap() const : "
-            << "Finished calculating face lookup map"
-            << endl;
-    }
-}
-
-
 void Foam::faceZone::calcCellLayers() const
 {
     if (debug)
@@ -228,16 +177,13 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
+    zone(name, addr, index),
     flipMap_(fm),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
@@ -252,22 +198,18 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
+    zone(name, addr, index),
     flipMap_(fm),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
 
 
-// Construct from dictionary
 Foam::faceZone::faceZone
 (
     const word& name,
@@ -276,23 +218,18 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(dict.lookup("faceLabels")),
-    name_(name),
+    zone("face", name, dict, index),
     flipMap_(dict.lookup("flipMap")),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
 
 
-// Construct given the original zone and resetting the
-// face list and zone mesh information
 Foam::faceZone::faceZone
 (
     const faceZone& fz,
@@ -302,16 +239,13 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(fz.name()),
+    zone(fz, addr, index),
     flipMap_(fm),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
@@ -326,16 +260,13 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(fz.name()),
+    zone(fz, addr, index),
     flipMap_(fm),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
@@ -351,29 +282,18 @@ Foam::faceZone::~faceZone()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::faceZone::whichFace(const label globalFaceID) const
-{
-    const Map<label>& flm = faceLookupMap();
-
-    Map<label>::const_iterator flmIter = flm.find(globalFaceID);
-
-    if (flmIter == flm.end())
-    {
-        return -1;
-    }
-    else
-    {
-        return flmIter();
-    }
-}
-
-
 const Foam::faceZoneMesh& Foam::faceZone::zoneMesh() const
 {
     return zoneMesh_;
 }
 
 
+Foam::label Foam::faceZone::whichFace(const label globalFaceID) const
+{
+    return zone::localID(globalFaceID);
+}
+
+
 const Foam::primitiveFacePatch& Foam::faceZone::operator()() const
 {
     if (!patchPtr_)
@@ -450,13 +370,14 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
 
 void Foam::faceZone::clearAddressing()
 {
+    zone::clearAddressing();
+
     deleteDemandDrivenData(patchPtr_);
 
     deleteDemandDrivenData(masterCellsPtr_);
     deleteDemandDrivenData(slaveCellsPtr_);
 
     deleteDemandDrivenData(mePtr_);
-    deleteDemandDrivenData(faceLookupMapPtr_);
 }
 
 
@@ -504,30 +425,7 @@ void Foam::faceZone::updateMesh(const mapPolyMesh& mpm)
 
 bool Foam::faceZone::checkDefinition(const bool report) const
 {
-    const labelList& addr = *this;
-
-    bool boundaryError = false;
-
-    forAll(addr, i)
-    {
-        if (addr[i] < 0 || addr[i] >= zoneMesh().mesh().faces().size())
-        {
-            boundaryError = true;
-
-            if (report)
-            {
-                SeriousErrorIn
-                (
-                    "bool faceZone::checkDefinition("
-                    "const bool report) const"
-                )   << "Zone " << name()
-                    << " contains invalid face label " << addr[i] << nl
-                    << "Valid face labels are 0.."
-                    << zoneMesh().mesh().faces().size()-1 << endl;
-            }
-        }
-    }
-    return boundaryError;
+    return zone::checkDefinition(zoneMesh().mesh().faces().size(), report);
 }
 
 
@@ -642,10 +540,10 @@ void Foam::faceZone::writeDict(Ostream& os) const
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const faceZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const faceZone& fz)
 {
-    p.write(os);
-    os.check("Ostream& operator<<(Ostream& f, const faceZone& p");
+    fz.write(os);
+    os.check("Ostream& operator<<(Ostream& os, const faceZone& fz");
     return os;
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 16c7e82b09..7b1b46d2c4 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -41,13 +41,10 @@ SourceFiles
 #ifndef faceZone_H
 #define faceZone_H
 
-#include "typeInfo.H"
-#include "dictionary.H"
-#include "labelList.H"
+#include "zone.H"
 #include "faceZoneMeshFwd.H"
 #include "boolList.H"
 #include "primitiveFacePatch.H"
-#include "Map.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,20 +65,17 @@ Ostream& operator<<(Ostream&, const faceZone&);
 
 class faceZone
 :
-    public labelList
+    public zone
 {
-    // Private data
 
-        //- Name of zone
-        word name_;
+protected:
+
+    // Protected data
 
         //- Flip map for all faces in the zone.  Set to true if the
         //  face needs to be flipped to achieve the correct orientation.
         boolList flipMap_;
 
-        //- Index of zone
-        label index_;
-
         //- Reference to zone list
         const faceZoneMesh& zoneMesh_;
 
@@ -100,9 +94,6 @@ class faceZone
             //- Global edge addressing
             mutable labelList* mePtr_;
 
-            //- Map of face labels in zone for fast location lookup
-            mutable Map<label>* faceLookupMapPtr_;
-
 
     // Private Member Functions
 
@@ -118,9 +109,6 @@ class faceZone
         //- Return map of local face indices
         const Map<label>& faceLookupMap() const;
 
-        //- Build map of local face indices
-        void calcFaceLookupMap() const;
-
         //- Calculate master and slave face layer
         void calcCellLayers() const;
 
@@ -244,38 +232,23 @@ public:
 
 
     //- Destructor
-
-        virtual ~faceZone();
+    virtual ~faceZone();
 
 
     // Member Functions
 
-        //- Return name
-        const word& name() const
-        {
-            return name_;
-        }
-
         //- Return face flip map
         const boolList& flipMap() const
         {
             return flipMap_;
         }
 
-        //- Map storing the local face index for every global face index.
-        //  Used to find out the index of face in the zone from the known global
-        //  face index.  If the face is not in the zone, returns -1
-        label whichFace(const label globalFaceID) const;
+        //- Helper function to re-direct to zone::localID(...)
+        label whichFace(const label globalCellID) const;
 
         //- Return reference to primitive patch
         const primitiveFacePatch& operator()() const;
 
-        //- Return the index of this zone in zone list
-        label index() const
-        {
-            return index_;
-        }
-
         //- Return zoneMesh reference
         const faceZoneMesh& zoneMesh() const;
 
@@ -294,23 +267,23 @@ public:
 
 
         //- Clear addressing
-        void clearAddressing();
+        virtual void clearAddressing();
 
         //- Reset addressing and flip map (clearing demand-driven data)
-        void resetAddressing(const labelList&, const boolList&);
+        virtual void resetAddressing(const labelList&, const boolList&);
 
         //- Check zone definition. Return true if in error.
-        bool checkDefinition(const bool report = false) const;
+        virtual bool checkDefinition(const bool report = false) const;
 
         //- Check whether all procs have faces synchronised. Return
         //  true if in error.
-        bool checkParallelSync(const bool report = false) const;
+        virtual bool checkParallelSync(const bool report = false) const;
 
         //- Correct patch after moving points
         virtual void movePoints(const pointField&);
 
         //- Update for changes in topology
-        void updateMesh(const mapPolyMesh& mpm);
+        virtual void updateMesh(const mapPolyMesh& mpm);
 
         //- Write
         virtual void write(Ostream&) const;
@@ -319,8 +292,9 @@ public:
         virtual void writeDict(Ostream&) const;
 
 
-    // Ostream Operator
+    // I-O
 
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream&, const faceZone&);
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
index 91506f5ce8..07f85cc180 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
@@ -22,15 +22,11 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceZone.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
@@ -61,7 +57,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
             "const label, const faceZoneMesh&)",
             dict
         )   << "Unknown faceZone type " << zoneType << endl << endl
-            << "Valid faceZone types are :" << endl
+            << "Valid faceZone types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
@@ -70,6 +66,4 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
index 015bdea318..695e9f3bb6 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
@@ -22,15 +22,11 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointZone.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
@@ -61,7 +57,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
             "const label, const pointZoneMesh&)",
             dict
         )   << "Unknown pointZone type " << zoneType << endl << endl
-            << "Valid pointZone types are :" << endl
+            << "Valid pointZone types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
@@ -69,6 +65,5 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
     return autoPtr<pointZone>(cstrIter()(name, dict, index, zm));
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index d1c450691f..c6098a38a2 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    A subset of mesh points.
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointZone.H"
@@ -43,59 +40,9 @@ namespace Foam
     addToRunTimeSelectionTable(pointZone, pointZone, dictionary);
 }
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-const Foam::Map<Foam::label>& Foam::pointZone::pointLookupMap() const
-{
-    if (!pointLookupMapPtr_)
-    {
-        calcPointLookupMap();
-    }
-
-    return *pointLookupMapPtr_;
-}
-
-
-void Foam::pointZone::calcPointLookupMap() const
-{
-    if (debug)
-    {
-        Info<< "void pointZone::calcPointLookupMap() const : "
-            << "Calculating point lookup map"
-            << endl;
-    }
-
-    if (pointLookupMapPtr_)
-    {
-        FatalErrorIn
-        (
-            "void pointZone::calcPointLookupMap() const"
-        )   << "point lookup map already calculated"
-            << abort(FatalError);
-    }
-
-    const labelList& addr = *this;
-
-    pointLookupMapPtr_ = new Map<label>(2*addr.size());
-    Map<label>& plm = *pointLookupMapPtr_;
-
-    forAll (addr, pointI)
-    {
-        plm.insert(addr[pointI], pointI);
-    }
-
-    if (debug)
-    {
-        Info<< "void pointZone::calcPointLookupMap() const : "
-            << "Finished calculating point lookup map"
-            << endl;
-    }
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::pointZone::pointZone
 (
     const word& name,
@@ -104,11 +51,8 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone(name, addr, index),
+    zoneMesh_(zm)
 {}
 
 
@@ -120,15 +64,11 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone(name, addr, index),
+    zoneMesh_(zm)
 {}
 
 
-// Construct from dictionary
 Foam::pointZone::pointZone
 (
     const word& name,
@@ -137,16 +77,11 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(dict.lookup("pointLabels")),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone("point", name, dict, index),
+    zoneMesh_(zm)
 {}
 
 
-// Construct given the original zone and resetting the
-// point list and zone mesh information
 Foam::pointZone::pointZone
 (
     const pointZone& pz,
@@ -155,11 +90,8 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(pz.name()),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone(pz, addr, index),
+    zoneMesh_(zm)
 {}
 
 
@@ -171,92 +103,40 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(pz.name()),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone(pz, addr, index),
+    zoneMesh_(zm)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::pointZone::~pointZone()
-{
-    clearAddressing();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::pointZone::whichPoint(const label globalPointID) const
-{
-    const Map<label>& plm = pointLookupMap();
-
-    Map<label>::const_iterator plmIter = plm.find(globalPointID);
-
-    if (plmIter == plm.end())
-    {
-        return -1;
-    }
-    else
-    {
-        return plmIter();
-    }
-}
-
-
 const Foam::pointZoneMesh& Foam::pointZone::zoneMesh() const
 {
     return zoneMesh_;
 }
 
 
-void Foam::pointZone::clearAddressing()
+Foam::label Foam::pointZone::whichPoint(const label globalPointID) const
 {
-    deleteDemandDrivenData(pointLookupMapPtr_);
+    return zone::localID(globalPointID);
 }
 
 
 bool Foam::pointZone::checkDefinition(const bool report) const
 {
-    const labelList& addr = *this;
-
-    bool boundaryError = false;
-
-    forAll(addr, i)
-    {
-        if (addr[i] < 0 || addr[i] >= zoneMesh_.mesh().points().size())
-        {
-            boundaryError = true;
-
-            if (report)
-            {
-                SeriousErrorIn
-                (
-                    "bool pointZone::checkDefinition("
-                    "const bool report) const"
-                )   << "Zone " << name()
-                    << " contains invalid point label " << addr[i] << nl
-                    << "Valid point labels are 0.."
-                    << zoneMesh_.mesh().points().size()-1 << endl;
-            }
-        }
-    }
-    return boundaryError;
-}
-
-
-void Foam::pointZone::write(Ostream& os) const
-{
-    os  << nl << name()
-        << nl << static_cast<const labelList&>(*this);
+    return zone::checkDefinition(zoneMesh_.mesh().points().size(), report);
 }
 
 
 void Foam::pointZone::writeDict(Ostream& os) const
 {
-    os  << nl << name() << nl << token::BEGIN_BLOCK << nl
+    os  << nl << name_ << nl << token::BEGIN_BLOCK << nl
         << "    type " << type() << token::END_STATEMENT << nl;
 
     writeEntry("pointLabels", os);
@@ -267,10 +147,10 @@ void Foam::pointZone::writeDict(Ostream& os) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::pointZone::operator=(const pointZone& cz)
+void Foam::pointZone::operator=(const pointZone& pz)
 {
     clearAddressing();
-    labelList::operator=(cz);
+    labelList::operator=(pz);
 }
 
 
@@ -283,10 +163,10 @@ void Foam::pointZone::operator=(const labelList& addr)
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const pointZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const pointZone& pz)
 {
-    p.write(os);
-    os.check("Ostream& operator<<(Ostream& f, const pointZone& p");
+    pz.write(os);
+    os.check("Ostream& operator<<(Ostream& os, const pointZone& pz");
     return os;
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 66719530f5..89f8349461 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -43,12 +43,8 @@ SourceFiles
 #ifndef pointZone_H
 #define pointZone_H
 
-#include "labelList.H"
-#include "typeInfo.H"
-#include "dictionary.H"
+#include "zone.H"
 #include "pointZoneMeshFwd.H"
-#include "Map.H"
-#include "pointField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -67,37 +63,22 @@ Ostream& operator<<(Ostream&, const pointZone&);
 
 class pointZone
 :
-    public labelList
+    public zone
 {
+
+protected:
+
     // Private data
 
-        //- Name of zone
-        word name_;
-
-        //- Index of zone
-        label index_;
-
         //- Reference to zone list
         const pointZoneMesh& zoneMesh_;
 
 
-        // Demand-driven private data
-
-            //- Map of point labels in zone for fast location lookup
-            mutable Map<label>* pointLookupMapPtr_;
-
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
         pointZone(const pointZone&);
 
-        //- Return map of local point indices
-        const Map<label>& pointLookupMap() const;
-
-        //- Build map of local point indices
-        void calcPointLookupMap() const;
-
 
 public:
 
@@ -210,46 +191,24 @@ public:
 
 
     //- Destructor
-
-        virtual ~pointZone();
+    virtual ~pointZone();
 
 
     // Member Functions
 
-        //- Return name
-        const word& name() const
-        {
-            return name_;
-        }
-
-        //- Map storing the local point index for every global point
-        //  index.  Used to find out the index of point in the zone from
-        //  the known global point index.  If the point is not in the
-        //  zone, returns -1
-        label whichPoint(const label globalPointID) const;
-
-        //- Return the index of this zone in zone list
-        label index() const
-        {
-            return index_;
-        }
-
         //- Return zoneMesh reference
         const pointZoneMesh& zoneMesh() const;
 
-        //- Clear addressing
-        void clearAddressing();
+        //- Helper function to re-direct to zone::localID(...)
+        label whichPoint(const label globalPointID) const;
 
         //- Check zone definition. Return true if in error.
-        bool checkDefinition(const bool report = false) const;
+        virtual bool checkDefinition(const bool report = false) const;
 
         //- Correct patch after moving points
         virtual void movePoints(const pointField&)
         {}
 
-        //- Write
-        virtual void write(Ostream&) const;
-
         //- Write dictionary
         virtual void writeDict(Ostream&) const;
 
@@ -263,8 +222,9 @@ public:
         void operator=(const labelList&);
 
 
-    // Ostream Operator
+    // I-O
 
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream&, const pointZone&);
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
new file mode 100644
index 0000000000..20195888c5
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 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 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "zone.H"
+#include "IOstream.H"
+#include "demandDrivenData.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(zone, 0);
+}
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+const Foam::Map<Foam::label>& Foam::zone::lookupMap() const
+{
+    if (!lookupMapPtr_)
+    {
+        calcLookupMap();
+    }
+
+    return *lookupMapPtr_;
+}
+
+
+void Foam::zone::calcLookupMap() const
+{
+    if (debug)
+    {
+        Info<< "void zone::calcLookupMap() const: "
+            << "Calculating lookup map"
+            << endl;
+    }
+
+    if (lookupMapPtr_)
+    {
+        FatalErrorIn("void zone::calcLookupMap() const")
+            << "Lookup map already calculated" << nl
+            << abort(FatalError);
+    }
+
+    const labelList& addr = *this;
+
+    lookupMapPtr_ = new Map<label>(2*addr.size());
+    Map<label>& lm = *lookupMapPtr_;
+
+    forAll(addr, i)
+    {
+        lm.insert(addr[i], i);
+    }
+
+    if (debug)
+    {
+        Info<< "void zone::calcLookupMap() const: "
+            << "Finished calculating lookup map"
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::zone::zone
+(
+    const word& name,
+    const labelList& addr,
+    const label index
+)
+:
+    labelList(addr),
+    name_(name),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+    const word& name,
+    const Xfer<labelList>& addr,
+    const label index
+)
+:
+    labelList(addr),
+    name_(name),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+    const word& zoneType,
+    const word& name,
+    const dictionary& dict,
+    const label index
+)
+:
+    labelList(dict.lookup(zoneType + "Labels")),
+    name_(name),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+    const zone& z,
+    const labelList& addr,
+    const label index
+)
+:
+    labelList(addr),
+    name_(z.name()),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+    const zone& z,
+    const Xfer<labelList>& addr,
+    const label index
+)
+:
+    labelList(addr),
+    name_(z.name()),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::zone::~zone()
+{
+    clearAddressing();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::zone::localID(const label globalCellID) const
+{
+    const Map<label>& lm = lookupMap();
+
+    Map<label>::const_iterator lmIter = lm.find(globalCellID);
+
+    if (lmIter == lm.end())
+    {
+        return -1;
+    }
+    else
+    {
+        return lmIter();
+    }
+}
+
+
+void Foam::zone::clearAddressing()
+{
+    deleteDemandDrivenData(lookupMapPtr_);
+}
+
+
+bool Foam::zone::checkDefinition(const label maxSize, const bool report) const
+{
+    const labelList& addr = *this;
+
+    bool boundaryError = false;
+
+    forAll(addr, i)
+    {
+        if (addr[i] < 0 || addr[i] >= maxSize)
+        {
+            boundaryError = true;
+
+            if (report)
+            {
+                SeriousErrorIn
+                (
+                    "bool zone::checkDefinition("
+                    "const label maxSize, const bool report) const"
+                )   << "Zone " << name_
+                    << " contains invalid index label " << addr[i] << nl
+                    << "Valid index labels are 0.."
+                    << maxSize-1 << endl;
+            }
+        }
+    }
+
+    return boundaryError;
+}
+
+
+void Foam::zone::write(Ostream& os) const
+{
+    os  << nl << name_
+        << nl << static_cast<const labelList&>(*this);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const zone& z)
+{
+    z.write(os);
+    os.check("Ostream& operator<<(Ostream& f, const zone& z");
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
new file mode 100644
index 0000000000..fb5d2453e6
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 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 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::cellZone
+
+Description
+    Base class for zones
+
+SourceFiles
+    zone.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef zone_H
+#define zone_H
+
+#include "labelList.H"
+#include "typeInfo.H"
+#include "dictionary.H"
+#include "Map.H"
+#include "pointFieldFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+class zone;
+Ostream& operator<<(Ostream&, const zone&);
+
+/*---------------------------------------------------------------------------*\
+                           Class zone Declaration
+\*---------------------------------------------------------------------------*/
+
+class zone
+:
+    public labelList
+{
+
+protected:
+
+    // Protected data
+
+        //- Name of zone
+        word name_;
+
+        //- Index of zone
+        label index_;
+
+
+        // Demand-driven private data
+
+            //- Map of labels in zone for fast location lookup
+            mutable Map<label>* lookupMapPtr_;
+
+
+    // Protected Member Functions
+
+        //- Return a reference to the look-up map
+        const Map<label>& lookupMap() const;
+
+        //- Construct the look-up map
+        void calcLookupMap() const;
+
+        //- Disallow default bitwise copy construct
+        zone(const zone&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("zone");
+
+
+    // Constructors
+
+        //- Construct from components
+        zone
+        (
+            const word& name,
+            const labelList& addr,
+            const label index
+        );
+
+        //- Construct from components, transferring contents
+        zone
+        (
+            const word& name,
+            const Xfer<labelList>& addr,
+            const label index
+        );
+
+        //- Construct from dictionary
+        zone
+        (
+            const word& zoneType,
+            const word& name,
+            const dictionary&,
+            const label index
+        );
+
+        //- Construct given the original zone and resetting the
+        //  cell list and zone mesh information
+        zone
+        (
+            const zone&,
+            const labelList& addr,
+            const label index
+        );
+
+        //- Construct given the original zone, resetting the
+        //  cell list and zone mesh information
+        zone
+        (
+            const zone&,
+            const Xfer<labelList>& addr,
+            const label index
+        );
+
+
+    //- Destructor
+    virtual ~zone();
+
+
+    // Member Functions
+
+        //- Return name
+        const word& name() const
+        {
+            return name_;
+        }
+
+        //- Map storing the local index for every global index.  Used to find
+        //  the index of the item in the zone from the known global index. If
+        //  the item is not in the zone, returns -1
+        label localID(const label globalID) const;
+
+        //- Return the index of this zone in zone list
+        label index() const
+        {
+            return index_;
+        }
+
+        //- Clear addressing
+        virtual void clearAddressing();
+
+        //- Check zone definition. Return true if in error.
+        virtual bool checkDefinition(const bool report = false) const = 0;
+
+        //- Check zone definition with max size given. Return true if in error.
+        virtual bool checkDefinition
+        (
+            const label maxSize,
+            const bool report = false
+        ) const;
+
+        //- Correct patch after moving points
+        virtual void movePoints(const pointField&)
+        {}
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+        //- Write dictionary
+        virtual void writeDict(Ostream&) const = 0;
+
+
+    // I-O
+
+        //- Ostream Operator
+        friend Ostream& operator<<(Ostream&, const zone&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
index 35c748949b..9347146b01 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "DispersionModel.H"
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 fae1d15e6b..e9cf99d723 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cloudAbsorptionEmission.H"
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
index 6fc8c65acf..533adf4f05 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cloudScatter.H"
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index c7c79e96b3..ee684801a6 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -244,6 +244,7 @@ class PointEdgeWave
         //- Disallow default bitwise assignment
         void operator=(const PointEdgeWave&);
 
+
 public:
 
     // Static Functions
@@ -261,7 +262,6 @@ public:
         }
 
 
-
     // Constructors
 
         //- Construct from mesh, list of changed points with the Type
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWaveName.C b/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
index 5a834dac45..8c6a37e11f 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
+++ b/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "PointEdgeWave.H"
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.C b/src/meshTools/PointEdgeWave/pointEdgePoint.C
index e994774059..ad0fc3869c 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.C
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointEdgePoint.H"
@@ -32,8 +30,6 @@ Description
 
 Foam::point Foam::pointEdgePoint::greatPoint(GREAT, GREAT, GREAT);
 
-
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<
@@ -45,9 +41,11 @@ Foam::Ostream& Foam::operator<<
     return os << wDist.origin() << wDist.distSqr();
 }
 
+
 Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::pointEdgePoint& wDist)
 {
     return is >> wDist.origin_ >> wDist.distSqr_;
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.H b/src/meshTools/PointEdgeWave/pointEdgePoint.H
index 23a2eeb2c3..1e83edd1d9 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.H
@@ -45,7 +45,6 @@ SourceFiles
 #include "tensor.H"
 #include "pTraits.H"
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -69,6 +68,7 @@ class pointEdgePoint
         //- normal distance (squared) from point to origin
         scalar distSqr_;
 
+
     // Private Member Functions
 
         //- Evaluate distance to point. Update distSqr, origin from whomever
@@ -89,6 +89,7 @@ class pointEdgePoint
             const scalar tol
         );
 
+
 public:
 
     // Static data members
@@ -96,6 +97,7 @@ public:
         //- initial point far away.
         static point greatPoint;
 
+
     // Constructors
 
         //- Construct null
diff --git a/src/meshTools/PointEdgeWave/pointEdgePointI.H b/src/meshTools/PointEdgeWave/pointEdgePointI.H
index 0e46d2b1a5..72842946e2 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePointI.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePointI.H
@@ -46,7 +46,7 @@ inline bool Foam::pointEdgePoint::update
         origin_ = w2.origin();
 
         return true;
-    }        
+    }
 
     scalar diff = distSqr_ - dist2;
 
@@ -71,7 +71,7 @@ inline bool Foam::pointEdgePoint::update
     }
 }
 
-    
+
 // Update this with w2 (information on same point)
 inline bool Foam::pointEdgePoint::update
 (
@@ -86,7 +86,7 @@ inline bool Foam::pointEdgePoint::update
         origin_ = w2.origin();
 
         return true;
-    }        
+    }
 
     scalar diff = distSqr_ - w2.distSqr();
 
@@ -111,6 +111,7 @@ inline bool Foam::pointEdgePoint::update
     }
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Null constructor
@@ -124,7 +125,7 @@ inline Foam::pointEdgePoint::pointEdgePoint()
 // Construct from origin, distance
 inline Foam::pointEdgePoint::pointEdgePoint
 (
-    const point& origin, 
+    const point& origin,
     const scalar distSqr
 )
 :
@@ -229,14 +230,14 @@ inline bool Foam::pointEdgePoint::updatePoint
     const scalar tol
 )
 {
-    return 
+    return
         update
         (
             mesh.points()[pointI],
             edgeInfo,
             tol
         );
-    }    
+}
 
 
 // Update this with new information on same point
@@ -255,7 +256,7 @@ inline bool Foam::pointEdgePoint::updatePoint
             newPointInfo,
             tol
         );
-}    
+}
 
 
 // Update this with new information on same point. No extra information.
@@ -266,7 +267,7 @@ inline bool Foam::pointEdgePoint::updatePoint
 )
 {
     return update(newPointInfo, tol);
-}    
+}
 
 
 // Update this with information from connected point
@@ -292,7 +293,7 @@ inline bool Foam::pointEdgePoint::updateEdge
             pointInfo,
             tol
         );
-}    
+}
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index f54876c9c5..518fd5ae4a 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellClassification.H"
diff --git a/src/meshTools/cellClassification/cellInfo.C b/src/meshTools/cellClassification/cellInfo.C
index f7828fc292..92aff0b76d 100644
--- a/src/meshTools/cellClassification/cellInfo.C
+++ b/src/meshTools/cellClassification/cellInfo.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellInfo.H"
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index 8bc65470bc..d1d3a5638c 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellDistFuncs.H"
diff --git a/src/meshTools/cellDist/wallPoint/wallPoint.C b/src/meshTools/cellDist/wallPoint/wallPoint.C
index b25b64ba86..168a401f30 100644
--- a/src/meshTools/cellDist/wallPoint/wallPoint.C
+++ b/src/meshTools/cellDist/wallPoint/wallPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "wallPoint.H"
diff --git a/src/meshTools/cellDist/wallPoint/wallPointData.C b/src/meshTools/cellDist/wallPoint/wallPointData.C
index 3d4f343132..7143872d8b 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointData.C
+++ b/src/meshTools/cellDist/wallPoint/wallPointData.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "wallPointData.H"
diff --git a/src/meshTools/cellFeatures/cellFeatures.C b/src/meshTools/cellFeatures/cellFeatures.C
index 8d3170dca3..d023d66eb8 100644
--- a/src/meshTools/cellFeatures/cellFeatures.C
+++ b/src/meshTools/cellFeatures/cellFeatures.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellFeatures.H"
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index 57e450dfe8..b1c47e8f10 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Class calculates cell quality measures.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index 80232ffd8d..1c2dd701e8 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -111,10 +111,7 @@ Foam::coordinateSystem::coordinateSystem
 }
 
 
-Foam::coordinateSystem::coordinateSystem
-(
-    const dictionary& dict
-)
+Foam::coordinateSystem::coordinateSystem(const dictionary& dict)
 :
     name_(type()),
     note_(),
@@ -322,16 +319,17 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
         os.writeKeyword("note") << note_ << token::END_STATEMENT << nl;
     }
 
-    os.writeKeyword("origin") << origin_  << token::END_STATEMENT << nl;
-    os.writeKeyword("e1")     << e1()     << token::END_STATEMENT << nl;
-    os.writeKeyword("e3")     << e3()     << token::END_STATEMENT << nl;
+    os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
+    os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl;
+    os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl;
 
     if (subDict)
     {
-        os << decrIndent << indent << token::END_BLOCK << endl;
+        os  << decrIndent << indent << token::END_BLOCK << endl;
     }
 }
 
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 void Foam::coordinateSystem::operator=(const dictionary& rhs)
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinateSystems/coordinateSystem.H
index 5bff54e523..cfdecfd398 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.H
+++ b/src/meshTools/coordinateSystems/coordinateSystem.H
@@ -166,6 +166,7 @@ class coordinateSystem
         //- Global-to-Local transformation tensor
         tensor Rtr_;
 
+
 protected:
 
     // Protected Member Functions
@@ -194,6 +195,7 @@ protected:
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -249,6 +251,7 @@ public:
             return autoPtr<coordinateSystem>(new coordinateSystem(*this));
         }
 
+
     // Declare run-time constructor selection table
 
         declareRunTimeSelectionTable
@@ -276,6 +279,7 @@ public:
             (name, origin, cr)
         );
 
+
     // Selectors
 
         //- Select constructed from dictionary
@@ -297,160 +301,170 @@ public:
         //- Select constructed from Istream
         static autoPtr<coordinateSystem> New(Istream& is);
 
-    // Destructor
 
-        virtual ~coordinateSystem();
+    //- Destructor
+    virtual ~coordinateSystem();
 
 
     // Member Functions
 
-      // Access
+        // Access
 
-        //- Return name
-        const word& name() const
-        {
-            return name_;
-        }
+            //- Return name
+            const word& name() const
+            {
+                return name_;
+            }
 
-        //- Return non-constant access to the optional note
-        string& note()
-        {
-            return note_;
-        }
+            //- Return non-constant access to the optional note
+            string& note()
+            {
+                return note_;
+            }
 
-        //- Return the optional note
-        const string& note() const
-        {
-            return note_;
-        }
+            //- Return the optional note
+            const string& note() const
+            {
+                return note_;
+            }
 
-        //- Return origin
-        const point& origin() const
-        {
-            return origin_;
-        }
+            //- Return origin
+            const point& origin() const
+            {
+                return origin_;
+            }
 
-        //- Return coordinate rotation
-        const coordinateRotation& rotation() const
-        {
-            return R_;
-        }
+            //- Return coordinate rotation
+            const coordinateRotation& rotation() const
+            {
+                return R_;
+            }
 
-        //- Return local-to-global transformation tensor
-        const tensor& R() const
-        {
-            return R_;
-        }
+            //- Return local-to-global transformation tensor
+            const tensor& R() const
+            {
+                return R_;
+            }
 
-        //- Return local Cartesian x-axis
-        const vector& e1() const
-        {
-           return Rtr_.x();
-        }
+            //- Return local Cartesian x-axis
+            const vector& e1() const
+            {
+                return Rtr_.x();
+            }
 
-        //- Return local Cartesian y-axis
-        const vector& e2() const
-        {
-           return Rtr_.y();
-        }
+            //- Return local Cartesian y-axis
+            const vector& e2() const
+            {
+                return Rtr_.y();
+            }
 
-        //- Return local Cartesian z-axis
-        const vector& e3() const
-        {
-           return Rtr_.z();
-        }
+            //- Return local Cartesian z-axis
+            const vector& e3() const
+            {
+                return Rtr_.z();
+            }
 
-        //- Return axis (e3: local Cartesian z-axis)
-        // @deprecated method e3 is preferred
-        const vector& axis() const
-        {
-           return Rtr_.z();
-        }
+            //- Return axis (e3: local Cartesian z-axis)
+            // @deprecated method e3 is preferred
+            const vector& axis() const
+            {
+                return Rtr_.z();
+            }
 
-        //- Return direction (e1: local Cartesian x-axis)
-        // @deprecated method e1 is preferred
-        const vector& direction() const
-        {
-            return Rtr_.x();
-        }
+            //- Return direction (e1: local Cartesian x-axis)
+            // @deprecated method e1 is preferred
+            const vector& direction() const
+            {
+                return Rtr_.x();
+            }
 
-        //- Return as dictionary of entries
-        //  @param [in] ignoreType drop type (cartesian, cylindrical, etc)
-        //  when generating the dictionary
-        virtual dictionary dict(bool ignoreType=false) const;
+            //- Return as dictionary of entries
+            //  @param [in] ignoreType drop type (cartesian, cylindrical, etc)
+            //  when generating the dictionary
+            virtual dictionary dict(bool ignoreType=false) const;
 
 
-      // Edit
+        // Edit
 
-        //- Rename
-        virtual void rename(const word& newName)
-        {
-            name_ = newName;
-        }
+            //- Rename
+            virtual void rename(const word& newName)
+            {
+                name_ = newName;
+            }
 
-        //- Edit access to origin
-        point& origin()
-        {
-            return origin_;
-        }
+            //- Edit access to origin
+            point& origin()
+            {
+                return origin_;
+            }
 
-      // Write
 
-        //- Write
-        virtual void write(Ostream&) const;
+        // Write
 
-        //- Write dictionary
-        virtual void writeDict(Ostream&, bool subDict=true) const;
+            //- Write
+            virtual void write(Ostream&) const;
 
-      // Transformations
+            //- Write dictionary
+            virtual void writeDict(Ostream&, bool subDict=true) const;
 
-        //- Convert from position in local coordinate system to global Cartesian position
-        point globalPosition(const point& local) const
-        {
-            return localToGlobal(local, true);
-        }
 
-        //- Convert from position in local coordinate system to global Cartesian position
-        tmp<pointField> globalPosition(const pointField& local) const
-        {
-            return localToGlobal(local, true);
-        }
+        // Transformations
 
-        //- Convert from vector components in local coordinate system to global Cartesian vector
-        vector globalVector(const vector& local) const
-        {
-            return localToGlobal(local, false);
-        }
+            //- Convert from position in local coordinate system to global
+            //  Cartesian position
+            point globalPosition(const point& local) const
+            {
+                return localToGlobal(local, true);
+            }
 
-        //- Convert from vector components in local coordinate system to global Cartesian vector
-        tmp<vectorField> globalVector(const vectorField& local) const
-        {
-            return localToGlobal(local, false);
-        }
+            //- Convert from position in local coordinate system to global
+            //  Cartesian position
+            tmp<pointField> globalPosition(const pointField& local) const
+            {
+                return localToGlobal(local, true);
+            }
 
-        //- Convert from global Cartesian position to position in local coordinate system
-        point localPosition(const point& global) const
-        {
-            return globalToLocal(global, true);
-        }
+            //- Convert from vector components in local coordinate system to
+            //  global Cartesian vector
+            vector globalVector(const vector& local) const
+            {
+                return localToGlobal(local, false);
+            }
 
-        //- Convert from global Cartesian position to position in local coordinate system
-        tmp<pointField> localPosition(const pointField& global) const
-        {
-            return globalToLocal(global, true);
-        }
+            //- Convert from vector components in local coordinate system to
+            //  global Cartesian vector
+            tmp<vectorField> globalVector(const vectorField& local) const
+            {
+                return localToGlobal(local, false);
+            }
 
-        //- Convert from global Cartesian vector to components in local coordinate system
-        vector localVector(const vector& global) const
-        {
-            return globalToLocal(global, false);
-        }
+            //- Convert from global Cartesian position to position in local
+            //  coordinate system
+            point localPosition(const point& global) const
+            {
+                return globalToLocal(global, true);
+            }
 
-        //- Convert from global Cartesian vector to components in local coordinate system
-        tmp<vectorField> localVector(const vectorField& global) const
-        {
-            return globalToLocal(global, false);
-        }
+            //- Convert from global Cartesian position to position in local
+            //  coordinate system
+            tmp<pointField> localPosition(const pointField& global) const
+            {
+                return globalToLocal(global, true);
+            }
+
+            //- Convert from global Cartesian vector to components in local
+            //  coordinate system
+            vector localVector(const vector& global) const
+            {
+                return globalToLocal(global, false);
+            }
+
+            //- Convert from global Cartesian vector to components in local
+            //  coordinate system
+            tmp<vectorField> localVector(const vectorField& global) const
+            {
+                return globalToLocal(global, false);
+            }
 
 
     // Member Operators
@@ -467,6 +481,7 @@ public:
             const coordinateSystem&
         );
 
+
     // IOstream Operators
 
         friend Ostream& operator<<(Ostream&, const coordinateSystem&);
diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C
index 0c0752eded..25039ce0e1 100644
--- a/src/meshTools/coordinateSystems/coordinateSystemNew.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -121,4 +121,5 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
     return New(name, dict);
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H
index f9fdc012e0..cc1554768e 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.H
+++ b/src/meshTools/coordinateSystems/coordinateSystems.H
@@ -64,6 +64,7 @@ class coordinateSystems
         //- Disallow default bitwise assignment
         void operator=(const coordinateSystems&);
 
+
 public:
 
     //- Runtime type information
@@ -88,11 +89,13 @@ public:
             const Xfer<PtrList<coordinateSystem> >&
         );
 
+
     // Selectors
 
         //- Return previously registered or read construct from "constant"
         static const coordinateSystems& New(const objectRegistry&);
 
+
     // Member Functions
 
         //- Find and return index for a given keyword, returns -1 if not found
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.H b/src/meshTools/coordinateSystems/cylindricalCS.H
index e41f263a7e..0aa8da5746 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.H
+++ b/src/meshTools/coordinateSystems/cylindricalCS.H
@@ -86,6 +86,7 @@ protected:
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -142,7 +143,6 @@ public:
 
         //- Non-const access to inDegrees
         bool& inDegrees();
-
 };
 
 
diff --git a/src/meshTools/coordinateSystems/parabolicCylindricalCS.C b/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
index f2e83108ac..f80b75a724 100644
--- a/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
+++ b/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
@@ -159,6 +159,7 @@ Foam::vector Foam::parabolicCylindricalCS::globalToLocal
     return vector::zero;
 }
 
+
 Foam::tmp<Foam::vectorField> Foam::parabolicCylindricalCS::globalToLocal
 (
     const vectorField& global,
diff --git a/src/meshTools/coordinateSystems/parabolicCylindricalCS.H b/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
index d5fb5ccec3..5b389f070e 100644
--- a/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
+++ b/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
@@ -85,6 +85,7 @@ protected:
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -106,7 +107,6 @@ public:
 
         //- Construct from dictionary
         parabolicCylindricalCS(const word&, const dictionary&);
-
 };
 
 
diff --git a/src/meshTools/coordinateSystems/sphericalCS.H b/src/meshTools/coordinateSystems/sphericalCS.H
index 31d32bc9e4..d211ec798e 100644
--- a/src/meshTools/coordinateSystems/sphericalCS.H
+++ b/src/meshTools/coordinateSystems/sphericalCS.H
@@ -85,6 +85,7 @@ protected:
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -141,7 +142,6 @@ public:
 
         //- Non-const access to inDegrees
         bool& inDegrees();
-
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinateSystems/toroidalCS.C b/src/meshTools/coordinateSystems/toroidalCS.C
index f098a0d18f..189e0e4979 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.C
+++ b/src/meshTools/coordinateSystems/toroidalCS.C
@@ -158,8 +158,8 @@ void Foam::toroidalCS::writeDict(Ostream& os, bool subDict) const
 {
     if (subDict)
     {
-	os  << indent << name() << nl
-	    << indent << token::BEGIN_BLOCK << incrIndent << nl;
+        os  << indent << name() << nl
+            << indent << token::BEGIN_BLOCK << incrIndent << nl;
     }
 
     coordinateSystem::writeDict(os, false);
@@ -167,8 +167,9 @@ void Foam::toroidalCS::writeDict(Ostream& os, bool subDict) const
 
     if (subDict)
     {
-	os << decrIndent << indent << token::END_BLOCK << endl;
+        os << decrIndent << indent << token::END_BLOCK << endl;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/toroidalCS.H b/src/meshTools/coordinateSystems/toroidalCS.H
index c04498dda8..7631bd6fee 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.H
+++ b/src/meshTools/coordinateSystems/toroidalCS.H
@@ -46,7 +46,6 @@ SourceFiles
 namespace Foam
 {
 
-
 /*---------------------------------------------------------------------------*\
                         Class toroidalCS Declaration
 \*---------------------------------------------------------------------------*/
@@ -86,6 +85,7 @@ class toroidalCS
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -103,7 +103,6 @@ public:
             const scalar radius
         );
 
-
         //- Construct from dictionary
         toroidalCS(const word& name, const dictionary&);
 
diff --git a/src/meshTools/indexedOctree/indexedOctreeName.C b/src/meshTools/indexedOctree/indexedOctreeName.C
index bc98c21926..e658d328af 100644
--- a/src/meshTools/indexedOctree/indexedOctreeName.C
+++ b/src/meshTools/indexedOctree/indexedOctreeName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "indexedOctree.H"
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index 5303156518..1115ff13f9 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeDataPoint.H"
diff --git a/src/meshTools/octree/octree.C b/src/meshTools/octree/octree.C
index fa180fd9c1..fe841e93f1 100644
--- a/src/meshTools/octree/octree.C
+++ b/src/meshTools/octree/octree.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octree.H"
diff --git a/src/meshTools/octree/octreeDataCell.C b/src/meshTools/octree/octreeDataCell.C
index df9bd9ef12..2a3882f16e 100644
--- a/src/meshTools/octree/octreeDataCell.C
+++ b/src/meshTools/octree/octreeDataCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octreeDataCell.H"
diff --git a/src/meshTools/octree/octreeDataPointTreeLeaf.C b/src/meshTools/octree/octreeDataPointTreeLeaf.C
index 2e5cafc9b7..844bf498a8 100644
--- a/src/meshTools/octree/octreeDataPointTreeLeaf.C
+++ b/src/meshTools/octree/octreeDataPointTreeLeaf.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 //#include "octreeDataPointTreeLeaf.H"
diff --git a/src/meshTools/octree/octreeName.C b/src/meshTools/octree/octreeName.C
index 59b9f85f30..e09b142766 100644
--- a/src/meshTools/octree/octreeName.C
+++ b/src/meshTools/octree/octreeName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octree.H"
diff --git a/src/meshTools/octree/pointIndexHitIOList.C b/src/meshTools/octree/pointIndexHitIOList.C
index 79976abdcf..844f3b5eac 100644
--- a/src/meshTools/octree/pointIndexHitIOList.C
+++ b/src/meshTools/octree/pointIndexHitIOList.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    IOList of pointIndexHits
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointIndexHitIOList.H"
diff --git a/src/meshTools/octree/treeLeaf.C b/src/meshTools/octree/treeLeaf.C
index 3cff3dfd60..555edaa2b0 100644
--- a/src/meshTools/octree/treeLeaf.C
+++ b/src/meshTools/octree/treeLeaf.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeLeaf.H"
diff --git a/src/meshTools/octree/treeLeafName.C b/src/meshTools/octree/treeLeafName.C
index 414a2eb3a4..af0447bb23 100644
--- a/src/meshTools/octree/treeLeafName.C
+++ b/src/meshTools/octree/treeLeafName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeLeaf.H"
diff --git a/src/meshTools/octree/treeNode.C b/src/meshTools/octree/treeNode.C
index 3e503f13a0..e8e5ece609 100644
--- a/src/meshTools/octree/treeNode.C
+++ b/src/meshTools/octree/treeNode.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeNode.H"
diff --git a/src/meshTools/octree/treeNodeName.C b/src/meshTools/octree/treeNodeName.C
index 002c8d3063..3bd8cb58a0 100644
--- a/src/meshTools/octree/treeNodeName.C
+++ b/src/meshTools/octree/treeNodeName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeNode.H"
diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
index c53a881e82..5b454c41d2 100644
--- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
+++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "boxToCell.H"
diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
index 760d3541bc..222d14965f 100644
--- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
+++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellToCell.H"
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index 270e58f300..233a4cfd96 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceToCell.H"
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
index 1111a9f62b..aad4d776dc 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "fieldToCell.H"
diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
index 66e6734028..8ed5cc4684 100644
--- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
+++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "nearestToCell.H"
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index c05e527a33..323809ab5b 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointToCell.H"
diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
index 4a63a4d213..0f0421ef81 100644
--- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
+++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "rotatedBoxToCell.H"
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
index d5ca0772ae..c8f23570d4 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "shapeToCell.H"
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
index 97352fe606..eec8051b2f 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceToCell.H"
diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
index aaf7ebee0c..185b3eca2e 100644
--- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
+++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "boundaryToFace.H"
diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
index ba30ce0266..e0683883ab 100644
--- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
+++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "boxToFace.H"
diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
index 7e031664ad..69ee32b780 100644
--- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
+++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceToFace.H"
diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C b/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
index d9d922bcf4..c2c378a513 100644
--- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
+++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "labelToFace.H"
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
index f0c0925cd7..a310082f8a 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "normalToFace.H"
diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
index 000db639a9..0d76a37e4b 100644
--- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
+++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "patchToFace.H"
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index 6b063bab29..80f7be2838 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointToFace.H"
diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
index 7f68dcfafc..357bf44d29 100644
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "boxToPoint.H"
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index 4b83fcae80..1753f84848 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellToPoint.H"
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index 1ae3fb1f66..242d3bd566 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceToPoint.H"
diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
index a80ca084d6..48710a9de8 100644
--- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
+++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "labelToPoint.H"
diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
index 6ae1220845..bc28d066f4 100644
--- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
+++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointToPoint.H"
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
index 25601a2134..8bb787f3af 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceToPoint.H"
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C
index 63aff6fc83..7579ffffad 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "topoSetSource.H"
diff --git a/src/meshTools/surfaceSets/surfaceSets.C b/src/meshTools/surfaceSets/surfaceSets.C
index eb82bd44ff..93a8cb1ce5 100644
--- a/src/meshTools/surfaceSets/surfaceSets.C
+++ b/src/meshTools/surfaceSets/surfaceSets.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceSets.H"
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 3e007c880e..fdccecf617 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "booleanSurface.H"
@@ -1098,7 +1096,4 @@ Foam::booleanSurface::booleanSurface
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
index f1ce39aa6e..8c28eb36a3 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
@@ -82,6 +82,7 @@ class booleanSurface
             INSIDE
         };
 
+
     // Private data
 
         //- From new to old face + surface:
@@ -90,6 +91,7 @@ class booleanSurface
         //          face2 (e.g. face2I = -faceMap[]-1)
         labelList faceMap_;
 
+
     // Private Member Functions
 
         //- Check whether subset of faces (from markZones) reaches up to
@@ -151,6 +153,7 @@ class booleanSurface
             labelList& side
         );
 
+
 public:
 
     ClassName("booleanSurface");
@@ -175,7 +178,7 @@ public:
         booleanSurface();
 
         //- Construct from surfaces and face labels to keep.
-        //  Walks from provided seed faces without crossing intersection line 
+        //  Walks from provided seed faces without crossing intersection line
         //  to determine faces to keep.
         booleanSurface
         (
@@ -233,8 +236,6 @@ public:
             }
             return -faceMap_[faceI]-1;
         }
-
-
 };
 
 
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index 8d73f64d51..5caa377e05 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "edgeSurface.H"
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
index 73fe36815b..c1e8fd0491 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
@@ -117,7 +117,6 @@ private:
         void calcPointEdges();
 
 
-
 public:
 
     ClassName("edgeSurface");
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 9450865081..be758c07fd 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -205,7 +205,6 @@ void Foam::intersectedSurface::printVisit
 }
 
 
-
 // Check if the two vertices that f0 and f1 share are in the same order on
 // both faces.
 bool Foam::intersectedSurface::sameEdgeOrder
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index f3ee58ed0b..7ff2327196 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "edgeIntersections.H"
@@ -46,7 +44,7 @@ Description
 defineTypeNameAndDebug(Foam::edgeIntersections, 0);
 
 Foam::scalar Foam::edgeIntersections::alignedCos_ =
-    Foam::cos(89.0 * Foam::mathematicalConstant::pi/180.0);
+    Foam::cos(89.0*Foam::mathematicalConstant::pi/180.0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -721,13 +719,4 @@ Foam::label Foam::edgeIntersections::removeDegenerates
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
index e1ca17c441..45c54995cc 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
@@ -131,6 +131,7 @@ class edgeIntersections
             boolList& affectedEdges
         ) const;
 
+
 public:
 
     ClassName("edgeIntersections");
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 38ee335d33..33940989b8 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceIntersection.H"
@@ -201,7 +199,6 @@ bool Foam::surfaceIntersection::excludeEdgeHit
 //}
 
 
-
 void Foam::surfaceIntersection::storeIntersection
 (
     const bool isFirstSurf,
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
index 3f23e9e370..2b4304c694 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
@@ -76,7 +76,7 @@ class triSurface;
 class edgeIntersections;
 
 /*---------------------------------------------------------------------------*\
-                           Class surfaceIntersection Declaration
+                    Class surfaceIntersection Declaration
 \*---------------------------------------------------------------------------*/
 
 class surfaceIntersection
@@ -171,7 +171,7 @@ class surfaceIntersection
         //    const point& eStart,
         //    const point& eEnd
         //);
-    
+
 
         //- Debugging: Dump intersected edges to stream
         void writeIntersectedEdges
@@ -233,6 +233,7 @@ class surfaceIntersection
             List<DynamicList<label> >& surfEdgeCuts
         );
 
+
 public:
 
     ClassName("surfaceIntersection");
@@ -284,7 +285,6 @@ public:
         const labelListList& surf1EdgeCuts() const;
 
         const labelListList& surf2EdgeCuts() const;
-
 };
 
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 711ede3cd2..b2a5eec086 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceIntersection.H"
@@ -37,9 +35,6 @@ Description
 #include "octree.H"
 #include "meshTools.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::surfaceIntersection::writeOBJ(const point& pt, Ostream& os)
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
index aeec3a8daf..03aac83298 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceIntersection.H"
diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C b/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
index ef1cbbae6e..a2d826cb4b 100644
--- a/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
+++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octreeDataTriSurface.H"
diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
index e555cb2487..9582d6118d 100644
--- a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
+++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octreeDataTriSurfaceTreeLeaf.H"
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
index f4c165d83f..34a2307447 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "orientedSurface.H"
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 0e08c13c27..af3be4840a 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceFeatures.H"
@@ -1097,8 +1095,8 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
 
             // Step to next sample point using local distance.
             // Truncate to max 1/minSampleDist samples per feature edge.
-//            s += max(minSampleDist*eMag, sampleDist[e.start()]);
-s += 0.01*eMag;
+            // s += max(minSampleDist*eMag, sampleDist[e.start()]);
+            s += 0.01*eMag;
 
             if (s >= (1-minSampleDist)*eMag)
             {
diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
index e3d6758cff..3df84cb551 100644
--- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
+++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
@@ -27,15 +27,6 @@ License
 #include "surfaceLocation.H"
 #include "triSurface.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
@@ -72,12 +63,6 @@ Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 void Foam::surfaceLocation::write(Ostream& os, const triSurface& s) const
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index b89afdab63..b406fb0467 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "triSurfaceTools.H"
@@ -158,7 +156,7 @@ void Foam::triSurfaceTools::greenRefine
 }
 
 
-// Refine all triangles marked for refinement. 
+// Refine all triangles marked for refinement.
 Foam::triSurface Foam::triSurfaceTools::doRefine
 (
     const triSurface& surf,
@@ -358,7 +356,7 @@ void Foam::triSurfaceTools::protectNeighbours
         forAll(myFaces, myFaceI)
         {
             label faceI = myFaces[myFaceI];
- 
+
             if ((faceStatus[faceI] == ANYEDGE) || (faceStatus[faceI] >= 0))
             {
                 faceStatus[faceI] = NOEDGE;
@@ -392,10 +390,10 @@ Foam::labelHashSet Foam::triSurfaceTools::getCollapsedFaces
     {
         facesToBeCollapsed.insert(myFaces[myFaceI]);
     }
-    
+
     // From faces using v1 check if they share an edge with faces
     // using v2.
-    //  - share edge: are part of 'splay' tree and will collapse if edge    
+    //  - share edge: are part of 'splay' tree and will collapse if edge
     //    collapses
     const labelList& v1Faces = surf.pointFaces()[v1];
 
@@ -795,7 +793,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
 //
 //    // Now neighbours contains first layer of triangles outside of
 //    // collapseFaces
-//    // There should be 
+//    // There should be
 //    // -two if edgeI is a boundary edge
 //    // since the outside 'edge' of collapseFaces should
 //    // form a triangle and the face connected to edgeI is not inserted.
@@ -816,7 +814,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
 //        for (label j = i+1; j < neighbourList.size(); i++)
 //        {
 //            const labelList& faceJEdges = surf.faceEdges()[neighbourList[j]];
-//            
+//
 //            // Check if faceI and faceJ share an edge
 //            forAll(faceIEdges, fI)
 //            {
@@ -1194,7 +1192,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::visitFaces
                 nearest.setHit();
                 nearest.triangle() = triI;
                 break;
-            }            
+            }
             else
             {
                // Which edge is cut.
@@ -1913,7 +1911,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
 
     // Storage for new faces
     DynamicList<labelledTri> newFaces(0);
-    
+
     pointField newPoints(surf.localPoints());
     newPoints.setSize(surf.nPoints() + surf.nEdges());
     label newPointI = surf.nPoints();
@@ -2635,7 +2633,7 @@ Foam::triSurface Foam::triSurfaceTools::delaunay2D(const List<vector2D>& pts)
 //    // ~~~~~~~~~~~~~~~
 //
 //    label vertI = 0;
-//    for 
+//    for
 //    (
 //        Vertex_iterator it = T.vertices_begin();
 //        it != T.vertices_end();
@@ -2849,7 +2847,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::classify
 
     // Nearest point could be on point or edge. Retest.
     label index, elemType;
-    //bool inside = 
+    //bool inside =
     triPointRef(s[triI].tri(s.points())).classify
     (
         trianglePoint,
@@ -2865,7 +2863,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::classify
         nearest.setHit();
         nearest.setIndex(triI);
         nearest.elementType() = triPointRef::NONE;
-    }    
+    }
     else if (elemType == triPointRef::EDGE)
     {
         nearest.setMiss();
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index c5c0e3d4da..f98585b5de 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -22,11 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Class applies a two-dimensional correction to mesh motion point field.
-    The correction guarantees that the mesh does not get twisted during motion
-    and thus introduce a third dimension into a 2-D problem.
-
 \*---------------------------------------------------------------------------*/
 
 #include "twoDPointCorrector.H"
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 29ac4c2a3b..eef0ce53fc 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -120,6 +120,7 @@ protected:
         //- Prime-squared average
         static const word EXT_PRIME2MEAN;
 
+
     // Private data
 
         //- Name of this set of field averages.
@@ -144,6 +145,7 @@ protected:
         //  calculated and output
         List<fieldAverageItem> faItems_;
 
+
         // Lists of averages
 
             // Arithmetic mean fields
@@ -220,7 +222,7 @@ protected:
             ) const;
 
 
-        // IO
+        // I-O
 
             //- Write averages
             virtual void writeAverages() const;
@@ -272,8 +274,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~fieldAverage();
+    virtual ~fieldAverage();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index beffadd573..d2f544eedd 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -116,9 +116,8 @@ public:
         fieldAverageItem(const fieldAverageItem&);
 
 
-    // Destructor
-
-        ~fieldAverageItem();
+    //- Destructor
+    ~fieldAverageItem();
 
 
     // Member Functions
@@ -166,6 +165,7 @@ public:
 
         void operator=(const fieldAverageItem&);
 
+
     // Friend Operators
 
         friend bool operator==
@@ -190,6 +190,7 @@ public:
             return !(a == b);
         }
 
+
     // IOstream Operators
 
         friend Istream& operator>>(Istream&, fieldAverageItem&);
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index 8c8a3aaf47..36b88ecdfa 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -140,9 +140,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fieldMinMax();
+    //- Destructor
+    virtual ~fieldMinMax();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
index d9a948db08..beb7cec956 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -116,9 +116,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~forceCoeffs();
+    //- Destructor
+    virtual ~forceCoeffs();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 1ffc36cab0..6baace3863 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -61,7 +61,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
         const incompressible::RASModel& ras
             = obr_.lookupObject<incompressible::RASModel>("RASProperties");
 
-        return rhoRef_*ras.devReff();
+        return rho()*ras.devReff();
     }
     else if (obr_.foundObject<compressible::LESModel>("LESProperties"))
     {
@@ -75,7 +75,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
         const incompressible::LESModel& les
             = obr_.lookupObject<incompressible::LESModel>("LESProperties");
 
-        return rhoRef_*les.devBeff();
+        return rho()*les.devBeff();
     }
     else if (obr_.foundObject<basicThermo>("thermophysicalProperties"))
     {
@@ -97,7 +97,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
 
         const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);
 
-        return -rhoRef_*laminarT.nu()*dev(twoSymm(fvc::grad(U)));
+        return -rho()*laminarT.nu()*dev(twoSymm(fvc::grad(U)));
     }
     else if (obr_.foundObject<dictionary>("transportProperties"))
     {
@@ -108,7 +108,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
 
         const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);
 
-        return -rhoRef_*nu*dev(twoSymm(fvc::grad(U)));
+        return -rho()*nu*dev(twoSymm(fvc::grad(U)));
     }
     else
     {
@@ -121,6 +121,34 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
 }
 
 
+Foam::tmp<Foam::volScalarField> Foam::forces::rho() const
+{
+    if (rhoName_ == "rhoInf")
+    {
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+        return tmp<volScalarField>
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    "rho",
+                    mesh.time().timeName(),
+                    mesh
+                ),
+                mesh,
+                dimensionedScalar("rho", dimDensity, rhoRef_)
+            )
+        );
+    }
+    else
+    {
+        return(obr_.lookupObject<volScalarField>(rhoName_));
+    }
+}
+
+
 Foam::scalar Foam::forces::rho(const volScalarField& p) const
 {
     if (p.dimensions() == dimPressure)
@@ -129,6 +157,13 @@ Foam::scalar Foam::forces::rho(const volScalarField& p) const
     }
     else
     {
+        if (rhoName_ != "rhoInf")
+        {
+            FatalErrorIn("forces::rho(const volScalarField& p)")
+                << "Dynamic pressure is expected but kinematic is provided."
+                << exit(FatalError);
+        }
+
         return rhoRef_;
     }
 }
@@ -149,11 +184,12 @@ Foam::forces::forces
     active_(true),
     log_(false),
     patchSet_(),
-    pName_(""),
-    UName_(""),
+    pName_(word::null),
+    UName_(word::null),
+    rhoName_(word::null),
     directForceDensity_(false),
     fDName_(""),
-    rhoRef_(0),
+    rhoRef_(VGREAT),
     CofR_(vector::zero),
     forcesFilePtr_(NULL)
 {
@@ -175,6 +211,12 @@ Foam::forces::forces
     }
 
     read(dict);
+
+    if (active_)
+    {
+        // Create the forces file if not already created
+        makeFile();
+    }
 }
 
 
@@ -222,18 +264,31 @@ void Foam::forces::read(const dictionary& dict)
             // Optional entries U and p
             pName_ = dict.lookupOrDefault<word>("pName", "p");
             UName_ = dict.lookupOrDefault<word>("UName", "U");
+            rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
 
-            // Check whether UName and pName exists, if not deactivate forces
+            // Check whether UName, pName and rhoName exists,
+            // if not deactivate forces
             if
             (
                 !obr_.foundObject<volVectorField>(UName_)
              || !obr_.foundObject<volScalarField>(pName_)
+             || (
+                    rhoName_ != "rhoInf"
+                 && !obr_.foundObject<volScalarField>(rhoName_)
+                )
             )
             {
                 active_ = false;
+
                 WarningIn("void forces::read(const dictionary& dict)")
-                << "Could not find " << UName_ << " or "
-                    << pName_ << " in database." << nl
+                    << "Could not find " << UName_ << ", " << pName_;
+
+                if (rhoName_ != "rhoInf")
+                {
+                    Info<< " or " << rhoName_;
+                }
+
+                Info<< " in database." << nl
                     << "    De-activating forces."
                     << endl;
             }
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index 96651af97e..6fcdccc50e 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -132,6 +132,9 @@ protected:
             //- Name of velocity field
             word UName_;
 
+            //- Name of density field (optional)
+            word rhoName_;
+
             //- Is the force density being supplied directly?
             Switch directForceDensity_;
 
@@ -157,6 +160,9 @@ protected:
         //- Return the effective viscous stress (laminar + turbulent).
         tmp<volSymmTensorField> devRhoReff() const;
 
+        //- Return rho if rhoName is specified otherwise rhoRef
+        tmp<volScalarField> rho() const;
+
         //- Return rhoRef if the pressure field is dynamic, i.e. p/rho
         //  otherwise return 1
         scalar rho(const volScalarField& p) const;
@@ -190,9 +196,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~forces();
+    //- Destructor
+    virtual ~forces();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C
index 44f7948c80..ea429e9106 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.C
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.C
@@ -66,8 +66,8 @@ Foam::systemCall::~systemCall()
 void Foam::systemCall::read(const dictionary& dict)
 {
     dict.readIfPresent("executeCalls", executeCalls_);
-    dict.readIfPresent("endCalls",     endCalls_);
-    dict.readIfPresent("writeCalls",   writeCalls_);
+    dict.readIfPresent("endCalls", endCalls_);
+    dict.readIfPresent("writeCalls", writeCalls_);
 
     if (executeCalls_.empty() && endCalls_.empty() && writeCalls_.empty())
     {
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.H b/src/postProcessing/functionObjects/systemCall/systemCall.H
index 042ee0fc4d..a5039f6636 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~systemCall();
+    //- Destructor
+    virtual ~systemCall();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
index 3e6b33c0d3..87b9d393b0 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
@@ -98,9 +98,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~dsmcFields();
+    //- Destructor
+    virtual ~dsmcFields();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
index 71c4fd3516..8bf734ba14 100644
--- a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
+++ b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
@@ -106,9 +106,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~staticPressure();
+    //- Destructor
+    virtual ~staticPressure();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
index e048920899..36740cbf11 100644
--- a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
@@ -57,7 +57,7 @@ Foam::faceZonesIntegration::faceZonesIntegration
     log_(false),
     faceZonesSet_(),
     fItems_(),
-    faceZonesIntegrationFilePtr_(NULL)
+    filePtr_(NULL)
 {
     // Check if the available mesh is an fvMesh otherise deactivate
     if (!isA<fvMesh>(obr_))
@@ -104,7 +104,7 @@ void Foam::faceZonesIntegration::read(const dictionary& dict)
 void Foam::faceZonesIntegration::makeFile()
 {
     // Create the face Zone file if not already created
-    if (faceZonesIntegrationFilePtr_.empty())
+    if (filePtr_.empty())
     {
         if (debug)
         {
@@ -132,7 +132,7 @@ void Foam::faceZonesIntegration::makeFile()
             mkDir(faceZonesIntegrationDir);
 
             // Open new file at start up
-            faceZonesIntegrationFilePtr_.resize(fItems_.size());
+            filePtr_.resize(fItems_.size());
 
             forAll(fItems_, Ifields)
             {
@@ -143,7 +143,7 @@ void Foam::faceZonesIntegration::makeFile()
                         faceZonesIntegrationDir/fieldName
                     );
 
-                faceZonesIntegrationFilePtr_.insert(fieldName, sPtr);
+                filePtr_.insert(fieldName, sPtr);
             }
 
             // Add headers to output data
@@ -155,11 +155,11 @@ void Foam::faceZonesIntegration::makeFile()
 
 void Foam::faceZonesIntegration::writeFileHeader()
 {
-    forAllIter(HashPtrTable<OFstream>, faceZonesIntegrationFilePtr_, iter)
+    forAllIter(HashPtrTable<OFstream>, filePtr_, iter)
     {
         unsigned int w = IOstream::defaultPrecision() + 7;
 
-        OFstream& os = *faceZonesIntegrationFilePtr_[iter.key()];
+        OFstream& os = *filePtr_[iter.key()];
 
         os  << "#Time " << setw(w);
 
@@ -196,10 +196,10 @@ void Foam::faceZonesIntegration::write()
         {
             const word& fieldName = fItems_[fieldI];
 
-            const surfaceScalarField& fD =
+            const surfaceScalarField& sField =
                 obr_.lookupObject<surfaceScalarField>(fieldName);
 
-            const fvMesh& mesh = fD.mesh();
+            const fvMesh& mesh = sField.mesh();
 
             // 1. integrate over all face zones
 
@@ -211,11 +211,11 @@ void Foam::faceZonesIntegration::write()
 
                 label zoneID = mesh.faceZones().findZoneID(name);
 
-                const faceZone& fz = mesh.faceZones()[zoneID];
+                const faceZone& fZone = mesh.faceZones()[zoneID];
 
                 integralVals[setI] = returnReduce
                 (
-                    calcFaceZonesIntegral(fD, fz),
+                    calcIntegral(sField, fZone),
                     sumOp<scalar>()
                 );
             }
@@ -225,13 +225,9 @@ void Foam::faceZonesIntegration::write()
 
             // 2. Write only on master
 
-            if
-            (
-                Pstream::master()
-             && faceZonesIntegrationFilePtr_.found(fieldName)
-            )
+            if (Pstream::master() && filePtr_.found(fieldName))
             {
-                OFstream& os = *faceZonesIntegrationFilePtr_(fieldName);
+                OFstream& os = *filePtr_(fieldName);
 
                 os  << obr_.time().value();
 
@@ -242,7 +238,8 @@ void Foam::faceZonesIntegration::write()
                     if (log_)
                     {
                         Info<< "faceZonesIntegration output:" << nl
-                            << "    Integration" << integralVals[setI] << endl;
+                            << "    Integration[" << setI << "] "
+                            << integralVals[setI] << endl;
                     }
                 }
 
@@ -253,45 +250,47 @@ void Foam::faceZonesIntegration::write()
 }
 
 
-Foam::scalar Foam::faceZonesIntegration::calcFaceZonesIntegral
+Foam::scalar Foam::faceZonesIntegration::calcIntegral
 (
-    const surfaceScalarField& fD,
-    const faceZone& fz
+    const surfaceScalarField& sField,
+    const faceZone& fZone
 ) const
 {
-    scalar dm = 0.0;
-    const fvMesh& mesh = fD.mesh();
+    scalar sum = 0.0;
+    const fvMesh& mesh = sField.mesh();
 
-    forAll (fz, i)
+    forAll (fZone, i)
     {
-        label faceI = fz[i];
+        label faceI = fZone[i];
 
         if (mesh.isInternalFace(faceI))
         {
-            if (fz.flipMap()[i])
+            if (fZone.flipMap()[i])
             {
-                dm -= fD[faceI];
+                sum -= sField[faceI];
             }
             else
             {
-                dm += fD[faceI];
+                sum += sField[faceI];
             }
         }
         else
         {
             label patchI = mesh.boundaryMesh().whichPatch(faceI);
             const polyPatch& pp = mesh.boundaryMesh()[patchI];
+            const fvsPatchScalarField& bField = sField.boundaryField()[patchI];
             if (isA<processorPolyPatch>(pp))
             {
                 if (refCast<const processorPolyPatch>(pp).owner())
                 {
-                    if (fz.flipMap()[i])
+                    label patchFaceI = pp.whichFace(faceI);
+                    if (fZone.flipMap()[i])
                     {
-                        dm -= fD.boundaryField()[patchI][pp.whichFace(faceI)];
+                        sum -= bField[patchFaceI];
                     }
                     else
                     {
-                        dm += fD.boundaryField()[patchI][pp.whichFace(faceI)];
+                        sum += bField[patchFaceI];
                     }
                 }
             }
@@ -300,32 +299,32 @@ Foam::scalar Foam::faceZonesIntegration::calcFaceZonesIntegral
                 label patchFaceI = faceI - pp.start();
                 if (patchFaceI < pp.size()/2)
                 {
-                    if (fz.flipMap()[i])
+                    if (fZone.flipMap()[i])
                     {
-                        dm -= fD.boundaryField()[patchI][patchFaceI];
+                        sum -= bField[patchFaceI];
                     }
                     else
                     {
-                        dm += fD.boundaryField()[patchI][patchFaceI];
+                        sum += bField[patchFaceI];
                     }
                 }
             }
             else if (!isA<emptyPolyPatch>(pp))
             {
                 label patchFaceI = faceI - pp.start();
-                if (fz.flipMap()[i])
+                if (fZone.flipMap()[i])
                 {
-                    dm -= fD.boundaryField()[patchI][patchFaceI];
+                    sum -= bField[patchFaceI];
                 }
                 else
                 {
-                    dm += fD.boundaryField()[patchI][patchFaceI];
+                    sum += bField[patchFaceI];
                 }
             }
         }
     }
 
-    return dm;
+    return sum;
 }
 
 
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
index 87659ac340..c2f3ad9d4b 100644
--- a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
@@ -57,7 +57,7 @@ class dictionary;
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                           Class faceZonesIntegration Declaration
+                    Class faceZonesIntegration Declaration
 \*---------------------------------------------------------------------------*/
 
 class faceZonesIntegration
@@ -65,17 +65,18 @@ class faceZonesIntegration
 
 protected:
 
-    // Private data
+    // Protected data
 
         //- Name of this set of face zone integration,
-        //  Also used as the name of the probes directory.
+        //  Also used as the name of the output directory.
         word name_;
 
         const objectRegistry& obr_;
 
+
         // Read from dictionary
 
-            //- on/off switch
+            //- On/off switch
             bool active_;
 
             //- Switch to send output to Info as well as to file
@@ -89,19 +90,19 @@ protected:
 
 
         //- Current open files
-        HashPtrTable<OFstream> faceZonesIntegrationFilePtr_;
+        HashPtrTable<OFstream> filePtr_;
 
 
 
-    // Private Member Functions
+    // Protected Member Functions
 
         //- If the integration file has not been created create it
         void makeFile();
 
-        scalar calcFaceZonesIntegral
+        scalar calcIntegral
         (
-            const surfaceScalarField& fD,
-            const faceZone& fz
+            const surfaceScalarField& sField,
+            const faceZone& fZone
         ) const;
 
 
@@ -134,9 +135,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~faceZonesIntegration();
+    //- Destructor
+    virtual ~faceZonesIntegration();
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
index 46eeed365c..ad6d28ea23 100644
--- a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Selection function for 'basic' density-based thermodynamics
-
 \*---------------------------------------------------------------------------*/
 
 #include "basicRhoThermo.H"
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
index cd7c7ab616..9677a4bfc7 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "liquidMixture.H"
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
index d1b0ac2610..6ceae42bcd 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 -------------------------------------------------------------------------------
 */
 
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
index f398523460..1b327b07c4 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "iC3H8O.H"
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
index ab79adedd7..455d032634 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Perfect gas equation of state.
-
 \*---------------------------------------------------------------------------*/
 
 #include "perfectGas.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
index 58e28a2bc1..7c896accb9 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    
 \*---------------------------------------------------------------------------*/
 
 #include "IrreversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
index fc639515bb..6cc28a7c70 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    
 \*---------------------------------------------------------------------------*/
 
 #include "NonEquilibriumReversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index ad5c2e1185..30124a5819 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -22,10 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Simple extension of ReactionThermo to handle Reaction kinetics in addition
-    to the equilibrium thermodynamics already handled.
-
 \*---------------------------------------------------------------------------*/
 
 #include "Reaction.H"
@@ -207,7 +203,7 @@ Reaction<ReactionThermo>::Reaction
     setLRhs(is);
     setThermo(thermoDatabase);
 }
-    
+
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
index 9bdfae4388..a11368caaf 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    
 \*---------------------------------------------------------------------------*/
 
 #include "ReversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
index 3756f2e365..2a67e3143d 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "reactionTypes.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
index 1789fe80fc..637581bb1f 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "makeReactionThermo.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
index 1a054b1124..bc9fc47732 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "reactionTypes.H"
diff --git a/src/thermophysicalModels/specie/speciesTable/speciesTable.C b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
index acb4f0a72c..b2cb515e37 100644
--- a/src/thermophysicalModels/specie/speciesTable/speciesTable.C
+++ b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "speciesTable.H"
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index cebe3765b6..8735480807 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -22,10 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Constant properties Transport package.  Templated ito a given
-    thermodynamics package (needed for thermal conductivity).
-
 \*---------------------------------------------------------------------------*/
 
 #include "constTransport.H"
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
index df5fb2754b..d4afb4df2e 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
@@ -22,14 +22,9 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Basic species Transport type based on the use of a fitting
     function for nu.  All other properties are derived from
     this primitive function.
 
-    The nu function must be provided by the derived type,
-    e.g. SutherlandTransport.
-
 \*---------------------------------------------------------------------------*/
 
 #include "speciesTransport.H"
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
index 885e4bb2fd..44d6f34b43 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
@@ -38,7 +38,6 @@ SourceFiles
     speciesTransportI.H
     speciesTransport.C
 
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef speciesTransport_H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
index f936042653..9bae498a49 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "NSRDSfunc4.H"
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
index 4f21ba6472..28b8c89101 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -70,7 +70,7 @@ class alphatWallFunctionFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("compressible::alphatWallFunction");
+    TypeName("alphatWallFunction");
 
 
     // Constructors
@@ -147,7 +147,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index 7d1954f982..4db7a49d65 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -147,7 +147,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index e7405e9146..ef9f2747f1 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -147,7 +147,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
index dde33b47e9..145d82f010 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
@@ -32,13 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            compressible::alphaSgsJayatillekeWallFunction;
+        type            alphaSgsJayatillekeWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            compressible::alphaSgsJayatillekeWallFunction;
+        type            alphaSgsJayatillekeWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
index 2f642fa18a..05bf1b5329 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
@@ -32,13 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            compressible::muSgsWallFunction;
+        type            muSgsUSpaldingWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            compressible::muSgsWallFunction;
+        type            muSgsUSpaldingWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
index eb4a4e461d..313dcceba1 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
index bc78e8f836..b536298afb 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
@@ -32,13 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            compressible::alphaSgsJayatillekeWallFunction;
+        type            alphaSgsJayatillekeWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            compressible::alphaSgsJayatillekeWallFunction;
+        type            alphaSgsJayatillekeWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
index 8f65a48265..7a45526d54 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
@@ -32,13 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            compressible::muSgsWallFunction;
+        type            muSgsUSpaldingWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            compressible::muSgsWallFunction;
+        type            muSgsUSpaldingWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
index 7a35f54079..19a09dd2c7 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
index 46c50d5bee..5eceb3da78 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/alphat b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
index 3c40b89e22..7d6c338d7c 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/alphat
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
@@ -23,19 +23,19 @@ boundaryField
 {
     piston
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     liner
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     cylinderHead
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
index caf0ef5da9..28bd4effe6 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     wall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
index e168ce375e..9c62cf78f3 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
@@ -23,13 +23,13 @@ boundaryField
 {
     movingWall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
index caf0ef5da9..28bd4effe6 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     wall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
new file mode 100644
index 0000000000..6b66930cda
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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    "0";
+    object      alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    INLE1
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    OUTL2
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    SYMP3
+    {
+        type            empty;
+    }
+    WALL10
+    {
+        type            alphatWallFunction;
+        Prt             0.85;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
index 8f09366b8f..9a65ce7eec 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,29 +21,31 @@ internalField   uniform 25000;
 
 boundaryField
 {
-    INLE1           
+    INLE1
     {
         type            inletOutlet;
         inletValue      uniform 25000;
         value           uniform 25000;
     }
-
-    OUTL2           
+    OUTL2
     {
         type            inletOutlet;
         inletValue      uniform 25000;
         value           uniform 25000;
     }
-
-    SYMP3           
+    SYMP3
     {
         type            empty;
     }
-
-    WALL10          
+    WALL10
     {
-        type            zeroGradient;
+        type            compressible::epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 25000;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
index 93c09e9044..552f881f4e 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,29 +21,28 @@ internalField   uniform 1000;
 
 boundaryField
 {
-    INLE1           
+    INLE1
     {
         type            inletOutlet;
         inletValue      uniform 1000;
         value           uniform 1000;
     }
-
-    OUTL2           
+    OUTL2
     {
         type            inletOutlet;
         inletValue      uniform 1000;
         value           uniform 1000;
     }
-
-    SYMP3           
+    SYMP3
     {
         type            empty;
     }
-
-    WALL10          
+    WALL10
     {
-        type            zeroGradient;
+        type            compressible::kqRWallFunction;
+        value           uniform 1000;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut
new file mode 100644
index 0000000000..d10d508706
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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    "0";
+    object      mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    INLE1
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    OUTL2
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    SYMP3
+    {
+        type            empty;
+    }
+    WALL10
+    {
+        type            mutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
index b15d0272a6..59a99aa3f0 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/alphat b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
index c361d50f31..cdb024c97e 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/alphat
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
@@ -43,7 +43,7 @@ boundaryField
     }
     prismWall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     defaultFaces
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
index 88f7153e5c..fcaa8d0c1d 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
@@ -23,17 +23,17 @@ boundaryField
 {
     floor
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
index 5addae2ddf..4b700cf1b7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
@@ -23,25 +23,25 @@ boundaryField
 {
     frontAndBack
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     topAndBottom
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     hot
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     cold
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
index 2557d81789..1625699677 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
@@ -23,19 +23,19 @@ boundaryField
 {
     floor
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     ceiling
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
index 00d1a6abb3..a7132ce19d 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
@@ -23,22 +23,22 @@ boundaryField
 {
     box
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     floor
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
index 51389bfd04..970624b7b9 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
@@ -23,25 +23,25 @@ boundaryField
 {
     box
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     floor
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     ceiling
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy
new file mode 100644
index 0000000000..39d86bc30f
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy
@@ -0,0 +1,80 @@
+  0.000625      0.001
+  0.001875      0.001
+  0.003125      0.001
+  0.004375      0.001
+  0.005625      0.001
+  0.006875      0.001
+  0.008125      0.001
+  0.009375      0.001
+  0.010625      0.001
+  0.011875      0.001
+  0.013125      0.001
+  0.014375      0.001
+  0.015625      0.001
+  0.016875      0.001
+  0.018125      0.001
+  0.019375      0.001
+  0.020625      0.001
+  0.021875      0.001
+  0.023125      0.001
+  0.024375      0.001
+  0.025625      0.001
+  0.026875      0.001
+  0.028125      0.001
+  0.029375      0.001
+  0.030625      0.001
+  0.031875      0.001
+  0.033125      0.001
+  0.034375      0.001
+  0.035625      0.001
+  0.036875      0.001
+  0.038125      0.001
+  0.039375      0.001
+  0.040625      0.001
+  0.041875      0.001
+  0.043125      0.001
+  0.044375      0.001
+  0.045625      0.001
+  0.046875      0.001
+  0.048125      0.001
+  0.049375      0.001
+  0.050625      0.001
+  0.051875      0.001
+  0.053125      0.001
+  0.054375      0.001
+  0.055625      0.001
+  0.056875      0.001
+  0.058125      0.001
+  0.059375      0.001
+  0.060625      0.001
+  0.061875      0.001
+  0.063125      0.001
+  0.064375      0.001
+  0.065625      0.001
+  0.066875      0.001
+  0.068125      0.001
+  0.069375      0.001
+  0.070625      0.001
+  0.071875      0.001
+  0.073125      0.001
+  0.074375      0.001
+  0.075625      0.001
+  0.076875      0.001
+  0.078125      0.001
+  0.079375      0.001
+  0.080625      0.001
+  0.081875      0.001
+  0.083125      0.001
+  0.084375      0.001
+  0.085625      0.001
+  0.086875      0.001
+  0.088125      0.001
+  0.089375      0.001
+  0.090625      0.001
+  0.091875      0.001
+  0.093125      0.001
+  0.094375      0.001
+  0.095625      0.001
+  0.096875      0.001
+  0.098125      0.001
+  0.099375      0.001
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
index f4e64506c6..acf7b7754f 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
@@ -19,7 +19,7 @@ Ubar            Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-8;
+nu              nu [ 0 2 -1 0 0 0 0 ] 1e-3;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
deleted file mode 100644
index eeb06bac7a..0000000000
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
+++ /dev/null
@@ -1,174 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-turbulenceModel SpalartAllmaras;
-
-turbulence      on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.0845;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.42;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.68;
-    alphak          alphaK [ 0 0 0 0 0 0 0 ] 1.39;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 1.39;
-    eta0            eta0 [ 0 0 0 0 0 0 0 ] 4.38;
-    beta            beta [ 0 0 0 0 0 0 0 ] 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76932;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-LienCubicKECoeffs
-{
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-QZetaCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaZeta       alphaZeta [ 0 0 0 0 0 0 0 ] 0.76923;
-    anisotropic     no;
-}
-
-LaunderSharmaKECoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-    Am              Am [ 0 0 0 0 0 0 0 ] 0.016;
-    Aepsilon        Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
-    Amu             Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    Am              Am [ 0 0 0 0 0 0 0 ] 0.016;
-    Aepsilon        Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
-    Amu             Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LRRCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    Clrr1           Clrr1 [ 0 0 0 0 0 0 0 ] 1.8;
-    Clrr2           Clrr2 [ 0 0 0 0 0 0 0 ] 0.6;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    Cs              Cs [ 0 0 0 0 0 0 0 ] 0.25;
-    Ceps            Ceps [ 0 0 0 0 0 0 0 ] 0.15;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    Clg1            Clg1 [ 0 0 0 0 0 0 0 ] 1.8;
-    Clg2            Clg2 [ 0 0 0 0 0 0 0 ] 0.6;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    C1Ref           C1Ref [ 0 0 0 0 0 0 0 ] 0.5;
-    C2Ref           C2Ref [ 0 0 0 0 0 0 0 ] 0.3;
-    Cs              Cs [ 0 0 0 0 0 0 0 ] 0.25;
-    Ceps            Ceps [ 0 0 0 0 0 0 0 ] 0.15;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    alphaR          alphaR [ 0 0 0 0 0 0 0 ] 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
-    alphaNut        alphaNut [ 0 0 0 0 0 0 0 ] 1.5;
-    Cb1             Cb1 [ 0 0 0 0 0 0 0 ] 0.1355;
-    Cb2             Cb2 [ 0 0 0 0 0 0 0 ] 0.622;
-    Cw2             Cw2 [ 0 0 0 0 0 0 0 ] 0.3;
-    Cw3             Cw3 [ 0 0 0 0 0 0 0 ] 2;
-    Cv1             Cv1 [ 0 0 0 0 0 0 0 ] 7.1;
-    Cv2             Cv2 [ 0 0 0 0 0 0 0 ] 5;
-}
-
-wallFunctionCoeffs
-{
-    kappa           kappa [ 0 0 0 0 0 0 0 ] 0.4187;
-    E               E [ 0 0 0 0 0 0 0 ] 9;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
deleted file mode 100644
index eeb06bac7a..0000000000
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
+++ /dev/null
@@ -1,174 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-turbulenceModel SpalartAllmaras;
-
-turbulence      on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.0845;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.42;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.68;
-    alphak          alphaK [ 0 0 0 0 0 0 0 ] 1.39;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 1.39;
-    eta0            eta0 [ 0 0 0 0 0 0 0 ] 4.38;
-    beta            beta [ 0 0 0 0 0 0 0 ] 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76932;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-LienCubicKECoeffs
-{
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-QZetaCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaZeta       alphaZeta [ 0 0 0 0 0 0 0 ] 0.76923;
-    anisotropic     no;
-}
-
-LaunderSharmaKECoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-    Am              Am [ 0 0 0 0 0 0 0 ] 0.016;
-    Aepsilon        Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
-    Amu             Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    Am              Am [ 0 0 0 0 0 0 0 ] 0.016;
-    Aepsilon        Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
-    Amu             Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LRRCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    Clrr1           Clrr1 [ 0 0 0 0 0 0 0 ] 1.8;
-    Clrr2           Clrr2 [ 0 0 0 0 0 0 0 ] 0.6;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    Cs              Cs [ 0 0 0 0 0 0 0 ] 0.25;
-    Ceps            Ceps [ 0 0 0 0 0 0 0 ] 0.15;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    Clg1            Clg1 [ 0 0 0 0 0 0 0 ] 1.8;
-    Clg2            Clg2 [ 0 0 0 0 0 0 0 ] 0.6;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    C1Ref           C1Ref [ 0 0 0 0 0 0 0 ] 0.5;
-    C2Ref           C2Ref [ 0 0 0 0 0 0 0 ] 0.3;
-    Cs              Cs [ 0 0 0 0 0 0 0 ] 0.25;
-    Ceps            Ceps [ 0 0 0 0 0 0 0 ] 0.15;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    alphaR          alphaR [ 0 0 0 0 0 0 0 ] 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
-    alphaNut        alphaNut [ 0 0 0 0 0 0 0 ] 1.5;
-    Cb1             Cb1 [ 0 0 0 0 0 0 0 ] 0.1355;
-    Cb2             Cb2 [ 0 0 0 0 0 0 0 ] 0.622;
-    Cw2             Cw2 [ 0 0 0 0 0 0 0 ] 0.3;
-    Cw3             Cw3 [ 0 0 0 0 0 0 0 ] 2;
-    Cv1             Cv1 [ 0 0 0 0 0 0 0 ] 7.1;
-    Cv2             Cv2 [ 0 0 0 0 0 0 0 ] 5;
-}
-
-wallFunctionCoeffs
-{
-    kappa           kappa [ 0 0 0 0 0 0 0 ] 0.4187;
-    E               E [ 0 0 0 0 0 0 0 ] 9;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
index 6321b9c336..b29e4e70c0 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     bottom
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     symmetry
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
index 458a72388d..c87862d4ae 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
index 458a72388d..c87862d4ae 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
index 6321b9c336..b29e4e70c0 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     bottom
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     symmetry
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
new file mode 100755
index 0000000000..411704d783
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication $application