diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H
index be23570078..8159ee73aa 100644
--- a/applications/solvers/combustion/fireFoam/createFields.H
+++ b/applications/solvers/combustion/fireFoam/createFields.H
@@ -146,5 +146,3 @@
     (
         additionalControlsDict.lookup("solvePrimaryRegion")
     );
-
-    IObasicSourceList sources(mesh);
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
index d746d63b8f..46954c120c 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::cellSplitter, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(cellSplitter, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
index 27cc47f823..18109761a5 100644
--- a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
+++ b/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
@@ -466,8 +466,8 @@ int main(int argc, char *argv[])
     labelListList pointPoints;
     autoPtr<mapDistribute> meshDistributor = buildMap(mesh, pointPoints);
 
-    triadField alignments = buildAlignmentField(mesh);
-    pointField points = buildPointField(mesh);
+    triadField alignments(buildAlignmentField(mesh));
+    pointField points(buildPointField(mesh));
 
     mesh.printInfo(Info);
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index 124f4b39dc..fcc5d8c2ba 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
@@ -168,7 +168,8 @@ public:
         );
 
         //- Inserts points into the triangulation if the point is within
-        //  the circumsphere of another cell
+        //  the circumsphere of another cell. Returns HashSet of failed
+        //  point insertions
         template<class PointIterator>
         labelPairHashSet rangeInsertReferredWithInfo
         (
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
index 4a072aa593..03ee51a4f6 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
@@ -24,7 +24,7 @@ EXE_INC = \
     -IPrintTable \
     -I../vectorTools
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lmeshTools \
     -ledgeMesh \
     -lfileFormats \
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
index a6b47f4ab0..7238f270bb 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
@@ -585,7 +585,7 @@ Foam::label Foam::cellShapeControl::refineMesh
     const autoPtr<backgroundMeshDecomposition>& decomposition
 )
 {
-    const pointField cellCentres = shapeControlMesh_.cellCentres();
+    const pointField cellCentres(shapeControlMesh_.cellCentres());
 
     Info<< "    Created cell centres" << endl;
 
@@ -682,7 +682,7 @@ Foam::label Foam::cellShapeControl::refineMesh
                 )
             );
             verts.last().targetCellSize() = lastCellSize;
-            verts.last().alignment() = tensor::I;
+            verts.last().alignment() = triad::unset;
         }
     }
 
@@ -704,8 +704,8 @@ void Foam::cellShapeControl::smoothMesh()
         pointPoints
     );
 
-    triadField alignments = buildAlignmentField(shapeControlMesh_);
-    pointField points = buildPointField(shapeControlMesh_);
+    triadField alignments(buildAlignmentField(shapeControlMesh_));
+    pointField points(buildPointField(shapeControlMesh_));
     // Setup the sizes and alignments on each point
     triadField fixedAlignments(shapeControlMesh_.vertexCount(), triad::unset);
 
@@ -721,12 +721,7 @@ void Foam::cellShapeControl::smoothMesh()
         {
             const tensor& alignment = vit->alignment();
 
-            fixedAlignments[vit->index()] = triad
-            (
-                alignment.x(),
-                alignment.y(),
-                alignment.z()
-            );
+            fixedAlignments[vit->index()] = alignment;
         }
     }
 
@@ -881,12 +876,7 @@ void Foam::cellShapeControl::smoothMesh()
     {
         if (vit->real())
         {
-            vit->alignment() = tensor
-            (
-                alignments[vit->index()].x(),
-                alignments[vit->index()].y(),
-                alignments[vit->index()].z()
-            );
+            vit->alignment() = alignments[vit->index()];
         }
     }
 
@@ -911,9 +901,7 @@ void Foam::cellShapeControl::smoothMesh()
     {
         if (vit->referred())
         {
-            const triad& t = alignments[referredPoints[referredI++]];
-
-            vit->alignment() = tensor(t.x(), t.y(), t.z());
+            vit->alignment() = alignments[referredPoints[referredI++]];
         }
     }
 }
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index bdcbf5a885..ae57bbb087 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -684,7 +684,7 @@ void Foam::cellShapeControlMesh::insertBoundingPoints(const boundBox& bb)
     boundBox bbInflate = bb;
     bbInflate.inflate(10);
 
-    pointField pts = bbInflate.points();
+    pointField pts(bbInflate.points());
 
     forAll(pts, pI)
     {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
index e8f09cf5f1..4a73b4a7c5 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
@@ -263,8 +263,6 @@ Foam::triSurfaceScalarField Foam::automatic::load()
 
     surfaceCellSize.write();
 
-    debug = 1;
-
     if (debug)
     {
         faceList faces(surface_.size());
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 92ee53c1f2..5eb2c01f5f 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -30,6 +30,7 @@ License
 #include "indexedCellChecks.H"
 
 #include "CGAL/Exact_predicates_exact_constructions_kernel.h"
+#include "CGAL/Gmpq.h"
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -211,9 +212,8 @@ void Foam::conformalVoronoiMesh::checkDuals()
 
     typedef CGAL::Exact_predicates_exact_constructions_kernel       EK2;
     typedef CGAL::Regular_triangulation_euclidean_traits_3<EK2>     EK;
-    typedef CGAL::Cartesian_converter<typename baseK::Kernel, EK2>  To_exact;
-    typedef CGAL::Cartesian_converter<EK2, typename baseK::Kernel>
-        Back_from_exact;
+    typedef CGAL::Cartesian_converter<baseK::Kernel, EK2>  To_exact;
+    typedef CGAL::Cartesian_converter<EK2, baseK::Kernel>  Back_from_exact;
 
 //    PackedBoolList bPoints(number_of_finite_cells());
 
@@ -391,13 +391,13 @@ void Foam::conformalVoronoiMesh::checkDuals()
                         CGAL::Gmpq z(CGAL::to_double(masterPoint.z()));
 
                         std::cout<< "master = " << x << " " << y << " " << z
-                                 << endl;
+                                 << std::endl;
 
                         CGAL::Gmpq xs(CGAL::to_double(closestPoint.x()));
                         CGAL::Gmpq ys(CGAL::to_double(closestPoint.y()));
                         CGAL::Gmpq zs(CGAL::to_double(closestPoint.z()));
                         std::cout<< "slave  = " << xs << " " << ys << " " << zs
-                                 << endl;
+                                 << std::endl;
                     }
                 }
                 else
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
index 02d37c1b05..ea9e4db6d4 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
@@ -142,7 +142,7 @@ inline int CGAL::indexedVertex<Gt, Vb>::index() const
 
 
 template<class Gt, class Vb>
-inline typename CGAL::indexedVertex<Gt, Vb>::vertexType&
+inline Foam::indexedVertexEnum::vertexType&
 CGAL::indexedVertex<Gt, Vb>::type()
 {
     return type_;
@@ -150,7 +150,7 @@ CGAL::indexedVertex<Gt, Vb>::type()
 
 
 template<class Gt, class Vb>
-inline typename CGAL::indexedVertex<Gt, Vb>::vertexType
+inline Foam::indexedVertexEnum::vertexType
 CGAL::indexedVertex<Gt, Vb>::type() const
 {
     return type_;
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMesh.C b/applications/utilities/mesh/generation/cvMesh/cvMesh.C
index cf21964271..e9487b909b 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/cvMesh.C
@@ -64,14 +64,22 @@ int main(int argc, char *argv[])
         )
     );
 
-    conformalVoronoiMesh::debug = true;
-
-    conformalVoronoiMesh mesh(runTime, cvMeshDict);
-
 
     if (checkGeometry)
     {
-        const searchableSurfaces& allGeometry = mesh.allGeometry();
+        const searchableSurfaces allGeometry
+        (
+            IOobject
+            (
+                "cvSearchableSurfaces",
+                runTime.constant(),
+                "triSurface",
+                runTime,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            ),
+            cvMeshDict.subDict("geometry")
+        );
 
         // Write some stats
         allGeometry.writeStats(List<wordList>(0), Info);
@@ -91,6 +99,11 @@ int main(int argc, char *argv[])
     }
 
 
+    conformalVoronoiMesh::debug = true;
+
+    conformalVoronoiMesh mesh(runTime, cvMeshDict);
+
+
     while (runTime.loop())
     {
         Info<< nl << "Time = " << runTime.timeName() << endl;
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index d964ac12cc..ef521a257d 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -803,7 +803,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
     if (allGeometry)
     {
         cellSet cells(mesh, "underdeterminedCells", mesh.nCells()/100);
-        if (mesh.checkCellDeterminant(true, &cells, mesh.geometricD()))
+        if (mesh.checkCellDeterminant(true, &cells))
         {
             noFailedChecks++;
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index df572a3619..26d472c44d 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -33,7 +33,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::mergePolyMesh, 1);
+namespace Foam
+{
+defineTypeNameAndDebug(mergePolyMesh, 1);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index e0dabffedb..a86343da25 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -34,7 +34,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::meshDualiser, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(meshDualiser, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/manipulation/setSet/Allwmake b/applications/utilities/mesh/manipulation/setSet/Allwmake
index 3be0afc595..0d586b6f94 100755
--- a/applications/utilities/mesh/manipulation/setSet/Allwmake
+++ b/applications/utilities/mesh/manipulation/setSet/Allwmake
@@ -14,7 +14,7 @@ if [ -f /usr/include/readline/readline.h -a "${1%NO_READLINE}" = "$1" ]
 then
     echo "Found <readline/readline.h>  --  enabling readline support."
     export COMP_FLAGS="-DHAS_READLINE"
-    export LINK_FLAGS="-lreadline -lncurses"
+    export LINK_FLAGS="-lreadline"
 fi
 
 wmake
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/Make/files b/applications/utilities/mesh/manipulation/subsetMesh/Make/files
index d8856b5f26..79552b3264 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/Make/files
+++ b/applications/utilities/mesh/manipulation/subsetMesh/Make/files
@@ -1,6 +1,3 @@
-cellSelection/cellSelection.C
-cellSelection/badQualityCellSelection.C
-cellSelection/outsideCellSelection.C
 subsetMesh.C
 
 EXE = $(FOAM_APPBIN)/subsetMesh
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.C b/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.C
deleted file mode 100644
index 7cb4eec518..0000000000
--- a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.C
+++ /dev/null
@@ -1,417 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "outsideCellSelection.H"
-#include "addToRunTimeSelectionTable.H"
-#include "faceSet.H"
-#include "polyMesh.H"
-#include "motionSmoother.H"
-#include "regionSplit.H"
-#include "syncTools.H"
-#include "zeroGradientFvPatchFields.H"
-
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace cellSelections
-{
-    defineTypeNameAndDebug(outsideCellSelection, 0);
-    addToRunTimeSelectionTable(cellSelection, outsideCellSelection, dictionary);
-}
-}
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField>
-Foam::cellSelections::outsideCellSelection::generateField
-(
-    const word& name,
-    const boolList& lst
-) const
-{
-    const fvMesh& mesh = dynamic_cast<const fvMesh&>(mesh_);
-
-    tmp<volScalarField> tfld
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                name,
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh,
-            dimensionedScalar(name, dimless, 0),
-            zeroGradientFvPatchScalarField::typeName
-        )
-    );
-    scalarField& fld = tfld().internalField();
-
-    forAll(fld, celli)
-    {
-       fld[celli] = 1.0*lst[celli];
-    }
-    tfld().correctBoundaryConditions();
-
-    return tfld;
-}
-
-
-void Foam::cellSelections::outsideCellSelection::markRegionFaces
-(
-    const boolList& selectedCell,
-    boolList& regionFace
-) const
-{
-    // Internal faces
-    const labelList& faceOwner = mesh_.faceOwner();
-    const labelList& faceNeighbour = mesh_.faceNeighbour();
-    forAll(faceNeighbour, faceI)
-    {
-        if
-        (
-            selectedCell[faceOwner[faceI]]
-         != selectedCell[faceNeighbour[faceI]]
-        )
-        {
-            regionFace[faceI] = true;
-        }
-    }
-
-    // Swap neighbour selectedCell state
-    boolList nbrSelected;
-    syncTools::swapBoundaryCellList(mesh_, selectedCell, nbrSelected);
-
-    // Boundary faces
-    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
-    forAll(pbm, patchI)
-    {
-        const polyPatch& pp = pbm[patchI];
-        const labelUList& faceCells = pp.faceCells();
-        forAll(faceCells, i)
-        {
-            label faceI = pp.start()+i;
-            label bFaceI = faceI-mesh_.nInternalFaces();
-            if
-            (
-                selectedCell[faceCells[i]]
-             != selectedCell[nbrSelected[bFaceI]]
-            )
-            {
-                regionFace[faceI] = true;
-            }
-        }
-    }
-}
-
-
-Foam::boolList Foam::cellSelections::outsideCellSelection::findRegions
-(
-    const bool verbose,
-    const regionSplit& cellRegion
-) const
-{
-    boolList keepRegion(cellRegion.nRegions(), false);
-
-    forAll(locationsInMesh_, i)
-    {
-        // Find the region containing the insidePoint
-
-        label cellI = mesh_.findCell(locationsInMesh_[i]);
-
-        label keepRegionI = -1;
-        label keepProcI = -1;
-        if (cellI != -1)
-        {
-            keepRegionI = cellRegion[cellI];
-            keepProcI = Pstream::myProcNo();
-        }
-        reduce(keepRegionI, maxOp<label>());
-        keepRegion[keepRegionI] = true;
-
-        reduce(keepProcI, maxOp<label>());
-
-        if (keepProcI == -1)
-        {
-            FatalErrorIn
-            (
-                "outsideCellSelection::findRegions"
-                "(const bool, const regionSplit&)"
-            )   << "Did not find " << locationsInMesh_[i]
-                << " in mesh." << " Mesh bounds are " << mesh_.bounds()
-                << exit(FatalError);
-        }
-
-        if (verbose)
-        {
-            Info<< "Found location " << locationsInMesh_[i]
-                << " in cell " << cellI << " on processor " << keepProcI
-                << " in global region " << keepRegionI
-                << " out of " << cellRegion.nRegions() << " regions." << endl;
-        }
-    }
-
-    return keepRegion;
-}
-
-
-void Foam::cellSelections::outsideCellSelection::unselectOutsideRegions
-(
-    boolList& selectedCell
-) const
-{
-    // Determine faces on the edge of selectedCell
-    boolList blockedFace(mesh_.nFaces(), false);
-    markRegionFaces(selectedCell, blockedFace);
-
-    // Determine regions
-    regionSplit cellRegion(mesh_, blockedFace);
-
-    // Determine regions containing locationsInMesh_
-    boolList keepRegion(findRegions(true, cellRegion));
-
-    // Go back to bool per cell
-    forAll(cellRegion, cellI)
-    {
-        if (!keepRegion[cellRegion[cellI]])
-        {
-            selectedCell[cellI] = false;
-        }
-    }
-}
-
-
-void Foam::cellSelections::outsideCellSelection::shrinkRegions
-(
-    boolList& selectedCell
-) const
-{
-    // Select points on unselected cells and boundary
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    boolList boundaryPoint(mesh_.nPoints(), false);
-
-    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
-
-    forAll(pbm, patchI)
-    {
-        const polyPatch& pp = pbm[patchI];
-
-        if (!pp.coupled() && !isA<emptyPolyPatch>(pp))
-        {
-            forAll(pp, i)
-            {
-                const face& f = pp[i];
-                forAll(f, fp)
-                {
-                    boundaryPoint[f[fp]] = true;
-                }
-            }
-        }
-    }
-
-    forAll(selectedCell, cellI)
-    {
-        if (!selectedCell[cellI])
-        {
-            const labelList& cPoints = mesh_.cellPoints(cellI);
-            forAll(cPoints, i)
-            {
-                boundaryPoint[cPoints[i]] = true;
-            }
-        }
-    }
-
-    syncTools::syncPointList(mesh_, boundaryPoint, orEqOp<bool>(), false);
-
-
-    // Select all cells using these points
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    label nChanged = 0;
-    forAll(boundaryPoint, pointI)
-    {
-        if (boundaryPoint[pointI])
-        {
-            const labelList& pCells = mesh_.pointCells(pointI);
-            forAll(pCells, i)
-            {
-                label cellI = pCells[i];
-                if (selectedCell[cellI])
-                {
-                    selectedCell[cellI] = false;
-                    nChanged++;
-                }
-            }
-        }
-    }
-}
-
-
-void Foam::cellSelections::outsideCellSelection::erode
-(
-    boolList& selectedCell
-) const
-{
-    //Info<< "Entering shrinkRegions:" << count(selectedCell) << endl;
-    //generateField("selectedCell_before", selectedCell)().write();
-
-    // Now erode and see which regions get disconnected
-    boolList shrunkSelectedCell(selectedCell);
-
-    for (label iter = 0; iter < nErode_; iter++)
-    {
-        shrinkRegions(shrunkSelectedCell);
-    }
-
-    //Info<< "After shrinking:" << count(shrunkSelectedCell) << endl;
-    //generateField("shrunkSelectedCell", shrunkSelectedCell)().write();
-
-
-
-    // Determine faces on the edge of shrunkSelectedCell
-    boolList blockedFace(mesh_.nFaces(), false);
-    markRegionFaces(shrunkSelectedCell, blockedFace);
-
-    // Find disconnected regions
-    regionSplit cellRegion(mesh_, blockedFace);
-
-    // Determine regions containing insidePoints
-    boolList keepRegion(findRegions(true, cellRegion));
-
-
-    // Extract cells in regions that are not to be kept.
-    boolList removeCell(mesh_.nCells(), false);
-    forAll(cellRegion, cellI)
-    {
-        if (shrunkSelectedCell[cellI] && !keepRegion[cellRegion[cellI]])
-        {
-            removeCell[cellI] = true;
-        }
-    }
-
-    //Info<< "removeCell before:" << count(removeCell) << endl;
-    //generateField("removeCell_before", removeCell)().write();
-
-
-
-    // Grow removeCell
-    for (label iter = 0; iter < nErode_; iter++)
-    {
-        // Grow selected cell in regions that are not for keeping
-        boolList boundaryPoint(mesh_.nPoints(), false);
-        forAll(removeCell, cellI)
-        {
-            if (removeCell[cellI])
-            {
-                const labelList& cPoints = mesh_.cellPoints(cellI);
-                forAll(cPoints, i)
-                {
-                    boundaryPoint[cPoints[i]] = true;
-                }
-            }
-        }
-        syncTools::syncPointList(mesh_, boundaryPoint, orEqOp<bool>(), false);
-
-        // Select all cells using these points
-
-        label nChanged = 0;
-        forAll(boundaryPoint, pointI)
-        {
-            if (boundaryPoint[pointI])
-            {
-                const labelList& pCells = mesh_.pointCells(pointI);
-                forAll(pCells, i)
-                {
-                    label cellI = pCells[i];
-                    if (!removeCell[cellI])
-                    {
-                        removeCell[cellI] = true;
-                        nChanged++;
-                    }
-                }
-            }
-        }
-    }
-
-    //Info<< "removeCell after:" << count(removeCell) << endl;
-    //generateField("removeCell_after", removeCell)().write();
-
-
-    // Unmark removeCell
-    forAll(removeCell, cellI)
-    {
-        if (removeCell[cellI])
-        {
-            selectedCell[cellI] = false;
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::cellSelections::outsideCellSelection::outsideCellSelection
-(
-    const word& name,
-    const polyMesh& mesh,
-    const dictionary& dict
-)
-:
-    cellSelection(name, mesh, dict),
-    locationsInMesh_(dict.lookup("locationsInMesh")),
-    nErode_(readLabel(dict.lookup("nErodeLayers")))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::cellSelections::outsideCellSelection::~outsideCellSelection()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::cellSelections::outsideCellSelection::select
-(
-    boolList& selectedCell
-) const
-{
-    // Unselect all disconnected regions
-    unselectOutsideRegions(selectedCell);
-
-    if (nErode_ > 0)
-    {
-        erode(selectedCell);
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.H b/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.H
deleted file mode 100644
index 9d7c600c23..0000000000
--- a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.H
+++ /dev/null
@@ -1,145 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::cellSelections::outsideCellSelection
-
-Description
-    Deselect cells not reachable from 'inside' points
-
-SourceFiles
-    outsideCellSelection.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef outsideCellSelection_H
-#define outsideCellSelection_H
-
-#include "cellSelection.H"
-#include "pointField.H"
-#include "boolList.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class regionSplit;
-
-namespace cellSelections
-{
-
-/*---------------------------------------------------------------------------*\
-                     Class outsideCellSelection Declaration
-\*---------------------------------------------------------------------------*/
-
-class outsideCellSelection
-:
-    public cellSelection
-{
-    // Private data
-
-        //- Locations to keep
-        const pointField locationsInMesh_;
-
-        //- Number of layers to erode
-        const label nErode_;
-
-
-   // Private Member Functions
-
-        //- For debugging: generate volScalarField with 1.0 for all true
-        tmp<volScalarField> generateField
-        (
-            const word& name,
-            const boolList& lst
-        ) const;
-
-        //- Mark faces inbetween selected and unselected elements
-        void markRegionFaces
-        (
-            const boolList& selectedCell,
-            boolList& regionFace
-        ) const;
-
-        //- Determine for every disconnected region in the mesh whether
-        //  it contains a locationInMesh
-        boolList findRegions(const bool verbose, const regionSplit&) const;
-
-        //- Unselect regions not containing a locationInMesh
-        void unselectOutsideRegions(boolList& selectedCell) const;
-
-        //- Unselect one layer of cells from selectedCell
-        void shrinkRegions(boolList& selectedCell) const;
-
-        //- Erode a given number of layers from selectedCell. Remove any
-        //  region that gets disconnected that way.
-        void erode(boolList& selectedCell) const;
-
-public:
-
-    //- Runtime type information
-    TypeName("outside");
-
-
-    // Constructors
-
-        //- Construct from dictionary
-        outsideCellSelection
-        (
-            const word& name,
-            const polyMesh& mesh,
-            const dictionary& dict
-        );
-
-        //- Clone
-        autoPtr<cellSelection> clone() const
-        {
-            notImplemented("autoPtr<cellSelection> clone() const");
-            return autoPtr<cellSelection>(NULL);
-        }
-
-
-    //- Destructor
-    virtual ~outsideCellSelection();
-
-
-    // Member Functions
-
-        //- Apply this selector
-        virtual void select(boolList&) const;
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace cellSelections
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index f4f1250cb1..a3358770a8 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -37,12 +37,12 @@ Description
 #include "cellSet.H"
 #include "IOobjectList.H"
 #include "volFields.H"
-#include "cellSelection.H"
 
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+
 template<class Type>
 void subsetVolFields
 (
@@ -152,16 +152,12 @@ int main(int argc, char *argv[])
 {
     argList::addNote
     (
-        "select a mesh subset based on a provided cellSet and/or"
-        " selection criteria"
-    );
-    #include "addDictOption.H"
-    argList::addOption
-    (
-        "cellSet",
-        "name",
-        "operates on specified cellSet name"
+        "select a mesh subset based on a cellSet"
     );
+
+    #include "addOverwriteOption.H"
+    #include "addRegionOption.H"
+    argList::validArgs.append("cellSet");
     argList::addOption
     (
         "patch",
@@ -169,73 +165,23 @@ int main(int argc, char *argv[])
         "add exposed internal faces to specified patch instead of to "
         "'oldInternalFaces'"
     );
-
-    #include "addOverwriteOption.H"
-    #include "addRegionOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
 
-    word setName;
-    const bool useCellSet = args.optionReadIfPresent("cellSet", setName);
-    const bool useDict = args.optionFound("dict");
-    const bool overwrite = args.optionFound("overwrite");
-
-    if (!useCellSet && !useDict)
-    {
-        FatalErrorIn(args.executable())
-            << "No cells to operate on selected. Please supply at least one of "
-            << "'-cellSet', '-dict'"
-            << exit(FatalError);
-    }
-
+    Foam::word meshRegionName = polyMesh::defaultRegion;
+    args.optionReadIfPresent("region", meshRegionName);
 
     #include "createNamedMesh.H"
 
+
     const word oldInstance = mesh.pointsInstance();
 
-    autoPtr<cellSet> currentSet;
-    if (useCellSet)
-    {
-        // Load the cellSet
-        Info<< "Operating on cell set " << setName << nl << endl;
-        currentSet.reset(new cellSet(mesh, setName));
-    }
-
-    PtrList<cellSelection> selectors;
-    if (useDict)
-    {
-        const word dictName("subsetMeshDict");
-        #include "setSystemMeshDictionaryIO.H"
-        Info<< "Reading selection criteria from " << dictName << nl << endl;
-        IOdictionary dict(dictIO);
-
-        const dictionary& selectionsDict = dict.subDict("selections");
-
-        label n = 0;
-        forAllConstIter(dictionary, selectionsDict, iter)
-        {
-            if (iter().isDict())
-            {
-                n++;
-            }
-        }
-        selectors.setSize(n);
-        n = 0;
-        forAllConstIter(dictionary, selectionsDict, iter)
-        {
-            if (iter().isDict())
-            {
-                selectors.set
-                (
-                    n++,
-                    cellSelection::New(iter().keyword(), mesh, iter().dict())
-                );
-            }
-        }
-    }
+    const word setName = args[1];
+    const bool overwrite = args.optionFound("overwrite");
 
 
+    Info<< "Reading cell set from " << setName << endl << endl;
 
     // Create mesh subsetting engine
     fvMeshSubset subsetter(mesh);
@@ -266,54 +212,9 @@ int main(int argc, char *argv[])
     }
 
 
-    // Select cells to operate on
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    boolList selectedCell(mesh.nCells(), false);
-    if (currentSet.valid())
-    {
-        const cellSet& set = currentSet();
-        forAllConstIter(cellSet, set, iter)
-        {
-            selectedCell[iter.key()] = true;
-        }
-    }
-    else
-    {
-        selectedCell = true;
-    }
-
-
-    // Manipulate selectedCell according to dictionary
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    forAll(selectors, i)
-    {
-        Info<< "Applying cellSelector " << selectors[i].name() << endl;
-        selectors[i].select(selectedCell);
-
-        Info<< "After applying cellSelector " << selectors[i].name()
-            << " have " << cellSelection::count(selectedCell)
-            << " cells" << nl << endl;
-    }
-
-
-    // Back from selectedCells to region
-    {
-        Info<< "Final selection : " << cellSelection::count(selectedCell)
-            << " cells" << nl << endl;
-
-        labelList cellRegion(mesh.nCells(), -1);
-        forAll(selectedCell, cellI)
-        {
-            if (selectedCell[cellI])
-            {
-                cellRegion[cellI] = 0;
-            }
-        }
-        subsetter.setLargeCellSubset(cellRegion, 0, patchI, true);
-    }
+    cellSet currentSet(mesh, setName);
 
+    subsetter.setLargeCellSubset(currentSet, patchI, true);
 
     IOobjectList objects(mesh, runTime.timeName());
 
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMeshDict b/applications/utilities/mesh/manipulation/subsetMesh/subsetMeshDict
deleted file mode 100644
index 93280bb305..0000000000
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMeshDict
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      subsetMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Load snappyHexMeshDict settings so we can use some entries below.
-#include "./snappyHexMeshDict"
-
-
-selections
-{
-    badQuality
-    {
-        // Remove any cells using a 'bad quality' face. Uses the mesh checks
-        // used by snappyHexMesh, cvMesh.
-        type    badQuality;
-        // Use the quality criteria from the snappyHexMeshDict
-        ${:meshQualityControls}
-    }
-
-    outside
-    {
-        // Remove any cells not reachable from provided locations
-        type    outside;
-
-        //- Number of cell layers to erode mesh to detect holes in the mesh
-        //  Set to 0 if not used.
-        nErodeLayers 3;
-
-        //- Define mesh location for keeping.
-        //  In this case use the one from snappyHexMeshDict. This can
-        //  optionally be a list of locations.
-        locationsInMesh (${:castellatedMeshControls.locationInMesh});
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 00720d2382..57514a2053 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -167,8 +167,10 @@ FoamFile
 //    source regionToCell;
 //    sourceInfo
 //    {
-//        set         c0;         // name of cellSet giving mesh subset
-//        insidePoint (1 2 3);    // point inside region to select
+//        set         c0;         // optional name of cellSet giving mesh subset
+//        insidePoints ((1 2 3)); // points inside region to select
+//        nErode      0;          // optional number of layers to erode
+//                                // selection
 //    }
 //
 //    // Cells underneath plane such that volume is reached. E.g. for use
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
index b381bd7d43..2e5018852f 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
@@ -1,16 +1,14 @@
 /* Note: enable vtkPolyhedron when available */
 
-PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
-
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I../../vtkPV3Readers/lnInclude \
     -I../PV3FoamReader \
-    -I$(PARAVIEW_INC) \
+    -I$(ParaView_INCLUDE_DIR) \
     $(shell \
-        test -f $(PARAVIEW_INC)/vtkPolyhedron.h && \
+        test -f $(ParaView_INCLUDE_DIR)/vtkPolyhedron.h && \
         echo "-DHAS_VTK_POLYHEDRON" || echo "-UHAS_VTK_POLYHEDRON" \
     )
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index cf0ca1314a..054582768f 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -40,7 +40,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::vtkPV3Foam, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(vtkPV3Foam, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
index 53f300a9f7..dfab6b6630 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
@@ -1,9 +1,7 @@
-PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
-
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-    -I$(PARAVIEW_INC) \
+    -I$(ParaView_INCLUDE_DIR) \
     -I../../vtkPV3Readers/lnInclude \
     -I../PV3blockMeshReader
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
index 5d47947d88..74e6d23d2d 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::vtkPV3blockMesh, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(vtkPV3blockMesh, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
index 4b2b1a3289..11c006c3be 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
@@ -1,7 +1,5 @@
-PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
-
 EXE_INC = \
-    -I$(PARAVIEW_INC)
+    -I$(ParaView_INCLUDE_DIR)
 
 LIB_LIBS = \
     $(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
index cd1e6eb6c8..4daf45fc48 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,11 @@ Description
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::vtkPV3Readers, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(vtkPV3Readers, 0);
+}
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/surface/surfaceClean/collapseBase.C b/applications/utilities/surface/surfaceClean/collapseBase.C
index 37e5b4da3b..ceb834b56f 100644
--- a/applications/utilities/surface/surfaceClean/collapseBase.C
+++ b/applications/utilities/surface/surfaceClean/collapseBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,55 +36,55 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Dump collapse region to .obj file
-static void writeRegionOBJ
-(
-    const triSurface& surf,
-    const label regionI,
-    const labelList& collapseRegion,
-    const labelList& outsideVerts
-)
-{
-    fileName dir("regions");
-
-    mkDir(dir);
-    fileName regionName(dir / "region_" + name(regionI) + ".obj");
-
-    Pout<< "Dumping region " << regionI << " to file " << regionName << endl;
-
-    boolList include(surf.size(), false);
-
-    forAll(collapseRegion, faceI)
-    {
-        if (collapseRegion[faceI] == regionI)
-        {
-            include[faceI] = true;
-        }
-    }
-
-    labelList pointMap, faceMap;
-
-    triSurface regionSurf(surf.subsetMesh(include, pointMap, faceMap));
-
-    Pout<< "Region " << regionI << " surface:" << nl;
-    regionSurf.writeStats(Pout);
-
-    regionSurf.write(regionName);
-
-
-    // Dump corresponding outside vertices.
-    fileName pointsName(dir / "regionPoints_" + name(regionI) + ".obj");
-
-    Pout<< "Dumping region " << regionI << " points to file " << pointsName
-        << endl;
-
-    OFstream str(pointsName);
-
-    forAll(outsideVerts, i)
-    {
-        meshTools::writeOBJ(str, surf.localPoints()[outsideVerts[i]]);
-    }
-}
+//// Dump collapse region to .obj file
+//static void writeRegionOBJ
+//(
+//    const triSurface& surf,
+//    const label regionI,
+//    const labelList& collapseRegion,
+//    const labelList& outsideVerts
+//)
+//{
+//    fileName dir("regions");
+//
+//    mkDir(dir);
+//    fileName regionName(dir / "region_" + name(regionI) + ".obj");
+//
+//    Pout<< "Dumping region " << regionI << " to file " << regionName << endl;
+//
+//    boolList include(surf.size(), false);
+//
+//    forAll(collapseRegion, faceI)
+//    {
+//        if (collapseRegion[faceI] == regionI)
+//        {
+//            include[faceI] = true;
+//        }
+//    }
+//
+//    labelList pointMap, faceMap;
+//
+//    triSurface regionSurf(surf.subsetMesh(include, pointMap, faceMap));
+//
+//    Pout<< "Region " << regionI << " surface:" << nl;
+//    regionSurf.writeStats(Pout);
+//
+//    regionSurf.write(regionName);
+//
+//
+//    // Dump corresponding outside vertices.
+//    fileName pointsName(dir / "regionPoints_" + name(regionI) + ".obj");
+//
+//    Pout<< "Dumping region " << regionI << " points to file " << pointsName
+//        << endl;
+//
+//    OFstream str(pointsName);
+//
+//    forAll(outsideVerts, i)
+//    {
+//        meshTools::writeOBJ(str, surf.localPoints()[outsideVerts[i]]);
+//    }
+//}
 
 
 // Split triangle into multiple triangles because edge e being split
diff --git a/etc/caseDicts/setConstraintTypes b/etc/caseDicts/setConstraintTypes
index 7e1194a520..85d6ec525c 100644
--- a/etc/caseDicts/setConstraintTypes
+++ b/etc/caseDicts/setConstraintTypes
@@ -11,6 +11,11 @@ cyclic
     type  cyclic;
 }
 
+cyclicAMI
+{
+    type  cyclicAMI;
+}
+
 cyclicSlip
 {
     type  cyclicSlip;
diff --git a/etc/config/example/paraview.csh b/etc/config/example/paraview.csh
index db45dd5965..9b639c74ba 100644
--- a/etc/config/example/paraview.csh
+++ b/etc/config/example/paraview.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -39,7 +39,7 @@
 #
 
 set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.csh`
-if ( $status == 0 ) source $foamFile ParaView_VERSION=3.9.0
+if ( $status == 0 ) source $foamFile ParaView_VERSION=3.12.0
 
 unset foamFile
 
diff --git a/etc/config/example/paraview.sh b/etc/config/example/paraview.sh
index d0d13b55e0..9586dc81dc 100644
--- a/etc/config/example/paraview.sh
+++ b/etc/config/example/paraview.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -39,7 +39,7 @@
 #
 
 foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.sh 2>/dev/null)
-[ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.9.0
+[ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.12.0
 
 unset foamFile
 
diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index 7fa619881e..3a011ee219 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -88,6 +88,7 @@ if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
     setenv PATH ${ParaView_DIR}/bin:${PATH}
     setenv LD_LIBRARY_PATH "${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}:${LD_LIBRARY_PATH}"
     setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-${ParaView_MAJOR}
+    setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
 
     # add in python libraries if required
     set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index a432e62c54..9f35cdf3e4 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -98,6 +98,8 @@ then
     export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-$ParaView_MAJOR:$LD_LIBRARY_PATH
     export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR
 
+    export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
+
     # add in python libraries if required
     paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
     if [ -r $paraviewPython ]
diff --git a/etc/config/unset.csh b/etc/config/unset.csh
index 555bd89d7b..928f08f442 100644
--- a/etc/config/unset.csh
+++ b/etc/config/unset.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -125,6 +125,7 @@ unsetenv OPAL_PREFIX
 unsetenv ENSIGHT9_READER
 unsetenv CMAKE_HOME
 unsetenv ParaView_DIR
+unsetenv ParaView_INCLUDE_DIR
 unsetenv PV_PLUGIN_PATH
 
 
diff --git a/etc/config/unset.sh b/etc/config/unset.sh
index 3996a6df92..59428c5d6b 100644
--- a/etc/config/unset.sh
+++ b/etc/config/unset.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -112,6 +112,7 @@ unset OPAL_PREFIX
 unset ENSIGHT9_READER
 unset CMAKE_HOME
 unset ParaView_DIR
+unset ParaView_INCLUDE_DIR
 unset PV_PLUGIN_PATH
 
 
diff --git a/etc/controlDict b/etc/controlDict
index a47741c94c..a0b999f35b 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -994,7 +994,7 @@ DimensionSets
         acceleration acceleration  [ m s^-2 ] 1.0;
         kinematicPressure kinematicPressure [ Pa density^-1 ] 1.0;
 
-        // Scaled units. Only allowed in dymensionedType (dimensionedScalar,
+        // Scaled units. Only allowed in dimensionedType (dimensionedScalar,
         // dimensionedVector etc.) and UniformDimensionedField, not
         // in DimensionedField or GeometricField
         cm  cm  [ m ] 1e-2;
diff --git a/src/Allwmake b/src/Allwmake
index 94afb0d985..1a78e00b4a 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -76,6 +76,8 @@ wmake $makeType engine
 
 wmake $makeType fieldSources
 
+wmake $makeType regionCoupled
+
 postProcessing/Allwmake $*
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/ODE/ODESolvers/KRR4/KRR4.C b/src/ODE/ODESolvers/KRR4/KRR4.C
index bdfca457df..9246605b51 100644
--- a/src/ODE/ODESolvers/KRR4/KRR4.C
+++ b/src/ODE/ODESolvers/KRR4/KRR4.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::KRR4, 0);
-
 namespace Foam
 {
+    defineTypeNameAndDebug(KRR4, 0);
+
     addToRunTimeSelectionTable(ODESolver, KRR4, ODE);
 
 const scalar
diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.C b/src/ODE/ODESolvers/ODESolver/ODESolver.C
index 1d7bebc32a..7a981dfd16 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolver.C
+++ b/src/ODE/ODESolvers/ODESolver/ODESolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,9 +27,9 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::ODESolver, 0);
 namespace Foam
 {
+    defineTypeNameAndDebug(ODESolver, 0);
     defineRunTimeSelectionTable(ODESolver, ODE);
 }
 
diff --git a/src/ODE/ODESolvers/RK/RK.C b/src/ODE/ODESolvers/RK/RK.C
index 03a3405355..6ae5036078 100644
--- a/src/ODE/ODESolvers/RK/RK.C
+++ b/src/ODE/ODESolvers/RK/RK.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(Foam::RK, 0);
+    defineTypeNameAndDebug(RK, 0);
     addToRunTimeSelectionTable(ODESolver, RK, ODE);
 
 const scalar
diff --git a/src/ODE/ODESolvers/SIBS/SIBS.C b/src/ODE/ODESolvers/SIBS/SIBS.C
index 5d6a58f9ae..d86f60d5c9 100644
--- a/src/ODE/ODESolvers/SIBS/SIBS.C
+++ b/src/ODE/ODESolvers/SIBS/SIBS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::SIBS, 0);
-
 namespace Foam
 {
+    defineTypeNameAndDebug(SIBS, 0);
+
     addToRunTimeSelectionTable(ODESolver, SIBS, ODE);
 
     const label SIBS::nSeq_[iMaxX_] = {2, 6, 10, 14, 22, 34, 50, 70};
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 34290315c7..920778116e 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,11 @@ Description
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::POSIX, 0);
+namespace Foam
+{
+    defineTypeNameAndDebug(POSIX, 0);
+}
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index f17e7b1dc9..a960ac39fe 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -45,13 +45,13 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::fileMonitor, 0);
-
 const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
     Foam::fileMonitor::fileStateNames_;
 
 namespace Foam
 {
+    defineTypeNameAndDebug(fileMonitor, 0);
+
     template<>
     const char* Foam::NamedEnum
     <
diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
index e973bc1bd8..94759bfe33 100644
--- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,11 +31,41 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+namespace Foam
+{
 // Signal number to catch
-int Foam::sigStopAtWriteNow::signal_
+int sigStopAtWriteNow::signal_
 (
     debug::optimisationSwitch("stopAtWriteNowSignal", -1)
 );
+// Register re-reader
+class addstopAtWriteNowSignalToOpt
+:
+    public ::Foam::simpleRegIOobject
+{
+public:
+    addstopAtWriteNowSignalToOpt(const char* name)
+    :
+        ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
+    {}
+    virtual ~addstopAtWriteNowSignalToOpt()
+    {}
+    virtual void readData(Foam::Istream& is)
+    {
+        sigStopAtWriteNow::signal_ = readLabel(is);
+        sigStopAtWriteNow::set(true);
+    }
+    virtual void writeData(Foam::Ostream& os) const
+    {
+        os << sigStopAtWriteNow::signal_;
+    }
+};
+addstopAtWriteNowSignalToOpt addstopAtWriteNowSignalToOpt_
+(
+    "stopAtWriteNowSignal"
+);
+}
+
 
 static Foam::Time const* runTimePtr_ = NULL;
 
@@ -80,6 +110,36 @@ Foam::sigStopAtWriteNow::sigStopAtWriteNow
     const bool verbose,
     const Time& runTime
 )
+{
+    // Store runTime
+    runTimePtr_ = &runTime;
+
+    set(verbose);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::sigStopAtWriteNow::~sigStopAtWriteNow()
+{
+    // Reset old handling
+    if (signal_ > 0)
+    {
+        if (sigaction(signal_, &oldAction_, NULL) < 0)
+        {
+            FatalErrorIn
+            (
+                "Foam::sigStopAtWriteNow::~sigStopAtWriteNow()"
+            )   << "Cannot reset " << signal_ << " trapping"
+                << abort(FatalError);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::sigStopAtWriteNow::set(const bool verbose)
 {
     if (signal_ > 0)
     {
@@ -98,9 +158,6 @@ Foam::sigStopAtWriteNow::sigStopAtWriteNow
         }
 
 
-        // Store runTime
-        runTimePtr_ = &runTime;
-
         struct sigaction newAction;
         newAction.sa_handler = sigHandler;
         newAction.sa_flags = SA_NODEFER;
@@ -125,27 +182,6 @@ Foam::sigStopAtWriteNow::sigStopAtWriteNow
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::sigStopAtWriteNow::~sigStopAtWriteNow()
-{
-    // Reset old handling
-    if (signal_ > 0)
-    {
-        if (sigaction(signal_, &oldAction_, NULL) < 0)
-        {
-            FatalErrorIn
-            (
-                "Foam::sigStopAtWriteNow::~sigStopAtWriteNow()"
-            )   << "Cannot reset " << signal_ << " trapping"
-                << abort(FatalError);
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 bool Foam::sigStopAtWriteNow::active() const
 {
     return signal_ > 0;
diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
index 4c07248eb2..d7d9d113b0 100644
--- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
+++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,6 +68,9 @@ class sigStopAtWriteNow
 
 public:
 
+    //- wip. Have setter have access to signal_
+    friend class addstopAtWriteNowSignalToOpt;
+
     // Constructors
 
         //- Construct null
@@ -83,6 +86,9 @@ public:
 
     // Member functions
 
+        //- (re)set signal catcher
+        static void set(const bool verbose);
+
         //- Is active?
         bool active() const;
 };
diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.C b/src/OSspecific/POSIX/signals/sigWriteNow.C
index 6ad98a6190..29381368a2 100644
--- a/src/OSspecific/POSIX/signals/sigWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigWriteNow.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,11 +31,39 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+namespace Foam
+{
 // Signal number to catch
-int Foam::sigWriteNow::signal_
+int sigWriteNow::signal_
 (
     debug::optimisationSwitch("writeNowSignal", -1)
 );
+// Register re-reader
+class addwriteNowSignalToOpt
+:
+    public ::Foam::simpleRegIOobject
+{
+public:
+    addwriteNowSignalToOpt(const char* name)
+    :
+        ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
+    {}
+    virtual ~addwriteNowSignalToOpt()
+    {}
+    virtual void readData(Foam::Istream& is)
+    {
+        sigWriteNow::signal_ = readLabel(is);
+        sigWriteNow::set(true);
+    }
+    virtual void writeData(Foam::Ostream& os) const
+    {
+        os << sigWriteNow::signal_;
+    }
+};
+addwriteNowSignalToOpt addwriteNowSignalToOpt_("writeNowSignal");
+
+}
+
 
 static Foam::Time* runTimePtr_ = NULL;
 
@@ -64,31 +92,10 @@ Foam::sigWriteNow::sigWriteNow()
 
 Foam::sigWriteNow::sigWriteNow(const bool verbose, Time& runTime)
 {
-    if (signal_ >= 0)
-    {
-        // Store runTime
-        runTimePtr_ = &runTime;
+    // Store runTime
+    runTimePtr_ = &runTime;
 
-        struct sigaction newAction;
-        newAction.sa_handler = sigHandler;
-        newAction.sa_flags = SA_NODEFER;
-        sigemptyset(&newAction.sa_mask);
-        if (sigaction(signal_, &newAction, &oldAction_) < 0)
-        {
-            FatalErrorIn
-            (
-                "Foam::sigWriteNow::sigWriteNow(const bool, const Time&)"
-            )   << "Cannot set " << signal_ << " trapping"
-                << abort(FatalError);
-        }
-
-        if (verbose)
-        {
-            Info<< "sigWriteNow :"
-                << " Enabling writing upon signal " << signal_
-                << endl;
-        }
-    }
+    set(verbose);
 }
 
 
@@ -113,6 +120,33 @@ Foam::sigWriteNow::~sigWriteNow()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::sigWriteNow::set(const bool verbose)
+{
+    if (signal_ >= 0)
+    {
+        struct sigaction newAction;
+        newAction.sa_handler = sigHandler;
+        newAction.sa_flags = SA_NODEFER;
+        sigemptyset(&newAction.sa_mask);
+        if (sigaction(signal_, &newAction, &oldAction_) < 0)
+        {
+            FatalErrorIn
+            (
+                "Foam::sigWriteNow::sigWriteNow(const bool, const Time&)"
+            )   << "Cannot set " << signal_ << " trapping"
+                << abort(FatalError);
+        }
+
+        if (verbose)
+        {
+            Info<< "sigWriteNow :"
+                << " Enabling writing upon signal " << signal_
+                << endl;
+        }
+    }
+}
+
+
 bool Foam::sigWriteNow::active() const
 {
     return signal_ > 0;
diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.H b/src/OSspecific/POSIX/signals/sigWriteNow.H
index 477bae825f..f89933721f 100644
--- a/src/OSspecific/POSIX/signals/sigWriteNow.H
+++ b/src/OSspecific/POSIX/signals/sigWriteNow.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,9 @@ public:
 
     friend class sigStopAtWriteNow;
 
+    //- wip. Have setter have access to signal_
+    friend class addwriteNowSignalToOpt;
+
     // Constructors
 
         //- Construct null
@@ -84,6 +87,9 @@ public:
 
     // Member functions
 
+        //- (re)set signal catcher
+        static void set(const bool verbose);
+
         //- Is active?
         bool active() const;
 
diff --git a/src/OSspecific/POSIX/timer.C b/src/OSspecific/POSIX/timer.C
index f7a2b211aa..8b175332d8 100644
--- a/src/OSspecific/POSIX/timer.C
+++ b/src/OSspecific/POSIX/timer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,13 +30,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::timer, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(timer, 0);
 
-jmp_buf Foam::timer::envAlarm;
+jmp_buf timer::envAlarm;
 
-struct sigaction Foam::timer::oldAction_;
+struct sigaction timer::oldAction_;
+
+unsigned int timer::oldTimeOut_ = 0;
+}
 
-unsigned int Foam::timer::oldTimeOut_ = 0;
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index c4f142b88c..03072a6f02 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -427,6 +427,10 @@ $(polyMesh)/polyMeshInitMesh.C
 $(polyMesh)/polyMeshClear.C
 $(polyMesh)/polyMeshUpdate.C
 
+polyMeshCheck = $(polyMesh)/polyMeshCheck
+$(polyMeshCheck)/polyMeshCheck.C
+$(polyMeshCheck)/polyMeshTools.C
+
 primitiveMesh = meshes/primitiveMesh
 $(primitiveMesh)/primitiveMesh.C
 $(primitiveMesh)/primitiveMeshCellCells.C
@@ -447,9 +451,9 @@ $(primitiveMesh)/primitiveMeshCalcCellShapes.C
 
 primitiveMeshCheck = $(primitiveMesh)/primitiveMeshCheck
 $(primitiveMeshCheck)/primitiveMeshCheck.C
-$(primitiveMeshCheck)/primitiveMeshCheckMotion.C
 $(primitiveMeshCheck)/primitiveMeshCheckPointNearness.C
 $(primitiveMeshCheck)/primitiveMeshCheckEdgeLength.C
+$(primitiveMeshCheck)/primitiveMeshTools.C
 
 primitivePatch = $(primitiveMesh)/primitivePatch
 $(primitivePatch)/patchZones.C
diff --git a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C
index 30cac7b402..fce4a14921 100644
--- a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C
+++ b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,9 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-Foam::Dictionary<T>::Dictionary()
+Foam::Dictionary<T>::Dictionary(const label size)
+:
+    DictionaryBase<IDLList<T>, T>(size)
 {}
 
 
diff --git a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
index 238e50055a..85901731f2 100644
--- a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,8 +61,8 @@ public:
 
     // Constructors
 
-        //- Null constructor
-        Dictionary();
+        //- Construct given initial table size
+        Dictionary(const label size = 128);
 
         //- Copy construct
         Dictionary(const Dictionary&);
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
index 691ba1fdca..3227e13b21 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,9 @@ void Foam::DictionaryBase<IDLListType, T>::addEntries()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class IDLListType, class T>
-Foam::DictionaryBase<IDLListType, T>::DictionaryBase()
+Foam::DictionaryBase<IDLListType, T>::DictionaryBase(const label size)
+:
+    hashedTs_(size)
 {}
 
 
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
index 1bb12cbb79..7d788fe4df 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,8 +90,8 @@ public:
 
     // Constructors
 
-        //- Null constructor
-        DictionaryBase();
+        //- Construct given initial table size
+        DictionaryBase(const label size = 128);
 
         //- Copy construct
         DictionaryBase(const DictionaryBase&);
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.C b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.C
index 29bbb0f8e0..bdd9e5fbc8 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.C
+++ b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,9 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-Foam::PtrDictionary<T>::PtrDictionary()
+Foam::PtrDictionary<T>::PtrDictionary(const label size)
+:
+    DictionaryBase<DLPtrList<T>, T>(size)
 {}
 
 
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
index 602bae3d53..efa739d26a 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,8 +61,8 @@ public:
 
     // Constructors
 
-        //- Null constructor
-        PtrDictionary();
+        //- Construct given initial table size
+        PtrDictionary(const label size = 128);
 
         //- Copy construct
         PtrDictionary(const PtrDictionary&);
diff --git a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.C b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.C
index 2600f07bc7..bc81b3784b 100644
--- a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.C
+++ b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,9 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-Foam::UPtrDictionary<T>::UPtrDictionary()
+Foam::UPtrDictionary<T>::UPtrDictionary(const label size)
+:
+    DictionaryBase<DLList<T*>, T>(size)
 {}
 
 
diff --git a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
index 8923799589..f83825a327 100644
--- a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,8 +61,8 @@ public:
 
     // Constructors
 
-        //- Null constructor
-        UPtrDictionary();
+        //- Construct given initial table size
+        UPtrDictionary(const label size = 128);
 
         //- Copy construct
         UPtrDictionary(const UPtrDictionary&);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 2f1611a5e2..9cc6d9d6f5 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -240,6 +240,12 @@ bool Foam::UPstream::floatTransfer
 (
     debug::optimisationSwitch("floatTransfer", 0)
 );
+registerOptSwitchWithName
+(
+    Foam::UPstream::floatTransfer,
+    floatTransfer,
+    "floatTransfer"
+);
 
 // Number of processors at which the reduce algorithm changes from linear to
 // tree
@@ -247,18 +253,55 @@ int Foam::UPstream::nProcsSimpleSum
 (
     debug::optimisationSwitch("nProcsSimpleSum", 16)
 );
+registerOptSwitchWithName
+(
+    Foam::UPstream::nProcsSimpleSum,
+    nProcsSimpleSum,
+    "nProcsSimpleSum"
+);
 
 // Default commsType
 Foam::UPstream::commsTypes Foam::UPstream::defaultCommsType
 (
     commsTypeNames.read(debug::optimisationSwitches().lookup("commsType"))
 );
+// Register re-reader
+class addcommsTypeToOpt
+:
+    public ::Foam::simpleRegIOobject
+{
+public:
+    addcommsTypeToOpt(const char* name)
+    :
+        ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
+    {}
+    virtual ~addcommsTypeToOpt()
+    {}
+    virtual void readData(Foam::Istream& is)
+    {
+        Foam::UPstream::defaultCommsType = Foam::UPstream::commsTypeNames.read
+        (
+            is
+        );
+    }
+    virtual void writeData(Foam::Ostream& os) const
+    {
+        os << Foam::UPstream::commsTypeNames[Foam::UPstream::defaultCommsType];
+    }
+};
+addcommsTypeToOpt addcommsTypeToOpt_("commsType");
+
 
 // Number of polling cycles in processor updates
 int Foam::UPstream::nPollProcInterfaces
 (
     debug::optimisationSwitch("nPollProcInterfaces", 0)
 );
-
+registerOptSwitchWithName
+(
+    Foam::UPstream::nPollProcInterfaces,
+    nPollProcInterfaces,
+    "nPollProcInterfaces"
+);
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C
index d90f7f2b20..83b5542c64 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.C
+++ b/src/OpenFOAM/db/IOstreams/token/token.C
@@ -32,8 +32,9 @@ namespace Foam
 const char* const token::typeName = "token";
 token token::undefinedToken;
 
-defineTypeNameAndDebug(token::compound, 0);
-defineRunTimeSelectionTable(token::compound, Istream);
+typedef token::compound tokenCompound;
+defineTypeNameAndDebug(tokenCompound, 0);
+defineRunTimeSelectionTable(tokenCompound, Istream);
 }
 
 
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index cace29f02f..8b5761858d 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "Time.H"
 #include "Pstream.H"
 #include "simpleObjectRegistry.H"
+#include "dimensionedConstants.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -40,52 +41,55 @@ void Foam::Time::readDict()
 
 
     // Check for local switches and settings
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Debug switches
     if (controlDict_.found("DebugSwitches"))
     {
+        Info<< "Overriding DebugSwitches according to " << controlDict_.name()
+            << endl;
+
         simpleObjectRegistry& objects = debug::debugObjects();
         const dictionary& localSettings = controlDict_.subDict("DebugSwitches");
         forAllConstIter(dictionary, localSettings, iter)
         {
             const word& name = iter().keyword();
-            simpleObjectRegistry::iterator fnd = objects.find(name);
-            if (fnd != objects.end())
+
+            simpleObjectRegistryEntry* objPtr = objects.lookupPtr(name);
+
+            if (objPtr)
             {
-                Info<< controlDict_.name() << " : overriding debug switch "
-                    << name << endl;
+                Info<< "    " << iter() << endl;
+
+                const List<simpleRegIOobject*>& objects = *objPtr;
 
                 if (iter().isDict())
                 {
-                    OStringStream os(IOstream::ASCII);
-                    os  << iter().dict();
-                    IStringStream is(os.str());
-                    fnd()->readData(is);
+                    forAll(objects, i)
+                    {
+                        OStringStream os(IOstream::ASCII);
+                        os  << iter().dict();
+                        IStringStream is(os.str());
+                        objects[i]->readData(is);
+                    }
                 }
                 else
                 {
-                    fnd()->readData(iter().stream());
+                    forAll(objects, i)
+                    {
+                        objects[i]->readData(iter().stream());
+                    }
                 }
             }
         }
     }
-    if (controlDict_.found("DimensionSets"))
-    {
-        dictionary dict(Foam::dimensionSystems());
-        dict.merge(controlDict_.subDict("DimensionSets"));
 
-        simpleObjectRegistry& objects = debug::dimensionSetObjects();
-        simpleObjectRegistry::iterator fnd = objects.find("DimensionSets");
-        if (fnd != objects.end())
-        {
-            Info<< controlDict_.name() << " : overriding DimensionSets" << endl;
-
-            OStringStream os(IOstream::ASCII);
-            os  << dict;
-            IStringStream is(os.str());
-            fnd()->readData(is);
-        }
-    }
+    // Optimisation Switches
     if (controlDict_.found("OptimisationSwitches"))
     {
+        Info<< "Overriding OptimisationSwitches according to "
+            << controlDict_.name() << endl;
+
         simpleObjectRegistry& objects = debug::optimisationObjects();
         const dictionary& localSettings = controlDict_.subDict
         (
@@ -94,29 +98,210 @@ void Foam::Time::readDict()
         forAllConstIter(dictionary, localSettings, iter)
         {
             const word& name = iter().keyword();
-            simpleObjectRegistry::iterator fnd = objects.find(name);
-            if (fnd != objects.end())
+
+            simpleObjectRegistryEntry* objPtr = objects.lookupPtr(name);
+
+            if (objPtr)
             {
-                Info<< controlDict_.name()
-                    << " : overriding optimisation switch "
-                    << name << endl;
+                Info<< "    " << iter() << endl;
+
+                const List<simpleRegIOobject*>& objects = *objPtr;
 
                 if (iter().isDict())
                 {
-                    OStringStream os(IOstream::ASCII);
-                    os  << iter().dict();
-                    IStringStream is(os.str());
-                    fnd()->readData(is);
+                    forAll(objects, i)
+                    {
+                        OStringStream os(IOstream::ASCII);
+                        os  << iter().dict();
+                        IStringStream is(os.str());
+                        objects[i]->readData(is);
+                    }
                 }
                 else
                 {
-                    fnd()->readData(iter().stream());
+                    forAll(objects, i)
+                    {
+                        objects[i]->readData(iter().stream());
+                    }
                 }
             }
         }
     }
 
 
+    // DimensionedConstants. Handled as a special case since both e.g.
+    // the 'unitSet' might be changed and the individual values
+    if (controlDict_.found("DimensionedConstants"))
+    {
+        Info<< "Overriding DimensionedConstants according to "
+            << controlDict_.name() << endl;
+
+        // Change in-memory
+        dimensionedConstants().merge
+        (
+            controlDict_.subDict("DimensionedConstants")
+        );
+
+
+        simpleObjectRegistry& objects = debug::dimensionedConstantObjects();
+
+        IStringStream dummyIs("");
+
+        forAllConstIter(simpleObjectRegistry, objects, iter)
+        {
+            const List<simpleRegIOobject*>& objects = *iter;
+
+            forAll(objects, i)
+            {
+                objects[i]->readData(dummyIs);
+
+                Info<< "    ";
+                objects[i]->writeData(Info);
+                Info<< endl;
+            }
+        }
+    }
+
+
+
+    //{
+    //    // fundamentalConstants.C
+    //    Info<< "constant::universal::hr:"
+    //        << Foam::constant::universal::hr
+    //        << endl;
+    //    Info<< "constant::universal::c:"
+    //        << Foam::constant::universal::c
+    //        << endl;
+    //    Info<< "constant::universal::G:"
+    //        << Foam::constant::universal::G
+    //        << endl;
+    //    Info<< "constant::universal::h:"
+    //        << Foam::constant::universal::h
+    //        << endl;
+    //    Info<< "constant::electromagnetic::e:"
+    //        << Foam::constant::electromagnetic::e
+    //        << endl;
+    //    Info<< "constant::atomic::me:"
+    //        << Foam::constant::atomic::me
+    //        << endl;
+    //    Info<< "constant::atomic::mp:"
+    //        << Foam::constant::atomic::mp
+    //        << endl;
+    //    Info<< "constant::physicoChemical::mu:"
+    //        << Foam::constant::physicoChemical::mu
+    //        << endl;
+    //    Info<< "constant::physicoChemical::NA:"
+    //        << Foam::constant::physicoChemical::NA
+    //        << endl;
+    //    Info<< "constant::physicoChemical::k:"
+    //        << Foam::constant::physicoChemical::k
+    //        << endl;
+    //    Info<< "constant::standard::Pstd:"
+    //        << Foam::constant::standard::Pstd
+    //        << endl;
+    //    Info<< "constant::standard::Tstd:"
+    //        << Foam::constant::standard::Tstd
+    //        << endl;
+    //
+    //    // universalConstants.C
+    //    Info<< "constant::universal::hr:"
+    //        << Foam::constant::universal::hr
+    //        << endl;
+    //
+    //    // electromagneticConstants.C
+    //    Info<< "constant::electromagnetic::mu0:"
+    //        << Foam::constant::electromagnetic::mu0
+    //        << endl;
+    //    Info<< "constant::electromagnetic::epsilon0:"
+    //        << Foam::constant::electromagnetic::epsilon0
+    //        << endl;
+    //    Info<< "constant::electromagnetic::Z0:"
+    //        << Foam::constant::electromagnetic::Z0
+    //        << endl;
+    //    Info<< "constant::electromagnetic::kappa:"
+    //        << Foam::constant::electromagnetic::kappa
+    //        << endl;
+    //    Info<< "constant::electromagnetic::G0:"
+    //        << Foam::constant::electromagnetic::G0
+    //        << endl;
+    //    Info<< "constant::electromagnetic::KJ:"
+    //        << Foam::constant::electromagnetic::KJ
+    //        << endl;
+    //    Info<< "constant::electromagnetic::RK:"
+    //        << Foam::constant::electromagnetic::RK
+    //        << endl;
+    //
+    //
+    //    // atomicConstants.C
+    //    Info<< "constant::atomic::alpha:"
+    //        << Foam::constant::atomic::alpha
+    //        << endl;
+    //    Info<< "constant::atomic::Rinf:"
+    //        << Foam::constant::atomic::Rinf
+    //        << endl;
+    //    Info<< "constant::atomic::a0:"
+    //        << Foam::constant::atomic::a0
+    //        << endl;
+    //    Info<< "constant::physiatomic::re:"
+    //        << Foam::constant::atomic::re
+    //        << endl;
+    //    Info<< "constant::atomic::Eh:"
+    //        << Foam::constant::atomic::Eh
+    //        << endl;
+    //
+    //
+    //    // physicoChemicalConstants.C
+    //    Info<< "constant::physicoChemical::R:"
+    //        << Foam::constant::physicoChemical::R
+    //        << endl;
+    //    Info<< "constant::physicoChemical::F:"
+    //        << Foam::constant::physicoChemical::F
+    //        << endl;
+    //    Info<< "constant::physicoChemical::sigma:"
+    //        << Foam::constant::physicoChemical::sigma
+    //        << endl;
+    //    Info<< "constant::physicoChemical::b:"
+    //        << Foam::constant::physicoChemical::b
+    //        << endl;
+    //    Info<< "constant::physicoChemical::c1:"
+    //        << Foam::constant::physicoChemical::c1
+    //        << endl;
+    //    Info<< "constant::physicoChemical::c2:"
+    //        << Foam::constant::physicoChemical::c2
+    //        << endl;
+    //}
+
+
+    // Dimension sets
+    if (controlDict_.found("DimensionSets"))
+    {
+        Info<< "Overriding DimensionSets according to "
+            << controlDict_.name() << endl;
+
+        dictionary dict(Foam::dimensionSystems());
+        dict.merge(controlDict_.subDict("DimensionSets"));
+
+        simpleObjectRegistry& objects = debug::dimensionSetObjects();
+
+        simpleObjectRegistryEntry* objPtr = objects.lookupPtr("DimensionSets");
+
+        if (objPtr)
+        {
+            Info<< controlDict_.subDict("DimensionSets") << endl;
+
+            const List<simpleRegIOobject*>& objects = *objPtr;
+
+            forAll(objects, i)
+            {
+                OStringStream os(IOstream::ASCII);
+                os  << dict;
+                IStringStream is(os.str());
+                objects[i]->readData(is);
+            }
+        }
+    }
+
+
 
     if (!deltaTchanged_)
     {
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index a01634d344..3522f1aebd 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -37,6 +37,13 @@ namespace Foam
     (
         debug::optimisationSwitch("fileModificationSkew", 30)
     );
+    registerOptSwitchWithName
+    (
+        Foam::regIOobject::fileModificationSkew,
+        fileModificationSkew,
+        "fileModificationSkew"
+    );
+
 
     template<>
     const char* NamedEnum
@@ -67,6 +74,35 @@ Foam::regIOobject::fileCheckTypes Foam::regIOobject::fileModificationChecking
         )
     )
 );
+// Register re-reader
+class addfileModificationCheckingToOpt
+:
+    public ::Foam::simpleRegIOobject
+{
+public:
+    addfileModificationCheckingToOpt(const char* name)
+    :
+        ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
+    {}
+    virtual ~addfileModificationCheckingToOpt()
+    {}
+    virtual void readData(Foam::Istream& is)
+    {
+        Foam::regIOobject::fileModificationChecking =
+            Foam::regIOobject::fileCheckTypesNames.read(is);
+    }
+    virtual void writeData(Foam::Ostream& os) const
+    {
+        os <<   Foam::regIOobject::fileCheckTypesNames
+                [
+                    Foam::regIOobject::fileModificationChecking
+                ];
+    }
+};
+addfileModificationCheckingToOpt addfileModificationCheckingToOpt_
+(
+    "fileModificationChecking"
+);
 
 
 bool Foam::regIOobject::masterOnlyReading = false;
diff --git a/src/OpenFOAM/db/typeInfo/className.H b/src/OpenFOAM/db/typeInfo/className.H
index a6a247d234..cc0342e15d 100644
--- a/src/OpenFOAM/db/typeInfo/className.H
+++ b/src/OpenFOAM/db/typeInfo/className.H
@@ -31,6 +31,7 @@ Description
 
 #include "word.H"
 #include "debug.H"
+#include "debugName.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -133,84 +134,6 @@ public:                                                                       \
 
 
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// definitions (debug information only)
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-//- Define the debug information, lookup as \a Name
-#define registerDebugSwitchWithName(Type,Tag,Name)\
-    class add##Tag##ToDebug\
-    :\
-        public ::Foam::simpleRegIOobject\
-    {\
-    public:\
-        add##Tag##ToDebug(const char* name)\
-        :\
-            ::Foam::simpleRegIOobject(Foam::debug::addDebugObject, name)\
-        {}\
-        virtual ~add##Tag##ToDebug()\
-        {}\
-        virtual void readData(Foam::Istream& is)\
-        {\
-            Type::debug = readLabel(is);\
-        }\
-        virtual void writeData(Foam::Ostream& os) const\
-        {\
-            os << Type::debug;\
-        }\
-    };\
-    add##Tag##ToDebug add##Tag##ToDebug_(Name)
-
-
-//- Define the debug information, lookup as \a Name
-#define defineDebugSwitchWithName(Type, Name, DebugSwitch)                    \
-    int Type::debug(::Foam::debug::debugSwitch(Name, DebugSwitch))
-
-//- Define the debug information
-#define defineDebugSwitch(Type, DebugSwitch)                                  \
-    defineDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch)
-
-#ifdef __INTEL_COMPILER
-//- Define the debug information for templates, lookup as \a Name
-# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)           \
-    defineDebugSwitchWithName(Type, Name, DebugSwitch)
-//- Define the debug information for templates sub-classes, lookup as \a Name
-# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)          \
-    defineDebugSwitchWithName(Type, Name, DebugSwitch)
-#else
-//- Define the debug information for templates, lookup as \a Name
-# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)           \
-    template<>                                                                \
-    defineDebugSwitchWithName(Type, Name, DebugSwitch)
-//- Define the debug information for templates sub-classes, lookup as \a Name
-# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)          \
-    template<>                                                                \
-    defineDebugSwitchWithName(Type, Name, DebugSwitch)
-#endif
-
-//- Define the debug information for templates
-//  Useful with typedefs
-#define defineTemplateDebugSwitch(Type, DebugSwitch)                          \
-    defineTemplateDebugSwitchWithName(Type, #Type, DebugSwitch)
-
-//- Define the debug information directly for templates
-#define defineNamedTemplateDebugSwitch(Type, DebugSwitch)                     \
-    defineTemplateDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch)
-
-
-// for templated sub-classes
-
-//- Define the debug information for templates
-//  Useful with typedefs
-#define defineTemplate2DebugSwitch(Type, DebugSwitch)                         \
-    defineTemplate2DebugSwitchWithName(Type, #Type, DebugSwitch)
-
-//- Define the debug information directly for templates
-#define defineNamedTemplate2DebugSwitch(Type, DebugSwitch)                    \
-    defineTemplate2DebugSwitchWithName(Type, Type::typeName_(), DebugSwitch)
-
-
-
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // definitions (with debug information)
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/OpenFOAM/db/typeInfo/debugName.H b/src/OpenFOAM/db/typeInfo/debugName.H
new file mode 100644
index 0000000000..2277945ed4
--- /dev/null
+++ b/src/OpenFOAM/db/typeInfo/debugName.H
@@ -0,0 +1,172 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    Macro definitions for debug symbols etc.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef debugName_H
+#define debugName_H
+
+#include "simpleRegIOobject.H"
+#include "word.H"
+#include "debug.H"
+#include "label.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// definitions (debug information only)
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+//- Define the debug information, lookup as \a Name
+#define registerDebugSwitchWithName(Type,Tag,Name)                            \
+    class add##Tag##ToDebug                                                   \
+    :                                                                         \
+        public ::Foam::simpleRegIOobject                                      \
+    {                                                                         \
+    public:                                                                   \
+        add##Tag##ToDebug(const char* name)                                   \
+        :                                                                     \
+            ::Foam::simpleRegIOobject(Foam::debug::addDebugObject, name)      \
+        {}                                                                    \
+        virtual ~add##Tag##ToDebug()                                          \
+        {}                                                                    \
+        virtual void readData(Foam::Istream& is)                              \
+        {                                                                     \
+            Type::debug = readLabel(is);                                      \
+        }                                                                     \
+        virtual void writeData(Foam::Ostream& os) const                       \
+        {                                                                     \
+            os << Type::debug;                                                \
+        }                                                                     \
+    };                                                                        \
+    add##Tag##ToDebug add##Tag##ToDebug_(Name)
+
+
+//- Register info switch (if int), lookup as \a Name
+#define registerInfoSwitchWithName(Switch,Tag,Name)                           \
+    class add##Tag##ToInfo                                                    \
+    :                                                                         \
+        public ::Foam::simpleRegIOobject                                      \
+    {                                                                         \
+    public:                                                                   \
+        add##Tag##ToInfo(const char* name)                                    \
+        :                                                                     \
+            ::Foam::simpleRegIOobject(Foam::debug::addInfoObject, name)       \
+        {}                                                                    \
+        virtual ~add##Tag##ToInfo()                                           \
+        {}                                                                    \
+        virtual void readData(Foam::Istream& is)                              \
+        {                                                                     \
+            Switch = readLabel(is);                                           \
+        }                                                                     \
+        virtual void writeData(Foam::Ostream& os) const                       \
+        {                                                                     \
+            os << Switch;                                                     \
+        }                                                                     \
+    };                                                                        \
+    add##Tag##ToInfo add##Tag##ToInfo_(Name)
+
+
+//- Register optimisation switch (if int), lookup as \a Name
+#define registerOptSwitchWithName(Switch,Tag,Name)                            \
+    class add##Tag##ToOpt                                                     \
+    :                                                                         \
+        public ::Foam::simpleRegIOobject                                      \
+    {                                                                         \
+    public:                                                                   \
+        add##Tag##ToOpt(const char* name)                                     \
+        :                                                                     \
+            ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject,name)\
+        {}                                                                    \
+        virtual ~add##Tag##ToOpt()                                            \
+        {}                                                                    \
+        virtual void readData(Foam::Istream& is)                              \
+        {                                                                     \
+            Switch = readLabel(is);                                           \
+        }                                                                     \
+        virtual void writeData(Foam::Ostream& os) const                       \
+        {                                                                     \
+            os << Switch;                                                     \
+        }                                                                     \
+    };                                                                        \
+    add##Tag##ToOpt add##Tag##ToOpt_(Name)
+
+
+//- Define the debug information, lookup as \a Name
+#define defineDebugSwitchWithName(Type, Name, DebugSwitch)                    \
+    int Type::debug(::Foam::debug::debugSwitch(Name, DebugSwitch))
+
+//- Define the debug information
+#define defineDebugSwitch(Type, DebugSwitch)                                  \
+    defineDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch);          \
+    registerDebugSwitchWithName(Type, Type, Type::typeName_())
+
+#ifdef __INTEL_COMPILER
+//- Define the debug information for templates, lookup as \a Name
+# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)           \
+    defineDebugSwitchWithName(Type, Name, DebugSwitch)
+//- Define the debug information for templates sub-classes, lookup as \a Name
+# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)          \
+    defineDebugSwitchWithName(Type, Name, DebugSwitch)
+#else
+//- Define the debug information for templates, lookup as \a Name
+# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)           \
+    template<>                                                                \
+    defineDebugSwitchWithName(Type, Name, DebugSwitch)
+//- Define the debug information for templates sub-classes, lookup as \a Name
+# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)          \
+    template<>                                                                \
+    defineDebugSwitchWithName(Type, Name, DebugSwitch)
+#endif
+
+//- Define the debug information for templates
+//  Useful with typedefs
+#define defineTemplateDebugSwitch(Type, DebugSwitch)                          \
+    defineTemplateDebugSwitchWithName(Type, #Type, DebugSwitch)
+
+//- Define the debug information directly for templates
+#define defineNamedTemplateDebugSwitch(Type, DebugSwitch)                     \
+    defineTemplateDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch)
+
+
+// for templated sub-classes
+
+//- Define the debug information for templates
+//  Useful with typedefs
+#define defineTemplate2DebugSwitch(Type, DebugSwitch)                         \
+    defineTemplate2DebugSwitchWithName(Type, #Type, DebugSwitch)
+
+//- Define the debug information directly for templates
+#define defineNamedTemplate2DebugSwitch(Type, DebugSwitch)                    \
+    defineTemplate2DebugSwitchWithName(Type, Type::typeName_(), DebugSwitch)
+
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index 6dc1219562..7a6faf95c4 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,6 +194,10 @@ private:
         };
 
 
+        //- Reset exponents to nearest integer if close to it. Used to
+        //  handle reading with insufficient precision.
+        void round(const scalar tol);
+
         dimensionedScalar parse
         (
             const label lastPrior,
diff --git a/src/OpenFOAM/dimensionSet/dimensionSetIO.C b/src/OpenFOAM/dimensionSet/dimensionSetIO.C
index d41348e208..e3cbb64fd5 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSetIO.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSetIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "dimensionSet.H"
 #include "IOstreams.H"
 #include "dimensionedScalar.H"
+#include <limits>
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -142,7 +143,7 @@ void Foam::dimensionSet::tokeniser::splitWord(const word& w)
                 word subWord = w(start, i-start);
                 if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
                 {
-                    push(token(readLabel(IStringStream(subWord)())));
+                    push(token(readScalar(IStringStream(subWord)())));
                 }
                 else
                 {
@@ -153,7 +154,7 @@ void Foam::dimensionSet::tokeniser::splitWord(const word& w)
             {
                 if (isdigit(w[i]))
                 {
-                    push(token(readLabel(IStringStream(w[i])())));
+                    push(token(readScalar(IStringStream(w[i])())));
                 }
                 else
                 {
@@ -168,7 +169,7 @@ void Foam::dimensionSet::tokeniser::splitWord(const word& w)
         word subWord = w(start, w.size()-start);
         if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
         {
-            push(token(readLabel(IStringStream(subWord)())));
+            push(token(readScalar(IStringStream(subWord)())));
         }
         else
         {
@@ -213,6 +214,29 @@ void Foam::dimensionSet::tokeniser::putBack(const token& t)
 }
 
 
+void Foam::dimensionSet::round(const scalar tol)
+{
+    for (int i=0; i < dimensionSet::nDimensions; ++i)
+    {
+        scalar integralPart;
+        scalar fractionalPart = std::modf(exponents_[i], &integralPart);
+
+        if (mag(fractionalPart-1.0) <= tol)
+        {
+            exponents_[i] = 1.0+integralPart;
+        }
+        else if (mag(fractionalPart+1.0) <= tol)
+        {
+            exponents_[i] = -1.0+integralPart;
+        }
+        else if (mag(fractionalPart) <= tol)
+        {
+            exponents_[i] = integralPart;
+        }
+    }
+}
+
+
 Foam::dimensionedScalar Foam::dimensionSet::parse
 (
     const label lastPrior,
@@ -327,6 +351,8 @@ Foam::dimensionedScalar Foam::dimensionSet::parse
                     dimensionedScalar exp(parse(nextPrior, tis, readSet));
 
                     ds.dimensions().reset(pow(ds.dimensions(), exp.value()));
+                    // Round to nearest integer if close to it
+                    ds.dimensions().round(10*smallExponent);
                     ds.value() = Foam::pow(ds.value(), exp.value());
                 }
                 else
@@ -535,6 +561,8 @@ Foam::Istream& Foam::dimensionSet::read
                 s.read(readSet[symbol], readSet);
 
                 symbolSet.reset(pow(s.dimensions(), exponent));
+                // Round to nearest integer if close to it
+                symbolSet.round(10*smallExponent);
                 multiplier *= Foam::pow(s.value(), exponent);
             }
             else
@@ -634,6 +662,13 @@ Foam::Ostream& Foam::dimensionSet::write
         writeUnits.coefficients(exponents);
 
         bool hasPrinted = false;
+
+        // Set precision to lots
+        std::streamsize oldPrecision = os.precision
+        (
+            std::numeric_limits<scalar>::digits10
+        );
+
         forAll(exponents, i)
         {
             if (mag(exponents[i]) > smallExponent)
@@ -658,6 +693,9 @@ Foam::Ostream& Foam::dimensionSet::write
                 }
             }
         }
+
+        // Reset precision
+        os.precision(oldPrecision);
     }
     else
     {
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C
index 7486781df8..1e2b254da1 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,21 +35,16 @@ namespace Foam
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
+//- Since dimensionSystems() can be reread we actually store a copy of
+//  the controlDict subDict (v.s. a reference to the subDict for e.g.
+//  dimensionedConstants)
 dictionary* dimensionSystemsPtr_(NULL);
+HashTable<dimensionedScalar>* unitSetPtr_(NULL);
+dimensionSets* writeUnitSetPtr_(NULL);
 
-dictionary& dimensionSystems()
-{
-    return debug::switchSet
-    (
-        "DimensionSets",
-        dimensionSystemsPtr_
-    );
-}
-
-
-autoPtr<HashTable<dimensionedScalar> > unitSetPtr_;
-autoPtr<dimensionSets> writeUnitSetPtr_;
-
+//- Helper class to
+//  - register re-reader
+//  - deallocate demand-driven data
 class addDimensionSetsToDebug
 :
     public ::Foam::simpleRegIOobject
@@ -60,12 +55,17 @@ public:
         ::Foam::simpleRegIOobject(Foam::debug::addDimensionSetObject, name)
     {}
     virtual ~addDimensionSetsToDebug()
-    {}
+    {
+        deleteDemandDrivenData(dimensionSystemsPtr_);
+        deleteDemandDrivenData(unitSetPtr_);
+        deleteDemandDrivenData(writeUnitSetPtr_);
+
+    }
     virtual void readData(Foam::Istream& is)
     {
         deleteDemandDrivenData(dimensionSystemsPtr_);
-        unitSetPtr_.clear();
-        writeUnitSetPtr_.clear();
+        deleteDemandDrivenData(unitSetPtr_);
+        deleteDemandDrivenData(writeUnitSetPtr_);
         dimensionSystemsPtr_ = new dictionary(is);
     }
     virtual void writeData(Foam::Ostream& os) const
@@ -76,10 +76,27 @@ public:
 addDimensionSetsToDebug addDimensionSetsToDebug_("DimensionSets");
 
 
+dictionary& dimensionSystems()
+{
+    if (!dimensionSystemsPtr_)
+    {
+        dictionary* cachedPtr = NULL;
+        dimensionSystemsPtr_ = new dictionary
+        (
+            debug::switchSet
+            (
+                "DimensionSets",
+                cachedPtr
+            )
+        );
+    }
+    return *dimensionSystemsPtr_;
+}
+
 
 const HashTable<dimensionedScalar>& unitSet()
 {
-    if (!unitSetPtr_.valid())
+    if (!unitSetPtr_)
     {
         const dictionary& dict = dimensionSystems();
 
@@ -101,10 +118,7 @@ const HashTable<dimensionedScalar>& unitSet()
 
         const dictionary& unitDict = dict.subDict(unitSetCoeffs);
 
-        unitSetPtr_.reset
-        (
-            new HashTable<dimensionedScalar>(unitDict.size())
-        );
+        unitSetPtr_ = new HashTable<dimensionedScalar>(unitDict.size());
 
         forAllConstIter(dictionary, unitDict, iter)
         {
@@ -132,14 +146,7 @@ const HashTable<dimensionedScalar>& unitSet()
             )
         );
 
-        writeUnitSetPtr_.reset
-        (
-            new dimensionSets
-            (
-                unitSetPtr_(),
-                writeUnitNames
-            )
-        );
+        writeUnitSetPtr_ = new dimensionSets(*unitSetPtr_, writeUnitNames);
 
         if (writeUnitNames.size() != 0 && writeUnitNames.size() != 7)
         {
@@ -149,17 +156,17 @@ const HashTable<dimensionedScalar>& unitSet()
                 << exit(FatalIOError);
         }
     }
-    return unitSetPtr_();
+    return *unitSetPtr_;
 }
 
 
 const dimensionSets& writeUnitSet()
 {
-    if (!writeUnitSetPtr_.valid())
+    if (!writeUnitSetPtr_)
     {
         (void)unitSet();
     }
-    return writeUnitSetPtr_();
+    return *writeUnitSetPtr_;
 }
 
 
diff --git a/src/OpenFOAM/global/constants/atomic/atomicConstants.C b/src/OpenFOAM/global/constants/atomic/atomicConstants.C
index f6af6660d4..eaa9f18f6b 100644
--- a/src/OpenFOAM/global/constants/atomic/atomicConstants.C
+++ b/src/OpenFOAM/global/constants/atomic/atomicConstants.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,100 +32,107 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-const char* const Foam::constant::atomic::group = "atomic";
+namespace Foam
+{
+namespace constant
+{
+
+const char* const atomic::group = "atomic";
 
 
-const Foam::dimensionedScalar Foam::constant::atomic::alpha
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    atomic::group,
+    atomic::alpha,
+    dimensionedScalar
     (
-        group,
         "alpha",
-        dimensionedScalar
-        (
-            "alpha",
-            sqr(constant::electromagnetic::e)
-           /(
-                dimensionedScalar("C", dimless, 2.0)
-               *constant::electromagnetic::epsilon0
-               *constant::universal::h
-               *constant::universal::c
-            )
-        )
-    )
-);
-
-
-const Foam::dimensionedScalar Foam::constant::atomic::Rinf
-(
-    dimensionedConstant
-    (
-        group,
-        "Rinf",
-        dimensionedScalar
-        (
-            "Rinf",
-            sqr(alpha)*me*constant::universal::c
-           /(dimensionedScalar("C", dimless, 2.0)*constant::universal::h)
-        )
-    )
-);
-
-
-const Foam::dimensionedScalar Foam::constant::atomic::a0
-(
-    dimensionedConstant
-    (
-        group,
-        "a0",
-        dimensionedScalar
-        (
-            "a0",
-            alpha
-           /(
-               dimensionedScalar("C", dimless, 4.0*constant::mathematical::pi)
-              *Rinf
-           )
-        )
-    )
-);
-
-
-const Foam::dimensionedScalar Foam::constant::atomic::re
-(
-    dimensionedConstant
-    (
-        group,
-        "re",
-        dimensionedScalar
-        (
-            "re",
-            sqr(constant::electromagnetic::e)
-           /(
-                dimensionedScalar("C", dimless, 4.0*constant::mathematical::pi)
-               *constant::electromagnetic::epsilon0
-               *me
-               *sqr(constant::universal::c)
-            )
-        )
-    )
-);
-
-
-const Foam::dimensionedScalar Foam::constant::atomic::Eh
-(
-    dimensionedConstant
-    (
-        group,
-        "Eh",
-        dimensionedScalar
-        (
-            "Eh",
+        sqr(electromagnetic::e)
+       /(
             dimensionedScalar("C", dimless, 2.0)
-           *Rinf*constant::universal::h*constant::universal::c
+           *electromagnetic::epsilon0
+           *universal::h
+           *universal::c
         )
-    )
+    ),
+    constantatomicalpha,
+    "alpha"
 );
 
 
+defineDimensionedConstantWithDefault
+(
+    atomic::group,
+    atomic::Rinf,
+    dimensionedScalar
+    (
+        "Rinf",
+        sqr(atomic::alpha)
+       *atomic::me
+       *universal::c
+       /(Foam::dimensionedScalar("C", Foam::dimless, 2.0)*universal::h)
+    ),
+    constantatomicRinf,
+    "Rinf"
+);
+
+
+defineDimensionedConstantWithDefault
+(
+    atomic::group,
+    atomic::a0,
+    dimensionedScalar
+    (
+        "a0",
+        atomic::alpha
+       /(
+           Foam::dimensionedScalar("C", Foam::dimless, 4.0*mathematical::pi)
+          *atomic::Rinf
+        )
+    ),
+    constantatomica0,
+    "a0"
+);
+
+
+defineDimensionedConstantWithDefault
+(
+    atomic::group,
+    atomic::re,
+    dimensionedScalar
+    (
+        "re",
+        Foam::sqr(electromagnetic::e)
+       /(
+            Foam::dimensionedScalar("C", Foam::dimless, 4.0*mathematical::pi)
+           *electromagnetic::epsilon0
+           *atomic::me
+           *Foam::sqr(universal::c)
+        )
+    ),
+    constantatomicre,
+    "re"
+);
+
+
+defineDimensionedConstantWithDefault
+(
+    atomic::group,
+    atomic::Eh,
+    dimensionedScalar
+    (
+        "Eh",
+        Foam::dimensionedScalar("C", Foam::dimless, 2.0)
+       *atomic::Rinf*universal::h*universal::c
+    ),
+    constantatomicEh,
+    "Eh"
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace constant
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/constants/constants.C b/src/OpenFOAM/global/constants/constants.C
index 94eb57cffd..202855d8d2 100644
--- a/src/OpenFOAM/global/constants/constants.C
+++ b/src/OpenFOAM/global/constants/constants.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // Constants supplied in the main controlDict
 #include "fundamentalConstants.C"
 
-// Derived constants
+// Derived constants. Note:order is important
 #include "universalConstants.C"
 #include "electromagneticConstants.C"
 #include "atomicConstants.C"
diff --git a/src/OpenFOAM/global/constants/dimensionedConstants.H b/src/OpenFOAM/global/constants/dimensionedConstants.H
index 010addd4cf..188f755cac 100644
--- a/src/OpenFOAM/global/constants/dimensionedConstants.H
+++ b/src/OpenFOAM/global/constants/dimensionedConstants.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,6 +92,104 @@ T dimensionedConstant
 }
 
 
+//- Defined dimensioned constant , lookup as \a Name
+#define defineDimensionedConstant(Group,Switch,Tag,Name)                      \
+    const Foam::dimensionedScalar Switch;                                     \
+    class add##Tag##ToDimensionedConstant                                     \
+    :                                                                         \
+        public Foam::simpleRegIOobject                                        \
+    {                                                                         \
+    public:                                                                   \
+        add##Tag##ToDimensionedConstant(const char* name)                     \
+        :                                                                     \
+            Foam::simpleRegIOobject                                           \
+            (Foam::debug::addDimensionedConstantObject,name)                  \
+        {                                                                     \
+            Foam::dimensionedScalar ds                                        \
+            (                                                                 \
+                Foam::dimensionedConstant                                     \
+                (                                                             \
+                    Group,                                                    \
+                    Name                                                      \
+                )                                                             \
+            );                                                                \
+            Foam::dimensionedScalar& s = const_cast<Foam::dimensionedScalar&> \
+            (                                                                 \
+                Switch                                                        \
+            );                                                                \
+            s.dimensions().reset(ds.dimensions());                            \
+            s = ds;                                                           \
+        }                                                                     \
+        virtual ~add##Tag##ToDimensionedConstant()                            \
+        {}                                                                    \
+        virtual void readData(Foam::Istream& is)                              \
+        {                                                                     \
+            const_cast<Foam::dimensionedScalar&>(Switch) =                    \
+                Foam::dimensionedConstant                                     \
+                (                                                             \
+                    Group,                                                    \
+                    Name                                                      \
+                );                                                            \
+        }                                                                     \
+        virtual void writeData(Foam::Ostream& os) const                       \
+        {                                                                     \
+            os << Switch;                                                     \
+        }                                                                     \
+    };                                                                        \
+    add##Tag##ToDimensionedConstant add##Tag##ToDimensionedConstant_(Name)
+
+
+//- Defined dimensioned constant with default , lookup as \a Name
+#define defineDimensionedConstantWithDefault\
+(Group,Switch,DefaultExpr,Tag,Name)                                           \
+    const Foam::dimensionedScalar Switch;                                     \
+    class add##Tag##ToDimensionedConstantWithDefault                          \
+    :                                                                         \
+        public Foam::simpleRegIOobject                                        \
+    {                                                                         \
+    public:                                                                   \
+        add##Tag##ToDimensionedConstantWithDefault(const char* name)          \
+        :                                                                     \
+            Foam::simpleRegIOobject                                           \
+            (Foam::debug::addDimensionedConstantObject,name)                  \
+        {                                                                     \
+            Foam::dimensionedScalar ds                                        \
+            (                                                                 \
+                Foam::dimensionedConstant                                     \
+                (                                                             \
+                    Group,                                                    \
+                    Name,                                                     \
+                    Foam::dimensionedScalar(Name,DefaultExpr)                 \
+                )                                                             \
+            );                                                                \
+            Foam::dimensionedScalar& s = const_cast<Foam::dimensionedScalar&> \
+            (                                                                 \
+                Switch                                                        \
+            );                                                                \
+            s.dimensions().reset(ds.dimensions());                            \
+            s = ds;                                                           \
+        }                                                                     \
+        virtual ~add##Tag##ToDimensionedConstantWithDefault()                 \
+        {}                                                                    \
+        virtual void readData(Foam::Istream& is)                              \
+        {                                                                     \
+            const_cast<Foam::dimensionedScalar&>(Switch) =                    \
+                Foam::dimensionedConstant                                     \
+                (                                                             \
+                    Group,                                                    \
+                    Name,                                                     \
+                    Foam::dimensionedScalar(Name,DefaultExpr)                 \
+                );                                                            \
+        }                                                                     \
+        virtual void writeData(Foam::Ostream& os) const                       \
+        {                                                                     \
+            os << Switch;                                                     \
+        }                                                                     \
+    };                                                                        \
+    add##Tag##ToDimensionedConstantWithDefault                                \
+        add##Tag##ToDimensionedConstantWithDefault_(Name)
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/global/constants/electromagnetic/electromagneticConstants.C b/src/OpenFOAM/global/constants/electromagnetic/electromagneticConstants.C
index 4297e24f4c..2237f78e98 100644
--- a/src/OpenFOAM/global/constants/electromagnetic/electromagneticConstants.C
+++ b/src/OpenFOAM/global/constants/electromagnetic/electromagneticConstants.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,135 +32,145 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-const char* const Foam::constant::electromagnetic::group = "electromagnetic";
+namespace Foam
+{
+namespace constant
+{
+
+const char* const electromagnetic::group = "electromagnetic";
 
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::mu0
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    electromagnetic::group,
+    electromagnetic::mu0,
+    dimensionedScalar
     (
-        group,
         "mu0",
-        dimensionedScalar
-        (
-            "mu0",
-            dimensionSet(1, 1, -2, 0, 0, -2, 0),
-            4.0*constant::mathematical::pi*1e-07
-        )
-    )
+        dimensionSet(1, 1, -2, 0, 0, -2, 0),
+        4.0*mathematical::pi*1e-07
+    ),
+    constantelectromagneticmu0,
+    "mu0"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::epsilon0
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    electromagnetic::group,
+    electromagnetic::epsilon0,
+
+    dimensionedScalar
     (
-        group,
         "epsilon0",
-        dimensionedScalar
-        (
-            "epsilon0",
-            dimensionedScalar("C", dimless, 1.0)
-           /(mu0*sqr(constant::universal::c))
-        )
-    )
+        dimensionedScalar("C", dimless, 1.0)
+       /(electromagnetic::mu0*sqr(universal::c))
+    ),
+    constantelectromagneticepsilon0,
+    "epsilon0"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::Z0
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    electromagnetic::group,
+    electromagnetic::Z0,
+    dimensionedScalar
     (
-        group,
         "Z0",
-        dimensionedScalar
-        (
-            "Z0",
-            mu0*constant::universal::c
-        )
-    )
+        electromagnetic::mu0*universal::c
+    ),
+    constantelectromagneticZ0,
+    "Z0"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::kappa
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    electromagnetic::group,
+    electromagnetic::kappa,
+
+    dimensionedScalar
     (
-        group,
         "kappa",
         dimensionedScalar
         (
-            "kappa",
-            dimensionedScalar
-            (
-                "C",
-                dimless,
-                1.0/(4.0*constant::mathematical::pi)
-            )
-           /epsilon0
+            "C",
+            Foam::dimless,
+            1.0/(4.0*mathematical::pi)
         )
-    )
+       /electromagnetic::epsilon0
+    ),
+
+    constantelectromagnetickappa,
+    "kappa"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::G0
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    electromagnetic::group,
+    electromagnetic::G0,
+    dimensionedScalar
     (
-        group,
         "G0",
-        dimensionedScalar
-        (
-            "G0",
-            dimensionedScalar("C", dimless, 2)*sqr(e)/constant::universal::h
-        )
-    )
+        dimensionedScalar("C", dimless, 2)
+       *sqr(electromagnetic::e)
+       /universal::h
+    ),
+    constantelectromagneticG0,
+    "G0"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::KJ
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    electromagnetic::group,
+    electromagnetic::KJ,
+    dimensionedScalar
     (
-        group,
         "KJ",
-        dimensionedScalar
-        (
-            "KJ",
-            dimensionedScalar("C", dimless, 2)*e/constant::universal::h
-        )
-    )
+        dimensionedScalar("C", dimless, 2)
+       *electromagnetic::e
+       /universal::h
+    ),
+    constantelectromagneticKJ,
+    "KJ"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::phi0
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    electromagnetic::group,
+    electromagnetic::phi0,
+    dimensionedScalar
     (
-        group,
         "phi0",
-        dimensionedScalar
-        (
-            "phi0",
-            constant::universal::h/(dimensionedScalar("C", dimless, 2)*e)
-        )
-    )
+        universal::h
+       /(dimensionedScalar("C", dimless, 2)*electromagnetic::e)
+    ),
+    constantelectromagneticphi0,
+    "phi0"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::RK
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    electromagnetic::group,
+    electromagnetic::RK,
+    dimensionedScalar
     (
-        group,
         "RK",
-        dimensionedScalar
-        (
-            "RK",
-            constant::universal::h/sqr(e)
-        )
-    )
+        universal::h/Foam::sqr(electromagnetic::e)
+    ),
+    constantelectromagneticRK,
+    "RK"
 );
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace constant
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/constants/fundamental/fundamentalConstants.C b/src/OpenFOAM/global/constants/fundamental/fundamentalConstants.C
index 3e85524f49..b51e8dc2d6 100644
--- a/src/OpenFOAM/global/constants/fundamental/fundamentalConstants.C
+++ b/src/OpenFOAM/global/constants/fundamental/fundamentalConstants.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,89 +39,127 @@ Description
 
 // Universal constants
 
-const Foam::dimensionedScalar Foam::constant::universal::c
+namespace Foam
+{
+namespace constant
+{
+
+defineDimensionedConstant
 (
-    dimensionedConstant(universal::group, "c")
+    universal::group,
+    universal::c,
+    constantuniversalc,
+    "c"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::universal::G
+defineDimensionedConstant
 (
-    dimensionedConstant(universal::group, "G")
+    universal::group,
+    universal::G,
+    constantuniversalG,
+    "G"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::universal::h
+defineDimensionedConstant
 (
-    dimensionedConstant(universal::group, "h")
+    universal::group,
+    universal::h,
+    constantuniversalh,
+    "h"
 );
 
 
 // Electromagnetic
 
-const Foam::dimensionedScalar Foam::constant::electromagnetic::e
+defineDimensionedConstant
 (
-    dimensionedConstant(electromagnetic::group, "e")
+    electromagnetic::group,
+    electromagnetic::e,
+    constantelectromagnetice,
+    "e"
 );
 
 
 // Atomic
 
-const Foam::dimensionedScalar Foam::constant::atomic::me
+defineDimensionedConstant
 (
-    dimensionedConstant(atomic::group, "me")
+    atomic::group,
+    atomic::me,
+    constantatomicme,
+    "me"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::atomic::mp
+defineDimensionedConstant
 (
-    dimensionedConstant(atomic::group, "mp")
+    atomic::group,
+    atomic::mp,
+    constantatomicmp,
+    "mp"
 );
 
 
 // Physico-chemical
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::mu
+defineDimensionedConstant
 (
-    dimensionedConstant(physicoChemical::group, "mu")
+    physicoChemical::group,
+    physicoChemical::mu,
+    constantphysicoChemicalmu,
+    "mu"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::NA
+defineDimensionedConstantWithDefault
 (
-//    dimensionedConstant(physicoChemical::group, "NA")
-    dimensionedConstant
+    physicoChemical::group,
+    physicoChemical::NA,
+    Foam::dimensionedScalar
     (
-        physicoChemical::group,
         "NA",
-        dimensionedScalar
-        (
-            "NA",
-            dimless/dimMoles,
-            6.0221417930e+23
-        )
-    )
+        Foam::dimless/Foam::dimMoles,
+        6.0221417930e+23
+    ),
+    constantphysicoChemicalNA,
+    "NA"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::k
+defineDimensionedConstant
 (
-    dimensionedConstant(physicoChemical::group, "k")
+    physicoChemical::group,
+    physicoChemical::k,
+    constantphysicoChemicalk,
+    "k"
 );
 
 
 // Standard
 
-const Foam::dimensionedScalar Foam::constant::standard::Pstd
+defineDimensionedConstant
 (
-    dimensionedConstant("standard", "Pstd")
+    "standard",
+    standard::Pstd,
+    constantstandardPstd,
+    "Pstd"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::standard::Tstd
+defineDimensionedConstant
 (
-    dimensionedConstant("standard", "Tstd")
+    "standard",
+    standard::Tstd,
+    constantstandardTstd,
+    "Tstd"
 );
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace constant
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.C b/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.C
index 8cf5cfdb6f..fe7520a9c5 100644
--- a/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.C
+++ b/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,105 +32,109 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-const char* const Foam::constant::physicoChemical::group = "physicoChemical";
+namespace Foam
+{
+namespace constant
+{
 
+const char* const physicoChemical::group = "physicoChemical";
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::R
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    physicoChemical::group,
+    physicoChemical::R,
+    dimensionedScalar
     (
-        group,
         "R",
-        dimensionedScalar
-        (
-            "R",
-            NA*k
-        )
-    )
+        physicoChemical::NA*physicoChemical::k
+    ),
+    constantphysicoChemicalR,
+    "R"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::F
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    physicoChemical::group,
+    physicoChemical::F,
+    dimensionedScalar
     (
-        group,
         "F",
-        dimensionedScalar
-        (
-            "F",
-            NA*constant::electromagnetic::e
-        )
-    )
+        physicoChemical::NA*electromagnetic::e
+    ),
+    constantphysicoChemicalF,
+    "F"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::sigma
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    physicoChemical::group,
+    physicoChemical::sigma,
+    dimensionedScalar
     (
-        group,
         "sigma",
-        dimensionedScalar
+        Foam::dimensionedScalar
         (
-            "sigma",
-            dimensionedScalar
-            (
-                "C",
-                dimless,
-                sqr(constant::mathematical::pi)/60.0
-            )
-           *pow4(k)/(pow3(constant::universal::hr)*sqr(constant::universal::c))
+            "C",
+            Foam::dimless,
+            Foam::sqr(mathematical::pi)/60.0
         )
-    )
+       *Foam::pow4(physicoChemical::k)
+       /(pow3(universal::hr)*sqr(universal::c))
+    ),
+    constantphysicoChemicalsigma,
+    "sigma"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::b
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    physicoChemical::group,
+    physicoChemical::b,
+    dimensionedScalar
     (
-        group,
         "b",
-        dimensionedScalar
-        (
-            "b",
-            (constant::universal::h*constant::universal::c/k)
-           /dimensionedScalar("C", dimless, 4.965114231)
-        )
-    )
+        (universal::h*universal::c/physicoChemical::k)
+       /Foam::dimensionedScalar("C", Foam::dimless, 4.965114231)
+    ),
+    constantphysicoChemicalb,
+    "b"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::c1
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    physicoChemical::group,
+    physicoChemical::c1,
+    dimensionedScalar
     (
-        group,
         "c1",
-        dimensionedScalar
-        (
-            "c1",
-            dimensionedScalar("C", dimless, constant::mathematical::twoPi)
-           *constant::universal::h*sqr(constant::universal::c)
-        )
-    )
+        Foam::dimensionedScalar("C", Foam::dimless, mathematical::twoPi)
+       *universal::h*Foam::sqr(universal::c)
+    ),
+    constantphysicoChemicalc1,
+    "c1"
 );
 
 
-const Foam::dimensionedScalar Foam::constant::physicoChemical::c2
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    physicoChemical::group,
+    physicoChemical::c2,
+    dimensionedScalar
     (
-        group,
         "c2",
-        dimensionedScalar
-        (
-            "c2",
-            constant::universal::h*constant::universal::c/k
-        )
-    )
+        universal::h*universal::c/physicoChemical::k
+    ),
+    constantphysicoChemicalc2,
+    "c2"
 );
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace constant
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/constants/universal/universalConstants.C b/src/OpenFOAM/global/constants/universal/universalConstants.C
index 32e5459181..c5bb8d05e1 100644
--- a/src/OpenFOAM/global/constants/universal/universalConstants.C
+++ b/src/OpenFOAM/global/constants/universal/universalConstants.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,22 +30,32 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-const char* const Foam::constant::universal::group = "universal";
+namespace Foam
+{
+namespace constant
+{
+
+const char* const universal::group = "universal";
 
 
-const Foam::dimensionedScalar Foam::constant::universal::hr
+defineDimensionedConstantWithDefault
 (
-    dimensionedConstant
+    "universal",
+    universal::hr,
+    dimensionedScalar
     (
-        group,
         "hr",
-        dimensionedScalar
-        (
-            "hr",
-            h/(dimensionedScalar("C", dimless, constant::mathematical::twoPi))
-        )
-    )
+        universal::h
+       /(dimensionedScalar("C", dimless, mathematical::twoPi))
+    ),
+    constantuniversalhr,
+    "hr"
 );
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace constant
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C
index 2abbc5826d..f8f513322c 100644
--- a/src/OpenFOAM/global/debug/debug.C
+++ b/src/OpenFOAM/global/debug/debug.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,6 +47,14 @@ dictionary* debugSwitchesPtr_(NULL);
 dictionary* infoSwitchesPtr_(NULL);
 dictionary* optimisationSwitchesPtr_(NULL);
 
+// Debug switch read and write callback tables.
+simpleObjectRegistry* debugObjectsPtr_(NULL);
+simpleObjectRegistry* infoObjectsPtr_(NULL);
+simpleObjectRegistry* optimisationObjectsPtr_(NULL);
+simpleObjectRegistry* dimensionSetObjectsPtr_(NULL);
+simpleObjectRegistry* dimensionedConstantObjectsPtr_(NULL);
+
+
 // to ensure controlDictPtr_ is deleted at the end of the run
 class deleteControlDictPtr
 {
@@ -57,35 +65,20 @@ public:
 
     ~deleteControlDictPtr()
     {
+        deleteDemandDrivenData(debugObjectsPtr_);
+        deleteDemandDrivenData(infoObjectsPtr_);
+        deleteDemandDrivenData(optimisationObjectsPtr_);
+        deleteDemandDrivenData(dimensionSetObjectsPtr_);
+        deleteDemandDrivenData(dimensionedConstantObjectsPtr_);
+
+        debugSwitchesPtr_ = NULL;
+        infoSwitchesPtr_ = NULL;
+        optimisationSwitchesPtr_ = NULL;
         deleteDemandDrivenData(controlDictPtr_);
     }
 };
 
 deleteControlDictPtr deleteControlDictPtr_;
-
-
-// Debug switch read and write callback tables.
-simpleObjectRegistry* debugObjectsPtr_(NULL);
-simpleObjectRegistry* infoObjectsPtr_(NULL);
-simpleObjectRegistry* optimisationObjectsPtr_(NULL);
-simpleObjectRegistry* dimensionSetObjectsPtr_(NULL);
-class deleteDebugSwitchPtr
-{
-public:
-
-    deleteDebugSwitchPtr()
-    {}
-
-    ~deleteDebugSwitchPtr()
-    {
-        deleteDemandDrivenData(debugObjectsPtr_);
-        deleteDemandDrivenData(infoObjectsPtr_);
-        deleteDemandDrivenData(optimisationObjectsPtr_);
-        deleteDemandDrivenData(dimensionSetObjectsPtr_);
-    }
-};
-
-deleteDebugSwitchPtr deleteDebugSwitchPtr_;
 //! \endcond
 
 
@@ -190,13 +183,43 @@ int Foam::debug::optimisationSwitch(const char* name, const int defaultValue)
 
 void Foam::debug::addDebugObject(const char* name, simpleRegIOobject* obj)
 {
-    debugObjects().insert(name, obj);
+    simpleObjectRegistryEntry* ptr = debugObjects().lookupPtr(name);
+    if (ptr)
+    {
+        ptr->append(obj);
+    }
+    else
+    {
+        debugObjects().append
+        (
+            name,
+            new simpleObjectRegistryEntry
+            (
+                List<simpleRegIOobject*>(1, obj)
+            )
+        );
+    }
 }
 
 
 void Foam::debug::addInfoObject(const char* name, simpleRegIOobject* obj)
 {
-    infoObjects().insert(name, obj);
+    simpleObjectRegistryEntry* ptr = infoObjects().lookupPtr(name);
+    if (ptr)
+    {
+        ptr->append(obj);
+    }
+    else
+    {
+        infoObjects().append
+        (
+            name,
+            new simpleObjectRegistryEntry
+            (
+                List<simpleRegIOobject*>(1, obj)
+            )
+        );
+    }
 }
 
 
@@ -206,7 +229,22 @@ void Foam::debug::addOptimisationObject
     simpleRegIOobject* obj
 )
 {
-    optimisationObjects().insert(name, obj);
+    simpleObjectRegistryEntry* ptr = optimisationObjects().lookupPtr(name);
+    if (ptr)
+    {
+        ptr->append(obj);
+    }
+    else
+    {
+        optimisationObjects().append
+        (
+            name,
+            new simpleObjectRegistryEntry
+            (
+                List<simpleRegIOobject*>(1, obj)
+            )
+        );
+    }
 }
 
 
@@ -216,7 +254,50 @@ void Foam::debug::addDimensionSetObject
     simpleRegIOobject* obj
 )
 {
-    dimensionSetObjects().insert(name, obj);
+    simpleObjectRegistryEntry* ptr = dimensionSetObjects().lookupPtr(name);
+    if (ptr)
+    {
+        ptr->append(obj);
+    }
+    else
+    {
+        dimensionSetObjects().append
+        (
+            name,
+            new simpleObjectRegistryEntry
+            (
+                List<simpleRegIOobject*>(1, obj)
+            )
+        );
+    }
+}
+
+
+void Foam::debug::addDimensionedConstantObject
+(
+    const char* name,
+    simpleRegIOobject* obj
+)
+{
+    simpleObjectRegistryEntry* ptr = dimensionedConstantObjects().lookupPtr
+    (
+        name
+    );
+    if (ptr)
+    {
+        ptr->append(obj);
+    }
+    else
+    {
+        dimensionedConstantObjects().append
+        (
+            name,
+            new simpleObjectRegistryEntry
+            (
+                List<simpleRegIOobject*>(1, obj)
+            )
+        );
+    }
 }
 
 
@@ -235,7 +316,7 @@ Foam::simpleObjectRegistry& Foam::debug::infoObjects()
 {
     if (!infoObjectsPtr_)
     {
-        infoObjectsPtr_ = new simpleObjectRegistry(1000);
+        infoObjectsPtr_ = new simpleObjectRegistry(100);
     }
 
     return *infoObjectsPtr_;
@@ -246,7 +327,7 @@ Foam::simpleObjectRegistry& Foam::debug::optimisationObjects()
 {
     if (!optimisationObjectsPtr_)
     {
-        optimisationObjectsPtr_ = new simpleObjectRegistry(1000);
+        optimisationObjectsPtr_ = new simpleObjectRegistry(100);
     }
 
     return *optimisationObjectsPtr_;
@@ -257,13 +338,24 @@ Foam::simpleObjectRegistry& Foam::debug::dimensionSetObjects()
 {
     if (!dimensionSetObjectsPtr_)
     {
-        dimensionSetObjectsPtr_ = new simpleObjectRegistry(1000);
+        dimensionSetObjectsPtr_ = new simpleObjectRegistry(100);
     }
 
     return *dimensionSetObjectsPtr_;
 }
 
 
+Foam::simpleObjectRegistry& Foam::debug::dimensionedConstantObjects()
+{
+    if (!dimensionedConstantObjectsPtr_)
+    {
+        dimensionedConstantObjectsPtr_ = new simpleObjectRegistry(100);
+    }
+
+    return *dimensionedConstantObjectsPtr_;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
diff --git a/src/OpenFOAM/global/debug/debug.H b/src/OpenFOAM/global/debug/debug.H
index 09697c57a7..4eeb8cbb53 100644
--- a/src/OpenFOAM/global/debug/debug.H
+++ b/src/OpenFOAM/global/debug/debug.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,6 +93,9 @@ namespace debug
         //- Register DimensionSets read/write object
         void addDimensionSetObject(const char* name, simpleRegIOobject* obj);
 
+        //- Register DimensionedConstant read/write object
+        void addDimensionedConstantObject(const char* name, simpleRegIOobject*);
+
 
         //- Get access to registered debug switch objects
         simpleObjectRegistry& debugObjects();
@@ -106,6 +109,8 @@ namespace debug
         //- Get access to registered dimensionSets switch objects
         simpleObjectRegistry& dimensionSetObjects();
 
+        //- Get access to registered dimensionedConstant switch objects
+        simpleObjectRegistry& dimensionedConstantObjects();
 
 } // End namespace debug
 
diff --git a/src/OpenFOAM/global/debug/simpleObjectRegistry.H b/src/OpenFOAM/global/debug/simpleObjectRegistry.H
index 61d0931f49..91475b8b5a 100644
--- a/src/OpenFOAM/global/debug/simpleObjectRegistry.H
+++ b/src/OpenFOAM/global/debug/simpleObjectRegistry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::simpleObjectRegistry
 
 Description
-    Object registry for simpleRegIOobject
+    Object registry for simpleRegIOobject. Maintains ordering.
 
 SourceFiles
 
@@ -34,7 +34,8 @@ SourceFiles
 #ifndef simpleObjectRegistry_H
 #define simpleObjectRegistry_H
 
-#include "HashTable.H"
+//#include "UPtrDictionary.H"
+#include "Dictionary.H"
 #include "simpleRegIOobject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -43,21 +44,39 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class simpleObjectRegistry Declaration
+                   Class simpleObjectRegistryEntry Declaration
+\*---------------------------------------------------------------------------*/
+
+class simpleObjectRegistryEntry
+:
+    public Dictionary<simpleObjectRegistryEntry>::link,
+    public List<simpleRegIOobject*>
+{
+public:
+
+    simpleObjectRegistryEntry(const List<simpleRegIOobject*>& data)
+    :
+        List<simpleRegIOobject*>(data)
+    {}
+};
+
+
+/*---------------------------------------------------------------------------*\
+                      Class simpleObjectRegistry Declaration
 \*---------------------------------------------------------------------------*/
 
 class simpleObjectRegistry
 :
-    public HashTable<simpleRegIOobject*>
+    public Dictionary<simpleObjectRegistryEntry>
 {
 public:
 
     // Constructors
 
-        //- Construct from initial estimate
+        //- Construct given initial table size
         simpleObjectRegistry(const label nIoObjects = 128)
         :
-            HashTable<simpleRegIOobject*>(nIoObjects)
+            Dictionary<simpleObjectRegistryEntry>(nIoObjects)
         {}
 
 };
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index 7c12295edb..7c59cfc2f6 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,8 +33,9 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(graph::writer, 0);
-    defineRunTimeSelectionTable(graph::writer, word);
+    typedef graph::writer graphWriter;
+    defineTypeNameAndDebug(graphWriter, 0);
+    defineRunTimeSelectionTable(graphWriter, word);
 }
 
 
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
index 6bba442cda..d6bc7f7b71 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
@@ -27,6 +27,13 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<class Type>
+inline Foam::DiagonalMatrix<Type>::DiagonalMatrix()
+:
+    List<Type>()
+{}
+
+
 template<class Type>
 template<class Form>
 Foam::DiagonalMatrix<Type>::DiagonalMatrix(const Matrix<Form, Type>& a)
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
index c89f915578..031320a457 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
@@ -60,6 +60,9 @@ public:
 
     // Constructors
 
+        //- Null constructor.
+        DiagonalMatrix<Type>();
+
         //- Construct from diagonal component of a Matrix
         template<class Form>
         DiagonalMatrix<Type>(const Matrix<Form, Type>&);
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index c7dbb073e4..861a20dfaf 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -421,6 +421,40 @@ Form Foam::operator*(const scalar s, const Matrix<Form, Type>& a)
 }
 
 
+template<class Form, class Type>
+Form Foam::operator*(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
+{
+    if (a.m() != b.n())
+    {
+        FatalErrorIn
+        (
+            "Matrix<Form, Type>::operator*"
+            "(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
+        )   << "attempted to multiply incompatible matrices:" << nl
+            << "Matrix A : " << a.n() << " rows, " << a.m() << " columns" << nl
+            << "Matrix B : " << b.n() << " rows, " << b.m() << " columns" << nl
+            << "In order to multiply matrices, columns of A must equal "
+            << "rows of B"
+            << abort(FatalError);
+    }
+
+    Form ab(a.n(), b.m(), scalar(0));
+
+    for (register label i = 0; i < ab.n(); i++)
+    {
+        for (register label j = 0; j < ab.m(); j++)
+        {
+            for (register label l = 0; l < b.n(); l++)
+            {
+                ab[i][j] += a[i][l]*b[l][j];
+            }
+        }
+    }
+
+    return ab;
+}
+
+
 // * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
 
 #include "MatrixIO.C"
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 89554d4cad..dd55db770c 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -215,6 +215,12 @@ template<class Form, class Type> Form operator*
     const Matrix<Form, Type>&
 );
 
+template<class Form, class Type> Form operator*
+(
+    const Matrix<Form, Type>&,
+    const Matrix<Form, Type>&
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index 94e5073fa3..725433247c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -258,7 +258,8 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
                     (
                         Pstream::nonBlocking,
                         restrictMap
-                    )
+                    ),
+                    fineLevelIndex
                 ).ptr()
             );
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
index 4d2ec30de2..7ae547c0bb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,11 @@ Foam::GAMGSolver::GAMGSolver
     // which may be overridden by those in controlDict
     cacheAgglomeration_(false),
     nPreSweeps_(0),
+    preSweepsLevelMultiplier_(1),
+    maxPreSweeps_(4),
     nPostSweeps_(2),
+    postSweepsLevelMultiplier_(1),
+    maxPostSweeps_(4),
     nFinestSweeps_(2),
     scaleCorrection_(matrix.symmetric()),
     directSolveCoarsest_(false),
@@ -156,7 +160,19 @@ void Foam::GAMGSolver::readControls()
     // we could also consider supplying defaults here too
     controlDict_.readIfPresent("cacheAgglomeration", cacheAgglomeration_);
     controlDict_.readIfPresent("nPreSweeps", nPreSweeps_);
+    controlDict_.readIfPresent
+    (
+        "preSweepsLevelMultiplier",
+        preSweepsLevelMultiplier_
+    );
+    controlDict_.readIfPresent("maxPreSweeps", maxPreSweeps_);
     controlDict_.readIfPresent("nPostSweeps", nPostSweeps_);
+    controlDict_.readIfPresent
+    (
+        "postSweepsLevelMultiplier",
+        postSweepsLevelMultiplier_
+    );
+    controlDict_.readIfPresent("maxPostSweeps", maxPostSweeps_);
     controlDict_.readIfPresent("nFinestSweeps", nFinestSweeps_);
     controlDict_.readIfPresent("scaleCorrection", scaleCorrection_);
     controlDict_.readIfPresent("directSolveCoarsest", directSolveCoarsest_);
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index 273d2c75b2..c2aefbea16 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -79,9 +79,21 @@ class GAMGSolver
         //- Number of pre-smoothing sweeps
         label nPreSweeps_;
 
+        //- Lever multiplier for the number of pre-smoothing sweeps
+        label preSweepsLevelMultiplier_;
+
+        //- Maximum number of pre-smoothing sweeps
+        label maxPreSweeps_;
+
         //- Number of post-smoothing sweeps
         label nPostSweeps_;
 
+        //- Lever multiplier for the number of post-smoothing sweeps
+        label postSweepsLevelMultiplier_;
+
+        //- Maximum number of post-smoothing sweeps
+        label maxPostSweeps_;
+
         //- Number of smoothing sweeps on finest mesh
         label nFinestSweeps_;
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index 248c421f2e..25c8e6dbe5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -156,7 +156,11 @@ void Foam::GAMGSolver::Vcycle
                 coarseCorrFields[leveli],
                 coarseSources[leveli],
                 cmpt,
-                nPreSweeps_ + leveli
+                min
+                (
+                    nPreSweeps_ +  preSweepsLevelMultiplier_*leveli,
+                    maxPreSweeps_
+                )
             );
 
             scalarField::subField ACf
@@ -297,7 +301,11 @@ void Foam::GAMGSolver::Vcycle
             coarseCorrFields[leveli],
             coarseSources[leveli],
             cmpt,
-            nPostSweeps_ + leveli
+            min
+            (
+                nPostSweeps_ + postSweepsLevelMultiplier_*leveli,
+                maxPostSweeps_
+            )
         );
     }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index ed6c7ca746..69ed441404 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
@@ -38,6 +38,7 @@ SourceFiles
 
 #include "autoPtr.H"
 #include "lduInterfacePtrsList.H"
+#include "GAMGAgglomeration.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -99,14 +100,16 @@ public:
                 const lduInterfacePtrsList& coarseInterfaces,
                 const lduInterface& fineInterface,
                 const labelField& localRestrictAddressing,
-                const labelField& neighbourRestrictAddressing
+                const labelField& neighbourRestrictAddressing,
+                const label fineLevelIndex
             ),
             (
                 index,
                 coarseInterfaces,
                 fineInterface,
                 localRestrictAddressing,
-                neighbourRestrictAddressing
+                neighbourRestrictAddressing,
+                fineLevelIndex
             )
         );
 
@@ -121,7 +124,8 @@ public:
             const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& localRestrictAddressing,
-            const labelField& neighbourRestrictAddressing
+            const labelField& neighbourRestrictAddressing,
+            const label fineLevelIndex
         );
 
 
@@ -135,7 +139,8 @@ public:
             const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface&,
             const labelField&,
-            const labelField&
+            const labelField&,
+            const label fineLevelIndex = -1
         )
         :
             index_(index),
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
index 48bc4320b1..faeaada1cc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "GAMGInterface.H"
+#include "GAMGAgglomeration.H"
 #include "lduMatrix.H"
 
 
@@ -35,7 +36,8 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
     const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
-    const labelField& neighbourRestrictAddressing
+    const labelField& neighbourRestrictAddressing,
+    const label fineLevelIndex
 )
 {
     const word coupleType(fineInterface.type());
@@ -65,7 +67,8 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
             coarseInterfaces,
             fineInterface,
             localRestrictAddressing,
-            neighbourRestrictAddressing
+            neighbourRestrictAddressing,
+            fineLevelIndex
         )
     );
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 39038f5f29..cab5661f8e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -50,7 +50,8 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
     const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
-    const labelField& neighbourRestrictAddressing
+    const labelField& neighbourRestrictAddressing,
+    const label fineLevelIndex
 )
 :
     GAMGInterface
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
index aa83d23ff8..5a8255212c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
@@ -84,7 +84,8 @@ public:
             const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& restrictAddressing,
-            const labelField& neighbourRestrictAddressing
+            const labelField& neighbourRestrictAddressing,
+            const label fineLevelIndex
         );
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.C
index 88ee47cd17..45db4356f9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.C
@@ -49,7 +49,8 @@ Foam::processorCyclicGAMGInterface::processorCyclicGAMGInterface
     const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
-    const labelField& neighbourRestrictAddressing
+    const labelField& neighbourRestrictAddressing,
+    const label fineLevelIndex
 )
 :
     processorGAMGInterface
@@ -58,7 +59,8 @@ Foam::processorCyclicGAMGInterface::processorCyclicGAMGInterface
         coarseInterfaces,
         fineInterface,
         localRestrictAddressing,
-        neighbourRestrictAddressing
+        neighbourRestrictAddressing,
+        fineLevelIndex
     )
 {}
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
index 95a6957335..e53b11cc04 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
@@ -75,7 +75,8 @@ public:
             const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& restrictAddressing,
-            const labelField& neighbourRestrictAddressing
+            const labelField& neighbourRestrictAddressing,
+            const label fineLevelIndex
         );
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index e5e640f6f8..45d0dc4bfc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -50,7 +50,8 @@ Foam::processorGAMGInterface::processorGAMGInterface
     const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
-    const labelField& neighbourRestrictAddressing
+    const labelField& neighbourRestrictAddressing,
+    const label fineLevelIndex
 )
 :
     GAMGInterface
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index ee2a0eaf67..8ef90c74fe 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -84,7 +84,8 @@ public:
             const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& restrictAddressing,
-            const labelField& neighbourRestrictAddressing
+            const labelField& neighbourRestrictAddressing,
+            const label fineLevelIndex
         );
 
 
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
index 6087241fd2..9a6ba2f138 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
@@ -255,7 +255,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
             {
                 scalar c = 0.0;
                 s = 1.0;
-                for (label i = l-1; i < k+1; i++)
+                for (label i = l; i < k+1; i++)
                 {
                     scalar f = s*rv1[i];
                     rv1[i] = c*rv1[i];
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
index c3b701c8f9..58b196da09 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
@@ -136,41 +136,6 @@ void Foam::LUDecompose
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::multiply
-(
-    scalarRectangularMatrix& ans,         // value changed in return
-    const scalarRectangularMatrix& A,
-    const scalarRectangularMatrix& B
-)
-{
-    if (A.m() != B.n())
-    {
-        FatalErrorIn
-        (
-            "multiply("
-            "scalarRectangularMatrix& answer "
-            "const scalarRectangularMatrix& A, "
-            "const scalarRectangularMatrix& B)"
-        )   << "A and B must have identical inner dimensions but A.m = "
-            << A.m() << " and B.n = " << B.n()
-            << abort(FatalError);
-    }
-
-    ans = scalarRectangularMatrix(A.n(), B.m(), scalar(0));
-
-    for (register label i = 0; i < A.n(); i++)
-    {
-        for (register label j = 0; j < B.m(); j++)
-        {
-            for (register label l = 0; l < B.n(); l++)
-            {
-                ans[i][j] += A[i][l]*B[l][j];
-            }
-        }
-    }
-}
-
-
 void Foam::multiply
 (
     scalarRectangularMatrix& ans,         // value changed in return
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
index d3818cfc23..0830b33ae6 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
@@ -88,11 +88,12 @@ void LUBacksubstitute
 template<class Type>
 void LUsolve(scalarSquareMatrix& matrix, Field<Type>& source);
 
+template<class Form, class Type>
 void multiply
 (
-    scalarRectangularMatrix& answer,         // value changed in return
-    const scalarRectangularMatrix& A,
-    const scalarRectangularMatrix& B
+    Matrix<Form, Type>& answer,         // value changed in return
+    const Matrix<Form, Type>& A,
+    const Matrix<Form, Type>& B
 );
 
 void multiply
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index f1ca94018b..0489ed012d 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -176,4 +176,40 @@ void Foam::LUsolve
 }
 
 
+template<class Form, class Type>
+void Foam::multiply
+(
+    Matrix<Form, Type>& ans,         // value changed in return
+    const Matrix<Form, Type>& A,
+    const Matrix<Form, Type>& B
+)
+{
+    if (A.m() != B.n())
+    {
+        FatalErrorIn
+        (
+            "multiply("
+            "Matrix<Form, Type>& answer "
+            "const Matrix<Form, Type>& A, "
+            "const Matrix<Form, Type>& B)"
+        )   << "A and B must have identical inner dimensions but A.m = "
+            << A.m() << " and B.n = " << B.n()
+            << abort(FatalError);
+    }
+
+    ans = Matrix<Form, Type>(A.n(), B.m(), scalar(0));
+
+    for (register label i = 0; i < A.n(); i++)
+    {
+        for (register label j = 0; j < B.m(); j++)
+        {
+            for (register label l = 0; l < B.n(); l++)
+            {
+                ans[i][j] += A[i][l]*B[l][j];
+            }
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 6388190bf6..8201254e0b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -47,12 +47,6 @@ License
 namespace Foam
 {
 defineTypeNameAndDebug(polyMesh, 0);
-registerDebugSwitchWithName
-(
-    polyMesh,
-    polyMesh,
-    polyMesh::typeName_()
-);
 
 word polyMesh::defaultRegion = "region0";
 word polyMesh::meshSubDir = "polyMesh";
@@ -1129,7 +1123,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
     if (debug)
     {
         // Check mesh motion
-        if (primitiveMesh::checkMeshMotion(points_, true))
+        if (checkMeshMotion(points_, true))
         {
             Info<< "tmp<scalarField> polyMesh::movePoints"
                 << "(const pointField&) : "
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 09c046feb8..e4c1897671 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -34,6 +34,7 @@ SourceFiles
     polyMeshFromShapeMesh.C
     polyMeshIO.C
     polyMeshUpdate.C
+    polyMeshCheck.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -224,7 +225,45 @@ private:
                 cellList& cells
             );
 
+        // Geometry checks
 
+            //- Check non-orthogonality
+            bool checkFaceOrthogonality
+            (
+                const vectorField& fAreas,
+                const vectorField& cellCtrs,
+                const bool report,
+                const bool detailedReport,
+                labelHashSet* setPtr
+            ) const;
+
+            //- Check face skewness
+            bool checkFaceSkewness
+            (
+                const pointField& points,
+                const vectorField& fCtrs,
+                const vectorField& fAreas,
+                const vectorField& cellCtrs,
+                const bool report,
+                const bool detailedReport,
+                labelHashSet* setPtr
+            ) const;
+
+            bool checkEdgeAlignment
+            (
+                const pointField& p,
+                const bool report,
+                const Vector<label>& directions,
+                labelHashSet* setPtr
+            ) const;
+
+            bool checkCellDeterminant
+            (
+                const vectorField& faceAreas,
+                const bool report,
+                labelHashSet* setPtr,
+                const Vector<label>& meshD
+            ) const;
 
 public:
 
@@ -535,6 +574,48 @@ public:
             void removeFiles() const;
 
 
+        // Geometric checks. Selectively override primitiveMesh functionality.
+
+            //- Check boundary for closedness
+            virtual bool checkClosedBoundary(const bool report = false) const;
+
+            //- Check non-orthogonality
+            virtual bool checkFaceOrthogonality
+            (
+                const bool report = false,
+                labelHashSet* setPtr = NULL
+            ) const;
+
+            //- Check face skewness
+            virtual bool checkFaceSkewness
+            (
+                const bool report = false,
+                labelHashSet* setPtr = NULL
+            ) const;
+
+            //- Check edge alignment for 1D/2D cases
+            virtual bool checkEdgeAlignment
+            (
+                const bool report,
+                const Vector<label>& directions,
+                labelHashSet* setPtr
+            ) const;
+
+            virtual bool checkCellDeterminant
+            (
+                const bool report,
+                labelHashSet* setPtr
+            ) const;
+
+            //- Check mesh motion for correctness given motion points
+            virtual bool checkMeshMotion
+            (
+                const pointField& newPoints,
+                const bool report = false,
+                const bool detailedReport = false
+            ) const;
+
+
         // Helper functions
 
             //- Find the cell, tetFaceI and tetPtI for the given position
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
new file mode 100644
index 0000000000..748c7da21a
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@@ -0,0 +1,679 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polyMesh.H"
+#include "polyMeshTools.H"
+#include "unitConversion.H"
+#include "syncTools.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::polyMesh::checkFaceOrthogonality
+(
+    const vectorField& fAreas,
+    const vectorField& cellCtrs,
+    const bool report,
+    const bool detailedReport,
+    labelHashSet* setPtr
+) const
+{
+    if (debug)
+    {
+        Info<< "bool polyMesh::checkFaceOrthogonality("
+            << "const bool, labelHashSet*) const: "
+            << "checking mesh non-orthogonality" << endl;
+    }
+
+    const labelList& own = faceOwner();
+    const labelList& nei = faceNeighbour();
+
+    // Calculate orthogonality for all internal and coupled boundary faces
+    // (1 for uncoupled boundary faces)
+    tmp<scalarField> tortho = polyMeshTools::faceOrthogonality
+    (
+        *this,
+        fAreas,
+        cellCtrs
+    );
+    const scalarField& ortho = tortho();
+
+    // Severe nonorthogonality threshold
+    const scalar severeNonorthogonalityThreshold =
+        ::cos(degToRad(primitiveMesh::nonOrthThreshold_));
+
+
+    scalar minDDotS = GREAT;
+    scalar sumDDotS = 0.0;
+    label nSummed = 0;
+    label severeNonOrth = 0;
+    label errorNonOrth = 0;
+
+
+    // Statistics only for internal and masters of coupled faces
+    PackedBoolList isMasterFace(syncTools::getInternalOrMasterFaces(*this));
+
+    forAll(ortho, faceI)
+    {
+        if (ortho[faceI] < severeNonorthogonalityThreshold)
+        {
+            if (ortho[faceI] > SMALL)
+            {
+                if (setPtr)
+                {
+                    setPtr->insert(faceI);
+                }
+
+                severeNonOrth++;
+            }
+            else
+            {
+                // Error : non-ortho too large
+                if (setPtr)
+                {
+                    setPtr->insert(faceI);
+                }
+                if (detailedReport && errorNonOrth == 0)
+                {
+                    // Non-orthogonality greater than 90 deg
+                    WarningIn
+                    (
+                        "polyMesh::checkFaceOrthogonality"
+                        "(const pointField&, const bool) const"
+                    )   << "Severe non-orthogonality for face "
+                        << faceI
+                        << " between cells " << own[faceI]
+                        << " and " << nei[faceI]
+                        << ": Angle = " << radToDeg(::acos(ortho[faceI]))
+                        << " deg." << endl;
+                }
+
+                errorNonOrth++;
+            }
+        }
+
+        if (isMasterFace[faceI])
+        {
+            minDDotS = min(minDDotS, ortho[faceI]);
+            sumDDotS += ortho[faceI];
+            nSummed++;
+        }
+    }
+
+    reduce(minDDotS, minOp<scalar>());
+    reduce(sumDDotS, sumOp<scalar>());
+    reduce(nSummed, sumOp<label>());
+    reduce(severeNonOrth, sumOp<label>());
+    reduce(errorNonOrth, sumOp<label>());
+
+    if (debug || report)
+    {
+        if (nSummed > 0)
+        {
+            if (debug || report)
+            {
+                Info<< "    Mesh non-orthogonality Max: "
+                    << radToDeg(::acos(minDDotS))
+                    << " average: " << radToDeg(::acos(sumDDotS/nSummed))
+                    << endl;
+            }
+        }
+
+        if (severeNonOrth > 0)
+        {
+            Info<< "   *Number of severely non-orthogonal faces: "
+                << severeNonOrth << "." << endl;
+        }
+    }
+
+    if (errorNonOrth > 0)
+    {
+        if (debug || report)
+        {
+            Info<< " ***Number of non-orthogonality errors: "
+                << errorNonOrth << "." << endl;
+        }
+
+        return true;
+    }
+    else
+    {
+        if (debug || report)
+        {
+            Info<< "    Non-orthogonality check OK." << endl;
+        }
+
+        return false;
+    }
+}
+
+
+bool Foam::polyMesh::checkFaceSkewness
+(
+    const pointField& points,
+    const vectorField& fCtrs,
+    const vectorField& fAreas,
+    const vectorField& cellCtrs,
+    const bool report,
+    const bool detailedReport,
+    labelHashSet* setPtr
+) const
+{
+    if (debug)
+    {
+        Info<< "bool polyMesh::checkFaceSkewnesss("
+            << "const bool, labelHashSet*) const: "
+            << "checking face skewness" << endl;
+    }
+
+    const labelList& own = faceOwner();
+    const labelList& nei = faceNeighbour();
+
+    // Warn if the skew correction vector is more than skewWarning times
+    // larger than the face area vector
+
+    tmp<scalarField> tskew = polyMeshTools::faceSkewness
+    (
+        *this,
+        points,
+        fCtrs,
+        fAreas,
+        cellCtrs
+    );
+    const scalarField& skew = tskew();
+
+    scalar maxSkew = max(skew);
+    label nWarnSkew = 0;
+
+    // Statistics only for all faces except slave coupled faces
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(*this));
+
+    forAll(skew, faceI)
+    {
+        // Check if the skewness vector is greater than the PN vector.
+        // This does not cause trouble but is a good indication of a poor mesh.
+        if (skew[faceI] > skewThreshold_)
+        {
+            if (setPtr)
+            {
+                setPtr->insert(faceI);
+            }
+            if (detailedReport && nWarnSkew == 0)
+            {
+                // Non-orthogonality greater than 90 deg
+                if (isInternalFace(faceI))
+                {
+                    WarningIn
+                    (
+                        "polyMesh::checkFaceSkewnesss"
+                        "(const pointField&, const bool) const"
+                    )   << "Severe skewness " << skew[faceI]
+                        << " for face " << faceI
+                        << " between cells " << own[faceI]
+                        << " and " << nei[faceI];
+                }
+                else
+                {
+                    WarningIn
+                    (
+                        "polyMesh::checkFaceSkewnesss"
+                        "(const pointField&, const bool) const"
+                    )   << "Severe skewness " << skew[faceI]
+                        << " for boundary face " << faceI
+                        << " on cell " << own[faceI];
+                }
+            }
+
+            if (isMasterFace[faceI])
+            {
+                nWarnSkew++;
+            }
+        }
+    }
+
+    reduce(maxSkew, maxOp<scalar>());
+    reduce(nWarnSkew, sumOp<label>());
+
+    if (nWarnSkew > 0)
+    {
+        if (debug || report)
+        {
+            Info<< " ***Max skewness = " << maxSkew
+                << ", " << nWarnSkew << " highly skew faces detected"
+                   " which may impair the quality of the results"
+                << endl;
+        }
+
+        return true;
+    }
+    else
+    {
+        if (debug || report)
+        {
+            Info<< "    Max skewness = " << maxSkew << " OK." << endl;
+        }
+
+        return false;
+    }
+}
+
+
+// Check 1D/2Dness of edges. Gets passed the non-empty directions and
+// checks all edges in the mesh whether they:
+// - have no component in a non-empty direction or
+// - are only in a singe non-empty direction.
+// Empty direction info is passed in as a vector of labels (synchronised)
+// which are 1 if the direction is non-empty, 0 if it is.
+bool Foam::polyMesh::checkEdgeAlignment
+(
+    const pointField& p,
+    const bool report,
+    const Vector<label>& directions,
+    labelHashSet* setPtr
+) const
+{
+    if (debug)
+    {
+        Info<< "bool polyMesh::checkEdgeAlignment("
+            << "const bool, const Vector<label>&, labelHashSet*) const: "
+            << "checking edge alignment" << endl;
+    }
+
+    label nDirs = 0;
+    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
+    {
+        if (directions[cmpt] == 1)
+        {
+            nDirs++;
+        }
+        else if (directions[cmpt] != 0)
+        {
+            FatalErrorIn
+            (
+                "polyMesh::checkEdgeAlignment"
+                "(const bool, const Vector<label>&, labelHashSet*)"
+            )   << "directions should contain 0 or 1 but is now " << directions
+                << exit(FatalError);
+        }
+    }
+
+    if (nDirs == vector::nComponents)
+    {
+        return false;
+    }
+
+
+    const faceList& fcs = faces();
+
+    EdgeMap<label> edgesInError;
+
+    forAll(fcs, faceI)
+    {
+        const face& f = fcs[faceI];
+
+        forAll(f, fp)
+        {
+            label p0 = f[fp];
+            label p1 = f.nextLabel(fp);
+            if (p0 < p1)
+            {
+                vector d(p[p1]-p[p0]);
+                scalar magD = mag(d);
+
+                if (magD > ROOTVSMALL)
+                {
+                    d /= magD;
+
+                    // Check how many empty directions are used by the edge.
+                    label nEmptyDirs = 0;
+                    label nNonEmptyDirs = 0;
+                    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
+                    {
+                        if (mag(d[cmpt]) > 1e-6)
+                        {
+                            if (directions[cmpt] == 0)
+                            {
+                                nEmptyDirs++;
+                            }
+                            else
+                            {
+                                nNonEmptyDirs++;
+                            }
+                        }
+                    }
+
+                    if (nEmptyDirs == 0)
+                    {
+                        // Purely in ok directions.
+                    }
+                    else if (nEmptyDirs == 1)
+                    {
+                        // Ok if purely in empty directions.
+                        if (nNonEmptyDirs > 0)
+                        {
+                            edgesInError.insert(edge(p0, p1), faceI);
+                        }
+                    }
+                    else if (nEmptyDirs > 1)
+                    {
+                        // Always an error
+                        edgesInError.insert(edge(p0, p1), faceI);
+                    }
+                }
+            }
+        }
+    }
+
+    label nErrorEdges = returnReduce(edgesInError.size(), sumOp<label>());
+
+    if (nErrorEdges > 0)
+    {
+        if (debug || report)
+        {
+            Info<< " ***Number of edges not aligned with or perpendicular to "
+                << "non-empty directions: " << nErrorEdges << endl;
+        }
+
+        if (setPtr)
+        {
+            setPtr->resize(2*edgesInError.size());
+            forAllConstIter(EdgeMap<label>, edgesInError, iter)
+            {
+                setPtr->insert(iter.key()[0]);
+                setPtr->insert(iter.key()[1]);
+            }
+        }
+
+        return true;
+    }
+    else
+    {
+        if (debug || report)
+        {
+            Info<< "    All edges aligned with or perpendicular to "
+                << "non-empty directions." << endl;
+        }
+        return false;
+    }
+}
+
+
+bool Foam::polyMesh::checkCellDeterminant
+(
+    const vectorField& faceAreas,
+    const bool report,
+    labelHashSet* setPtr,
+    const Vector<label>& meshD
+) const
+{
+    if (debug)
+    {
+        Info<< "bool polyMesh::checkCellDeterminant(const bool"
+            << ", labelHashSet*) const: "
+            << "checking for under-determined cells" << endl;
+    }
+
+    // Determine number of dimensions and (for 2D) missing dimension
+    label nDims = 0;
+    label twoD = -1;
+    for (direction dir = 0; dir < vector::nComponents; dir++)
+    {
+        if (meshD[dir] == 1)
+        {
+            nDims++;
+        }
+        else
+        {
+            twoD = dir;
+        }
+    }
+
+
+    tmp<scalarField> tcellDeterminant = primitiveMeshTools::cellDeterminant
+    (
+        *this,
+        meshD,
+        faceAreas,
+        syncTools::getInternalOrCoupledFaces(*this)
+    );
+    scalarField& cellDeterminant = tcellDeterminant();
+
+
+    label nErrorCells = 0;
+    scalar minDet = min(cellDeterminant);
+    scalar sumDet = sum(cellDeterminant);
+
+    forAll (cellDeterminant, cellI)
+    {
+        if (cellDeterminant[cellI] < 1e-3)
+        {
+            if (setPtr)
+            {
+                setPtr->insert(cellI);
+            }
+
+            nErrorCells++;
+        }
+    }
+
+    reduce(nErrorCells, sumOp<label>());
+    reduce(minDet, minOp<scalar>());
+    reduce(sumDet, sumOp<scalar>());
+    label nSummed = returnReduce(cellDeterminant.size(), sumOp<label>());
+
+    if (debug || report)
+    {
+        if (nSummed > 0)
+        {
+            Info<< "    Cell determinant (wellposedness) : minimum: " << minDet
+                << " average: " << sumDet/nSummed
+                << endl;
+        }
+    }
+
+    if (nErrorCells > 0)
+    {
+        if (debug || report)
+        {
+            Info<< " ***Cells with small determinant found, number of cells: "
+                << nErrorCells << endl;
+        }
+
+        return true;
+    }
+    else
+    {
+        if (debug || report)
+        {
+            Info<< "    Cell determinant check OK." << endl;
+        }
+
+        return false;
+    }
+
+    return false;
+}
+
+
+bool Foam::polyMesh::checkClosedBoundary(const bool report) const
+{
+    return primitiveMesh::checkClosedBoundary
+    (
+        faceAreas(),
+        report,
+        syncTools::getInternalOrCoupledFaces(*this)
+    );
+}
+
+
+bool Foam::polyMesh::checkFaceOrthogonality
+(
+    const bool report,
+    labelHashSet* setPtr
+) const
+{
+    return checkFaceOrthogonality
+    (
+        faceAreas(),
+        cellCentres(),
+        report,
+        false,  // detailedReport
+        setPtr
+    );
+}
+
+
+bool Foam::polyMesh::checkFaceSkewness
+(
+    const bool report,
+    labelHashSet* setPtr
+) const
+{
+    return checkFaceSkewness
+    (
+        points(),
+        faceCentres(),
+        faceAreas(),
+        cellCentres(),
+        report,
+        false,  // detailedReport
+        setPtr
+    );
+}
+
+
+bool Foam::polyMesh::checkEdgeAlignment
+(
+    const bool report,
+    const Vector<label>& directions,
+    labelHashSet* setPtr
+) const
+{
+    return checkEdgeAlignment
+    (
+        points(),
+        report,
+        directions,
+        setPtr
+    );
+}
+
+
+bool Foam::polyMesh::checkCellDeterminant
+(
+    const bool report,
+    labelHashSet* setPtr
+) const
+{
+    return checkCellDeterminant
+    (
+        faceAreas(),
+        report,
+        setPtr,
+        geometricD()
+    );
+}
+
+
+bool Foam::polyMesh::checkMeshMotion
+(
+    const pointField& newPoints,
+    const bool report,
+    const bool detailedReport
+) const
+{
+    if (debug || report)
+    {
+        Pout<< "bool polyMesh::checkMeshMotion("
+            << "const pointField&, const bool, const bool) const: "
+            << "checking mesh motion" << endl;
+    }
+
+    vectorField fCtrs(nFaces());
+    vectorField fAreas(nFaces());
+
+    makeFaceCentresAndAreas(newPoints, fCtrs, fAreas);
+
+    // Check cell volumes and calculate new cell centres
+    vectorField cellCtrs(nCells());
+    scalarField cellVols(nCells());
+
+    makeCellCentresAndVols(fCtrs, fAreas, cellCtrs, cellVols);
+
+    // Check cell volumes
+    bool error = checkCellVolumes
+    (
+        cellVols,       // vols
+        report,         // report
+        detailedReport, // detailedReport
+        NULL            // setPtr
+    );
+
+
+    // Check face areas
+    bool areaError = checkFaceAreas
+    (
+        faceAreas(),
+        report,         // report
+        detailedReport, // detailedReport,
+        NULL            // setPtr
+    );
+    error = error || areaError;
+
+
+    // Check pyramid volumes
+    bool pyrVolError = checkFacePyramids
+    (
+        newPoints,
+        cellCtrs,
+        report,         // report,
+        detailedReport, // detailedReport,
+        -SMALL,         // minPyrVol
+        NULL            // setPtr
+    );
+    error = error || pyrVolError;
+
+
+    // Check face non-orthogonality
+    bool nonOrthoError = checkFaceOrthogonality
+    (
+        fAreas,
+        cellCtrs,
+        report,         // report
+        detailedReport, // detailedReport
+        NULL            // setPtr
+    );
+    error = error || nonOrthoError;
+
+
+    if (!error && (debug || report))
+    {
+        Pout<< "Mesh motion check OK." << endl;
+    }
+
+    return error;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C
new file mode 100644
index 0000000000..fc0739e79f
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polyMeshTools.H"
+#include "syncTools.H"
+#include "pyramidPointFaceRef.H"
+#include "primitiveMeshTools.H"
+#include "polyMeshTools.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::scalarField> Foam::polyMeshTools::faceOrthogonality
+(
+    const polyMesh& mesh,
+    const vectorField& areas,
+    const vectorField& cc
+)
+{
+    const labelList& own = mesh.faceOwner();
+    const labelList& nei = mesh.faceNeighbour();
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    tmp<scalarField> tortho(new scalarField(mesh.nFaces(), 1.0));
+    scalarField& ortho = tortho();
+
+    // Internal faces
+    forAll(nei, faceI)
+    {
+        ortho[faceI] = primitiveMeshTools::faceOrthogonality
+        (
+            cc[own[faceI]],
+            cc[nei[faceI]],
+            areas[faceI]
+        );
+    }
+
+
+    // Coupled faces
+
+    pointField neighbourCc;
+    syncTools::swapBoundaryCellList(mesh, cc, neighbourCc);
+
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+        if (pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start() + i;
+                label bFaceI = faceI - mesh.nInternalFaces();
+
+                ortho[faceI] = primitiveMeshTools::faceOrthogonality
+                (
+                    cc[own[faceI]],
+                    neighbourCc[bFaceI],
+                    areas[faceI]
+                );
+            }
+        }
+    }
+
+    return tortho;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::polyMeshTools::faceSkewness
+(
+    const polyMesh& mesh,
+    const pointField& p,
+    const vectorField& fCtrs,
+    const vectorField& fAreas,
+    const vectorField& cellCtrs
+)
+{
+    const labelList& own = mesh.faceOwner();
+    const labelList& nei = mesh.faceNeighbour();
+    const faceList& fcs = mesh.faces();
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    tmp<scalarField> tskew(new scalarField(mesh.nFaces()));
+    scalarField& skew = tskew();
+
+    forAll(nei, faceI)
+    {
+        skew[faceI] = primitiveMeshTools::faceSkewness
+        (
+            mesh,
+            p,
+            fCtrs,
+            fAreas,
+
+            faceI,
+            cellCtrs[own[faceI]],
+            cellCtrs[nei[faceI]]
+        );
+    }
+
+
+    // Boundary faces: consider them to have only skewness error.
+    // (i.e. treat as if mirror cell on other side)
+
+    pointField neighbourCc;
+    syncTools::swapBoundaryCellList(mesh, cellCtrs, neighbourCc);
+
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+        if (pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start() + i;
+                label bFaceI = faceI - mesh.nInternalFaces();
+
+                skew[faceI] = primitiveMeshTools::faceSkewness
+                (
+                    mesh,
+                    p,
+                    fCtrs,
+                    fAreas,
+
+                    faceI,
+                    cellCtrs[own[faceI]],
+                    neighbourCc[bFaceI]
+                );
+            }
+        }
+        else
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start() + i;
+
+                vector Cpf = fCtrs[faceI] - cellCtrs[own[faceI]];
+
+                vector normal = fAreas[faceI];
+                normal /= mag(normal) + VSMALL;
+                vector d = normal*(normal & Cpf);
+
+
+                // Skewness vector
+                vector sv =
+                    Cpf
+                  - ((fAreas[faceI] & Cpf)/((fAreas[faceI] & d) + VSMALL))*d;
+                vector svHat = sv/(mag(sv) + VSMALL);
+
+                // Normalisation distance calculated as the approximate distance
+                // from the face centre to the edge of the face in the direction
+                // of the skewness
+                scalar fd = 0.4*mag(d) + VSMALL;
+                const face& f = fcs[faceI];
+                forAll(f, pi)
+                {
+                    fd = max(fd, mag(svHat & (p[f[pi]] - fCtrs[faceI])));
+                }
+
+                // Normalised skewness
+                 skew[faceI] = mag(sv)/fd;
+            }
+        }
+    }
+
+    return tskew;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.H b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.H
new file mode 100644
index 0000000000..53c758c3be
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.H
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Namespace
+    Foam::polyMeshTools
+
+Description
+    Collection of static functions operating on polyMesh (mainly checks) so
+    that need access to patch information.
+
+SourceFiles
+    polyMeshTools.C
+
+\*---------------------------------------------------------------------------*/
+#ifndef polyMeshTools_H
+#define polyMeshTools_H
+
+#include "polyMesh.H"
+#include "primitiveMeshTools.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Namespace polyMeshTools Declaration
+\*---------------------------------------------------------------------------*/
+
+class polyMeshTools
+:
+    public primitiveMeshTools
+{
+
+public:
+
+    //- Generate orthogonality field. (1 for fully orthogonal, < 1 for
+    //  non-orthogonal)
+    static tmp<scalarField> faceOrthogonality
+    (
+        const polyMesh& mesh,
+        const vectorField& fAreas,
+        const vectorField& cellCtrs
+    );
+
+//    static tmp<scalarField> faceOrthogonality(const polyMesh& mesh)
+//    {
+//        return faceOrthogonality
+//        (
+//            mesh,
+//            mesh.faceAreas(),
+//            mesh.cellCentres()
+//        );
+//    }
+
+    //- Generate skewness field
+    static tmp<scalarField> faceSkewness
+    (
+        const polyMesh& mesh,
+        const pointField& points,
+        const vectorField& fCtrs,
+        const vectorField& fAreas,
+        const vectorField& cellCtrs
+    );
+
+//    static tmp<scalarField> faceSkewness(const polyMesh& mesh)
+//    {
+//        return faceSkewness
+//        (
+//            mesh,
+//            mesh.points(),
+//            mesh.faceCentres(),
+//            mesh.faceAreas(),
+//            mesh.cellCentres()
+//        );
+//    }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
index a7667d79ed..99fc0a9498 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,6 +44,14 @@ namespace Foam
 class dummyTransform
 {
 public:
+    template<class T>
+    void operator()
+    (
+        const vectorTensorTransform& vt,
+        const bool forward,
+        List<T>& fld
+    ) const
+    {};
     template<class T>
     void operator()(const coupledPolyPatch& cpp, Field<T>& fld) const
     {}
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
index 5abf8685ec..670daa726c 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Determines for every point whether it is coupled and if so sets only one.
 Foam::PackedBoolList Foam::syncTools::getMasterPoints(const polyMesh& mesh)
 {
     PackedBoolList isMasterPoint(mesh.nPoints());
@@ -72,7 +71,6 @@ Foam::PackedBoolList Foam::syncTools::getMasterPoints(const polyMesh& mesh)
 }
 
 
-// Determines for every edge whether it is coupled and if so sets only one.
 Foam::PackedBoolList Foam::syncTools::getMasterEdges(const polyMesh& mesh)
 {
     PackedBoolList isMasterEdge(mesh.nEdges());
@@ -117,7 +115,6 @@ Foam::PackedBoolList Foam::syncTools::getMasterEdges(const polyMesh& mesh)
 }
 
 
-// Determines for every face whether it is coupled and if so sets only one.
 Foam::PackedBoolList Foam::syncTools::getMasterFaces(const polyMesh& mesh)
 {
     PackedBoolList isMasterFace(mesh.nFaces(), 1);
@@ -145,4 +142,66 @@ Foam::PackedBoolList Foam::syncTools::getMasterFaces(const polyMesh& mesh)
 }
 
 
+Foam::PackedBoolList Foam::syncTools::getInternalOrMasterFaces
+(
+    const polyMesh& mesh
+)
+{
+    PackedBoolList isMasterFace(mesh.nFaces(), 1);
+
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            if (!refCast<const coupledPolyPatch>(pp).owner())
+            {
+                forAll(pp, i)
+                {
+                    isMasterFace.unset(pp.start()+i);
+                }
+            }
+        }
+        else
+        {
+            forAll(pp, i)
+            {
+                isMasterFace.unset(pp.start()+i);
+            }
+        }
+    }
+
+    return isMasterFace;
+}
+
+
+Foam::PackedBoolList Foam::syncTools::getInternalOrCoupledFaces
+(
+    const polyMesh& mesh
+)
+{
+    PackedBoolList isMasterFace(mesh.nFaces(), 1);
+
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (!pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                isMasterFace.unset(pp.start()+i);
+            }
+        }
+    }
+
+    return isMasterFace;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index 3eb6e71388..26711f2d0b 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
@@ -579,15 +579,25 @@ public:
 
         // Other
 
-            //- Get per point whether is it master (of a coupled set of points)
+            //- Get per point whether it is uncoupled or a master of a
+            //  coupled set of points
             static PackedBoolList getMasterPoints(const polyMesh&);
 
-            //- Get per edge whether is it master (of a coupled set of edges)
+            //- Get per edge whether it is uncoupled or a master of a
+            //  coupled set of edges
             static PackedBoolList getMasterEdges(const polyMesh&);
 
-            //- Get per face whether is it master (of a coupled set of faces)
+            //- Get per face whether it is uncoupled or a master of a
+            //  coupled set of faces
             static PackedBoolList getMasterFaces(const polyMesh&);
 
+            //- Get per face whether it is internal or a master of a
+            //  coupled set of faces
+            static PackedBoolList getInternalOrMasterFaces(const polyMesh&);
+
+            //- Get per face whether it is internal or coupled
+            static PackedBoolList getInternalOrCoupledFaces(const polyMesh&);
+
 };
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index 8c647d8454..c4ab139ca3 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,9 +43,6 @@ SourceFiles
     primitiveMeshEdges.C
     primitiveMeshCellCentresAndVols.C
     primitiveMeshFaceCentresAndAreas.C
-    primitiveMeshEdgeVectors.C
-    primitiveMeshCheck.C
-    primitiveMeshCheckMotion.C
     primitiveMeshFindCell.C
 
 \*---------------------------------------------------------------------------*/
@@ -69,6 +66,8 @@ SourceFiles
 namespace Foam
 {
 
+class PackedBoolList;
+
 /*---------------------------------------------------------------------------*\
                       Class primitiveMesh Declaration
 \*---------------------------------------------------------------------------*/
@@ -225,6 +224,28 @@ class primitiveMesh
                 const labelList&
             );
 
+protected:
+
+    // Static data members
+
+        //- Static data to control mesh checking
+
+            //- Cell closedness warning threshold
+            //  set as the fraction of un-closed area to closed area
+            static scalar closedThreshold_;
+
+            //- Aspect ratio warning threshold
+            static scalar aspectThreshold_;
+
+            //- Non-orthogonality warning threshold in deg
+            static scalar nonOrthThreshold_;
+
+            //- Skewness warning threshold
+            static scalar skewThreshold_;
+
+            //- Threshold where faces are considered coplanar
+            static scalar planarCosAngle_;
+
 
         // Geometrical calculations
 
@@ -251,7 +272,7 @@ class primitiveMesh
             void calcEdgeVectors() const;
 
 
-        // Helper functions for mesh checking
+        // Mesh checking
 
             //- Check if all points on face are shared with another face.
             bool checkDuplicateFaces
@@ -270,29 +291,104 @@ class primitiveMesh
                 labelHashSet*
             ) const;
 
+            //- Check boundary for closedness
+            bool checkClosedBoundary
+            (
+                const vectorField&,
+                const bool,
+                const PackedBoolList&
+            ) const;
 
-    // Static data members
+            //- Check cells for closedness
+            bool checkClosedCells
+            (
+                const vectorField& faceAreas,
+                const scalarField& cellVolumes,
+                const bool report,
+                labelHashSet* setPtr,
+                labelHashSet* aspectSetPtr,
+                const Vector<label>& meshD
+            ) const;
 
-        //- Static data to control mesh checking
+            //- Check for negative face areas
+            bool checkFaceAreas
+            (
+                const vectorField& faceAreas,
+                const bool report,
+                const bool detailedReport,
+                labelHashSet* setPtr
+            ) const;
 
-            //- Cell closedness warning threshold
-            //  set as the fraction of un-closed area to closed area
-            static scalar closedThreshold_;
+            //- Check for negative cell volumes
+            bool checkCellVolumes
+            (
+                const scalarField& vols,
+                const bool report,
+                const bool detailedReport,
+                labelHashSet* setPtr
+            ) const;
 
-            //- Aspect ratio warning threshold
-            static scalar aspectThreshold_;
+            //- Check for non-orthogonality
+            bool checkFaceOrthogonality
+            (
+                const vectorField& fAreas,
+                const vectorField& cellCtrs,
+                const bool report,
+                labelHashSet* setPtr
+            ) const;
 
-            //- Non-orthogonality warning threshold in deg
-            static scalar nonOrthThreshold_;
+            //- Check face pyramid volume
+            bool checkFacePyramids
+            (
+                const pointField& points,
+                const vectorField& ctrs,
+                const bool report,
+                const bool detailedReport,
+                const scalar minPyrVol,
+                labelHashSet* setPtr
+            ) const;
 
-            //- Skewness warning threshold
-            static scalar skewThreshold_;
+            //- Check face skewness
+            bool checkFaceSkewness
+            (
+                const pointField& points,
+                const vectorField& fCtrs,
+                const vectorField& fAreas,
+                const vectorField& cellCtrs,
+                const bool report,
+                labelHashSet* setPtr
+            ) const;
 
-            //- Threshold where faces are considered coplanar
-            static scalar planarCosAngle_;
+            //- Check face angles
+            bool checkFaceAngles
+            (
+                const pointField& points,
+                const vectorField& faceAreas,
+                const bool report,
+                const scalar maxDeg,
+                labelHashSet* setPtr
+            ) const;
 
+            //- Check face warpage
+            bool checkFaceFlatness
+            (
+                const pointField& points,
+                const vectorField& faceCentres,
+                const vectorField& faceAreas,
+                const bool report,
+                const scalar warnFlatness,
+                labelHashSet* setPtr
+            ) const;
+
+            //- Check for concave cells by the planes of faces
+            bool checkConcaveCells
+            (
+                const vectorField& fAreas,
+                const pointField& fCentres,
+                const bool report,
+                labelHashSet* setPtr
+            ) const;
 
-protected:
 
         //- Construct null
         primitiveMesh();
@@ -502,29 +598,36 @@ public:
 
             // Topological checks
 
+                //- Check face ordering
+                virtual bool checkUpperTriangular
+                (
+                    const bool report = false,
+                    labelHashSet* setPtr = NULL
+                ) const;
+
                 //- Check cell zip-up
-                bool checkCellsZipUp
+                virtual bool checkCellsZipUp
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL
                 ) const;
 
                 //- Check uniqueness of face vertices
-                bool checkFaceVertices
+                virtual bool checkFaceVertices
+                (
+                    const bool report = false,
+                    labelHashSet* setPtr = NULL
+                ) const;
+
+                //- Check for unused points
+                virtual bool checkPoints
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL
                 ) const;
 
                 //- Check face-face connectivity
-                bool checkFaceFaces
-                (
-                    const bool report = false,
-                    labelHashSet* setPtr = NULL
-                ) const;
-
-                //- Check face ordering
-                bool checkUpperTriangular
+                virtual bool checkFaceFaces
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL
@@ -534,10 +637,11 @@ public:
             // Geometric checks
 
                 //- Check boundary for closedness
-                bool checkClosedBoundary(const bool report = false) const;
+                virtual bool checkClosedBoundary(const bool report = false)
+                const;
 
                 //- Check cells for closedness
-                bool checkClosedCells
+                virtual bool checkClosedCells
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL,
@@ -546,28 +650,28 @@ public:
                 ) const;
 
                 //- Check for negative face areas
-                bool checkFaceAreas
+                virtual bool checkFaceAreas
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL
                 ) const;
 
                 //- Check for negative cell volumes
-                bool checkCellVolumes
+                virtual bool checkCellVolumes
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL
                 ) const;
 
                 //- Check for non-orthogonality
-                bool checkFaceOrthogonality
+                virtual bool checkFaceOrthogonality
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL
                 ) const;
 
                 //- Check face pyramid volume
-                bool checkFacePyramids
+                virtual bool checkFacePyramids
                 (
                     const bool report = false,
                     const scalar minPyrVol = -SMALL,
@@ -575,14 +679,14 @@ public:
                 ) const;
 
                 //- Check face skewness
-                bool checkFaceSkewness
+                virtual bool checkFaceSkewness
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL
                 ) const;
 
                 //- Check face angles
-                bool checkFaceAngles
+                virtual bool checkFaceAngles
                 (
                     const bool report = false,
                     const scalar maxSin = 10,    // In degrees
@@ -592,31 +696,16 @@ public:
                 //- Check face warpage: decompose face and check ratio between
                 //  magnitude of sum of triangle areas and sum of magnitude of
                 //  triangle areas.
-                bool checkFaceFlatness
+                virtual bool checkFaceFlatness
                 (
                     const bool report,
                     const scalar warnFlatness,  // When to include in set.
                     labelHashSet* setPtr
                 ) const;
 
-                //- Check edge alignment for 1D/2D cases
-                bool checkEdgeAlignment
-                (
-                    const bool report,
-                    const Vector<label>& directions,
-                    labelHashSet* setPtr = NULL
-                ) const;
-
-                //- Check for unused points
-                bool checkPoints
-                (
-                    const bool report = false,
-                    labelHashSet* setPtr = NULL
-                ) const;
-
                 //- Check for point-point-nearness,
                 //  e.g. colocated points which may be part of baffles.
-                bool checkPointNearness
+                virtual bool checkPointNearness
                 (
                     const bool report,
                     const scalar reportDistSqr,
@@ -624,23 +713,15 @@ public:
                 ) const;
 
                 //- Check edge length
-                bool checkEdgeLength
+                virtual bool checkEdgeLength
                 (
                     const bool report,
                     const scalar minLenSqr,
                     labelHashSet* setPtr = NULL
                 ) const;
 
-                //- Check cell determinant
-                bool checkCellDeterminant
-                (
-                    const bool report = false,
-                    labelHashSet* setPtr = NULL,
-                    const Vector<label>& solutionD = Vector<label>::one
-                ) const;
-
                 //- Check for concave cells by the planes of faces
-                bool checkConcaveCells
+                virtual bool checkConcaveCells
                 (
                     const bool report = false,
                     labelHashSet* setPtr = NULL
@@ -649,22 +730,14 @@ public:
 
             //- Check mesh topology for correctness.
             //  Returns false for no error.
-            bool checkTopology(const bool report = false) const;
+            virtual bool checkTopology(const bool report = false) const;
 
             //- Check mesh geometry (& implicitly topology) for correctness.
             //  Returns false for no error.
-            bool checkGeometry(const bool report = false) const;
+            virtual bool checkGeometry(const bool report = false) const;
 
             //- Check mesh for correctness. Returns false for no error.
-            bool checkMesh(const bool report = false) const;
-
-            //- Check mesh motion for correctness given motion points
-            bool checkMeshMotion
-            (
-                const pointField& newPoints,
-                const bool report = false
-            ) const;
-
+            virtual bool checkMesh(const bool report = false) const;
 
             //- Set the closedness ratio warning threshold
             static scalar setClosedThreshold(const scalar);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 76fa1aa5d1..d805608e44 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -29,6 +29,7 @@ License
 #include "unitConversion.H"
 #include "SortableList.H"
 #include "EdgeMap.H"
+#include "primitiveMeshTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -41,7 +42,12 @@ Foam::scalar Foam::primitiveMesh::planarCosAngle_   = 1.0e-6;
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-bool Foam::primitiveMesh::checkClosedBoundary(const bool report) const
+bool Foam::primitiveMesh::checkClosedBoundary
+(
+    const vectorField& areas,
+    const bool report,
+    const PackedBoolList& internalOrCoupledFaces
+) const
 {
     if (debug)
     {
@@ -56,12 +62,13 @@ bool Foam::primitiveMesh::checkClosedBoundary(const bool report) const
     vector sumClosed(vector::zero);
     scalar sumMagClosedBoundary = 0;
 
-    const vectorField& areas = faceAreas();
-
     for (label faceI = nInternalFaces(); faceI < areas.size(); faceI++)
     {
-        sumClosed += areas[faceI];
-        sumMagClosedBoundary += mag(areas[faceI]);
+        if (internalOrCoupledFaces.size() && !internalOrCoupledFaces[faceI])
+        {
+            sumClosed += areas[faceI];
+            sumMagClosedBoundary += mag(areas[faceI]);
+        }
     }
 
     reduce(sumClosed, sumOp<vector>());
@@ -95,6 +102,8 @@ bool Foam::primitiveMesh::checkClosedBoundary(const bool report) const
 
 bool Foam::primitiveMesh::checkClosedCells
 (
+    const vectorField& faceAreas,
+    const scalarField& cellVolumes,
     const bool report,
     labelHashSet* setPtr,
     labelHashSet* aspectSetPtr,
@@ -140,66 +149,28 @@ bool Foam::primitiveMesh::checkClosedCells
         return true;
     }
 
-    // Loop through cell faces and sum up the face area vectors for each cell.
-    // This should be zero in all vector components
 
-    vectorField sumClosed(nCells(), vector::zero);
-    vectorField sumMagClosed(nCells(), vector::zero);
-
-    const labelList& own = faceOwner();
-    const labelList& nei = faceNeighbour();
-    const vectorField& areas = faceAreas();
-
-    forAll(own, faceI)
-    {
-        // Add to owner
-        sumClosed[own[faceI]] += areas[faceI];
-        sumMagClosed[own[faceI]] += cmptMag(areas[faceI]);
-    }
-
-    forAll(nei, faceI)
-    {
-        // Subtract from neighbour
-        sumClosed[nei[faceI]] -= areas[faceI];
-        sumMagClosed[nei[faceI]] += cmptMag(areas[faceI]);
-    }
+    scalarField openness;
+    scalarField aspectRatio;
+    primitiveMeshTools::cellClosedness
+    (
+        *this,
+        meshD,
+        faceAreas,
+        cellVolumes,
+        openness,
+        aspectRatio
+    );
 
     label nOpen = 0;
-    scalar maxOpennessCell = 0;
-
+    scalar maxOpennessCell = max(openness);
     label nAspect = 0;
-    scalar maxAspectRatio = 0;
-
-    const scalarField& vols = cellVolumes();
-
-    label nDims = 0;
-    for (direction dir = 0; dir < vector::nComponents; dir++)
-    {
-        if (meshD[dir] == 1)
-        {
-            nDims++;
-        }
-    }
-
+    scalar maxAspectRatio = max(aspectRatio);
 
     // Check the sums
-    forAll(sumClosed, cellI)
+    forAll(openness, cellI)
     {
-        scalar maxOpenness = 0;
-
-        for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-        {
-            maxOpenness = max
-            (
-                maxOpenness,
-                mag(sumClosed[cellI][cmpt])
-               /(sumMagClosed[cellI][cmpt] + VSMALL)
-            );
-        }
-
-        maxOpennessCell = max(maxOpennessCell, maxOpenness);
-
-        if (maxOpenness > closedThreshold_)
+        if (openness[cellI] > closedThreshold_)
         {
             if (setPtr)
             {
@@ -209,32 +180,7 @@ bool Foam::primitiveMesh::checkClosedCells
             nOpen++;
         }
 
-        // Calculate the aspect ration as the maximum of Cartesian component
-        // aspect ratio to the total area hydraulic area aspect ratio
-        scalar minCmpt = VGREAT;
-        scalar maxCmpt = -VGREAT;
-        for (direction dir = 0; dir < vector::nComponents; dir++)
-        {
-            if (meshD[dir] == 1)
-            {
-                minCmpt = min(minCmpt, sumMagClosed[cellI][dir]);
-                maxCmpt = max(maxCmpt, sumMagClosed[cellI][dir]);
-            }
-        }
-
-        scalar aspectRatio = maxCmpt/(minCmpt + VSMALL);
-        if (nDims == 3)
-        {
-            aspectRatio = max
-            (
-                aspectRatio,
-                1.0/6.0*cmptSum(sumMagClosed[cellI])/pow(vols[cellI], 2.0/3.0)
-            );
-        }
-
-        maxAspectRatio = max(maxAspectRatio, aspectRatio);
-
-        if (aspectRatio > aspectThreshold_)
+        if (aspectRatio[cellI] > aspectThreshold_)
         {
             if (aspectSetPtr)
             {
@@ -290,7 +236,9 @@ bool Foam::primitiveMesh::checkClosedCells
 
 bool Foam::primitiveMesh::checkFaceAreas
 (
+    const vectorField& faceAreas,
     const bool report,
+    const bool detailedReport,
     labelHashSet* setPtr
 ) const
 {
@@ -301,7 +249,7 @@ bool Foam::primitiveMesh::checkFaceAreas
             << "checking face area magnitudes" << endl;
     }
 
-    const scalarField magFaceAreas(mag(faceAreas()));
+    const scalarField magFaceAreas(mag(faceAreas));
 
     scalar minArea = GREAT;
     scalar maxArea = -GREAT;
@@ -314,6 +262,25 @@ bool Foam::primitiveMesh::checkFaceAreas
             {
                 setPtr->insert(faceI);
             }
+            if (detailedReport)
+            {
+                if (isInternalFace(faceI))
+                {
+                    Pout<< "Zero or negative face area detected for "
+                        << "internal face "<< faceI << " between cells "
+                        << faceOwner()[faceI] << " and "
+                        << faceNeighbour()[faceI]
+                        << ".  Face area magnitude = " << magFaceAreas[faceI]
+                        << endl;
+                }
+                else
+                {
+                    Pout<< "Zero or negative face area detected for "
+                        << "boundary face " << faceI << " next to cell "
+                        << faceOwner()[faceI] << ".  Face area magnitude = "
+                        << magFaceAreas[faceI] << endl;
+                }
+            }
         }
 
         minArea = min(minArea, magFaceAreas[faceI]);
@@ -349,7 +316,9 @@ bool Foam::primitiveMesh::checkFaceAreas
 
 bool Foam::primitiveMesh::checkCellVolumes
 (
+    const scalarField& vols,
     const bool report,
+    const bool detailedReport,
     labelHashSet* setPtr
 ) const
 {
@@ -360,8 +329,6 @@ bool Foam::primitiveMesh::checkCellVolumes
             << "checking cell volumes" << endl;
     }
 
-    const scalarField& vols = cellVolumes();
-
     scalar minVolume = GREAT;
     scalar maxVolume = -GREAT;
 
@@ -375,6 +342,11 @@ bool Foam::primitiveMesh::checkCellVolumes
             {
                 setPtr->insert(cellI);
             }
+            if (detailedReport)
+            {
+                Pout<< "Zero or negative cell volume detected for cell "
+                    << cellI << ".  Volume = " << vols[cellI] << endl;
+            }
 
             nNegVolCells++;
         }
@@ -416,6 +388,8 @@ bool Foam::primitiveMesh::checkCellVolumes
 
 bool Foam::primitiveMesh::checkFaceOrthogonality
 (
+    const vectorField& fAreas,
+    const vectorField& cellCtrs,
     const bool report,
     labelHashSet* setPtr
 ) const
@@ -427,35 +401,33 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
             << "checking mesh non-orthogonality" << endl;
     }
 
-    // for all internal faces check that the d dot S product is positive
-    const vectorField& centres = cellCentres();
-    const vectorField& areas = faceAreas();
 
-    const labelList& own = faceOwner();
-    const labelList& nei = faceNeighbour();
+    tmp<scalarField> tortho = primitiveMeshTools::faceOrthogonality
+    (
+        *this,
+        fAreas,
+        cellCtrs
+    );
+    const scalarField& ortho = tortho();
 
     // Severe nonorthogonality threshold
     const scalar severeNonorthogonalityThreshold =
         ::cos(degToRad(nonOrthThreshold_));
 
-    scalar minDDotS = GREAT;
+    scalar minDDotS = min(ortho);
 
-    scalar sumDDotS = 0;
+    scalar sumDDotS = sum(ortho);
 
     label severeNonOrth = 0;
 
     label errorNonOrth = 0;
 
-    forAll(nei, faceI)
+
+    forAll(ortho, faceI)
     {
-        vector d = centres[nei[faceI]] - centres[own[faceI]];
-        const vector& s = areas[faceI];
-
-        scalar dDotS = (d & s)/(mag(d)*mag(s) + VSMALL);
-
-        if (dDotS < severeNonorthogonalityThreshold)
+        if (ortho[faceI] < severeNonorthogonalityThreshold)
         {
-            if (dDotS > SMALL)
+            if (ortho[faceI] > SMALL)
             {
                 if (setPtr)
                 {
@@ -474,13 +446,6 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
                 errorNonOrth++;
             }
         }
-
-        if (dDotS < minDDotS)
-        {
-            minDDotS = dDotS;
-        }
-
-        sumDDotS += dDotS;
     }
 
     reduce(minDDotS, minOp<scalar>());
@@ -490,7 +455,7 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
 
     if (debug || report)
     {
-        label neiSize = nei.size();
+        label neiSize = ortho.size();
         reduce(neiSize, sumOp<label>());
 
         if (neiSize > 0)
@@ -535,7 +500,10 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
 
 bool Foam::primitiveMesh::checkFacePyramids
 (
+    const pointField& points,
+    const vectorField& ctrs,
     const bool report,
+    const bool detailedReport,
     const scalar minPyrVol,
     labelHashSet* setPtr
 ) const
@@ -547,46 +515,63 @@ bool Foam::primitiveMesh::checkFacePyramids
             << "checking face orientation" << endl;
     }
 
-    // check whether face area vector points to the cell with higher label
-    const vectorField& ctrs = cellCentres();
-
     const labelList& own = faceOwner();
     const labelList& nei = faceNeighbour();
-
     const faceList& f = faces();
 
-    const pointField& p = points();
+
+    scalarField ownPyrVol;
+    scalarField neiPyrVol;
+    primitiveMeshTools::facePyramidVolume
+    (
+        *this,
+        points,
+        ctrs,
+        ownPyrVol,
+        neiPyrVol
+    );
+
 
     label nErrorPyrs = 0;
 
-    forAll(f, faceI)
+    forAll(ownPyrVol, faceI)
     {
-        // Create the owner pyramid - it will have negative volume
-        scalar pyrVol = pyramidPointFaceRef(f[faceI], ctrs[own[faceI]]).mag(p);
-
-        if (pyrVol > -minPyrVol)
+        if (ownPyrVol[faceI] < minPyrVol)
         {
             if (setPtr)
             {
                 setPtr->insert(faceI);
             }
+            if (detailedReport)
+            {
+                Pout<< "Negative pyramid volume: " << ownPyrVol[faceI]
+                    << " for face " << faceI << " " << f[faceI]
+                    << "  and owner cell: " << own[faceI] << endl
+                    << "Owner cell vertex labels: "
+                    << cells()[own[faceI]].labels(faces())
+                    << endl;
+            }
 
             nErrorPyrs++;
         }
 
         if (isInternalFace(faceI))
         {
-            // Create the neighbour pyramid - it will have positive volume
-            scalar pyrVol =
-                pyramidPointFaceRef(f[faceI], ctrs[nei[faceI]]).mag(p);
-
-            if (pyrVol < minPyrVol)
+            if (neiPyrVol[faceI] < minPyrVol)
             {
                 if (setPtr)
                 {
                     setPtr->insert(faceI);
                 }
-
+                if (detailedReport)
+                {
+                    Pout<< "Negative pyramid volume: " << neiPyrVol[faceI]
+                        << " for face " << faceI << " " << f[faceI]
+                        << "  and neighbour cell: " << nei[faceI] << nl
+                        << "Neighbour cell vertex labels: "
+                        << cells()[nei[faceI]].labels(faces())
+                        << endl;
+                }
                 nErrorPyrs++;
             }
         }
@@ -619,6 +604,10 @@ bool Foam::primitiveMesh::checkFacePyramids
 
 bool Foam::primitiveMesh::checkFaceSkewness
 (
+    const pointField& points,
+    const vectorField& fCtrs,
+    const vectorField& fAreas,
+    const vectorField& cellCtrs,
     const bool report,
     labelHashSet* setPtr
 ) const
@@ -633,44 +622,24 @@ bool Foam::primitiveMesh::checkFaceSkewness
     // Warn if the skew correction vector is more than skewWarning times
     // larger than the face area vector
 
-    const pointField& p = points();
-    const faceList& fcs = faces();
+    tmp<scalarField> tskewness = primitiveMeshTools::faceSkewness
+    (
+        *this,
+        points,
+        fCtrs,
+        fAreas,
+        cellCtrs
+    );
+    const scalarField& skewness = tskewness();
 
-    const labelList& own = faceOwner();
-    const labelList& nei = faceNeighbour();
-    const vectorField& cellCtrs = cellCentres();
-    const vectorField& faceCtrs = faceCentres();
-    const vectorField& fAreas = faceAreas();
-
-    scalar maxSkew = 0;
+    scalar maxSkew = max(skewness);
     label nWarnSkew = 0;
 
-    forAll(nei, faceI)
+    forAll(skewness, faceI)
     {
-        vector Cpf = faceCtrs[faceI] - cellCtrs[own[faceI]];
-        vector d = cellCtrs[nei[faceI]] - cellCtrs[own[faceI]];
-
-        // Skewness vector
-        vector sv =
-            Cpf - ((fAreas[faceI] & Cpf)/((fAreas[faceI] & d) + SMALL))*d;
-        vector svHat = sv/(mag(sv) + VSMALL);
-
-        // Normalisation distance calculated as the approximate distance
-        // from the face centre to the edge of the face in the direction of
-        // the skewness
-        scalar fd = 0.2*mag(d) + VSMALL;
-        const face& f = fcs[faceI];
-        forAll(f, pi)
-        {
-            fd = max(fd, mag(svHat & (p[f[pi]] - faceCtrs[faceI])));
-        }
-
-        // Normalised skewness
-        scalar skewness = mag(sv)/fd;
-
         // Check if the skewness vector is greater than the PN vector.
         // This does not cause trouble but is a good indication of a poor mesh.
-        if (skewness > skewThreshold_)
+        if (skewness[faceI] > skewThreshold_)
         {
             if (setPtr)
             {
@@ -679,63 +648,8 @@ bool Foam::primitiveMesh::checkFaceSkewness
 
             nWarnSkew++;
         }
-
-        if (skewness > maxSkew)
-        {
-            maxSkew = skewness;
-        }
     }
 
-
-    // Boundary faces: consider them to have only skewness error.
-    // (i.e. treat as if mirror cell on other side)
-
-    for (label faceI = nInternalFaces(); faceI < nFaces(); faceI++)
-    {
-        vector Cpf = faceCtrs[faceI] - cellCtrs[own[faceI]];
-
-        vector normal = fAreas[faceI];
-        normal /= mag(normal) + VSMALL;
-        vector d = normal*(normal & Cpf);
-
-
-        // Skewness vector
-        vector sv =
-            Cpf - ((fAreas[faceI] & Cpf)/((fAreas[faceI] & d) + VSMALL))*d;
-        vector svHat = sv/(mag(sv) + VSMALL);
-
-        // Normalisation distance calculated as the approximate distance
-        // from the face centre to the edge of the face in the direction of
-        // the skewness
-        scalar fd = 0.4*mag(d) + VSMALL;
-        const face& f = fcs[faceI];
-        forAll(f, pi)
-        {
-            fd = max(fd, mag(svHat & (p[f[pi]] - faceCtrs[faceI])));
-        }
-
-        // Normalised skewness
-        scalar skewness = mag(sv)/fd;
-
-        // Check if the skewness vector is greater than the PN vector.
-        // This does not cause trouble but is a good indication of a poor mesh.
-        if (skewness > skewThreshold_)
-        {
-            if (setPtr)
-            {
-                setPtr->insert(faceI);
-            }
-
-            nWarnSkew++;
-        }
-
-        if (skewness > maxSkew)
-        {
-            maxSkew = skewness;
-        }
-    }
-
-
     reduce(maxSkew, maxOp<scalar>());
     reduce(nWarnSkew, sumOp<label>());
 
@@ -763,86 +677,14 @@ bool Foam::primitiveMesh::checkFaceSkewness
 }
 
 
-bool Foam::primitiveMesh::checkPoints
-(
-    const bool report,
-    labelHashSet* setPtr
-) const
-{
-    if (debug)
-    {
-        Info<< "bool primitiveMesh::checkPoints"
-            << "(const bool, labelHashSet*) const: "
-            << "checking points" << endl;
-    }
-
-    label nFaceErrors = 0;
-    label nCellErrors = 0;
-
-    const labelListList& pf = pointFaces();
-
-    forAll(pf, pointI)
-    {
-        if (pf[pointI].empty())
-        {
-            if (setPtr)
-            {
-                setPtr->insert(pointI);
-            }
-
-            nFaceErrors++;
-        }
-    }
-
-
-    forAll(pf, pointI)
-    {
-        const labelList& pc = pointCells(pointI);
-
-        if (pc.empty())
-        {
-            if (setPtr)
-            {
-                setPtr->insert(pointI);
-            }
-
-            nCellErrors++;
-        }
-    }
-
-    reduce(nFaceErrors, sumOp<label>());
-    reduce(nCellErrors, sumOp<label>());
-
-    if (nFaceErrors > 0 || nCellErrors > 0)
-    {
-        if (debug || report)
-        {
-            Info<< " ***Unused points found in the mesh, "
-                   "number unused by faces: " << nFaceErrors
-                << " number unused by cells: " << nCellErrors
-                << endl;
-        }
-
-        return true;
-    }
-    else
-    {
-        if (debug || report)
-        {
-            Info<< "    Point usage OK." << endl;
-        }
-
-        return false;
-    }
-}
-
-
 // Check convexity of angles in a face. Allow a slight non-convexity.
 // E.g. maxDeg = 10 allows for angles < 190 (or 10 degrees concavity)
 // (if truly concave and points not visible from face centre the face-pyramid
 //  check in checkMesh will fail)
 bool Foam::primitiveMesh::checkFaceAngles
 (
+    const pointField& points,
+    const vectorField& faceAreas,
     const bool report,
     const scalar maxDeg,
     labelHashSet* setPtr
@@ -867,71 +709,30 @@ bool Foam::primitiveMesh::checkFaceAngles
 
     const scalar maxSin = Foam::sin(degToRad(maxDeg));
 
-    const pointField& p = points();
-    const faceList& fcs = faces();
-    vectorField faceNormals(faceAreas());
-    faceNormals /= mag(faceNormals) + VSMALL;
 
-    scalar maxEdgeSin = 0.0;
+    tmp<scalarField> tfaceAngles = primitiveMeshTools::faceConcavity
+    (
+        maxSin,
+        *this,
+        points,
+        faceAreas
+    );
+    const scalarField& faceAngles = tfaceAngles();
+
+    scalar maxEdgeSin = max(faceAngles);
 
     label nConcave = 0;
 
-    label errorFaceI = -1;
-
-    forAll(fcs, faceI)
+    forAll(faceAngles, faceI)
     {
-        const face& f = fcs[faceI];
-
-        // Get edge from f[0] to f[size-1];
-        vector ePrev(p[f.first()] - p[f.last()]);
-        scalar magEPrev = mag(ePrev);
-        ePrev /= magEPrev + VSMALL;
-
-        forAll(f, fp0)
+        if (faceAngles[faceI] > SMALL)
         {
-            // Get vertex after fp
-            label fp1 = f.fcIndex(fp0);
+            nConcave++;
 
-            // Normalized vector between two consecutive points
-            vector e10(p[f[fp1]] - p[f[fp0]]);
-            scalar magE10 = mag(e10);
-            e10 /= magE10 + VSMALL;
-
-            if (magEPrev > SMALL && magE10 > SMALL)
+            if (setPtr)
             {
-                vector edgeNormal = ePrev ^ e10;
-                scalar magEdgeNormal = mag(edgeNormal);
-
-                if (magEdgeNormal < maxSin)
-                {
-                    // Edges (almost) aligned -> face is ok.
-                }
-                else
-                {
-                    // Check normal
-                    edgeNormal /= magEdgeNormal;
-
-                    if ((edgeNormal & faceNormals[faceI]) < SMALL)
-                    {
-                        if (faceI != errorFaceI)
-                        {
-                            // Count only one error per face.
-                            errorFaceI = faceI;
-                            nConcave++;
-                        }
-
-                        if (setPtr)
-                        {
-                            setPtr->insert(faceI);
-                        }
-
-                        maxEdgeSin = max(maxEdgeSin, magEdgeNormal);
-                    }
-                }
+                setPtr->insert(faceI);
             }
-
-            ePrev = e10;
-            magEPrev = magE10;
         }
     }
 
@@ -965,11 +766,11 @@ bool Foam::primitiveMesh::checkFaceAngles
 }
 
 
-// Check warpage of faces. Is calculated as the difference between areas of
-// individual triangles and the overall area of the face (which ifself is
-// is the average of the areas of the individual triangles).
 bool Foam::primitiveMesh::checkFaceFlatness
 (
+    const pointField& points,
+    const vectorField& faceCentres,
+    const vectorField& faceAreas,
     const bool report,
     const scalar warnFlatness,
     labelHashSet* setPtr
@@ -992,52 +793,34 @@ bool Foam::primitiveMesh::checkFaceFlatness
             << exit(FatalError);
     }
 
-
-    const pointField& p = points();
     const faceList& fcs = faces();
-    const pointField& fctrs = faceCentres();
 
-    // Areas are calculated as the sum of areas. (see
-    // primitiveMeshFaceCentresAndAreas.C)
-    scalarField magAreas(mag(faceAreas()));
+    tmp<scalarField> tfaceFlatness = primitiveMeshTools::faceFlatness
+    (
+        *this,
+        points,
+        faceCentres,
+        faceAreas
+    );
+    const scalarField& faceFlatness = tfaceFlatness();
 
-    label nWarped = 0;
+    scalarField magAreas(mag(faceAreas));
 
     scalar minFlatness = GREAT;
     scalar sumFlatness = 0;
     label nSummed = 0;
+    label nWarped = 0;
 
-    forAll(fcs, faceI)
+    forAll(faceFlatness, faceI)
     {
-        const face& f = fcs[faceI];
-
-        if (f.size() > 3 && magAreas[faceI] > VSMALL)
+        if (fcs[faceI].size() > 3 && magAreas[faceI] > VSMALL)
         {
-            const point& fc = fctrs[faceI];
-
-            // Calculate the sum of magnitude of areas and compare to magnitude
-            // of sum of areas.
-
-            scalar sumA = 0.0;
-
-            forAll(f, fp)
-            {
-                const point& thisPoint = p[f[fp]];
-                const point& nextPoint = p[f.nextLabel(fp)];
-
-                // Triangle around fc.
-                vector n = 0.5*((nextPoint - thisPoint)^(fc - thisPoint));
-                sumA += mag(n);
-            }
-
-            scalar flatness = magAreas[faceI] / (sumA+VSMALL);
-
-            sumFlatness += flatness;
+            sumFlatness += faceFlatness[faceI];
             nSummed++;
 
-            minFlatness = min(minFlatness, flatness);
+            minFlatness = min(minFlatness, faceFlatness[faceI]);
 
-            if (flatness < warnFlatness)
+            if (faceFlatness[faceI] < warnFlatness)
             {
                 nWarped++;
 
@@ -1092,131 +875,103 @@ bool Foam::primitiveMesh::checkFaceFlatness
 }
 
 
-// Check 1D/2Dness of edges. Gets passed the non-empty directions and
-// checks all edges in the mesh whether they:
-// - have no component in a non-empty direction or
-// - are only in a singe non-empty direction.
-// Empty direction info is passed in as a vector of labels (synchronised)
-// which are 1 if the direction is non-empty, 0 if it is.
-bool Foam::primitiveMesh::checkEdgeAlignment
+bool Foam::primitiveMesh::checkConcaveCells
 (
+    const vectorField& fAreas,
+    const pointField& fCentres,
     const bool report,
-    const Vector<label>& directions,
     labelHashSet* setPtr
 ) const
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkEdgeAlignment("
-            << "const bool, const Vector<label>&, labelHashSet*) const: "
-            << "checking edge alignment" << endl;
+        Info<< "bool primitiveMesh::checkConcaveCells(const bool"
+            << ", labelHashSet*) const: "
+            << "checking for concave cells" << endl;
     }
 
-    label nDirs = 0;
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
+    const cellList& c = cells();
+    const labelList& fOwner = faceOwner();
+
+    label nConcaveCells = 0;
+
+    forAll(c, cellI)
     {
-        if (directions[cmpt] == 1)
+        const cell& cFaces = c[cellI];
+
+        bool concave = false;
+
+        forAll(cFaces, i)
         {
-            nDirs++;
-        }
-        else if (directions[cmpt] != 0)
-        {
-            FatalErrorIn
-            (
-                "primitiveMesh::checkEdgeAlignment"
-                "(const bool, const Vector<label>&, labelHashSet*)"
-            )   << "directions should contain 0 or 1 but is now " << directions
-                << exit(FatalError);
-        }
-    }
-
-    if (nDirs == vector::nComponents)
-    {
-        return false;
-    }
-
-
-
-    const pointField& p = points();
-    const faceList& fcs = faces();
-
-    EdgeMap<label> edgesInError;
-
-    forAll(fcs, faceI)
-    {
-        const face& f = fcs[faceI];
-
-        forAll(f, fp)
-        {
-            label p0 = f[fp];
-            label p1 = f.nextLabel(fp);
-            if (p0 < p1)
+            if (concave)
             {
-                vector d(p[p1]-p[p0]);
-                scalar magD = mag(d);
+                break;
+            }
 
-                if (magD > ROOTVSMALL)
+            label fI = cFaces[i];
+
+            const point& fC = fCentres[fI];
+
+            vector fN = fAreas[fI];
+
+            fN /= max(mag(fN), VSMALL);
+
+            // Flip normal if required so that it is always pointing out of
+            // the cell
+            if (fOwner[fI] != cellI)
+            {
+                fN *= -1;
+            }
+
+            // Is the centre of any other face of the cell on the
+            // wrong side of the plane of this face?
+
+            forAll(cFaces, j)
+            {
+                if (j != i)
                 {
-                    d /= magD;
+                    label fJ = cFaces[j];
 
-                    // Check how many empty directions are used by the edge.
-                    label nEmptyDirs = 0;
-                    label nNonEmptyDirs = 0;
-                    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-                    {
-                        if (mag(d[cmpt]) > 1e-6)
-                        {
-                            if (directions[cmpt] == 0)
-                            {
-                                nEmptyDirs++;
-                            }
-                            else
-                            {
-                                nNonEmptyDirs++;
-                            }
-                        }
-                    }
+                    const point& pt = fCentres[fJ];
 
-                    if (nEmptyDirs == 0)
+                    // If the cell is concave, the point will be on the
+                    // positive normal side of the plane of f, defined by
+                    // its centre and normal, and the angle between (pt -
+                    // fC) and fN will be less than 90 degrees, so the dot
+                    // product will be positive.
+
+                    vector pC = (pt - fC);
+
+                    pC /= max(mag(pC), VSMALL);
+
+                    if ((pC & fN) > -planarCosAngle_)
                     {
-                        // Purely in ok directions.
-                    }
-                    else if (nEmptyDirs == 1)
-                    {
-                        // Ok if purely in empty directions.
-                        if (nNonEmptyDirs > 0)
+                        // Concave or planar face
+
+                        concave = true;
+
+                        if (setPtr)
                         {
-                            edgesInError.insert(edge(p0, p1), faceI);
+                            setPtr->insert(cellI);
                         }
-                    }
-                    else if (nEmptyDirs > 1)
-                    {
-                        // Always an error
-                        edgesInError.insert(edge(p0, p1), faceI);
+
+                        nConcaveCells++;
+
+                        break;
                     }
                 }
             }
         }
     }
 
-    label nErrorEdges = returnReduce(edgesInError.size(), sumOp<label>());
+    reduce(nConcaveCells, sumOp<label>());
 
-    if (nErrorEdges > 0)
+    if (nConcaveCells > 0)
     {
         if (debug || report)
         {
-            Info<< " ***Number of edges not aligned with or perpendicular to "
-                << "non-empty directions: " << nErrorEdges << endl;
-        }
-
-        if (setPtr)
-        {
-            setPtr->resize(2*edgesInError.size());
-            forAllConstIter(EdgeMap<label>, edgesInError, iter)
-            {
-                setPtr->insert(iter.key()[0]);
-                setPtr->insert(iter.key()[1]);
-            }
+            Info<< " ***Concave cells (using face planes) found,"
+                << " number of cells: " << nConcaveCells << endl;
         }
 
         return true;
@@ -1225,14 +980,18 @@ bool Foam::primitiveMesh::checkEdgeAlignment
     {
         if (debug || report)
         {
-            Info<< "    All edges aligned with or perpendicular to "
-                << "non-empty directions." << endl;
+            Info<< "    Concave cell check OK." << endl;
         }
+
         return false;
     }
+
+    return false;
 }
 
 
+// Topological tests
+
 bool Foam::primitiveMesh::checkUpperTriangular
 (
     const bool report,
@@ -1574,6 +1333,80 @@ bool Foam::primitiveMesh::checkFaceVertices
 }
 
 
+bool Foam::primitiveMesh::checkPoints
+(
+    const bool report,
+    labelHashSet* setPtr
+) const
+{
+    if (debug)
+    {
+        Info<< "bool primitiveMesh::checkPoints"
+            << "(const bool, labelHashSet*) const: "
+            << "checking points" << endl;
+    }
+
+    label nFaceErrors = 0;
+    label nCellErrors = 0;
+
+    const labelListList& pf = pointFaces();
+
+    forAll(pf, pointI)
+    {
+        if (pf[pointI].empty())
+        {
+            if (setPtr)
+            {
+                setPtr->insert(pointI);
+            }
+
+            nFaceErrors++;
+        }
+    }
+
+
+    forAll(pf, pointI)
+    {
+        const labelList& pc = pointCells(pointI);
+
+        if (pc.empty())
+        {
+            if (setPtr)
+            {
+                setPtr->insert(pointI);
+            }
+
+            nCellErrors++;
+        }
+    }
+
+    reduce(nFaceErrors, sumOp<label>());
+    reduce(nCellErrors, sumOp<label>());
+
+    if (nFaceErrors > 0 || nCellErrors > 0)
+    {
+        if (debug || report)
+        {
+            Info<< " ***Unused points found in the mesh, "
+                   "number unused by faces: " << nFaceErrors
+                << " number unused by cells: " << nCellErrors
+                << endl;
+        }
+
+        return true;
+    }
+    else
+    {
+        if (debug || report)
+        {
+            Info<< "    Point usage OK." << endl;
+        }
+
+        return false;
+    }
+}
+
+
 // Check if all points on face are shared between faces.
 bool Foam::primitiveMesh::checkDuplicateFaces
 (
@@ -1891,168 +1724,153 @@ bool Foam::primitiveMesh::checkFaceFaces
 }
 
 
-// Checks cells with 1 or less internal faces. Give numerical problems.
-bool Foam::primitiveMesh::checkCellDeterminant
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::primitiveMesh::checkClosedBoundary(const bool report) const
+{
+    return checkClosedBoundary(faceAreas(), report, PackedBoolList(0));
+}
+
+
+bool Foam::primitiveMesh::checkClosedCells
 (
-    const bool report,    // report,
-    labelHashSet* setPtr, // setPtr
-    const Vector<label>& meshD
+    const bool report,
+    labelHashSet* setPtr,
+    labelHashSet* aspectSetPtr,
+     const Vector<label>& solutionD
 ) const
 {
-    if (debug)
-    {
-        Info<< "bool primitiveMesh::checkCellDeterminant(const bool"
-            << ", labelHashSet*) const: "
-            << "checking for under-determined cells" << endl;
-    }
-
-    // Determine number of dimensions and (for 2D) missing dimension
-    label nDims = 0;
-    label twoD = -1;
-    for (direction dir = 0; dir < vector::nComponents; dir++)
-    {
-        if (meshD[dir] == 1)
-        {
-            nDims++;
-        }
-        else
-        {
-            twoD = dir;
-        }
-    }
+    return checkClosedCells
+    (
+        faceAreas(),
+        cellVolumes(),
+        report,
+        setPtr,
+        aspectSetPtr,
+        solutionD
+    );
+}
 
 
-    const cellList& c = cells();
+bool Foam::primitiveMesh::checkFaceAreas
+(
+    const bool report,
+    labelHashSet* setPtr
+) const
+{
+    return checkFaceAreas
+    (
+        faceAreas(),
+        report,
+        false,  // detailedReport,
+        setPtr
+    );
+}
 
-    label nErrorCells = 0;
 
-    scalar minDet = GREAT;
-    scalar sumDet = 0;
-    label nSummed = 0;
+bool Foam::primitiveMesh::checkCellVolumes
+(
+    const bool report,
+    labelHashSet* setPtr
+) const
+{
+    return checkCellVolumes
+    (
+        cellVolumes(),
+        report,
+        false,  // detailedReport,
+        setPtr
+    );
+}
 
-    if (nDims == 1)
-    {
-        minDet = 1;
-        sumDet = c.size()*minDet;
-        nSummed = c.size();
-    }
-    else
-    {
-        forAll (c, cellI)
-        {
-            const labelList& curFaces = c[cellI];
 
-            // Calculate local normalization factor
-            scalar avgArea = 0;
+bool Foam::primitiveMesh::checkFaceOrthogonality
+(
+    const bool report,
+    labelHashSet* setPtr
+) const
+{
+    return checkFaceOrthogonality
+    (
+        faceAreas(),
+        cellCentres(),
+        report,
+        setPtr
+    );
+}
 
-            label nInternalFaces = 0;
 
-            forAll(curFaces, i)
-            {
-                if (isInternalFace(curFaces[i]))
-                {
-                    avgArea += mag(faceAreas()[curFaces[i]]);
+bool Foam::primitiveMesh::checkFacePyramids
+(
+    const bool report,
+    const scalar minPyrVol,
+    labelHashSet* setPtr
+) const
+{
+    return checkFacePyramids
+    (
+        points(),
+        cellCentres(),
+        report,
+        false,  // detailedReport,
+        minPyrVol,
+        setPtr
+    );
+}
 
-                    nInternalFaces++;
-                }
-            }
 
-            if (nInternalFaces == 0)
-            {
-                if (setPtr)
-                {
-                    setPtr->insert(cellI);
-                }
+bool Foam::primitiveMesh::checkFaceSkewness
+(
+    const bool report,
+    labelHashSet* setPtr
+) const
+{
+    return checkFaceSkewness
+    (
+        points(),
+        faceCentres(),
+        faceAreas(),
+        cellCentres(),
+        report,
+        setPtr
+    );
+}
 
-                nErrorCells++;
-            }
-            else
-            {
-                avgArea /= nInternalFaces;
 
-                symmTensor areaTensor(symmTensor::zero);
+bool Foam::primitiveMesh::checkFaceAngles
+(
+    const bool report,
+    const scalar maxDeg,
+    labelHashSet* setPtr
+) const
+{
+    return checkFaceAngles
+    (
+        points(),
+        faceAreas(),
+        report,
+        maxDeg,
+        setPtr
+    );
+}
 
-                forAll(curFaces, i)
-                {
-                    if (isInternalFace(curFaces[i]))
-                    {
-                        areaTensor += sqr(faceAreas()[curFaces[i]]/avgArea);
-                    }
-                }
 
-                if (nDims == 2)
-                {
-                    // Add the missing eigenvector (such that it does not
-                    // affect the determinant)
-                    if (twoD == 0)
-                    {
-                        areaTensor.xx() = 1;
-                    }
-                    else if (twoD == 1)
-                    {
-                        areaTensor.yy() = 1;
-                    }
-                    else
-                    {
-                        areaTensor.zz() = 1;
-                    }
-                }
-
-                scalar determinant = mag(det(areaTensor));
-
-                minDet = min(determinant, minDet);
-                sumDet += determinant;
-                nSummed++;
-
-                if (determinant < 1e-3)
-                {
-                    if (setPtr)
-                    {
-                        setPtr->insert(cellI);
-                    }
-
-                    nErrorCells++;
-                }
-            }
-        }
-    }
-
-    reduce(nErrorCells, sumOp<label>());
-    reduce(minDet, minOp<scalar>());
-    reduce(sumDet, sumOp<scalar>());
-    reduce(nSummed, sumOp<label>());
-
-    if (debug || report)
-    {
-        if (nSummed > 0)
-        {
-            Info<< "    Cell determinant (wellposedness) : minimum: " << minDet
-                << " average: " << sumDet/nSummed
-                << endl;
-        }
-    }
-
-    if (nErrorCells > 0)
-    {
-        if (debug || report)
-        {
-            Info<< " ***Cells with small determinant found, number of cells: "
-                << nErrorCells << endl;
-        }
-
-        return true;
-    }
-    else
-    {
-        if (debug || report)
-        {
-            Info<< "    Cell determinant check OK." << endl;
-        }
-
-        return false;
-    }
-
-    return false;
+bool Foam::primitiveMesh::checkFaceFlatness
+(
+    const bool report,
+    const scalar warnFlatness,
+    labelHashSet* setPtr
+) const
+{
+    return checkFaceFlatness
+    (
+        points(),
+        faceCentres(),
+        faceAreas(),
+        report,
+        warnFlatness,
+        setPtr
+    );
 }
 
 
@@ -2062,117 +1880,16 @@ bool Foam::primitiveMesh::checkConcaveCells
     labelHashSet* setPtr
 ) const
 {
-    if (debug)
-    {
-        Info<< "bool primitiveMesh::checkConcaveCells(const bool"
-            << ", labelHashSet*) const: "
-            << "checking for concave cells" << endl;
-    }
-
-    const cellList& c = cells();
-    const labelList& fOwner = faceOwner();
-    const vectorField& fAreas = faceAreas();
-    const pointField& fCentres = faceCentres();
-
-    label nConcaveCells = 0;
-
-    forAll(c, cellI)
-    {
-        const cell& cFaces = c[cellI];
-
-        bool concave = false;
-
-        forAll(cFaces, i)
-        {
-            if (concave)
-            {
-                break;
-            }
-
-            label fI = cFaces[i];
-
-            const point& fC = fCentres[fI];
-
-            vector fN = fAreas[fI];
-
-            fN /= max(mag(fN), VSMALL);
-
-            // Flip normal if required so that it is always pointing out of
-            // the cell
-            if (fOwner[fI] != cellI)
-            {
-                fN *= -1;
-            }
-
-            // Is the centre of any other face of the cell on the
-            // wrong side of the plane of this face?
-
-            forAll(cFaces, j)
-            {
-                if (j != i)
-                {
-                    label fJ = cFaces[j];
-
-                    const point& pt = fCentres[fJ];
-
-                    // If the cell is concave, the point will be on the
-                    // positive normal side of the plane of f, defined by
-                    // its centre and normal, and the angle between (pt -
-                    // fC) and fN will be less than 90 degrees, so the dot
-                    // product will be positive.
-
-                    vector pC = (pt - fC);
-
-                    pC /= max(mag(pC), VSMALL);
-
-                    if ((pC & fN) > -planarCosAngle_)
-                    {
-                        // Concave or planar face
-
-                        concave = true;
-
-                        if (setPtr)
-                        {
-                            setPtr->insert(cellI);
-                        }
-
-                        nConcaveCells++;
-
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    reduce(nConcaveCells, sumOp<label>());
-
-    if (nConcaveCells > 0)
-    {
-        if (debug || report)
-        {
-            Info<< " ***Concave cells (using face planes) found,"
-                << " number of cells: " << nConcaveCells << endl;
-        }
-
-        return true;
-    }
-    else
-    {
-        if (debug || report)
-        {
-            Info<< "    Concave cell check OK." << endl;
-        }
-
-        return false;
-    }
-
-    return false;
+    return checkConcaveCells
+    (
+        faceAreas(),
+        faceCentres(),
+        report,
+        setPtr
+    );
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 bool Foam::primitiveMesh::checkTopology(const bool report) const
 {
     label noFailedChecks = 0;
@@ -2182,7 +1899,6 @@ bool Foam::primitiveMesh::checkTopology(const bool report) const
     if (checkCellsZipUp(report)) noFailedChecks++;
     if (checkFaceVertices(report)) noFailedChecks++;
     if (checkFaceFaces(report)) noFailedChecks++;
-    //if (checkCellDeterminant(report)) noFailedChecks++;
 
     if (noFailedChecks == 0)
     {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
deleted file mode 100644
index 4b0d2da63a..0000000000
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
+++ /dev/null
@@ -1,266 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    Given a set of points, find out if the mesh resulting from point motion will
-    be valid without actually changing the mesh.
-
-\*---------------------------------------------------------------------------*/
-
-#include "primitiveMesh.H"
-#include "pyramidPointFaceRef.H"
-#include "cell.H"
-#include "unitConversion.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-bool Foam::primitiveMesh::checkMeshMotion
-(
-    const pointField& newPoints,
-    const bool report
-) const
-{
-    if (debug || report)
-    {
-        Pout<< "bool primitiveMesh::checkMeshMotion("
-            << "const pointField& newPoints, const bool report) const: "
-            << "checking mesh motion" << endl;
-    }
-
-    bool error = false;
-
-    const faceList& f = faces();
-
-    const labelList& own = faceOwner();
-    const labelList& nei = faceNeighbour();
-
-    vectorField fCtrs(nFaces());
-    vectorField fAreas(nFaces());
-
-    makeFaceCentresAndAreas(newPoints, fCtrs, fAreas);
-
-    // Check cell volumes and calculate new cell centres
-    vectorField cellCtrs(nCells());
-    scalarField cellVols(nCells());
-
-    makeCellCentresAndVols(fCtrs, fAreas, cellCtrs, cellVols);
-
-    scalar minVolume = GREAT;
-    label nNegVols = 0;
-
-    forAll(cellVols, cellI)
-    {
-        if (cellVols[cellI] < VSMALL)
-        {
-            if (debug || report)
-            {
-                Pout<< "Zero or negative cell volume detected for cell "
-                    << cellI << ".  Volume = " << cellVols[cellI] << endl;
-            }
-
-            nNegVols++;
-        }
-
-        minVolume = min(minVolume, cellVols[cellI]);
-    }
-
-    if (nNegVols > 0)
-    {
-        error = true;
-
-        Pout<< "Zero or negative cell volume in mesh motion in " << nNegVols
-            << " cells.  Min volume: " << minVolume << endl;
-    }
-    else
-    {
-        if (debug || report)
-        {
-            Pout<< "Min volume = " << minVolume
-                << ".  Total volume = " << sum(cellVols)
-                << ".  Cell volumes OK." << endl;
-        }
-    }
-
-    // Check face areas
-
-    scalar minArea = GREAT;
-    label nNegAreas = 0;
-    label nPyrErrors = 0;
-    label nDotProductErrors = 0;
-
-    forAll(f, faceI)
-    {
-        const scalar a = Foam::mag(fAreas[faceI]);
-
-        if (a < VSMALL)
-        {
-            if (debug || report)
-            {
-                if (isInternalFace(faceI))
-                {
-                    Pout<< "Zero or negative face area detected for "
-                        << "internal face "<< faceI << " between cells "
-                        << own[faceI] << " and " << nei[faceI]
-                        << ".  Face area magnitude = " << a << endl;
-                }
-                else
-                {
-                    Pout<< "Zero or negative face area detected for "
-                        << "boundary face " << faceI << " next to cell "
-                        << own[faceI] << ".  Face area magnitude = "
-                        << a << endl;
-                }
-            }
-
-            nNegAreas++;
-        }
-
-        minArea = min(minArea, a);
-
-        // Create the owner pyramid - it will have negative volume
-        scalar pyrVol =
-            pyramidPointFaceRef(f[faceI], cellCtrs[own[faceI]]).mag(newPoints);
-
-        if (pyrVol > SMALL)
-        {
-            if (debug || report)
-            {
-                Pout<< "Negative pyramid volume: " << -pyrVol
-                    << " for face " << faceI << " " << f[faceI]
-                    << "  and owner cell: " << own[faceI] << endl
-                    << "Owner cell vertex labels: "
-                    << cells()[own[faceI]].labels(f)
-                    << endl;
-            }
-
-            nPyrErrors++;
-        }
-
-        if (isInternalFace(faceI))
-        {
-            // Create the neighbour pyramid - it will have positive volume
-            scalar pyrVol =
-                pyramidPointFaceRef
-                (
-                    f[faceI],
-                    cellCtrs[nei[faceI]]
-                ).mag(newPoints);
-
-            if (pyrVol < -SMALL)
-            {
-                if (debug || report)
-                {
-                    Pout<< "Negative pyramid volume: " << pyrVol
-                        << " for face " << faceI << " " << f[faceI]
-                        << "  and neighbour cell: " << nei[faceI] << nl
-                        << "Neighbour cell vertex labels: "
-                        << cells()[nei[faceI]].labels(f)
-                        << endl;
-                }
-
-                nPyrErrors++;
-            }
-
-            const vector d = cellCtrs[nei[faceI]] - cellCtrs[own[faceI]];
-            const vector& s = fAreas[faceI];
-            scalar dDotS = (d & s)/(mag(d)*mag(s) + VSMALL);
-
-            // Only write full message the first time
-            if (dDotS < SMALL && nDotProductErrors == 0)
-            {
-                // Non-orthogonality greater than 90 deg
-                WarningIn
-                (
-                    "primitiveMesh::checkMeshMotion"
-                    "(const pointField& newPoints, const bool report) const"
-                )   << "Severe non-orthogonality in mesh motion for face "
-                    << faceI
-                    << " between cells " << own[faceI] << " and " << nei[faceI]
-                    << ": Angle = " << radToDeg(::acos(dDotS))
-                    << " deg." << endl;
-
-                nDotProductErrors++;
-            }
-        }
-    }
-
-    if (nNegAreas > 0)
-    {
-        error = true;
-
-        WarningIn
-        (
-            "primitiveMesh::checkMeshMotion"
-            "(const pointField& newPoints, const bool report) const"
-        )   << "Zero or negative face area in mesh motion in " << nNegAreas
-            << " faces.  Min area: " << minArea << endl;
-    }
-    else
-    {
-        if (debug || report)
-        {
-            Pout<< "Min area = " << minArea
-                << ".  Face areas OK." << endl;
-        }
-    }
-
-    if (nPyrErrors > 0)
-    {
-        Pout<< "Detected " << nPyrErrors
-            << " negative pyramid volume in mesh motion" << endl;
-
-        error = true;
-    }
-    else
-    {
-        if (debug || report)
-        {
-            Pout<< "Pyramid volumes OK." << endl;
-        }
-    }
-
-    if (nDotProductErrors > 0)
-    {
-        Pout<< "Detected " << nDotProductErrors
-            << " in non-orthogonality in mesh motion." << endl;
-
-        error = true;
-    }
-    else
-    {
-        if (debug || report)
-        {
-            Pout<< "Non-orthogonality check OK." << endl;
-        }
-    }
-
-    if (!error && (debug || report))
-    {
-        Pout<< "Mesh motion check OK." << endl;
-    }
-
-    return error;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
new file mode 100644
index 0000000000..e94c8edbf7
--- /dev/null
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
@@ -0,0 +1,638 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "primitiveMeshTools.H"
+#include "syncTools.H"
+#include "pyramidPointFaceRef.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::scalar Foam::primitiveMeshTools::faceSkewness
+(
+    const primitiveMesh& mesh,
+    const pointField& p,
+    const vectorField& fCtrs,
+    const vectorField& fAreas,
+
+    const label faceI,
+    const point& ownCc,
+    const point& neiCc
+)
+{
+    vector Cpf = fCtrs[faceI] - ownCc;
+    vector d = neiCc - ownCc;
+
+    // Skewness vector
+    vector sv =
+        Cpf
+      - ((fAreas[faceI] & Cpf)/((fAreas[faceI] & d) + SMALL))*d;
+    vector svHat = sv/(mag(sv) + VSMALL);
+
+    // Normalisation distance calculated as the approximate distance
+    // from the face centre to the edge of the face in the direction
+    // of the skewness
+    scalar fd = 0.2*mag(d) + VSMALL;
+    const face& f = mesh.faces()[faceI];
+    forAll(f, pi)
+    {
+        fd = max(fd, mag(svHat & (p[f[pi]] - fCtrs[faceI])));
+    }
+
+    // Normalised skewness
+    return mag(sv)/fd;
+}
+
+
+Foam::scalar Foam::primitiveMeshTools::faceOrthogonality
+(
+    const point& ownCc,
+    const point& neiCc,
+    const vector& s
+)
+{
+    vector d = neiCc - ownCc;
+
+    return (d & s)/(mag(d)*mag(s) + VSMALL);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::faceOrthogonality
+(
+    const primitiveMesh& mesh,
+    const vectorField& areas,
+    const vectorField& cc
+)
+{
+    const labelList& own = mesh.faceOwner();
+    const labelList& nei = mesh.faceNeighbour();
+
+    tmp<scalarField> tortho(new scalarField(mesh.nInternalFaces()));
+    scalarField& ortho = tortho();
+
+    // Internal faces
+    forAll(nei, faceI)
+    {
+        ortho[faceI] = faceOrthogonality
+        (
+            cc[own[faceI]],
+            cc[nei[faceI]],
+            areas[faceI]
+        );
+    }
+
+    return tortho;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::faceSkewness
+(
+    const primitiveMesh& mesh,
+    const pointField& p,
+    const vectorField& fCtrs,
+    const vectorField& fAreas,
+    const vectorField& cellCtrs
+)
+{
+    const labelList& own = mesh.faceOwner();
+    const labelList& nei = mesh.faceNeighbour();
+    const faceList& fcs = mesh.faces();
+
+    tmp<scalarField> tskew(new scalarField(mesh.nFaces()));
+    scalarField& skew = tskew();
+
+    forAll(nei, faceI)
+    {
+        skew[faceI] = faceSkewness
+        (
+            mesh,
+            p,
+            fCtrs,
+            fAreas,
+
+            faceI,
+            cellCtrs[own[faceI]],
+            cellCtrs[nei[faceI]]
+        );
+    }
+
+
+    // Boundary faces: consider them to have only skewness error.
+    // (i.e. treat as if mirror cell on other side)
+
+    for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
+    {
+        vector Cpf = fCtrs[faceI] - cellCtrs[own[faceI]];
+
+        vector normal = fAreas[faceI];
+        normal /= mag(normal) + VSMALL;
+        vector d = normal*(normal & Cpf);
+
+
+        // Skewness vector
+        vector sv =
+            Cpf
+          - ((fAreas[faceI] & Cpf)/((fAreas[faceI] & d) + VSMALL))*d;
+        vector svHat = sv/(mag(sv) + VSMALL);
+
+        // Normalisation distance calculated as the approximate distance
+        // from the face centre to the edge of the face in the direction
+        // of the skewness
+        scalar fd = 0.4*mag(d) + VSMALL;
+        const face& f = fcs[faceI];
+        forAll(f, pi)
+        {
+            fd = max(fd, mag(svHat & (p[f[pi]] - fCtrs[faceI])));
+        }
+
+        // Normalised skewness
+        skew[faceI] = mag(sv)/fd;
+    }
+
+    return tskew;
+}
+
+void Foam::primitiveMeshTools::facePyramidVolume
+(
+    const primitiveMesh& mesh,
+    const pointField& points,
+    const vectorField& ctrs,
+
+    scalarField& ownPyrVol,
+    scalarField& neiPyrVol
+)
+{
+    const labelList& own = mesh.faceOwner();
+    const labelList& nei = mesh.faceNeighbour();
+    const faceList& f = mesh.faces();
+
+    ownPyrVol.setSize(mesh.nFaces());
+    neiPyrVol.setSize(mesh.nInternalFaces());
+
+    forAll(f, faceI)
+    {
+        // Create the owner pyramid
+        ownPyrVol[faceI] = -pyramidPointFaceRef
+        (
+            f[faceI],
+            ctrs[own[faceI]]
+        ).mag(points);
+
+        if (mesh.isInternalFace(faceI))
+        {
+            // Create the neighbour pyramid - it will have positive volume
+            neiPyrVol[faceI] = pyramidPointFaceRef
+            (
+                f[faceI],
+                ctrs[nei[faceI]]
+            ).mag(points);
+        }
+    }
+}
+
+
+void Foam::primitiveMeshTools::cellClosedness
+(
+    const primitiveMesh& mesh,
+    const Vector<label>& meshD,
+    const vectorField& areas,
+    const scalarField& vols,
+
+    scalarField& openness,
+    scalarField& aratio
+)
+{
+    const labelList& own = mesh.faceOwner();
+    const labelList& nei = mesh.faceNeighbour();
+
+    // Loop through cell faces and sum up the face area vectors for each cell.
+    // This should be zero in all vector components
+
+    vectorField sumClosed(mesh.nCells(), vector::zero);
+    vectorField sumMagClosed(mesh.nCells(), vector::zero);
+
+    forAll(own, faceI)
+    {
+        // Add to owner
+        sumClosed[own[faceI]] += areas[faceI];
+        sumMagClosed[own[faceI]] += cmptMag(areas[faceI]);
+    }
+
+    forAll(nei, faceI)
+    {
+        // Subtract from neighbour
+        sumClosed[nei[faceI]] -= areas[faceI];
+        sumMagClosed[nei[faceI]] += cmptMag(areas[faceI]);
+    }
+
+
+    label nDims = 0;
+    for (direction dir = 0; dir < vector::nComponents; dir++)
+    {
+        if (meshD[dir] == 1)
+        {
+            nDims++;
+        }
+    }
+
+
+    // Check the sums
+    openness.setSize(mesh.nCells());
+    aratio.setSize(mesh.nCells());
+
+    forAll(sumClosed, cellI)
+    {
+        scalar maxOpenness = 0;
+
+        for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
+        {
+            maxOpenness = max
+            (
+                maxOpenness,
+                mag(sumClosed[cellI][cmpt])
+               /(sumMagClosed[cellI][cmpt] + VSMALL)
+            );
+        }
+        openness[cellI] = maxOpenness;
+
+        // Calculate the aspect ration as the maximum of Cartesian component
+        // aspect ratio to the total area hydraulic area aspect ratio
+        scalar minCmpt = VGREAT;
+        scalar maxCmpt = -VGREAT;
+        for (direction dir = 0; dir < vector::nComponents; dir++)
+        {
+            if (meshD[dir] == 1)
+            {
+                minCmpt = min(minCmpt, sumMagClosed[cellI][dir]);
+                maxCmpt = max(maxCmpt, sumMagClosed[cellI][dir]);
+            }
+        }
+
+        scalar aspectRatio = maxCmpt/(minCmpt + VSMALL);
+        if (nDims == 3)
+        {
+            aspectRatio = max
+            (
+                aspectRatio,
+                1.0/6.0*cmptSum(sumMagClosed[cellI])/pow(vols[cellI], 2.0/3.0)
+            );
+        }
+
+        aratio[cellI] = aspectRatio;
+    }
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::faceConcavity
+(
+    const scalar maxSin,
+    const primitiveMesh& mesh,
+    const pointField& p,
+    const vectorField& faceAreas
+)
+{
+    const faceList& fcs = mesh.faces();
+
+    vectorField faceNormals(faceAreas);
+    faceNormals /= mag(faceNormals) + VSMALL;
+
+    tmp<scalarField> tfaceAngles(new scalarField(mesh.nFaces()));
+    scalarField& faceAngles = tfaceAngles();
+
+
+    forAll(fcs, faceI)
+    {
+        const face& f = fcs[faceI];
+
+        // Get edge from f[0] to f[size-1];
+        vector ePrev(p[f.first()] - p[f.last()]);
+        scalar magEPrev = mag(ePrev);
+        ePrev /= magEPrev + VSMALL;
+
+        scalar maxEdgeSin = 0.0;
+
+        forAll(f, fp0)
+        {
+            // Get vertex after fp
+            label fp1 = f.fcIndex(fp0);
+
+            // Normalized vector between two consecutive points
+            vector e10(p[f[fp1]] - p[f[fp0]]);
+            scalar magE10 = mag(e10);
+            e10 /= magE10 + VSMALL;
+
+            if (magEPrev > SMALL && magE10 > SMALL)
+            {
+                vector edgeNormal = ePrev ^ e10;
+                scalar magEdgeNormal = mag(edgeNormal);
+
+                if (magEdgeNormal < maxSin)
+                {
+                    // Edges (almost) aligned -> face is ok.
+                }
+                else
+                {
+                    // Check normal
+                    edgeNormal /= magEdgeNormal;
+
+                    if ((edgeNormal & faceNormals[faceI]) < SMALL)
+                    {
+                        maxEdgeSin = max(maxEdgeSin, magEdgeNormal);
+                    }
+                }
+            }
+
+            ePrev = e10;
+            magEPrev = magE10;
+        }
+
+        faceAngles[faceI] = maxEdgeSin;
+    }
+
+    return tfaceAngles;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::faceFlatness
+(
+    const primitiveMesh& mesh,
+    const pointField& p,
+    const vectorField& fCtrs,
+    const vectorField& faceAreas
+)
+{
+    const faceList& fcs = mesh.faces();
+
+    // Areas are calculated as the sum of areas. (see
+    // primitiveMeshFaceCentresAndAreas.C)
+    scalarField magAreas(mag(faceAreas));
+
+    tmp<scalarField> tfaceFlatness(new scalarField(mesh.nFaces(), 1.0));
+    scalarField& faceFlatness = tfaceFlatness();
+
+
+    forAll(fcs, faceI)
+    {
+        const face& f = fcs[faceI];
+
+        if (f.size() > 3 && magAreas[faceI] > VSMALL)
+        {
+            const point& fc = fCtrs[faceI];
+
+            // Calculate the sum of magnitude of areas and compare to magnitude
+            // of sum of areas.
+
+            scalar sumA = 0.0;
+
+            forAll(f, fp)
+            {
+                const point& thisPoint = p[f[fp]];
+                const point& nextPoint = p[f.nextLabel(fp)];
+
+                // Triangle around fc.
+                vector n = 0.5*((nextPoint - thisPoint)^(fc - thisPoint));
+                sumA += mag(n);
+            }
+
+            faceFlatness[faceI] = magAreas[faceI] / (sumA+VSMALL);
+        }
+    }
+
+    return tfaceFlatness;
+}
+
+
+//Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::edgeAlignment
+//(
+//    const primitiveMesh& mesh,
+//    const Vector<label>& meshD,
+//    const pointField& p
+//)
+//{
+//    label nDirs = 0;
+//    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
+//    {
+//        if (meshD[cmpt] == 1)
+//        {
+//            nDirs++;
+//        }
+//        else if (meshD[cmpt] != 0)
+//        {
+//            FatalErrorIn
+//            (
+//                "primitiveMeshTools::edgeAlignment"
+//                "(const primitiveMesh&, const Vector<label>&"
+//                ", const pointField&)"
+//            )   << "directions should contain 0 or 1 but is now " << meshD
+//                << exit(FatalError);
+//        }
+//    }
+//
+//    tmp<scalarField> tedgeAlignment(new scalarField(mesh.nFaces(), 0.0));
+//    scalarField& edgeAlignment = tedgeAlignment();
+//
+//    if (nDirs != vector::nComponents)
+//    {
+//        const faceList& fcs = mesh.faces();
+//
+//        forAll(fcs, faceI)
+//        {
+//            const face& f = fcs[faceI];
+//
+//            forAll(f, fp)
+//            {
+//                label p0 = f[fp];
+//                label p1 = f.nextLabel(fp);
+//                if (p0 < p1)
+//                {
+//                    vector d(p[p1]-p[p0]);
+//                    scalar magD = mag(d);
+//
+//                    if (magD > ROOTVSMALL)
+//                    {
+//                        d /= magD;
+//
+//                        // Check how many empty directions are used by the
+//                        // edge.
+//                        label nEmptyDirs = 0;
+//                        label nNonEmptyDirs = 0;
+//                        for
+//                        (
+//                              direction cmpt=0;
+//                              cmpt<vector::nComponents;
+//                              cmpt++
+//                        )
+//                        {
+//                            if (mag(d[cmpt]) > 1e-6)
+//                            {
+//                                if (meshD[cmpt] == 0)
+//                                {
+//                                    nEmptyDirs++;
+//                                }
+//                                else
+//                                {
+//                                    nNonEmptyDirs++;
+//                                }
+//                            }
+//                        }
+//
+//                        if (nEmptyDirs == 0)
+//                        {
+//                            // Purely in ok directions.
+//                        }
+//                        else if (nEmptyDirs == 1)
+//                        {
+//                            // Ok if purely in empty directions.
+//                            if (nNonEmptyDirs > 0)
+//                            {
+//                                edgeAlignment[faceI] = max
+//                                (
+//                                    edgeAlignment[faceI],
+//                                    1
+//                                );
+//                            }
+//                        }
+//                        else if (nEmptyDirs > 1)
+//                        {
+//                            // Always an error
+//                            edgeAlignment[faceI] = max
+//                            (
+//                                edgeAlignment[faceI],
+//                                2
+//                            );
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }
+//
+//    return tedgeAlignment;
+//}
+
+
+// Checks cells with 1 or less internal faces. Give numerical problems.
+Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::cellDeterminant
+(
+    const primitiveMesh& mesh,
+    const Vector<label>& meshD,
+    const vectorField& faceAreas,
+    const PackedBoolList& internalOrCoupledFace
+)
+{
+    // Determine number of dimensions and (for 2D) missing dimension
+    label nDims = 0;
+    label twoD = -1;
+    for (direction dir = 0; dir < vector::nComponents; dir++)
+    {
+        if (meshD[dir] == 1)
+        {
+            nDims++;
+        }
+        else
+        {
+            twoD = dir;
+        }
+    }
+
+
+
+    tmp<scalarField> tcellDeterminant(new scalarField(mesh.nCells()));
+    scalarField& cellDeterminant = tcellDeterminant();
+
+    const cellList& c = mesh.cells();
+
+    if (nDims == 1)
+    {
+        cellDeterminant = 1.0;
+    }
+    else
+    {
+        forAll (c, cellI)
+        {
+            const labelList& curFaces = c[cellI];
+
+            // Calculate local normalization factor
+            scalar avgArea = 0;
+
+            label nInternalFaces = 0;
+
+            forAll(curFaces, i)
+            {
+                if (internalOrCoupledFace[curFaces[i]])
+                {
+                    avgArea += mag(faceAreas[curFaces[i]]);
+
+                    nInternalFaces++;
+                }
+            }
+
+            if (nInternalFaces == 0)
+            {
+                cellDeterminant[cellI] = 0;
+            }
+            else
+            {
+                avgArea /= nInternalFaces;
+
+                symmTensor areaTensor(symmTensor::zero);
+
+                forAll(curFaces, i)
+                {
+                    if (internalOrCoupledFace[curFaces[i]])
+                    {
+                        areaTensor += sqr(faceAreas[curFaces[i]]/avgArea);
+                    }
+                }
+
+                if (nDims == 2)
+                {
+                    // Add the missing eigenvector (such that it does not
+                    // affect the determinant)
+                    if (twoD == 0)
+                    {
+                        areaTensor.xx() = 1;
+                    }
+                    else if (twoD == 1)
+                    {
+                        areaTensor.yy() = 1;
+                    }
+                    else
+                    {
+                        areaTensor.zz() = 1;
+                    }
+                }
+
+                cellDeterminant[cellI] = mag(det(areaTensor));
+            }
+        }
+    }
+
+    return tcellDeterminant;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.H
new file mode 100644
index 0000000000..5e3b2c07fd
--- /dev/null
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.H
@@ -0,0 +1,168 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Namespace
+    Foam::primitiveMeshTools
+
+Description
+    Collection of static functions operating on primitiveMesh (mainly checks).
+
+SourceFiles
+    primitiveMeshTools.C
+
+\*---------------------------------------------------------------------------*/
+#ifndef primitiveMeshTools_H
+#define primitiveMeshTools_H
+
+#include "primitiveMesh.H"
+#include "PackedBoolList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Namespace primitiveMeshTools Declaration
+\*---------------------------------------------------------------------------*/
+
+class primitiveMeshTools
+{
+
+protected:
+
+   // Protected Member Functions
+
+        //- Skewness of single face
+        static scalar faceSkewness
+        (
+            const primitiveMesh& mesh,
+            const pointField& p,
+            const vectorField& fCtrs,
+            const vectorField& fAreas,
+
+            const label faceI,
+            const point& ownCc,
+            const point& neiCc
+        );
+
+        //- Orthogonality of single face
+        static scalar faceOrthogonality
+        (
+            const point& ownCc,
+            const point& neiCc,
+            const vector& s
+        );
+
+public:
+
+    //- Generate non-orthogonality field (internal faces only)
+    static tmp<scalarField> faceOrthogonality
+    (
+        const primitiveMesh& mesh,
+        const vectorField& fAreas,
+        const vectorField& cellCtrs
+    );
+
+    //- Generate face pyramid volume fields
+    static void facePyramidVolume
+    (
+        const primitiveMesh& mesh,
+        const pointField& points,
+        const vectorField& cellCtrs,
+        scalarField& ownPyrVol,
+        scalarField& neiPyrVol
+    );
+
+    //- Generate skewness field
+    static tmp<scalarField> faceSkewness
+    (
+        const primitiveMesh& mesh,
+        const pointField& points,
+        const vectorField& fCtrs,
+        const vectorField& fAreas,
+        const vectorField& cellCtrs
+    );
+
+    //- Generate cell openness and cell ascpect ratio field
+    static void cellClosedness
+    (
+        const primitiveMesh& mesh,
+        const Vector<label>& meshD,
+        const vectorField& areas,
+        const scalarField& vols,
+        scalarField& openness,
+        scalarField& aratio
+    );
+
+    //- Generate face concavity field. Returns per face the (sin of the)
+    //  most concave angle between two consecutive edges
+    static tmp<scalarField> faceConcavity
+    (
+        const scalar maxSin,
+        const primitiveMesh& mesh,
+        const pointField& p,
+        const vectorField& faceAreas
+    );
+
+    //- Generate face flatness field. Compares the individual triangles'
+    //  normals against the face average normal. Between 0 (fully warped)
+    //  and 1 (fully flat)
+    static tmp<scalarField> faceFlatness
+    (
+        const primitiveMesh& mesh,
+        const pointField& p,
+        const vectorField& fCtrs,
+        const vectorField& faceAreas
+    );
+
+    //- Generate edge alignment field. Is per face the minimum aligned edge
+    //  (does not use edge addressing)
+    static tmp<scalarField> edgeAlignment
+    (
+        const primitiveMesh& mesh,
+        const Vector<label>& directions,
+        const pointField& p
+    );
+
+    //- Generate cell determinant field
+    static tmp<scalarField> cellDeterminant
+    (
+        const primitiveMesh& mesh,
+        const Vector<label>& directions,
+        const vectorField& faceAreas,
+        const PackedBoolList& internalOrCoupledFace
+    );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
index d9e5736ca2..cbf6466d26 100644
--- a/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,6 @@ SourceFiles
 #define symmTensor_H
 
 #include "SymmTensor.H"
-#include "vector.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 8b3c1d9a9d..94b567d532 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -103,6 +103,9 @@ public:
         //- Construct given SymmTensor
         inline Tensor(const SymmTensor<Cmpt>&);
 
+        //- Construct given triad
+        inline Tensor(const Vector<Vector<Cmpt> >&);
+
         //- Construct given the three vector components
         inline Tensor
         (
@@ -165,6 +168,9 @@ public:
 
         //- Assign to a SymmTensor
         inline void operator=(const SymmTensor<Cmpt>&);
+
+        //- Assign to a triad
+        inline void operator=(const Vector<Vector<Cmpt> >&);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 237bb6ceb3..416507e6b7 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,6 +66,24 @@ inline Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
 }
 
 
+//- Construct given triad
+template <class Cmpt>
+inline Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt> >& tr)
+{
+    this->v_[XX] = tr.x().x();
+    this->v_[XY] = tr.x().y();
+    this->v_[XZ] = tr.x().z();
+
+    this->v_[YX] = tr.y().x();
+    this->v_[YY] = tr.y().y();
+    this->v_[YZ] = tr.y().z();
+
+    this->v_[ZX] = tr.z().x();
+    this->v_[ZY] = tr.z().y();
+    this->v_[ZZ] = tr.z().z();
+}
+
+
 //- Construct given the three vector components
 template <class Cmpt>
 inline Tensor<Cmpt>::Tensor
@@ -272,6 +290,23 @@ inline void Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
 }
 
 
+template <class Cmpt>
+inline void Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt> >& tr)
+{
+    this->v_[XX] = tr.x().x();
+    this->v_[XY] = tr.x().y();
+    this->v_[XZ] = tr.x().z();
+
+    this->v_[YX] = tr.y().x();
+    this->v_[YY] = tr.y().y();
+    this->v_[YZ] = tr.y().z();
+
+    this->v_[ZX] = tr.z().x();
+    this->v_[ZY] = tr.z().y();
+    this->v_[ZZ] = tr.z().z();
+}
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Hodge Dual operator (tensor -> vector)
diff --git a/src/OpenFOAM/primitives/triad/triad.C b/src/OpenFOAM/primitives/triad/triad.C
index 80218dc776..2382e2c321 100644
--- a/src/OpenFOAM/primitives/triad/triad.C
+++ b/src/OpenFOAM/primitives/triad/triad.C
@@ -25,7 +25,6 @@ License
 
 #include "triad.H"
 #include "transform.H"
-#include "tensor.H"
 #include "quaternion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -63,6 +62,14 @@ Foam::triad::triad(const quaternion& q)
 }
 
 
+Foam::triad::triad(const tensor& t)
+{
+    x() = t.x();
+    y() = t.y();
+    z() = t.z();
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::triad::orthogonalize()
@@ -331,6 +338,16 @@ Foam::triad::operator quaternion() const
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::triad::operator=(const tensor& t)
+{
+    x() = t.x();
+    y() = t.y();
+    z() = t.z();
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/triad/triad.H b/src/OpenFOAM/primitives/triad/triad.H
index 624116602e..3915faff50 100644
--- a/src/OpenFOAM/primitives/triad/triad.H
+++ b/src/OpenFOAM/primitives/triad/triad.H
@@ -40,6 +40,7 @@ SourceFiles
 #define triad_H
 
 #include "vector.H"
+#include "tensor.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,7 +59,6 @@ Ostream& operator<<(Ostream&, const triad&);
 
 class quaternion;
 
-
 /*---------------------------------------------------------------------------*\
                            Class triad Declaration
 \*---------------------------------------------------------------------------*/
@@ -87,6 +87,9 @@ public:
         //- Construct from a quaternion
         triad(const quaternion& q);
 
+        //- Construct from a tensor
+        triad(const tensor& t);
+
         //- Construct from Istream
         inline triad(Istream&);
 
@@ -135,6 +138,8 @@ public:
 
         inline void operator=(const Vector<vector>&);
 
+        void operator=(const tensor& t);
+
         //- Add the triad t2 to this triad
         //  without normalizing or orthogonalizing
         void operator+=(const triad& t2);
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
index 6cf51363b1..f2d3a7f4ec 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,9 +27,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::dynamicFvMesh, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(dynamicFvMesh, 0);
 
-defineRunTimeSelectionTable(Foam::dynamicFvMesh, IOobject);
+defineRunTimeSelectionTable(dynamicFvMesh, IOobject);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
index 815361bec0..10a3bb0799 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,9 +27,13 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::solidBodyMotionFunction, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(solidBodyMotionFunction, 0);
+
+defineRunTimeSelectionTable(solidBodyMotionFunction, dictionary);
+}
 
-defineRunTimeSelectionTable(Foam::solidBodyMotionFunction, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index a3e8de6892..4bc6aa0c52 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -87,6 +87,8 @@ fvMeshTools/fvMeshTools.C
 motionSmoother/motionSmoother.C
 motionSmoother/motionSmootherCheck.C
 motionSmoother/polyMeshGeometry/polyMeshGeometry.C
+motionSmoother/badQualityToCell/badQualityToCell.C
+motionSmoother/badQualityToFace/badQualityToFace.C
 
 motionSolver/motionSolver/motionSolver.C
 motionSolver/displacement/displacementMotionSolver.C
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index 4a705acead..1abf219dfb 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -37,13 +37,16 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::boundaryMesh, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(boundaryMesh, 0);
 
 // Normal along which to divide faces into categories (used in getNearest)
-const Foam::vector Foam::boundaryMesh::splitNormal_(3, 2, 1);
+const vector boundaryMesh::splitNormal_(3, 2, 1);
 
 // Distance to face tolerance for getNearest
-const Foam::scalar Foam::boundaryMesh::distanceTol_ = 1e-2;
+const scalar boundaryMesh::distanceTol_ = 1e-2;
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
index 7da1a844b7..e6356ff66f 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.C
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.C
@@ -40,10 +40,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::createShellMesh, 0);
-
 namespace Foam
 {
+defineTypeNameAndDebug(createShellMesh, 0);
+
 template<>
 class minEqOp<labelPair>
 {
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 54aebc17e1..a21cfb6300 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -43,7 +43,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::fvMeshDistribute, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(fvMeshDistribute, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index e213daebd2..6861186e39 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::cellCuts, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(cellCuts, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index 529f8f6ccc..654b47a254 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::boundaryCutter, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(boundaryCutter, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index e9eb291083..4999757132 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::meshCutAndRemove, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(meshCutAndRemove, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index 7239b6aebd..15ab110764 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::meshCutter, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(meshCutter, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index d19664663a..3668134cc4 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::multiDirRefinement, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(multiDirRefinement, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Statc Functions * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
index e694d0c34d..30e32a44af 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::refinementIterator, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(refinementIterator, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index a8867eb605..7782b9bb3a 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::undoableMeshCutter, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(undoableMeshCutter, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/cellSelection.C b/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.C
similarity index 50%
rename from applications/utilities/mesh/manipulation/subsetMesh/cellSelection/cellSelection.C
rename to src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.C
index b1d6c9b5f1..80f15127af 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/cellSelection.C
+++ b/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.C
@@ -23,81 +23,104 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "cellSelection.H"
+#include "badQualityToCell.H"
 #include "polyMesh.H"
+#include "motionSmoother.H"
+#include "addToRunTimeSelectionTable.H"
+#include "faceSet.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(cellSelection, 0);
-    defineRunTimeSelectionTable(cellSelection, dictionary);
+
+defineTypeNameAndDebug(badQualityToCell, 0);
+
+addToRunTimeSelectionTable(topoSetSource, badQualityToCell, word);
+
+addToRunTimeSelectionTable(topoSetSource, badQualityToCell, istream);
+
+}
+
+
+Foam::topoSetSource::addToUsageTable Foam::badQualityToCell::usage_
+(
+    badQualityToCell::typeName,
+    "\n    Usage: badQualityToCell mesh-quality-dictionary\n\n"
+    "    Select all cells that do not satisfy the selection criterion\n\n"
+);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::badQualityToCell::combine(topoSet& set, const bool add) const
+{
+    faceSet faces(mesh_, "meshQualityFaces", mesh_.nFaces()/100+1);
+    motionSmoother::checkMesh(false, mesh_, dict_, faces);
+    faces.sync(mesh_);
+
+    forAllConstIter(faceSet, faces, iter)
+    {
+        label faceI = iter.key();
+        addOrDelete(set, mesh_.faceOwner()[faceI], add);
+        if (mesh_.isInternalFace(faceI))
+        {
+            addOrDelete(set, mesh_.faceNeighbour()[faceI], add);
+        }
+    }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cellSelection::cellSelection
+// Construct from dictionary
+Foam::badQualityToCell::badQualityToCell
 (
-    const word& name,
     const polyMesh& mesh,
     const dictionary& dict
 )
 :
-    name_(name),
-    mesh_(mesh),
+    topoSetSource(mesh),
     dict_(dict)
 {}
 
 
+// Construct from Istream
+Foam::badQualityToCell::badQualityToCell
+(
+    const polyMesh& mesh,
+    Istream& is
+)
+:
+    topoSetSource(mesh),
+    dict_(is)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::cellSelection::~cellSelection()
+Foam::badQualityToCell::~badQualityToCell()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::cellSelection> Foam::cellSelection::New
+void Foam::badQualityToCell::applyToSet
 (
-    const word& name,
-    const polyMesh& mesh,
-    const dictionary& dict
-)
+    const topoSetSource::setAction action,
+    topoSet& set
+) const
 {
-    const word sampleType(dict.lookup("type"));
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(sampleType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if ((action == topoSetSource::NEW) || (action == topoSetSource::ADD))
     {
-        FatalErrorIn
-        (
-            "cellSelection::New"
-            "(const word&, const polyMesh&, const dictionary&)"
-        )   << "Unknown cellSelection type "
-            << sampleType << nl << nl
-            << "Valid cellSelection types : " << endl
-            << dictionaryConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+        Info<< "    Adding bad-quality cells" << endl;
+        combine(set, true);
     }
-
-    return autoPtr<cellSelection>(cstrIter()(name, mesh, dict));
-}
-
-
-Foam::label Foam::cellSelection::count(const boolList& lst)
-{
-    label n = 0;
-    forAll(lst, i)
+    else if (action == topoSetSource::DELETE)
     {
-        if (lst[i])
-        {
-            n++;
-        }
+        Info<< "    Removing bad-quality cells" << endl;
+        combine(set, false);
     }
-    return returnReduce(n, sumOp<label>());
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/badQualityCellSelection.H b/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.H
similarity index 65%
rename from applications/utilities/mesh/manipulation/subsetMesh/cellSelection/badQualityCellSelection.H
rename to src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.H
index 67b17e83be..4b52b0ff17 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/badQualityCellSelection.H
+++ b/src/dynamicMesh/motionSmoother/badQualityToCell/badQualityToCell.H
@@ -22,76 +22,94 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::cellSelections::badQualityCellSelection
+    Foam::badQualityToCell
 
 Description
-    Deselect bad quality cells
+    Selects bad quality cells (using snappyHexMesh/cvMesh mesh quality selector)
 
 SourceFiles
-    badQualityCellSelection.C
+    badQualityToCell.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef badQualityCellSelection_H
-#define badQualityCellSelection_H
+#ifndef badQualityToCell_H
+#define badQualityToCell_H
 
-#include "cellSelection.H"
+#include "topoSetSource.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-namespace cellSelections
-{
-
 /*---------------------------------------------------------------------------*\
-                     Class badQualityCellSelection Declaration
+                         Class badQualityToCell Declaration
 \*---------------------------------------------------------------------------*/
 
-class badQualityCellSelection
+class badQualityToCell
 :
-    public cellSelection
+    public topoSetSource
 {
 
+    // Private data
+
+        //- Add usage string
+        static addToUsageTable usage_;
+
+        //- Mesh quality dictionary
+        const dictionary dict_;
+
+
+    // Private Member Functions
+
+        void combine(topoSet& set, const bool add) const;
+
+
 public:
 
     //- Runtime type information
-    TypeName("badQuality");
-
+    TypeName("badQualityToCell");
 
     // Constructors
 
         //- Construct from dictionary
-        badQualityCellSelection
+        badQualityToCell
         (
-            const word& name,
             const polyMesh& mesh,
             const dictionary& dict
         );
 
-        //- Clone
-        autoPtr<cellSelection> clone() const
-        {
-            notImplemented("autoPtr<cellSelection> clone() const");
-            return autoPtr<cellSelection>(NULL);
-        }
+        //- Construct from Istream
+        badQualityToCell
+        (
+            const polyMesh& mesh,
+            Istream&
+        );
 
 
     //- Destructor
-    virtual ~badQualityCellSelection();
+    virtual ~badQualityToCell();
 
 
     // Member Functions
 
-        virtual void select(boolList&) const;
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
+        virtual void applyToSet
+        (
+            const topoSetSource::setAction action,
+            topoSet&
+        ) const;
 
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace cellSelections
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/badQualityCellSelection.C b/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.C
similarity index 56%
rename from applications/utilities/mesh/manipulation/subsetMesh/cellSelection/badQualityCellSelection.C
rename to src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.C
index fdd73a3034..a692c61569 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/badQualityCellSelection.C
+++ b/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.C
@@ -23,71 +23,99 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "badQualityCellSelection.H"
-#include "addToRunTimeSelectionTable.H"
-#include "faceSet.H"
+#include "badQualityToFace.H"
 #include "polyMesh.H"
 #include "motionSmoother.H"
+#include "addToRunTimeSelectionTable.H"
+#include "faceSet.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace cellSelections
-{
-    defineTypeNameAndDebug(badQualityCellSelection, 0);
-    addToRunTimeSelectionTable
-    (
-        cellSelection,
-        badQualityCellSelection,
-        dictionary
-    );
+
+defineTypeNameAndDebug(badQualityToFace, 0);
+
+addToRunTimeSelectionTable(topoSetSource, badQualityToFace, word);
+
+addToRunTimeSelectionTable(topoSetSource, badQualityToFace, istream);
+
 }
+
+
+Foam::topoSetSource::addToUsageTable Foam::badQualityToFace::usage_
+(
+    badQualityToFace::typeName,
+    "\n    Usage: badQualityToFace mesh-quality-dictionary\n\n"
+    "    Select all faces that do not satisfy the selection criterion\n\n"
+);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::badQualityToFace::combine(topoSet& set, const bool add) const
+{
+    faceSet faces(mesh_, "meshQualityFaces", mesh_.nFaces()/100+1);
+    motionSmoother::checkMesh(false, mesh_, dict_, faces);
+    faces.sync(mesh_);
+
+    forAllConstIter(faceSet, faces, iter)
+    {
+        label faceI = iter.key();
+        addOrDelete(set, faceI, add);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cellSelections::badQualityCellSelection::badQualityCellSelection
+// Construct from dictionary
+Foam::badQualityToFace::badQualityToFace
 (
-    const word& name,
     const polyMesh& mesh,
     const dictionary& dict
 )
 :
-    cellSelection(name, mesh, dict)
+    topoSetSource(mesh),
+    dict_(dict)
+{}
+
+
+// Construct from Istream
+Foam::badQualityToFace::badQualityToFace
+(
+    const polyMesh& mesh,
+    Istream& is
+)
+:
+    topoSetSource(mesh),
+    dict_(is)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::cellSelections::badQualityCellSelection::~badQualityCellSelection()
+Foam::badQualityToFace::~badQualityToFace()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::cellSelections::badQualityCellSelection::select
+void Foam::badQualityToFace::applyToSet
 (
-    boolList& selectedCell
+    const topoSetSource::setAction action,
+    topoSet& set
 ) const
 {
-    //- Delete cell of any face in error
-    faceSet faces(mesh_, "meshQualityFaces", mesh_.nFaces()/100+1);
-    motionSmoother::checkMesh(false, mesh_, dict_, faces);
-    label nFaces = returnReduce(faces.size(), sumOp<label>());
-    if (nFaces > 0)
+    if ((action == topoSetSource::NEW) || (action == topoSetSource::ADD))
     {
-        faces.sync(mesh_);
-        forAllConstIter(faceSet, faces, iter)
-        {
-            label faceI = iter.key();
-            selectedCell[mesh_.faceOwner()[faceI]] = false;
-            if (mesh_.isInternalFace(faceI))
-            {
-                selectedCell[mesh_.faceNeighbour()[faceI]] = false;
-            }
-        }
+        Info<< "    Adding bad-quality faces" << endl;
+        combine(set, true);
+    }
+    else if (action == topoSetSource::DELETE)
+    {
+        Info<< "    Removing bad-quality faces" << endl;
+        combine(set, false);
     }
 }
 
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/cellSelection.H b/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.H
similarity index 56%
rename from applications/utilities/mesh/manipulation/subsetMesh/cellSelection/cellSelection.H
rename to src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.H
index 656d052d82..d59964bad8 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/cellSelection.H
+++ b/src/dynamicMesh/motionSmoother/badQualityToFace/badQualityToFace.H
@@ -22,118 +22,88 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::cellSelection
+    Foam::badQualityToFace
 
 Description
-    Cell selection methods in subsetMesh
+    Selects bad quality faces (using snappyHexMesh/cvMesh mesh quality selector)
 
 SourceFiles
-    cellSelection.C
+    badQualityToFace.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellSelection_H
-#define cellSelection_H
+#ifndef badQualityToFace_H
+#define badQualityToFace_H
 
-#include "dictionary.H"
-#include "typeInfo.H"
-#include "runTimeSelectionTables.H"
-#include "autoPtr.H"
-#include "boolList.H"
+#include "topoSetSource.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of classes
-class polyMesh;
-
 /*---------------------------------------------------------------------------*\
-                         Class cellSelection Declaration
+                         Class badQualityToFace Declaration
 \*---------------------------------------------------------------------------*/
 
-class cellSelection
+class badQualityToFace
+:
+    public topoSetSource
 {
-protected:
 
-    // Protected data
+    // Private data
 
-        //- Name
-        const word name_;
+        //- Add usage string
+        static addToUsageTable usage_;
 
-        //- Reference to mesh
-        const polyMesh& mesh_;
-
-        //- Input dictionary
+        //- Mesh quality dictionary
         const dictionary dict_;
 
+
+    // Private Member Functions
+
+        void combine(topoSet& set, const bool add) const;
+
+
 public:
 
     //- Runtime type information
-    TypeName("cellSelection");
-
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            cellSelection,
-            dictionary,
-            (
-                const word& name,
-                const polyMesh& mesh,
-                const dictionary& dict
-            ),
-            (name, mesh, dict)
-        );
-
+    TypeName("badQualityToFace");
 
     // Constructors
 
         //- Construct from dictionary
-        cellSelection
+        badQualityToFace
         (
-            const word& name,
             const polyMesh& mesh,
             const dictionary& dict
         );
 
-        //- Clone
-        autoPtr<cellSelection> clone() const
-        {
-            notImplemented("autoPtr<cellSelection> clone() const");
-            return autoPtr<cellSelection>(NULL);
-        }
-
-
-    // Selectors
-
-        //- Return a reference to the selected cellSelection
-        static autoPtr<cellSelection> New
+        //- Construct from Istream
+        badQualityToFace
         (
-            const word& name,
             const polyMesh& mesh,
-            const dictionary& dict
+            Istream&
         );
 
 
     //- Destructor
-    virtual ~cellSelection();
+    virtual ~badQualityToFace();
 
 
     // Member Functions
 
-        //- Count global number of selected elements
-        static label count(const boolList&);
-
-        const word& name() const
+        virtual sourceType setType() const
         {
-            return name_;
+            return CELLSETSOURCE;
         }
 
-        virtual void select(boolList&) const = 0;
+        virtual void applyToSet
+        (
+            const topoSetSource::setAction action,
+            topoSet&
+        ) const;
 
 };
 
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index 0359c18457..a89d1cf60f 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -35,7 +35,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::motionSmoother, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(motionSmoother, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 8de21e2f08..e8e7b52721 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -34,9 +34,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::faceCoupleInfo, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(faceCoupleInfo, 0);
 
-const Foam::scalar Foam::faceCoupleInfo::angleTol_ = 1e-3;
+const scalar faceCoupleInfo::angleTol_ = 1e-3;
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
index 0aebc63a0d..fb93ad0d42 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
@@ -496,7 +496,6 @@ Foam::label Foam::polyMeshFilter::filter(const label nOriginalBadFaces)
     faceFilterFactor_.resize(mesh_.nFaces(), initialFaceLengthFactor_);
 
     // Maintain the number of times a point has been part of a bad face
-    //
     labelList pointErrorCount(mesh_.nPoints(), 0);
 
     // Main loop
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 7f11fb638d..bc9b292aab 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::addPatchCellLayer, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(addPatchCellLayer, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 8a772ac888..e74e8783c4 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::combineFaces, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(combineFaces, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H
index 94895c53fd..1eb9f40e77 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -174,8 +174,6 @@ public:
 
 private:
 
-    TypeName("refinementHistory");
-
     // Private data
 
         //- Storage for splitCells
@@ -230,6 +228,10 @@ private:
 
 public:
 
+    // Declare name of the class and its debug switch
+    TypeName("refinementHistory");
+
+
     // Constructors
 
         //- Construct (read) given an IOobject
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
index bdbd851527..fd0057531b 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
@@ -33,10 +33,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::tetDecomposer, 0);
-
 namespace Foam
 {
+    defineTypeNameAndDebug(tetDecomposer, 0);
+
     template<>
     const char* NamedEnum<tetDecomposer::decompositionType, 2>::names[] =
     {
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index 2a1539a6b4..b48d0ee60e 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -37,10 +37,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::extendedFeatureEdgeMesh, 0);
-
 namespace Foam
 {
+    defineTypeNameAndDebug(extendedFeatureEdgeMesh, 0);
+
     template<>
     const char* Foam::NamedEnum
     <
@@ -564,8 +564,6 @@ void Foam::extendedFeatureEdgeMesh::allNearestFeaturePoints
     List<pointIndexHit>& info
 ) const
 {
-    DynamicList<pointIndexHit> dynPointHit;
-
     // Pick up all the feature points that intersect the search sphere
     labelList elems = pointTree().findSphere
     (
@@ -573,6 +571,8 @@ void Foam::extendedFeatureEdgeMesh::allNearestFeaturePoints
         searchRadiusSqr
     );
 
+    DynamicList<pointIndexHit> dynPointHit(elems.size());
+
     forAll(elems, elemI)
     {
         label index = elems[elemI];
@@ -609,7 +609,7 @@ void Foam::extendedFeatureEdgeMesh::allNearestFeatureEdges
     sliceStarts[3] = openStart_;
     sliceStarts[4] = multipleStart_;
 
-    DynamicList<pointIndexHit> dynEdgeHit;
+    DynamicList<pointIndexHit> dynEdgeHit(edgeTrees.size()*3);
 
     // Loop over all the feature edge types
     forAll(edgeTrees, i)
diff --git a/src/engine/engineMesh/engineMesh/engineMesh.C b/src/engine/engineMesh/engineMesh/engineMesh.C
index 8dac21fed4..d3a80edeea 100644
--- a/src/engine/engineMesh/engineMesh/engineMesh.C
+++ b/src/engine/engineMesh/engineMesh/engineMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,9 +28,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::engineMesh, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(engineMesh, 0);
+defineRunTimeSelectionTable(engineMesh, IOobject);
+}
 
-defineRunTimeSelectionTable(Foam::engineMesh, IOobject);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.C b/src/fileFormats/vtk/vtkUnstructuredReader.C
index 7efce8278b..f3acda065a 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.C
@@ -32,10 +32,10 @@ License
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
-defineTypeNameAndDebug(Foam::vtkUnstructuredReader, 0);
-
 namespace Foam
 {
+    defineTypeNameAndDebug(vtkUnstructuredReader, 0);
+
     template<>
     const char*
     NamedEnum<vtkUnstructuredReader::vtkDataType, 8>::names[] =
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 5e097730fd..3a82c7407b 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -30,6 +30,10 @@ derivedFvPatches = $(fvPatches)/derived
 $(derivedFvPatches)/wall/wallFvPatch.C
 $(derivedFvPatches)/mapped/mappedFvPatch.C
 $(derivedFvPatches)/mapped/mappedWallFvPatch.C
+$(derivedFvPatches)/regionCoupled/regionCoupledBaseFvPatch.C
+$(derivedFvPatches)/regionCoupled/regionCoupledFvPatch.C
+$(derivedFvPatches)/regionCoupled/regionCoupledWallFvPatch.C
+
 
 wallDist = fvMesh/wallDist
 $(wallDist)/wallPointYPlus/wallPointYPlus.C
diff --git a/src/finiteVolume/Make/options b/src/finiteVolume/Make/options
index b91061399e..1c1990e5f3 100644
--- a/src/finiteVolume/Make/options
+++ b/src/finiteVolume/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
 
 LIB_LIBS = \
     -lOpenFOAM \
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index c9de2ad6a5..15c7e6cb0e 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -33,7 +33,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::MRFZone, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(MRFZone, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index 21f03aea9f..1f07b1bb14 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -105,7 +105,12 @@ uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf),
-    uniformValue_(ptf.uniformValue_().clone().ptr())
+    uniformValue_
+    (
+        ptf.uniformValue_.valid()
+      ? ptf.uniformValue_().clone().ptr()
+      : NULL
+    )
 {}
 
 
@@ -117,11 +122,20 @@ uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, iF),
-    uniformValue_(ptf.uniformValue_().clone().ptr())
+    uniformValue_
+    (
+        ptf.uniformValue_.valid()
+      ? ptf.uniformValue_().clone().ptr()
+      : NULL
+    )
 {
     // For safety re-evaluate
     const scalar t = this->db().time().timeOutputValue();
-    fvPatchField<Type>::operator==(uniformValue_->value(t));
+
+    if (ptf.uniformValue_.valid())
+    {
+        fvPatchField<Type>::operator==(uniformValue_->value(t));
+    }
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
index 7d07ca649f..dfb73c3607 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
@@ -40,6 +40,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
                "const fvPatch&, const DimensionedField<Type, volMesh>&) :"
                " patchFieldType="
             << patchFieldType
+            << " : " << p.type()
             << endl;
     }
 
@@ -50,7 +51,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
     {
         FatalErrorIn
         (
-            "fvPatchField<Type>::New(const word&, const word&, const fvPatch&, "
+            "fvPatchField<Type>::New(const word&, const word&, const fvPatch&,"
             "const DimensionedField<Type, volMesh>&)"
         )   << "Unknown patchField type "
             << patchFieldType << nl << nl
diff --git a/src/finiteVolume/finiteVolume/fv/fv.C b/src/finiteVolume/finiteVolume/fv/fv.C
index 1dac0f235c..2f4e26d44f 100644
--- a/src/finiteVolume/finiteVolume/fv/fv.C
+++ b/src/finiteVolume/finiteVolume/fv/fv.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::fv, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(fv, 0);
+}
+
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
index 254038b3fa..b0ec820d69 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::extendedLeastSquaresVectors, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(extendedLeastSquaresVectors, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index 7df3d5488b..95db626d72 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::leastSquaresVectors, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(leastSquaresVectors, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
index 021241fa27..a960f5a851 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,10 @@ License
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
-defineTypeNameAndDebug(Foam::extendedCellToFaceStencil, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(extendedCellToFaceStencil, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
index d59782184e..4fc0d1f2bb 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,27 +37,31 @@ void Foam::extendedCellToFaceStencil::collectData
 )
 {
     // 1. Construct cell data in compact addressing
-    List<Type> compactFld(map.constructSize(), pTraits<Type>::zero);
+    List<Type> flatFld(map.constructSize(), pTraits<Type>::zero);
 
     // Insert my internal values
     forAll(fld, cellI)
     {
-        compactFld[cellI] = fld[cellI];
+        flatFld[cellI] = fld[cellI];
     }
     // Insert my boundary values
-    label nCompact = fld.size();
     forAll(fld.boundaryField(), patchI)
     {
         const fvPatchField<Type>& pfld = fld.boundaryField()[patchI];
 
+        label nCompact =
+            pfld.patch().start()
+           -fld.mesh().nInternalFaces()
+           +fld.mesh().nCells();
+
         forAll(pfld, i)
         {
-            compactFld[nCompact++] = pfld[i];
+            flatFld[nCompact++] = pfld[i];
         }
     }
 
     // Do all swapping
-    map.distribute(compactFld);
+    map.distribute(flatFld);
 
     // 2. Pull to stencil
     stencilFld.setSize(stencil.size());
@@ -70,7 +74,7 @@ void Foam::extendedCellToFaceStencil::collectData
 
         forAll(compactCells, i)
         {
-            stencilFld[faceI][i] = compactFld[compactCells[i]];
+            stencilFld[faceI][i] = flatFld[compactCells[i]];
         }
     }
 }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
index 36af731c5a..fd04606fa6 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,8 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistribute.H"
 #include "extendedCentredFaceToCellStencil.H"
+#include "mapDistribute.H"
 #include "faceToCellStencil.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
index 635bd38aa3..8449ba6f19 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,27 +37,28 @@ void Foam::extendedFaceToCellStencil::collectData
 )
 {
     // 1. Construct face data in compact addressing
-    List<Type> compactFld(map.constructSize(), pTraits<Type>::zero);
+    List<Type> flatFld(map.constructSize(), pTraits<Type>::zero);
 
     // Insert my internal values
     forAll(fld, cellI)
     {
-        compactFld[cellI] = fld[cellI];
+        flatFld[cellI] = fld[cellI];
     }
     // Insert my boundary values
-    label nCompact = fld.size();
     forAll(fld.boundaryField(), patchI)
     {
         const fvsPatchField<Type>& pfld = fld.boundaryField()[patchI];
 
+        label nCompact = pfld.patch().start();
+
         forAll(pfld, i)
         {
-            compactFld[nCompact++] = pfld[i];
+            flatFld[nCompact++] = pfld[i];
         }
     }
 
     // Do all swapping
-    map.distribute(compactFld);
+    map.distribute(flatFld);
 
     // 2. Pull to stencil
     stencilFld.setSize(stencil.size());
@@ -70,7 +71,7 @@ void Foam::extendedFaceToCellStencil::collectData
 
         forAll(compactCells, i)
         {
-            stencilFld[faceI][i] = compactFld[compactCells[i]];
+            stencilFld[faceI][i] = flatFld[compactCells[i]];
         }
     }
 }
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index e40d0a8a22..b32cc11ce0 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -64,7 +64,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::fvMesh, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(fvMesh, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.C
new file mode 100644
index 0000000000..94dfecc3b4
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledBaseFvPatch.H"
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledBaseFvPatch, 0);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.H
new file mode 100644
index 0000000000..9b67e8c232
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.H
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledBaseFvPatch
+
+Description
+    Base class of regionCoupledFvPatch with common functionality for
+    regionCoupledFvPatch and regionCoupledWallFvPatch
+
+SourceFiles
+    regionCoupledBaseFvPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledBaseFvPatch_H
+#define regionCoupledBaseFvPatch_H
+
+#include "regionCoupledBase.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "polyPatch.H"
+#include "regionCoupledLduInterface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class regionCoupledBaseFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledBaseFvPatch
+:
+    public regionCoupledLduInterface
+{
+protected:
+
+    // Protected data
+
+        //- Reference to regionCoupledBase
+        const regionCoupledBase& regionCoupledBase_;
+
+        //- Reference to fvPatch
+        const fvPatch& patch_;
+
+
+    // Protected members
+
+        //- Returns fvMesh
+        const fvMesh& nbrFvMesh() const
+        {
+            return
+            (
+                patch_.boundaryMesh().mesh().time().lookupObject<fvMesh>
+                (
+                    regionCoupledBase_.nbrRegionName()
+                )
+            );
+        }
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupledBase");
+
+
+    // Constructors
+
+        //- Construct from polyPatch
+        regionCoupledBaseFvPatch
+        (
+            const polyPatch& pp,
+            const fvPatch& patch
+        )
+        :
+            regionCoupledLduInterface(),
+            regionCoupledBase_
+            (
+                refCast<const regionCoupledBase>(pp)
+            ),
+            patch_(patch)
+        {}
+
+
+    //- Destructor
+    virtual ~regionCoupledBaseFvPatch()
+    {}
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return neighbour
+            virtual label neighbPatchID() const
+            {
+                return regionCoupledBase_.neighbPatchID();
+            }
+
+            //- Is it the owner?
+            virtual bool owner() const
+            {
+                return regionCoupledBase_.owner();
+            }
+
+            //- Return regionCoupledBase neighb Patch
+            virtual const regionCoupledBaseFvPatch& neighbPatch() const
+            {
+                return refCast<const regionCoupledBaseFvPatch>
+                (
+                    nbrFvMesh().boundary()
+                    [
+                        regionCoupledBase_.neighbPatchID()
+                    ]
+                );
+            }
+
+            //- Return a reference to the AMI interpolator
+            virtual const AMIPatchToPatchInterpolation& AMI() const
+            {
+                return regionCoupledBase_.AMI();
+            }
+
+            //- Returns neighbour polyMesh
+            virtual const polyMesh& nbrMesh() const
+            {
+                return
+                (
+                    patch_.boundaryMesh().mesh().time().lookupObject<polyMesh>
+                    (
+                        regionCoupledBase_.nbrRegionName()
+                    )
+                );
+            }
+
+            //- Return fvPatch
+            const fvPatch& patch() const
+            {
+                return patch_;
+            }
+
+            //- Returns if it is the same Region
+            bool sameRegion() const
+            {
+                return regionCoupledBase_.sameRegion();
+            }
+
+            //- Return regionCoupledPolyPatch
+            const regionCoupledBase& regionCoupledPatch() const
+            {
+                return regionCoupledBase_;
+            }
+
+            //- Return neighbor fvPatch
+            const fvPatch& neighbFvPatch() const
+            {
+                return refCast<const fvPatch>
+                (
+                    nbrFvMesh().boundary()
+                    [
+                        regionCoupledBase_.neighbPatchID()
+                    ]
+                );
+            }
+
+            //- Return the interface type
+            const word& regionCoupleType() const
+            {
+                return regionCoupledBase_.regionCoupleType();
+            }
+
+
+             //- Return faceCell addressing
+            virtual const labelUList& faceCells() const = 0;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
new file mode 100644
index 0000000000..d43c48ac9b
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    coupledFvPatch is an abstract base class for patches that couple regions
+    of the computational domain e.g. cyclic and processor-processor links.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledFvPatch, 0);
+    addToRunTimeSelectionTable(fvPatch, regionCoupledFvPatch, polyPatch);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::labelField> Foam::regionCoupledFvPatch::interfaceInternalField
+(
+    const labelUList& internalData
+) const
+{
+    return patchInternalField(internalData);
+}
+
+
+Foam::tmp<Foam::labelField> Foam::regionCoupledFvPatch::internalFieldTransfer
+(
+    const Pstream::commsTypes commsType,
+    const labelUList& iF
+) const
+{
+    if (neighbFvPatch().sameRegion())
+    {
+        return neighbFvPatch().patchInternalField(iF);
+    }
+    else
+    {
+        /*
+        WarningIn
+        (
+            "regionCoupledFvPatch::internalFieldTransfer"
+            "( const Pstream::commsTypes, const labelUList&)"
+            " the internal field can not be transfered "
+            " as the neighbFvPatch are in different meshes "
+        );
+        */
+        return tmp<labelField>(new labelField(iF.size(), 0));
+
+    }
+    return tmp<labelField>(NULL);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H
new file mode 100644
index 0000000000..9c22929437
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledFvPatch
+
+Description
+    Common functionality for regionCoupleFvPatch and regionCoupledWallFvPatch
+
+SourceFiles
+    regionCoupledFvPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledFvPatch_H
+#define regionCoupledFvPatch_H
+
+#include "fvPatch.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "regionCoupledPolyPatch.H"
+#include "regionCoupledBaseFvPatch.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class regionCoupledFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledFvPatch
+:
+    public lduInterface,
+    public fvPatch,
+    public regionCoupledBaseFvPatch
+{
+    // Private data
+
+        const regionCoupledPolyPatch& regionCoupledPolyPatch_;
+
+    // Private members
+
+        //- Return regionCoupledFvPatch nbr
+        const regionCoupledFvPatch& neighbFvPatch() const
+        {
+            return refCast<const regionCoupledFvPatch>
+            (
+                nbrFvMesh().boundary()
+                [
+                    neighbPatchID()
+                ]
+            );
+        }
+
+
+public:
+
+    //- Runtime type information
+    TypeName(regionCoupledPolyPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from polyPatch
+        regionCoupledFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
+        :
+            fvPatch(patch, bm),
+            regionCoupledBaseFvPatch
+            (
+                patch,
+                *this
+            ),
+            regionCoupledPolyPatch_
+            (
+                refCast<const regionCoupledPolyPatch>(patch)
+            )
+        {}
+
+
+    //- Destructor
+    ~regionCoupledFvPatch()
+    {}
+
+
+    // Member Functions
+
+
+        // Access
+
+            //- Return faceCell addressing
+            virtual const labelUList& faceCells() const
+            {
+                return fvPatch::faceCells();
+            }
+
+            //- Return true because this patch is coupled
+            virtual bool coupled() const
+            {
+                return regionCoupledPolyPatch_.coupled();
+            }
+
+
+        // Interface transfer functions
+
+            //- Return the values of the given internal data adjacent to
+            //  the interface as a field
+            virtual tmp<labelField> interfaceInternalField
+            (
+                const labelUList& internalData
+            ) const;
+
+            //- Initialise neighbour field transfer
+            virtual void initInternalFieldTransfer
+            (
+                const Pstream::commsTypes commsType,
+                labelUList& iF
+            ) const
+            {}
+
+            //- Return neighbour field
+            virtual tmp<labelField> internalFieldTransfer
+            (
+                const Pstream::commsTypes commsType,
+                const labelUList& iF
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
new file mode 100644
index 0000000000..382fff4e79
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledWallFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledWallFvPatch, 0);
+    addToRunTimeSelectionTable(fvPatch, regionCoupledWallFvPatch, polyPatch);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::labelField> Foam::regionCoupledWallFvPatch::
+interfaceInternalField
+(
+    const labelUList& internalData
+) const
+{
+    return patchInternalField(internalData);
+}
+
+
+Foam::tmp<Foam::labelField> Foam::regionCoupledWallFvPatch::
+internalFieldTransfer
+(
+    const Pstream::commsTypes commsType,
+    const labelUList& iF
+) const
+{
+    if (neighbFvPatch().sameRegion())
+    {
+        return neighbFvPatch().patchInternalField(iF);
+    }
+    else
+    {
+        return tmp<labelField>(new labelField(iF.size(), 0));
+
+    }
+    return tmp<labelField>(NULL);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H
new file mode 100644
index 0000000000..486c5c693d
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledWallFvPatch
+
+Description
+    Foam::regionCoupledWallFvPatch
+
+SourceFiles
+    regionCoupledWallFvPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledWallFvPatch_H
+#define regionCoupledWallFvPatch_H
+
+#include "wallFvPatch.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "regionCoupledWallPolyPatch.H"
+#include "regionCoupledBaseFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class regionCoupledWallFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledWallFvPatch
+:
+    public lduInterface,
+    public wallFvPatch,
+    public regionCoupledBaseFvPatch
+{
+
+    // Private data
+
+        //- Const reference to regionCoupledWallPolyPatch
+        const regionCoupledWallPolyPatch& regionCoupledPolyPatch_;
+
+
+    // Private members
+
+        //- Return regionCoupledBaseFvPatch nbr
+        const regionCoupledWallFvPatch& neighbFvPatch() const
+        {
+            return refCast<const regionCoupledWallFvPatch>
+            (
+                nbrFvMesh().boundary()[neighbPatchID()]
+            );
+        }
+
+
+public:
+
+    //- Runtime type information
+    TypeName(regionCoupledWallPolyPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from components
+        regionCoupledWallFvPatch
+        (
+            const polyPatch& patch,
+            const fvBoundaryMesh& bm
+        )
+        :
+            wallFvPatch(patch, bm),
+            regionCoupledBaseFvPatch
+            (
+                patch,
+                *this
+            ),
+            regionCoupledPolyPatch_
+            (
+                refCast<const regionCoupledWallPolyPatch>(patch)
+            )
+        {}
+
+
+    //- Destructor
+    ~regionCoupledWallFvPatch()
+    {}
+
+
+    // Member Functions
+
+
+        // Access
+
+            //- Return faceCell addressing
+            virtual const labelUList& faceCells() const
+            {
+                return fvPatch::faceCells();
+            }
+
+            //- Return true because this patch is coupled
+            virtual bool coupled() const
+            {
+                return regionCoupledPolyPatch_.coupled();
+            }
+
+
+
+        // Interface transfer functions
+
+            //- Return the values of the given internal data adjacent to
+            //  the interface as a field
+            virtual tmp<labelField> interfaceInternalField
+            (
+                const labelUList& internalData
+            ) const;
+
+            //- Initialise neighbour field transfer
+            virtual void initInternalFieldTransfer
+            (
+                const Pstream::commsTypes commsType,
+                labelUList& iF
+            ) const
+            {}
+
+            //- Return neighbour field
+            virtual tmp<labelField> internalFieldTransfer
+            (
+                const Pstream::commsTypes commsType,
+                const labelUList& iF
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
index 467100fb37..cb8973ebc9 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
@@ -25,6 +25,7 @@ License
 
 #include "fvPatch.H"
 #include "HashTable.H"
+#include "cyclicAMIPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
index 6c6a6c0c53..3891ef4dc6 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
@@ -28,7 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineDebugSwitchWithName(Foam::pointMVCWeight, "pointMVCWeight", 0);
+namespace Foam
+{
+defineDebugSwitchWithName(pointMVCWeight, "pointMVCWeight", 0);
+}
 
 Foam::scalar Foam::pointMVCWeight::tol(SMALL);
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 2d9cadc47a..4386716a17 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -34,7 +34,10 @@ Description
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfaceInterpolation, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(surfaceInterpolation, 0);
+}
 
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index 38afad6fa2..5dc9d06272 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -515,7 +515,7 @@ void Foam::refinementSurfaces::setMinLevelFields
         if (geom.regions().size() > 1 && geom.globalSize() > 10)
         {
             // Representative local coordinates
-            const pointField ctrs = geom.coordinates();
+            const pointField ctrs(geom.coordinates());
 
             labelList minLevelField(ctrs.size(), -1);
             {
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationName.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationName.C
index d70d09184d..cf2a38a788 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationName.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,10 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::AMIInterpolationName, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(AMIInterpolationName, 0);
+}
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
index 6fa4f1a41a..cdc08e00a7 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
@@ -50,7 +50,8 @@ Foam::cyclicAMIGAMGInterface::cyclicAMIGAMGInterface
     const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
-    const labelField& neighbourRestrictAddressing
+    const labelField& neighbourRestrictAddressing,
+    const label fineLevelIndex
 )
 :
     GAMGInterface
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
index f498fe7701..5b01f7a945 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
@@ -87,7 +87,8 @@ public:
             const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& restrictAddressing,
-            const labelField& neighbourRestrictAddressing
+            const labelField& neighbourRestrictAddressing,
+            const label fineLevelIndex
         );
 
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.C
index 7d9a1a71e3..863013080f 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::cyclicAMILduInterface, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(cyclicAMILduInterface, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C
index 20cb7784da..0752825b56 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::cyclicAMILduInterfaceField, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(cyclicAMILduInterfaceField, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index b35aff1ab4..1b3dffa89d 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -188,4 +188,17 @@ mappedPatches/mappedPointPatch/mappedPointPatch.C
 mappedPatches/mappedPointPatch/mappedWallPointPatch.C
 
 
+regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
+regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C
+regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C
+regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C
+regionCoupled/patches/regionCoupledPointPatch/regionCoupledPointPatch.C
+regionCoupled/patches/regionCoupledPointPatch/regionCoupledWallPointPatch.C
+
+regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
+regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.C
+regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.C
+regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.C
+regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.C
+
 LIB = $(FOAM_LIBBIN)/libmeshTools
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWaveName.C b/src/meshTools/algorithms/MeshWave/FaceCellWaveName.C
index 6fc25dbae9..2a98fdf5f0 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWaveName.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWaveName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::FaceCellWaveName, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(FaceCellWaveName, 0);
+}
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/algorithms/MeshWave/MeshWaveName.C b/src/meshTools/algorithms/MeshWave/MeshWaveName.C
index 6c17c838f7..4de3d76789 100644
--- a/src/meshTools/algorithms/MeshWave/MeshWaveName.C
+++ b/src/meshTools/algorithms/MeshWave/MeshWaveName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::MeshWaveName, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(MeshWaveName, 0);
+}
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWaveName.C b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWaveName.C
index 5d3f3e1d58..5345b425fc 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWaveName.C
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWaveName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::PatchEdgeFaceWaveName, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(PatchEdgeFaceWaveName, 0);
+}
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveName.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveName.C
index ffc2aff4f4..796244585a 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveName.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::PointEdgeWaveName, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(PointEdgeWaveName, 0);
+}
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index 6fc2b15a97..09e84ac93c 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -38,7 +38,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::cellClassification, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(cellClassification, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index 2637c4e99e..103f4ef992 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::cellDistFuncs, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(cellDistFuncs, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C
index 62ba5f2917..567fae0478 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.C
+++ b/src/meshTools/indexedOctree/treeDataEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::treeDataEdge, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(treeDataEdge, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index ca928ab1c7..9699416c13 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -29,9 +29,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::treeDataFace, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(treeDataFace, 0);
 
-Foam::scalar Foam::treeDataFace::tolSqr = sqr(1e-6);
+scalar treeDataFace::tolSqr = sqr(1e-6);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index 09bf90de38..7c3a831159 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::treeDataPoint, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(treeDataPoint, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatchName.C b/src/meshTools/indexedOctree/treeDataPrimitivePatchName.C
index e1592bf7d3..bc6c79727c 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatchName.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatchName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::treeDataPrimitivePatchName, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(treeDataPrimitivePatchName, 0);
+}
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.C b/src/meshTools/indexedOctree/treeDataTriSurface.C
index 06c80367e2..fb1a4645f6 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.C
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::treeDataTriSurface, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(treeDataTriSurface, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index 6ff66755e4..f05d317104 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -33,9 +33,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::meshSearch, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(meshSearch, 0);
 
-Foam::scalar Foam::meshSearch::tol_ = 1e-3;
+scalar meshSearch::tol_ = 1e-3;
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.C b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.C
new file mode 100644
index 0000000000..30c00fca9b
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.C
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledGAMGInterfaceField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "lduMatrix.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledGAMGInterfaceField, 0);
+    addToRunTimeSelectionTable
+    (
+        GAMGInterfaceField,
+        regionCoupledGAMGInterfaceField,
+        lduInterface
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::regionCoupledGAMGInterfaceField::regionCoupledGAMGInterfaceField
+(
+    const GAMGInterface& GAMGCp,
+    const lduInterfaceField& fineInterface
+)
+:
+    GAMGInterfaceField(GAMGCp, fineInterface),
+    regionCoupledGAMGInterface_
+    (
+        refCast<const regionCoupledGAMGInterface>(GAMGCp)
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Desstructor * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledGAMGInterfaceField::~regionCoupledGAMGInterfaceField()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H
new file mode 100644
index 0000000000..b52b4c1321
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledGAMGInterfaceField
+
+Description
+    GAMG agglomerated region coupled interface field.
+
+SourceFiles
+    regionCoupledGAMGInterfaceField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledGAMGInterfaceField_H
+#define regionCoupledGAMGInterfaceField_H
+
+#include "GAMGInterfaceField.H"
+#include "regionCoupledGAMGInterface.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class regionCoupledGAMGInterfaceField Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledGAMGInterfaceField
+:
+    public GAMGInterfaceField
+{
+    // Private data
+
+        //- Local reference cast into the cyclic interface
+        const regionCoupledGAMGInterface& regionCoupledGAMGInterface_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        regionCoupledGAMGInterfaceField
+        (
+            const regionCoupledGAMGInterfaceField&
+        );
+
+        //- Disallow default bitwise assignment
+        void operator=(const regionCoupledGAMGInterfaceField&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupled");
+
+
+    // Constructors
+
+        //- Construct from GAMG interface and fine level interface field
+        regionCoupledGAMGInterfaceField
+        (
+            const GAMGInterface& GAMGCp,
+            const lduInterfaceField& fineInterfaceField
+        );
+
+
+    //- Destructor
+    virtual ~regionCoupledGAMGInterfaceField();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return size
+            label size() const
+            {
+                return regionCoupledGAMGInterface_.size();
+            }
+
+
+            //- Interface matrix update
+            virtual void updateInterfaceMatrix
+            (
+                scalarField&,
+                const scalarField&,
+                const scalarField&,
+                const direction,
+                const Pstream::commsTypes commsType
+            ) const
+            {}
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.C b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.C
new file mode 100644
index 0000000000..24921d8dd4
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.C
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledWallGAMGInterfaceField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "lduMatrix.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledWallGAMGInterfaceField, 0);
+    addToRunTimeSelectionTable
+    (
+        GAMGInterfaceField,
+        regionCoupledWallGAMGInterfaceField,
+        lduInterface
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::regionCoupledWallGAMGInterfaceField::regionCoupledWallGAMGInterfaceField
+(
+    const GAMGInterface& GAMGCp,
+    const lduInterfaceField& fineInterface
+)
+:
+    GAMGInterfaceField(GAMGCp, fineInterface),
+    regionCoupledGAMGInterface_
+    (
+        refCast<const regionCoupledWallGAMGInterface>(GAMGCp)
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Desstructor * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledWallGAMGInterfaceField::~regionCoupledWallGAMGInterfaceField
+()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H
new file mode 100644
index 0000000000..31aaf93261
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledWallGAMGInterfaceField
+
+Description
+    GAMG agglomerated region coupled interface field.
+
+SourceFiles
+    regionCoupledWallGAMGInterfaceField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledWallGAMGInterfaceField_H
+#define regionCoupledWallGAMGInterfaceField_H
+
+#include "GAMGInterfaceField.H"
+#include "regionCoupledWallGAMGInterface.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+             Class regionCoupledWallGAMGInterfaceField Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledWallGAMGInterfaceField
+:
+    public GAMGInterfaceField
+{
+    // Private data
+
+        //- Local reference cast into the region coupled interface
+        const regionCoupledWallGAMGInterface& regionCoupledGAMGInterface_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        regionCoupledWallGAMGInterfaceField
+        (
+            const regionCoupledWallGAMGInterfaceField&
+        );
+
+        //- Disallow default bitwise assignment
+        void operator=(const regionCoupledWallGAMGInterfaceField&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupledWall");
+
+
+    // Constructors
+
+        //- Construct from GAMG interface and fine level interface field
+        regionCoupledWallGAMGInterfaceField
+        (
+            const GAMGInterface& GAMGCp,
+            const lduInterfaceField& fineInterfaceField
+        );
+
+
+    //- Destructor
+    virtual ~regionCoupledWallGAMGInterfaceField();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return size
+            label size() const
+            {
+                return regionCoupledGAMGInterface_.size();
+            }
+
+
+            //- Interface matrix update
+            virtual void updateInterfaceMatrix
+            (
+                scalarField&,
+                const scalarField&,
+                const scalarField&,
+                const direction,
+                const Pstream::commsTypes commsType
+            ) const
+            {}
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
new file mode 100644
index 0000000000..b2df899a56
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
@@ -0,0 +1,261 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "AMIInterpolation.H"
+#include "regionCoupledBaseGAMGInterface.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Map.H"
+#include "polyMesh.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::regionCoupledBaseGAMGInterface::regionCoupledBaseGAMGInterface
+(
+    const label index,
+    const lduInterfacePtrsList& coarseInterfaces,
+    const lduInterface& fineInterface,
+    const labelField& localRestrictAddressing,
+    const labelField& neighbourRestrictAddressing,
+    const label fineLevelIndex
+)
+:
+    GAMGInterface
+    (
+        index,
+        coarseInterfaces,
+        fineInterface,
+        localRestrictAddressing,
+        neighbourRestrictAddressing,
+        fineLevelIndex
+    ),
+    fineRegionCoupledLduInterface_
+    (
+        refCast<const regionCoupledLduInterface>(fineInterface)
+    )
+{
+    /*
+    // Construct face agglomeration from cell agglomeration
+    {
+        // From coarse face to cell
+        DynamicList<label> dynFaceCells(localRestrictAddressing.size());
+
+        // From face to coarse face
+        DynamicList<label> dynFaceRestrictAddressing
+        (
+            localRestrictAddressing.size()
+        );
+
+        Map<label> masterToCoarseFace(localRestrictAddressing.size());
+
+        forAll(localRestrictAddressing, ffi)
+        {
+            label curMaster = localRestrictAddressing[ffi];
+
+            Map<label>::const_iterator fnd = masterToCoarseFace.find
+            (
+                curMaster
+            );
+
+            if (fnd == masterToCoarseFace.end())
+            {
+                // New coarse face
+                label coarseI = dynFaceCells.size();
+                dynFaceRestrictAddressing.append(coarseI);
+                dynFaceCells.append(curMaster);
+                masterToCoarseFace.insert(curMaster, coarseI);
+            }
+            else
+            {
+                // Already have coarse face
+                dynFaceRestrictAddressing.append(fnd());
+            }
+        }
+
+        faceCells_.transfer(dynFaceCells);
+        faceRestrictAddressing_.transfer(dynFaceRestrictAddressing);
+    }
+
+    // On the owner side construct the AMI
+    if (fineRegionCoupledLduInterface_.owner())
+    {
+        const polyMesh& nbrMesh =
+            fineRegionCoupledLduInterface_.nbrMesh();
+
+        if
+        (
+            nbrMesh.foundObject<GAMGAgglomeration>(GAMGAgglomeration::typeName)
+        )
+        {
+            const GAMGAgglomeration& nbrAgg = nbrMesh.thisDb().lookupObject
+            <
+                GAMGAgglomeration
+            >
+            (
+                GAMGAgglomeration::typeName
+            );
+
+            label nbrLevel(-1);
+            if (nbrAgg.size() > fineLevelIndex)
+            {
+                nbrLevel = fineLevelIndex;
+            }
+            else
+            {
+                nbrLevel = nbrAgg.size() - 1;
+            }
+
+            const labelField& nbrRestrictMap =
+                nbrAgg.restrictAddressing(nbrLevel);
+
+            const labelUList& nbrFaceCells =
+                nbrLduInterface
+                (
+                    nbrLevel,
+                    neighbPatchID()
+                ).faceCells();
+
+
+            const IndirectList<label> nbrPatchRestrictMap
+            (
+                nbrRestrictMap,
+                nbrFaceCells
+            );
+
+            labelList nbrFaceRestrictAddressing;
+            {
+                // From face to coarse face
+                DynamicList<label> dynNbrFaceRestrictAddressing
+                (
+                    nbrPatchRestrictMap.size()
+                );
+
+                Map<label> masterToCoarseFace(nbrPatchRestrictMap.size());
+
+                forAll(nbrPatchRestrictMap, ffi)
+                {
+                    label curMaster = nbrPatchRestrictMap[ffi];
+
+                    Map<label>::const_iterator fnd = masterToCoarseFace.find
+                    (
+                        curMaster
+                    );
+
+                    if (fnd == masterToCoarseFace.end())
+                    {
+                        // New coarse face
+                        label coarseI = masterToCoarseFace.size();
+                        dynNbrFaceRestrictAddressing.append(coarseI);
+                        masterToCoarseFace.insert(curMaster, coarseI);
+                    }
+                    else
+                    {
+                        // Already have coarse face
+                        dynNbrFaceRestrictAddressing.append(fnd());
+                    }
+                }
+
+                nbrFaceRestrictAddressing.transfer
+                (
+                    dynNbrFaceRestrictAddressing
+                );
+            }
+
+            amiPtr_.reset
+            (
+                new AMIPatchToPatchInterpolation
+                (
+                    fineRegionCoupledLduInterface_.AMI(),
+                    faceRestrictAddressing_,
+                    nbrFaceRestrictAddressing
+                )
+            );
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "regionCoupledBaseGAMGInterface::"
+                "regionCoupledBaseGAMGInterface"
+                "("
+                "const label index,"
+                "const lduInterfacePtrsList& coarseInterfaces,"
+                "const lduInterface& fineInterface,"
+                "const labelField& localRestrictAddressing,"
+                "const labelField& neighbourRestrictAddressing,"
+                "const label fineLevelIndex"
+                ")"
+            )   << " GAMGAgglomeration was not found in the nbr mesh. "
+                << " Check on the cacheAgglomeration flag in fvSolution"
+                << exit(FatalError);
+        }
+    }
+    */
+
+}
+
+
+// * * * * * * * * * * * * * * * * Desstructor * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledBaseGAMGInterface::~regionCoupledBaseGAMGInterface()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::labelField> Foam::regionCoupledBaseGAMGInterface::
+internalFieldTransfer
+(
+    const Pstream::commsTypes,
+    const labelUList& iF
+) const
+{
+    /*
+    WarningIn
+    (
+        "regionCoupledBaseGAMGInterface::internalFieldTransfer"
+        "( const Pstream::commsTypes, const labelUList&)"
+        " the internal field can not be transfered "
+        " as the neighbFvPatch are in different meshes "
+    );
+
+    //const labelUList& nbrFaceCells = neighbPatch().faceCells();
+
+    const labelUList& nbrFaceCells = nbrLduInterface().faceCells();
+
+    tmp<labelField> tpnf(new labelField(nbrFaceCells.size()));
+    labelField& pnf = tpnf();
+
+    forAll(pnf, facei)
+    {
+        pnf[facei] = iF[nbrFaceCells[facei]];
+    }
+    */
+    tmp<labelField> tpnf(new labelField(iF));
+
+    return tpnf;
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H
new file mode 100644
index 0000000000..4afefef879
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H
@@ -0,0 +1,169 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledBaseGAMGInterface
+
+Description
+    Base class for GAMG agglomerated coupled region interface.
+
+SourceFiles
+    regionCoupledBaseGAMGInterface.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledBaseGAMGInterface_H
+#define regionCoupledBaseGAMGInterface_H
+
+#include "GAMGInterface.H"
+#include "regionCoupledLduInterface.H"
+#include "GAMGAgglomeration.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class regionCoupledBaseGAMGInterface Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledBaseGAMGInterface
+:
+    public GAMGInterface,
+    virtual public regionCoupledLduInterface
+{
+    // Private data
+
+        //- Reference for the regionCoupledBaseFvPatch from which this is
+        //  agglomerated
+        const regionCoupledLduInterface& fineRegionCoupledLduInterface_;
+
+        //- AMI interface
+        //autoPtr<AMIPatchToPatchInterpolation> amiPtr_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        regionCoupledBaseGAMGInterface(const regionCoupledBaseGAMGInterface&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const regionCoupledBaseGAMGInterface&);
+
+
+public:
+
+
+    // Constructors
+
+        //- Construct from fine level interface,
+        //  local and neighbour restrict addressing
+        regionCoupledBaseGAMGInterface
+        (
+            const label index,
+            const lduInterfacePtrsList& coarseInterfaces,
+            const lduInterface& fineInterface,
+            const labelField& restrictAddressing,
+            const labelField& neighbourRestrictAddressing,
+            const label fineLevelIndex
+        );
+
+
+    //- Destructor
+    virtual ~regionCoupledBaseGAMGInterface();
+
+
+    // Member Functions
+
+        // Interface transfer functions
+
+            //- Transfer and return internal field adjacent to the interface
+            virtual tmp<labelField> internalFieldTransfer
+            (
+                const Pstream::commsTypes commsType,
+                const labelUList& iF
+            ) const;
+
+
+        //- Cyclic interface functions
+
+            //- Return neigbour processor number
+            virtual label neighbPatchID() const
+            {
+                return fineRegionCoupledLduInterface_.neighbPatchID();
+            }
+
+            virtual bool owner() const
+            {
+                return fineRegionCoupledLduInterface_.owner();
+            }
+
+            virtual const regionCoupledBaseGAMGInterface& neighbPatch() const
+            {
+                return dynamic_cast<const regionCoupledBaseGAMGInterface&>
+                (
+                    fineRegionCoupledLduInterface_.neighbPatch()
+                );
+            }
+
+            //virtual const AMIPatchToPatchInterpolation& AMI() const
+            //{
+            //    return amiPtr_();
+            //}
+
+            virtual const polyMesh& nbrMesh() const
+            {
+                return fineRegionCoupledLduInterface_.nbrMesh();
+            }
+
+            const lduInterface& nbrLduInterface
+            (
+                const label fineLevelIndex,
+                const label index
+            ) const
+            {
+                const GAMGAgglomeration& agg = nbrMesh().thisDb().lookupObject
+                <
+                    GAMGAgglomeration
+                >
+                (
+                    GAMGAgglomeration::typeName
+                );
+
+                const lduMesh& mesh = agg.meshLevel(fineLevelIndex);
+                return mesh.interfaces()[index];
+            }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.C b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.C
new file mode 100644
index 0000000000..bcac280bfa
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.C
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledGAMGInterface.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledGAMGInterface, 0);
+    addToRunTimeSelectionTable
+    (
+        GAMGInterface,
+        regionCoupledGAMGInterface,
+        lduInterface
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::regionCoupledGAMGInterface::regionCoupledGAMGInterface
+(
+    const label index,
+    const lduInterfacePtrsList& coarseInterfaces,
+    const lduInterface& fineInterface,
+    const labelField& localRestrictAddressing,
+    const labelField& neighbourRestrictAddressing,
+    const label fineLevelIndex
+)
+:
+    regionCoupledBaseGAMGInterface
+    (
+        index,
+        coarseInterfaces,
+        fineInterface,
+        localRestrictAddressing,
+        neighbourRestrictAddressing,
+        fineLevelIndex
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Desstructor * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledGAMGInterface::~regionCoupledGAMGInterface()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H
new file mode 100644
index 0000000000..03c1b31b8e
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledGAMGInterface
+
+Description
+    GAMG agglomerated coupled region interface.
+
+SourceFiles
+    regionCoupledGAMGInterface.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledGAMGInterface_H
+#define regionCoupledGAMGInterface_H
+
+#include "regionCoupledBaseGAMGInterface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class regionCoupledGAMGInterface Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledGAMGInterface
+:
+    public regionCoupledBaseGAMGInterface
+{
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        regionCoupledGAMGInterface(const regionCoupledGAMGInterface&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const regionCoupledGAMGInterface&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupled");
+
+    // Constructors
+
+        //- Construct from fine level interface,
+        //  local and neighbour restrict addressing
+        regionCoupledGAMGInterface
+        (
+            const label index,
+            const lduInterfacePtrsList& coarseInterfaces,
+            const lduInterface& fineInterface,
+            const labelField& restrictAddressing,
+            const labelField& neighbourRestrictAddressing,
+            const label fineLevelIndex
+        );
+
+
+    //- Destructor
+    virtual ~regionCoupledGAMGInterface();
+
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.C b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.C
new file mode 100644
index 0000000000..c3f2e39645
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.C
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledWallGAMGInterface.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledWallGAMGInterface, 0);
+    addToRunTimeSelectionTable
+    (
+        GAMGInterface,
+        regionCoupledWallGAMGInterface,
+        lduInterface
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::regionCoupledWallGAMGInterface::regionCoupledWallGAMGInterface
+(
+    const label index,
+    const lduInterfacePtrsList& coarseInterfaces,
+    const lduInterface& fineInterface,
+    const labelField& localRestrictAddressing,
+    const labelField& neighbourRestrictAddressing,
+    const label fineLevelIndex
+)
+:
+    regionCoupledBaseGAMGInterface
+    (
+        index,
+        coarseInterfaces,
+        fineInterface,
+        localRestrictAddressing,
+        neighbourRestrictAddressing,
+        fineLevelIndex
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Desstructor * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledWallGAMGInterface::~regionCoupledWallGAMGInterface()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H
new file mode 100644
index 0000000000..dd3c96c843
--- /dev/null
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledWallGAMGInterface
+
+Description
+    GAMG agglomerated coupled region interface.
+
+SourceFiles
+    regionCoupledWallGAMGInterface.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledWallGAMGInterface_H
+#define regionCoupledWallGAMGInterface_H
+
+#include "regionCoupledBaseGAMGInterface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class regionCoupledWallGAMGInterface Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledWallGAMGInterface
+:
+    public regionCoupledBaseGAMGInterface
+{
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        regionCoupledWallGAMGInterface(const regionCoupledWallGAMGInterface&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const regionCoupledWallGAMGInterface&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupledWall");
+
+
+    // Constructors
+
+        //- Construct from fine level interface,
+        //  local and neighbour restrict addressing
+        regionCoupledWallGAMGInterface
+        (
+            const label index,
+            const lduInterfacePtrsList& coarseInterfaces,
+            const lduInterface& fineInterface,
+            const labelField& restrictAddressing,
+            const labelField& neighbourRestrictAddressing,
+            const label fineLevelIndex
+        );
+
+
+    //- Destructor
+    virtual ~regionCoupledWallGAMGInterface();
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C b/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C
new file mode 100644
index 0000000000..fbc831dc61
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledLduInterface.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+namespace Foam
+{
+defineTypeNameAndDebug(regionCoupledLduInterface, 0);
+}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledLduInterface::~regionCoupledLduInterface()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.H b/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.H
new file mode 100644
index 0000000000..8b8e81a793
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.H
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledLduInterface
+
+Description
+    An abstract base class for region coupled interfaces
+
+SourceFiles
+    regionCoupledLduInterface.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledLduInterface_H
+#define regionCoupledLduInterface_H
+
+#include "primitiveFieldsFwd.H"
+#include "AMIPatchToPatchInterpolation.H"
+#include "polyMesh.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class regionCoupledLduInterface Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledLduInterface
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupledLduInterface");
+
+
+    // Constructors
+
+        //- Construct null
+        regionCoupledLduInterface()
+        {}
+
+
+    //- Destructor
+    virtual ~regionCoupledLduInterface();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return neighbour
+            virtual label neighbPatchID() const = 0;
+
+            //- Is it owner?
+            virtual bool owner() const = 0;
+
+            //- Return neighb regionCoupledLduInterface
+            virtual const regionCoupledLduInterface& neighbPatch() const = 0;
+
+            //- Return AMI
+            //virtual const AMIPatchToPatchInterpolation& AMI() const = 0;
+
+            //- Return nbrMesh
+            virtual const polyMesh& nbrMesh() const = 0;
+
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledPointPatch.C b/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledPointPatch.C
new file mode 100644
index 0000000000..034f58d049
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledPointPatch.C
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledPointPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    defineTypeNameAndDebug(regionCoupledPointPatch, 0);
+    addToRunTimeSelectionTable
+    (
+        facePointPatch,
+        regionCoupledPointPatch,
+        polyPatch
+    );
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledPointPatch.H b/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledPointPatch.H
new file mode 100644
index 0000000000..3194272c5d
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledPointPatch.H
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledPointPatch
+
+Description
+    Cyclic AMI point patch - place holder only
+
+SourceFiles
+    regionCoupledPointPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledPointPatch_H
+#define regionCoupledPointPatch_H
+
+#include "facePointPatch.H"
+#include "regionCoupledPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class regionCoupledPointPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledPointPatch
+:
+    public facePointPatch
+{
+public:
+
+    //- Runtime type information
+    TypeName(regionCoupledPolyPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from components
+        regionCoupledPointPatch
+        (
+            const polyPatch& patch,
+            const pointBoundaryMesh& bm
+        ):
+             facePointPatch(patch, bm)
+        {}
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledWallPointPatch.C b/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledWallPointPatch.C
new file mode 100644
index 0000000000..590f71d838
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledWallPointPatch.C
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledWallPointPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    defineTypeNameAndDebug(regionCoupledWallPointPatch, 0);
+    addToRunTimeSelectionTable
+    (
+        facePointPatch,
+        regionCoupledWallPointPatch,
+        polyPatch
+    );
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledWallPointPatch.H b/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledWallPointPatch.H
new file mode 100644
index 0000000000..5dc4b6953d
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPointPatch/regionCoupledWallPointPatch.H
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledWallPointPatch
+
+Description
+    Cyclic AMI point patch - place holder only
+
+SourceFiles
+    regionCoupledWallPointPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledWallPointPatch_H
+#define regionCoupledWallPointPatch_H
+
+#include "facePointPatch.H"
+#include "regionCoupledWallPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class regionCoupledWallPointPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledWallPointPatch
+:
+    public facePointPatch
+{
+public:
+
+    //- Runtime type information
+    TypeName(regionCoupledWallPolyPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from components
+        regionCoupledWallPointPatch
+        (
+            const polyPatch& patch,
+            const pointBoundaryMesh& bm
+        ):
+             facePointPatch(patch, bm)
+        {}
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
new file mode 100644
index 0000000000..de7215e3da
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
@@ -0,0 +1,369 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledBase.H"
+#include "SubField.H"
+#include "polyMesh.H"
+#include "Time.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledBase, 0);
+}
+
+
+// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
+
+void Foam::regionCoupledBase::resetAMI() const
+{
+    if (owner())
+    {
+        AMIPtr_.clear();
+
+        const polyPatch& nbr = refCast<const polyPatch>(neighbPatch());
+        pointField nbrPoints = nbr.localPoints();
+
+        if (debug)
+        {
+            const Time& t = patch_.boundaryMesh().mesh().time();
+            OFstream os(t.path()/patch_.name() + "_neighbourPatch-org.obj");
+            meshTools::writeOBJ(os, nbr.localFaces(), nbrPoints);
+        }
+
+        // transform neighbour patch to local system
+        //transformPosition(nbrPoints);
+        primitivePatch nbrPatch0
+        (
+            SubList<face>
+            (
+                nbr.localFaces(),
+                nbr.size()
+            ),
+            nbrPoints
+        );
+
+        if (debug)
+        {
+            const Time& t = patch_.boundaryMesh().mesh().time();
+            OFstream osN(t.path()/patch_.name() + "_neighbourPatch-trans.obj");
+            meshTools::writeOBJ(osN, nbrPatch0.localFaces(), nbrPoints);
+
+            OFstream osO(t.path()/patch_.name() + "_ownerPatch.obj");
+            meshTools::writeOBJ
+            (
+                osO,
+                patch_.localFaces(),
+                patch_.localPoints()
+            );
+        }
+
+        // Construct/apply AMI interpolation to determine addressing and weights
+        AMIPtr_.reset
+        (
+            new AMIPatchToPatchInterpolation
+            (
+                patch_,
+                nbrPatch0,
+                surfPtr(),
+                faceAreaIntersect::tmMesh,
+                AMIReverse_
+            )
+        );
+
+        if (debug)
+        {
+            Pout<< "regionCoupledBase : " << patch_.name()
+                << " constructed AMI with " << nl
+                << "    " << ":srcAddress:" << AMIPtr_().srcAddress().size()
+                << nl
+                << "    " << " tgAddress :" << AMIPtr_().tgtAddress().size()
+                << nl << endl;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::regionCoupledBase::clearGeom()
+{
+    AMIPtr_.clear();
+    surfPtr_.clear();
+}
+
+
+// * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledBase::regionCoupledBase
+(
+    const polyPatch& pp
+)
+:
+    patch_(pp),
+    nbrPatchName_(word::null),
+    nbrPatchID_(-1),
+    nbrRegionName_(word::null),
+    sameRegion_(false),
+    AMIPtr_(NULL),
+    AMIReverse_(false),
+    surfPtr_(NULL),
+    surfDict_(fileName("surface"))
+{}
+
+
+Foam::regionCoupledBase::regionCoupledBase
+(
+    const polyPatch& pp,
+    const dictionary& dict
+)
+:
+    patch_(pp),
+    nbrPatchName_(dict.lookup("neighbourPatch")),
+    nbrPatchID_(-1),
+    nbrRegionName_(dict.lookup("neighbourRegion")),
+    sameRegion_(nbrRegionName_ == patch_.boundaryMesh().mesh().name()),
+    AMIPtr_(NULL),
+    AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
+    surfPtr_(NULL),
+    surfDict_(dict.subOrEmptyDict("surface"))
+{
+    if (nbrPatchName_ == patch_.name())
+    {
+        FatalIOErrorIn
+        (
+            "regionCoupledBase::regionCoupledBase"
+            "("
+                "const polyPatch&, "
+                "const dictionary& "
+            ")",
+            dict
+        )   << "Neighbour patch name " << nbrPatchName_
+            << " cannot be the same as this patch " << patch_.name()
+            << exit(FatalIOError);
+    }
+}
+
+
+Foam::regionCoupledBase::regionCoupledBase
+(
+    const polyPatch& pp,
+    const regionCoupledBase& mpb
+)
+:
+    patch_(pp),
+    nbrPatchName_(mpb.nbrPatchName_),
+    nbrPatchID_(mpb.nbrPatchID_),
+    nbrRegionName_(mpb.nbrRegionName_),
+    sameRegion_(mpb.sameRegion_),
+    AMIPtr_(NULL),
+    AMIReverse_(mpb.AMIReverse_),
+    surfPtr_(mpb.surfPtr_),
+    surfDict_(mpb.surfDict_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledBase::~regionCoupledBase()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::regionCoupledBase::neighbPatchID() const
+{
+    if (nbrPatchID_ == -1)
+    {
+        if
+        (
+            patch_.boundaryMesh().mesh().time().foundObject<polyMesh>
+            (
+                nbrRegionName_
+            )
+        )
+        {
+            const polyMesh& mesh =
+                patch_.boundaryMesh().mesh().time().lookupObject<polyMesh>
+                (
+                    nbrRegionName_
+                );
+
+            nbrPatchID_ = mesh.boundaryMesh().findPatchID(nbrPatchName_);
+
+            if (nbrPatchID_ == -1)
+            {
+                FatalErrorIn("cyclicPolyAMIPatch::neighbPatchID() const")
+                    << "Illegal neighbourPatch name " << nbrPatchName_
+                    << nl << "Valid patch names are "
+                    << mesh.boundaryMesh().names()
+                    << exit(FatalError);
+            }
+
+            // Check that it is a cyclic AMI patch
+            const regionCoupledBase& nbrPatch =
+                refCast<const regionCoupledBase>
+                (
+                    mesh.boundaryMesh()[nbrPatchID_]
+                );
+
+            if (nbrPatch.nbrPatchName() != patch_.name())
+            {
+                WarningIn("regionCoupledBase::neighbPatchID() const")
+                    << "Patch " << patch_.name()
+                    << " specifies neighbour patch " << nbrPatchName()
+                    << nl << " but that in return specifies "
+                    << nbrPatch.nbrPatchName() << endl;
+            }
+        }
+    }
+
+    return nbrPatchID_;
+}
+
+
+bool Foam::regionCoupledBase::owner() const
+{
+    if (nbrRegionName_ == patch_.boundaryMesh().mesh().name())
+    {
+        return patch_.index() < neighbPatchID();
+    }
+    else
+    {
+        return patch_.boundaryMesh().mesh().name() < nbrRegionName_;
+    }
+}
+
+
+const Foam::autoPtr<Foam::searchableSurface>&Foam::regionCoupledBase::
+surfPtr() const
+{
+    const word surfType(surfDict_.lookupOrDefault<word>("type", "none"));
+
+    if (!surfPtr_.valid() && owner() && surfType != "none")
+    {
+        word surfName(surfDict_.lookupOrDefault("name", patch_.name()));
+
+        const polyMesh& mesh = patch_.boundaryMesh().mesh();
+
+        surfPtr_ =
+            searchableSurface::New
+            (
+                surfType,
+                IOobject
+                (
+                    surfName,
+                    mesh.time().constant(),
+                    "triSurface",
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                ),
+                surfDict_
+            );
+    }
+
+    return surfPtr_;
+}
+
+
+const Foam::AMIPatchToPatchInterpolation& Foam::regionCoupledBase::AMI() const
+{
+    if (!owner())
+    {
+        FatalErrorIn
+        (
+            "const AMIPatchToPatchInterpolation& regionCoupledBase::AMI()"
+        )
+            << "AMI interpolator only available to owner patch"
+            << abort(FatalError);
+    }
+
+    if (!AMIPtr_.valid())
+    {
+        resetAMI();
+    }
+
+    return AMIPtr_();
+}
+
+
+const Foam::regionCoupledBase&
+Foam::regionCoupledBase::neighbPatch() const
+{
+    const polyMesh& mesh =
+        patch_.boundaryMesh().mesh().time().lookupObject<polyMesh>
+        (
+            nbrRegionName_
+        );
+
+    const polyPatch& pp = mesh.boundaryMesh()[neighbPatchID()];
+    return refCast<const regionCoupledBase>(pp);
+}
+
+
+bool Foam::regionCoupledBase::order
+(
+    PstreamBuffers& pBufs,
+    const primitivePatch& pp,
+    labelList& faceMap,
+    labelList& rotation
+) const
+{
+    faceMap.setSize(pp.size());
+    faceMap = -1;
+
+    rotation.setSize(pp.size());
+    rotation = 0;
+
+    // do nothing
+    return false;
+}
+
+
+void Foam::regionCoupledBase::write(Ostream& os) const
+{
+    os.writeKeyword("neighbourPatch") << nbrPatchName_
+    << token::END_STATEMENT << nl;
+    os.writeKeyword("nbrRegionName") << nbrRegionName_
+    << token::END_STATEMENT << nl;
+
+    if (AMIReverse_)
+    {
+        os.writeKeyword("flipNormals") << AMIReverse_
+            << token::END_STATEMENT << nl;
+    }
+
+    if (!surfDict_.empty())
+    {
+        os.writeKeyword(surfDict_.dictName());
+        os  << surfDict_;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.H b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.H
new file mode 100644
index 0000000000..b28d4351a0
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.H
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledBase
+
+Description
+    Base class with common functinality for regionCoupled polyPatch.
+    It includes AMI.
+
+
+SourceFiles
+    regionCoupledBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledBase_H
+#define regionCoupledBase_H
+
+#include "AMIPatchToPatchInterpolation.H"
+#include "polyBoundaryMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class regionCoupledBase Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledBase
+{
+private:
+
+    // Private data
+
+        //- Patch to sample
+        const polyPatch& patch_;
+
+        //- Name of other half
+        const word nbrPatchName_;
+
+        //- Index of other half
+        mutable label nbrPatchID_;
+
+        //- Name of other region
+        const word nbrRegionName_;
+
+        //- Same region
+        const bool sameRegion_;
+
+        //- AMI interpolation class
+        mutable autoPtr<AMIPatchToPatchInterpolation> AMIPtr_;
+
+        //- Flag to indicate that slave patch should be reversed for AMI
+        const bool AMIReverse_;
+
+         //- Projection surface
+        mutable autoPtr<searchableSurface> surfPtr_;
+
+        //- Dictionary used during projection surface construction
+        const dictionary surfDict_;
+
+
+    // Private Member Functions
+
+        //- Reset the AMI interpolator
+        void resetAMI() const;
+
+
+protected:
+
+
+        //- Clear geometry
+        virtual void clearGeom();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupledBase");
+
+
+    // Constructors
+
+        //- Construct from patch
+        regionCoupledBase(const polyPatch&);
+
+        //- Construct from dictionary
+        regionCoupledBase(const polyPatch&, const dictionary&);
+
+         //- Construct as copy, resetting patch
+        regionCoupledBase(const polyPatch&, const regionCoupledBase&);
+
+
+    //- Destructor
+    virtual ~regionCoupledBase();
+
+
+    // Member Functions
+
+
+        // Access
+
+            //- Neighbour patch name
+            const word& nbrPatchName() const
+            {
+                return nbrPatchName_;
+            }
+
+            //- Neighbour region name
+            const word& nbrRegionName() const
+            {
+                return nbrRegionName_;
+            }
+
+            //- Cached sampleRegion != mesh.name()
+            bool sameRegion() const
+            {
+                return sameRegion_;
+            }
+
+            //- Neighbour patch ID
+            label neighbPatchID() const;
+
+            //- Does this side own the patch?
+            bool owner() const;
+
+            //- Return a reference to the neighbour patch
+            const regionCoupledBase& neighbPatch() const;
+
+            //- Return a reference to the projection surface
+            const autoPtr<searchableSurface>& surfPtr() const;
+
+            //- Return a reference to the AMI interpolator
+            const AMIPatchToPatchInterpolation& AMI() const;
+
+
+            // Interpolations
+
+                //- Interpolate field
+                template<class Type>
+                tmp<Field<Type> > interpolate(const Field<Type>& fld) const;
+
+                //- Interpolate tmp field
+                template<class Type>
+                tmp<Field<Type> > interpolate
+                (
+                    const tmp<Field<Type> >& tFld
+                ) const;
+
+                //- Low-level interpolate List
+                template<class Type, class BinaryOp>
+                void interpolate
+                (
+                    const UList<Type>& fld,
+                    const BinaryOp& bop,
+                    List<Type>& result
+                ) const;
+
+
+        //- Return new ordering for primitivePatch.
+        //  Ordering is -faceMap: for every face
+        //  index of the new face -rotation:for every new face the clockwise
+        //  shift of the original face. Return false if nothing changes
+        //  (faceMap is identity, rotation is 0), true otherwise.
+        virtual bool order
+        (
+            PstreamBuffers&,
+            const primitivePatch&,
+            labelList& faceMap,
+            labelList& rotation
+        ) const;
+
+
+        //- Return the type
+        virtual const word& regionCoupleType() const = 0;
+
+        //- Write the polyPatch data as a dictionary
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "regionCoupledBaseTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBaseTemplates.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBaseTemplates.C
new file mode 100644
index 0000000000..125af8d35b
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBaseTemplates.C
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::Field<Type> > Foam::regionCoupledBase::interpolate
+(
+    const Field<Type>& fld
+) const
+{
+    if (owner())
+    {
+        return AMI().interpolateToSource(fld);
+    }
+    else
+    {
+        return neighbPatch().AMI().interpolateToTarget(fld);
+    }
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type> > Foam::regionCoupledBase::interpolate
+(
+    const tmp<Field<Type> >& tFld
+) const
+{
+    if (owner())
+    {
+        return AMI().interpolateToSource(tFld);
+    }
+    else
+    {
+        return neighbPatch().AMI().interpolateToTarget(tFld);
+    }
+}
+
+
+template<class Type, class BinaryOp>
+void Foam::regionCoupledBase::interpolate
+(
+    const UList<Type>& fld,
+    const BinaryOp& bop,
+    List<Type>& result
+) const
+{
+    if (owner())
+    {
+        AMI().interpolateToSource(fld, bop, result);
+    }
+    else
+    {
+        neighbPatch().AMI().interpolateToTarget(fld, bop, result);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C
new file mode 100644
index 0000000000..e88e32b7de
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledPolyPatch.H"
+#include "polyMesh.H"
+#include "Time.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledPolyPatch, 0);
+
+    addToRunTimeSelectionTable(polyPatch, regionCoupledPolyPatch, word);
+    addToRunTimeSelectionTable(polyPatch, regionCoupledPolyPatch, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledPolyPatch::regionCoupledPolyPatch
+(
+    const word& name,
+    const label size,
+    const label start,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& patchType
+)
+:
+    polyPatch(name, size, start, index, bm, patchType),
+    regionCoupledBase(static_cast<const polyPatch&>(*this))
+{}
+
+
+Foam::regionCoupledPolyPatch::regionCoupledPolyPatch
+(
+    const word& name,
+    const dictionary& dict,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& patchType
+)
+:
+    polyPatch(name, dict, index, bm, patchType),
+    regionCoupledBase(*this, dict)
+{}
+
+
+Foam::regionCoupledPolyPatch::regionCoupledPolyPatch
+(
+    const regionCoupledPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    polyPatch(pp, bm),
+    regionCoupledBase(*this, pp)
+{}
+
+
+Foam::regionCoupledPolyPatch::regionCoupledPolyPatch
+(
+    const regionCoupledPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
+)
+:
+    polyPatch(pp, bm, index, newSize, newStart),
+    regionCoupledBase(*this, pp)
+{}
+
+
+Foam::regionCoupledPolyPatch::regionCoupledPolyPatch
+(
+    const regionCoupledPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const labelUList& mapAddressing,
+    const label newStart
+)
+:
+    polyPatch(pp, bm, index, mapAddressing, newStart),
+    regionCoupledBase(*this, pp)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledPolyPatch::~regionCoupledPolyPatch()
+{
+    regionCoupledBase::clearGeom();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::regionCoupledPolyPatch::initGeometry(PstreamBuffers& pBufs)
+{
+    polyPatch::initGeometry(pBufs);
+}
+
+
+void Foam::regionCoupledPolyPatch::initMovePoints
+(
+    PstreamBuffers& pBufs,
+    const pointField& p
+)
+{
+    polyPatch::initMovePoints(pBufs, p);
+}
+
+
+void Foam::regionCoupledPolyPatch::movePoints
+(
+    PstreamBuffers& pBufs,
+    const pointField& p
+)
+{
+    polyPatch::movePoints(pBufs, p);
+    regionCoupledBase::clearGeom();
+}
+
+
+void Foam::regionCoupledPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+{
+    polyPatch::initUpdateMesh(pBufs);
+}
+
+
+void Foam::regionCoupledPolyPatch::updateMesh(PstreamBuffers& pBufs)
+{
+    polyPatch::updateMesh(pBufs);
+    regionCoupledBase::clearGeom();
+}
+
+
+void Foam::regionCoupledPolyPatch::write(Ostream& os) const
+{
+    polyPatch::write(os);
+    regionCoupledBase::write(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.H b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.H
new file mode 100644
index 0000000000..82b3bf54fa
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.H
@@ -0,0 +1,223 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledPolyPatch
+
+Description
+    Region coupled polyPatch
+
+SourceFiles
+    regionCoupledPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledPolyPatch_H
+#define regionCoupledPolyPatch_H
+
+#include "regionCoupledBase.H"
+#include "polyBoundaryMesh.H"
+#include "polyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class regionCoupledPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledPolyPatch
+:
+    public polyPatch,
+    public regionCoupledBase
+{
+
+protected:
+
+    // Protected Member Functions
+
+        //- Initialise the calculation of the patch geometry
+        virtual void initGeometry(PstreamBuffers&);
+
+        //- Initialise the patches for moving points
+        virtual void initMovePoints(PstreamBuffers& pBufs, const pointField&);
+
+        //- Correct patches after moving points
+        virtual void movePoints(PstreamBuffers& pBufs, const pointField&);
+
+        //- Initialise the update of the patch topology
+        virtual void initUpdateMesh(PstreamBuffers&);
+
+        //- Update of the patch topology
+        virtual void updateMesh(PstreamBuffers&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupled");
+
+
+    // Constructors
+
+        //- Construct from (base couped patch) components
+        regionCoupledPolyPatch
+        (
+            const word& name,
+            const label size,
+            const label start,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& patchType
+        );
+
+        //- Construct from dictionary
+        regionCoupledPolyPatch
+        (
+            const word& name,
+            const dictionary& dict,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& patchType
+        );
+
+        //- Construct as copy, resetting the boundary mesh
+        regionCoupledPolyPatch
+        (
+            const regionCoupledPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
+        //- Construct given the original patch and resetting the
+        //  face list and boundary mesh information
+        regionCoupledPolyPatch
+        (
+            const regionCoupledPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        );
+
+        //- Construct given the original patch and a map
+        regionCoupledPolyPatch
+        (
+            const regionCoupledPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const labelUList& mapAddressing,
+            const label newStart
+        );
+
+
+        //- Construct and return a clone, resetting the boundary mesh
+        virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
+        {
+            return autoPtr<polyPatch>(new regionCoupledPolyPatch(*this, bm));
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new regionCoupledPolyPatch
+                (
+                    *this,
+                    bm,
+                    index,
+                    newSize,
+                    newStart
+                )
+            );
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const labelUList& mapAddressing,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new regionCoupledPolyPatch
+                (
+                    *this,
+                    bm,
+                    index,
+                    mapAddressing,
+                    newStart
+                )
+            );
+        }
+
+
+    //- Destructor
+    virtual ~regionCoupledPolyPatch();
+
+
+    // Member functions
+
+        // Access
+
+            //- Is it coupled?
+            virtual bool coupled() const
+            {
+                return false;
+            }
+
+
+        //- Return the type
+        virtual const word& regionCoupleType() const
+        {
+            return type();
+        }
+
+
+        //- Write the polyPatch data as a dictionary
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C
new file mode 100644
index 0000000000..ef996b5974
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionCoupledWallPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "polyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(regionCoupledWallPolyPatch, 0);
+
+    addToRunTimeSelectionTable(polyPatch, regionCoupledWallPolyPatch, word);
+    addToRunTimeSelectionTable
+    (
+        polyPatch,
+        regionCoupledWallPolyPatch,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledWallPolyPatch::regionCoupledWallPolyPatch
+(
+    const word& name,
+    const label size,
+    const label start,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& patchType
+)
+:
+    wallPolyPatch(name, size, start, index, bm, patchType),
+    regionCoupledBase(static_cast<const polyPatch&>(*this))
+{}
+
+
+Foam::regionCoupledWallPolyPatch::regionCoupledWallPolyPatch
+(
+    const word& name,
+    const dictionary& dict,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& patchType
+)
+:
+    wallPolyPatch(name, dict, index, bm, patchType),
+    regionCoupledBase(static_cast<const polyPatch&>(*this), dict)
+{}
+
+
+Foam::regionCoupledWallPolyPatch::regionCoupledWallPolyPatch
+(
+    const regionCoupledWallPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    wallPolyPatch(pp, bm),
+    regionCoupledBase(*this, pp)
+{}
+
+
+Foam::regionCoupledWallPolyPatch::regionCoupledWallPolyPatch
+(
+    const regionCoupledWallPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
+)
+:
+    wallPolyPatch(pp, bm, index, newSize, newStart),
+    regionCoupledBase(*this, pp)
+{}
+
+
+Foam::regionCoupledWallPolyPatch::regionCoupledWallPolyPatch
+(
+    const regionCoupledWallPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const labelUList& mapAddressing,
+    const label newStart
+)
+:
+    wallPolyPatch(pp, bm, index, mapAddressing, newStart),
+    regionCoupledBase(*this, pp)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::regionCoupledWallPolyPatch::~regionCoupledWallPolyPatch()
+{
+    regionCoupledBase::clearGeom();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::regionCoupledWallPolyPatch::initGeometry(PstreamBuffers& pBufs)
+{
+    wallPolyPatch::initGeometry(pBufs);
+}
+
+
+void Foam::regionCoupledWallPolyPatch::calcGeometry(PstreamBuffers& pBufs)
+{
+    wallPolyPatch::calcGeometry(pBufs);
+    regionCoupledBase::clearGeom();
+}
+
+
+void Foam::regionCoupledWallPolyPatch::initMovePoints
+(
+    PstreamBuffers& pBufs,
+    const pointField& p
+)
+{
+    wallPolyPatch::initMovePoints(pBufs, p);
+}
+
+
+void Foam::regionCoupledWallPolyPatch::movePoints
+(
+    PstreamBuffers& pBufs,
+    const pointField& p
+)
+{
+    wallPolyPatch::movePoints(pBufs, p);
+    regionCoupledBase::clearGeom();
+}
+
+
+void Foam::regionCoupledWallPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+{
+    wallPolyPatch::initUpdateMesh(pBufs);
+}
+
+
+void Foam::regionCoupledWallPolyPatch::updateMesh(PstreamBuffers& pBufs)
+{
+    wallPolyPatch::updateMesh(pBufs);
+    regionCoupledBase::clearGeom();
+}
+
+
+void Foam::regionCoupledWallPolyPatch::write(Ostream& os) const
+{
+    wallPolyPatch::write(os);
+    regionCoupledBase::write(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.H b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.H
new file mode 100644
index 0000000000..7e00221a90
--- /dev/null
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.H
@@ -0,0 +1,222 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionCoupledWallPolyPatch
+
+Description
+    regionCoupledWall
+
+SourceFiles
+    regionCoupledWallPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionCoupledWallPolyPatch_H
+#define regionCoupledWallPolyPatch_H
+
+#include "wallPolyPatch.H"
+#include "regionCoupledBase.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                      Class regionCoupledWallPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionCoupledWallPolyPatch
+:
+    public wallPolyPatch,
+    public regionCoupledBase
+{
+
+protected:
+
+        //- Initialise the calculation of the patch geometry
+        virtual void initGeometry(PstreamBuffers&);
+
+        //- Calculate the patch geometry
+        virtual void calcGeometry(PstreamBuffers&);
+
+        //- Initialise the patches for moving points
+        virtual void initMovePoints(PstreamBuffers&, const pointField&);
+
+        //- Correct patches after moving points
+        virtual void movePoints(PstreamBuffers&, const pointField&);
+
+        //- Initialise the update of the patch topology
+        virtual void initUpdateMesh(PstreamBuffers&);
+
+        //- Update of the patch topology
+        virtual void updateMesh(PstreamBuffers&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionCoupledWall");
+
+
+    // Constructors
+
+        //- Construct from components
+        regionCoupledWallPolyPatch
+        (
+            const word& name,
+            const label size,
+            const label start,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& patchType
+        );
+
+
+        //- Construct from dictionary
+        regionCoupledWallPolyPatch
+        (
+            const word& name,
+            const dictionary& dict,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& patchType
+        );
+
+        //- Construct as copy, resetting the boundary mesh
+        regionCoupledWallPolyPatch
+        (
+            const regionCoupledWallPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
+        //- Construct given the original patch and resetting the
+        //  face list and boundary mesh information
+        regionCoupledWallPolyPatch
+        (
+            const regionCoupledWallPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        );
+
+        //- Construct given the original patch and a map
+        regionCoupledWallPolyPatch
+        (
+            const regionCoupledWallPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const labelUList& mapAddressing,
+            const label newStart
+        );
+
+        //- Construct and return a clone, resetting the boundary mesh
+        virtual autoPtr<wallPolyPatch::polyPatch> clone
+        (
+            const polyBoundaryMesh& bm
+        ) const
+        {
+            return autoPtr<wallPolyPatch::polyPatch>
+            (
+                new regionCoupledWallPolyPatch(*this, bm)
+            );
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<wallPolyPatch::polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        ) const
+        {
+            return autoPtr<wallPolyPatch::polyPatch>
+            (
+                new regionCoupledWallPolyPatch
+                (
+                    *this,
+                    bm,
+                    index,
+                    newSize,
+                    newStart
+                )
+            );
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const labelUList& mapAddressing,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new regionCoupledWallPolyPatch
+                (
+                    *this,
+                    bm,
+                    index,
+                    mapAddressing,
+                    newStart
+                )
+            );
+        }
+
+
+    //- Destructor
+    virtual ~regionCoupledWallPolyPatch();
+
+
+    // Member functions
+
+        //- Return the type
+        virtual const word& regionCoupleType() const
+        {
+            return type();
+        }
+
+        //- Write the polyPatch data as a dictionary
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/searchableSurface/searchableSurfaces.C b/src/meshTools/searchableSurface/searchableSurfaces.C
index 0995847fb4..768e9b33dc 100644
--- a/src/meshTools/searchableSurface/searchableSurfaces.C
+++ b/src/meshTools/searchableSurface/searchableSurfaces.C
@@ -35,7 +35,10 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::searchableSurfaces, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(searchableSurfaces, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 26f0a45324..d533ed9075 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -31,7 +31,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::searchableSurfacesQueries, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(searchableSurfacesQueries, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
index 77948ca5a5..96c3077cde 100644
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,12 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "regionToCell.H"
-#include "polyMesh.H"
 #include "regionSplit.H"
-#include "globalMeshData.H"
+#include "emptyPolyPatch.H"
 #include "cellSet.H"
 #include "syncTools.H"
-
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -49,104 +47,341 @@ addToRunTimeSelectionTable(topoSetSource, regionToCell, istream);
 Foam::topoSetSource::addToUsageTable Foam::regionToCell::usage_
 (
     regionToCell::typeName,
-    "\n    Usage: regionToCell subCellSet (x y z)\n\n"
-    "    Select all cells in the connected region containing point.\n"
-    "    If started inside the subCellSet keeps to it;\n"
-    "    if started outside stays outside.\n"
+    "\n    Usage: regionToCell subCellSet (pt0 .. ptn)\n\n"
+    "    Select all cells in the connected region containing"
+    " points (pt0..ptn).\n"
 );
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void Foam::regionToCell::markRegionFaces
+(
+    const boolList& selectedCell,
+    boolList& regionFace
+) const
+{
+    // Internal faces
+    const labelList& faceOwner = mesh_.faceOwner();
+    const labelList& faceNeighbour = mesh_.faceNeighbour();
+    forAll(faceNeighbour, faceI)
+    {
+        if
+        (
+            selectedCell[faceOwner[faceI]]
+         != selectedCell[faceNeighbour[faceI]]
+        )
+        {
+            regionFace[faceI] = true;
+        }
+    }
+
+    // Swap neighbour selectedCell state
+    boolList nbrSelected;
+    syncTools::swapBoundaryCellList(mesh_, selectedCell, nbrSelected);
+
+    // Boundary faces
+    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+        const labelUList& faceCells = pp.faceCells();
+        forAll(faceCells, i)
+        {
+            label faceI = pp.start()+i;
+            label bFaceI = faceI-mesh_.nInternalFaces();
+            if
+            (
+                selectedCell[faceCells[i]]
+             != selectedCell[nbrSelected[bFaceI]]
+            )
+            {
+                regionFace[faceI] = true;
+            }
+        }
+    }
+}
+
+
+Foam::boolList Foam::regionToCell::findRegions
+(
+    const bool verbose,
+    const regionSplit& cellRegion
+) const
+{
+    boolList keepRegion(cellRegion.nRegions(), false);
+
+    forAll(insidePoints_, i)
+    {
+        // Find the region containing the insidePoint
+
+        label cellI = mesh_.findCell(insidePoints_[i]);
+
+        label keepRegionI = -1;
+        label keepProcI = -1;
+        if (cellI != -1)
+        {
+            keepRegionI = cellRegion[cellI];
+            keepProcI = Pstream::myProcNo();
+        }
+        reduce(keepRegionI, maxOp<label>());
+        keepRegion[keepRegionI] = true;
+
+        reduce(keepProcI, maxOp<label>());
+
+        if (keepProcI == -1)
+        {
+            FatalErrorIn
+            (
+                "outsideCellSelection::findRegions"
+                "(const bool, const regionSplit&)"
+            )   << "Did not find " << insidePoints_[i]
+                << " in mesh." << " Mesh bounds are " << mesh_.bounds()
+                << exit(FatalError);
+        }
+
+        if (verbose)
+        {
+            Info<< "    Found location " << insidePoints_[i]
+                << " in cell " << cellI << " on processor " << keepProcI
+                << " in global region " << keepRegionI
+                << " out of " << cellRegion.nRegions() << " regions." << endl;
+        }
+    }
+
+    return keepRegion;
+}
+
+
+void Foam::regionToCell::unselectOutsideRegions
+(
+    boolList& selectedCell
+) const
+{
+    // Determine faces on the edge of selectedCell
+    boolList blockedFace(mesh_.nFaces(), false);
+    markRegionFaces(selectedCell, blockedFace);
+
+    // Determine regions
+    regionSplit cellRegion(mesh_, blockedFace);
+
+    // Determine regions containing insidePoints_
+    boolList keepRegion(findRegions(true, cellRegion));
+
+    // Go back to bool per cell
+    forAll(cellRegion, cellI)
+    {
+        if (!keepRegion[cellRegion[cellI]])
+        {
+            selectedCell[cellI] = false;
+        }
+    }
+}
+
+
+void Foam::regionToCell::shrinkRegions
+(
+    boolList& selectedCell
+) const
+{
+    // Select points on unselected cells and boundary
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    boolList boundaryPoint(mesh_.nPoints(), false);
+
+    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
+
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+
+        if (!pp.coupled() && !isA<emptyPolyPatch>(pp))
+        {
+            forAll(pp, i)
+            {
+                const face& f = pp[i];
+                forAll(f, fp)
+                {
+                    boundaryPoint[f[fp]] = true;
+                }
+            }
+        }
+    }
+
+    forAll(selectedCell, cellI)
+    {
+        if (!selectedCell[cellI])
+        {
+            const labelList& cPoints = mesh_.cellPoints(cellI);
+            forAll(cPoints, i)
+            {
+                boundaryPoint[cPoints[i]] = true;
+            }
+        }
+    }
+
+    syncTools::syncPointList(mesh_, boundaryPoint, orEqOp<bool>(), false);
+
+
+    // Select all cells using these points
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    label nChanged = 0;
+    forAll(boundaryPoint, pointI)
+    {
+        if (boundaryPoint[pointI])
+        {
+            const labelList& pCells = mesh_.pointCells(pointI);
+            forAll(pCells, i)
+            {
+                label cellI = pCells[i];
+                if (selectedCell[cellI])
+                {
+                    selectedCell[cellI] = false;
+                    nChanged++;
+                }
+            }
+        }
+    }
+    Info<< "    Eroded " << returnReduce(nChanged, sumOp<label>())
+        << " cells." << endl;
+}
+
+
+void Foam::regionToCell::erode
+(
+    boolList& selectedCell
+) const
+{
+    //Info<< "Entering shrinkRegions:" << count(selectedCell) << endl;
+    //generateField("selectedCell_before", selectedCell)().write();
+
+    // Now erode and see which regions get disconnected
+    boolList shrunkSelectedCell(selectedCell);
+
+    for (label iter = 0; iter < nErode_; iter++)
+    {
+        shrinkRegions(shrunkSelectedCell);
+    }
+
+    //Info<< "After shrinking:" << count(shrunkSelectedCell) << endl;
+    //generateField("shrunkSelectedCell", shrunkSelectedCell)().write();
+
+
+
+    // Determine faces on the edge of shrunkSelectedCell
+    boolList blockedFace(mesh_.nFaces(), false);
+    markRegionFaces(shrunkSelectedCell, blockedFace);
+
+    // Find disconnected regions
+    regionSplit cellRegion(mesh_, blockedFace);
+
+    // Determine regions containing insidePoints
+    boolList keepRegion(findRegions(true, cellRegion));
+
+
+    // Extract cells in regions that are not to be kept.
+    boolList removeCell(mesh_.nCells(), false);
+    forAll(cellRegion, cellI)
+    {
+        if (shrunkSelectedCell[cellI] && !keepRegion[cellRegion[cellI]])
+        {
+            removeCell[cellI] = true;
+        }
+    }
+
+    //Info<< "removeCell before:" << count(removeCell) << endl;
+    //generateField("removeCell_before", removeCell)().write();
+
+
+
+    // Grow removeCell
+    for (label iter = 0; iter < nErode_; iter++)
+    {
+        // Grow selected cell in regions that are not for keeping
+        boolList boundaryPoint(mesh_.nPoints(), false);
+        forAll(removeCell, cellI)
+        {
+            if (removeCell[cellI])
+            {
+                const labelList& cPoints = mesh_.cellPoints(cellI);
+                forAll(cPoints, i)
+                {
+                    boundaryPoint[cPoints[i]] = true;
+                }
+            }
+        }
+        syncTools::syncPointList(mesh_, boundaryPoint, orEqOp<bool>(), false);
+
+        // Select all cells using these points
+
+        label nChanged = 0;
+        forAll(boundaryPoint, pointI)
+        {
+            if (boundaryPoint[pointI])
+            {
+                const labelList& pCells = mesh_.pointCells(pointI);
+                forAll(pCells, i)
+                {
+                    label cellI = pCells[i];
+                    if (!removeCell[cellI])
+                    {
+                        removeCell[cellI] = true;
+                        nChanged++;
+                    }
+                }
+            }
+        }
+    }
+
+    //Info<< "removeCell after:" << count(removeCell) << endl;
+    //generateField("removeCell_after", removeCell)().write();
+
+
+    // Unmark removeCell
+    forAll(removeCell, cellI)
+    {
+        if (removeCell[cellI])
+        {
+            selectedCell[cellI] = false;
+        }
+    }
+}
+
+
 void Foam::regionToCell::combine(topoSet& set, const bool add) const
 {
-    label cellI = mesh_.findCell(insidePoint_);
+    // Note: wip. Select cells first
+    boolList selectedCell(mesh_.nCells(), true);
 
-    // Load the subset of cells
-    boolList blockedFace(mesh_.nFaces(), false);
+    if (setName_.size() && setName_ != "none")
     {
-        Info<< "Loading subset " << setName_ << " to delimit search region."
+        Info<< "    Loading subset " << setName_ << " to delimit search region."
             << endl;
         cellSet subSet(mesh_, setName_);
 
-        boolList inSubset(mesh_.nCells(), false);
+        selectedCell = false;
         forAllConstIter(cellSet, subSet, iter)
         {
-            inSubset[iter.key()] = true;
-        }
-
-        if (cellI != -1 && inSubset[cellI])
-        {
-            Pout<< "Point " << insidePoint_ << " is inside cellSet "
-                << setName_ << endl
-                << "Collecting all cells connected to " << cellI
-                << " and inside cellSet " << setName_ << endl;
-        }
-        else
-        {
-            Pout<< "Point " << insidePoint_ << " is outside cellSet "
-                << setName_ << endl
-                << "Collecting all cells connected to " << cellI
-                << " and outside cellSet " << setName_ << endl;
-        }
-
-        // Get coupled cell status
-        label nInt = mesh_.nInternalFaces();
-        boolList neiSet(mesh_.nFaces()-nInt, false);
-        for (label faceI = nInt; faceI < mesh_.nFaces(); faceI++)
-        {
-             neiSet[faceI-nInt] = inSubset[mesh_.faceOwner()[faceI]];
-        }
-        syncTools::swapBoundaryFaceList(mesh_, neiSet);
-
-        // Find faces inbetween subSet and non-subset.
-        for (label faceI = 0; faceI < nInt; faceI++)
-        {
-            bool ownInSet = inSubset[mesh_.faceOwner()[faceI]];
-            bool neiInSet = inSubset[mesh_.faceNeighbour()[faceI]];
-            blockedFace[faceI] = (ownInSet != neiInSet);
-        }
-        for (label faceI = nInt; faceI < mesh_.nFaces(); faceI++)
-        {
-            bool ownInSet = inSubset[mesh_.faceOwner()[faceI]];
-            bool neiInSet = neiSet[faceI-nInt];
-            blockedFace[faceI] = (ownInSet != neiInSet);
+            selectedCell[iter.key()] = true;
         }
     }
 
-    // Find connected regions without crossing boundary of the cellset.
-    regionSplit regions(mesh_, blockedFace);
 
-    // Get the region containing the insidePoint
-    label regionI = -1;
+    unselectOutsideRegions(selectedCell);
 
-    if (cellI != -1)
+    if (nErode_ > 0)
     {
-        // On processor that has found cell.
-        regionI = regions[cellI];
-    }
-
-    reduce(regionI, maxOp<label>());
-
-    if (regionI == -1)
-    {
-        WarningIn
-        (
-            "regionToCell::combine(topoSet&, const bool) const"
-        )   << "Point " << insidePoint_
-            << " is not inside the mesh." << nl
-            << "Bounding box of the mesh:" << mesh_.bounds()
-            << endl;
-        return;
+        erode(selectedCell);
     }
 
 
-    // Pick up the cells of the region
-    const labelList regionCells(findIndices(regions, regionI));
-
-    forAll(regionCells, i)
+    forAll(selectedCell, cellI)
     {
-        addOrDelete(set, regionCells[i], add);
+        if (selectedCell[cellI])
+        {
+            addOrDelete(set, cellI, add);
+        }
     }
 }
 
@@ -158,12 +393,14 @@ Foam::regionToCell::regionToCell
 (
     const polyMesh& mesh,
     const word& setName,
-    const point& insidePoint
+    const pointField& insidePoints,
+    const label nErode
 )
 :
     topoSetSource(mesh),
     setName_(setName),
-    insidePoint_(insidePoint)
+    insidePoints_(insidePoints),
+    nErode_(nErode)
 {}
 
 
@@ -175,8 +412,14 @@ Foam::regionToCell::regionToCell
 )
 :
     topoSetSource(mesh),
-    setName_(dict.lookup("set")),
-    insidePoint_(dict.lookup("insidePoint"))
+    setName_(dict.lookupOrDefault<word>("set", "none")),
+    insidePoints_
+    (
+        dict.found("insidePoints")
+      ? dict.lookup("insidePoints")
+      : dict.lookup("insidePoint")
+    ),
+    nErode_(dict.lookupOrDefault("nErode", 0))
 {}
 
 
@@ -189,7 +432,8 @@ Foam::regionToCell::regionToCell
 :
     topoSetSource(mesh),
     setName_(checkIs(is)),
-    insidePoint_(checkIs(is))
+    insidePoints_(checkIs(is)),
+    nErode_(0)
 {}
 
 
@@ -209,15 +453,15 @@ void Foam::regionToCell::applyToSet
 {
     if ((action == topoSetSource::NEW) || (action == topoSetSource::ADD))
     {
-        Info<< "    Adding all cells of connected region containing point "
-            << insidePoint_ << " ..." << endl;
+        Info<< "    Adding all cells of connected region containing points "
+            << insidePoints_ << " ..." << endl;
 
         combine(set, true);
     }
     else if (action == topoSetSource::DELETE)
     {
-        Info<< "    Removing all cells of connected region containing point "
-            << insidePoint_ << " ..." << endl;
+        Info<< "    Removing all cells of connected region containing points "
+            << insidePoints_ << " ..." << endl;
 
         combine(set, false);
     }
diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
index 94a49bbf64..4d740c0ca3 100644
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,20 @@ Class
 
 Description
     TopoSetSource. Select cells belonging to topological connected region
-    (that contains given point)
+    (that contains given points)
+
+    In dictionary input:
+
+        // optional name of cellSet delimiting search
+        set         c0;
+
+        //- Number of cell layers to erode mesh to detect holes in the mesh
+        //  Set to 0 if not used.
+        nErode 3;
+
+        // points inside region to select
+        insidePoints ((1 2 3));
+
 
 SourceFiles
     regionToCell.C
@@ -37,12 +50,15 @@ SourceFiles
 #define regionToCell_H
 
 #include "topoSetSource.H"
+#include "boolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+class regionSplit;
+
 /*---------------------------------------------------------------------------*\
                            Class regionToCell Declaration
 \*---------------------------------------------------------------------------*/
@@ -58,14 +74,38 @@ class regionToCell
         static addToUsageTable usage_;
 
         //- Name of cellSet to keep to
-        word setName_;
+        const word setName_;
 
-        //- Coordinate that is inside connected region
-        point insidePoint_;
+        //- Coordinate(s) that is inside connected region
+        const pointField insidePoints_;
+
+        //- Number of layers to erode
+        const label nErode_;
 
 
     // Private Member Functions
 
+        //- Mark faces inbetween selected and unselected elements
+        void markRegionFaces
+        (
+            const boolList& selectedCell,
+            boolList& regionFace
+        ) const;
+
+        //- Determine for every disconnected region in the mesh whether
+        //  it contains a locationInMesh
+        boolList findRegions(const bool verbose, const regionSplit&) const;
+
+        //- Unselect regions not containing a locationInMesh
+        void unselectOutsideRegions(boolList& selectedCell) const;
+
+        //- Unselect one layer of cells from selectedCell
+        void shrinkRegions(boolList& selectedCell) const;
+
+        //- Erode a given number of layers from selectedCell. Remove any
+        //  region that gets disconnected that way.
+        void erode(boolList& selectedCell) const;
+
         void combine(topoSet& set, const bool add) const;
 
 
@@ -81,7 +121,8 @@ public:
         (
             const polyMesh& mesh,
             const word& setName,
-            const point& insidePoint
+            const pointField& insidePoints,
+            const label nErode
         );
 
         //- Construct from dictionary
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index b40943cf69..d171b432a0 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::booleanSurface, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(booleanSurface, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index ecf56438c3..3a39a47525 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::edgeSurface, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(edgeSurface, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index d4892716c0..7cffb1309a 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,13 +37,18 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::intersectedSurface, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(intersectedSurface, 0);
+}
+
 
 const Foam::label Foam::intersectedSurface::UNVISITED = 0;
 const Foam::label Foam::intersectedSurface::STARTTOEND = 1;
 const Foam::label Foam::intersectedSurface::ENDTOSTART = 2;
 const Foam::label Foam::intersectedSurface::BOTH = STARTTOEND | ENDTOSTART;
 
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Write whole pointField and edges to stream
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 13730bc5c1..a233af491d 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -40,9 +40,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::edgeIntersections, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(edgeIntersections, 0);
 
-Foam::scalar Foam::edgeIntersections::alignedCos_ = Foam::cos(degToRad(89.0));
+scalar edgeIntersections::alignedCos_ = cos(degToRad(89.0));
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 394f796aa3..9af93cf0b7 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfaceIntersection, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(surfaceIntersection, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
index be73d4bb66..95acfa125c 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
@@ -30,7 +30,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::orientedSurface, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(orientedSurface, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 8ac5179fd1..514099c8df 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -37,10 +37,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfaceFeatures, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(surfaceFeatures, 0);
 
-const Foam::scalar Foam::surfaceFeatures::parallelTolerance =
-    sin(degToRad(1.0));
+const scalar surfaceFeatures::parallelTolerance = sin(degToRad(1.0));
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
index c60be140af..9f8a6a5179 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -34,7 +34,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::pointToPointPlanarInterpolation, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(pointToPointPlanarInterpolation, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
index a2103db6e5..802f63f308 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::removeRegisteredObject, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(removeRegisteredObject, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
index 368f01da58..694fba31b6 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
@@ -30,7 +30,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::writeDictionary, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(writeDictionary, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
index c6516b7045..cc3f0c628e 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::writeRegisteredObject, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(writeRegisteredObject, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
index b789688874..2a3d212afd 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::cloudInfo, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(cloudInfo, 0);
+}
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index 2de912282f..68c4ab2ced 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -31,10 +31,13 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::fieldAverage, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(fieldAverage, 0);
 
-const Foam::word Foam::fieldAverage::EXT_MEAN = "Mean";
-const Foam::word Foam::fieldAverage::EXT_PRIME2MEAN = "Prime2Mean";
+const word fieldAverage::EXT_MEAN = "Mean";
+const word fieldAverage::EXT_PRIME2MEAN = "Prime2Mean";
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
index afb592bc78..250e3c34dc 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::fieldCoordinateSystemTransform, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(fieldCoordinateSystemTransform, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
index e268fa4c93..e7a611febc 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -28,17 +28,16 @@ License
 #include "dictionary.H"
 #include "Time.H"
 
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::fieldMinMax, 0);
-
 namespace Foam
 {
+    defineTypeNameAndDebug(fieldMinMax, 0);
+
     template<>
-    const char* Foam::NamedEnum
+    const char* NamedEnum
     <
-        Foam::fieldMinMax::modeType,
+        fieldMinMax::modeType,
         2
     >::names[] =
     {
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index 52d1934a87..20614f474f 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -31,7 +31,10 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(Foam::fieldValues::fieldValueDelta, 0);
+    namespace fieldValues
+    {
+        defineTypeNameAndDebug(fieldValueDelta, 0);
+    }
 
     template<>
     const char*
@@ -43,8 +46,8 @@ namespace Foam
         "max"
     };
 
-    const Foam::NamedEnum<Foam::fieldValues::fieldValueDelta::operationType, 4>
-        Foam::fieldValues::fieldValueDelta::operationTypeNames_;
+    const NamedEnum<fieldValues::fieldValueDelta::operationType, 4>
+        fieldValues::fieldValueDelta::operationTypeNames_;
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
index ee8eb8e334..715bcfa7f8 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
@@ -28,7 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::nearWallFields, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(nearWallFields, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.C b/src/postProcessing/functionObjects/field/processorField/processorField.C
index 87794ba92e..bd72316b23 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.C
+++ b/src/postProcessing/functionObjects/field/processorField/processorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::processorField, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(processorField, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C
index 6e5c44935f..2d8a0fd0e0 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::readFields, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(readFields, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index dbe60ac94f..037ddc5ae1 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -38,7 +38,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::streamLine, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(streamLine, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
index fd4ba20b65..855b3ce800 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(Foam::turbulenceFields, 0);
+    defineTypeNameAndDebug(turbulenceFields, 0);
 
     template<>
     const char* NamedEnum<turbulenceFields::compressibleField, 6>::names[] =
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index 0b736e44c3..e2487e3cd6 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
@@ -40,7 +40,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::wallBoundedStreamLine, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(wallBoundedStreamLine, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 1487175753..ce38948089 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -31,7 +31,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::forceCoeffs, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(forceCoeffs, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index bfcd001eab..27310c7a80 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -40,7 +40,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::forces, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(forces, 0);
+}
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
index a36367f805..b4154fc847 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,9 +27,13 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::sixDoFRigidBodyMotionConstraint, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(sixDoFRigidBodyMotionConstraint, 0);
+
+defineRunTimeSelectionTable(sixDoFRigidBodyMotionConstraint, dictionary);
+}
 
-defineRunTimeSelectionTable(Foam::sixDoFRigidBodyMotionConstraint, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
index 19feb9aadf..6a7088a0dc 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,9 +27,13 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::sixDoFRigidBodyMotionRestraint, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(sixDoFRigidBodyMotionRestraint, 0);
+
+defineRunTimeSelectionTable(sixDoFRigidBodyMotionRestraint, dictionary);
+}
 
-defineRunTimeSelectionTable(Foam::sixDoFRigidBodyMotionRestraint, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
index 934fb58d75..b5fd621b71 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
@@ -30,7 +30,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::calcFvcDiv, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(calcFvcDiv, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
index de97652e5e..edcddb2eae 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
@@ -30,7 +30,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::calcFvcGrad, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(calcFvcGrad, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
index 47705025de..f997cc8b78 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
+++ b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
@@ -30,7 +30,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::calcMag, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(calcMag, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
index 7d4d9aa52a..41b8f697c1 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
+++ b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::abortCalculation, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(abortCalculation, 0);
+}
 
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C
index 299c792aab..00cb7b850c 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.C
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.C
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::systemCall, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(systemCall, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
index b76cdeb206..e72e693338 100644
--- a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
+++ b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
@@ -32,7 +32,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::CourantNo, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(CourantNo, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
index 6d5c2f7eaa..b9a4843600 100644
--- a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
@@ -32,7 +32,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::DESModelRegions, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(DESModelRegions, 0);
+}
 
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
index 04c8ddefb9..5b1b3f0cf9 100644
--- a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
+++ b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
@@ -31,7 +31,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::Lambda2, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(Lambda2, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
index 3c6731babd..874977faed 100644
--- a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
+++ b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
@@ -33,7 +33,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::Peclet, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(Peclet, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/Q/Q.C b/src/postProcessing/functionObjects/utilities/Q/Q.C
index ffce5efc56..5dec2d3aa7 100644
--- a/src/postProcessing/functionObjects/utilities/Q/Q.C
+++ b/src/postProcessing/functionObjects/utilities/Q/Q.C
@@ -30,7 +30,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::Q, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(Q, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
index ac8b9cca10..fb60ce2527 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,10 @@ using namespace Foam::constant;
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::dsmcFields, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(dsmcFields, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
index f560914e06..7fc298e74d 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::pressureTools, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(pressureTools, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
index 00518f6bdc..69e7f1c554 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
@@ -39,7 +39,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::scalarTransport, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(scalarTransport, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 31a583624f..aa88880eee 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::timeActivatedFileUpdate, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
index 7e096c6a70..55a4011d6a 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
@@ -32,7 +32,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::wallShearStress, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(wallShearStress, 0);
+}
 
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
index d7543ff1b5..789c06ddc7 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
@@ -34,7 +34,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::yPlusLES, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(yPlusLES, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
index de584f6105..663c6dda74 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
@@ -36,7 +36,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::yPlusRAS, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(yPlusRAS, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/regionCoupled/Make/files b/src/regionCoupled/Make/files
new file mode 100644
index 0000000000..4ca7129524
--- /dev/null
+++ b/src/regionCoupled/Make/files
@@ -0,0 +1,3 @@
+derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+
+LIB = $(FOAM_LIBBIN)/libregionCoupled
diff --git a/src/regionCoupled/Make/options b/src/regionCoupled/Make/options
new file mode 100644
index 0000000000..ea55cd87d2
--- /dev/null
+++ b/src/regionCoupled/Make/options
@@ -0,0 +1,11 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
+
+LIB_LIBS = \
+    -lfluidThermophysicalModels \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lcompressibleTurbulenceModel
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
new file mode 100644
index 0000000000..c54293f22b
--- /dev/null
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -0,0 +1,561 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "addToRunTimeSelectionTable.H"
+#include "energyRegionCoupledFvPatchScalarField.H"
+#include "Time.H"
+#include "turbulenceModel.H"
+
+// * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::energyRegionCoupledFvPatchScalarField::kappaMethodType,
+        3
+    >::names[] =
+    {
+        "solid",
+        "fluid",
+        "undefined"
+    };
+}
+
+
+const Foam::NamedEnum
+<
+    Foam::energyRegionCoupledFvPatchScalarField::kappaMethodType,
+    3
+> Foam::energyRegionCoupledFvPatchScalarField::methodTypeNames_;
+
+
+// * * * * * * * * * * * * * * * * Private members  * * * * * * * * * * * * *//
+
+void Foam::energyRegionCoupledFvPatchScalarField::setMethod() const
+{
+    if (method_ == UNDEFINED)
+    {
+        if (
+                this->db().foundObject<compressible::turbulenceModel>
+                (
+                    "turbulenceModel"
+                )
+           )
+        {
+            method_ = FLUID;
+        }
+        else
+        {
+            method_ = SOLID;
+        }
+    }
+
+    if (!nbrThermoPtr_)
+    {
+        nbrThermoPtr_ =
+        (
+            &regionCoupledPatch_.nbrMesh().lookupObject<basicThermo>
+            (
+                "thermophysicalProperties"
+            )
+        );
+    }
+
+    if (!thermoPtr_)
+    {
+        thermoPtr_ =
+        (
+            &this->db().lookupObject<basicThermo>
+            (
+                "thermophysicalProperties"
+            )
+        );
+    }
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+kappa() const
+{
+    switch (method_)
+    {
+        case FLUID:
+        {
+            const compressible::turbulenceModel& model =
+                this->db().lookupObject<compressible::turbulenceModel>
+                (
+                    "turbulenceModel"
+                );
+
+            return model.kappaEff(patch().index());
+        }
+        break;
+
+        case SOLID:
+        {
+            const basicThermo& thermo =
+                this->db().lookupObject<basicThermo>
+                (
+                    "thermophysicalProperties"
+                );
+
+            return thermo.kappa(patch().index());
+        }
+        break;
+
+        case UNDEFINED:
+        {
+            FatalErrorIn("energyRegionCoupledFvPatchScalarField::kappa() const")
+                    << " on mesh " << this->db().name() << " patch "
+                    << patch().name()
+                    << " could not find a method in. Methods are:  "
+                    << methodTypeNames_.toc()
+                    << " Not turbulenceModel or thermophysicalProperties"
+                    << " were found"
+                    << exit(FatalError);
+        }
+        break;
+    }
+    return scalarField(0);
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+weights() const
+{
+    const fvPatch& patch = regionCoupledPatch_.patch();
+
+    const scalarField deltas
+    (
+        patch.nf() & patch.delta()
+    );
+
+    const scalarField alphaDelta(kappa()/deltas);
+
+    const fvPatch& nbrPatch = regionCoupledPatch_.neighbFvPatch();
+
+    const energyRegionCoupledFvPatchScalarField& nbrField =
+    refCast
+    <
+        const energyRegionCoupledFvPatchScalarField
+    >
+    (
+        nbrPatch.lookupPatchField<volScalarField, scalar>("T")
+    );
+
+    // Needed in the first calculation of weights
+    nbrField.setMethod();
+
+    const scalarField nbrAlpha
+    (
+        regionCoupledPatch_.regionCoupledPatch().interpolate
+        (
+            nbrField.kappa()
+        )
+    );
+
+    const scalarField nbrDeltas
+    (
+        regionCoupledPatch_.regionCoupledPatch().interpolate
+        (
+            nbrPatch.nf() & nbrPatch.delta()
+        )
+    );
+
+    const scalarField nbrAlphaDelta(nbrAlpha/nbrDeltas);
+
+    tmp<scalarField> tw(new scalarField(deltas.size()));
+    scalarField& w = tw();
+
+    forAll(alphaDelta, faceI)
+    {
+        scalar di = alphaDelta[faceI];
+        scalar dni = nbrAlphaDelta[faceI];
+
+        w[faceI] = di/(di + dni);
+    }
+
+    return tw;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::energyRegionCoupledFvPatchScalarField::
+energyRegionCoupledFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    LduInterfaceField<scalar>(refCast<const lduInterface>(p)),
+    fvPatchScalarField(p, iF),
+    regionCoupledPatch_(refCast<const regionCoupledBaseFvPatch>(p)),
+    method_(UNDEFINED),
+    nbrThermoPtr_(NULL),
+    thermoPtr_(NULL)
+{}
+
+
+Foam::energyRegionCoupledFvPatchScalarField::
+energyRegionCoupledFvPatchScalarField
+(
+    const energyRegionCoupledFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    LduInterfaceField<scalar>(refCast<const lduInterface>(p)),
+    fvPatchScalarField(ptf, p, iF, mapper),
+    regionCoupledPatch_(refCast<const regionCoupledBaseFvPatch>(p)),
+    method_(ptf.method_),
+    nbrThermoPtr_(NULL),
+    thermoPtr_(NULL)
+{}
+
+
+Foam::energyRegionCoupledFvPatchScalarField::
+energyRegionCoupledFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    LduInterfaceField<scalar>(refCast<const lduInterface>(p)),
+    fvPatchScalarField(p, iF, dict),
+    regionCoupledPatch_(refCast<const regionCoupledBaseFvPatch>(p)),
+    method_(UNDEFINED),
+    nbrThermoPtr_(NULL),
+    thermoPtr_(NULL)
+{
+
+    if (!isA<regionCoupledBase>(this->patch().patch()))
+    {
+        FatalErrorIn
+        (
+            "energyRegionCoupledFvPatchScalarField::"
+            "energyRegionCoupledFvPatchScalarField\n"
+            "(\n"
+            "    const fvPatch& p,\n"
+            "    const DimensionedField<scalar, volMesh>& iF,\n"
+            "    const dictionary& dict\n"
+            ")\n"
+        )   << "\n    patch type '" << p.type()
+            << "' not type '" << regionCoupledBase::typeName << "'"
+            << "\n    for patch " << p.name()
+            << " of field " << dimensionedInternalField().name()
+            << " in file " << dimensionedInternalField().objectPath()
+            << exit(FatalError);
+    }
+
+    if (dict.found("value"))
+    {
+        fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    }
+}
+
+
+Foam::energyRegionCoupledFvPatchScalarField::
+energyRegionCoupledFvPatchScalarField
+(
+    const energyRegionCoupledFvPatchScalarField& ptf
+)
+:
+    LduInterfaceField<scalar>(refCast<const lduInterface>(ptf.patch())),
+    fvPatchScalarField(ptf),
+    regionCoupledPatch_(ptf.regionCoupledPatch_),
+    method_(ptf.method_),
+    nbrThermoPtr_(NULL),
+    thermoPtr_(NULL)
+{}
+
+
+Foam::energyRegionCoupledFvPatchScalarField::
+energyRegionCoupledFvPatchScalarField
+(
+    const energyRegionCoupledFvPatchScalarField& ptf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    LduInterfaceField<scalar>(refCast<const lduInterface>(ptf.patch())),
+    fvPatchScalarField(ptf, iF),
+    regionCoupledPatch_(ptf.regionCoupledPatch_),
+    method_(ptf.method_),
+    nbrThermoPtr_(NULL),
+    thermoPtr_(NULL)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+snGrad() const
+{
+    return
+    (*this - patchInternalField())*regionCoupledPatch_.patch().deltaCoeffs();
+}
+
+
+void Foam::energyRegionCoupledFvPatchScalarField::initEvaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (!updated())
+    {
+        updateCoeffs();
+    }
+}
+
+
+void Foam::energyRegionCoupledFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (!updated())
+    {
+        updateCoeffs();
+    }
+
+    label patchi = patch().index();
+    const scalarField& pp =  thermoPtr_->p().boundaryField()[patchi];
+
+    const scalarField lWeights(weights());
+
+    scalarField::operator=
+    (
+        thermoPtr_->he
+        (
+            pp,
+            lWeights*patchInternalTemperatureField()
+         + (1.0 - lWeights)*patchNeighbourTemperatureField(),
+            patchi
+        )
+    );
+
+    fvPatchScalarField::evaluate();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+valueInternalCoeffs
+(
+    const tmp<scalarField>& w
+) const
+{
+    return scalar(pTraits<scalar>::one)*w;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+valueBoundaryCoeffs
+(
+    const tmp<scalarField>& w
+) const
+{
+    return scalar(pTraits<scalar>::one)*(1.0 - w);
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+gradientInternalCoeffs() const
+{
+    return
+        -scalar(pTraits<scalar>::one)
+        *regionCoupledPatch_.patch().deltaCoeffs();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+gradientBoundaryCoeffs() const
+{
+    return -this->gradientInternalCoeffs();
+}
+
+
+Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::energyRegionCoupledFvPatchScalarField::
+patchNeighbourField() const
+{
+    const fvPatch& nbrPatch = regionCoupledPatch_.neighbFvPatch();
+
+    const labelUList& nbrFaceCells = nbrPatch.faceCells();
+
+    setMethod();
+
+    const scalarField nbrIntT
+    (
+        nbrThermoPtr_->T().internalField(), nbrFaceCells
+    );
+
+    scalarField intNbrT
+    (
+        regionCoupledPatch_.regionCoupledPatch().interpolate(nbrIntT)
+    );
+
+    label patchi = patch().index();
+    const scalarField& pp =  thermoPtr_->p().boundaryField()[patchi];
+    tmp<scalarField> tmyHE = thermoPtr_->he(pp, intNbrT, patchi);
+
+    return tmyHE;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+patchNeighbourTemperatureField() const
+{
+    const fvPatch& nbrPatch = regionCoupledPatch_.neighbFvPatch();
+
+    const labelUList& nbrFaceCells = nbrPatch.faceCells();
+
+    const scalarField nbrIntT
+    (
+        nbrThermoPtr_->T().internalField(), nbrFaceCells
+    );
+
+     tmp<scalarField> tintNbrT =
+        regionCoupledPatch_.regionCoupledPatch().interpolate(nbrIntT);
+
+    return tintNbrT;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
+patchInternalTemperatureField() const
+{
+    const labelUList& faceCells = regionCoupledPatch_.faceCells();
+
+    tmp<scalarField> tintT
+    (
+        new scalarField(thermoPtr_->T().internalField(), faceCells)
+    );
+
+    return tintT;
+}
+
+
+void Foam::energyRegionCoupledFvPatchScalarField::updateInterfaceMatrix
+(
+    Field<scalar>& result,
+    const scalarField& psiInternal,
+    const scalarField& coeffs,
+    const direction cmpt,
+    const Pstream::commsTypes
+) const
+{
+    setMethod();
+
+    scalarField myHE(this->size());
+
+    if (&psiInternal == &internalField())
+    {
+
+        label patchi = this->patch().index();
+        const scalarField& pp =  thermoPtr_->p().boundaryField()[patchi];
+        const scalarField& Tp =  thermoPtr_->T().boundaryField()[patchi];
+
+        myHE = thermoPtr_->he(pp, Tp, patchi);
+    }
+    else
+    {
+        forAll(*this, facei)
+        {
+            myHE[facei] = psiInternal[regionCoupledPatch_.faceCells()[facei]];
+        }
+    }
+
+    // Multiply the field by coefficients and add into the result
+    const labelUList& faceCells = regionCoupledPatch_.faceCells();
+
+    forAll(faceCells, elemI)
+    {
+        result[faceCells[elemI]] -= coeffs[elemI]*myHE[elemI];
+    }
+}
+
+
+void Foam::energyRegionCoupledFvPatchScalarField::updateInterfaceMatrix
+(
+    Field<scalar>& result,
+    const Field<scalar>& psiInternal,
+    const scalarField& coeffs,
+    const Pstream::commsTypes
+) const
+{
+    setMethod();
+
+    scalarField myHE(this->size());
+
+    if (&psiInternal == &internalField())
+    {
+        label patchi = this->patch().index();
+        const scalarField& pp =  thermoPtr_->p().boundaryField()[patchi];
+        const scalarField& Tp =  thermoPtr_->T().boundaryField()[patchi];
+
+        myHE = thermoPtr_->he(pp, Tp, patchi);
+    }
+    else
+    {
+        forAll(*this, facei)
+        {
+            myHE[facei] = psiInternal[regionCoupledPatch_.faceCells()[facei]];
+        }
+    }
+
+    // Multiply the field by coefficients and add into the result
+    const labelUList& faceCells = regionCoupledPatch_.faceCells();
+
+    forAll(faceCells, elemI)
+    {
+        result[faceCells[elemI]] -= coeffs[elemI]*myHE[elemI];
+    }
+}
+
+
+void Foam::energyRegionCoupledFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    this->writeEntry("value", os);
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        energyRegionCoupledFvPatchScalarField
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
new file mode 100644
index 0000000000..7b0b7df39c
--- /dev/null
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
@@ -0,0 +1,287 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::energyRegionCoupledFvPatchScalarField
+
+Description
+    Energy region coupled implicit boundary condition.
+    The fvPatch is treated as uncoupled from the delta point of view.
+    In the mesh the fvPatch is an interface and is incorporated
+    into the matrix implicitly.
+
+SourceFiles
+    energyRegionCoupledFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef energyRegionCoupledFvPatchScalarField_H
+#define energyRegionCoupledFvPatchScalarField_H
+
+#include "regionCoupledBaseFvPatch.H"
+#include "LduInterfaceField.H"
+#include "fvPatchField.H"
+#include "NamedEnum.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+
+/*---------------------------------------------------------------------------*\
+             Class energyRegionCoupledFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class energyRegionCoupledFvPatchScalarField
+:
+    public LduInterfaceField<scalar>,
+    public fvPatchScalarField
+{
+public:
+
+        enum kappaMethodType
+        {
+            SOLID,
+            FLUID,
+            UNDEFINED
+        };
+
+
+private:
+
+    // Private data
+
+        //- Local reference to region couple patch
+        const regionCoupledBaseFvPatch& regionCoupledPatch_;
+
+        //- Methof to extract kappa
+        static const NamedEnum<kappaMethodType, 3> methodTypeNames_;
+
+        //- How to get K
+        mutable kappaMethodType method_;
+
+        //- AutoPtr to nbr thermo
+        mutable const basicThermo* nbrThermoPtr_;
+
+        //- AutoPtr to my thermo
+        mutable const basicThermo* thermoPtr_;
+
+
+    // Private functions
+
+        //- Local weight for this coupled field
+        tmp<scalarField> weights() const;
+
+        //- Return nbr temperature internal field
+        tmp<scalarField> patchNeighbourTemperatureField() const;
+
+        //- Return local temperature internal field
+        tmp<scalarField> patchInternalTemperatureField() const;
+
+        //- Return kappa
+        tmp<scalarField> kappa() const;
+
+        //- Set method
+        void setMethod() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::energyRegionCoupled");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        energyRegionCoupledFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        energyRegionCoupledFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given energyRegionCoupledFvPatchScalarField
+        // onto a new patch
+        energyRegionCoupledFvPatchScalarField
+        (
+            const energyRegionCoupledFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        energyRegionCoupledFvPatchScalarField
+        (
+            const energyRegionCoupledFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<scalar> > clone() const
+        {
+            return tmp<fvPatchField<scalar> >
+            (
+                new energyRegionCoupledFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        energyRegionCoupledFvPatchScalarField
+        (
+            const energyRegionCoupledFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+
+    //- Destructor
+    virtual ~energyRegionCoupledFvPatchScalarField()
+    {}
+
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<scalar> > clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<scalar> >
+            (
+                new energyRegionCoupledFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+
+        // Access
+
+            //- Return true if this patch field is coupled
+            virtual bool coupled() const
+            {
+                return true;
+            }
+
+            //- Method to obtain K
+            word kappaMethod() const
+            {
+                return methodTypeNames_[method_];
+            }
+
+
+        // Evaluation functions
+
+            //- Return neighbour coupled internal cell data
+            virtual tmp<scalarField> patchNeighbourField() const;
+
+            //- Return patch-normal gradient
+            virtual tmp<scalarField> snGrad() const;
+
+            //- Initialise the evaluation of the patch field
+            virtual void initEvaluate
+            (
+                const Pstream::commsTypes commsType
+            );
+
+            //- Evaluate the patch field
+            virtual void evaluate
+            (
+                const Pstream::commsTypes commsType
+            );
+
+            //- Return the matrix diagonal coefficients corresponding to the
+            //  evaluation of the value of this patchField with given weights
+            virtual tmp<scalarField> valueInternalCoeffs
+            (
+                const tmp<scalarField>&
+            ) const;
+
+            //- Return the matrix source coefficients corresponding to the
+            //  evaluation of the value of this patchField with given weights
+            virtual tmp<scalarField> valueBoundaryCoeffs
+            (
+                const tmp<scalarField>&
+            ) const;
+
+            //- Return the matrix diagonal coefficients corresponding to the
+            //  evaluation of the gradient of this patchField
+            virtual tmp<scalarField> gradientInternalCoeffs() const;
+
+            //- Return the matrix source coefficients corresponding to the
+            //  evaluation of the gradient of this patchField
+            virtual tmp<scalarField> gradientBoundaryCoeffs() const;
+
+
+        // Coupled interface functionality
+
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<scalar>& result,
+                const scalarField& psiInternal,
+                const scalarField& coeffs,
+                const direction cmpt,
+                const Pstream::commsTypes commsType
+            ) const;
+
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<scalar>&,
+                const Field<scalar>&,
+                const scalarField&,
+                const Pstream::commsTypes commsType
+            ) const;
+
+            //- Return the interface type
+            virtual const word& interfaceFieldType() const
+            {
+                return regionCoupledPatch_.regionCoupleType();
+            }
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/regionModels/thermoBaffleModels/Make/files b/src/regionModels/thermoBaffleModels/Make/files
index 41bb7d03db..2799f6460b 100644
--- a/src/regionModels/thermoBaffleModels/Make/files
+++ b/src/regionModels/thermoBaffleModels/Make/files
@@ -1,9 +1,9 @@
 thermoBaffleModel/thermoBaffleModel.C
 thermoBaffleModel/thermoBaffleModelNew.C
-thermoBaffle2D/thermoBaffle2D.C
+thermoBaffle/thermoBaffle.C
 noThermo/noThermo.C
 
-derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
+derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
 
 
 LIB = $(FOAM_LIBBIN)/libthermoBaffleModels
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
similarity index 86%
rename from src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
rename to src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
index 50dc8c0489..471295924e 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "temperatureThermoBaffleFvPatchScalarField.H"
+#include "thermoBaffleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -35,8 +35,8 @@ namespace compressible
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-temperatureThermoBaffleFvPatchScalarField::
-temperatureThermoBaffleFvPatchScalarField
+thermoBaffleFvPatchScalarField::
+thermoBaffleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -49,10 +49,10 @@ temperatureThermoBaffleFvPatchScalarField
 {}
 
 
-temperatureThermoBaffleFvPatchScalarField::
-temperatureThermoBaffleFvPatchScalarField
+thermoBaffleFvPatchScalarField::
+thermoBaffleFvPatchScalarField
 (
-    const temperatureThermoBaffleFvPatchScalarField& ptf,
+    const thermoBaffleFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -71,8 +71,8 @@ temperatureThermoBaffleFvPatchScalarField
 {}
 
 
-temperatureThermoBaffleFvPatchScalarField::
-temperatureThermoBaffleFvPatchScalarField
+thermoBaffleFvPatchScalarField::
+thermoBaffleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -88,8 +88,8 @@ temperatureThermoBaffleFvPatchScalarField
     {
         FatalErrorIn
         (
-            "temperatureThermoBaffleFvPatchScalarField::"
-            "temperatureThermoBaffleFvPatchScalarField\n"
+            "thermoBaffleFvPatchScalarField::"
+            "thermoBaffleFvPatchScalarField\n"
             "(\n"
             "    const fvPatch& p,\n"
             "    const DimensionedField<scalar, volMesh>& iF,\n"
@@ -127,10 +127,10 @@ temperatureThermoBaffleFvPatchScalarField
 }
 
 
-temperatureThermoBaffleFvPatchScalarField::
-temperatureThermoBaffleFvPatchScalarField
+thermoBaffleFvPatchScalarField::
+thermoBaffleFvPatchScalarField
 (
-    const temperatureThermoBaffleFvPatchScalarField& ptf,
+    const thermoBaffleFvPatchScalarField& ptf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -144,7 +144,7 @@ temperatureThermoBaffleFvPatchScalarField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 
-void temperatureThermoBaffleFvPatchScalarField::autoMap
+void thermoBaffleFvPatchScalarField::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -153,7 +153,7 @@ void temperatureThermoBaffleFvPatchScalarField::autoMap
 }
 
 
-void temperatureThermoBaffleFvPatchScalarField::rmap
+void thermoBaffleFvPatchScalarField::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
@@ -163,7 +163,7 @@ void temperatureThermoBaffleFvPatchScalarField::rmap
 }
 
 
-void temperatureThermoBaffleFvPatchScalarField::updateCoeffs()
+void thermoBaffleFvPatchScalarField::updateCoeffs()
 {
     if (this->updated())
     {
@@ -181,7 +181,7 @@ void temperatureThermoBaffleFvPatchScalarField::updateCoeffs()
 }
 
 
-void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const
+void thermoBaffleFvPatchScalarField::write(Ostream& os) const
 {
     turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write(os);
 
@@ -212,10 +212,10 @@ void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const
 
         os.writeKeyword("thermoType");
         os << dict_.subDict("thermoType") << nl;
- 
+
         os.writeKeyword("mixture");
         os << dict_.subDict("mixture") << nl;
- 
+
         os.writeKeyword("radiation");
         os << dict_.subDict("radiation") << nl;
    }
@@ -227,7 +227,7 @@ void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const
 makePatchTypeField
 (
     fvPatchScalarField,
-    temperatureThermoBaffleFvPatchScalarField
+    thermoBaffleFvPatchScalarField
 );
 
 
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.H
similarity index 86%
rename from src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
rename to src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.H
index b32a0127c4..a3fa62d442 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::temperatureThermoBaffleFvPatchScalarField
+    Foam::thermoBaffleFvPatchScalarField
 
 Group
     grpThermoBoundaryConditions
@@ -56,11 +56,11 @@ Description
 
 
         // Thermo baffle model
-        thermoBaffleModel   thermoBaffle2D;
+        thermoBaffleModel   thermoBaffle;
         regionName          baffleRegion;
         infoOutput          yes;
         active              yes;
-        thermoBaffle2DCoeffs
+        thermoBaffleCoeffs
         {
         }
 
@@ -115,12 +115,12 @@ SeeAlso
     Foam::regionModels::thermoBaffleModels::thermoBaffleModel
 
 SourceFiles
-    temperatureThermoBaffleFvPatchScalarField.C
+    thermoBaffleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef temperatureThermoBaffleFvPatchScalarField_H
-#define temperatureThermoBaffleFvPatchScalarField_H
+#ifndef thermoBaffleFvPatchScalarField_H
+#define thermoBaffleFvPatchScalarField_H
 
 
 #include "autoPtr.H"
@@ -137,10 +137,10 @@ namespace compressible
 {
 
 /*---------------------------------------------------------------------------*\
-        Class temperatureThermoBaffleFvPatchScalarField Declaration
+        Class thermoBaffleFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class temperatureThermoBaffleFvPatchScalarField
+class thermoBaffleFvPatchScalarField
 :
     public turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
 {
@@ -159,20 +159,20 @@ class temperatureThermoBaffleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("compressible::temperatureThermoBaffle");
+    TypeName("compressible::thermoBaffle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        temperatureThermoBaffleFvPatchScalarField
+        thermoBaffleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        temperatureThermoBaffleFvPatchScalarField
+        thermoBaffleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -180,10 +180,10 @@ public:
         );
 
         //- Construct by mapping given
-        //  temperatureThermoBaffleFvPatchScalarField onto a new patch
-        temperatureThermoBaffleFvPatchScalarField
+        //  thermoBaffleFvPatchScalarField onto a new patch
+        thermoBaffleFvPatchScalarField
         (
-            const temperatureThermoBaffleFvPatchScalarField&,
+            const thermoBaffleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
@@ -195,14 +195,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new temperatureThermoBaffleFvPatchScalarField(*this)
+                new thermoBaffleFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        temperatureThermoBaffleFvPatchScalarField
+        thermoBaffleFvPatchScalarField
         (
-            const temperatureThermoBaffleFvPatchScalarField&,
+            const thermoBaffleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -214,7 +214,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new temperatureThermoBaffleFvPatchScalarField(*this, iF)
+                new thermoBaffleFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.C
similarity index 89%
rename from src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
rename to src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.C
index 39f2e4cc04..9044f71fa2 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "thermoBaffle2D.H"
+#include "thermoBaffle.H"
 
 #include "fvm.H"
 #include "fvcDiv.H"
@@ -44,32 +44,32 @@ namespace thermoBaffleModels
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(thermoBaffle2D, 0);
+defineTypeNameAndDebug(thermoBaffle, 0);
 
-addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle2D, mesh);
-addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle2D, dictionary);
+addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle, mesh);
+addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle, dictionary);
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-bool thermoBaffle2D::read()
+bool thermoBaffle::read()
 {
     this->solution().lookup("nNonOrthCorr") >> nNonOrthCorr_;
     return regionModel1D::read();
 }
 
 
-bool thermoBaffle2D::read(const dictionary& dict)
+bool thermoBaffle::read(const dictionary& dict)
 {
     this->solution().lookup("nNonOrthCorr") >> nNonOrthCorr_;
     return regionModel1D::read(dict);
 }
 
 
-void thermoBaffle2D::solveEnergy()
+void thermoBaffle::solveEnergy()
 {
     if (debug)
     {
-        Info<< "thermoBaffle2D::solveEnergy()" << endl;
+        Info<< "thermoBaffle::solveEnergy()" << endl;
     }
 
     const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
@@ -157,7 +157,7 @@ void thermoBaffle2D::solveEnergy()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-thermoBaffle2D::thermoBaffle2D
+thermoBaffle::thermoBaffle
 (
     const word& modelType,
     const fvMesh& mesh,
@@ -218,7 +218,7 @@ thermoBaffle2D::thermoBaffle2D
 }
 
 
-thermoBaffle2D::thermoBaffle2D
+thermoBaffle::thermoBaffle
 (
     const word& modelType,
     const fvMesh& mesh
@@ -279,13 +279,13 @@ thermoBaffle2D::thermoBaffle2D
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-thermoBaffle2D::~thermoBaffle2D()
+thermoBaffle::~thermoBaffle()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void thermoBaffle2D::init()
+void thermoBaffle::init()
 {
     if (oneD_ && !constantThickness_)
     {
@@ -294,7 +294,7 @@ void thermoBaffle2D::init()
 
         if (Qsb!= thickness_.size())
         {
-            FatalErrorIn("thermoBaffle2D::init()")
+            FatalErrorIn("thermoBaffle::init()")
                 << "the boundary field of Qs is "
                 << Qsb << " and " << nl
                 << "the field 'thickness' is " << thickness_.size() << nl
@@ -304,11 +304,11 @@ void thermoBaffle2D::init()
 }
 
 
-void thermoBaffle2D::preEvolveRegion()
+void thermoBaffle::preEvolveRegion()
 {}
 
 
-void thermoBaffle2D::evolveRegion()
+void thermoBaffle::evolveRegion()
 {
     for (int nonOrth=0; nonOrth<=nNonOrthCorr_; nonOrth++)
     {
@@ -317,43 +317,43 @@ void thermoBaffle2D::evolveRegion()
 }
 
 
-const tmp<volScalarField> thermoBaffle2D::Cp() const
+const tmp<volScalarField> thermoBaffle::Cp() const
 {
     return thermo_->Cp();
 }
 
 
-const volScalarField& thermoBaffle2D::kappaRad() const
+const volScalarField& thermoBaffle::kappaRad() const
 {
     return radiation_->absorptionEmission().a();
 }
 
 
-const volScalarField& thermoBaffle2D::rho() const
+const volScalarField& thermoBaffle::rho() const
 {
     return thermo_->rho();
 }
 
 
-const volScalarField& thermoBaffle2D::kappa() const
+const volScalarField& thermoBaffle::kappa() const
 {
     return thermo_->kappa();
 }
 
 
-const volScalarField& thermoBaffle2D::T() const
+const volScalarField& thermoBaffle::T() const
 {
     return thermo_->T();
 }
 
 
-const solidThermo& thermoBaffle2D::thermo() const
+const solidThermo& thermoBaffle::thermo() const
 {
     return thermo_;
 }
 
 
-void thermoBaffle2D::info() const
+void thermoBaffle::info() const
 {
     const labelList& coupledPatches = intCoupledPatchIDs();
 
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.H
similarity index 90%
rename from src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
rename to src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.H
index 52f648f8d6..93fcf19fd6 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermoBaffle2D
+    Foam::thermoBaffle
 
 Description
     2D thermal baffle
 
 SourceFiles
-    thermoBaffle2D.C
-    thermoBaffle2DI.H
+    thermoBaffle.C
+    thermoBaffleI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef thermoBaffle2D_H
-#define thermoBaffle2D_H
+#ifndef thermoBaffle_H
+#define thermoBaffle_H
 
 #include "thermoBaffleModel.H"
 #include "volFieldsFwd.H"
@@ -51,10 +51,10 @@ namespace thermoBaffleModels
 
 
 /*---------------------------------------------------------------------------*\
-                        Class thermoBaffle2D Declaration
+                        Class thermoBaffle Declaration
 \*---------------------------------------------------------------------------*/
 
-class thermoBaffle2D
+class thermoBaffle
 :
     public thermoBaffleModel
 {
@@ -63,12 +63,12 @@ private:
     // Private member functions
 
         //- Disallow default bitwise copy construct
-        thermoBaffle2D(const thermoBaffle2D&);
+        thermoBaffle(const thermoBaffle&);
 
         //- Disallow default bitwise assignment
-        void operator=(const thermoBaffle2D&);
+        void operator=(const thermoBaffle&);
 
-        //- Initialize thermoBaffle2D
+        //- Initialize thermoBaffle
         void init();
 
 
@@ -124,16 +124,16 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("thermoBaffle2D");
+    TypeName("thermoBaffle");
 
 
     // Constructors
 
         //- Construct from components
-        thermoBaffle2D(const word& modelType, const fvMesh& mesh);
+        thermoBaffle(const word& modelType, const fvMesh& mesh);
 
         //- Construct from components and dict
-        thermoBaffle2D
+        thermoBaffle
         (
             const word& modelType,
             const fvMesh& mesh,
@@ -142,7 +142,7 @@ public:
 
 
     //- Destructor
-    virtual ~thermoBaffle2D();
+    virtual ~thermoBaffle();
 
 
     // Member Functions
@@ -211,7 +211,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "thermoBaffle2DI.H"
+#include "thermoBaffleI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2DI.H b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffleI.H
similarity index 93%
rename from src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2DI.H
rename to src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffleI.H
index 22d675bbb5..107274f65e 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2DI.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffleI.H
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "thermoBaffle2D.H"
+#include "thermoBaffle.H"
 #include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,7 +38,7 @@ namespace thermoBaffleModels
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-inline tmp<scalarField> thermoBaffle2D::he
+inline tmp<scalarField> thermoBaffle::he
 (
     const scalarField& p,
     const scalarField& T,
@@ -49,7 +49,7 @@ inline tmp<scalarField> thermoBaffle2D::he
 }
 
 
-inline tmp<volScalarField> thermoBaffle2D::he() const
+inline tmp<volScalarField> thermoBaffle::he() const
 {
     return thermo_->he();
 }
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
index fa495c40ce..3cbd5fd02f 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,12 +27,16 @@ License
 #include "processorFvPatch.H"
 #include "demandDrivenData.H"
 
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::meshToMesh, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(meshToMesh, 0);
+}
+
 const Foam::scalar Foam::meshToMesh::directHitTol = 1e-5;
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::meshToMesh::meshToMesh
diff --git a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
index 43061586de..219d78ce76 100644
--- a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
+++ b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
@@ -34,7 +34,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::tetOverlapVolume, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(tetOverlapVolume, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 4e2a0aa060..8652fa9a25 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::probes, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(probes, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 0d34fee852..803190a4a1 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -33,8 +33,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::sampledSets, 0);
-bool Foam::sampledSets::verbose_ = false;
+namespace Foam
+{
+defineTypeNameAndDebug(sampledSets, 0);
+bool sampledSets::verbose_ = false;
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index f96983d27a..7fc7074943 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::isoSurface, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(isoSurface, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index 53f99b67c0..8123541ebe 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::isoSurfaceCell, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(isoSurfaceCell, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 89fc6a6e6e..4a64251053 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -33,10 +33,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::sampledSurfaces, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(sampledSurfaces, 0);
+}
+
+
 bool Foam::sampledSurfaces::verbose_ = false;
+
 Foam::scalar Foam::sampledSurfaces::mergeTol_ = 1e-10;
 
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::sampledSurfaces::writeGeometry() const
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
index 63c76f641a..81f46165c2 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::thresholdCellFaces, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(thresholdCellFaces, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index 3f5d71c571..88a7427135 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfMesh, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(surfMesh, 0);
+}
+
 
 Foam::word Foam::surfMesh::meshSubDir = "surfMesh";
 
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C
index a4370eb122..faab239456 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.C
+++ b/src/surfMesh/surfZone/surfZone/surfZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfZone, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(surfZone, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
index b3adbce762..745fec325f 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfZoneIOList, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(surfZoneIOList, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.C b/src/surfMesh/surfaceFormats/obj/OBJstream.C
index fcd446eaab..ce0eb2721b 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJstream.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJstream.C
@@ -29,7 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::OBJstream, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(OBJstream, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.C b/src/surfMesh/surfaceRegistry/surfaceRegistry.C
index 716612eb59..227481d7ef 100644
--- a/src/surfMesh/surfaceRegistry/surfaceRegistry.C
+++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,11 +28,16 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfaceRegistry, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(surfaceRegistry, 0);
+}
+
 
 const Foam::word Foam::surfaceRegistry::prefix("surfaces");
 Foam::word Foam::surfaceRegistry::defaultName("default");
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::surfaceRegistry::surfaceRegistry
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index 29634e2769..5f49a4ba75 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -102,6 +102,10 @@ Foam::wordList Foam::heThermo<BasicThermo, MixtureType>::heBoundaryTypes()
         {
             hbt[patchi] = energyJumpAMIFvPatchScalarField::typeName;
         }
+        else if (tbf[patchi].type() == "energyRegionCoupledFvPatchScalarField")
+        {
+            hbt[patchi] = "energyRegionCoupledFvPatchScalarField";
+        }
     }
 
     return hbt;
diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C
index fa4bea7ca9..a35e5850e9 100644
--- a/src/thermophysicalModels/specie/specie/specie.C
+++ b/src/thermophysicalModels/specie/specie/specie.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,10 @@ const Foam::scalar Foam::specie::Pstd = constant::standard::Pstd.value();
 //- Standard temperature (default in [K])
 const Foam::scalar Foam::specie::Tstd = constant::standard::Tstd.value();
 
-defineTypeNameAndDebug(Foam::specie, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(specie, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.C b/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.C
index 8d39083330..63c97e53a5 100644
--- a/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.C
+++ b/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(Foam::topoChangerFvMesh, 0);
+    defineTypeNameAndDebug(topoChangerFvMesh, 0);
 }
 
 
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.C b/src/triSurface/triSurface/surfacePatch/surfacePatch.C
index 4b0f4bb0ed..aab5a7962e 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatch.C
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,8 +29,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfacePatch, 0);
-
+namespace Foam
+{
+defineTypeNameAndDebug(surfacePatch, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
index 1abcc7e445..1eb6176193 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::surfacePatchIOList, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(surfacePatchIOList, 0);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index d8630cc77d..e0e6c265ff 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -34,7 +34,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::triSurface, 0);
+namespace Foam
+{
+defineTypeNameAndDebug(triSurface, 0);
+}
 
 
 Foam::fileName Foam::triSurface::triSurfInstance(const Time& d)
diff --git a/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
index d613db9f6a..060ed5bda3 100644
--- a/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ b/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,9 +173,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::anisotropicFilter::operator()
             (
                 "anisotropicFilteredSymmTensorField",
                 mesh().time().timeName(),
-                mesh(),
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
+                mesh()
             ),
             mesh(),
             unFilteredField().dimensions()
@@ -209,9 +207,7 @@ Foam::tmp<Foam::volTensorField> Foam::anisotropicFilter::operator()
             (
                 "anisotropicFilteredTensorField",
                 mesh().time().timeName(),
-                mesh(),
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
+                mesh()
             ),
             mesh(),
             unFilteredField().dimensions()
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/files b/src/turbulenceModels/compressible/turbulenceModel/Make/files
index 3544505a72..e089735210 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/files
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/files
@@ -4,9 +4,10 @@ laminar/laminar.C
 derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
 derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
 derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
-derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.C
+derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
 derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
 derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
 derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
 
+
 LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModel
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.C
similarity index 88%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.C
index 5d39d5e40f..2d4f331e20 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.C
@@ -39,8 +39,8 @@ namespace compressible
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class solidType>
-temperatureThermoBaffle1DFvPatchScalarField<solidType>::
-temperatureThermoBaffle1DFvPatchScalarField
+thermoBaffle1DFvPatchScalarField<solidType>::
+thermoBaffle1DFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -56,10 +56,10 @@ temperatureThermoBaffle1DFvPatchScalarField
 
 
 template<class solidType>
-temperatureThermoBaffle1DFvPatchScalarField<solidType>::
-temperatureThermoBaffle1DFvPatchScalarField
+thermoBaffle1DFvPatchScalarField<solidType>::
+thermoBaffle1DFvPatchScalarField
 (
-    const temperatureThermoBaffle1DFvPatchScalarField& ptf,
+    const thermoBaffle1DFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -75,8 +75,8 @@ temperatureThermoBaffle1DFvPatchScalarField
 
 
 template<class solidType>
-temperatureThermoBaffle1DFvPatchScalarField<solidType>::
-temperatureThermoBaffle1DFvPatchScalarField
+thermoBaffle1DFvPatchScalarField<solidType>::
+thermoBaffle1DFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -94,8 +94,8 @@ temperatureThermoBaffle1DFvPatchScalarField
     {
         FatalErrorIn
         (
-            "temperatureThermoBaffle1DFvPatchScalarField::"
-            "temperatureThermoBaffle1DFvPatchScalarField"
+            "thermoBaffle1DFvPatchScalarField::"
+            "thermoBaffle1DFvPatchScalarField"
             "("
                 "const fvPatch&,\n"
                 "const DimensionedField<scalar, volMesh>&, "
@@ -130,10 +130,10 @@ temperatureThermoBaffle1DFvPatchScalarField
 
 
 template<class solidType>
-temperatureThermoBaffle1DFvPatchScalarField<solidType>::
-temperatureThermoBaffle1DFvPatchScalarField
+thermoBaffle1DFvPatchScalarField<solidType>::
+thermoBaffle1DFvPatchScalarField
 (
-    const temperatureThermoBaffle1DFvPatchScalarField& ptf
+    const thermoBaffle1DFvPatchScalarField& ptf
 )
 :
     mixedFvPatchScalarField(ptf),
@@ -146,10 +146,10 @@ temperatureThermoBaffle1DFvPatchScalarField
 
 
 template<class solidType>
-temperatureThermoBaffle1DFvPatchScalarField<solidType>::
-temperatureThermoBaffle1DFvPatchScalarField
+thermoBaffle1DFvPatchScalarField<solidType>::
+thermoBaffle1DFvPatchScalarField
 (
-    const temperatureThermoBaffle1DFvPatchScalarField& ptf,
+    const thermoBaffle1DFvPatchScalarField& ptf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -165,7 +165,7 @@ temperatureThermoBaffle1DFvPatchScalarField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class solidType>
-void temperatureThermoBaffle1DFvPatchScalarField<solidType>::autoMap
+void thermoBaffle1DFvPatchScalarField<solidType>::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -174,7 +174,7 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::autoMap
 }
 
 template<class solidType>
-void temperatureThermoBaffle1DFvPatchScalarField<solidType>::rmap
+void thermoBaffle1DFvPatchScalarField<solidType>::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
@@ -185,7 +185,7 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::rmap
 
 
 template<class solidType>
-void temperatureThermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
+void thermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
 {
     if (updated())
     {
@@ -242,8 +242,8 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
         );
         mpp.map().distribute(nbrQDot);
 
-        const temperatureThermoBaffle1DFvPatchScalarField& nbrField =
-        refCast<const temperatureThermoBaffle1DFvPatchScalarField>
+        const thermoBaffle1DFvPatchScalarField& nbrField =
+        refCast<const thermoBaffle1DFvPatchScalarField>
         (
             nbrPatch.template lookupPatchField<volScalarField, scalar>(TName_)
         );
@@ -347,7 +347,7 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
 }
 
 template <class solidType>
-void temperatureThermoBaffle1DFvPatchScalarField<solidType>::
+void thermoBaffle1DFvPatchScalarField<solidType>::
 write(Ostream& os) const
 {
     mixedFvPatchScalarField::write(os);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.H
similarity index 79%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.H
index 8708bd125c..33a26f39fd 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::temperatureThermoBaffle1DFvPatchScalarField
+    Foam::thermoBaffle1DFvPatchScalarField
 
 Description
     Boundary which solves the 1D steady state heat transfer equation
     through a baffle.
 
 SourceFiles
-    temperatureThermoBaffle1DFvPatchScalarField.C
+    thermoBaffle1DFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef temperatureThermoBaffle1DFvPatchScalarField_H
-#define temperatureThermoBaffle1DFvPatchScalarField_H
+#ifndef thermoBaffle1DFvPatchScalarField_H
+#define thermoBaffle1DFvPatchScalarField_H
 
 #include "mixedFvPatchFields.H"
 #include "autoPtr.H"
@@ -48,11 +48,11 @@ namespace compressible
 {
 
 /*---------------------------------------------------------------------------*\
-         Class temperatureThermoBaffle1DFvPatchScalarField Declaration
+            Class thermoBaffle1DFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class solidType>
-class temperatureThermoBaffle1DFvPatchScalarField
+class thermoBaffle1DFvPatchScalarField
 :
     public mixedFvPatchScalarField
 {
@@ -77,20 +77,20 @@ class temperatureThermoBaffle1DFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("compressible::temperatureThermoBaffle1D");
+    TypeName("compressible::thermoBaffle1D");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        temperatureThermoBaffle1DFvPatchScalarField
+        thermoBaffle1DFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        temperatureThermoBaffle1DFvPatchScalarField
+        thermoBaffle1DFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -98,19 +98,19 @@ public:
         );
 
         //- Construct by mapping given
-        //  temperatureThermoBaffle1DFvPatchScalarField onto a new patch
-        temperatureThermoBaffle1DFvPatchScalarField
+        //  thermoBaffle1DFvPatchScalarField onto a new patch
+        thermoBaffle1DFvPatchScalarField
         (
-            const temperatureThermoBaffle1DFvPatchScalarField&,
+            const thermoBaffle1DFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        temperatureThermoBaffle1DFvPatchScalarField
+        thermoBaffle1DFvPatchScalarField
         (
-            const temperatureThermoBaffle1DFvPatchScalarField&
+            const thermoBaffle1DFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -118,14 +118,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new temperatureThermoBaffle1DFvPatchScalarField(*this)
+                new thermoBaffle1DFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        temperatureThermoBaffle1DFvPatchScalarField
+        thermoBaffle1DFvPatchScalarField
         (
-            const temperatureThermoBaffle1DFvPatchScalarField&,
+            const thermoBaffle1DFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -137,7 +137,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new temperatureThermoBaffle1DFvPatchScalarField(*this, iF)
+                new thermoBaffle1DFvPatchScalarField(*this, iF)
             );
         }
 
@@ -176,7 +176,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "temperatureThermoBaffle1DFvPatchScalarField.C"
+#   include "thermoBaffle1DFvPatchScalarField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
similarity index 80%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
index cc4da7852c..2e180238f4 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "temperatureThermoBaffle1DFvPatchScalarFields.H"
+#include "thermoBaffle1DFvPatchScalarFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 
@@ -38,28 +38,28 @@ namespace compressible
 
 defineTemplateTypeNameAndDebugWithName
 (
-    constSolid_temperatureThermoBaffle1DFvPatchScalarField,
-    "compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>",
+    constSolid_thermoBaffle1DFvPatchScalarField,
+    "compressible::thermoBaffle1D<hConstSolidThermoPhysics>",
     0
 );
 
 addToPatchFieldRunTimeSelection
 (
     fvPatchScalarField,
-    constSolid_temperatureThermoBaffle1DFvPatchScalarField
+    constSolid_thermoBaffle1DFvPatchScalarField
 );
 
 defineTemplateTypeNameAndDebugWithName
 (
-    expoSolid_temperatureThermoBaffle1DFvPatchScalarField,
-    "compressible::temperatureThermoBaffle1D<hExponentialSolidThermoPhysics>",
+    expoSolid_thermoBaffle1DFvPatchScalarField,
+    "compressible::thermoBaffle1D<hExponentialSolidThermoPhysics>",
     0
 );
 
 addToPatchFieldRunTimeSelection
 (
     fvPatchScalarField,
-    expoSolid_temperatureThermoBaffle1DFvPatchScalarField
+    expoSolid_thermoBaffle1DFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.H
similarity index 81%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.H
index 428d54b827..931aeaae07 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.H
@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef temperatureThermoBaffle1DFvPatchScalarFields_H
-#define temperatureThermoBaffle1DFvPatchScalarFields_H
+#ifndef thermoBaffle1DFvPatchScalarFields_H
+#define thermoBaffle1DFvPatchScalarFields_H
 
-#include "temperatureThermoBaffle1DFvPatchScalarField.H"
+#include "thermoBaffle1DFvPatchScalarField.H"
 #include "solidThermoPhysicsTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,15 +38,15 @@ namespace compressible
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    typedef temperatureThermoBaffle1DFvPatchScalarField
+    typedef thermoBaffle1DFvPatchScalarField
     <
         hConstSolidThermoPhysics
-    >constSolid_temperatureThermoBaffle1DFvPatchScalarField;
+    >constSolid_thermoBaffle1DFvPatchScalarField;
 
-    typedef temperatureThermoBaffle1DFvPatchScalarField
+    typedef thermoBaffle1DFvPatchScalarField
     <
         hExponentialSolidThermoPhysics
-    >expoSolid_temperatureThermoBaffle1DFvPatchScalarField;
+    >expoSolid_thermoBaffle1DFvPatchScalarField;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
index 8d2ca105a3..acabb40438 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
@@ -21,7 +21,7 @@ active          no;
 
 regionName      none;
 
-thermoBaffle2DCoeffs
+thermoBaffleCoeffs
 {
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
index 5a0ae0bb51..1931c502a6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
@@ -22,7 +22,7 @@ dictionaryReplacement
         {
             "region0_to.*"
             {
-                type                compressible::temperatureThermoBaffle;
+                type                compressible::thermoBaffle;
                 neighbourFieldName  T;
                 kappa               solidThermo;
                 kappaName           none;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
index f379d7dd7c..6146edeb2b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
@@ -88,7 +88,7 @@ dictionaryReplacement
         {
             "baffle.*"
             {
-                type        compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>;
+                type        compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
                 baffleActivated yes;
                 thickness       uniform 0.005;  // thickness [m]
                 Qs              uniform 100;    // heat flux [W/m2]
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
index 770264278f..d2933855c5 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
@@ -88,7 +88,7 @@ dictionaryReplacement
         {
             "baffle1Wall.*"
             {
-                type   compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>;
+                type   compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
                 baffleActivated yes;
                 thickness       uniform 0.005;  // thickness [m]
                 Qs              uniform 100;    // heat flux [W/m2]
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index eb661d3a35..1cbf29f10c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -91,7 +91,7 @@ dictionaryReplacement
 
             "region0_to.*"
             {
-                type                compressible::temperatureThermoBaffle;
+                type                compressible::thermoBaffle;
 
                 // Coupled BC.
                 neighbourFieldName  T;
@@ -99,11 +99,11 @@ dictionaryReplacement
                 kappaName           none;
 
                 // Thermo baffle model
-                thermoBaffleModel   thermoBaffle2D;
+                thermoBaffleModel   thermoBaffle;
                 regionName          baffleRegion;
                 infoOutput          no;
                 active              yes;
-                thermoBaffle2DCoeffs
+                thermoBaffleCoeffs
                 {
                 }
 
diff --git a/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/Allrun b/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/Allrun
index 76db274115..12efff4e49 100755
--- a/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/Allrun
+++ b/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/Allrun
@@ -9,7 +9,7 @@ application=`getApplication`
 
 runApplication blockMesh
 runApplication topoSet
-runApplication subsetMesh -overwrite -cellSet c0 -patch floatingObject
+runApplication subsetMesh -overwrite c0 -patch floatingObject
 cp -r 0.org 0 > /dev/null 2>&1
 
 runApplication $application
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
index b8c9364b11..5f5d56017f 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
@@ -20,6 +20,9 @@ internalField   uniform (1 0 0);
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     inlet
     {
         type            codedFixedValue;
@@ -48,11 +51,6 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
-
-    "side.*"
-    {
-        type            cyclicAMI;
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
index 9f571637a7..15724a840f 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
@@ -21,6 +21,9 @@ internalField   uniform 1;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     inlet
     {
         type            turbulentMixingLengthDissipationRateInlet;
@@ -39,11 +42,6 @@ boundaryField
         type            epsilonWallFunction;
         value           uniform 0;
     }
-
-    "side.*"
-    {
-        type            cyclicAMI;
-    }
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
index 7266279462..6e56ce95f2 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
@@ -21,6 +21,9 @@ internalField   uniform 1;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     inlet
     {
         type            turbulentIntensityKineticEnergyInlet;
@@ -39,11 +42,6 @@ boundaryField
         type            kqRWallFunction;
         value           uniform 0;
     }
-
-    "side.*"
-    {
-        type            cyclicAMI;
-    }
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
index f25d205095..8a7557745e 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
@@ -20,6 +20,9 @@ internalField   uniform 0;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     inlet
     {
         type            zeroGradient;
@@ -34,11 +37,6 @@ boundaryField
     {
         type            zeroGradient;
     }
-
-    "side.*"
-    {
-        type            cyclicAMI;
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
index 62cb2f0e62..82d8352b7d 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
@@ -21,6 +21,9 @@ internalField   uniform 0;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     inlet
     {
         type            calculated;
@@ -38,11 +41,6 @@ boundaryField
         type            nutkWallFunction;
         value           $internalField;
     }
-
-    "side.*"
-    {
-        type            cyclicAMI;
-    }
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
index ede4c306b8..8766459626 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
@@ -20,6 +20,9 @@ internalField   uniform 0;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     inlet
     {
         type            zeroGradient;
@@ -35,11 +38,6 @@ boundaryField
     {
         type            zeroGradient;
     }
-
-    "side.*"
-    {
-        type            cyclicAMI;
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
index e27a9470fb..e318d43152 100755
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
@@ -36,4 +36,6 @@ cp -r 0.org 0
 runApplication decomposePar -cellDist
 runParallel $application 5
 
+runApplication reconstructPar
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
index e43cefc79a..da248aeec7 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
@@ -15,6 +15,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+libs
+(
+    "libOpenFOAM.so"
+    "libincompressibleTurbulenceModel.so"
+    "libincompressibleRASModels.so"
+);
+
 application     simpleFoam;
 
 startFrom       startTime;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
index 627999b5cd..e2e3a1f1bf 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
@@ -13,7 +13,7 @@ runApplication blockMesh
 runApplication topoSet
 
 # create the obstacles - add obstacle patches to wallFilm patch
-runApplication subsetMesh -cellSet c0 -patch wallFilm -overwrite
+runApplication subsetMesh c0 -patch wallFilm -overwrite
 
 # split the obstacle patches into cube[1-6]_patch[1-6]
 echo "running patchifyObstacles"
diff --git a/tutorials/mesh/cvMesh/flange/Allrun b/tutorials/mesh/cvMesh/flange/Allrun
index 8e16ed1b00..f3f8912437 100755
--- a/tutorials/mesh/cvMesh/flange/Allrun
+++ b/tutorials/mesh/cvMesh/flange/Allrun
@@ -10,7 +10,7 @@ runApplication surfaceFeatureExtract
 runApplication blockMesh
 runApplication topoSet -dict system/topoSetDict-background
 mv log.topoSet log.topoSet.background
-runApplication subsetMesh -cellSet background -patch walls -overwrite
+runApplication subsetMesh background -patch walls -overwrite
 
 runApplication cvMesh
 runApplication collapseEdges -latestTime -collapseFaces
diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun
index bca050f753..a0ea6affe8 100755
--- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun
+++ b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun
@@ -10,7 +10,7 @@ application=`getApplication`
 
 runApplication blockMesh
 runApplication topoSet
-runApplication subsetMesh -overwrite -cellSet c0 -patch movingBlock
+runApplication subsetMesh -overwrite c0 -patch movingBlock
 cp -r 0.org 0 > /dev/null 2>&1
 runApplication $application
 ./extractData log.$application
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
index 5b0f4b59e1..3c68954487 100755
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
@@ -8,7 +8,7 @@ cp -r 0.org 0 > /dev/null 2>&1
 runApplication blockMesh
 #runApplication setSet -batch createObstacle.setSet
 runApplication topoSet
-runApplication subsetMesh -overwrite -cellSet c0 -patch walls
+runApplication subsetMesh -overwrite c0 -patch walls
 runApplication setFields
 runApplication `getApplication`
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
index 896dd6e6f2..8ca61574f2 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
@@ -9,7 +9,7 @@ application=`getApplication`
 
 runApplication blockMesh
 runApplication topoSet
-runApplication subsetMesh -overwrite -cellSet c0 -patch floatingObject
+runApplication subsetMesh -overwrite c0 -patch floatingObject
 cp -r 0.org 0 > /dev/null 2>&1
 runApplication setFields
 runApplication $application