diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index f9c9ab221..bd58456e8 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -47,7 +47,6 @@ Description
 using namespace Foam;
 
 #include "argList.H"
-#include "objectRegistry.H"
 #include "Time.H"
 #include "polyMesh.H"
 #include "emptyPolyPatch.H"
@@ -63,11 +62,16 @@ label maxNodei = 0;
 
 SLPtrList<labelList> slCellLabels;
 SLList<label> slCellMap;
+SLList<label> slCellType;
 label maxCelli = 0;
 
 PtrList<SLList<label> > slPatchCells;
 PtrList<SLList<label> > slPatchCellFaces;
 
+// Cell types
+Map<word> cellTypes;
+label currentTypei = -1;
+
 
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
@@ -90,27 +94,26 @@ cspace                ","{space}
 
 alpha                 [_A-Za-z]
 digit                 [0-9]
-dec_digit             [0-9]
-octal_digit           [0-7]
-hex_digit             [0-9a-fA-F]
 
 identifier            {alpha}({alpha}|{digit})*
-integer               {dec_digit}+
-label                 [1-9]{dec_digit}*
+integer               {digit}+
+label                 [1-9]{digit}*
 
 exponent_part         [eE][-+]?{digit}+
 fractional_constant   [-+]?(({digit}*"."{digit}+)|({digit}+"."?))
 
-double                (({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))
+floatNum              (({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))
 
-x                     {double}
-y                     {double}
-z                     {double}
-value                 {double}
+x                     {floatNum}
+y                     {floatNum}
+z                     {floatNum}
+value                 {floatNum}
 
 node                  ^{space}"N"{cspace}
 element               ^{space}"EN"{cspace}
 bface                 ^{space}"SFE"{cspace}
+elementTypeName       ^{space}"ET"{cspace}
+elementType           ^{space}"TYPE"{cspace}
 
 
 %%
@@ -163,6 +166,7 @@ bface                 ^{space}"SFE"{cspace}
 
         slCellMap.append(celli);
         slCellLabels.append(new labelList(labels));
+        slCellType.append(currentTypei);
     }
 
 
@@ -213,6 +217,37 @@ bface                 ^{space}"SFE"{cspace}
     }
 
 
+{elementTypeName}{label}{cspace}{identifier}{space}\n {
+
+        IStringStream elementStream(YYText());
+        char tag,c;
+        label cellTypei;
+        word cellTypeName;
+        elementStream
+            >> tag >> tag           // skip 'ET'
+            >> c >> cellTypei
+            >> c >> cellTypeName;
+
+        Info<< "Read typeName " << cellTypeName
+            << " for type " << cellTypei << endl;
+
+        cellTypes.insert(cellTypei, cellTypeName);
+    }
+
+
+{elementType}{label}{space}\n {
+        IStringStream elementStream(YYText());
+        char tag,c;
+        label cellTypei;
+        elementStream
+            >> tag >> tag >> tag >> tag     // skip 'TYPE'
+            >> c >> cellTypei;
+
+        currentTypei = cellTypei;
+    }
+
+
+
  /* ------------------------------------------------------------------------- *\
     ------ Ignore remaining space and \n s.  Any other characters are errors.
  \* ------------------------------------------------------------------------- */
@@ -234,6 +269,29 @@ bface                 ^{space}"SFE"{cspace}
 #include <fstream>
 using std::ifstream;
 
+
+label findFace(const polyMesh& mesh, const face& f)
+{
+    const labelList& pFaces = mesh.pointFaces()[f[0]];
+
+    forAll(pFaces, i)
+    {
+        label faceI = pFaces[i];
+
+        if (mesh.faces()[faceI] == f)
+        {
+            return faceI;
+        }
+    }
+
+    FatalErrorIn("findFace(const polyMesh&, const face&)")
+        << "Cannot find a face matching " << f
+        << exit(FatalError);
+
+    return -1;
+}
+
+
 int main(int argc, char *argv[])
 {
     argList::noParallel();
@@ -264,20 +322,15 @@ int main(int argc, char *argv[])
     }
 
     yyFlexLexer lexer(&ansysStream);
-    while(lexer.yylex() != 0)
+    while (lexer.yylex() != 0)
     {}
 
-    Info << "Creating points" << endl;
+    Info<< "Creating points" << endl;
 
     pointField points(slPoints.size());
 
-    label i=0;
-    for
-    (
-        SLList<point>::iterator pointIter = slPoints.begin();
-        pointIter != slPoints.end();
-        ++pointIter
-    )
+    label i = 0;
+    forAllConstIter(SLList<point>, slPoints, pointIter)
     {
         // Scale points for the given scale factor
         points[i++] = scaleFactor * pointIter();
@@ -286,28 +339,18 @@ int main(int argc, char *argv[])
 
     labelList pointMap(maxNodei+1);
 
-    i=0;
-    for
-    (
-        SLList<label>::iterator pointMapIter = slPointMap.begin();
-        pointMapIter != slPointMap.end();
-        ++pointMapIter
-    )
+    i = 0;
+    forAllConstIter(SLList<label>, slPointMap, pointMapIter)
     {
         pointMap[pointMapIter()] = i++;
     }
 
-    Info << "Creating cells" << endl;
+    Info<< "Creating cells" << endl;
 
     labelList cellMap(maxCelli+1);
 
-    i=0;
-    for
-    (
-        SLList<label>::iterator cellMapIter = slCellMap.begin();
-        cellMapIter != slCellMap.end();
-        ++cellMapIter
-    )
+    i = 0;
+    forAllConstIter(SLList<label>, slCellMap, cellMapIter)
     {
         cellMap[cellMapIter()] = i++;
     }
@@ -326,12 +369,7 @@ int main(int argc, char *argv[])
     cellShapeList cellShapes(slCellLabels.size());
     label nCells = 0;
 
-    for
-    (
-        SLPtrList<labelList>::iterator cellIter = slCellLabels.begin();
-        cellIter != slCellLabels.end();
-        ++cellIter
-    )
+    forAllConstIter(SLPtrList<labelList>, slCellLabels, cellIter)
     {
         if      // Tetrahedron
         (
@@ -396,6 +434,34 @@ int main(int argc, char *argv[])
         }
     }
 
+
+    const word defaultFacesName = "defaultFaces";
+    word defaultFacesType = emptyPolyPatch::typeName;
+
+    // Create dummy mesh just to find out what are internal/external
+    // faces
+    autoPtr<polyMesh> dummyMesh
+    (
+        new polyMesh
+        (
+            IOobject
+            (
+                "dummyMesh",
+                runTime.constant(),
+                runTime
+            ),
+            xferCopy(points),
+            cellShapes,
+            faceListList(0),
+            wordList(0),
+            wordList(0),
+            defaultFacesName,
+            defaultFacesType,
+            wordList(0)
+        )
+    );
+
+
     // Warning: tet face order has changed between version 1.9.6 and 2.0
     //
     label faceIndex[7][6] =
@@ -404,12 +470,12 @@ int main(int argc, char *argv[])
         {-1, -1, -1, -1, -1, -1}, // 1
         {-1, -1, -1, -1, -1, -1}, // 2
         {-1, -1, -1, -1, -1, -1}, // 3
-        {-1,  2,  0,  3,  1, -1}, // tet (version 2.0)
+        { 3,  2,  0, -1,  1, -1}, // tet (version 2.0)
         { 0,  4,  3, -1,  2,  1}, // prism
         { 4,  2,  1,  3,  0,  5}, // hex
     };
 
-    Info << "Creating boundary patches" << endl;
+    Info<< "Creating boundary patches" << endl;
 
     faceListList boundary(slPatchCells.size());
     wordList patchNames(slPatchCells.size());
@@ -429,12 +495,14 @@ int main(int argc, char *argv[])
             ++cellIter, ++faceIter
         )
         {
+            const cellShape& shape = cellShapes[cellMap[cellIter()]];
+
             patchFaces.append
             (
-                cellShapes[cellMap[cellIter()] ].faces()
+                shape.faces()
                 [
                     faceIndex
-                        [cellShapes[cellMap[cellIter()] ].nFaces()]
+                        [shape.nFaces()]
                         [faceIter()-1]
                 ]
             );
@@ -442,34 +510,85 @@ int main(int argc, char *argv[])
 
         boundary[patchI] = patchFaces;
         patchNames[patchI] = word("patch") + name(patchI + 1);
-        Info << "Patch " << patchI << " named " << patchNames[patchI]
+    }
+
+
+    //
+    // Lookup the face labels for all the boundary faces
+    //
+    labelListList boundaryFaceLabels(boundary.size());
+    forAll(boundary, patchI)
+    {
+        const faceList& bFaces = boundary[patchI];
+        labelList& bFaceLabels = boundaryFaceLabels[patchI];
+        bFaceLabels.setSize(bFaces.size());
+        forAll(bFaces, i)
+        {
+            bFaceLabels[i] = findFace(dummyMesh(), bFaces[i]);
+        }
+    }
+
+
+    // Now split the boundary faces into external and internal faces. All
+    // faces go into faceZones and external faces go into patches.
+    List<faceList> patchFaces(slPatchCells.size());
+    labelList patchNFaces(slPatchCells.size(), 0);
+    forAll(boundary, patchI)
+    {
+        const faceList& bFaces = boundary[patchI];
+        const labelList& bFaceLabels = boundaryFaceLabels[patchI];
+
+        patchFaces[patchI].setSize(bFaces.size());
+
+        forAll(bFaces, i)
+        {
+            if (!dummyMesh().isInternalFace(bFaceLabels[i]))
+            {
+                patchFaces[patchI][patchNFaces[patchI]++] = bFaces[i];
+            }
+        }
+        patchFaces[patchI].setSize(patchNFaces[patchI]);
+
+        Info<< "Patch " << patchI << " named " << patchNames[patchI]
             << ": " << boundary[patchI].size() << " faces" << endl;
     }
 
-    Info << "ansysToFoam: " << endl
+    // We no longer need the dummyMesh
+    dummyMesh.clear();
+
+
+    Info<< "ansysToFoam: " << endl
         << "Ansys file format does not provide information about the type of "
         << "the patch (eg. wall, symmetry plane, cyclic etc)." << endl
         << "All the patches have been created "
         << "as type patch. Please reset after mesh conversion as necessary."
         << endl;
 
-    wordList patchTypes(boundary.size(), polyPatch::typeName);
-    word defaultFacesName = "defaultFaces";
-    word defaultFacesType = emptyPolyPatch::typeName;
-    wordList patchPhysicalTypes(boundary.size());
+    PtrList<dictionary> patchDicts;
 
     preservePatchTypes
     (
         runTime,
         runTime.constant(),
-        polyMesh::defaultRegion,
+        polyMesh::meshSubDir,
         patchNames,
-        patchTypes,
+        patchDicts,
         defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
+        defaultFacesType
     );
 
+    // Add information to dictionary
+    forAll(patchNames, patchI)
+    {
+        if (!patchDicts.set(patchI))
+        {
+            patchDicts.set(patchI, new dictionary());
+        }
+        // Add but not overwrite
+        patchDicts[patchI].add("type", polyPatch::typeName, false);
+    }
+
+
     polyMesh pShapeMesh
     (
         IOobject
@@ -480,18 +599,101 @@ int main(int argc, char *argv[])
         ),
         xferMove(points),
         cellShapes,
-        boundary,
+        patchFaces,
         patchNames,
-        patchTypes,
+        patchDicts,
         defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
+        defaultFacesType
     );
 
-    // Set the precision of the points data to 10
-    IOstream::defaultPrecision(10);
 
-    Info << "Writing polyMesh" << endl;
+    if (cellTypes.size() > 0 || patchNames.size() > 0)
+    {
+        DynamicList<pointZone*> pz;
+        DynamicList<faceZone*> fz;
+        DynamicList<cellZone*> cz;
+
+        // FaceZones
+        forAll(boundaryFaceLabels, patchI)
+        {
+            if (boundaryFaceLabels[patchI].size())
+            {
+                // Re-do the boundaryFaceLabels since the boundary face
+                // labels will be different on the pShapeMesh.
+                const faceList& bFaces = boundary[patchI];
+                labelList& bFaceLabels = boundaryFaceLabels[patchI];
+                forAll(bFaceLabels, i)
+                {
+                    bFaceLabels[i] = findFace(pShapeMesh, bFaces[i]);
+                }
+
+                Info<< "Creating faceZone " <<  patchNames[patchI]
+                    << " with " << bFaceLabels.size() << " faces" << endl;
+
+                fz.append
+                (
+                    new faceZone
+                    (
+                        patchNames[patchI],
+                        bFaceLabels,
+                        boolList(bFaceLabels.size(), false),
+                        fz.size(),
+                        pShapeMesh.faceZones()
+                    )
+                );
+            }
+        }
+
+
+        // CellZones
+        labelList types = cellTypes.toc();
+
+        forAll(types, j)
+        {
+            label cellType = types[j];
+
+            // Pick up cells in zone
+            DynamicList<label> addr;
+
+            SLList<label>::iterator cellMapIter = slCellMap.begin();
+            SLList<label>::iterator typeIter = slCellType.begin();
+
+            for
+            (
+                ;
+                typeIter != slCellType.end();
+                ++typeIter, ++cellMapIter
+            )
+            {
+                if (typeIter() == cellType)
+                {
+                    addr.append(cellMap[cellMapIter()]);
+                }
+            }
+
+            Info<< "Creating cellZone " << cellTypes[cellType]
+                << " with " << addr.size() << " cells" << endl;
+
+            cz.append
+            (
+                new cellZone
+                (
+                    cellTypes[cellType],
+                    addr,
+                    j,
+                    pShapeMesh.cellZones()
+                )
+            );
+        }
+
+        pShapeMesh.addZones(pz, fz, cz);
+    }
+
+
+    // Set the precision of the points data to 10
+    IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
+
+    Info<< "Writing polyMesh" << endl;
     pShapeMesh.write();
 
     Info<< nl << "end" << endl;
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index 1cc02e4f4..08b3b6d50 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -30,7 +30,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "objectRegistry.H"
 #include "Time.H"
 #include "IFstream.H"
 #include "hexBlock.H"
@@ -44,7 +43,6 @@ Description
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
 int main(int argc, char *argv[])
 {
@@ -73,7 +71,7 @@ int main(int argc, char *argv[])
 
     cfxFile >> nblock >> npatch >> nglue >> nelem >> npoint;
 
-    Info << "Reading blocks" << endl;
+    Info<< "Reading blocks" << endl;
 
     PtrList<hexBlock> blocks(nblock);
 
@@ -81,7 +79,7 @@ int main(int argc, char *argv[])
         word blockName;
         label nx, ny, nz;
 
-        forAll (blocks, blockI)
+        forAll(blocks, blockI)
         {
             cfxFile >> blockName;
             cfxFile >> nx >> ny >> nz;
@@ -90,7 +88,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info << "Reading patch definitions" << endl;
+    Info<< "Reading patch definitions" << endl;
 
     wordList cfxPatchTypes(npatch);
     wordList cfxPatchNames(npatch);
@@ -101,7 +99,7 @@ int main(int argc, char *argv[])
     {
         label no, blkNo, patchLabel;
 
-        forAll (cfxPatchTypes, patchI)
+        forAll(cfxPatchTypes, patchI)
         {
             // Grab patch type and name
             cfxFile >> cfxPatchTypes[patchI] >> cfxPatchNames[patchI] >> no;
@@ -110,7 +108,7 @@ int main(int argc, char *argv[])
             patchRanges[patchI].setSize(6);
             labelList& curRange = patchRanges[patchI];
 
-            forAll (curRange, rI)
+            forAll(curRange, rI)
             {
                 cfxFile >> curRange[rI];
             }
@@ -126,7 +124,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info << "Reading block glueing information" << endl;
+    Info<< "Reading block glueing information" << endl;
 
     labelList glueMasterPatches(nglue, -1);
     labelList glueSlavePatches(nglue, -1);
@@ -145,15 +143,15 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info << "Reading block points" << endl;
+    Info<< "Reading block points" << endl;
 
-    forAll (blocks, blockI)
+    forAll(blocks, blockI)
     {
-        Info << "block " << blockI << " is a ";
+        Info<< "block " << blockI << " is a ";
         blocks[blockI].readPoints(cfxFile);
     }
 
-    Info << "Calculating block offsets" << endl;
+    Info<< "Calculating block offsets" << endl;
 
     labelList blockOffsets(nblock, -1);
 
@@ -172,11 +170,11 @@ int main(int argc, char *argv[])
           + blocks[blockI - 1].nBlockPoints();
     }
 
-    Info << "Assembling patches" << endl;
+    Info<< "Assembling patches" << endl;
 
     faceListList rawPatches(npatch);
 
-    forAll (rawPatches, patchI)
+    forAll(rawPatches, patchI)
     {
         const word& patchType = cfxPatchTypes[patchI];
 
@@ -203,7 +201,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info << "Merging points ";
+    Info<< "Merging points ";
 
     labelList pointMergeList(nMeshPoints, -1);
 
@@ -214,7 +212,7 @@ int main(int argc, char *argv[])
     // For efficiency, create merge pairs in the first pass
     labelListListList glueMergePairs(glueMasterPatches.size());
 
-    forAll (glueMasterPatches, glueI)
+    forAll(glueMasterPatches, glueI)
     {
         const label masterPatch = glueMasterPatches[glueI];
         const label slavePatch = glueSlavePatches[glueI];
@@ -247,14 +245,14 @@ int main(int argc, char *argv[])
 
         scalar sqrMergeTol = GREAT;
 
-        forAll (blockPFaces, blockPFaceLabel)
+        forAll(blockPFaces, blockPFaceLabel)
         {
             const labelList& blockPFacePoints =
                 blockPFaces[blockPFaceLabel];
 
-            forAll (blockPFacePoints, blockPFacePointI)
+            forAll(blockPFacePoints, blockPFacePointI)
             {
-                forAll (blockPFacePoints, blockPFacePointI2)
+                forAll(blockPFacePoints, blockPFacePointI2)
                 {
                     if (blockPFacePointI != blockPFacePointI2)
                     {
@@ -281,7 +279,7 @@ int main(int argc, char *argv[])
 
         // N-squared point search over all points of all faces of
         // master block over all point of all faces of slave block
-        forAll (blockPFaces, blockPFaceLabel)
+        forAll(blockPFaces, blockPFaceLabel)
         {
             const labelList& blockPFacePoints =
                 blockPFaces[blockPFaceLabel];
@@ -289,16 +287,16 @@ int main(int argc, char *argv[])
             labelList& cp = curPairs[blockPFaceLabel];
             cp.setSize(blockPFacePoints.size());
 
-        forAll (blockPFacePoints, blockPFacePointI)
+        forAll(blockPFacePoints, blockPFacePointI)
         {
             found = false;
 
-            forAll (blockNFaces, blockNFaceLabel)
+            forAll(blockNFaces, blockNFaceLabel)
             {
                 const labelList& blockNFacePoints =
                     blockNFaces[blockNFaceLabel];
 
-            forAll (blockNFacePoints, blockNFacePointI)
+            forAll(blockNFacePoints, blockNFacePointI)
             {
                 if
                 (
@@ -360,7 +358,7 @@ int main(int argc, char *argv[])
         changedPointMerge = false;
         nPasses++;
 
-        forAll (glueMasterPatches, glueI)
+        forAll(glueMasterPatches, glueI)
         {
             const label masterPatch = glueMasterPatches[glueI];
             const label slavePatch = glueSlavePatches[glueI];
@@ -372,14 +370,14 @@ int main(int argc, char *argv[])
 
             const labelListList& curPairs = glueMergePairs[glueI];
 
-            forAll (blockPFaces, blockPFaceLabel)
+            forAll(blockPFaces, blockPFaceLabel)
             {
                 const labelList& blockPFacePoints =
                     blockPFaces[blockPFaceLabel];
 
                 const labelList& cp = curPairs[blockPFaceLabel];
 
-                forAll (cp, blockPFacePointI)
+                forAll(cp, blockPFacePointI)
                 {
                     label PpointLabel =
                         blockPFacePoints[blockPFacePointI]
@@ -408,10 +406,10 @@ int main(int argc, char *argv[])
                 }
             }
         }
-        Info << "." << flush;
+        Info<< "." << flush;
     }
     while (changedPointMerge && nPasses < 8);
-    Info << endl;
+    Info<< endl;
 
     if (changedPointMerge == true)
     {
@@ -421,7 +419,7 @@ int main(int argc, char *argv[])
     }
 
 
-    forAll (glueMasterPatches, glueI)
+    forAll(glueMasterPatches, glueI)
     {
         const label masterPatch = glueMasterPatches[glueI];
         const label slavePatch = glueSlavePatches[glueI];
@@ -433,12 +431,12 @@ int main(int argc, char *argv[])
         const faceList& blockNFaces = rawPatches[slavePatch];
 
 
-        forAll (blockPFaces, blockPFaceLabel)
+        forAll(blockPFaces, blockPFaceLabel)
         {
             const labelList& blockPFacePoints
                 = blockPFaces[blockPFaceLabel];
 
-            forAll (blockPFacePoints, blockPFacePointI)
+            forAll(blockPFacePoints, blockPFacePointI)
             {
                 label PpointLabel =
                     blockPFacePoints[blockPFacePointI]
@@ -455,12 +453,12 @@ int main(int argc, char *argv[])
             }
         }
 
-        forAll (blockNFaces, blockNFaceLabel)
+        forAll(blockNFaces, blockNFaceLabel)
         {
             const labelList& blockNFacePoints
                 = blockNFaces[blockNFaceLabel];
 
-            forAll (blockNFacePoints, blockNFacePointI)
+            forAll(blockNFacePoints, blockNFacePointI)
             {
                 label NpointLabel =
                     blockNFacePoints[blockNFacePointI]
@@ -483,7 +481,7 @@ int main(int argc, char *argv[])
     // given old point label
     label nNewPoints = 0;
 
-    forAll (pointMergeList, pointLabel)
+    forAll(pointMergeList, pointLabel)
     {
         if (pointMergeList[pointLabel] > pointLabel)
         {
@@ -509,15 +507,15 @@ int main(int argc, char *argv[])
 
     nMeshPoints = nNewPoints;
 
-    Info << "Creating points" << endl;
+    Info<< "Creating points" << endl;
 
     pointField points(nMeshPoints);
 
-    forAll (blocks, blockI)
+    forAll(blocks, blockI)
     {
         const pointField& blockPoints = blocks[blockI].points();
 
-        forAll (blockPoints, blockPointLabel)
+        forAll(blockPoints, blockPointLabel)
         {
             points
             [
@@ -536,7 +534,7 @@ int main(int argc, char *argv[])
         points *= scaleFactor;
     }
 
-    Info << "Creating cells" << endl;
+    Info<< "Creating cells" << endl;
 
     cellShapeList cellShapes(nMeshCells);
 
@@ -544,15 +542,15 @@ int main(int argc, char *argv[])
 
     label nCreatedCells = 0;
 
-    forAll (blocks, blockI)
+    forAll(blocks, blockI)
     {
         labelListList curBlockCells = blocks[blockI].blockCells();
 
-        forAll (curBlockCells, blockCellI)
+        forAll(curBlockCells, blockCellI)
         {
             labelList cellPoints(curBlockCells[blockCellI].size());
 
-            forAll (cellPoints, pointI)
+            forAll(cellPoints, pointI)
             {
                 cellPoints[pointI] =
                     pointMergeList
@@ -568,18 +566,17 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info << "Creating boundary patches" << endl;
+    Info<< "Creating boundary patches" << endl;
 
     faceListList boundary(npatch);
     wordList patchNames(npatch);
     wordList patchTypes(npatch);
     word defaultFacesName = "defaultFaces";
     word defaultFacesType = wallPolyPatch::typeName;
-    wordList patchPhysicalTypes(npatch);
 
     label nCreatedPatches = 0;
 
-    forAll (rawPatches, patchI)
+    forAll(rawPatches, patchI)
     {
         if (rawPatches[patchI].size() && cfxPatchTypes[patchI] != "BLKBDY")
         {
@@ -600,7 +597,7 @@ int main(int argc, char *argv[])
 
             if (existingPatch >= 0)
             {
-                Info << "CFX patch " << patchI
+                Info<< "CFX patch " << patchI
                     << ", of type " << cfxPatchTypes[patchI]
                     << ", name " << cfxPatchNames[patchI]
                     << " already exists as FOAM patch " << existingPatch
@@ -610,14 +607,14 @@ int main(int argc, char *argv[])
                 label oldSize = renumberedPatch.size();
                 renumberedPatch.setSize(oldSize + curRawPatch.size());
 
-                forAll (curRawPatch, faceI)
+                forAll(curRawPatch, faceI)
                 {
                     const face& oldFace = curRawPatch[faceI];
 
                     face& newFace = renumberedPatch[oldSize + faceI];
                     newFace.setSize(oldFace.size());
 
-                    forAll (oldFace, pointI)
+                    forAll(oldFace, pointI)
                     {
                         newFace[pointI] =
                             pointMergeList
@@ -634,14 +631,14 @@ int main(int argc, char *argv[])
                 faceList& renumberedPatch = boundary[nCreatedPatches];
                 renumberedPatch.setSize(curRawPatch.size());
 
-                forAll (curRawPatch, faceI)
+                forAll(curRawPatch, faceI)
                 {
                     const face& oldFace = curRawPatch[faceI];
 
                     face& newFace = renumberedPatch[faceI];
                     newFace.setSize(oldFace.size());
 
-                    forAll (oldFace, pointI)
+                    forAll(oldFace, pointI)
                     {
                         newFace[pointI] =
                             pointMergeList
@@ -652,7 +649,7 @@ int main(int argc, char *argv[])
                     }
                 }
 
-                Info << "CFX patch " << patchI
+                Info<< "CFX patch " << patchI
                     << ", of type " << cfxPatchTypes[patchI]
                     << ", name " << cfxPatchNames[patchI]
                     << " converted into FOAM patch " << nCreatedPatches
@@ -660,7 +657,7 @@ int main(int argc, char *argv[])
 
                 if (cfxPatchTypes[patchI] == "WALL")
                 {
-                    Info << "wall." << endl;
+                    Info<< "wall." << endl;
 
                     patchTypes[nCreatedPatches] = wallPolyPatch::typeName;
                     patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@@ -668,7 +665,7 @@ int main(int argc, char *argv[])
                 }
                 else if (cfxPatchTypes[patchI] == "SYMMET")
                 {
-                    Info << "symmetryPlane." << endl;
+                    Info<< "symmetryPlane." << endl;
 
                     patchTypes[nCreatedPatches] = symmetryPolyPatch::typeName;
                     patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@@ -683,7 +680,7 @@ int main(int argc, char *argv[])
                  || cfxPatchTypes[patchI] == "USER2D"
                 )
                 {
-                    Info << "generic." << endl;
+                    Info<< "generic." << endl;
 
                     patchTypes[nCreatedPatches] = polyPatch::typeName;
                     patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@@ -704,18 +701,30 @@ int main(int argc, char *argv[])
     patchTypes.setSize(nCreatedPatches);
     patchNames.setSize(nCreatedPatches);
 
+    PtrList<dictionary> patchDicts;
+
     preservePatchTypes
     (
         runTime,
         runTime.constant(),
-        polyMesh::defaultRegion,
+        polyMesh::meshSubDir,
         patchNames,
-        patchTypes,
+        patchDicts,
         defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
+        defaultFacesType
     );
 
+    // Add information to dictionary
+    forAll(patchNames, patchI)
+    {
+        if (!patchDicts.set(patchI))
+        {
+            patchDicts.set(patchI, new dictionary());
+        }
+        // Add but not overwrite
+        patchDicts[patchI].add("type", patchTypes[patchI], false);
+    }
+
     polyMesh pShapeMesh
     (
         IOobject
@@ -728,19 +737,18 @@ int main(int argc, char *argv[])
         cellShapes,
         boundary,
         patchNames,
-        patchTypes,
+        patchDicts,
         defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
+        defaultFacesType
     );
 
     // Set the precision of the points data to 10
-    IOstream::defaultPrecision(10);
+    IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
 
-    Info << "Writing polyMesh" << endl;
+    Info<< "Writing polyMesh" << endl;
     pShapeMesh.write();
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 011e7c752..ac988079f 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -34,19 +34,17 @@ Description
 
 #undef yyFlexLexer
 
-/* ------------------------------------------------------------------------- *\
+ /* ------------------------------------------------------------------------- *\
    ------ local definitions
-\* ------------------------------------------------------------------------- */
+ \* ------------------------------------------------------------------------- */
 
 #include "argList.H"
-#include "objectRegistry.H"
 #include "Time.H"
 #include "IStringStream.H"
 #include "polyMesh.H"
 #include "emptyPolyPatch.H"
 #include "wallPolyPatch.H"
 #include "symmetryPolyPatch.H"
-#include "preservePatchTypes.H"
 #include "cellShape.H"
 #include "faceSet.H"
 #include "cellSet.H"
@@ -132,7 +130,7 @@ quote                      \"
 dash                       "-"
 dotColonDash               [.:-]
 
-schemeSpecialInitial       [!$%&*/\\:<=>?~_^#.@']
+schemeSpecialInitial       [!$%&*/:<=>?~_^#.]
 schemeSpecialSubsequent    [.+-]
 schemeSymbol               (({some_space}|{alpha}|{quote}|{schemeSpecialInitial})({alpha}|{quote}|{digit}|{schemeSpecialInitial}|{schemeSpecialSubsequent})*)
 
@@ -142,7 +140,7 @@ integer                    {decDigit}+
 label                      [1-9]{decDigit}*
 hexLabel                   {hexDigit}+
 zeroLabel                  {digit}*
-signedInteger              [-+]?{integer}
+
 word                       ({alpha}|{digit}|{dotColonDash})*
 
 exponent_part              [eE][-+]?{digit}+
@@ -252,11 +250,11 @@ endOfSection               {space}")"{space}
 %}
 
 
- /* ------------------------------------------------------------------------ *\
+ /* ------------------------------------------------------------------------- *\
                             ------ Start Lexing ------
- \* ------------------------------------------------------------------------ */
+ \* ------------------------------------------------------------------------- */
 
- /*                     ------ Reading control header ------                 */
+ /*                      ------ Reading control header ------                 */
 
 {comment} {
         yy_push_state(readComment);
@@ -491,7 +489,7 @@ endOfSection               {space}")"{space}
         // set size of label list
         curFaceLabels.setSize(readLabel(mixedFaceStream));
 
-        forAll (curFaceLabels, i)
+        forAll(curFaceLabels, i)
         {
             curFaceLabels[i] = readHexLabel(mixedFaceStream) - 1;
         }
@@ -512,7 +510,7 @@ endOfSection               {space}")"{space}
         // for edge is 2, for triangle is 3 and for quad is 4
         curFaceLabels.setSize(faceGroupElementType);
 
-        forAll (curFaceLabels, i)
+        forAll(curFaceLabels, i)
         {
             curFaceLabels[i] = readHexLabel(mixedFaceStream) - 1;
         }
@@ -766,6 +764,7 @@ endOfSection               {space}")"{space}
     }
 
 <readZoneBlock>{lbrac} {
+        Info<< "Found unknown block in zone:" << YYText() << endl;
         yy_push_state(unknownBlock);
     }
 
@@ -785,6 +784,7 @@ endOfSection               {space}")"{space}
 
 
 {lbrac}{label} {
+        Info<< "Found unknown block:" << YYText() << endl;
         yy_push_state(unknownBlock);
     }
 
@@ -792,11 +792,13 @@ endOfSection               {space}")"{space}
     }
 
 <readComment,unknownBlock,embeddedUnknownBlock>{spaceNl}{lbrac} {
+        Info<< "Embedded blocks in comment or unknown:" << YYText() << endl;
         yy_push_state(embeddedUnknownBlock);
 
     }
 
 <readComment,unknownBlock,embeddedUnknownBlock>{spaceNl}{endOfSection} {
+        Info<< "Found end of section in unknown:" << YYText() << endl;
         yy_pop_state();
     }
 
@@ -900,7 +902,7 @@ int main(int argc, char *argv[])
     patchNameIDs.setSize(maxZoneID);
 
     yyFlexLexer lexer(&fluentStream);
-    while(lexer.yylex() != 0)
+    while (lexer.yylex() != 0)
     {}
 
     Info<< "\n\nFINISHED LEXING\n\n\n";
@@ -917,14 +919,14 @@ int main(int argc, char *argv[])
 
     labelList nFacesInCell(nCells, 0);
 
-    forAll (cellFaces, celli)
+    forAll(cellFaces, celli)
     {
         cellFaces[celli].setSize(fluentModelNFaces[fluentCellModelID[celli] ]);
     }
 
     // fill in owner and neighbour
 
-    forAll (owner, faceI)
+    forAll(owner, faceI)
     {
         if (owner[faceI] > -1)
         {
@@ -946,7 +948,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    forAll (neighbour, faceI)
+    forAll(neighbour, faceI)
     {
         if (neighbour[faceI] > -1)
         {
@@ -999,8 +1001,8 @@ int main(int argc, char *argv[])
         // Note: In order for the owner-neighbour rules to be right, the
         // points given by Fluent need to represent the FRONT plane of the
         // geometry. Therefore, the extrusion will be in -z direction
-
-        forAll (oldPoints, pointI)
+        //
+        forAll(oldPoints, pointI)
         {
             points[nNewPoints] = oldPoints[pointI];
 
@@ -1009,7 +1011,7 @@ int main(int argc, char *argv[])
             nNewPoints++;
         }
 
-        forAll (oldPoints, pointI)
+        forAll(oldPoints, pointI)
         {
             points[nNewPoints] = oldPoints[pointI];
 
@@ -1024,7 +1026,7 @@ int main(int argc, char *argv[])
         // Set the number of empty faces
         frontAndBackFaces.setSize(2*nCells);
 
-        forAll (fluentCellModelID, celli)
+        forAll(fluentCellModelID, celli)
         {
             switch (fluentCellModelID[celli])
             {
@@ -1068,7 +1070,7 @@ int main(int argc, char *argv[])
 
                 default:
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
                         << "unrecognised  2-D cell shape: "
                         << fluentCellModelID[celli]
                         << abort(FatalError);
@@ -1077,12 +1079,12 @@ int main(int argc, char *argv[])
         }
 
         // Create new faces
-        forAll (faces, faceI)
+        forAll(faces, faceI)
         {
 
             if (faces[faceI].size() != 2)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
                     << "fluentMeshToFoam: a 2-D face defined with "
                     << faces[faceI].size() << " points." << endl;
             }
@@ -1102,7 +1104,7 @@ int main(int argc, char *argv[])
     {
         // 3-D shape recognition
         Info<< "Creating shapes for 3-D cells"<< endl;
-        forAll (fluentCellModelID, celli)
+        forAll(fluentCellModelID, celli)
         {
             if
             (
@@ -1128,7 +1130,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-                FatalErrorIn(args.executable())
+                FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
                     << "unrecognised 3-D cell shape: "
                     << fluentCellModelID[celli]
                     << abort(FatalError);
@@ -1140,7 +1142,7 @@ int main(int argc, char *argv[])
     // area vector points into the domain. Turn them round before making patches
     // for Foam compatibility
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         if (owner[faceI] == -1)
         {
@@ -1228,7 +1230,7 @@ int main(int argc, char *argv[])
 
     label nPatches = 0;
 
-    // Colate information for all patches (internal and external)
+    // colate information for all patches (internal and external)
 
     // Create a file listing patch type for each zone
 
@@ -1271,7 +1273,7 @@ int main(int argc, char *argv[])
         ++faceGroupEndIndexIter
     )
     {
-        // Get face type and name
+        // get face type and name
         const word& curPatchType = patchTypeIDs[faceGroupZoneIDIter()];
 
         const word& curPatchName = patchNameIDs[faceGroupZoneIDIter()];
@@ -1282,15 +1284,15 @@ int main(int argc, char *argv[])
             << " end: " << faceGroupEndIndexIter()
             << " type: " << curPatchType << " name: " << curPatchName << endl;
 
-        // Record zone index
+        // record zone index
         zoneToPatchName[faceGroupZoneIDIter()] = curPatchName;
 
-        // Make patch labels
+        // make patch labels
         label faceLabel = faceGroupStartIndexIter() - 1;
 
         faceList patchFaces(faceGroupEndIndexIter() - faceLabel);
 
-        forAll (patchFaces, faceI)
+        forAll(patchFaces, faceI)
         {
             if
             (
@@ -1310,7 +1312,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        // Inlets and outlets
+        //inlets and outlets
         if
         (
             curPatchType == "pressure"
@@ -1375,7 +1377,7 @@ int main(int argc, char *argv[])
         else if
         (
             curPatchType == ""
-        ) // Unnamed face regions default to interior patches
+        ) //unnamed face regions default to interior patches
         {
             Info<< "Patch " << faceGroupZoneIDIter()
                 << ": Faces are defined but "
@@ -1391,7 +1393,7 @@ int main(int argc, char *argv[])
         }
         else //unknown face regions are not handled
         {
-            FatalErrorIn(args.executable())
+            FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
                 << "fluent patch type " << curPatchType << " not recognised."
                 << abort(FatalError);
         }
@@ -1436,25 +1438,12 @@ int main(int argc, char *argv[])
         label sz = bFaces.size();
         labelList meshFaces(sz,-1);
 
-
-        //make face set and write (seperate from rest for clarity)
-        //internal and external Fluent boundaries
+        // Search faces by point matching
+        forAll(bFaces, j)
         {
-            faceSet pFaceSet(pShapeMesh, patchNames[patchI], sz);
-
-            forAll (bFaces, j)
-            {
-                const face& f = bFaces[j];
-                label cMeshFace = findFace(pShapeMesh, f);
-                meshFaces[j] = cMeshFace;
-                pFaceSet.insert(cMeshFace);
-            }
-            if (writeSets)
-            {
-                Info<< "Writing patch " << patchNames[patchI]
-                    << " of size " << sz << " to faceSet." << endl;
-                pFaceSet.write();
-            }
+            const face& f = bFaces[j];
+            label cMeshFace = findFace(pShapeMesh, f);
+            meshFaces[j] = cMeshFace;
         }
 
 
@@ -1471,7 +1460,7 @@ int main(int argc, char *argv[])
          && !pShapeMesh.isInternalFace(meshFaces[0])
         )
         {
-            // First face is external and has valid non-internal type
+            //first face is external and has valid non-internal type
 
             //check all faces for externalness just to be sure
             //and mark patch number to global list
@@ -1488,7 +1477,7 @@ int main(int argc, char *argv[])
                         << exit(FatalError);
                 }
 
-                if(facePatchID[faceI - pShapeMesh.nInternalFaces()]!= -1)
+                if (facePatchID[faceI - pShapeMesh.nInternalFaces()]!= -1)
                 {
                     FatalErrorIn(args.executable())
                         << "Face " << faceI << " on new patch "
@@ -1501,7 +1490,7 @@ int main(int argc, char *argv[])
                 facePatchID[faceI - pShapeMesh.nInternalFaces()] = nBoundaries;
             }
 
-            // Add to boundary patch
+            //add to boundary patch
 
             Info<< "Adding new patch " << patchNames[patchI]
                 << " of type " << patchTypes[patchI]
@@ -1540,7 +1529,7 @@ int main(int argc, char *argv[])
         DynamicList<label> defaultBoundaryFaces(facePatchID.size());
         forAll(facePatchID, idI)
         {
-            if(facePatchID[idI] == -1)
+            if (facePatchID[idI] == -1)
             {
                 defaultBoundaryFaces.append(idI);
                 facePatchID[idI] = nBoundaries;
@@ -1548,7 +1537,7 @@ int main(int argc, char *argv[])
         }
         defaultBoundaryFaces.shrink();
 
-        if (defaultBoundaryFaces.size() != 0)
+        if (defaultBoundaryFaces.size())
         {
             Warning << " fluent mesh has " << defaultBoundaryFaces.size()
                     << " undefined boundary faces." << endl
@@ -1592,20 +1581,34 @@ int main(int argc, char *argv[])
     }
     repatcher.repatch();
 
-    preservePatchTypes
-    (
-        runTime,
-        runTime.constant(),
-        polyMesh::defaultRegion,
-        patchNames,
-        patchTypes,
-        defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
-    );
 
     // Set the precision of the points data to 10
-    IOstream::defaultPrecision(10);
+    IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
+
+
+    // Re-do face matching to write sets
+    if (writeSets)
+    {
+        forAll(patches, patchI)
+        {
+            const faceList& bFaces = patches[patchI];
+            label sz = bFaces.size();
+
+            faceSet pFaceSet(pShapeMesh, patchNames[patchI], sz);
+
+            forAll(bFaces, j)
+            {
+                const face& f = bFaces[j];
+                label cMeshFace = findFace(pShapeMesh, f);
+                pFaceSet.insert(cMeshFace);
+            }
+            Info<< "Writing patch " << patchNames[patchI]
+                << " of size " << sz << " to faceSet" << endl;
+
+            pFaceSet.instance() = pShapeMesh.instance();
+            pFaceSet.write();
+        }
+    }
 
 
     // Zones
@@ -1616,7 +1619,7 @@ int main(int argc, char *argv[])
     // interior boundaries are handled via faceSets
     // cell zones will only be written if there is more than one
 
-    if (writeZones && cellGroupZoneID.size()>1)
+    if (writeZones && cellGroupZoneID.size() > 1)
     {
         Info<< "Adding Zones" << endl;
         List<pointZone*> pz(0);
@@ -1640,7 +1643,7 @@ int main(int argc, char *argv[])
             boundaryZones[pI].append(bPatches[pI].name());
         }
 
-        label cnt = 0;
+        label cnt=0;
         SLList<label>::iterator cg = cellGroupZoneID.begin();
         SLList<label>::iterator start = cellGroupStartIndex.begin();
         SLList<label>::iterator end = cellGroupEndIndex.begin();
@@ -1659,11 +1662,11 @@ int main(int argc, char *argv[])
             // Mark zone cells, used for finding faces
             boolList zoneCell(pShapeMesh.nCells(), false);
 
-            // Shift cell indices by 1
-            label nr = 0;
+            // shift cell indices by 1
+            label nr=0;
             for (label celli = (start() - 1); celli < end(); celli++)
             {
-                cls[nr] = celli;
+                cls[nr]=celli;
                 zoneCell[celli] = true;
                 nr++;
             }
@@ -1681,9 +1684,9 @@ int main(int argc, char *argv[])
             {
                 label nei = pShapeMesh.faceNeighbour()[faceI];
                 label own = pShapeMesh.faceOwner()[faceI];
-                if(nei != -1)
+                if (nei != -1)
                 {
-                    if(zoneCell[nei] && zoneCell[own])
+                    if (zoneCell[nei] && zoneCell[own])
                     {
                         zoneFaces.append(faceI);
                     }
@@ -1706,7 +1709,7 @@ int main(int argc, char *argv[])
                 const labelList& faceCells = bPatches[pI].faceCells();
                 forAll(faceCells, fcI)
                 {
-                    if(zoneCell[faceCells[fcI] ])
+                    if (zoneCell[faceCells[fcI] ])
                     {
                         boundaryZones[pI].append(name);
                         break;
@@ -1731,7 +1734,7 @@ int main(int argc, char *argv[])
         );
 
         OFstream boundaryCellZonesFile(bczf);
-        forAll (boundaryZones, bzI)
+        forAll(boundaryZones, bzI)
         {
             forAll(boundaryZones[bzI], bzII)
             {
@@ -1760,7 +1763,7 @@ int main(int argc, char *argv[])
     // soon negating the need for double output
     if (writeSets)
     {
-        if (cellGroupZoneID.size() > 1 )
+        if (cellGroupZoneID.size() > 1)
         {
             Info<< "Writing cell sets" << endl;
 
@@ -1773,8 +1776,8 @@ int main(int argc, char *argv[])
 
             for (; cg != cellGroupZoneID.end(); ++cg, ++start, ++end)
             {
-                const word& name = patchNameIDs[cg()];
-                const word& type = patchTypeIDs[cg()];
+                const word& name=patchNameIDs[cg()];
+                const word& type=patchTypeIDs[cg()];
 
                 Info<< "Writing cell set: " << name
                     << " of type " << type << " starting at " << start() - 1
@@ -1783,7 +1786,7 @@ int main(int argc, char *argv[])
                 cellSet internal(pShapeMesh, name, end() - start());
 
                 // shift cell indizes by 1
-                for(label celli=start() - 1; celli<=end() - 1; celli++)
+                for (label celli = start() - 1; celli <= end() - 1; celli++)
                 {
                     internal.insert(celli);
                 }
@@ -1797,11 +1800,11 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< nl << "End" << endl;
+    Info<< "\nEnd\n" << endl;
     return 0;
 }
 
 
-/* --------------------------------------------------------------------------*\
+ /* ------------------------------------------------------------------------- *\
     ------ End of fluentMeshToFoam.L
-\* --------------------------------------------------------------------------*/
+ \* ------------------------------------------------------------------------- */
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 453a07dfe..4c7b72854 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -40,10 +40,12 @@ Description
 #include "scalarList.H"
 #include "IStringStream.H"
 
+// For EOF only
+#include <cstdio>
+
 using namespace Foam;
 
 #include "argList.H"
-#include "objectRegistry.H"
 #include "Time.H"
 #include "polyMesh.H"
 #include "emptyPolyPatch.H"
@@ -92,24 +94,14 @@ int yyFlexLexer::yywrap()
 one_space             [ \t\f\r]
 space                 {one_space}*
 some_space            {one_space}+
-cspace                ","{space}
 spaceNl               ({space}|\n)*
 
 alpha                 [_[:alpha:]]
 digit                 [[:digit:]]
-dec_digit             [[:digit:]]
-octal_digit           [0-7]
-hex_digit             [[:xdigit:]]
 
-lbrac                      "("
-rbrac                      ")"
-quote                      \"
-dash                       "-"
-dotColonDash               [.:-]
+dotColonDash          [.:-]
 
-identifier            {alpha}({alpha}|{digit})*
-integer               {dec_digit}+
-label                 [0-9]{dec_digit}*
+label                 [0-9]{digit}*
 zeroLabel             {digit}*
 
 word                  ({alpha}|{digit}|{dotColonDash})*
@@ -117,14 +109,14 @@ word                  ({alpha}|{digit}|{dotColonDash})*
 exponent_part         [eE][-+]?{digit}+
 fractional_constant   [-+]?(({digit}*"."{digit}+)|({digit}+"."?))
 
-double                ((({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))|0)
+floatNum              ((({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))|0)
+
+x                     {floatNum}
+y                     {floatNum}
+z                     {floatNum}
 
-x                     {double}
-y                     {double}
-z                     {double}
-scalar                {double}
 labelListElement      {space}{zeroLabel}
-scalarListElement     {space}{double}
+scalarListElement     {space}{floatNum}
 labelList             ({labelListElement}+{space})
 scalarList            ({scalarListElement}+{space})
 
@@ -230,7 +222,7 @@ mtype                 {space}"MTYPE:"{space}
 
 <readProgramID>{space}{word} {
 
-        Info << "Written by " << YYText() << " ";
+        Info<< "Written by " << YYText() << " ";
         BEGIN(controlInfo);
     }
 
@@ -242,20 +234,20 @@ mtype                 {space}"MTYPE:"{space}
 
 <readVersionID>{space}{versionNumber} {
 
-        Info << " version " << YYText() << endl;
+        Info<< " version " << YYText() << endl;
         BEGIN(controlInfo);
     }
 
 
 <controlInfo>{space}{dateDDMonYYYY}{space}{time} {
 
-        Info << "File written on " << YYText() << endl;
+        Info<< "File written on " << YYText() << endl;
     }
 
 
 <controlInfo>{space}{dateDDMMYYYY}{space}{time} {
 
-        Info << "File written on " << YYText() << endl;
+        Info<< "File written on " << YYText() << endl;
     }
 
 
@@ -301,7 +293,7 @@ mtype                 {space}"MTYPE:"{space}
 {nodalCoords}{spaceNl} {
 
         curNumberOfNodes = 0;
-        Info << "Reading nodal coordinates" << endl;
+        Info<< "Reading nodal coordinates" << endl;
         BEGIN(nodalCoords);
     }
 
@@ -329,7 +321,7 @@ mtype                 {space}"MTYPE:"{space}
 {cellsAndElements}{spaceNl} {
 
         curNumberOfCells = 0;
-        Info << "Reading cells" << endl;
+        Info<< "Reading cells" << endl;
         BEGIN(cellsAndElements);
     }
 
@@ -419,7 +411,7 @@ mtype                 {space}"MTYPE:"{space}
  /*             ------ Reading element group information ------               */
 
 {cellStreams}{spaceNl} {
-        Info << "Reading cell streams" << endl;
+        Info<< "Reading cell streams" << endl;
         BEGIN(cellStreams);
     }
 
@@ -441,7 +433,7 @@ mtype                 {space}"MTYPE:"{space}
         }
         else
         {
-            curGroupID = readLabel(groupStream);;
+            curGroupID = readLabel(groupStream);
         }
 
         BEGIN(cellStreams);
@@ -501,7 +493,7 @@ mtype                 {space}"MTYPE:"{space}
 
 
 <cellStreamFlags>{labelList} {
-        Info << "Reading cell stream labels" << endl;
+        Info<< "Reading cell stream labels" << endl;
         BEGIN(cellStreamLabels);
     }
 
@@ -526,7 +518,7 @@ mtype                 {space}"MTYPE:"{space}
 
 <cellStreamLabels>{endOfSection}\n {
 
-        Info << "Finished reading cell stream labels" << endl;
+        Info<< "Finished reading cell stream labels" << endl;
 
         // reset current group ID and a number of flags
         curGroupID = 0;
@@ -538,7 +530,7 @@ mtype                 {space}"MTYPE:"{space}
 
 {boundaryPatch}{spaceNl} {
         curPatchFace = 0;
-        Info << "Reading patches" << endl;
+        Info<< "Reading patches" << endl;
         BEGIN(boundaryPatchParams);
     }
 
@@ -580,7 +572,7 @@ mtype                 {space}"MTYPE:"{space}
         {
             scalarList patchFaceValues(nValuesForPatchFaces);
 
-            forAll (patchFaceValues, fI)
+            forAll(patchFaceValues, fI)
             {
                 patchFaceValues[fI] = readScalar(patchFacesStream);
             }
@@ -662,15 +654,15 @@ int main(int argc, char *argv[])
     }
 
     yyFlexLexer lexer(&gambitStream);
-    while(lexer.yylex() != 0)
+    while (lexer.yylex() != 0)
     {}
 
-    Info << "Finished lexing" << endl;
+    Info<< "Finished lexing" << endl;
 
     // make a point mapping array
     label maxPointIndex = 0;
 
-    forAll (pointMap, pointI)
+    forAll(pointMap, pointI)
     {
         if (pointMap[pointI] > maxPointIndex)
         {
@@ -681,7 +673,7 @@ int main(int argc, char *argv[])
 
     labelList pointLookup(maxPointIndex + 1, -1);
 
-    forAll (pointMap, pointI)
+    forAll(pointMap, pointI)
     {
         pointLookup[pointMap[pointI] ] = pointI;
     }
@@ -689,7 +681,7 @@ int main(int argc, char *argv[])
     // make a cell mapping array
     label maxCellIndex = 0;
 
-    forAll (cellMap, cellI)
+    forAll(cellMap, cellI)
     {
         if (cellMap[cellI] > maxCellIndex)
         {
@@ -699,7 +691,7 @@ int main(int argc, char *argv[])
 
     labelList cellLookup(maxCellIndex + 1);
 
-    forAll (cellMap, cellI)
+    forAll(cellMap, cellI)
     {
         cellLookup[cellMap[cellI] ] = cellI;
     }
@@ -716,7 +708,7 @@ int main(int argc, char *argv[])
 
     cellShapeList cells(cellLabels.size());
 
-    forAll (cellTypes, cellI)
+    forAll(cellTypes, cellI)
     {
         const labelList& curCellLabels = cellLabels[cellI];
 
@@ -795,7 +787,7 @@ int main(int argc, char *argv[])
         faceList& patchFaces = boundary[patchI];
         patchFaces.setSize(curCells.size());
 
-        forAll (curCells, faceI)
+        forAll(curCells, faceI)
         {
             patchFaces[faceI] =
                 cells[cellLookup[curCells[faceI] ] ].faces()
@@ -812,7 +804,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info << "gambitToFoam: " << endl
+    Info<< "gambitToFoam: " << endl
         << "Gambit file format does not provide information about the type of "
         << "the patch (eg. wall, symmetry plane, cyclic etc)." << endl
         << "All the patches have been created "
@@ -822,24 +814,32 @@ int main(int argc, char *argv[])
     // Scale points
     points *= scaleFactor;
 
-    wordList patchTypes(boundary.size(), polyPatch::typeName);
+    PtrList<dictionary> patchDicts(boundary.size());
     word defaultFacesName = "defaultFaces";
     word defaultFacesType = emptyPolyPatch::typeName;
-    wordList patchPhysicalTypes(boundary.size());
 
     preservePatchTypes
     (
         runTime,
         runTime.constant(),
-        polyMesh::defaultRegion,
+        polyMesh::meshSubDir,
         patchNames,
-        patchTypes,
+        patchDicts,
         defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
+        defaultFacesType
     );
 
-    // Mesh will auto-write on construction
+    // Add information to dictionary
+    forAll(patchNames, patchI)
+    {
+        if (!patchDicts.set(patchI))
+        {
+            patchDicts.set(patchI, new dictionary());
+        }
+        // Add but not overwrite
+        patchDicts[patchI].add("type", polyPatch::typeName, false);
+    }
+
     polyMesh pShapeMesh
     (
         IOobject
@@ -852,19 +852,18 @@ int main(int argc, char *argv[])
         cells,
         boundary,
         patchNames,
-        patchTypes,
+        patchDicts,
         defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
+        defaultFacesType
     );
 
     // Set the precision of the points data to 10
-    IOstream::defaultPrecision(10);
+    IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
 
-    Info << "Writing polyMesh" << endl;
+    Info<< "Writing polyMesh" << endl;
     pShapeMesh.write();
 
-    Info<< nl << "End" << endl;
+    Info<< "\nEnd\n" << endl;
     return 0;
 }
 
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index bae7faa7f..7280bd23c 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -30,7 +30,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "objectRegistry.H"
 #include "Time.H"
 #include "polyMesh.H"
 #include "IFstream.H"
@@ -43,11 +42,11 @@ Description
 #include "symmetryPolyPatch.H"
 #include "wedgePolyPatch.H"
 #include "cyclicPolyPatch.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 using namespace Foam;
 
-// Supported KIVA versions
+//- Supported KIVA versions
 enum kivaVersions
 {
     kiva3,
@@ -55,7 +54,6 @@ enum kivaVersions
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
 int main(int argc, char *argv[])
 {
@@ -93,7 +91,6 @@ int main(int argc, char *argv[])
                 << exit(FatalError);
 
             args.printUsage();
-
             FatalError.exit(1);
         }
     }
@@ -103,7 +100,7 @@ int main(int argc, char *argv[])
 
 #   include "readKivaGrid.H"
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 709f8b66c..04b36020e 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -20,7 +20,7 @@ pointField points(nPoints);
 label i4;
 labelList idface(nPoints), fv(nPoints);
 
-for(label i=0; i<nPoints; i++)
+for (label i=0; i<nPoints; i++)
 {
     scalar ffv;
     kivaFile
@@ -44,7 +44,7 @@ labelList i1tab(nPoints), i3tab(nPoints), i8tab(nPoints), idreg(nPoints),
 
 label nBfaces = 0;
 
-for(label i=0; i<nPoints; i++)
+for (label i=0; i<nPoints; i++)
 {
     label i1, i3, i8;
     scalar ff, fbcl, fbcf, fbcb;
@@ -85,7 +85,7 @@ if (mTable == 0)
 
 labelList imtab(nPoints), jmtab(nPoints), kmtab(nPoints);
 
-for(label i=0; i<nPoints; i++)
+for (label i=0; i<nPoints; i++)
 {
     label im, jm, km;
     kivaFile >> i4 >> im >> jm >> km;
@@ -109,13 +109,13 @@ label activeCells = 0;
 // Create and set the collocated point collapse map
 labelList pointMap(nPoints);
 
-forAll (pointMap, i)
+forAll(pointMap, i)
 {
     pointMap[i] = i;
 }
 
 // Initialise all cells to hex and search and set map for collocated points
-for(label i=0; i<nPoints; i++)
+for (label i=0; i<nPoints; i++)
 {
     if (f[i] > 0.0)
     {
@@ -132,7 +132,7 @@ for(label i=0; i<nPoints; i++)
 
         edgeList edges = cellShapes[activeCells].edges();
 
-        forAll (edges, ei)
+        forAll(edges, ei)
         {
             if (edges[ei].mag(points) < SMALL)
             {
@@ -167,11 +167,11 @@ cellZoning.setSize(activeCells);
 
 // Map collocated points to refer to the same point and collapse cell shape
 // to the corresponding hex-degenerate.
-forAll (cellShapes, celli)
+forAll(cellShapes, celli)
 {
     cellShape& cs = cellShapes[celli];
 
-    forAll (cs, i)
+    forAll(cs, i)
     {
         cs[i] = pointMap[cs[i]];
     }
@@ -237,7 +237,7 @@ List<SLList<face> > pFaces[nBCs];
 face quadFace(4);
 face triFace(3);
 
-for(label i=0; i<nPoints; i++)
+for (label i=0; i<nPoints; i++)
 {
     if (f[i] > 0)
     {
@@ -315,7 +315,7 @@ for(label i=0; i<nPoints; i++)
     }
 }
 
-// Tranfer liner faces that are above the minimum cylinder-head z height
+// Transfer liner faces that are above the minimum cylinder-head z height
 // into the cylinder-head region
 if
 (
@@ -327,16 +327,11 @@ if
 {
     scalar minz = GREAT;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
-        iter != pFaces[CYLINDERHEAD][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
     {
         const face& pf = iter();
 
-        forAll (pf, pfi)
+        forAll(pf, pfi)
         {
             minz = min(minz, points[pf[pfi]].z());
         }
@@ -346,17 +341,12 @@ if
 
     SLList<face> newLinerFaces;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[LINER][0].begin();
-        iter != pFaces[LINER][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[LINER][0], iter)
     {
         const face& pf = iter();
 
         scalar minfz = GREAT;
-        forAll (pf, pfi)
+        forAll(pf, pfi)
         {
             minfz = min(minfz, points[pf[pfi]].z());
         }
@@ -380,17 +370,12 @@ if
 
     SLList<face> newCylinderHeadFaces;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
-        iter != pFaces[CYLINDERHEAD][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
     {
         const face& pf = iter();
 
         scalar minfz = GREAT;
-        forAll (pf, pfi)
+        forAll(pf, pfi)
         {
             minfz = min(minfz, points[pf[pfi]].z());
         }
@@ -417,7 +402,7 @@ if
 label nPatches = 0;
 for (int bci=0; bci<nBCs; bci++)
 {
-    forAll (pFaces[bci], rgi)
+    forAll(pFaces[bci], rgi)
     {
         if (pFaces[bci][rgi].size())
         {
@@ -434,7 +419,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
     {
         // Distribute the points to be +/- 2.5deg from the x-z plane
 
-        scalar tanTheta = Foam::tan(2.5*mathematicalConstant::pi/180.0);
+        scalar tanTheta = Foam::tan(degToRad(2.5));
 
         SLList<face>::iterator iterf = pFaces[WEDGE][0].begin();
         SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
@@ -456,12 +441,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
     {
         pFaces[CYCLIC].setSize(1);
         pFaces[CYCLIC][0] = pFaces[WEDGE][0];
-        for
-        (
-            SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
-            iterb != pFaces[WEDGE][1].end();
-            ++iterb
-        )
+        forAllIter(SLList<face>, pFaces[WEDGE][1], iterb)
         {
             pFaces[CYCLIC][0].append(iterb());
         }
@@ -479,13 +459,12 @@ wordList patchNames(nPatches);
 wordList patchTypes(nPatches);
 word defaultFacesName = "defaultFaces";
 word defaultFacesType = emptyPolyPatch::typeName;
-wordList patchPhysicalTypes(nPatches);
 
 label nAddedPatches = 0;
 
 for (int bci=0; bci<nBCs; bci++)
 {
-    forAll (pFaces[bci], rgi)
+    forAll(pFaces[bci], rgi)
     {
         if (pFaces[bci][rgi].size())
         {
@@ -510,9 +489,9 @@ for (int bci=0; bci<nBCs; bci++)
 labelList pointLabels(nPoints, -1);
 
 // Scan cells for used points
-forAll (cellShapes, celli)
+forAll(cellShapes, celli)
 {
-    forAll (cellShapes[celli], i)
+    forAll(cellShapes[celli], i)
     {
         pointLabels[cellShapes[celli][i]] = 1;
     }
@@ -520,7 +499,7 @@ forAll (cellShapes, celli)
 
 // Create addressing for used points and pack points array
 label newPointi = 0;
-forAll (pointLabels, pointi)
+forAll(pointLabels, pointi)
 {
     if (pointLabels[pointi] != -1)
     {
@@ -531,41 +510,51 @@ forAll (pointLabels, pointi)
 points.setSize(newPointi);
 
 // Reset cell point labels
-forAll (cellShapes, celli)
+forAll(cellShapes, celli)
 {
     cellShape& cs = cellShapes[celli];
 
-    forAll (cs, i)
+    forAll(cs, i)
     {
         cs[i] = pointLabels[cs[i]];
     }
 }
 
 // Reset boundary-face point labels
-forAll (boundary, patchi)
+forAll(boundary, patchi)
 {
-    forAll (boundary[patchi], facei)
+    forAll(boundary[patchi], facei)
     {
         face& f = boundary[patchi][facei];
 
-        forAll (f, i)
+        forAll(f, i)
         {
             f[i] = pointLabels[f[i]];
         }
     }
 }
 
+PtrList<dictionary> patchDicts;
 preservePatchTypes
 (
     runTime,
     runTime.constant(),
-    polyMesh::defaultRegion,
+    polyMesh::meshSubDir,
     patchNames,
-    patchTypes,
+    patchDicts,
     defaultFacesName,
-    defaultFacesType,
-    patchPhysicalTypes
+    defaultFacesType
 );
+// Add information to dictionary
+forAll(patchNames, patchI)
+{
+    if (!patchDicts.set(patchI))
+    {
+        patchDicts.set(patchI, new dictionary());
+    }
+    // Add but not overwrite
+    patchDicts[patchI].add("type", patchTypes[patchI], false);
+}
 
 // Build the mesh and write it out
 polyMesh pShapeMesh
@@ -580,10 +569,9 @@ polyMesh pShapeMesh
     cellShapes,
     boundary,
     patchNames,
-    patchTypes,
+    patchDicts,
     defaultFacesName,
-    defaultFacesType,
-    patchPhysicalTypes
+    defaultFacesType
 );
 
 Info << "Writing polyMesh" << endl;
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
index c575176a2..ff696d5b8 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
@@ -230,17 +230,28 @@ void sammMesh::readBoundary()
 
     patchPhysicalTypes_.setSize(patchTypes_.size());
 
+    PtrList<dictionary> patchDicts;
+
     preservePatchTypes
     (
         runTime_,
         runTime_.constant(),
-        polyMesh::defaultRegion,
+        polyMesh::meshSubDir,
         patchNames_,
-        patchTypes_,
+        patchDicts,
         defaultFacesName_,
-        defaultFacesType_,
-        patchPhysicalTypes_
+        defaultFacesType_
     );
+
+    forAll(patchDicts, patchI)
+    {
+        if (patchDicts.set(patchI))
+        {
+            const dictionary& dict = patchDicts[patchI];
+            dict.readIfPresent("type", patchTypes_[patchI]);
+            dict.readIfPresent("physicalType", patchPhysicalTypes_[patchI]);
+        }
+    }
 }
 
 
diff --git a/applications/utilities/mesh/conversion/starToFoam/readBoundary.C b/applications/utilities/mesh/conversion/starToFoam/readBoundary.C
index 9809fb945..d4cee0cf7 100644
--- a/applications/utilities/mesh/conversion/starToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/starToFoam/readBoundary.C
@@ -228,17 +228,28 @@ void starMesh::readBoundary()
 
     patchPhysicalTypes_.setSize(patchTypes_.size());
 
+    PtrList<dictionary> patchDicts;
+
     preservePatchTypes
     (
         runTime_,
         runTime_.constant(),
-        polyMesh::defaultRegion,
+        polyMesh::meshSubDir,
         patchNames_,
-        patchTypes_,
+        patchDicts,
         defaultFacesName_,
-        defaultFacesType_,
-        patchPhysicalTypes_
+        defaultFacesType_
     );
+
+    forAll(patchDicts, patchI)
+    {
+        if (patchDicts.set(patchI))
+        {
+            const dictionary& dict = patchDicts[patchI];
+            dict.readIfPresent("type", patchTypes_[patchI]);
+            dict.readIfPresent("physicalType", patchPhysicalTypes_[patchI]);
+        }
+    }
 }
 
 
diff --git a/applications/utilities/mesh/generation/blockMesh/Make/files b/applications/utilities/mesh/generation/blockMesh/Make/files
index b9c3e1583..74840e973 100644
--- a/applications/utilities/mesh/generation/blockMesh/Make/files
+++ b/applications/utilities/mesh/generation/blockMesh/Make/files
@@ -1,31 +1,3 @@
-curvedEdges = curvedEdges
-
-$(curvedEdges)/curvedEdge.C
-$(curvedEdges)/lineEdge.C
-$(curvedEdges)/polyLine.C
-$(curvedEdges)/polyLineEdge.C
-$(curvedEdges)/arcEdge.C
-$(curvedEdges)/ellipseEdge.C
-$(curvedEdges)/BSpline.C
-$(curvedEdges)/lineDivide.C
-$(curvedEdges)/CatmullRomSpline.C
-$(curvedEdges)/splineEdge.C
-
-blockMesh.C
-blockDescriptor.C
-setEdge.C
-block.C
-createTopology.C
-checkBlockMesh.C
-createBlockOffsets.C
-createMergeList.C
-createPoints.C
-createCells.C
-createPatches.C
-blockPoints.C
-blockCells.C
-blockBoundary.C
-
 blockMeshApp.C
 
 EXE = $(FOAM_APPBIN)/blockMesh
diff --git a/applications/utilities/mesh/generation/blockMesh/Make/options b/applications/utilities/mesh/generation/blockMesh/Make/options
index 1234c9b9c..9b3f3d485 100644
--- a/applications/utilities/mesh/generation/blockMesh/Make/options
+++ b/applications/utilities/mesh/generation/blockMesh/Make/options
@@ -1,11 +1,9 @@
 EXE_INC = \
-    -I$(curvedEdges) \
+    -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude
 
 EXE_LIBS = \
+    -lblockMesh \
     -lmeshTools \
-    -lODE \
-    -lfiniteVolume \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/blockMesh/block.C b/applications/utilities/mesh/generation/blockMesh/block.C
deleted file mode 100644
index 45d4a7f6a..000000000
--- a/applications/utilities/mesh/generation/blockMesh/block.C
+++ /dev/null
@@ -1,113 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-#include "block.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-
-label block::vtxLabel(label a, label b, label c)
-{
-    return (a + b*(blockDef_.n().x() + 1)
-            + c*(blockDef_.n().x() + 1)*(blockDef_.n().y() + 1));
-}
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Construct from description
-block::block(const blockDescriptor& definition)
-:
-    blockDef_(definition),
-    vertices_
-    (
-        ((blockDef_.n().x() + 1)*(blockDef_.n().y() + 1)*(blockDef_.n().z() + 1))
-    ),
-    cells_
-    (
-        (blockDef_.n().x()*blockDef_.n().y()*blockDef_.n().z())
-    ),
-    boundaryPatches_(6)
-{
-    // create points
-    blockPoints();
-
-    // generate internal cells
-    blockCells();
-
-    // generate boundary patches
-    blockBoundary();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
-const blockDescriptor& block::blockDef() const
-{
-    return blockDef_;
-}
-
-const pointField& block::points() const
-{
-    return vertices_;
-}
-
-const labelListList& block::cells() const
-{
-    return cells_;
-}
-
-const labelListListList& block::boundaryPatches() const
-{
-    return boundaryPatches_;
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-Ostream& operator<<(Ostream& os, const block& b)
-{
-    os << b.vertices_ << nl
-       << b.cells_ << nl
-       << b.boundaryPatches_ << endl;
-
-    return os;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
-
diff --git a/applications/utilities/mesh/generation/blockMesh/blockBoundary.C b/applications/utilities/mesh/generation/blockMesh/blockBoundary.C
deleted file mode 100644
index cf816f8e2..000000000
--- a/applications/utilities/mesh/generation/blockMesh/blockBoundary.C
+++ /dev/null
@@ -1,208 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    private member of block. Creates boundary patches for the block
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-#include "block.H"
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::block::blockBoundary()
-{
-    label ni = blockDef_.n().x();
-    label nj = blockDef_.n().y();
-    label nk = blockDef_.n().z();
-
-    // x-direction
-
-    label wallLabel = 0;
-    label wallCellLabel = 0;
-
-    // x-min
-    boundaryPatches_[wallLabel].setSize(nj*nk);
-    for (label k = 0; k <= nk - 1; k++)
-    {
-        for (label j = 0; j <= nj - 1; j++)
-        {
-            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
-
-            // set the points
-            boundaryPatches_[wallLabel][wallCellLabel][0] =
-                vtxLabel(0, j, k);
-            boundaryPatches_[wallLabel][wallCellLabel][1] =
-                vtxLabel(0, j, k + 1);
-            boundaryPatches_[wallLabel][wallCellLabel][2] =
-                vtxLabel(0, j + 1, k + 1);
-            boundaryPatches_[wallLabel][wallCellLabel][3] =
-                vtxLabel(0, j + 1, k);
-
-            // update the counter
-            wallCellLabel++;
-        }
-    }
-
-    // x-max
-    wallLabel++;
-    wallCellLabel = 0;
-
-    boundaryPatches_[wallLabel].setSize(nj*nk);
-
-    for (label k = 0; k <= nk - 1; k++)
-    {
-        for (label j = 0; j <= nj - 1; j++)
-        {
-            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
-
-            // set the points
-            boundaryPatches_[wallLabel][wallCellLabel][0] =
-                vtxLabel(ni, j, k);
-            boundaryPatches_[wallLabel][wallCellLabel][1] =
-                vtxLabel(ni, j+1, k);
-            boundaryPatches_[wallLabel][wallCellLabel][2] =
-                vtxLabel(ni, j+1, k+1);
-            boundaryPatches_[wallLabel][wallCellLabel][3] =
-                vtxLabel(ni, j, k+1);
-
-            // update the counter
-            wallCellLabel++;
-        }
-    }
-
-    // y-direction
-
-    // y-min
-    wallLabel++;
-    wallCellLabel = 0;
-
-    boundaryPatches_[wallLabel].setSize(ni*nk);
-    for (label i = 0; i <= ni - 1; i++)
-    {
-        for (label k = 0; k <= nk - 1; k++)
-        {
-            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
-
-            // set the points
-            boundaryPatches_[wallLabel][wallCellLabel][0] =
-                vtxLabel(i, 0, k);
-            boundaryPatches_[wallLabel][wallCellLabel][1] =
-                vtxLabel(i + 1, 0, k);
-            boundaryPatches_[wallLabel][wallCellLabel][2] =
-                vtxLabel(i + 1, 0, k + 1);
-            boundaryPatches_[wallLabel][wallCellLabel][3] =
-                vtxLabel(i, 0, k + 1);
-
-            // update the counter
-            wallCellLabel++;
-        }
-    }
-
-    // y-max
-    wallLabel++;
-    wallCellLabel = 0;
-
-    boundaryPatches_[wallLabel].setSize(ni*nk);
-
-    for (label i = 0; i <= ni - 1; i++)
-    {
-        for (label k = 0; k <= nk - 1; k++)
-        {
-            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
-
-            // set the points
-            boundaryPatches_[wallLabel][wallCellLabel][0] =
-                vtxLabel(i, nj, k);
-            boundaryPatches_[wallLabel][wallCellLabel][1] =
-                vtxLabel(i, nj, k + 1);
-            boundaryPatches_[wallLabel][wallCellLabel][2] =
-                vtxLabel(i + 1, nj, k + 1);
-            boundaryPatches_[wallLabel][wallCellLabel][3] =
-                vtxLabel(i + 1, nj, k);
-
-            // update the counter
-            wallCellLabel++;
-        }
-    }
-
-    // z-direction
-
-    // z-min
-    wallLabel++;
-    wallCellLabel = 0;
-
-    boundaryPatches_[wallLabel].setSize(ni*nj);
-
-    for (label i = 0; i <= ni - 1; i++)
-    {
-        for (label j = 0; j <= nj - 1; j++)
-        {
-            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
-
-            // set the points
-            boundaryPatches_[wallLabel][wallCellLabel][0] =
-                vtxLabel(i, j, 0);
-            boundaryPatches_[wallLabel][wallCellLabel][1] =
-                vtxLabel(i, j + 1, 0);
-            boundaryPatches_[wallLabel][wallCellLabel][2] =
-                vtxLabel(i + 1, j + 1, 0);
-            boundaryPatches_[wallLabel][wallCellLabel][3] =
-                vtxLabel(i + 1, j, 0);
-
-            // update the counter
-            wallCellLabel++;
-        }
-    }
-
-    // z-max
-    wallLabel++;
-    wallCellLabel = 0;
-
-    boundaryPatches_[wallLabel].setSize(ni*nj);
-
-    for (label i = 0; i <= ni - 1; i++)
-    {
-        for (label j = 0; j <= nj - 1; j++)
-        {
-            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
-
-            // set the points
-            boundaryPatches_[wallLabel][wallCellLabel][0] =
-                vtxLabel(i, j, nk);
-            boundaryPatches_[wallLabel][wallCellLabel][1] =
-                vtxLabel(i + 1, j, nk);
-            boundaryPatches_[wallLabel][wallCellLabel][2] =
-                vtxLabel(i + 1, j + 1, nk);
-            boundaryPatches_[wallLabel][wallCellLabel][3] =
-                vtxLabel(i, j + 1, nk);
-
-            // update the counter
-            wallCellLabel++;
-        }
-    }
-}
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockCells.C b/applications/utilities/mesh/generation/blockMesh/blockCells.C
deleted file mode 100644
index f98944275..000000000
--- a/applications/utilities/mesh/generation/blockMesh/blockCells.C
+++ /dev/null
@@ -1,64 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    private member of block. Creates cells for the block.
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-#include "block.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::block::blockCells()
-{
-    label ni = blockDef_.n().x();
-    label nj = blockDef_.n().y();
-    label nk = blockDef_.n().z();
-
-    label cellNo = 0;
-
-    for (label k = 0; k <= nk - 1; k++)
-    {
-        for (label j = 0; j <= nj - 1; j++)
-        {
-            for (label i = 0; i <= ni - 1; i++)
-            {
-                cells_[cellNo].setSize(8);
-
-                cells_[cellNo][0] =  vtxLabel(i, j, k);
-                cells_[cellNo][1] =  vtxLabel(i+1, j, k);
-                cells_[cellNo][2] =  vtxLabel(i+1, j+1, k);
-                cells_[cellNo][3] =  vtxLabel(i, j+1, k);
-                cells_[cellNo][4] =  vtxLabel(i, j, k+1);
-                cells_[cellNo][5] =  vtxLabel(i+1, j, k+1);
-                cells_[cellNo][6] =  vtxLabel(i+1, j+1, k+1);
-                cells_[cellNo][7] =  vtxLabel(i, j+1, k+1);
-                cellNo++;
-            }
-        }
-    }
-}
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockDescriptor.C b/applications/utilities/mesh/generation/blockMesh/blockDescriptor.C
deleted file mode 100644
index d468b80e1..000000000
--- a/applications/utilities/mesh/generation/blockMesh/blockDescriptor.C
+++ /dev/null
@@ -1,247 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-
-#include "blockDescriptor.H"
-#include "scalarList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void blockDescriptor::makeBlockEdges()
-{
-    // for all edges check the list of curved edges. If the edge is curved,
-    // add it to the list. If the edge is not found, create is as a line
-
-    setEdge(0, 0, 1, n_.x());
-    setEdge(1, 3, 2, n_.x());
-    setEdge(2, 7, 6, n_.x());
-    setEdge(3, 4, 5, n_.x());
-
-    setEdge(4, 0, 3, n_.y());
-    setEdge(5, 1, 2, n_.y());
-    setEdge(6, 5, 6, n_.y());
-    setEdge(7, 4, 7, n_.y());
-
-    setEdge(8, 0, 4, n_.z());
-    setEdge(9, 1, 5, n_.z());
-    setEdge(10, 2, 6, n_.z());
-    setEdge(11, 3, 7, n_.z());
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// from components
-blockDescriptor::blockDescriptor
-(
-    const cellShape& bshape,
-    const pointField& blockMeshPoints,
-    const curvedEdgeList& edges,
-    const Vector<label>& n,
-    const scalarList& expand,
-    const word& zoneName
-)
-:
-    blockMeshPoints_(blockMeshPoints),
-    blockShape_(bshape),
-    curvedEdges_(edges),
-    edgePoints_(12),
-    edgeWeights_(12),
-    n_(n),
-    expand_(expand),
-    zoneName_(zoneName)
-{
-    if (expand_.size() != 12)
-    {
-        FatalErrorIn
-        (
-            "blockDescriptor::blockDescriptor"
-            "(const cellShape& bshape, const pointField& blockMeshPoints, "
-            "const curvedEdgeList& edges, label xnum, label ynum, label znum, "
-            "const scalarList& expand, const word& zoneName)"
-        )   << "Unknown definition of expansion ratios"
-            << exit(FatalError);
-    }
-
-    makeBlockEdges();
-}
-
-
-// from Istream
-blockDescriptor::blockDescriptor
-(
-    const pointField& blockMeshPoints,
-    const curvedEdgeList& edges,
-    Istream& is
-)
-:
-    blockMeshPoints_(blockMeshPoints),
-    blockShape_(is),
-    curvedEdges_(edges),
-    edgePoints_(12),
-    edgeWeights_(12),
-    n_(),
-    expand_(12),
-    zoneName_()
-{
-    // Look at first token
-    token t(is);
-    is.putBack(t);
-
-    // Optional zone name
-    if (t.isWord())
-    {
-        zoneName_ = t.wordToken();
-
-        // Consume zoneName token
-        is >> t;
-
-        // New look-ahead
-        is >> t;
-        is.putBack(t);
-    }
-
-    if (t.isPunctuation())
-    {
-        if (t.pToken() == token::BEGIN_LIST)
-        {
-            is >> n_;
-        }
-        else
-        {
-            FatalIOErrorIn
-            (
-                "blockDescriptor::blockDescriptor"
-                "(const pointField&, const curvedEdgeList&, Istream& is)",
-                is
-            )   << "incorrect token while reading n, expected '(', found "
-                << t.info()
-                << exit(FatalIOError);
-        }
-    }
-    else
-    {
-        is >> n_.x() >> n_.y() >> n_.z();
-    }
-
-    is >> t;
-    if (!t.isWord())
-    {
-        is.putBack(t);
-    }
-
-    scalarList expRatios(is);
-
-    if (expRatios.size() == 3)
-    {
-        expand_[0] = expRatios[0];
-        expand_[1] = expRatios[0];
-        expand_[2] = expRatios[0];
-        expand_[3] = expRatios[0];
-
-        expand_[4] = expRatios[1];
-        expand_[5] = expRatios[1];
-        expand_[6] = expRatios[1];
-        expand_[7] = expRatios[1];
-
-        expand_[8] = expRatios[2];
-        expand_[9] = expRatios[2];
-        expand_[10] = expRatios[2];
-        expand_[11] = expRatios[2];
-    }
-    else if (expRatios.size() == 12)
-    {
-        expand_ = expRatios;
-    }
-    else
-    {
-        FatalErrorIn
-        (
-            "blockDescriptor::blockDescriptor"
-            "(const pointField& blockMeshPoints, const curvedEdgeList& edges,"
-            "Istream& is)"
-        )   << "Unknown definition of expansion ratios"
-            << exit(FatalError);
-    }
-
-    // create a list of edges
-    makeBlockEdges();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-const pointField& blockDescriptor::points() const
-{
-    return blockMeshPoints_;
-}
-
-const cellShape& blockDescriptor::blockShape() const
-{
-    return blockShape_;
-}
-
-const List<List<point> >& blockDescriptor::blockEdgePoints() const
-{
-    return edgePoints_;
-}
-
-const scalarListList& blockDescriptor::blockEdgeWeights() const
-{
-    return edgeWeights_;
-}
-
-const Vector<label>& blockDescriptor::n() const
-{
-    return n_;
-}
-
-const word& blockDescriptor::zoneName() const
-{
-    return zoneName_;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-void blockDescriptor::operator=(const blockDescriptor&)
-{
-    notImplemented("void blockDescriptor::operator=(const blockDescriptor&)");
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockDescriptor.H b/applications/utilities/mesh/generation/blockMesh/blockDescriptor.H
deleted file mode 100644
index 02ca546c3..000000000
--- a/applications/utilities/mesh/generation/blockMesh/blockDescriptor.H
+++ /dev/null
@@ -1,167 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::blockDescriptor
-
-Description
-    block descriptor. Takes the description of the block and the list
-    of curved edges and creates a list of points on edges together
-    with the weighting factors
-
-SourceFiles
-    blockDescriptor.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef blockDescriptor_H
-#define blockDescriptor_H
-
-#include "scalar.H"
-#include "label.H"
-#include "point.H"
-#include "cellShape.H"
-#include "scalarList.H"
-#include "curvedEdgeList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class Istream;
-class Ostream;
-
-/*---------------------------------------------------------------------------*\
-                           Class blockDescriptor Declaration
-\*---------------------------------------------------------------------------*/
-
-class blockDescriptor
-{
-    // Private data
-
-        //- Block mesh points
-        const pointField& blockMeshPoints_;
-
-        //- block shape
-        cellShape blockShape_;
-
-        // reference to a list of curved edges
-        const curvedEdgeList& curvedEdges_;
-
-        // block edge points
-        List<List<point> > edgePoints_;
-
-        //- block edge weighting factors
-        scalarListList edgeWeights_;
-
-        //- number of point in each direction
-        Vector<label> n_;
-
-        //- expansion ratios in all directions
-        scalarList expand_;
-
-        //- name of the zone (empty string if none)
-        word zoneName_;
-
-    // Private member functions
-
-        void makeBlockEdges();
-
-        void setEdge(label edge, label start, label end, label dim);
-
-
-public:
-
-    // Constructors
-
-        //- Construct from components. Optional cellSet/zone name.
-        blockDescriptor
-        (
-            const cellShape&,
-            const pointField& blockMeshPoints,
-            const curvedEdgeList& edges,
-            const Vector<label>& n,
-            const scalarList& expand,
-            const word& zoneName = ""
-        );
-
-        //- Construct from Istream
-        blockDescriptor
-        (
-            const pointField& blockMeshPoints,
-            const curvedEdgeList& edges,
-            Istream& is
-        );
-
-        //- Clone
-        autoPtr<blockDescriptor> clone() const
-        {
-            notImplemented("blockDescriptor::clone()");
-            return autoPtr<blockDescriptor>(NULL);
-        }
-
-
-    // Member Functions
-
-        // Access
-
-        const pointField& points() const;
-
-        const cellShape& blockShape() const;
-
-        const List<List<point> >& blockEdgePoints() const;
-
-        const scalarListList& blockEdgeWeights() const;
-
-        const Vector<label>& n() const;
-
-        const word& zoneName() const;
-
-    // Member Operators
-
-        void operator=(const blockDescriptor&);
-
-
-    // IOstream Operators
-
-        friend Ostream& operator<<(Ostream&, const blockDescriptor&);
-};
-
-
-inline Istream& operator>>(Istream& is, blockDescriptor*)
-{
-    notImplemented("Istream& operator>>(Istream& is, blockDescriptor*)");
-    return is;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
deleted file mode 100644
index 0a04b9b85..000000000
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ /dev/null
@@ -1,151 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    blockMesh
-
-Description
-    Mesh generator
-
-\*---------------------------------------------------------------------------*/
-
-#include "blockMesh.H"
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Construct from IOdictionary
-Foam::blockMesh::blockMesh(IOdictionary& meshDescription)
-:
-    topologyPtr_(createTopology(meshDescription)),
-    blockOffsets_(createBlockOffsets()),
-    mergeList_(createMergeList()),
-    points_(createPoints(meshDescription)),
-    cells_(createCells()),
-    patches_(createPatches())
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::blockMesh::~blockMesh()
-{
-    delete topologyPtr_;
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-const Foam::polyMesh& Foam::blockMesh::topology() const
-{
-    if (!topologyPtr_)
-    {
-        FatalErrorIn("blockMesh::topology() const")
-            << "topologyPtr_ not allocated"
-            << exit(FatalError);
-    }
-
-    return *topologyPtr_;
-}
-
-
-Foam::wordList Foam::blockMesh::patchNames() const
-{
-    const polyPatchList& patchTopologies = topology().boundaryMesh();
-    wordList names(patchTopologies.size());
-
-    forAll (names, patchI)
-    {
-        names[patchI] = patchTopologies[patchI].name();
-    }
-
-    return names;
-}
-
-
-Foam::wordList Foam::blockMesh::patchTypes() const
-{
-    const polyPatchList& patchTopologies = topology().boundaryMesh();
-    wordList types(patchTopologies.size());
-
-    forAll (types, patchI)
-    {
-        types[patchI] = patchTopologies[patchI].type();
-    }
-
-    return types;
-}
-
-
-Foam::wordList Foam::blockMesh::patchPhysicalTypes() const
-{
-    const polyPatchList& patchTopologies = topology().boundaryMesh();
-    wordList physicalTypes(patchTopologies.size());
-
-    forAll (physicalTypes, patchI)
-    {
-        physicalTypes[patchI] = patchTopologies[patchI].physicalType();
-    }
-
-    return physicalTypes;
-}
-
-
-Foam::label Foam::blockMesh::numZonedBlocks() const
-{
-    label num = 0;
-
-    forAll(*this, blockI)
-    {
-        if (operator[](blockI).blockDef().zoneName().size())
-        {
-            num++;
-        }
-    }
-
-    return num;
-}
-
-
-void Foam::blockMesh::writeTopology(Ostream& os) const
-{
-    const pointField& pts = topology().points();
-
-    forAll(pts, pI)
-    {
-        const point& pt = pts[pI];
-
-        os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
-    }
-
-    const edgeList& edges = topology().edges();
-
-    forAll(edges, eI)
-    {
-        const edge& e = edges[eI];
-
-        os << "l " << e.start() + 1 << ' ' << e.end() + 1 << endl;
-    }
-}
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.H b/applications/utilities/mesh/generation/blockMesh/blockMesh.H
deleted file mode 100644
index 005110222..000000000
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.H
+++ /dev/null
@@ -1,169 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::blockMesh
-
-Description
-
-SourceFiles
-    blockMesh.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef blockMesh_H
-#define blockMesh_H
-
-#include "blockList.H"
-#include "polyMesh.H"
-#include "IOdictionary.H"
-#include "curvedEdgeList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class blockMesh Declaration
-\*---------------------------------------------------------------------------*/
-
-class blockMesh
-:
-    public blockList
-{
-    // Private data
-
-        label nPoints_;
-        label nCells_;
-
-        curvedEdgeList edges_;
-
-        polyMesh* topologyPtr_;
-
-        labelList blockOffsets_;
-        labelList mergeList_;
-
-        pointField points_;
-        cellShapeList cells_;
-        faceListList patches_;
-
-
-    // Private Member Functions
-
-        bool blockLabelsOK
-        (
-            const label blockLabel,
-            const pointField& points,
-            const cellShape& blockShape
-        );
-
-        bool patchLabelsOK
-        (
-            const label patchLabel,
-            const pointField& points,
-            const faceList& patchShapes
-        );
-
-        polyMesh* createTopology(IOdictionary&);
-        void checkBlockMesh(const polyMesh&);
-
-        labelList createBlockOffsets();
-        labelList createMergeList();
-
-        pointField createPoints(const dictionary&);
-        cellShapeList createCells();
-
-        faceList createPatchFaces(const polyPatch& patchTopologyFaces);
-        faceListList createPatches();
-
-        //- as copy (not implemented)
-        blockMesh(const blockMesh&);
-
-
-public:
-
-    // Constructors
-
-        //- Construct from IOdictionary
-        blockMesh(IOdictionary&);
-
-
-    // Destructor
-
-        ~blockMesh();
-
-
-    // Member Functions
-
-        // Access
-
-            const polyMesh& topology() const;
-
-            const curvedEdgeList& edges() const
-            {
-                return edges_;
-            }
-
-            const pointField& points() const
-            {
-                return points_;
-            }
-
-            const cellShapeList& cells() const
-            {
-                return cells_;
-            }
-
-            const faceListList& patches() const
-            {
-                return patches_;
-            }
-
-            wordList patchNames() const;
-
-            wordList patchTypes() const;
-
-            wordList patchPhysicalTypes() const;
-
-            //- Number of blocks with specified zones
-            label numZonedBlocks() const;
-
-
-        // Write
-
-            //- Writes edges of blockMesh in OBJ format.
-            void writeTopology(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
-
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index be18f0da5..6aa8d474b 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
     blockMesh
@@ -28,25 +28,24 @@ Description
     A multi-block mesh generator.
 
     Uses the block mesh description found in
-    @a constant/polyMesh/blockMeshDict
-    (or @a constant/\<region\>/polyMesh/blockMeshDict).
+    \a constant/polyMesh/blockMeshDict
+    (or \a constant/\<region\>/polyMesh/blockMeshDict).
 
 Usage
 
     - blockMesh [OPTION]
 
-    @param -blockTopology \n
+    \param -blockTopology \n
     Write the topology as a set of edges in OBJ format.
 
-    @param -region \<name\> \n
+    \param -region \<name\> \n
     Specify an alternative mesh region.
 
-    @param -dict \<dictionary\> \n
-    Specify an alternative dictionary for the block mesh description.
+    \param -dict \<filename\> \n
+    Specify alternative dictionary for the block mesh description.
 
 \*---------------------------------------------------------------------------*/
 
-#include "objectRegistry.H"
 #include "Time.H"
 #include "IOdictionary.H"
 #include "IOPtrList.H"
@@ -150,8 +149,10 @@ int main(int argc, char *argv[])
     Info<< nl << "Creating block mesh from\n    "
         << meshDictIoPtr->objectPath() << nl << endl;
 
+    blockMesh::verbose(true);
+
     IOdictionary meshDict(meshDictIoPtr());
-    blockMesh blocks(meshDict);
+    blockMesh blocks(meshDict, regionName);
 
 
     if (args.optionFound("blockTopology"))
@@ -196,27 +197,10 @@ int main(int argc, char *argv[])
     }
 
 
+    Info<< nl << "Creating polyMesh from blockMesh" << endl;
 
-    Info<< nl << "Creating mesh from block mesh" << endl;
-
-    wordList patchNames = blocks.patchNames();
-    wordList patchTypes = blocks.patchTypes();
     word defaultFacesName = "defaultFaces";
     word defaultFacesType = emptyPolyPatch::typeName;
-    wordList patchPhysicalTypes = blocks.patchPhysicalTypes();
-
-    preservePatchTypes
-    (
-        runTime,
-        runTime.constant(),
-        polyMeshDir,
-        patchNames,
-        patchTypes,
-        defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
-    );
-
     polyMesh mesh
     (
         IOobject
@@ -225,14 +209,13 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferCopy(blocks.points()),
+        xferCopy(blocks.points()),           // could we re-use space?
         blocks.cells(),
         blocks.patches(),
-        patchNames,
-        patchTypes,
+        blocks.patchNames(),
+        blocks.patchDicts(),
         defaultFacesName,
-        defaultFacesType,
-        patchPhysicalTypes
+        defaultFacesType
     );
 
 
@@ -244,157 +227,11 @@ int main(int argc, char *argv[])
             meshDict.lookup("mergePatchPairs")
         );
 
-        if (mergePatchPairs.size() > 0)
-        {
-            // Create and add point and face zones and mesh modifiers
-            List<pointZone*> pz(mergePatchPairs.size());
-            List<faceZone*> fz(3*mergePatchPairs.size());
-            List<cellZone*> cz(0);
-
-            forAll (mergePatchPairs, pairI)
-            {
-                const word mergeName
-                (
-                    mergePatchPairs[pairI].first()
-                  + mergePatchPairs[pairI].second()
-                  + name(pairI)
-                );
-
-                pz[pairI] = new pointZone
-                (
-                    mergeName + "CutPointZone",
-                    labelList(0),
-                    0,
-                    mesh.pointZones()
-                );
-
-                // Master patch
-                const word masterPatchName(mergePatchPairs[pairI].first());
-                const polyPatch& masterPatch =
-                    mesh.boundaryMesh()
-                    [
-                        mesh.boundaryMesh().findPatchID(masterPatchName)
-                    ];
-
-                labelList isf(masterPatch.size());
-
-                forAll (isf, i)
-                {
-                    isf[i] = masterPatch.start() + i;
-                }
-
-                fz[3*pairI] = new faceZone
-                (
-                    mergeName + "MasterZone",
-                    isf,
-                    boolList(masterPatch.size(), false),
-                    0,
-                    mesh.faceZones()
-                );
-
-                // Slave patch
-                const word slavePatchName(mergePatchPairs[pairI].second());
-                const polyPatch& slavePatch =
-                    mesh.boundaryMesh()
-                    [
-                        mesh.boundaryMesh().findPatchID(slavePatchName)
-                    ];
-
-                labelList osf(slavePatch.size());
-
-                forAll (osf, i)
-                {
-                    osf[i] = slavePatch.start() + i;
-                }
-
-                fz[3*pairI + 1] = new faceZone
-                (
-                    mergeName + "SlaveZone",
-                    osf,
-                    boolList(slavePatch.size(), false),
-                    1,
-                    mesh.faceZones()
-                );
-
-                // Add empty zone for cut faces
-                fz[3*pairI + 2] = new faceZone
-                (
-                    mergeName + "CutFaceZone",
-                    labelList(0),
-                    boolList(0, false),
-                    2,
-                    mesh.faceZones()
-                );
-            }  // end of all merge pairs
-
-            Info << "Adding point and face zones" << endl;
-            mesh.addZones(pz, fz, cz);
-
-
-            Info << "Creating topo change" << endl;
-            polyTopoChanger attacher(mesh);
-            attacher.setSize(mergePatchPairs.size());
-
-            forAll (mergePatchPairs, pairI)
-            {
-                const word mergeName
-                (
-                    mergePatchPairs[pairI].first()
-                  + mergePatchPairs[pairI].second()
-                  + name(pairI)
-                );
-
-                // Add the sliding interface mesh modifier
-                attacher.set
-                (
-                    pairI,
-                    new slidingInterface
-                    (
-                        "couple" + name(pairI),
-                        pairI,
-                        attacher,
-                        mergeName + "MasterZone",
-                        mergeName + "SlaveZone",
-                        mergeName + "CutPointZone",
-                        mergeName + "CutFaceZone",
-                        mergePatchPairs[pairI].first(),
-                        mergePatchPairs[pairI].second(),
-                        slidingInterface::INTEGRAL,     // always integral
-                        false,                          // attach-detach action
-                        intersection::VISIBLE
-                    )
-                );
-            }
-
-            attacher.changeMesh();
-
-            // Clean the mesh after attach
-            labelList patchSizes(mesh.boundaryMesh().size());
-            labelList patchStarts(mesh.boundaryMesh().size());
-
-            forAll (mesh.boundaryMesh(), patchI)
-            {
-                patchSizes[patchI] = mesh.boundaryMesh()[patchI].size();
-                patchStarts[patchI] = mesh.boundaryMesh()[patchI].start();
-            }
-
-            mesh.resetPrimitives
-            (
-                xferCopy<pointField>(mesh.points()),
-                xferCopy<faceList>(mesh.faces()),
-                xferCopy<labelList>(mesh.faceOwner()),
-                xferCopy<labelList>(mesh.faceNeighbour()),
-                patchSizes,
-                patchStarts
-            );
-
-            mesh.setInstance(runTime.constant());
-            mesh.removeZones();
-        }
+#       include "mergePatchPairs.H"
     }
     else
     {
-        Info<< nl << "There are no merge patch pairs" << endl;
+        Info<< nl << "There are no merge patch pairs edges" << endl;
     }
 
 
@@ -464,7 +301,7 @@ int main(int argc, char *argv[])
         {
             label zoneI = iter();
 
-            cz[zoneI]= new cellZone
+            cz[zoneI] = new cellZone
             (
                 iter.key(),
                 zoneCells[zoneI].shrink(),
@@ -489,9 +326,9 @@ int main(int argc, char *argv[])
     }
 
     // Set the precision of the points data to 10
-    IOstream::defaultPrecision(10);
+    IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
 
-    Info << nl << "Writing polyMesh" << endl;
+    Info<< nl << "Writing polyMesh" << endl;
     mesh.removeFiles();
     if (!mesh.write())
     {
@@ -500,7 +337,39 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    Info<< nl << "End" << endl;
+
+    //
+    // write some information
+    //
+    {
+        const polyPatchList& patches = mesh.boundaryMesh();
+
+        Info<< "----------------" << nl
+            << "Mesh Information" << nl
+            << "----------------" << nl
+            << "  " << "boundingBox: " << boundBox(mesh.points()) << nl
+            << "  " << "nPoints: " << mesh.nPoints() << nl
+            << "  " << "nCells: " << mesh.nCells() << nl
+            << "  " << "nFaces: " << mesh.nFaces() << nl
+            << "  " << "nInternalFaces: " << mesh.nInternalFaces() << nl;
+
+        Info<< "----------------" << nl
+            << "Patches" << nl
+            << "----------------" << nl;
+
+        forAll(patches, patchI)
+        {
+            const polyPatch& p = patches[patchI];
+
+            Info<< "  " << "patch " << patchI
+                << " (start: " << p.start()
+                << " size: " << p.size()
+                << ") name: " << p.name()
+                << nl;
+        }
+    }
+
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/generation/blockMesh/blockPoints.C b/applications/utilities/mesh/generation/blockMesh/blockPoints.C
deleted file mode 100644
index 9a4d762e3..000000000
--- a/applications/utilities/mesh/generation/blockMesh/blockPoints.C
+++ /dev/null
@@ -1,231 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    private member of block. Creates vertices for cells filling the block.
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-#include "block.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::block::blockPoints()
-{
-    // set local variables for mesh specification
-    const label ni = blockDef_.n().x();
-    const label nj = blockDef_.n().y();
-    const label nk = blockDef_.n().z();
-
-    const point p000 = blockDef_.points()[blockDef_.blockShape()[0]];
-    const point p100 = blockDef_.points()[blockDef_.blockShape()[1]];
-    const point p110 = blockDef_.points()[blockDef_.blockShape()[2]];
-    const point p010 = blockDef_.points()[blockDef_.blockShape()[3]];
-
-    const point p001 = blockDef_.points()[blockDef_.blockShape()[4]];
-    const point p101 = blockDef_.points()[blockDef_.blockShape()[5]];
-    const point p111 = blockDef_.points()[blockDef_.blockShape()[6]];
-    const point p011 = blockDef_.points()[blockDef_.blockShape()[7]];
-
-    // list of edge point and weighting factors
-    const List<List<point> >& p = blockDef_.blockEdgePoints();
-    const scalarListList& w = blockDef_.blockEdgeWeights();
-
-    // generate vertices
-
-    for (label k = 0; k <= nk; k++)
-    {
-        for (label j = 0; j <= nj; j++)
-        {
-            for (label i = 0; i <= ni; i++)
-            {
-                label vertexNo = vtxLabel(i, j, k);
-
-                // points on edges
-                vector edgex1 = p000 + (p100 - p000)*w[0][i];
-                vector edgex2 = p010 + (p110 - p010)*w[1][i];
-                vector edgex3 = p011 + (p111 - p011)*w[2][i];
-                vector edgex4 = p001 + (p101 - p001)*w[3][i];
-
-                vector edgey1 = p000 + (p010 - p000)*w[4][j];
-                vector edgey2 = p100 + (p110 - p100)*w[5][j];
-                vector edgey3 = p101 + (p111 - p101)*w[6][j];
-                vector edgey4 = p001 + (p011 - p001)*w[7][j];
-
-                vector edgez1 = p000 + (p001 - p000)*w[8][k];
-                vector edgez2 = p100 + (p101 - p100)*w[9][k];
-                vector edgez3 = p110 + (p111 - p110)*w[10][k];
-                vector edgez4 = p010 + (p011 - p010)*w[11][k];
-
-                // calculate the importance factors for all edges
-                // x - direction
-                scalar impx1 =
-                (
-                    (1.0 - w[0][i])*(1.0 - w[4][j])*(1.0 - w[8][k])
-                  + w[0][i]*(1.0 - w[5][j])*(1.0 - w[9][k])
-                );
-
-                scalar impx2 =
-                (
-                    (1.0 - w[1][i])*w[4][j]*(1.0 - w[11][k])
-                  + w[1][i]*w[5][j]*(1.0 - w[10][k])
-                );
-
-                scalar impx3 =
-                (
-                     (1.0 - w[2][i])*w[7][j]*w[11][k]
-                   + w[2][i]*w[6][j]*w[10][k]
-                );
-
-
-                scalar impx4 =
-                (
-                    (1.0 - w[3][i])*(1.0 - w[7][j])*w[8][k]
-                  + w[3][i]*(1.0 - w[6][j])*w[9][k]
-                );
-
-                scalar magImpx = impx1 + impx2 + impx3 + impx4;
-                impx1 /= magImpx;
-                impx2 /= magImpx;
-                impx3 /= magImpx;
-                impx4 /= magImpx;
-
-
-                // y - direction
-                scalar impy1 =
-                (
-                    (1.0 - w[4][j])*(1.0 - w[0][i])*(1.0 - w[8][k])
-                  + w[4][j]*(1.0 - w[1][i])*(1.0 - w[11][k])
-                );
-
-                scalar impy2 =
-                (
-                    (1.0 - w[5][j])*w[0][i]*(1.0 - w[9][k])
-                  + w[5][j]*w[1][i]*(1.0 - w[10][k])
-                );
-
-                scalar impy3 =
-                (
-                    (1.0 - w[6][j])*w[3][i]*w[9][k]
-                  + w[6][j]*w[2][i]*w[10][k]
-                );
-
-                scalar impy4 =
-                (
-                    (1.0 - w[7][j])*(1.0 - w[3][i])*w[8][k]
-                  + w[7][j]*(1.0 - w[2][i])*w[11][k]
-                );
-
-                scalar magImpy = impy1 + impy2 + impy3 + impy4;
-                impy1 /= magImpy;
-                impy2 /= magImpy;
-                impy3 /= magImpy;
-                impy4 /= magImpy;
-
-
-                // z - direction
-                scalar impz1 =
-                (
-                    (1.0 - w[8][k])*(1.0 - w[0][i])*(1.0 - w[4][j])
-                  + w[8][k]*(1.0 - w[3][i])*(1.0 - w[7][j])
-                );
-
-                scalar impz2 =
-                (
-                    (1.0 - w[9][k])*w[0][i]*(1.0 - w[5][j])
-                  + w[9][k]*w[3][i]*(1.0 - w[6][j])
-                );
-
-                scalar impz3 =
-                (
-                    (1.0 - w[10][k])*w[1][i]*w[5][j]
-                  + w[10][k]*w[2][i]*w[6][j]
-                );
-
-                scalar impz4 =
-                (
-                    (1.0 - w[11][k])*(1.0 - w[1][i])*w[4][j]
-                  + w[11][k]*(1.0 - w[2][i])*w[7][j]
-                );
-
-                scalar magImpz = impz1 + impz2 + impz3 + impz4;
-                impz1 /= magImpz;
-                impz2 /= magImpz;
-                impz3 /= magImpz;
-                impz4 /= magImpz;
-
-                // calculate the correction vectors
-                vector corx1 = impx1*(p[0][i] - edgex1);
-                vector corx2 = impx2*(p[1][i] - edgex2);
-                vector corx3 = impx3*(p[2][i] - edgex3);
-                vector corx4 = impx4*(p[3][i] - edgex4);
-
-                vector cory1 = impy1*(p[4][j] - edgey1);
-                vector cory2 = impy2*(p[5][j] - edgey2);
-                vector cory3 = impy3*(p[6][j] - edgey3);
-                vector cory4 = impy4*(p[7][j] - edgey4);
-
-                vector corz1 = impz1*(p[8][k] - edgez1);
-                vector corz2 = impz2*(p[9][k] - edgez2);
-                vector corz3 = impz3*(p[10][k] - edgez3);
-                vector corz4 = impz4*(p[11][k] - edgez4);
-
-
-                // multiply by the importance factor
-
-                // x - direction
-                edgex1 *= impx1;
-                edgex2 *= impx2;
-                edgex3 *= impx3;
-                edgex4 *= impx4;
-
-                // y - direction
-                edgey1 *= impy1;
-                edgey2 *= impy2;
-                edgey3 *= impy3;
-                edgey4 *= impy4;
-
-                // z - direction
-                edgez1 *= impz1;
-                edgez2 *= impz2;
-                edgez3 *= impz3;
-                edgez4 *= impz4;
-
-
-                // add the contributions
-                vertices_[vertexNo] = edgex1 + edgex2 + edgex3 + edgex4;
-                vertices_[vertexNo] += edgey1 + edgey2 + edgey3 + edgey4;
-                vertices_[vertexNo] += edgez1 + edgez2 + edgez3 + edgez4;
-
-                vertices_[vertexNo] /= 3.0;
-
-                vertices_[vertexNo] += corx1 + corx2 + corx3 + corx4;
-                vertices_[vertexNo] += cory1 + cory2 + cory3 + cory4;
-                vertices_[vertexNo] += corz1 + corz2 + corz3 + corz4;
-            }
-        }
-    }
-}
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/checkBlockMesh.C b/applications/utilities/mesh/generation/blockMesh/checkBlockMesh.C
deleted file mode 100644
index b1be1cf1e..000000000
--- a/applications/utilities/mesh/generation/blockMesh/checkBlockMesh.C
+++ /dev/null
@@ -1,144 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "blockMesh.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-// Check the blockMesh topology
-void Foam::blockMesh::checkBlockMesh(const polyMesh& bm)
-{
-    Info<< nl << "Check block mesh topology" << endl;
-
-    bool blockMeshOK = true;
-
-    const pointField& points = bm.points();
-    const faceList& faces = bm.faces();
-    const cellList& cells = bm.cells();
-    const polyPatchList& patches = bm.boundaryMesh();
-
-    label nBoundaryFaces=0;
-    forAll(cells, celli)
-    {
-        nBoundaryFaces += cells[celli].nFaces();
-    }
-
-    nBoundaryFaces -= 2*bm.nInternalFaces();
-
-    label nDefinedBoundaryFaces=0;
-    forAll(patches, patchi)
-    {
-        nDefinedBoundaryFaces += patches[patchi].size();
-    }
-
-
-    Info<< nl << tab << "Basic statistics" << endl;
-
-    Info<< tab << tab << "Number of internal faces : "
-        << bm.nInternalFaces() << endl;
-
-    Info<< tab << tab << "Number of boundary faces : "
-        << nBoundaryFaces << endl;
-
-    Info<< tab << tab << "Number of defined boundary faces : "
-        << nDefinedBoundaryFaces << endl;
-
-    Info<< tab << tab << "Number of undefined boundary faces : "
-        << nBoundaryFaces - nDefinedBoundaryFaces << endl;
-
-    if ((nBoundaryFaces - nDefinedBoundaryFaces) > 0)
-    {
-        Info<< tab << tab << tab
-            << "(Warning : only leave undefined the front and back planes "
-            << "of 2D planar geometries!)" << endl;
-    }
-
-    Info<< nl << tab << "Checking patch -> block consistency" << endl;
-
-
-    forAll(patches, patchi)
-    {
-        const faceList& Patch = patches[patchi];
-
-        forAll(Patch, patchFacei)
-        {
-            const face& patchFace = Patch[patchFacei];
-            bool patchFaceOK = false;
-
-            forAll(cells, celli)
-            {
-                const labelList& cellFaces = cells[celli];
-
-                forAll(cellFaces, cellFacei)
-                {
-                    if (patchFace == faces[cellFaces[cellFacei]])
-                    {
-                        patchFaceOK = true;
-
-                        if
-                        (
-                            (
-                                patchFace.normal(points)
-                              & faces[cellFaces[cellFacei]].normal(points)
-                            ) < 0.0
-                        )
-                        {
-                            Info<< tab << tab
-                                << "Face " << patchFacei
-                                << " of patch " << patchi
-                                << " (" << patches[patchi].name() << ")"
-                                << " points inwards"
-                                << endl;
-
-                            blockMeshOK = false;
-                        }
-                    }
-                }
-            }
-
-            if (!patchFaceOK)
-            {
-                Info<< tab << tab
-                    << "Face " << patchFacei
-                    << " of patch " << patchi
-                    << " (" << patches[patchi].name() << ")"
-                    << " does not match any block faces" << endl;
-
-                blockMeshOK = false;
-            }
-        }
-    }
-
-    if (!blockMeshOK)
-    {
-        FatalErrorIn("blockMesh::checkBlockMesh(const polyMesh& bm)")
-            << "Block mesh topology incorrect, stopping mesh generation!"
-            << exit(FatalError);
-    }
-}
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/createCells.C b/applications/utilities/mesh/generation/blockMesh/createCells.C
deleted file mode 100644
index 462d6300f..000000000
--- a/applications/utilities/mesh/generation/blockMesh/createCells.C
+++ /dev/null
@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-
-#include "blockMesh.H"
-#include "cellModeller.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::cellShapeList Foam::blockMesh::createCells()
-{
-    Info<< nl << "Creating cells" << endl;
-
-    PtrList<cellShape> cells(nCells_);
-
-    blockMesh& blocks = *this;
-
-    const cellModel& hex = *(cellModeller::lookup("hex"));
-
-    label cellLabel = 0;
-
-    forAll(blocks, blockLabel)
-    {
-        const labelListList& blockCells = blocks[blockLabel].cells();
-
-        forAll(blockCells, blockCellLabel)
-        {
-            labelList cellPoints(blockCells[blockCellLabel].size());
-
-            forAll(cellPoints, cellPointLabel)
-            {
-                cellPoints[cellPointLabel] =
-                    mergeList_
-                    [
-                        blockCells[blockCellLabel][cellPointLabel]
-                      + blockOffsets_[blockLabel]
-                    ];
-            }
-
-            // Construct collapsed cell and all to list
-            cells.set(cellLabel, new cellShape(hex, cellPoints, true));
-
-            cellLabel++;
-        }
-    }
-
-    return cells;
-}
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/createPatches.C b/applications/utilities/mesh/generation/blockMesh/createPatches.C
deleted file mode 100644
index e9bd0c7d8..000000000
--- a/applications/utilities/mesh/generation/blockMesh/createPatches.C
+++ /dev/null
@@ -1,170 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-
-
-\*---------------------------------------------------------------------------*/
-
-#include "blockMesh.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::faceList Foam::blockMesh::createPatchFaces
-(
-    const polyPatch& patchTopologyFaces
-)
-{
-    blockMesh& blocks = *this;
-
-    labelList blockLabels = patchTopologyFaces.polyPatch::faceCells();
-
-    label nFaces=0;
-
-    forAll(patchTopologyFaces, patchTopologyFaceLabel)
-    {
-        label blockLabel = blockLabels[patchTopologyFaceLabel];
-
-        faceList blockFaces
-        (
-            blocks[blockLabel].blockDef().blockShape().faces()
-        );
-
-        forAll(blockFaces, blockFaceLabel)
-        {
-            if
-            (
-                blockFaces[blockFaceLabel]
-             == patchTopologyFaces[patchTopologyFaceLabel]
-            )
-            {
-                nFaces +=
-                    blocks[blockLabel].boundaryPatches()[blockFaceLabel].size();
-            }
-        }
-    }
-
-
-    faceList patchFaces(nFaces);
-    face quadFace(4);
-    label faceLabel = 0;
-
-    forAll(patchTopologyFaces, patchTopologyFaceLabel)
-    {
-        label blockLabel = blockLabels[patchTopologyFaceLabel];
-
-        faceList blockFaces
-        (
-            blocks[blockLabel].blockDef().blockShape().faces()
-        );
-
-        forAll(blockFaces, blockFaceLabel)
-        {
-            if
-            (
-                blockFaces[blockFaceLabel]
-                == patchTopologyFaces[patchTopologyFaceLabel]
-            )
-            {
-                const labelListList& blockPatchFaces =
-                    blocks[blockLabel].boundaryPatches()[blockFaceLabel];
-
-                forAll(blockPatchFaces, blockFaceLabel)
-                {
-                    // Lookup the face points
-                    // and collapse duplicate point labels
-
-                    quadFace[0] =
-                        mergeList_
-                        [
-                            blockPatchFaces[blockFaceLabel][0]
-                          + blockOffsets_[blockLabel]
-                        ];
-
-                    label nUnique = 1;
-
-                    for
-                    (
-                        label facePointLabel = 1;
-                        facePointLabel < 4;
-                        facePointLabel++
-                    )
-                    {
-                        quadFace[nUnique] =
-                            mergeList_
-                            [
-                                blockPatchFaces[blockFaceLabel][facePointLabel]
-                              + blockOffsets_[blockLabel]
-                            ];
-
-                        if (quadFace[nUnique] != quadFace[nUnique-1])
-                        {
-                            nUnique++;
-                        }
-                    }
-
-                    if (quadFace[nUnique-1] == quadFace[0])
-                    {
-                        nUnique--;
-                    }
-
-                    if (nUnique == 4)
-                    {
-                        patchFaces[faceLabel++] = quadFace;
-                    }
-                    else if (nUnique == 3)
-                    {
-                        patchFaces[faceLabel++] = face
-                        (
-                            labelList::subList(quadFace, 3)
-                        );
-                    }
-                    // else the face has collapsed to an edge or point
-                }
-            }
-        }
-    }
-
-    patchFaces.setSize(faceLabel);
-
-    return patchFaces;
-}
-
-
-Foam::faceListList Foam::blockMesh::createPatches()
-{
-    Info<< "\nCreating patches\n";
-
-    const polyPatchList& patchTopologies = topology().boundaryMesh();
-    faceListList patches(patchTopologies.size());
-
-    forAll(patchTopologies, patchLabel)
-    {
-        patches[patchLabel] =
-            createPatchFaces(patchTopologies[patchLabel]);
-    }
-
-    return patches;
-}
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/createTopology.C b/applications/utilities/mesh/generation/blockMesh/createTopology.C
deleted file mode 100644
index 1a69f27da..000000000
--- a/applications/utilities/mesh/generation/blockMesh/createTopology.C
+++ /dev/null
@@ -1,443 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "blockMesh.H"
-#include "Time.H"
-#include "preservePatchTypes.H"
-#include "emptyPolyPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-bool Foam::blockMesh::blockLabelsOK
-(
-    const label blockLabel,
-    const pointField& points,
-    const cellShape& blockShape
-)
-{
-    bool ok = true;
-
-    forAll(blockShape, blockI)
-    {
-        if (blockShape[blockI] < 0)
-        {
-            ok = false;
-
-            WarningIn
-            (
-                "bool Foam::blockMesh::blockLabelsOK"
-                "(const label blockLabel, const pointField& points, "
-                "const cellShape& blockShape)"
-            )   << "block " << blockLabel
-                << " point label " << blockShape[blockI]
-                << " less than zero" << endl;
-        }
-        else if (blockShape[blockI] >= points.size())
-        {
-            ok = false;
-
-            WarningIn
-            (
-                "bool Foam::blockMesh::blockLabelsOK"
-                "(const label blockLabel, const pointField& points, "
-                "const cellShape& blockShape)"
-            )   << "block " << blockLabel
-                << " point label " << blockShape[blockI]
-                << " larger than " << points.size() - 1
-                << " the largest defined point label" << endl;
-        }
-    }
-
-    return ok;
-}
-
-
-bool Foam::blockMesh::patchLabelsOK
-(
-    const label patchLabel,
-    const pointField& points,
-    const faceList& patchFaces
-)
-{
-    bool ok = true;
-
-    forAll(patchFaces, faceI)
-    {
-        const labelList& f = patchFaces[faceI];
-
-        forAll(f, fp)
-        {
-            if (f[fp] < 0)
-            {
-                ok = false;
-
-                WarningIn
-                (
-                    "bool Foam::blockMesh::patchLabelsOK(...)"
-                )   << "patch " << patchLabel
-                    << " face " << faceI
-                    << " point label " << f[fp]
-                    << " less than zero" << endl;
-            }
-            else if (f[fp] >= points.size())
-            {
-                ok = false;
-
-                WarningIn
-                (
-                    "bool Foam::blockMesh::patchLabelsOK(...)"
-                )   << "patch " << patchLabel
-                    << " face " << faceI
-                    << " point label " << f[fp]
-                    << " larger than " << points.size() - 1
-                    << " the largest defined point label" << endl;
-            }
-        }
-    }
-
-    return ok;
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& meshDescription)
-{
-    bool topologyOK = true;
-
-    blockMesh& blocks = *this;
-
-    word defaultPatchName = "defaultFaces";
-    word defaultPatchType = emptyPolyPatch::typeName;
-
-    // get names/types for the unassigned patch faces
-    // this is a bit heavy handed (and ugly), but there is currently
-    // no easy way to rename polyMesh patches subsequently
-    if (const dictionary* dictPtr = meshDescription.subDictPtr("defaultPatch"))
-    {
-        dictPtr->readIfPresent("name", defaultPatchName);
-        dictPtr->readIfPresent("type", defaultPatchType);
-    }
-
-    Info<< nl << "Creating blockCorners" << endl;
-
-    // create blockCorners
-    pointField tmpBlockPoints(meshDescription.lookup("vertices"));
-
-    if (meshDescription.found("edges"))
-    {
-        // read number of non-linear edges in mesh
-        Info<< nl << "Creating curved edges" << endl;
-
-        ITstream& edgesStream(meshDescription.lookup("edges"));
-
-        label nEdges = 0;
-
-        token firstToken(edgesStream);
-
-        if (firstToken.isLabel())
-        {
-            nEdges = firstToken.labelToken();
-            edges_.setSize(nEdges);
-        }
-        else
-        {
-            edgesStream.putBack(firstToken);
-        }
-
-        // Read beginning of edges
-        edgesStream.readBegin("edges");
-
-        nEdges = 0;
-
-        token lastToken(edgesStream);
-        while
-        (
-            !(
-                lastToken.isPunctuation()
-                && lastToken.pToken() == token::END_LIST
-            )
-        )
-        {
-            if (edges_.size() <= nEdges)
-            {
-                edges_.setSize(nEdges + 1);
-            }
-
-            edgesStream.putBack(lastToken);
-
-            edges_.set
-            (
-                nEdges,
-                curvedEdge::New(tmpBlockPoints, edgesStream)
-            );
-
-            nEdges++;
-
-            edgesStream >> lastToken;
-        }
-        edgesStream.putBack(lastToken);
-
-        // Read end of edges
-        edgesStream.readEnd("edges");
-    }
-    else
-    {
-        Info<< nl << "There are no non-linear edges" << endl;
-    }
-
-
-    Info<< nl << "Creating blocks" << endl;
-    {
-        ITstream& blockDescriptorStream(meshDescription.lookup("blocks"));
-
-        // read number of blocks in mesh
-        label nBlocks = 0;
-
-        token firstToken(blockDescriptorStream);
-
-        if (firstToken.isLabel())
-        {
-            nBlocks = firstToken.labelToken();
-            blocks.setSize(nBlocks);
-        }
-        else
-        {
-            blockDescriptorStream.putBack(firstToken);
-        }
-
-        // Read beginning of blocks
-        blockDescriptorStream.readBegin("blocks");
-
-        nBlocks = 0;
-
-        token lastToken(blockDescriptorStream);
-        while
-        (
-            !(
-                lastToken.isPunctuation()
-                && lastToken.pToken() == token::END_LIST
-            )
-        )
-        {
-            if (blocks.size() <= nBlocks)
-            {
-                blocks.setSize(nBlocks + 1);
-            }
-
-            blockDescriptorStream.putBack(lastToken);
-
-            blocks.set
-            (
-                nBlocks,
-                new block
-                (
-                    blockDescriptor
-                    (
-                        tmpBlockPoints,
-                        edges_,
-                        blockDescriptorStream
-                    )
-                )
-            );
-
-            topologyOK = topologyOK && blockLabelsOK
-            (
-                nBlocks,
-                tmpBlockPoints,
-                blocks[nBlocks].blockDef().blockShape()
-            );
-
-            nBlocks++;
-
-            blockDescriptorStream >> lastToken;
-        }
-        blockDescriptorStream.putBack(lastToken);
-
-        // Read end of blocks
-        blockDescriptorStream.readEnd("blocks");
-    }
-
-
-    Info<< nl << "Creating patches" << endl;
-
-    faceListList tmpBlocksPatches;
-    wordList patchNames;
-    wordList patchTypes;
-
-    {
-        ITstream& patchStream(meshDescription.lookup("patches"));
-
-        // read number of patches in mesh
-        label nPatches = 0;
-
-        token firstToken(patchStream);
-
-        if (firstToken.isLabel())
-        {
-            nPatches = firstToken.labelToken();
-
-            tmpBlocksPatches.setSize(nPatches);
-            patchNames.setSize(nPatches);
-            patchTypes.setSize(nPatches);
-        }
-        else
-        {
-            patchStream.putBack(firstToken);
-        }
-
-        // Read beginning of blocks
-        patchStream.readBegin("patches");
-
-        nPatches = 0;
-
-        token lastToken(patchStream);
-        while
-        (
-            !(
-                lastToken.isPunctuation()
-                && lastToken.pToken() == token::END_LIST
-            )
-        )
-        {
-            if (tmpBlocksPatches.size() <= nPatches)
-            {
-                tmpBlocksPatches.setSize(nPatches + 1);
-                patchNames.setSize(nPatches + 1);
-                patchTypes.setSize(nPatches + 1);
-            }
-
-            patchStream.putBack(lastToken);
-
-            patchStream
-                >> patchTypes[nPatches]
-                >> patchNames[nPatches]
-                >> tmpBlocksPatches[nPatches];
-
-
-            // Catch multiple patches asap.
-            for (label i = 0; i < nPatches; i++)
-            {
-                if (patchNames[nPatches] == patchNames[i])
-                {
-                    FatalErrorIn
-                    (
-                        "blockMesh::createTopology(IOdictionary&)"
-                    )   << "Duplicate patch " << patchNames[nPatches]
-                        << " at line " << patchStream.lineNumber()
-                        << ". Exiting !" << nl
-                        << exit(FatalError);
-                }
-            }
-
-            topologyOK = topologyOK && patchLabelsOK
-            (
-                nPatches,
-                tmpBlockPoints,
-                tmpBlocksPatches[nPatches]
-            );
-
-            nPatches++;
-
-            patchStream >> lastToken;
-        }
-        patchStream.putBack(lastToken);
-
-        // Read end of blocks
-        patchStream.readEnd("patches");
-    }
-
-
-    if (!topologyOK)
-    {
-        FatalErrorIn("blockMesh::createTopology(IOdictionary&)")
-            << "Cannot create mesh due to errors in topology, exiting !" << nl
-            << exit(FatalError);
-    }
-
-
-    Info<< nl << "Creating block mesh topology" << endl;
-
-    PtrList<cellShape> tmpBlockCells(blocks.size());
-    forAll(blocks, blockLabel)
-    {
-        tmpBlockCells.set
-        (
-            blockLabel,
-            new cellShape(blocks[blockLabel].blockDef().blockShape())
-        );
-
-        if (tmpBlockCells[blockLabel].mag(tmpBlockPoints) < 0.0)
-        {
-            WarningIn
-            (
-                "blockMesh::createTopology(IOdictionary&)"
-            )   << "negative volume block : " << blockLabel
-                << ", probably defined inside-out" << endl;
-        }
-    }
-
-    wordList patchPhysicalTypes(tmpBlocksPatches.size());
-
-    preservePatchTypes
-    (
-        meshDescription.time(),
-        meshDescription.time().constant(),
-        polyMesh::meshSubDir,
-        patchNames,
-        patchTypes,
-        defaultPatchName,
-        defaultPatchType,
-        patchPhysicalTypes
-    );
-
-    polyMesh* blockMeshPtr = new polyMesh
-    (
-        IOobject
-        (
-            "blockMesh",
-            meshDescription.time().constant(),
-            meshDescription.time(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        xferMove(tmpBlockPoints),
-        tmpBlockCells,
-        tmpBlocksPatches,
-        patchNames,
-        patchTypes,
-        defaultPatchName,
-        defaultPatchType,
-        patchPhysicalTypes
-    );
-
-    checkBlockMesh(*blockMeshPtr);
-
-    return blockMeshPtr;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polySplineEdge.C b/applications/utilities/mesh/generation/blockMesh/curvedEdges/polySplineEdge.C
deleted file mode 100644
index a6fe522f9..000000000
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polySplineEdge.C
+++ /dev/null
@@ -1,148 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "polySplineEdge.H"
-#include "BSpline.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(polySplineEdge, 0);
-
-    // Add the curvedEdge constructor functions to the hash tables
-    curvedEdge::addIstreamConstructorToTable<polySplineEdge>
-        addPolySplineEdgeIstreamConstructorToTable_;
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-// intervening : returns a list of the points making up the polyLineEdge
-// which describes the spline. nbetweenKnots is the number of points
-// placed between each knot : this ensures that the knot locations
-// are retained as a subset of the polyLine points.
-
-// note that the points are evenly spaced in the parameter mu, not
-// in real space
-
-Foam::pointField Foam::polySplineEdge::intervening
-(
-    const pointField& otherknots,
-    const label nbetweenKnots,
-    const vector& fstend,
-    const vector& sndend
-)
-{
-    BSpline spl(knotlist(points_, start_, end_, otherknots), fstend, sndend);
-
-    label nSize(nsize(otherknots.size(), nbetweenKnots));
-
-    pointField ans(nSize);
-
-    label N = spl.nKnots();
-    scalar init = 1.0/(N - 1);
-    scalar interval = (N - scalar(3))/N;
-    interval /= otherknots.size() + 1;
-    interval /= nbetweenKnots + 1;
-
-    ans[0] = points_[start_];
-
-    register scalar index(init);
-    for (register label i=1; i<nSize-1; i++)
-    {
-        index += interval;
-        ans[i] = spl.realPosition(index);
-    }
-
-    ans[nSize-1] = points_[end_];
-
-    return ans;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::polySplineEdge::polySplineEdge
-(
-    const pointField& points,
-    const label start,
-    const label end,
-    const pointField& otherknots,
-    const label nInterKnots
-)
-:
-    curvedEdge(points, start, end),
-    polyLine
-    (
-        intervening
-        (
-            otherknots,
-            nInterKnots,
-            vector::zero,
-            vector::zero
-        )
-    ),
-    otherKnots_(otherknots)
-{}
-
-
-Foam::polySplineEdge::polySplineEdge
-(
-    const pointField& points,
-    Istream& is
-)
-:
-    curvedEdge(points, is),
-    polyLine(pointField(0)),
-    otherKnots_(is)
-{
-    label nInterKnots(20);
-    vector fstend(is);
-    vector sndend(is);
-
-    controlPoints_.setSize(nsize(otherKnots_.size(), nInterKnots));
-    distances_.setSize(controlPoints_.size());
-
-    controlPoints_ = intervening(otherKnots_, nInterKnots, fstend, sndend);
-    calcDistances();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::vector Foam::polySplineEdge::position(const scalar mu) const
-{
-    return polyLine::position(mu);
-}
-
-
-Foam::scalar Foam::polySplineEdge::length() const
-{
-    return polyLine::length();
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H
new file mode 100644
index 000000000..0112c8cbe
--- /dev/null
+++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H
@@ -0,0 +1,120 @@
+        if (mergePatchPairs.size())
+        {
+            Info<< "Creating merge patch pairs" << nl << endl;
+
+            // Create and add point and face zones and mesh modifiers
+            List<pointZone*> pz(mergePatchPairs.size());
+            List<faceZone*> fz(3*mergePatchPairs.size());
+            List<cellZone*> cz(0);
+
+            forAll(mergePatchPairs, pairI)
+            {
+                const word mergeName
+                (
+                    mergePatchPairs[pairI].first()
+                  + mergePatchPairs[pairI].second()
+                  + name(pairI)
+                );
+
+                pz[pairI] = new pointZone
+                (
+                    mergeName + "CutPointZone",
+                    labelList(0),
+                    0,
+                    mesh.pointZones()
+                );
+
+                // Master patch
+                const word masterPatchName(mergePatchPairs[pairI].first());
+                const polyPatch& masterPatch =
+                    mesh.boundaryMesh()[masterPatchName];
+
+                labelList isf(masterPatch.size());
+
+                forAll(isf, i)
+                {
+                    isf[i] = masterPatch.start() + i;
+                }
+
+                fz[3*pairI] = new faceZone
+                (
+                    mergeName + "MasterZone",
+                    isf,
+                    boolList(masterPatch.size(), false),
+                    0,
+                    mesh.faceZones()
+                );
+
+                // Slave patch
+                const word slavePatchName(mergePatchPairs[pairI].second());
+                const polyPatch& slavePatch =
+                    mesh.boundaryMesh()[slavePatchName];
+
+                labelList osf(slavePatch.size());
+
+                forAll(osf, i)
+                {
+                    osf[i] = slavePatch.start() + i;
+                }
+
+                fz[3*pairI + 1] = new faceZone
+                (
+                    mergeName + "SlaveZone",
+                    osf,
+                    boolList(slavePatch.size(), false),
+                    1,
+                    mesh.faceZones()
+                );
+
+                // Add empty zone for cut faces
+                fz[3*pairI + 2] = new faceZone
+                (
+                    mergeName + "CutFaceZone",
+                    labelList(0),
+                    boolList(0, false),
+                    2,
+                    mesh.faceZones()
+                );
+            }  // end of all merge pairs
+
+            Info<< "Adding point and face zones" << endl;
+            mesh.addZones(pz, fz, cz);
+
+
+            Info<< "Creating attachPolyTopoChanger" << endl;
+            polyTopoChanger polyMeshAttacher(mesh);
+            polyMeshAttacher.setSize(mergePatchPairs.size());
+
+            forAll(mergePatchPairs, pairI)
+            {
+                const word mergeName
+                (
+                    mergePatchPairs[pairI].first()
+                  + mergePatchPairs[pairI].second()
+                  + name(pairI)
+                );
+
+                // Add the sliding interface mesh modifier
+                polyMeshAttacher.set
+                (
+                    pairI,
+                    new slidingInterface
+                    (
+                        "couple" + name(pairI),
+                        pairI,
+                        polyMeshAttacher,
+                        mergeName + "MasterZone",
+                        mergeName + "SlaveZone",
+                        mergeName + "CutPointZone",
+                        mergeName + "CutFaceZone",
+                        mergePatchPairs[pairI].first(),
+                        mergePatchPairs[pairI].second(),
+                        slidingInterface::INTEGRAL, // always integral
+                        false,
+                        intersection::VISIBLE
+                    )
+                );
+            }
+
+            polyMeshAttacher.changeMesh();
+        }
diff --git a/applications/utilities/mesh/generation/blockMesh/mergePatchPairsOld.H b/applications/utilities/mesh/generation/blockMesh/mergePatchPairsOld.H
new file mode 100644
index 000000000..675835e84
--- /dev/null
+++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairsOld.H
@@ -0,0 +1,271 @@
+
+    // Read in a list of dictionaries for the merge patch pairs
+    if (meshDict.found("mergePatchPairs"))
+    {
+        List<Pair<word> > mergePatchPairs
+        (
+            meshDict.lookup("mergePatchPairs")
+        );
+
+        if (mergePatchPairs.size() > 0)
+        {
+            // Create and add point and face zones and mesh modifiers
+            List<pointZone*> pz(mergePatchPairs.size());
+            List<faceZone*> fz(3*mergePatchPairs.size());
+            List<cellZone*> cz(0);
+
+            forAll (mergePatchPairs, pairI)
+            {
+                const word mergeName
+                (
+                    mergePatchPairs[pairI].first()
+                  + mergePatchPairs[pairI].second()
+                  + name(pairI)
+                );
+
+                pz[pairI] = new pointZone
+                (
+                    mergeName + "CutPointZone",
+                    labelList(0),
+                    0,
+                    mesh.pointZones()
+                );
+
+                // Master patch
+                const word masterPatchName(mergePatchPairs[pairI].first());
+                const polyPatch& masterPatch =
+                    mesh.boundaryMesh()
+                    [
+                        mesh.boundaryMesh().findPatchID(masterPatchName)
+                    ];
+
+                labelList isf(masterPatch.size());
+
+                forAll (isf, i)
+                {
+                    isf[i] = masterPatch.start() + i;
+                }
+
+                fz[3*pairI] = new faceZone
+                (
+                    mergeName + "MasterZone",
+                    isf,
+                    boolList(masterPatch.size(), false),
+                    0,
+                    mesh.faceZones()
+                );
+
+                // Slave patch
+                const word slavePatchName(mergePatchPairs[pairI].second());
+                const polyPatch& slavePatch =
+                    mesh.boundaryMesh()
+                    [
+                        mesh.boundaryMesh().findPatchID(slavePatchName)
+                    ];
+
+                labelList osf(slavePatch.size());
+
+                forAll (osf, i)
+                {
+                    osf[i] = slavePatch.start() + i;
+                }
+
+                fz[3*pairI + 1] = new faceZone
+                (
+                    mergeName + "SlaveZone",
+                    osf,
+                    boolList(slavePatch.size(), false),
+                    1,
+                    mesh.faceZones()
+                );
+
+                // Add empty zone for cut faces
+                fz[3*pairI + 2] = new faceZone
+                (
+                    mergeName + "CutFaceZone",
+                    labelList(0),
+                    boolList(0, false),
+                    2,
+                    mesh.faceZones()
+                );
+            }  // end of all merge pairs
+
+            Info << "Adding point and face zones" << endl;
+            mesh.addZones(pz, fz, cz);
+
+
+            Info << "Creating topo change" << endl;
+            polyTopoChanger attacher(mesh);
+            attacher.setSize(mergePatchPairs.size());
+
+            forAll (mergePatchPairs, pairI)
+            {
+                const word mergeName
+                (
+                    mergePatchPairs[pairI].first()
+                  + mergePatchPairs[pairI].second()
+                  + name(pairI)
+                );
+
+                // Add the sliding interface mesh modifier
+                attacher.set
+                (
+                    pairI,
+                    new slidingInterface
+                    (
+                        "couple" + name(pairI),
+                        pairI,
+                        attacher,
+                        mergeName + "MasterZone",
+                        mergeName + "SlaveZone",
+                        mergeName + "CutPointZone",
+                        mergeName + "CutFaceZone",
+                        mergePatchPairs[pairI].first(),
+                        mergePatchPairs[pairI].second(),
+                        slidingInterface::INTEGRAL, // always integral
+                        intersection::VISIBLE
+                    )
+                );
+            }
+
+            attacher.changeMesh();
+
+            // Clean the mesh after attach
+            labelList patchSizes(mesh.boundaryMesh().size());
+            labelList patchStarts(mesh.boundaryMesh().size());
+
+            forAll (mesh.boundaryMesh(), patchI)
+            {
+                patchSizes[patchI] = mesh.boundaryMesh()[patchI].size();
+                patchStarts[patchI] = mesh.boundaryMesh()[patchI].start();
+            }
+
+            mesh.resetPrimitives
+            (
+                xferCopy<pointField>(mesh.points()),
+                xferCopy<faceList>(mesh.faces()),
+                xferCopy<labelList>(mesh.faceOwner()),
+                xferCopy<labelList>(mesh.faceNeighbour()),
+                patchSizes,
+                patchStarts
+            );
+
+            mesh.setInstance(runTime.constant());
+            mesh.removeZones();
+        }
+    }
+    else
+    {
+        Info<< nl << "There are no merge patch pairs" << endl;
+    }
+
+
+    // Set any cellZones (note: cell labelling unaffected by above
+    // mergePatchPairs)
+
+    label nZones = blocks.numZonedBlocks();
+
+    if (nZones > 0)
+    {
+        Info<< nl << "Adding cell zones" << endl;
+
+        // Map from zoneName to cellZone index
+        HashTable<label> zoneMap(nZones);
+
+        // Cells per zone.
+        List<DynamicList<label> > zoneCells(nZones);
+
+        // Running cell counter
+        label cellI = 0;
+
+        // Largest zone so far
+        label freeZoneI = 0;
+
+        forAll(blocks, blockI)
+        {
+            const block& b = blocks[blockI];
+            const labelListList& blockCells = b.cells();
+            const word& zoneName = b.blockDef().zoneName();
+
+            if (zoneName.size())
+            {
+                HashTable<label>::const_iterator iter = zoneMap.find(zoneName);
+
+                label zoneI;
+
+                if (iter == zoneMap.end())
+                {
+                    zoneI = freeZoneI++;
+
+                    Info<< "    " << zoneI << '\t' << zoneName << endl;
+
+                    zoneMap.insert(zoneName, zoneI);
+                }
+                else
+                {
+                    zoneI = iter();
+                }
+
+                forAll(blockCells, i)
+                {
+                    zoneCells[zoneI].append(cellI++);
+                }
+            }
+            else
+            {
+                cellI += b.cells().size();
+            }
+        }
+
+
+        List<cellZone*> cz(zoneMap.size());
+
+        Info<< nl << "Writing cell zones as cellSets" << endl;
+
+        forAllConstIter(HashTable<label>, zoneMap, iter)
+        {
+            label zoneI = iter();
+
+            cz[zoneI]= new cellZone
+            (
+                iter.key(),
+                zoneCells[zoneI].shrink(),
+                zoneI,
+                mesh.cellZones()
+            );
+
+            // Write as cellSet for ease of processing
+            cellSet cset
+            (
+                mesh,
+                iter.key(),
+                labelHashSet(zoneCells[zoneI].shrink())
+            );
+            cset.write();
+        }
+
+        mesh.pointZones().setSize(0);
+        mesh.faceZones().setSize(0);
+        mesh.cellZones().setSize(0);
+        mesh.addZones(List<pointZone*>(0), List<faceZone*>(0), cz);
+    }
+
+    // Set the precision of the points data to 10
+    IOstream::defaultPrecision(10);
+
+    Info << nl << "Writing polyMesh" << endl;
+    mesh.removeFiles();
+    if (!mesh.write())
+    {
+        FatalErrorIn(args.executable())
+            << "Failed writing polyMesh."
+            << exit(FatalError);
+    }
+
+    Info<< nl << "End" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/setEdge.C b/applications/utilities/mesh/generation/blockMesh/setEdge.C
deleted file mode 100644
index fb2c46c6b..000000000
--- a/applications/utilities/mesh/generation/blockMesh/setEdge.C
+++ /dev/null
@@ -1,147 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    from the list of curved edges creates a list
-    of edges that are not curved. It is assumed
-    that all other edges are straight lines
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-
-#include "blockDescriptor.H"
-#include "lineEdge.H"
-#include "lineDivide.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-scalar calcGexp(const scalar expRatio, const label dim)
-{
-    if (dim == 1)
-    {
-        return 0.0;
-    }
-    else
-    {
-        return pow(expRatio, 1.0/(dim - 1));
-    }
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void blockDescriptor::setEdge(label edgeI, label start, label end, label dim)
-{
-    // for all edges check the list of curved edges. If the edge is curved,
-    // add it to the list. If the edge is not found, create is as a line
-
-    bool found = false;
-
-    // set reference to the list of labels defining the block
-    const labelList& blockLabels = blockShape_;
-
-    // set reference to global list of points
-    const pointField blockPoints = blockShape_.points(blockMeshPoints_);
-
-    // x1
-    found = false;
-
-    forAll (curvedEdges_, nCEI)
-    {
-        if (curvedEdges_[nCEI].compare(blockLabels[start], blockLabels[end]))
-        {
-            found = true;
-
-            // check the orientation:
-            // if the starting point of the curve is the same as the starting
-            // point of the edge, do the parametrisation and pick up the points
-            if (blockLabels[start] == curvedEdges_[nCEI].start())
-            {
-                // calculate the geometric expension factor out of the
-                // expansion ratio
-                scalar gExp = calcGexp(expand_[edgeI], dim);
-
-                // divide the line
-                lineDivide divEdge(curvedEdges_[nCEI], dim, gExp);
-
-                edgePoints_[edgeI] = divEdge.points();
-                edgeWeights_[edgeI] = divEdge.lambdaDivisions();
-            }
-            else
-            {
-                // the curve has got the opposite orientation
-                scalar gExp = calcGexp(expand_[edgeI], dim);
-
-                // divide the line
-                lineDivide divEdge(curvedEdges_[nCEI], dim, 1.0/(gExp + SMALL));
-
-                pointField p = divEdge.points();
-                scalarList d = divEdge.lambdaDivisions();
-
-                edgePoints_[edgeI].setSize(p.size());
-                edgeWeights_[edgeI].setSize(d.size());
-
-                label pMax = p.size() - 1;
-                forAll (p, pI)
-                {
-                    edgePoints_[edgeI][pI] = p[pMax - pI];
-                    edgeWeights_[edgeI][pI] = 1.0 - d[pMax - pI];
-                }
-            }
-
-            break;
-        }
-    }
-
-    if (!found)
-    {
-        // edge is a straight line
-        scalar gExp = calcGexp(expand_[edgeI], dim);
-
-        // Divide the line
-        lineEdge le(blockPoints, start, end);
-
-        lineDivide divEdge
-        (
-            le,
-            dim,
-            gExp
-        );
-
-        edgePoints_[edgeI] = divEdge.points();
-        edgeWeights_[edgeI] = divEdge.lambdaDivisions();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/Allwmake b/src/Allwmake
index 1b1441f9d..4b711dce5 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -51,6 +51,7 @@ wmake libso sampling
 wmake libso ODE
 wmake libso POD
 wmake libso randomProcesses
+mesh/Allwmake
 
 thermophysicalModels/Allwmake
 transportModels/Allwmake
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index eed8130f2..64e3c7092 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -1017,4 +1017,34 @@ int Foam::system(const string& command)
 }
 
 
+void Foam::osRandomSeed(const label seed)
+{
+#ifdef USE_RANDOM
+    srandom((unsigned int)seed);
+#else
+    srand48(seed);
+#endif
+}
+
+
+Foam::label Foam::osRandomInteger()
+{
+#ifdef USE_RANDOM
+    return random();
+#else
+    return lrand48();
+#endif
+}
+
+
+Foam::scalar Foam::osRandomDouble()
+{
+#ifdef USE_RANDOM
+    return (scalar)random()/INT_MAX;
+#else
+    return drand48();
+#endif
+}
+
+
 // ************************************************************************* //
diff --git a/src/conversion/meshReader/createPolyBoundary.C b/src/conversion/meshReader/createPolyBoundary.C
index 333fb2f3f..e5a349a10 100644
--- a/src/conversion/meshReader/createPolyBoundary.C
+++ b/src/conversion/meshReader/createPolyBoundary.C
@@ -303,15 +303,13 @@ void Foam::meshReader::createPolyBoundary()
 
     Info<< "Added " << nMissingFaces << " unmatched faces" << endl;
 
+    // Add missing faces to last patch ('Default_Empty' etc.)
     if (nMissingFaces > 0)
     {
-        patchSizes_[patchSizes_.size() - 1] = nMissingFaces;
-    }
-    else
-    {
-        patchStarts_.setSize(patchStarts_.size() - 1);
+        patchSizes_.last() = nMissingFaces;
     }
 
+
     // reset the size of the face list
     meshFaces_.setSize(nCreatedFaces);
 
@@ -412,6 +410,8 @@ Foam::meshReader::polyBoundaryPatches(const polyMesh& mesh)
 
     List<polyPatch*> p(nPatches);
 
+    // All patch dictionaries
+    PtrList<dictionary> patchDicts(patchNames_.size());
     // Default boundary patch types
     word defaultFacesType(emptyPolyPatch::typeName);
 
@@ -422,20 +422,37 @@ Foam::meshReader::polyBoundaryPatches(const polyMesh& mesh)
         mesh.instance(),
         mesh.meshDir(),
         patchNames_,
-        patchTypes_,
+        patchDicts,
         "defaultFaces",
-        defaultFacesType,
-        patchPhysicalTypes_
+        defaultFacesType
     );
+    forAll(patchDicts, patchI)
+    {
+        if (!patchDicts.set(patchI))
+        {
+            patchDicts.set(patchI, new dictionary());
+        }
+        dictionary& patchDict = patchDicts[patchI];
+
+        // add but not overwrite type
+        patchDict.add("type", patchTypes_[patchI], false);
+        if (patchPhysicalTypes_.size() && patchPhysicalTypes_[patchI].size())
+        {
+            patchDict.add("startFace", patchPhysicalTypes_[patchI], false);
+        }
+
+        // overwrite sizes and start
+        patchDict.add("nFaces", patchSizes_[patchI], true);
+        patchDict.add("startFace", patchStarts_[patchI], true);
+    }
+
 
     forAll(patchStarts_, patchI)
     {
         p[patchI] = polyPatch::New
         (
-            patchTypes_[patchI],
             patchNames_[patchI],
-            patchSizes_[patchI],
-            patchStarts_[patchI],
+            patchDicts[patchI],
             patchI,
             mesh.boundaryMesh()
         ).ptr();
diff --git a/src/foam/containers/Lists/UList/UList.H b/src/foam/containers/Lists/UList/UList.H
index 49bda2fe7..25e059cfe 100644
--- a/src/foam/containers/Lists/UList/UList.H
+++ b/src/foam/containers/Lists/UList/UList.H
@@ -167,6 +167,18 @@ public:
             //  This can be used (with caution) when interfacing with C code.
             inline T* data();
 
+            //- Return the first element of the list.
+            inline T& first();
+
+            //- Return first element of the list.
+            inline const T& first() const;
+
+            //- Return the last element of the list.
+            inline T& last();
+
+            //- Return the last element of the list.
+            inline const T& last() const;
+
 
         // Check
 
diff --git a/src/foam/containers/Lists/UList/UListI.H b/src/foam/containers/Lists/UList/UListI.H
index 3b9bd7a40..e6d27e6d6 100644
--- a/src/foam/containers/Lists/UList/UListI.H
+++ b/src/foam/containers/Lists/UList/UListI.H
@@ -128,6 +128,34 @@ inline void Foam::UList<T>::checkIndex(const label i) const
 }
 
 
+template<class T>
+inline T& Foam::UList<T>::first()
+{
+    return this->operator[](0);
+}
+
+
+template<class T>
+inline const T& Foam::UList<T>::first() const
+{
+    return this->operator[](0);
+}
+
+
+template<class T>
+inline T& Foam::UList<T>::last()
+{
+    return this->operator[](this->size()-1);
+}
+
+
+template<class T>
+inline const T& Foam::UList<T>::last() const
+{
+    return this->operator[](this->size()-1);
+}
+
+
 template<class T>
 inline const T* Foam::UList<T>::cdata() const
 {
diff --git a/src/foam/global/unitConversion/unitConversion.H b/src/foam/global/unitConversion/unitConversion.H
new file mode 100644
index 000000000..db50509f7
--- /dev/null
+++ b/src/foam/global/unitConversion/unitConversion.H
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+InNamespace
+    Foam
+
+Description
+    Unit conversion functions
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef unitConversion_H
+#define unitConversion_H
+
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Conversion from degrees to radians
+inline scalar degToRad(const scalar deg)
+{
+    return (deg*mathematicalConstant::pi/180.0);
+}
+
+//- Conversion from radians to degrees
+inline scalar radToDeg(const scalar rad)
+{
+    return (rad*180.0/mathematicalConstant::pi);
+}
+
+//- Conversion from atm to Pa
+inline scalar atmToPa(const scalar atm)
+{
+    return (atm*101325.0);
+}
+
+//- Conversion from atm to Pa
+inline scalar paToAtm(const scalar pa)
+{
+    return (pa/101325.0);
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/foam/include/OSspecific.H b/src/foam/include/OSspecific.H
index 48181a485..21edda1a5 100644
--- a/src/foam/include/OSspecific.H
+++ b/src/foam/include/OSspecific.H
@@ -171,6 +171,17 @@ bool ping(const word&, const label timeOut = 10);
 //- Execute the specified command
 int system(const string& command);
 
+// Low level random numbers. Use Random class instead.
+
+//- Seed random number generator.
+void osRandomSeed(const label seed);
+
+//- Return random integer (uniform distribution between 0 and 2^31)
+label osRandomInteger();
+
+//- Return random double precision (uniform distribution between 0 and 1)
+scalar osRandomDouble();
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 7b1bf8c2a..01edae0f4 100644
--- a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -699,6 +699,49 @@ bool Foam::polyBoundaryMesh::writeObject
     return regIOobject::writeObject(fmt, ver, IOstream::UNCOMPRESSED);
 }
 
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+const Foam::polyPatch& Foam::polyBoundaryMesh::operator[]
+(
+    const word& patchName
+) const
+{
+    const label patchI = findPatchID(patchName);
+
+    if (patchI < 0)
+    {
+        FatalErrorIn
+        (
+            "polyBoundaryMesh::operator[](const word&) const"
+        )   << "Patch named " << patchName << " not found." << nl
+            << "Available patch names: " << names() << endl
+            << abort(FatalError);
+    }
+
+    return operator[](patchI);
+}
+
+
+Foam::polyPatch& Foam::polyBoundaryMesh::operator[]
+(
+    const word& patchName
+)
+{
+    const label patchI = findPatchID(patchName);
+
+    if (patchI < 0)
+    {
+        FatalErrorIn
+        (
+            "polyBoundaryMesh::operator[](const word&)"
+        )   << "Patch named " << patchName << " not found." << nl
+            << "Available patch names: " << names() << endl
+            << abort(FatalError);
+    }
+
+    return operator[](patchI);
+}
+
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
diff --git a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 6674e52cb..e1a3cfc1e 100644
--- a/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -197,6 +197,18 @@ public:
         ) const;
 
 
+    // Member Operators
+
+        //- Return const and non-const reference to polyPatch by index.
+        using polyPatchList::operator[];
+
+        //- Return const reference to polyPatch by name.
+        const polyPatch& operator[](const word&) const;
+
+        //- Return reference to polyPatch by name.
+        polyPatch& operator[](const word&);
+
+
     // Ostream operator
 
         friend Ostream& operator<<(Ostream&, const polyBoundaryMesh&);
diff --git a/src/foam/meshes/polyMesh/polyMesh.C b/src/foam/meshes/polyMesh/polyMesh.C
index 978fdca0b..5d6b1b692 100644
--- a/src/foam/meshes/polyMesh/polyMesh.C
+++ b/src/foam/meshes/polyMesh/polyMesh.C
@@ -30,8 +30,10 @@ License
 #include "emptyPolyPatch.H"
 #include "globalMeshData.H"
 #include "processorPolyPatch.H"
-#include "meshObjectBase.H"
-#include "demandDrivenData.H"
+#include "indexedOctree.H"
+#include "treeDataCell.H"
+#include "MeshObject.H"
+#include "pointMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1337,4 +1339,36 @@ void Foam::polyMesh::removeFiles() const
 }
 
 
+Foam::label Foam::polyMesh::findCell
+(
+    const point& location
+) const
+{
+    if (nCells() == 0)
+    {
+        return -1;
+    }
+
+    // Find the nearest cell centre to this location
+    label cellI = findNearestCell(location);
+
+    // If point is in the nearest cell return
+    if (pointInCell(location, cellI))
+    {
+        return cellI;
+    }
+    else // point is not in the nearest cell so search all cells
+    {
+        for (label cellI = 0; cellI < nCells(); cellI++)
+        {
+            if (pointInCell(location, cellI))
+            {
+                return cellI;
+            }
+        }
+        return -1;
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/foam/meshes/polyMesh/polyMesh.H b/src/foam/meshes/polyMesh/polyMesh.H
index 2d18b29d6..93a6a2680 100644
--- a/src/foam/meshes/polyMesh/polyMesh.H
+++ b/src/foam/meshes/polyMesh/polyMesh.H
@@ -60,6 +60,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
 class globalMeshData;
 class mapPolyMesh;
 
@@ -202,6 +203,17 @@ private:
                 const label patchID
             ) const;
 
+            void setTopology
+            (
+                const cellShapeList& cellsAsShapes,
+                const faceListList& boundaryFaces,
+                const wordList& boundaryPatchNames,
+                labelList& patchSizes,
+                labelList& patchStarts,
+                label& defaultPatchStart,
+                label& nFaces,
+                cellList& cells
+            );
 
 public:
 
@@ -264,6 +276,20 @@ public:
             const bool syncPar = true
         );
 
+        //- Construct from cell shapes with patch information in dictionary
+        //  format.
+        polyMesh
+        (
+            const IOobject& io,
+            const Xfer<pointField>& points,
+            const cellShapeList& shapes,
+            const faceListList& boundaryFaces,
+            const wordList& boundaryPatchNames,
+            const PtrList<dictionary>& boundaryDicts,
+            const word& defaultBoundaryPatchName,
+            const word& defaultBoundaryPatchType,
+            const bool syncPar = true
+        );
 
     // Destructor
 
@@ -521,6 +547,14 @@ public:
 
             //- Remove all files from mesh instance()
             void removeFiles() const;
+
+        // Helper functions
+
+            //- Find cell enclosing this location (-1 if not in mesh)
+            label findCell
+            (
+                const point&
+            ) const;
 };
 
 
diff --git a/src/foam/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/foam/meshes/polyMesh/polyMeshFromShapeMesh.C
index 14b3318c8..8e825d8b6 100644
--- a/src/foam/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/foam/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -132,6 +132,292 @@ Foam::labelList Foam::polyMesh::facePatchFaceCells
 }
 
 
+//- Set faces_, calculate cells and patchStarts.
+void Foam::polyMesh::setTopology
+(
+    const cellShapeList& cellsAsShapes,
+    const faceListList& boundaryFaces,
+    const wordList& boundaryPatchNames,
+    labelList& patchSizes,
+    labelList& patchStarts,
+    label& defaultPatchStart,
+    label& nFaces,
+    cellList& cells
+)
+{
+    // Calculate the faces of all cells
+    // Initialise maximum possible numer of mesh faces to 0
+    label maxFaces = 0;
+
+    // Set up a list of face shapes for each cell
+    faceListList cellsFaceShapes(cellsAsShapes.size());
+    cells.setSize(cellsAsShapes.size());
+
+    forAll(cellsFaceShapes, cellI)
+    {
+        cellsFaceShapes[cellI] = cellsAsShapes[cellI].faces();
+
+        cells[cellI].setSize(cellsFaceShapes[cellI].size());
+
+        // Initialise cells to -1 to flag undefined faces
+        static_cast<labelList&>(cells[cellI]) = -1;
+
+        // Count maximum possible numer of mesh faces
+        maxFaces += cellsFaceShapes[cellI].size();
+    }
+
+    // Set size of faces array to maximum possible number of mesh faces
+    allFaces_.setSize(maxFaces);
+
+    // Initialise number of faces to 0
+    nFaces = 0;
+
+    // set reference to point-cell addressing
+    labelListList PointCells = cellShapePointCells(cellsAsShapes);
+
+    bool found = false;
+
+    forAll(cells, cellI)
+    {
+        // Note:
+        // Insertion cannot be done in one go as the faces need to be
+        // added into the list in the increasing order of neighbour
+        // cells.  Therefore, all neighbours will be detected first
+        // and then added in the correct order.
+
+        const faceList& curFaces = cellsFaceShapes[cellI];
+
+        // Record the neighbour cell
+        labelList neiCells(curFaces.size(), -1);
+
+        // Record the face of neighbour cell
+        labelList faceOfNeiCell(curFaces.size(), -1);
+
+        label nNeighbours = 0;
+
+        // For all faces ...
+        forAll(curFaces, faceI)
+        {
+            // Skip faces that have already been matched
+            if (cells[cellI][faceI] >= 0) continue;
+
+            found = false;
+
+            const face& curFace = curFaces[faceI];
+
+            // Get the list of labels
+            const labelList& curPoints = curFace;
+
+            // For all points
+            forAll(curPoints, pointI)
+            {
+                // Get the list of cells sharing this point
+                const labelList& curNeighbours =
+                    PointCells[curPoints[pointI]];
+
+                // For all neighbours
+                forAll(curNeighbours, neiI)
+                {
+                    label curNei = curNeighbours[neiI];
+
+                    // Reject neighbours with the lower label
+                    if (curNei > cellI)
+                    {
+                        // Get the list of search faces
+                        const faceList& searchFaces = cellsFaceShapes[curNei];
+
+                        forAll(searchFaces, neiFaceI)
+                        {
+                            if (searchFaces[neiFaceI] == curFace)
+                            {
+                                // Match!!
+                                found = true;
+
+                                // Record the neighbour cell and face
+                                neiCells[faceI] = curNei;
+                                faceOfNeiCell[faceI] = neiFaceI;
+                                nNeighbours++;
+
+                                break;
+                            }
+                        }
+                        if (found) break;
+                    }
+//                     if (found) break; HJ, not needed.  Never true
+                }
+                if (found) break;
+            } // End of current points
+        }  // End of current faces
+
+        // Add the faces in the increasing order of neighbours
+        for (label neiSearch = 0; neiSearch < nNeighbours; neiSearch++)
+        {
+            // Find the lowest neighbour which is still valid
+            label nextNei = -1;
+            label minNei = cells.size();
+
+            forAll (neiCells, ncI)
+            {
+                if (neiCells[ncI] > -1 && neiCells[ncI] < minNei)
+                {
+                    nextNei = ncI;
+                    minNei = neiCells[ncI];
+                }
+            }
+
+            if (nextNei > -1)
+            {
+                // Add the face to the list of faces
+               allFaces_[nFaces] = curFaces[nextNei];
+
+                // Set cell-face and cell-neighbour-face to current face label
+                cells[cellI][nextNei] = nFaces;
+                cells[neiCells[nextNei]][faceOfNeiCell[nextNei]] = nFaces;
+
+                // Stop the neighbour from being used again
+                neiCells[nextNei] = -1;
+
+                // Increment number of faces counter
+                nFaces++;
+            }
+            else
+            {
+                FatalErrorIn
+                (
+                    "polyMesh::setTopology\n"
+                    "(\n"
+                    "    const cellShapeList& cellsAsShapes,\n"
+                    "    const faceListList& boundaryFaces,\n"
+                    "    const wordList& boundaryPatchNames,\n"
+                    "    labelList& patchSizes,\n"
+                    "    labelList& patchStarts,\n"
+                    "    label& defaultPatchStart,\n"
+                    "    label& nFaces,\n"
+                    "    cellList& cells\n"
+                    ")"
+                )   << "Error in internal face insertion"
+                    << abort(FatalError);
+            }
+        }
+    }
+
+    // Do boundary faces
+
+    patchSizes.setSize(boundaryFaces.size(), -1);
+    patchStarts.setSize(boundaryFaces.size(), -1);
+
+    forAll (boundaryFaces, patchI)
+    {
+        const faceList& patchFaces = boundaryFaces[patchI];
+
+        labelList curPatchFaceCells =
+            facePatchFaceCells
+            (
+                patchFaces,
+                PointCells,
+                cellsFaceShapes,
+                patchI
+            );
+
+        // Grab the start label
+        label curPatchStart = nFaces;
+
+        forAll (patchFaces, faceI)
+        {
+            const face& curFace = patchFaces[faceI];
+
+            const label cellInside = curPatchFaceCells[faceI];
+
+            allFaces_[nFaces] = curFace;
+
+            // get faces of the cell inside
+            const faceList& facesOfCellInside = cellsFaceShapes[cellInside];
+
+            bool found = false;
+
+            forAll (facesOfCellInside, cellFaceI)
+            {
+                if (facesOfCellInside[cellFaceI] == curFace)
+                {
+                    if (cells[cellInside][cellFaceI] >= 0)
+                    {
+                        FatalErrorIn
+                        (
+                            "polyMesh::setTopology\n"
+                            "(\n"
+                            "    const cellShapeList& cellsAsShapes,\n"
+                            "    const faceListList& boundaryFaces,\n"
+                            "    const wordList& boundaryPatchNames,\n"
+                            "    labelList& patchSizes,\n"
+                            "    labelList& patchStarts,\n"
+                            "    label& defaultPatchStart,\n"
+                            "    label& nFaces,\n"
+                            "    cellList& cells\n"
+                            ")"
+                        )   << "Trying to specify a boundary face " << curFace
+                            << " on the face on cell " << cellInside
+                            << " which is either an internal face or already "
+                            << "belongs to some other patch.  This is face "
+                            << faceI << " of patch "
+                            << patchI << " named "
+                            << boundaryPatchNames[patchI] << "."
+                            << abort(FatalError);
+                    }
+
+                    found = true;
+
+                    cells[cellInside][cellFaceI] = nFaces;
+
+                    break;
+                }
+            }
+
+            if (!found)
+            {
+                FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+                    << "face " << faceI << " of patch " << patchI
+                    << " does not seem to belong to cell " << cellInside
+                    << " which, according to the addressing, "
+                    << "should be next to it."
+                    << abort(FatalError);
+            }
+
+            // increment the counter of faces
+            nFaces++;
+        }
+
+        patchSizes[patchI] = nFaces - curPatchStart;
+        patchStarts[patchI] = curPatchStart;
+    }
+
+    // Grab "non-existing" faces and put them into a default patch
+
+    defaultPatchStart = nFaces;
+
+    forAll(cells, cellI)
+    {
+        labelList& curCellFaces = cells[cellI];
+
+        forAll(curCellFaces, faceI)
+        {
+            if (curCellFaces[faceI] == -1) // "non-existent" face
+            {
+                curCellFaces[faceI] = nFaces;
+                allFaces_[nFaces] = cellsFaceShapes[cellI][faceI];
+
+                nFaces++;
+            }
+        }
+    }
+
+    // Reset the size of the face list
+    allFaces_.setSize(nFaces);
+    faces_.reset(allFaces_, nFaces);
+
+    return ;
+}
+
+
 Foam::polyMesh::polyMesh
 (
     const IOobject& io,
@@ -278,278 +564,27 @@ Foam::polyMesh::polyMesh
     // Remove all of the old mesh files if they exist
     removeFiles(instance());
 
-    // Calculate the faces of all cells
-    // Initialise maximum possible numer of mesh faces to 0
-    label maxFaces = 0;
-
-    // Set up a list of face shapes for each cell
-    faceListList cellsFaceShapes(cellsAsShapes.size());
-    cellList cells(cellsAsShapes.size());
-
-    forAll(cellsFaceShapes, cellI)
-    {
-        cellsFaceShapes[cellI] = cellsAsShapes[cellI].faces();
-
-        cells[cellI].setSize(cellsFaceShapes[cellI].size());
-
-        // Initialise cells to -1 to flag undefined faces
-        static_cast<labelList&>(cells[cellI]) = -1;
-
-        // Count maximum possible numer of mesh faces
-        maxFaces += cellsFaceShapes[cellI].size();
-    }
-
-    // Set size of faces array to maximum possible number of mesh faces
-    allFaces_.setSize(maxFaces);
-
-    // Initialise number of faces to 0
-    label nFaces = 0;
-
-    // set reference to point-cell addressing
-    labelListList PointCells = cellShapePointCells(cellsAsShapes);
-
-    bool found = false;
-
-    forAll(cells, cellI)
-    {
-        // Note:
-        // Insertion cannot be done in one go as the faces need to be
-        // added into the list in the increasing order of neighbour
-        // cells.  Therefore, all neighbours will be detected first
-        // and then added in the correct order.
-
-        const faceList& curFaces = cellsFaceShapes[cellI];
-
-        // Record the neighbour cell
-        labelList neiCells(curFaces.size(), -1);
-
-        // Record the face of neighbour cell
-        labelList faceOfNeiCell(curFaces.size(), -1);
-
-        label nNeighbours = 0;
-
-        // For all faces ...
-        forAll(curFaces, faceI)
-        {
-            // Skip faces that have already been matched
-            if (cells[cellI][faceI] >= 0) continue;
-
-            found = false;
-
-            const face& curFace = curFaces[faceI];
-
-            // Get the list of labels
-            const labelList& curPoints = curFace;
-
-            // For all points
-            forAll(curPoints, pointI)
-            {
-                // Get the list of cells sharing this point
-                const labelList& curNeighbours =
-                    PointCells[curPoints[pointI]];
-
-                // For all neighbours
-                forAll(curNeighbours, neiI)
-                {
-                    label curNei = curNeighbours[neiI];
-
-                    // Reject neighbours with the lower label
-                    if (curNei > cellI)
-                    {
-                        // Get the list of search faces
-                        const faceList& searchFaces = cellsFaceShapes[curNei];
-
-                        forAll(searchFaces, neiFaceI)
-                        {
-                            if (searchFaces[neiFaceI] == curFace)
-                            {
-                                // Match!!
-                                found = true;
-
-                                // Record the neighbour cell and face
-                                neiCells[faceI] = curNei;
-                                faceOfNeiCell[faceI] = neiFaceI;
-                                nNeighbours++;
-
-                                break;
-                            }
-                        }
-                        if (found) break;
-                    }
-//                     if (found) break; HJ, not needed.  Never true
-                }
-                if (found) break;
-            } // End of current points
-        }  // End of current faces
-
-        // Add the faces in the increasing order of neighbours
-        for (label neiSearch = 0; neiSearch < nNeighbours; neiSearch++)
-        {
-            // Find the lowest neighbour which is still valid
-            label nextNei = -1;
-            label minNei = cells.size();
-
-            forAll (neiCells, ncI)
-            {
-                if (neiCells[ncI] > -1 && neiCells[ncI] < minNei)
-                {
-                    nextNei = ncI;
-                    minNei = neiCells[ncI];
-                }
-            }
-
-            if (nextNei > -1)
-            {
-                // Add the face to the list of faces
-               allFaces_[nFaces] = curFaces[nextNei];
-
-                // Set cell-face and cell-neighbour-face to current face label
-                cells[cellI][nextNei] = nFaces;
-                cells[neiCells[nextNei]][faceOfNeiCell[nextNei]] = nFaces;
-
-                // Stop the neighbour from being used again
-                neiCells[nextNei] = -1;
-
-                // Increment number of faces counter
-                nFaces++;
-            }
-            else
-            {
-                FatalErrorIn
-                (
-                    "polyMesh::polyMesh\n"
-                    "(\n"
-                    "    const IOobject&,\n"
-                    "    const Xfer<pointField>&,\n"
-                    "    const cellShapeList& cellsAsShapes,\n"
-                    "    const faceListList& boundaryFaces,\n"
-                    "    const wordList& boundaryPatchTypes,\n"
-                    "    const wordList& boundaryPatchNames,\n"
-                    "    const word& defaultBoundaryPatchType\n"
-                    ")"
-                )   << "Error in internal face insertion"
-                    << abort(FatalError);
-            }
-        }
-    }
-
-    // Do boundary faces
-
-    labelList patchSizes(boundaryFaces.size(), -1);
-    labelList patchStarts(boundaryFaces.size(), -1);
-
-    forAll (boundaryFaces, patchI)
-    {
-        const faceList& patchFaces = boundaryFaces[patchI];
-
-        labelList curPatchFaceCells =
-            facePatchFaceCells
-            (
-                patchFaces,
-                PointCells,
-                cellsFaceShapes,
-                patchI
-            );
-
-        // Grab the start label
-        label curPatchStart = nFaces;
-
-        forAll (patchFaces, faceI)
-        {
-            const face& curFace = patchFaces[faceI];
-
-            const label cellInside = curPatchFaceCells[faceI];
-
-            allFaces_[nFaces] = curFace;
-
-            // get faces of the cell inside
-            const faceList& facesOfCellInside = cellsFaceShapes[cellInside];
-
-            bool found = false;
-
-            forAll (facesOfCellInside, cellFaceI)
-            {
-                if (facesOfCellInside[cellFaceI] == curFace)
-                {
-                    if (cells[cellInside][cellFaceI] >= 0)
-                    {
-                        FatalErrorIn
-                        (
-                            "polyMesh::polyMesh\n"
-                            "(\n"
-                            "    const IOobject&,\n"
-                            "    const Xfer<pointField>&,\n"
-                            "    const cellShapeList& cellsAsShapes,\n"
-                            "    const faceListList& boundaryFaces,\n"
-                            "    const wordList& boundaryPatchTypes,\n"
-                            "    const wordList& boundaryPatchNames,\n"
-                            "    const word& defaultBoundaryPatchType\n"
-                            ")"
-                        )   << "Trying to specify a boundary face " << curFace
-                            << " on the face on cell " << cellInside
-                            << " which is either an internal face or already "
-                            << "belongs to some other patch.  This is face "
-                            << faceI << " of patch "
-                            << patchI << " named "
-                            << boundaryPatchNames[patchI] << "."
-                            << abort(FatalError);
-                    }
-
-                    found = true;
-
-                    cells[cellInside][cellFaceI] = nFaces;
-
-                    break;
-                }
-            }
-
-            if (!found)
-            {
-                FatalErrorIn
-                (
-                    "polyMesh::polyMesh(... construct from shapes...)"
-                )    << "face " << faceI << " of patch " << patchI
-                    << " does not seem to belong to cell " << cellInside
-                    << " which, according to the addressing, "
-                    << "should be next to it."
-                    << abort(FatalError);
-            }
-
-            // increment the counter of faces
-            nFaces++;
-        }
-
-        patchSizes[patchI] = nFaces - curPatchStart;
-        patchStarts[patchI] = curPatchStart;
-    }
-
-    // Grab "non-existing" faces and put them into a default patch
-
-    label defaultPatchStart = nFaces;
-
-    forAll(cells, cellI)
-    {
-        labelList& curCellFaces = cells[cellI];
-
-        forAll(curCellFaces, faceI)
-        {
-            if (curCellFaces[faceI] == -1) // "non-existent" face
-            {
-                curCellFaces[faceI] = nFaces;
-                allFaces_[nFaces] = cellsFaceShapes[cellI][faceI];
-
-                nFaces++;
-            }
-        }
-    }
-
-    // Reset the size of the face list
-    allFaces_.setSize(nFaces);
-    faces_.reset(allFaces_, nFaces);
+    // Calculate faces and cells
+    labelList patchSizes;
+    labelList patchStarts;
+    label defaultPatchStart;
+    label nFaces;
+    cellList cells;
+    setTopology
+    (
+        cellsAsShapes,
+        boundaryFaces,
+        boundaryPatchNames,
+        patchSizes,
+        patchStarts,
+        defaultPatchStart,
+        nFaces,
+        cells
+    );
 
     // Warning: Patches can only be added once the face list is
     // completed, as they hold a subList of the face list
-    forAll (boundaryFaces, patchI)
+    forAll(boundaryFaces, patchI)
     {
         // add the patch to the list
         boundary_.set
@@ -579,27 +614,346 @@ Foam::polyMesh::polyMesh
 
     label nAllPatches = boundaryFaces.size();
 
-    if (nFaces > defaultPatchStart)
+
+    label nDefaultFaces = nFaces - defaultPatchStart;
+    if (syncPar)
+    {
+        reduce(nDefaultFaces, sumOp<label>());
+    }
+
+    if (nDefaultFaces > 0)
     {
         WarningIn("polyMesh::polyMesh(... construct from shapes...)")
-            << "Found " << nFaces - defaultPatchStart
+            << "Found " << nDefaultFaces
             << " undefined faces in mesh; adding to default patch." << endl;
 
+        // Check if there already exists a defaultFaces patch as last patch
+        // and reuse it.
+        label patchI = findIndex(boundaryPatchNames, defaultBoundaryPatchName);
+
+        if (patchI != -1)
+        {
+            if (patchI != boundaryFaces.size()-1 || boundary_[patchI].size())
+            {
+                FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+                    << "Default patch " << boundary_[patchI].name()
+                    << " already has faces in it or is not"
+                    << " last in list of patches." << exit(FatalError);
+            }
+
+            WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+                << "Reusing existing patch " << patchI
+                << " for undefined faces." << endl;
+
+            boundary_.set
+            (
+                patchI,
+                polyPatch::New
+                (
+                    boundary_[patchI].type(),
+                    boundary_[patchI].name(),
+                    nFaces - defaultPatchStart,
+                    defaultPatchStart,
+                    patchI,
+                    boundary_
+                )
+            );
+        }
+        else
+        {
+            boundary_.set
+            (
+                nAllPatches,
+                polyPatch::New
+                (
+                    defaultBoundaryPatchType,
+                    defaultBoundaryPatchName,
+                    nFaces - defaultPatchStart,
+                    defaultPatchStart,
+                    boundary_.size() - 1,
+                    boundary_
+                )
+            );
+
+            nAllPatches++;
+        }
+    }
+
+    // Reset the size of the boundary
+    boundary_.setSize(nAllPatches);
+
+    // Set the primitive mesh
+    initMesh(cells);
+
+    if (syncPar)
+    {
+        // Calculate topology for the patches (processor-processor comms etc.)
+        boundary_.updateMesh();
+
+        // Calculate the geometry for the patches (transformation tensors etc.)
+        boundary_.calcGeometry();
+    }
+
+    if (debug)
+    {
+        if (checkMesh())
+        {
+            Info << "Mesh OK" << endl;
+        }
+    }
+}
+
+
+Foam::polyMesh::polyMesh
+(
+    const IOobject& io,
+    const Xfer<pointField>& points,
+    const cellShapeList& cellsAsShapes,
+    const faceListList& boundaryFaces,
+    const wordList& boundaryPatchNames,
+    const PtrList<dictionary>& boundaryDicts,
+    const word& defaultBoundaryPatchName,
+    const word& defaultBoundaryPatchType,
+    const bool syncPar
+)
+:
+    objectRegistry(io),
+    primitiveMesh(),
+    allPoints_
+    (
+        IOobject
+        (
+            "points",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        points
+    ),
+    // To be re-sliced later.  HJ, 19/oct/2008
+    points_(allPoints_, allPoints_.size()),
+    allFaces_
+    (
+        IOobject
+        (
+            "faces",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        0
+    ),
+    faces_(allFaces_, allFaces_.size()),
+    owner_
+    (
+        IOobject
+        (
+            "owner",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        0
+    ),
+    neighbour_
+    (
+        IOobject
+        (
+            "neighbour",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        0
+    ),
+    clearedPrimitives_(false),
+    boundary_
+    (
+        IOobject
+        (
+            "boundary",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        *this,
+        boundaryFaces.size() + 1    // add room for a default patch
+    ),
+    bounds_(allPoints_, syncPar),
+    geometricD_(Vector<label>::zero),
+    solutionD_(Vector<label>::zero),
+    pointZones_
+    (
+        IOobject
+        (
+            "pointZones",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this,
+        0
+    ),
+    faceZones_
+    (
+        IOobject
+        (
+            "faceZones",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this,
+        0
+    ),
+    cellZones_
+    (
+        IOobject
+        (
+            "cellZones",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this,
+        0
+    ),
+    globalMeshDataPtr_(NULL),
+    moving_(false),
+    changing_(false),
+    curMotionTimeIndex_(time().timeIndex()),
+    oldAllPointsPtr_(NULL),
+    oldPointsPtr_(NULL)
+{
+    if (debug)
+    {
+        Info<<"Constructing polyMesh from cell and boundary shapes." << endl;
+    }
+
+    // Remove all of the old mesh files if they exist
+    removeFiles(instance());
+
+    // Calculate faces and cells
+    labelList patchSizes;
+    labelList patchStarts;
+    label defaultPatchStart;
+    label nFaces;
+    cellList cells;
+    setTopology
+    (
+        cellsAsShapes,
+        boundaryFaces,
+        boundaryPatchNames,
+        patchSizes,
+        patchStarts,
+        defaultPatchStart,
+        nFaces,
+        cells
+    );
+
+    // Warning: Patches can only be added once the face list is
+    // completed, as they hold a subList of the face list
+    forAll(boundaryDicts, patchI)
+    {
+        dictionary patchDict(boundaryDicts[patchI]);
+
+        patchDict.set("nFaces", patchSizes[patchI]);
+        patchDict.set("startFace", patchStarts[patchI]);
+
+        // add the patch to the list
         boundary_.set
         (
-            nAllPatches,
+            patchI,
             polyPatch::New
             (
-                defaultBoundaryPatchType,
-                defaultBoundaryPatchName,
-                nFaces - defaultPatchStart,
-                defaultPatchStart,
-                boundary_.size() - 1,
+                boundaryPatchNames[patchI],
+                patchDict,
+                patchI,
                 boundary_
             )
         );
+    }
 
-        nAllPatches++;
+    label nAllPatches = boundaryFaces.size();
+
+    label nDefaultFaces = nFaces - defaultPatchStart;
+    if (syncPar)
+    {
+        reduce(nDefaultFaces, sumOp<label>());
+    }
+
+    if (nDefaultFaces > 0)
+    {
+        WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+            << "Found " << nDefaultFaces
+            << " undefined faces in mesh; adding to default patch." << endl;
+
+        // Check if there already exists a defaultFaces patch as last patch
+        // and reuse it.
+        label patchI = findIndex(boundaryPatchNames, defaultBoundaryPatchName);
+
+        if (patchI != -1)
+        {
+            if (patchI != boundaryFaces.size()-1 || boundary_[patchI].size())
+            {
+                FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+                    << "Default patch " << boundary_[patchI].name()
+                    << " already has faces in it or is not"
+                    << " last in list of patches." << exit(FatalError);
+            }
+
+            WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+                << "Reusing existing patch " << patchI
+                << " for undefined faces." << endl;
+
+            boundary_.set
+            (
+                patchI,
+                polyPatch::New
+                (
+                    boundary_[patchI].type(),
+                    boundary_[patchI].name(),
+                    nFaces - defaultPatchStart,
+                    defaultPatchStart,
+                    patchI,
+                    boundary_
+                )
+            );
+        }
+        else
+        {
+            boundary_.set
+            (
+                nAllPatches,
+                polyPatch::New
+                (
+                    defaultBoundaryPatchType,
+                    defaultBoundaryPatchName,
+                    nFaces - defaultPatchStart,
+                    defaultPatchStart,
+                    boundary_.size() - 1,
+                    boundary_
+                )
+            );
+
+            nAllPatches++;
+        }
     }
 
     // Reset the size of the boundary
diff --git a/src/foam/meshes/preservePatchTypes/preservePatchTypes.C b/src/foam/meshes/preservePatchTypes/preservePatchTypes.C
index aec2c1bf6..239dfc1fa 100644
--- a/src/foam/meshes/preservePatchTypes/preservePatchTypes.C
+++ b/src/foam/meshes/preservePatchTypes/preservePatchTypes.C
@@ -25,7 +25,6 @@ License
 
 #include "preservePatchTypes.H"
 #include "polyBoundaryMeshEntries.H"
-#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
@@ -35,14 +34,16 @@ void Foam::preservePatchTypes
     const word& meshInstance,
     const fileName& meshDir,
     const wordList& patchNames,
-    wordList& patchTypes,
+    PtrList<dictionary>& patchDicts,
     const word& defaultFacesName,
-    word& defaultFacesType,
-    wordList& patchPhysicalTypes
+    word& defaultFacesType
 )
 {
+    patchDicts.setSize(patchNames.size());
+
     dictionary patchDictionary;
 
+    // Read boundary file as single dictionary
     {
         IOobject patchEntriesHeader
         (
@@ -67,36 +68,28 @@ void Foam::preservePatchTypes
         }
     }
 
-    if (patchDictionary.size())
+    forAll(patchNames, patchi)
     {
-        forAll(patchNames, patchi)
-        {
-            if (patchDictionary.found(patchNames[patchi]))
-            {
-                const dictionary& patchDict =
-                    patchDictionary.subDict(patchNames[patchi]);
-
-                patchDict.lookup("type") >> patchTypes[patchi];
-
-                patchDict.readIfPresent("geometricType", patchTypes[patchi]);
-                patchDict.readIfPresent
-                (
-                    "physicalType",
-                    patchPhysicalTypes[patchi]
-                );
-            }
-        }
-
-        if (patchDictionary.found(defaultFacesName))
+        if (patchDictionary.found(patchNames[patchi]))
         {
             const dictionary& patchDict =
-                patchDictionary.subDict(defaultFacesName);
+                patchDictionary.subDict(patchNames[patchi]);
 
-            patchDict.readIfPresent("geometricType", defaultFacesType);
+            patchDicts.set(patchi, patchDict.clone());
+            patchDicts[patchi].remove("nFaces");
+            patchDicts[patchi].remove("startFace");
         }
     }
 
-    Info << nl << "Default patch type set to " << defaultFacesType << endl;
+    if (patchDictionary.found(defaultFacesName))
+    {
+        const dictionary& patchDict =
+            patchDictionary.subDict(defaultFacesName);
+
+        patchDict.readIfPresent("geometricType", defaultFacesType);
+    }
+
+    Info<< nl << "Default patch type set to " << defaultFacesType << endl;
 }
 
 
diff --git a/src/foam/meshes/preservePatchTypes/preservePatchTypes.H b/src/foam/meshes/preservePatchTypes/preservePatchTypes.H
index 740bce67e..c007ac2ae 100644
--- a/src/foam/meshes/preservePatchTypes/preservePatchTypes.H
+++ b/src/foam/meshes/preservePatchTypes/preservePatchTypes.H
@@ -37,6 +37,7 @@ SourceFiles
 
 #include "fileName.H"
 #include "wordList.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,10 +53,9 @@ void preservePatchTypes
     const word& meshInstance,
     const fileName& meshDir,
     const wordList& patchNames,
-    wordList& patchTypes,
+    PtrList<dictionary>& patchDicts,
     const word& defaultFacesName,
-    word& defaultFacesType,
-    wordList& patchPhysicalTypes
+    word& defaultFacesType
 );
 
 } // End namespace Foam
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
new file mode 100755
index 000000000..4653b1d3c
--- /dev/null
+++ b/src/mesh/Allwmake
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+makeType=${1:-libso}
+set -x
+
+wmake $makeType autoMesh
+wmake $makeType blockMesh
+wmake $makeType extrudeModel
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/mesh/autoMesh/Make/files b/src/mesh/autoMesh/Make/files
new file mode 100644
index 000000000..fecec5db5
--- /dev/null
+++ b/src/mesh/autoMesh/Make/files
@@ -0,0 +1,26 @@
+autoHexMesh             = autoHexMesh
+autoHexMeshDriver       = $(autoHexMesh)/autoHexMeshDriver
+
+$(autoHexMeshDriver)/autoLayerDriver.C
+$(autoHexMeshDriver)/autoLayerDriverShrink.C
+$(autoHexMeshDriver)/autoSnapDriver.C
+$(autoHexMeshDriver)/autoRefineDriver.C
+$(autoHexMeshDriver)/autoHexMeshDriver.C
+
+$(autoHexMeshDriver)/layerParameters/layerParameters.C
+$(autoHexMeshDriver)/refinementParameters/refinementParameters.C
+$(autoHexMeshDriver)/snapParameters/snapParameters.C
+$(autoHexMeshDriver)/pointData/pointData.C
+
+$(autoHexMesh)/meshRefinement/meshRefinementBaffles.C
+$(autoHexMesh)/meshRefinement/meshRefinement.C
+$(autoHexMesh)/meshRefinement/meshRefinementMerge.C
+$(autoHexMesh)/meshRefinement/meshRefinementProblemCells.C
+$(autoHexMesh)/meshRefinement/meshRefinementRefine.C
+$(autoHexMesh)/refinementSurfaces/refinementSurfaces.C
+$(autoHexMesh)/shellSurfaces/shellSurfaces.C
+$(autoHexMesh)/trackedParticle/trackedParticle.C
+$(autoHexMesh)/trackedParticle/trackedParticleCloud.C
+
+LIB = $(FOAM_LIBBIN)/libautoMesh
+
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options
new file mode 100644
index 000000000..289c78c99
--- /dev/null
+++ b/src/mesh/autoMesh/Make/options
@@ -0,0 +1,19 @@
+EXE_INC = \
+    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude
+
+LIB_LIBS = \
+    -ldecompositionMethods \
+    -ldynamicMesh \
+    -ldynamicFvMesh \
+    -lfiniteVolume \
+    -llagrangian \
+    -lmeshTools \
+    -ledgeMesh \
+    -ltriSurface
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
new file mode 100644
index 000000000..756ef8ea4
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
@@ -0,0 +1,552 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*----------------------------------------------------------------------------*/
+
+#include "autoHexMeshDriver.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "boundBox.H"
+#include "wallPolyPatch.H"
+#include "cellSet.H"
+#include "syncTools.H"
+#include "refinementParameters.H"
+#include "snapParameters.H"
+#include "layerParameters.H"
+#include "autoRefineDriver.H"
+#include "autoSnapDriver.H"
+#include "autoLayerDriver.H"
+#include "triSurfaceMesh.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(autoHexMeshDriver, 0);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Check writing tolerance before doing any serious work
+Foam::scalar Foam::autoHexMeshDriver::getMergeDistance(const scalar mergeTol)
+ const
+{
+    const boundBox& meshBb = mesh_.bounds();
+    scalar mergeDist = mergeTol * meshBb.mag();
+    scalar writeTol = std::pow
+    (
+        scalar(10.0),
+       -scalar(IOstream::defaultPrecision())
+    );
+
+    Info<< nl
+        << "Overall mesh bounding box  : " << meshBb << nl
+        << "Relative tolerance         : " << mergeTol << nl
+        << "Absolute matching distance : " << mergeDist << nl
+        << endl;
+
+    if (mesh_.time().writeFormat() == IOstream::ASCII && mergeTol < writeTol)
+    {
+        FatalErrorIn("autoHexMeshDriver::getMergeDistance(const scalar) const")
+            << "Your current settings specify ASCII writing with "
+            << IOstream::defaultPrecision() << " digits precision." << endl
+            << "Your merging tolerance (" << mergeTol << ") is finer than this."
+            << endl
+            << "Please change your writeFormat to binary"
+            << " or increase the writePrecision" << endl
+            << "or adjust the merge tolerance (-mergeTol)."
+            << exit(FatalError);
+    }
+
+    return mergeDist;
+}
+
+
+//// Specifically orient using a calculated point outside
+//void Foam::autoHexMeshDriver::orientOutside
+//(
+//    PtrList<searchableSurface>& shells
+//)
+//{
+//    // Determine outside point.
+//    boundBox overallBb = boundBox::invertedBox;
+//
+//    bool hasSurface = false;
+//
+//    forAll(shells, shellI)
+//    {
+//        if (isA<triSurfaceMesh>(shells[shellI]))
+//        {
+//            const triSurfaceMesh& shell =
+//                refCast<const triSurfaceMesh>(shells[shellI]);
+//
+//            hasSurface = true;
+//
+//            boundBox shellBb(shell.localPoints(), false);
+//
+//            overallBb.min() = min(overallBb.min(), shellBb.min());
+//            overallBb.max() = max(overallBb.max(), shellBb.max());
+//        }
+//    }
+//
+//    if (hasSurface)
+//    {
+//        const point outsidePt = 2 * overallBb.span();
+//
+//        //Info<< "Using point " << outsidePt << " to orient shells" << endl;
+//
+//        forAll(shells, shellI)
+//        {
+//            if (isA<triSurfaceMesh>(shells[shellI]))
+//            {
+//                triSurfaceMesh& shell =
+//                  refCast<triSurfaceMesh>(shells[shellI]);
+//
+//                if (!refinementSurfaces::isSurfaceClosed(shell))
+//                {
+//                    FatalErrorIn("orientOutside(PtrList<searchableSurface>&)")
+//                        << "Refinement shell "
+//                        << shell.searchableSurface::name()
+//                        << " is not closed." << exit(FatalError);
+//                }
+//
+//                refinementSurfaces::orientSurface(outsidePt, shell);
+//            }
+//        }
+//    }
+//}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Construct from components
+Foam::autoHexMeshDriver::autoHexMeshDriver
+(
+    fvMesh& mesh,
+    const bool overwrite,
+    const dictionary& dict,
+    const dictionary& decomposeDict
+)
+:
+    mesh_(mesh),
+    dict_(dict),
+    debug_(readLabel(dict_.lookup("debug"))),
+    mergeDist_(getMergeDistance(readScalar(dict_.lookup("mergeTolerance"))))
+{
+    if (debug_ > 0)
+    {
+        meshRefinement::debug = debug_;
+        autoHexMeshDriver::debug = debug_;
+        autoRefineDriver::debug = debug;
+        autoSnapDriver::debug = debug;
+        autoLayerDriver::debug = debug;
+    }
+
+    refinementParameters refineParams(dict, 1);
+
+    Info<< "Overall cell limit                         : "
+        << refineParams.maxGlobalCells() << endl;
+    Info<< "Per processor cell limit                   : "
+        << refineParams.maxLocalCells() << endl;
+    Info<< "Minimum number of cells to refine          : "
+        << refineParams.minRefineCells() << endl;
+    Info<< "Curvature                                  : "
+        << refineParams.curvature() << nl << endl;
+    Info<< "Layers between different refinement levels : "
+        << refineParams.nBufferLayers() << endl;
+
+    PtrList<dictionary> shellDicts(dict_.lookup("refinementShells"));
+
+    PtrList<dictionary> surfaceDicts(dict_.lookup("surfaces"));
+
+
+    // Read geometry
+    // ~~~~~~~~~~~~~
+
+    {
+        Info<< "Reading all geometry." << endl;
+
+        // Construct dictionary with all shells and all refinement surfaces
+        dictionary geometryDict;
+
+        forAll(shellDicts, shellI)
+        {
+            dictionary shellDict = shellDicts[shellI];
+            const word name(shellDict.lookup("name"));
+            shellDict.remove("name");
+            shellDict.remove("level");
+            shellDict.remove("refineInside");
+            geometryDict.add(name, shellDict);
+        }
+
+        forAll(surfaceDicts, surfI)
+        {
+            dictionary surfDict = surfaceDicts[surfI];
+            const word name(string::validate<word>(surfDict.lookup("file")));
+            surfDict.remove("file");
+            surfDict.remove("regions");
+            if (!surfDict.found("name"))
+            {
+                surfDict.add("name", name);
+            }
+            surfDict.add("type", triSurfaceMesh::typeName);
+            geometryDict.add(name, surfDict);
+        }
+
+        allGeometryPtr_.reset
+        (
+            new searchableSurfaces
+            (
+                IOobject
+                (
+                    "abc",                                      // dummy name
+                    //mesh_.time().findInstance("triSurface", word::null),
+                                                                // instance
+                    mesh_.time().constant(),                    // instance
+                    "triSurface",                               // local
+                    mesh_.time(),                               // registry
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                ),
+                geometryDict
+            )
+        );
+
+        Info<< "Read geometry in = "
+            << mesh_.time().cpuTimeIncrement() << " s" << endl;
+    }
+
+
+    // Read refinement surfaces
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    {
+        Info<< "Reading surfaces and constructing search trees." << endl;
+
+        surfacesPtr_.reset
+        (
+            new refinementSurfaces
+            (
+                allGeometryPtr_(),
+                surfaceDicts
+            )
+        );
+        Info<< "Read surfaces in = "
+            << mesh_.time().cpuTimeIncrement() << " s" << endl;
+    }
+
+    // Read refinement shells
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    {
+        Info<< "Reading refinement shells." << endl;
+        shellsPtr_.reset
+        (
+            new shellSurfaces
+            (
+                allGeometryPtr_(),
+                shellDicts
+            )
+        );
+        Info<< "Read refinement shells in = "
+            << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+        //// Orient shell surfaces before any searching is done.
+        //Info<< "Orienting triSurface shells so point far away is outside."
+        //    << endl;
+        //orientOutside(shells_);
+        //Info<< "Oriented shells in = "
+        //    << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+        Info<< "Setting refinement level of surface to be consistent"
+            << " with shells." << endl;
+        surfacesPtr_().setMinLevelFields(shells());
+        Info<< "Checked shell refinement in = "
+            << mesh_.time().cpuTimeIncrement() << " s" << endl;
+    }
+
+
+    // Check faceZones are synchronised
+    meshRefinement::checkCoupledFaceZones(mesh_);
+
+
+    // Refinement engine
+    // ~~~~~~~~~~~~~~~~~
+
+    {
+        Info<< nl
+            << "Determining initial surface intersections" << nl
+            << "-----------------------------------------" << nl
+            << endl;
+
+        // Main refinement engine
+        meshRefinerPtr_.reset
+        (
+            new meshRefinement
+            (
+                mesh,
+                mergeDist_,         // tolerance used in sorting coordinates
+                overwrite,
+                surfaces(),
+                shells()
+            )
+        );
+        Info<< "Calculated surface intersections in = "
+            << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+        // Some stats
+        meshRefinerPtr_().printMeshInfo(debug_, "Initial mesh");
+
+        meshRefinerPtr_().write
+        (
+            debug_&meshRefinement::OBJINTERSECTIONS,
+            mesh_.time().path()/meshRefinerPtr_().timeName()
+        );
+    }
+
+
+    // Add all the surface regions as patches
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    {
+        Info<< nl
+            << "Adding patches for surface regions" << nl
+            << "----------------------------------" << nl
+            << endl;
+
+        // From global region number to mesh patch.
+        globalToPatch_.setSize(surfaces().nRegions(), -1);
+
+        Info<< "Patch\tRegion" << nl
+            << "-----\t------"
+            << endl;
+
+        const labelList& surfaceGeometry = surfaces().surfaces();
+        forAll(surfaceGeometry, surfI)
+        {
+            label geomI = surfaceGeometry[surfI];
+
+            const wordList& regNames = allGeometryPtr_().regionNames()[geomI];
+
+            Info<< surfaces().names()[surfI] << ':' << nl << nl;
+
+            forAll(regNames, i)
+            {
+                label patchI = meshRefinerPtr_().addMeshedPatch
+                (
+                    regNames[i],
+                    wallPolyPatch::typeName
+                );
+
+                Info<< patchI << '\t' << regNames[i] << nl;
+
+                globalToPatch_[surfaces().globalRegion(surfI, i)] = patchI;
+            }
+
+            Info<< nl;
+        }
+        Info<< "Added patches in = "
+            << mesh_.time().cpuTimeIncrement() << " s" << nl << endl;
+    }
+
+
+    //// Add cyclics for any named faceZones
+    //// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    //// (these cyclics are used later on to temporarily put the faceZones
+    ////  in when snapping)
+    //
+    //labelList namedSurfaces(surfaces().getNamedSurfaces());
+    //if (namedSurfaces.size())
+    //{
+    //    Info<< nl
+    //        << "Introducing cyclics for faceZones" << nl
+    //        << "---------------------------------" << nl
+    //        << endl;
+    //
+    //    // From surface to cyclic patch
+    //    surfaceToCyclicPatch_.setSize(surfaces().size(), -1);
+    //
+    //    Info<< "Patch\tZone" << nl
+    //        << "----\t-----"
+    //        << endl;
+    //
+    //    forAll(namedSurfaces, i)
+    //    {
+    //        label surfI = namedSurfaces[i];
+    //
+    //        surfaceToCyclicPatch_[surfI] = meshRefinement::addPatch
+    //        (
+    //            mesh,
+    //            surfaces().faceZoneNames()[surfI],
+    //            cyclicPolyPatch::typeName
+    //        );
+    //
+    //        Info<< surfaceToCyclicPatch_[surfI] << '\t'
+    //            << surfaces().faceZoneNames()[surfI] << nl << endl;
+    //    }
+    //    Info<< "Added cyclic patches in = "
+    //        << mesh_.time().cpuTimeIncrement() << " s" << endl;
+    //}
+
+
+    // Parallel
+    // ~~~~~~~~
+
+    {
+        // Decomposition
+        decomposerPtr_ = decompositionMethod::New
+        (
+            decomposeDict,
+            mesh_
+        );
+        decompositionMethod& decomposer = decomposerPtr_();
+
+
+        if (Pstream::parRun() && !decomposer.parallelAware())
+        {
+            FatalErrorIn("autoHexMeshDriver::autoHexMeshDriver"
+                "(const IOobject&, fvMesh&)")
+                << "You have selected decomposition method "
+                << decomposer.typeName
+                << " which is not parallel aware." << endl
+                << "Please select one that is (parMetis, hierarchical)"
+                << exit(FatalError);
+        }
+
+        // Mesh distribution engine (uses tolerance to reconstruct meshes)
+        distributorPtr_.reset(new fvMeshDistribute(mesh_, mergeDist_));
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::autoHexMeshDriver::writeMesh(const string& msg) const
+{
+    const meshRefinement& meshRefiner = meshRefinerPtr_();
+
+    meshRefiner.printMeshInfo(debug_, msg);
+    Info<< "Writing mesh to time " << meshRefiner.timeName() << endl;
+
+    meshRefiner.write(meshRefinement::MESH|meshRefinement::SCALARLEVELS, "");
+    if (debug_ & meshRefinement::OBJINTERSECTIONS)
+    {
+        meshRefiner.write
+        (
+            meshRefinement::OBJINTERSECTIONS,
+            mesh_.time().path()/meshRefiner.timeName()
+        );
+    }
+    Info<< "Written mesh in = "
+        << mesh_.time().cpuTimeIncrement() << " s." << endl;
+}
+
+
+void Foam::autoHexMeshDriver::doMesh()
+{
+    Switch wantRefine(dict_.lookup("doRefine"));
+    Switch wantSnap(dict_.lookup("doSnap"));
+    Switch wantLayers(dict_.lookup("doLayers"));
+
+    Info<< "Do refinement : " << wantRefine << nl
+        << "Do snapping   : " << wantSnap << nl
+        << "Do layers     : " << wantLayers << nl
+        << endl;
+
+    if (wantRefine)
+    {
+        const dictionary& motionDict = dict_.subDict("motionDict");
+
+        autoRefineDriver refineDriver
+        (
+            meshRefinerPtr_(),
+            decomposerPtr_(),
+            distributorPtr_(),
+            globalToPatch_
+        );
+
+        // Get all the refinement specific params
+        refinementParameters refineParams(dict_, 1);
+
+        refineDriver.doRefine(dict_, refineParams, wantSnap, motionDict);
+
+        // Write mesh
+        writeMesh("Refined mesh");
+    }
+
+    if (wantSnap)
+    {
+        const dictionary& snapDict = dict_.subDict("snapDict");
+        const dictionary& motionDict = dict_.subDict("motionDict");
+
+        autoSnapDriver snapDriver
+        (
+            meshRefinerPtr_(),
+            globalToPatch_
+        );
+
+        // Get all the snapping specific params
+        snapParameters snapParams(snapDict, 1);
+
+        snapDriver.doSnap(snapDict, motionDict, snapParams);
+
+        // Write mesh.
+        writeMesh("Snapped mesh");
+    }
+
+    if (wantLayers)
+    {
+        const dictionary& motionDict = dict_.subDict("motionDict");
+        const dictionary& shrinkDict = dict_.subDict("shrinkDict");
+        PtrList<dictionary> surfaceDicts(dict_.lookup("surfaces"));
+
+        autoLayerDriver layerDriver(meshRefinerPtr_());
+
+        // Get all the layer specific params
+        layerParameters layerParams
+        (
+            surfaceDicts,
+            surfacesPtr_(),
+            globalToPatch_,
+            shrinkDict,
+            mesh_.boundaryMesh()
+        );
+
+        layerDriver.doLayers
+        (
+            shrinkDict,
+            motionDict,
+            layerParams,
+            true,                   // pre-balance
+            decomposerPtr_(),
+            distributorPtr_()
+        );
+
+        // Write mesh.
+        writeMesh("Layer mesh");
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
new file mode 100644
index 000000000..4fc55795a
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
@@ -0,0 +1,233 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::autoHexMeshDriver
+
+Description
+    main meshing driver.
+
+SourceFiles
+    autoHexMeshDriver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef autoHexMeshDriver_H
+#define autoHexMeshDriver_H
+
+#include "autoPtr.H"
+#include "dictionary.H"
+#include "wallPoint.H"
+#include "searchableSurfaces.H"
+#include "refinementSurfaces.H"
+#include "shellSurfaces.H"
+#include "meshRefinement.H"
+#include "decompositionMethod.H"
+#include "fvMeshDistribute.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Class forward declarations
+class fvMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class autoHexMeshDriver Declaration
+\*---------------------------------------------------------------------------*/
+
+class autoHexMeshDriver
+{
+    // Static data members
+
+        //- Extrusion controls
+        enum extrudeMode
+        {
+            NOEXTRUDE,      /*!< Do not extrude. No layers added. */
+            EXTRUDE,        /*!< Extrude */
+            EXTRUDEREMOVE   /*!< Extrude but afterwards remove added */
+                            /*!< faces locally */
+        };
+
+
+    // Private classes
+
+        //- Combine operator class for equalizing displacements.
+        class minMagEqOp
+        {
+        public:
+
+            void operator()(vector& x, const vector& y) const
+            {
+                if (magSqr(y) < magSqr(x))
+                {
+                    x = y;
+                }
+            }
+        };
+
+        //- Combine operator class to combine normal with other normal.
+        class nomalsCombine
+        {
+        public:
+
+            void operator()(vector& x, const vector& y) const
+            {
+                if (y != wallPoint::greatPoint)
+                {
+                    if (x == wallPoint::greatPoint)
+                    {
+                        x = y;
+                    }
+                    else
+                    {
+                        x *= (x&y);
+                    }
+                }
+            }
+        };
+
+
+
+    // Private data
+
+        //- Reference to mesh
+        fvMesh& mesh_;
+
+        //- Input dictionary
+        const dictionary dict_;
+
+        //- Debug level
+        const label debug_;
+
+        //- Merge distance
+        const scalar mergeDist_;
+
+
+        //- All surface based geometry
+        autoPtr<searchableSurfaces> allGeometryPtr_;
+
+        //- Shells (geometry for inside/outside refinement)
+        autoPtr<shellSurfaces> shellsPtr_;
+
+        //- Surfaces (geometry for intersection based refinement)
+        autoPtr<refinementSurfaces> surfacesPtr_;
+
+        //- Per refinement surface region the patch
+        labelList globalToPatch_;
+
+        //- Mesh refinement engine
+        autoPtr<meshRefinement> meshRefinerPtr_;
+
+        //- Decomposition engine
+        autoPtr<decompositionMethod> decomposerPtr_;
+
+        //- Mesh distribution engine
+        autoPtr<fvMeshDistribute> distributorPtr_;
+
+
+
+    // Private Member Functions
+
+        //- Calculate merge distance. Check against writing tolerance.
+        scalar getMergeDistance(const scalar mergeTol) const;
+
+        //static void orientOutside(PtrList<searchableSurface>&);
+
+        //- Disallow default bitwise copy construct
+        autoHexMeshDriver(const autoHexMeshDriver&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const autoHexMeshDriver&);
+
+public:
+
+    //- Runtime type information
+    ClassName("autoHexMeshDriver");
+
+
+    // Constructors
+
+        //- Construct from dictionary and mesh to modify
+        autoHexMeshDriver
+        (
+            fvMesh& mesh,
+            const bool overwrite,
+            const dictionary& meshDict,
+            const dictionary& decomposeDict
+        );
+
+
+    // Member Functions
+
+        // Access
+
+            //- reference to mesh
+            const fvMesh& mesh() const
+            {
+                return mesh_;
+            }
+            fvMesh& mesh()
+            {
+                return mesh_;
+            }
+
+            //- Surfaces to base refinement on
+            const refinementSurfaces& surfaces() const
+            {
+                return surfacesPtr_();
+            }
+
+            //- Surfaces to volume refinement on
+            const shellSurfaces& shells() const
+            {
+                return shellsPtr_();
+            }
+
+            //- Per refinementsurface, per region the patch
+            const labelList& globalToPatch() const
+            {
+                return globalToPatch_;
+            }
+
+
+        // Meshing
+
+            //- Write mesh
+            void writeMesh(const string&) const;
+
+            //- Do all : refine, snap, layers
+            void doMesh();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
new file mode 100644
index 000000000..d6d1502b0
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -0,0 +1,3375 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    All to do with adding cell layers
+
+\*---------------------------------------------------------------------------*/
+
+#include "autoLayerDriver.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "meshRefinement.H"
+#include "removePoints.H"
+#include "pointFields.H"
+#include "motionSmoother.H"
+#include "mathematicalConstants.H"
+#include "pointSet.H"
+#include "faceSet.H"
+#include "cellSet.H"
+#include "directTopoChange.H"
+#include "mapPolyMesh.H"
+#include "addPatchCellLayer.H"
+#include "mapDistributePolyMesh.H"
+#include "OFstream.H"
+#include "layerParameters.H"
+#include "combineFaces.H"
+#include "IOmanip.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(autoLayerDriver, 0);
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::label Foam::autoLayerDriver::mergePatchFacesUndo
+(
+    const scalar minCos,
+    const scalar concaveCos,
+    const dictionary& motionDict
+)
+{
+    fvMesh& mesh = meshRefiner_.mesh();
+
+    // Patch face merging engine
+    combineFaces faceCombiner(mesh, true);
+
+    // Pick up all candidate cells on boundary
+    labelHashSet boundaryCells(mesh.nFaces()-mesh.nInternalFaces());
+
+    {
+        labelList patchIDs(meshRefiner_.meshedPatches());
+
+        const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+        forAll(patchIDs, i)
+        {
+            label patchI = patchIDs[i];
+
+            const polyPatch& patch = patches[patchI];
+
+            if (!patch.coupled())
+            {
+                forAll(patch, i)
+                {
+                    boundaryCells.insert(mesh.faceOwner()[patch.start()+i]);
+                }
+            }
+        }
+    }
+
+    // Get all sets of faces that can be merged
+    labelListList allFaceSets
+    (
+        faceCombiner.getMergeSets
+        (
+            minCos,
+            concaveCos,
+            boundaryCells
+        )
+    );
+
+    label nFaceSets = returnReduce(allFaceSets.size(), sumOp<label>());
+
+    Info<< "Merging " << nFaceSets << " sets of faces." << nl << endl;
+
+    if (nFaceSets > 0)
+    {
+        if (debug)
+        {
+            faceSet allSets(mesh, "allFaceSets", allFaceSets.size());
+            forAll(allFaceSets, setI)
+            {
+                forAll(allFaceSets[setI], i)
+                {
+                    allSets.insert(allFaceSets[setI][i]);
+                }
+            }
+            Pout<< "Writing all faces to be merged to set "
+                << allSets.objectPath() << endl;
+            allSets.write();
+        }
+
+
+        // Topology changes container
+        directTopoChange meshMod(mesh);
+
+        // Merge all faces of a set into the first face of the set.
+        faceCombiner.setRefinement(allFaceSets, meshMod);
+
+        // Experimental: store data for all the points that have been deleted
+        meshRefiner_.storeData
+        (
+            faceCombiner.savedPointLabels(),    // points to store
+            labelList(0),                       // faces to store
+            labelList(0)                        // cells to store
+        );
+
+        // Change the mesh (no inflation)
+        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
+
+        // Update fields
+        mesh.updateMesh(map);
+
+        // Move mesh (since morphing does not do this)
+        if (map().hasMotionPoints())
+        {
+            mesh.movePoints(map().preMotionPoints());
+        }
+        else
+        {
+            // Delete mesh volumes.
+            mesh.clearOut();
+        }
+
+        if (meshRefiner_.overwrite())
+        {
+            mesh.setInstance(meshRefiner_.oldInstance());
+        }
+
+        faceCombiner.updateMesh(map);
+
+        meshRefiner_.updateMesh(map, labelList(0));
+
+
+        for (label iteration = 0; iteration < 100; iteration++)
+        {
+            Info<< nl
+                << "Undo iteration " << iteration << nl
+                << "----------------" << endl;
+
+
+            // Check mesh for errors
+            // ~~~~~~~~~~~~~~~~~~~~~
+
+            faceSet errorFaces
+            (
+                mesh,
+                "errorFaces",
+                mesh.nFaces()-mesh.nInternalFaces()
+            );
+            bool hasErrors = motionSmoother::checkMesh
+            (
+                false,  // report
+                mesh,
+                motionDict,
+                errorFaces
+            );
+            //if (checkEdgeConnectivity)
+            //{
+            //    Info<< "Checking edge-face connectivity (duplicate faces"
+            //        << " or non-consecutive shared vertices)" << endl;
+            //
+            //    label nOldSize = errorFaces.size();
+            //
+            //    hasErrors =
+            //        mesh.checkFaceFaces
+            //        (
+            //            false,
+            //            &errorFaces
+            //        )
+            //     || hasErrors;
+            //
+            //    Info<< "Detected additional "
+            //        << returnReduce(errorFaces.size()-nOldSize, sumOp<label>())
+            //        << " faces with illegal face-face connectivity"
+            //        << endl;
+            //}
+
+            if (!hasErrors)
+            {
+                break;
+            }
+
+
+            if (debug)
+            {
+                Pout<< "Writing all faces in error to faceSet "
+                    << errorFaces.objectPath() << nl << endl;
+                errorFaces.write();
+            }
+
+
+            // Check any master cells for using any of the error faces
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            DynamicList<label> mastersToRestore(allFaceSets.size());
+
+            forAll(allFaceSets, setI)
+            {
+                label masterFaceI = faceCombiner.masterFace()[setI];
+
+                if (masterFaceI != -1)
+                {
+                    label masterCellII = mesh.faceOwner()[masterFaceI];
+
+                    const cell& cFaces = mesh.cells()[masterCellII];
+
+                    forAll(cFaces, i)
+                    {
+                        if (errorFaces.found(cFaces[i]))
+                        {
+                            mastersToRestore.append(masterFaceI);
+                            break;
+                        }
+                    }
+                }
+            }
+            mastersToRestore.shrink();
+
+            label nRestore = returnReduce
+            (
+                mastersToRestore.size(),
+                sumOp<label>()
+            );
+
+            Info<< "Masters that need to be restored:"
+                << nRestore << endl;
+
+            if (debug)
+            {
+                faceSet restoreSet
+                (
+                    mesh,
+                    "mastersToRestore",
+                    labelHashSet(mastersToRestore)
+                );
+
+                Pout<< "Writing all " << mastersToRestore.size()
+                    << " masterfaces to be restored to set "
+                    << restoreSet.objectPath() << endl;
+                restoreSet.write();
+            }
+
+
+            if (nRestore == 0)
+            {
+                break;
+            }
+
+
+            // Undo
+            // ~~~~
+
+            // Topology changes container
+            directTopoChange meshMod(mesh);
+
+            // Merge all faces of a set into the first face of the set.
+            // Experimental:mark all points/faces/cells that have been restored.
+            Map<label> restoredPoints(0);
+            Map<label> restoredFaces(0);
+            Map<label> restoredCells(0);
+
+            faceCombiner.setUnrefinement
+            (
+                mastersToRestore,
+                meshMod,
+                restoredPoints,
+                restoredFaces,
+                restoredCells
+            );
+
+            // Change the mesh (no inflation)
+            autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
+
+            // Update fields
+            mesh.updateMesh(map);
+
+            // Move mesh (since morphing does not do this)
+            if (map().hasMotionPoints())
+            {
+                mesh.movePoints(map().preMotionPoints());
+            }
+            else
+            {
+                // Delete mesh volumes.
+                mesh.clearOut();
+            }
+
+            if (meshRefiner_.overwrite())
+            {
+                mesh.setInstance(meshRefiner_.oldInstance());
+            }
+
+            faceCombiner.updateMesh(map);
+
+            // Renumber restore maps
+            inplaceMapKey(map().reversePointMap(), restoredPoints);
+            inplaceMapKey(map().reverseFaceMap(), restoredFaces);
+            inplaceMapKey(map().reverseCellMap(), restoredCells);
+
+            // Experimental:restore all points/face/cells in maps
+            meshRefiner_.updateMesh
+            (
+                map,
+                labelList(0),       // changedFaces
+                restoredPoints,
+                restoredFaces,
+                restoredCells
+            );
+
+            Info<< endl;
+        }
+
+        if (debug)
+        {
+            Pout<< "Writing merged-faces mesh to time "
+                << meshRefiner_.timeName() << nl << endl;
+            mesh.write();
+        }
+    }
+    else
+    {
+        Info<< "No faces merged ..." << endl;
+    }
+
+    return nFaceSets;
+}
+
+
+// Remove points. pointCanBeDeleted is parallel synchronised.
+Foam::autoPtr<Foam::mapPolyMesh> Foam::autoLayerDriver::doRemovePoints
+(
+    removePoints& pointRemover,
+    const boolList& pointCanBeDeleted
+)
+{
+    fvMesh& mesh = meshRefiner_.mesh();
+
+    // Topology changes container
+    directTopoChange meshMod(mesh);
+
+    pointRemover.setRefinement(pointCanBeDeleted, meshMod);
+
+    // Change the mesh (no inflation)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
+
+    // Update fields
+    mesh.updateMesh(map);
+
+    // Move mesh (since morphing does not do this)
+    if (map().hasMotionPoints())
+    {
+        mesh.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh.clearOut();
+    }
+
+    if (meshRefiner_.overwrite())
+    {
+        mesh.setInstance(meshRefiner_.oldInstance());
+    }
+
+    pointRemover.updateMesh(map);
+    meshRefiner_.updateMesh(map, labelList(0));
+
+    return map;
+}
+
+
+// Restore faces (which contain removed points)
+Foam::autoPtr<Foam::mapPolyMesh> Foam::autoLayerDriver::doRestorePoints
+(
+    removePoints& pointRemover,
+    const labelList& facesToRestore
+)
+{
+    fvMesh& mesh = meshRefiner_.mesh();
+
+    // Topology changes container
+    directTopoChange meshMod(mesh);
+
+    // Determine sets of points and faces to restore
+    labelList localFaces, localPoints;
+    pointRemover.getUnrefimentSet
+    (
+        facesToRestore,
+        localFaces,
+        localPoints
+    );
+
+    // Undo the changes on the faces that are in error.
+    pointRemover.setUnrefinement
+    (
+        localFaces,
+        localPoints,
+        meshMod
+    );
+
+    // Change the mesh (no inflation)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
+
+    // Update fields
+    mesh.updateMesh(map);
+
+    // Move mesh (since morphing does not do this)
+    if (map().hasMotionPoints())
+    {
+        mesh.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh.clearOut();
+    }
+
+    if (meshRefiner_.overwrite())
+    {
+        mesh.setInstance(meshRefiner_.oldInstance());
+    }
+
+    pointRemover.updateMesh(map);
+    meshRefiner_.updateMesh(map, labelList(0));
+
+    return map;
+}
+
+
+// Collect all faces that are both in candidateFaces and in the set.
+// If coupled face also collects the coupled face.
+Foam::labelList Foam::autoLayerDriver::collectFaces
+(
+    const labelList& candidateFaces,
+    const labelHashSet& set
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Has face been selected?
+    boolList selected(mesh.nFaces(), false);
+
+    forAll(candidateFaces, i)
+    {
+        label faceI = candidateFaces[i];
+
+        if (set.found(faceI))
+        {
+            selected[faceI] = true;
+        }
+    }
+    syncTools::syncFaceList
+    (
+        mesh,
+        selected,
+        orEqOp<bool>(),     // combine operator
+        false               // separation
+    );
+
+    labelList selectedFaces(findIndices(selected, true));
+
+    return selectedFaces;
+}
+
+
+// Pick up faces of cells of faces in set.
+Foam::labelList Foam::autoLayerDriver::growFaceCellFace
+(
+    const labelHashSet& set
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    boolList selected(mesh.nFaces(), false);
+
+    forAllConstIter(faceSet, set, iter)
+    {
+        label faceI = iter.key();
+
+        label own = mesh.faceOwner()[faceI];
+
+        const cell& ownFaces = mesh.cells()[own];
+        forAll(ownFaces, ownFaceI)
+        {
+            selected[ownFaces[ownFaceI]] = true;
+        }
+
+        if (mesh.isInternalFace(faceI))
+        {
+            label nbr = mesh.faceNeighbour()[faceI];
+
+            const cell& nbrFaces = mesh.cells()[nbr];
+            forAll(nbrFaces, nbrFaceI)
+            {
+                selected[nbrFaces[nbrFaceI]] = true;
+            }
+        }
+    }
+    syncTools::syncFaceList
+    (
+        mesh,
+        selected,
+        orEqOp<bool>(),     // combine operator
+        false               // separation
+    );
+    return findIndices(selected, true);
+}
+
+
+// Remove points not used by any face or points used by only two faces where
+// the edges are in line
+Foam::label Foam::autoLayerDriver::mergeEdgesUndo
+(
+    const scalar minCos,
+    const dictionary& motionDict
+)
+{
+    fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl
+        << "Merging all points on surface that" << nl
+        << "- are used by only two boundary faces and" << nl
+        << "- make an angle with a cosine of more than " << minCos
+        << "." << nl << endl;
+
+    // Point removal analysis engine with undo
+    removePoints pointRemover(mesh, true);
+
+    // Count usage of points
+    boolList pointCanBeDeleted;
+    label nRemove = pointRemover.countPointUsage(minCos, pointCanBeDeleted);
+
+    if (nRemove > 0)
+    {
+        Info<< "Removing " << nRemove
+            << " straight edge points ..." << nl << endl;
+
+        // Remove points
+        // ~~~~~~~~~~~~~
+
+        doRemovePoints(pointRemover, pointCanBeDeleted);
+
+
+        for (label iteration = 0; iteration < 100; iteration++)
+        {
+            Info<< nl
+                << "Undo iteration " << iteration << nl
+                << "----------------" << endl;
+
+
+            // Check mesh for errors
+            // ~~~~~~~~~~~~~~~~~~~~~
+
+            faceSet errorFaces
+            (
+                mesh,
+                "errorFaces",
+                mesh.nFaces()-mesh.nInternalFaces()
+            );
+            bool hasErrors = motionSmoother::checkMesh
+            (
+                false,  // report
+                mesh,
+                motionDict,
+                errorFaces
+            );
+            //if (checkEdgeConnectivity)
+            //{
+            //    Info<< "Checking edge-face connectivity (duplicate faces"
+            //        << " or non-consecutive shared vertices)" << endl;
+            //
+            //    label nOldSize = errorFaces.size();
+            //
+            //    hasErrors =
+            //        mesh.checkFaceFaces
+            //        (
+            //            false,
+            //            &errorFaces
+            //        )
+            //     || hasErrors;
+            //
+            //    Info<< "Detected additional "
+            //        << returnReduce(errorFaces.size()-nOldSize,sumOp<label>())
+            //        << " faces with illegal face-face connectivity"
+            //        << endl;
+            //}
+
+            if (!hasErrors)
+            {
+                break;
+            }
+
+            if (debug)
+            {
+                Pout<< "**Writing all faces in error to faceSet "
+                    << errorFaces.objectPath() << nl << endl;
+                errorFaces.write();
+            }
+
+            labelList masterErrorFaces
+            (
+                collectFaces
+                (
+                    pointRemover.savedFaceLabels(),
+                    errorFaces
+                )
+            );
+
+            label n = returnReduce(masterErrorFaces.size(), sumOp<label>());
+
+            Info<< "Detected " << n
+                << " error faces on boundaries that have been merged."
+                << " These will be restored to their original faces." << nl
+                << endl;
+
+            if (n == 0)
+            {
+                if (hasErrors)
+                {
+                    Info<< "Detected "
+                        << returnReduce(errorFaces.size(), sumOp<label>())
+                        << " error faces in mesh."
+                        << " Restoring neighbours of faces in error." << nl
+                        << endl;
+
+                    labelList expandedErrorFaces
+                    (
+                        growFaceCellFace
+                        (
+                            errorFaces
+                        )
+                    );
+
+                    doRestorePoints(pointRemover, expandedErrorFaces);
+                }
+
+                break;
+            }
+
+            doRestorePoints(pointRemover, masterErrorFaces);
+        }
+
+        if (debug)
+        {
+            Pout<< "Writing merged-edges mesh to time "
+                << meshRefiner_.timeName() << nl << endl;
+            mesh.write();
+        }
+    }
+    else
+    {
+        Info<< "No straight edges simplified and no points removed ..." << endl;
+    }
+
+    return nRemove;
+}
+
+
+// For debugging: Dump displacement to .obj files
+void Foam::autoLayerDriver::dumpDisplacement
+(
+    const fileName& prefix,
+    const indirectPrimitivePatch& pp,
+    const vectorField& patchDisp,
+    const List<extrudeMode>& extrudeStatus
+)
+{
+    OFstream dispStr(prefix + "_disp.obj");
+    Info<< "Writing all displacements to " << dispStr.name() << nl << endl;
+
+    label vertI = 0;
+
+    forAll(patchDisp, patchPointI)
+    {
+        const point& pt = pp.localPoints()[patchPointI];
+
+        meshTools::writeOBJ(dispStr, pt); vertI++;
+        meshTools::writeOBJ(dispStr, pt + patchDisp[patchPointI]); vertI++;
+
+        dispStr << "l " << vertI-1 << ' ' << vertI << nl;
+    }
+
+
+    OFstream illStr(prefix + "_illegal.obj");
+    Info<< "Writing invalid displacements to " << illStr.name() << nl << endl;
+
+    vertI = 0;
+
+    forAll(patchDisp, patchPointI)
+    {
+        if (extrudeStatus[patchPointI] != EXTRUDE)
+        {
+            const point& pt = pp.localPoints()[patchPointI];
+
+            meshTools::writeOBJ(illStr, pt); vertI++;
+            meshTools::writeOBJ(illStr, pt + patchDisp[patchPointI]); vertI++;
+
+            illStr << "l " << vertI-1 << ' ' << vertI << nl;
+        }
+    }
+}
+
+
+// Check that primitivePatch is not multiply connected. Collect non-manifold
+// points in pointSet.
+void Foam::autoLayerDriver::checkManifold
+(
+    const indirectPrimitivePatch& fp,
+    pointSet& nonManifoldPoints
+)
+{
+    // Check for non-manifold points (surface pinched at point)
+    fp.checkPointManifold(false, &nonManifoldPoints);
+
+    // Check for edge-faces (surface pinched at edge)
+    const labelListList& edgeFaces = fp.edgeFaces();
+
+    forAll(edgeFaces, edgeI)
+    {
+        const labelList& eFaces = edgeFaces[edgeI];
+
+        if (eFaces.size() > 2)
+        {
+            const edge& e = fp.edges()[edgeI];
+
+            nonManifoldPoints.insert(fp.meshPoints()[e[0]]);
+            nonManifoldPoints.insert(fp.meshPoints()[e[1]]);
+        }
+    }
+}
+
+
+void Foam::autoLayerDriver::checkMeshManifold() const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl << "Checking mesh manifoldness ..." << endl;
+
+    // Get all outside faces
+    labelList outsideFaces(mesh.nFaces() - mesh.nInternalFaces());
+
+    for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
+    {
+         outsideFaces[faceI - mesh.nInternalFaces()] = faceI;
+    }
+
+    pointSet nonManifoldPoints
+    (
+        mesh,
+        "nonManifoldPoints",
+        mesh.nPoints() / 100
+    );
+
+    // Build primitivePatch out of faces and check it for problems.
+    checkManifold
+    (
+        indirectPrimitivePatch
+        (
+            IndirectList<face>(mesh.faces(), outsideFaces),
+            mesh.points()
+        ),
+        nonManifoldPoints
+    );
+
+    label nNonManif = returnReduce(nonManifoldPoints.size(), sumOp<label>());
+
+    if (nNonManif > 0)
+    {
+        Info<< "Outside of mesh is multiply connected across edges or"
+            << " points." << nl
+            << "This is not a fatal error but might cause some unexpected"
+            << " behaviour." << nl
+            << "Writing " << nNonManif
+            << " points where this happens to pointSet "
+            << nonManifoldPoints.name() << endl;
+
+        nonManifoldPoints.write();
+    }
+    Info<< endl;
+}
+
+
+
+// Unset extrusion on point. Returns true if anything unset.
+bool Foam::autoLayerDriver::unmarkExtrusion
+(
+    const label patchPointI,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+)
+{
+    if (extrudeStatus[patchPointI] == EXTRUDE)
+    {
+        extrudeStatus[patchPointI] = NOEXTRUDE;
+        patchNLayers[patchPointI] = 0;
+        patchDisp[patchPointI] = vector::zero;
+        return true;
+    }
+    else if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
+    {
+        extrudeStatus[patchPointI] = NOEXTRUDE;
+        patchNLayers[patchPointI] = 0;
+        patchDisp[patchPointI] = vector::zero;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// Unset extrusion on face. Returns true if anything unset.
+bool Foam::autoLayerDriver::unmarkExtrusion
+(
+    const face& localFace,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+)
+{
+    bool unextruded = false;
+
+    forAll(localFace, fp)
+    {
+        if
+        (
+            unmarkExtrusion
+            (
+                localFace[fp],
+                patchDisp,
+                patchNLayers,
+                extrudeStatus
+            )
+        )
+        {
+            unextruded = true;
+        }
+    }
+    return unextruded;
+}
+
+
+// No extrusion at non-manifold points.
+void Foam::autoLayerDriver::handleNonManifolds
+(
+    const indirectPrimitivePatch& pp,
+    const labelList& meshEdges,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl << "Handling non-manifold points ..." << endl;
+
+    // Detect non-manifold points
+    Info<< nl << "Checking patch manifoldness ..." << endl;
+
+    pointSet nonManifoldPoints(mesh, "nonManifoldPoints", pp.nPoints());
+
+    // 1. Local check
+    checkManifold(pp, nonManifoldPoints);
+
+    label nNonManif = returnReduce(nonManifoldPoints.size(), sumOp<label>());
+
+    Info<< "Outside of local patch is multiply connected across edges or"
+        << " points at " << nNonManif << " points." << endl;
+
+
+    const labelList& meshPoints = pp.meshPoints();
+
+
+    // 2. Parallel check
+    // For now disable extrusion at any shared edges.
+    const labelHashSet sharedEdgeSet(mesh.globalData().sharedEdgeLabels());
+
+    forAll(pp.edges(), edgeI)
+    {
+        if (sharedEdgeSet.found(meshEdges[edgeI]))
+        {
+            const edge& e = mesh.edges()[meshEdges[edgeI]];
+
+            Pout<< "Disabling extrusion at edge "
+                << mesh.points()[e[0]] << mesh.points()[e[1]]
+                << " since it is non-manifold across coupled patches."
+                << endl;
+
+            nonManifoldPoints.insert(e[0]);
+            nonManifoldPoints.insert(e[1]);
+        }
+    }
+
+    // 3b. extrusion can produce multiple faces between 2 cells
+    // across processor boundary
+    // This occurs when a coupled face shares more than 1 edge with a
+    // non-coupled boundary face.
+    // This is now correctly handled by addPatchCellLayer in that it
+    // extrudes a single face from the stringed up edges.
+
+
+    nNonManif = returnReduce(nonManifoldPoints.size(), sumOp<label>());
+
+    if (nNonManif > 0)
+    {
+        Info<< "Outside of patches is multiply connected across edges or"
+            << " points at " << nNonManif << " points." << nl
+            << "Writing " << nNonManif
+            << " points where this happens to pointSet "
+            << nonManifoldPoints.name() << nl
+            << "and setting layer thickness to zero on these points."
+            << endl;
+
+        nonManifoldPoints.write();
+
+        forAll(meshPoints, patchPointI)
+        {
+            if (nonManifoldPoints.found(meshPoints[patchPointI]))
+            {
+                unmarkExtrusion
+                (
+                    patchPointI,
+                    patchDisp,
+                    patchNLayers,
+                    extrudeStatus
+                );
+            }
+        }
+    }
+
+    Info<< "Set displacement to zero for all " << nNonManif
+        << " non-manifold points" << endl;
+}
+
+
+// Parallel feature edge detection. Assumes non-manifold edges already handled.
+void Foam::autoLayerDriver::handleFeatureAngle
+(
+    const indirectPrimitivePatch& pp,
+    const labelList& meshEdges,
+    const scalar minCos,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl << "Handling feature edges ..." << endl;
+
+    if (minCos < 1-SMALL)
+    {
+        // Normal component of normals of connected faces.
+        vectorField edgeNormal(mesh.nEdges(), wallPoint::greatPoint);
+
+        const labelListList& edgeFaces = pp.edgeFaces();
+
+        forAll(edgeFaces, edgeI)
+        {
+            const labelList& eFaces = pp.edgeFaces()[edgeI];
+
+            label meshEdgeI = meshEdges[edgeI];
+
+            forAll(eFaces, i)
+            {
+                nomalsCombine()
+                (
+                    edgeNormal[meshEdgeI],
+                    pp.faceNormals()[eFaces[i]]
+                );
+            }
+        }
+
+        syncTools::syncEdgeList
+        (
+            mesh,
+            edgeNormal,
+            nomalsCombine(),
+            wallPoint::greatPoint,  // null value
+            false                   // no separation
+        );
+
+        label vertI = 0;
+        autoPtr<OFstream> str;
+        if (debug)
+        {
+            str.reset(new OFstream(mesh.time().path()/"featureEdges.obj"));
+            Info<< "Writing feature edges to " << str().name() << endl;
+        }
+
+        label nFeats = 0;
+
+        // Now on coupled edges the edgeNormal will have been truncated and
+        // only be still be the old value where two faces have the same normal
+        forAll(edgeFaces, edgeI)
+        {
+            const labelList& eFaces = pp.edgeFaces()[edgeI];
+
+            label meshEdgeI = meshEdges[edgeI];
+
+            const vector& n = edgeNormal[meshEdgeI];
+
+            if (n != wallPoint::greatPoint)
+            {
+                scalar cos = n & pp.faceNormals()[eFaces[0]];
+
+                if (cos < minCos)
+                {
+                    const edge& e = pp.edges()[edgeI];
+
+                    unmarkExtrusion
+                    (
+                        e[0],
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    );
+                    unmarkExtrusion
+                    (
+                        e[1],
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    );
+
+                    nFeats++;
+
+                    if (str.valid())
+                    {
+                        meshTools::writeOBJ(str(), pp.localPoints()[e[0]]);
+                        vertI++;
+                        meshTools::writeOBJ(str(), pp.localPoints()[e[1]]);
+                        vertI++;
+                        str()<< "l " << vertI-1 << ' ' << vertI << nl;
+                    }
+                }
+            }
+        }
+
+        Info<< "Set displacement to zero for points on "
+            << returnReduce(nFeats, sumOp<label>())
+            << " feature edges" << endl;
+    }
+}
+
+
+// No extrusion on cells with warped faces. Calculates the thickness of the
+// layer and compares it to the space the warped face takes up. Disables
+// extrusion if layer thickness is more than faceRatio of the thickness of
+// the face.
+void Foam::autoLayerDriver::handleWarpedFaces
+(
+    const indirectPrimitivePatch& pp,
+    const scalar faceRatio,
+    const scalar edge0Len,
+    const labelList& cellLevel,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl << "Handling cells with warped patch faces ..." << nl;
+
+    const pointField& points = mesh.points();
+
+    label nWarpedFaces = 0;
+
+    forAll(pp, i)
+    {
+        const face& f = pp[i];
+
+        if (f.size() > 3)
+        {
+            label faceI = pp.addressing()[i];
+
+            label ownLevel = cellLevel[mesh.faceOwner()[faceI]];
+            scalar edgeLen = edge0Len/(1<<ownLevel);
+
+            // Normal distance to face centre plane
+            const point& fc = mesh.faceCentres()[faceI];
+            const vector& fn = pp.faceNormals()[i];
+
+            scalarField vProj(f.size());
+
+            forAll(f, fp)
+            {
+                vector n = points[f[fp]] - fc;
+                vProj[fp] = (n & fn);
+            }
+
+            // Get normal 'span' of face
+            scalar minVal = min(vProj);
+            scalar maxVal = max(vProj);
+
+            if ((maxVal - minVal) > faceRatio * edgeLen)
+            {
+                if
+                (
+                    unmarkExtrusion
+                    (
+                        pp.localFaces()[i],
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    )
+                )
+                {
+                    nWarpedFaces++;
+                }
+            }
+        }
+    }
+
+    Info<< "Set displacement to zero on "
+        << returnReduce(nWarpedFaces, sumOp<label>())
+        << " warped faces since layer would be > " << faceRatio
+        << " of the size of the bounding box." << endl;
+}
+
+
+
+//// No extrusion on cells with multiple patch faces. There ususally is a reason
+//// why combinePatchFaces hasn't succeeded.
+//void Foam::autoLayerDriver::handleMultiplePatchFaces
+//(
+//    const indirectPrimitivePatch& pp,
+//    pointField& patchDisp,
+//    labelList& patchNLayers,
+//    List<extrudeMode>& extrudeStatus
+//) const
+//{
+//    const fvMesh& mesh = meshRefiner_.mesh();
+//
+//    Info<< nl << "Handling cells with multiple patch faces ..." << nl;
+//
+//    const labelListList& pointFaces = pp.pointFaces();
+//
+//    // Cells that should not get an extrusion layer
+//    cellSet multiPatchCells(mesh, "multiPatchCells", pp.size());
+//
+//    // Detect points that use multiple faces on same cell.
+//    forAll(pointFaces, patchPointI)
+//    {
+//        const labelList& pFaces = pointFaces[patchPointI];
+//
+//        labelHashSet pointCells(pFaces.size());
+//
+//        forAll(pFaces, i)
+//        {
+//            label cellI = mesh.faceOwner()[pp.addressing()[pFaces[i]]];
+//
+//            if (!pointCells.insert(cellI))
+//            {
+//                // Second or more occurrence of cell so cell has two or more
+//                // pp faces connected to this point.
+//                multiPatchCells.insert(cellI);
+//            }
+//        }
+//    }
+//
+//    label nMultiPatchCells = returnReduce
+//    (
+//        multiPatchCells.size(),
+//        sumOp<label>()
+//    );
+//
+//    Info<< "Detected " << nMultiPatchCells
+//        << " cells with multiple (connected) patch faces." << endl;
+//
+//    label nChanged = 0;
+//
+//    if (nMultiPatchCells > 0)
+//    {
+//        Info<< "Writing " << nMultiPatchCells
+//            << " cells with multiple (connected) patch faces to cellSet "
+//            << multiPatchCells.objectPath() << endl;
+//        multiPatchCells.write();
+//
+//
+//        // Go through all points and remove extrusion on any cell in
+//        // multiPatchCells
+//        // (has to be done in separate loop since having one point on
+//        // multipatches has to reset extrusion on all points of cell)
+//
+//        forAll(pointFaces, patchPointI)
+//        {
+//            if (extrudeStatus[patchPointI] != NOEXTRUDE)
+//            {
+//                const labelList& pFaces = pointFaces[patchPointI];
+//
+//                forAll(pFaces, i)
+//                {
+//                    label cellI =
+//                        mesh.faceOwner()[pp.addressing()[pFaces[i]]];
+//
+//                    if (multiPatchCells.found(cellI))
+//                    {
+//                        if
+//                        (
+//                            unmarkExtrusion
+//                            (
+//                                patchPointI,
+//                                patchDisp,
+//                                patchNLayers,
+//                                extrudeStatus
+//                            )
+//                        )
+//                        {
+//                            nChanged++;
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//
+//        reduce(nChanged, sumOp<label>());
+//    }
+//
+//    Info<< "Prevented extrusion on " << nChanged
+//        << " points due to multiple patch faces." << nl << endl;
+//}
+
+
+// No extrusion on faces with differing number of layers for points
+void Foam::autoLayerDriver::setNumLayers
+(
+    const labelList& patchToNLayers,
+    const labelList& patchIDs,
+    const indirectPrimitivePatch& pp,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl << "Handling points with inconsistent layer specification ..."
+        << endl;
+
+    // Get for every point (really only nessecary on patch external points)
+    // the max and min of any patch faces using it.
+    labelList maxLayers(patchNLayers.size(), labelMin);
+    labelList minLayers(patchNLayers.size(), labelMax);
+
+    forAll(patchIDs, i)
+    {
+        label patchI = patchIDs[i];
+
+        const labelList& meshPoints = mesh.boundaryMesh()[patchI].meshPoints();
+
+        label wantedLayers = patchToNLayers[patchI];
+
+        forAll(meshPoints, patchPointI)
+        {
+            label ppPointI = pp.meshPointMap()[meshPoints[patchPointI]];
+
+            maxLayers[ppPointI] = max(wantedLayers, maxLayers[ppPointI]);
+            minLayers[ppPointI] = min(wantedLayers, minLayers[ppPointI]);
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        maxLayers,
+        maxEqOp<label>(),
+        labelMin,           // null value
+        false               // no separation
+    );
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        minLayers,
+        minEqOp<label>(),
+        labelMax,           // null value
+        false               // no separation
+    );
+
+    // Unmark any point with different min and max
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    //label nConflicts = 0;
+
+    forAll(maxLayers, i)
+    {
+        if (maxLayers[i] == labelMin || minLayers[i] == labelMax)
+        {
+            FatalErrorIn("setNumLayers(..)")
+                << "Patchpoint:" << i << " coord:" << pp.localPoints()[i]
+                << " maxLayers:" << maxLayers
+                << " minLayers:" << minLayers
+                << abort(FatalError);
+        }
+        else if (maxLayers[i] == minLayers[i])
+        {
+            // Ok setting.
+            patchNLayers[i] = maxLayers[i];
+        }
+        else
+        {
+            // Inconsistent num layers between patch faces using point
+            //if
+            //(
+            //    unmarkExtrusion
+            //    (
+            //        i,
+            //        patchDisp,
+            //        patchNLayers,
+            //        extrudeStatus
+            //    )
+            //)
+            //{
+            //    nConflicts++;
+            //}
+            patchNLayers[i] = maxLayers[i];
+        }
+    }
+
+    //reduce(nConflicts, sumOp<label>());
+    //
+    //Info<< "Set displacement to zero for " << nConflicts
+    //    << " points due to points being on multiple regions"
+    //    << " with inconsistent nLayers specification." << endl;
+}
+
+
+// Grow no-extrusion layer
+void Foam::autoLayerDriver::growNoExtrusion
+(
+    const indirectPrimitivePatch& pp,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+)
+{
+    Info<< nl << "Growing non-extrusion points by one layer ..." << endl;
+
+    List<extrudeMode> grownExtrudeStatus(extrudeStatus);
+
+    const faceList& localFaces = pp.localFaces();
+
+    label nGrown = 0;
+
+    forAll(localFaces, faceI)
+    {
+        const face& f = localFaces[faceI];
+
+        bool hasSqueeze = false;
+        forAll(f, fp)
+        {
+            if (extrudeStatus[f[fp]] == NOEXTRUDE)
+            {
+                hasSqueeze = true;
+                break;
+            }
+        }
+
+        if (hasSqueeze)
+        {
+            // Squeeze all points of face
+            forAll(f, fp)
+            {
+                if
+                (
+                    extrudeStatus[f[fp]] == NOEXTRUDE
+                 && grownExtrudeStatus[f[fp]] != NOEXTRUDE
+                )
+                {
+                    grownExtrudeStatus[f[fp]] = NOEXTRUDE;
+                    nGrown++;
+                }
+            }
+        }
+    }
+
+    extrudeStatus.transfer(grownExtrudeStatus);
+
+    forAll(extrudeStatus, patchPointI)
+    {
+        if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        {
+            patchDisp[patchPointI] = vector::zero;
+            patchNLayers[patchPointI] = 0;
+        }
+    }
+
+    reduce(nGrown, sumOp<label>());
+
+    Info<< "Set displacement to zero for an additional " << nGrown
+        << " points." << endl;
+}
+
+
+void Foam::autoLayerDriver::calculateLayerThickness
+(
+    const indirectPrimitivePatch& pp,
+    const labelList& patchIDs,
+    const scalarField& patchExpansionRatio,
+
+    const bool relativeSizes,
+    const scalarField& patchFinalLayerThickness,
+    const scalarField& patchMinThickness,
+
+    const labelList& cellLevel,
+    const labelList& patchNLayers,
+    const scalar edge0Len,
+
+    scalarField& thickness,
+    scalarField& minThickness,
+    scalarField& expansionRatio
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+
+    // Rework patch-wise layer parameters into minimum per point
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Reuse input fields
+    expansionRatio.setSize(pp.nPoints());
+    expansionRatio = GREAT;
+    thickness.setSize(pp.nPoints());
+    thickness = GREAT;
+    minThickness.setSize(pp.nPoints());
+    minThickness = GREAT;
+
+    forAll(patchIDs, i)
+    {
+        label patchI = patchIDs[i];
+
+        const labelList& meshPoints = patches[patchI].meshPoints();
+
+        forAll(meshPoints, patchPointI)
+        {
+            label ppPointI = pp.meshPointMap()[meshPoints[patchPointI]];
+
+            expansionRatio[ppPointI] = min
+            (
+                expansionRatio[ppPointI],
+                patchExpansionRatio[patchI]
+            );
+            thickness[ppPointI] = min
+            (
+                thickness[ppPointI],
+                patchFinalLayerThickness[patchI]
+            );
+            minThickness[ppPointI] = min
+            (
+                minThickness[ppPointI],
+                patchMinThickness[patchI]
+            );
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        expansionRatio,
+        minEqOp<scalar>(),
+        GREAT,              // null value
+        false               // no separation
+    );
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        thickness,
+        minEqOp<scalar>(),
+        GREAT,              // null value
+        false               // no separation
+    );
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        minThickness,
+        minEqOp<scalar>(),
+        GREAT,              // null value
+        false               // no separation
+    );
+
+
+    // Now the thicknesses are set according to the minimum of connected
+    // patches.
+
+
+    // Rework relative thickness into absolute
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // by multiplying with the internal cell size.
+
+    if (relativeSizes)
+    {
+        if (min(patchMinThickness) < 0 || max(patchMinThickness) > 2)
+        {
+            FatalErrorIn("calculateLayerThickness(..)")
+                << "Thickness should be factor of local undistorted cell size."
+                << " Valid values are [0..2]." << nl
+                << " minThickness:" << patchMinThickness
+                << exit(FatalError);
+        }
+
+
+        // Determine per point the max cell level of connected cells
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        labelList maxPointLevel(pp.nPoints(), labelMin);
+
+        forAll(pp, i)
+        {
+            label ownLevel = cellLevel[mesh.faceOwner()[pp.addressing()[i]]];
+
+            const face& f = pp.localFaces()[i];
+
+            forAll(f, fp)
+            {
+                maxPointLevel[f[fp]] = max(maxPointLevel[f[fp]], ownLevel);
+            }
+        }
+
+        syncTools::syncPointList
+        (
+            mesh,
+            pp.meshPoints(),
+            maxPointLevel,
+            maxEqOp<label>(),
+            labelMin,           // null value
+            false               // no separation
+        );
+
+
+        forAll(maxPointLevel, pointI)
+        {
+            // Find undistorted edge size for this level.
+            scalar edgeLen = edge0Len/(1<<maxPointLevel[pointI]);
+            thickness[pointI] *= edgeLen;
+            minThickness[pointI] *= edgeLen;
+        }
+    }
+
+
+
+    // Rework thickness (of final layer) into overall thickness of all layers
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    forAll(thickness, pointI)
+    {
+        // Calculate layer thickness based on expansion ratio
+        // and final layer height
+        if (expansionRatio[pointI] == 1)
+        {
+            thickness[pointI] *= patchNLayers[pointI];
+        }
+        else
+        {
+
+            scalar invExpansion = 1.0 / expansionRatio[pointI];
+            label nLay = patchNLayers[pointI];
+            thickness[pointI] *=
+                (1.0 - pow(invExpansion, nLay))
+              / (1.0 - invExpansion);
+        }
+    }
+
+
+    //Info<< "calculateLayerThickness : min:" << gMin(thickness)
+    //    << " max:" << gMax(thickness) << endl;
+}
+
+
+// Synchronize displacement among coupled patches.
+void Foam::autoLayerDriver::syncPatchDisplacement
+(
+    const motionSmoother& meshMover,
+    const scalarField& minThickness,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+    const labelList& meshPoints = meshMover.patch().meshPoints();
+
+    label nChangedTotal = 0;
+
+    while (true)
+    {
+        label nChanged = 0;
+
+        // Sync displacement (by taking min)
+        syncTools::syncPointList
+        (
+            mesh,
+            meshPoints,
+            patchDisp,
+            minEqOp<vector>(),
+            wallPoint::greatPoint,          // null value
+            false                           // no separation
+        );
+
+        // Unmark if displacement too small
+        forAll(patchDisp, i)
+        {
+            if (mag(patchDisp[i]) < minThickness[i])
+            {
+                if
+                (
+                    unmarkExtrusion
+                    (
+                        i,
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    )
+                )
+                {
+                    nChanged++;
+                }
+            }
+        }
+
+        labelList syncPatchNLayers(patchNLayers);
+
+        syncTools::syncPointList
+        (
+            mesh,
+            meshPoints,
+            syncPatchNLayers,
+            minEqOp<label>(),
+            labelMax,           // null value
+            false               // no separation
+        );
+
+        // Reset if differs
+        forAll(syncPatchNLayers, i)
+        {
+            if (syncPatchNLayers[i] != patchNLayers[i])
+            {
+                if
+                (
+                    unmarkExtrusion
+                    (
+                        i,
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    )
+                )
+                {
+                    nChanged++;
+                }
+            }
+        }
+
+        syncTools::syncPointList
+        (
+            mesh,
+            meshPoints,
+            syncPatchNLayers,
+            maxEqOp<label>(),
+            labelMin,           // null value
+            false               // no separation
+        );
+
+        // Reset if differs
+        forAll(syncPatchNLayers, i)
+        {
+            if (syncPatchNLayers[i] != patchNLayers[i])
+            {
+                if
+                (
+                    unmarkExtrusion
+                    (
+                        i,
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    )
+                )
+                {
+                    nChanged++;
+                }
+            }
+        }
+        nChangedTotal += nChanged;
+
+        if (!returnReduce(nChanged, sumOp<label>()))
+        {
+            break;
+        }
+    }
+
+    Info<< "Prevented extrusion on "
+        << returnReduce(nChangedTotal, sumOp<label>())
+        << " coupled patch points during syncPatchDisplacement." << endl;
+}
+
+
+// Calculate displacement vector for all patch points. Uses pointNormal.
+// Checks that displaced patch point would be visible from all centres
+// of the faces using it.
+// extrudeStatus is both input and output and gives the status of each
+// patch point.
+void Foam::autoLayerDriver::getPatchDisplacement
+(
+    const motionSmoother& meshMover,
+    const scalarField& thickness,
+    const scalarField& minThickness,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    Info<< nl << "Determining displacement for added points"
+        << " according to pointNormal ..." << endl;
+
+    const fvMesh& mesh = meshRefiner_.mesh();
+    const indirectPrimitivePatch& pp = meshMover.patch();
+    const vectorField& faceNormals = pp.faceNormals();
+    const labelListList& pointFaces = pp.pointFaces();
+    const pointField& localPoints = pp.localPoints();
+    const labelList& meshPoints = pp.meshPoints();
+
+    // Determine pointNormal
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    pointField pointNormals(pp.nPoints(), vector::zero);
+    {
+        labelList nPointFaces(pp.nPoints(), 0);
+
+        forAll(faceNormals, faceI)
+        {
+            const face& f = pp.localFaces()[faceI];
+
+            forAll(f, fp)
+            {
+                pointNormals[f[fp]] += faceNormals[faceI];
+                nPointFaces[f[fp]] ++;
+            }
+        }
+
+        syncTools::syncPointList
+        (
+            mesh,
+            meshPoints,
+            pointNormals,
+            plusEqOp<vector>(),
+            vector::zero,       // null value
+            false               // no separation
+        );
+
+        syncTools::syncPointList
+        (
+            mesh,
+            meshPoints,
+            nPointFaces,
+            plusEqOp<label>(),
+            0,                  // null value
+            false               // no separation
+        );
+
+        forAll(pointNormals, i)
+        {
+            pointNormals[i] /= nPointFaces[i];
+        }
+    }
+
+
+    // Determine local length scale on patch
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Start off from same thickness everywhere (except where no extrusion)
+    patchDisp = thickness*pointNormals;
+
+    // Check if no extrude possible.
+    forAll(pointNormals, patchPointI)
+    {
+        label meshPointI = pp.meshPoints()[patchPointI];
+
+        if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        {
+            // Do not use unmarkExtrusion; forcibly set to zero extrusion.
+            patchNLayers[patchPointI] = 0;
+            patchDisp[patchPointI] = vector::zero;
+        }
+        else
+        {
+            // Get normal
+            const vector& n = pointNormals[patchPointI];
+
+            if (!meshTools::visNormal(n, faceNormals, pointFaces[patchPointI]))
+            {
+                Pout<< "No valid normal for point " << meshPointI
+                    << ' ' << pp.points()[meshPointI]
+                    << "; setting displacement to " << patchDisp[patchPointI]
+                    << endl;
+
+                extrudeStatus[patchPointI] = EXTRUDEREMOVE;
+            }
+        }
+    }
+
+    // At illegal points make displacement average of new neighbour positions
+    forAll(extrudeStatus, patchPointI)
+    {
+        if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
+        {
+            point avg(vector::zero);
+            label nPoints = 0;
+
+            const labelList& pEdges = pp.pointEdges()[patchPointI];
+
+            forAll(pEdges, i)
+            {
+                label edgeI = pEdges[i];
+
+                label otherPointI = pp.edges()[edgeI].otherVertex(patchPointI);
+
+                if (extrudeStatus[otherPointI] != NOEXTRUDE)
+                {
+                    avg += localPoints[otherPointI] + patchDisp[otherPointI];
+                    nPoints++;
+                }
+            }
+
+            if (nPoints > 0)
+            {
+                Pout<< "Displacement at illegal point "
+                    << localPoints[patchPointI]
+                    << " set to " << (avg / nPoints - localPoints[patchPointI])
+                    << endl;
+
+                patchDisp[patchPointI] =
+                    avg / nPoints
+                  - localPoints[patchPointI];
+            }
+        }
+    }
+
+    // Make sure displacement is equal on both sides of coupled patches.
+    syncPatchDisplacement
+    (
+        meshMover,
+        minThickness,
+        patchDisp,
+        patchNLayers,
+        extrudeStatus
+    );
+
+    Info<< endl;
+}
+
+
+// Truncates displacement
+// - for all patchFaces in the faceset displacement gets set to zero
+// - all displacement < minThickness gets set to zero
+Foam::label Foam::autoLayerDriver::truncateDisplacement
+(
+    const motionSmoother& meshMover,
+    const scalarField& minThickness,
+    const faceSet& illegalPatchFaces,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    const polyMesh& mesh = meshMover.mesh();
+    const indirectPrimitivePatch& pp = meshMover.patch();
+
+    label nChanged = 0;
+
+    const Map<label>& meshPointMap = pp.meshPointMap();
+
+    forAllConstIter(faceSet, illegalPatchFaces, iter)
+    {
+        label faceI = iter.key();
+
+        if (mesh.isInternalFace(faceI))
+        {
+            FatalErrorIn("truncateDisplacement(..)")
+                << "Faceset " << illegalPatchFaces.name()
+                << " contains internal face " << faceI << nl
+                << "It should only contain patch faces" << abort(FatalError);
+        }
+
+        const face& f = mesh.faces()[faceI];
+
+
+        forAll(f, fp)
+        {
+            if (meshPointMap.found(f[fp]))
+            {
+                label patchPointI = meshPointMap[f[fp]];
+
+                if (extrudeStatus[patchPointI] != NOEXTRUDE)
+                {
+                    unmarkExtrusion
+                    (
+                        patchPointI,
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    );
+                    nChanged++;
+                }
+            }
+        }
+    }
+
+    forAll(patchDisp, patchPointI)
+    {
+        if (mag(patchDisp[patchPointI]) < minThickness[patchPointI])
+        {
+            if
+            (
+                unmarkExtrusion
+                (
+                    patchPointI,
+                    patchDisp,
+                    patchNLayers,
+                    extrudeStatus
+                )
+            )
+            {
+                nChanged++;
+            }
+        }
+        else if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        {
+            // Make sure displacement is 0. Should already be so but ...
+            patchDisp[patchPointI] = vector::zero;
+            patchNLayers[patchPointI] = 0;
+        }
+    }
+
+
+    const faceList& localFaces = pp.localFaces();
+
+    while (true)
+    {
+        syncPatchDisplacement
+        (
+            meshMover,
+            minThickness,
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+        // Make sure that a face doesn't have two non-consecutive areas
+        // not extruded (e.g. quad where vertex 0 and 2 are not extruded
+        // but 1 and 3 are) since this gives topological errors.
+
+        label nPinched = 0;
+
+        forAll(localFaces, i)
+        {
+            const face& localF = localFaces[i];
+
+            // Count number of transitions from unsnapped to snapped.
+            label nTrans = 0;
+
+            extrudeMode prevMode = extrudeStatus[localF.prevLabel(0)];
+
+            forAll(localF, fp)
+            {
+                extrudeMode fpMode = extrudeStatus[localF[fp]];
+
+                if (prevMode == NOEXTRUDE && fpMode != NOEXTRUDE)
+                {
+                    nTrans++;
+                }
+                prevMode = fpMode;
+            }
+
+            if (nTrans > 1)
+            {
+                // Multiple pinches. Reset whole face as unextruded.
+                if
+                (
+                    unmarkExtrusion
+                    (
+                        localF,
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    )
+                )
+                {
+                    nPinched++;
+                    nChanged++;
+                }
+            }
+        }
+
+        reduce(nPinched, sumOp<label>());
+
+        Info<< "truncateDisplacement : Unextruded " << nPinched
+            << " faces due to non-consecutive vertices being extruded." << endl;
+
+
+        // Make sure that a face has consistent number of layers for all
+        // its vertices.
+
+        label nDiffering = 0;
+
+        //forAll(localFaces, i)
+        //{
+        //    const face& localF = localFaces[i];
+        //
+        //    label numLayers = -1;
+        //
+        //    forAll(localF, fp)
+        //    {
+        //        if (patchNLayers[localF[fp]] > 0)
+        //        {
+        //            if (numLayers == -1)
+        //            {
+        //                numLayers = patchNLayers[localF[fp]];
+        //            }
+        //            else if (numLayers != patchNLayers[localF[fp]])
+        //            {
+        //                // Differing number of layers
+        //                if
+        //                (
+        //                    unmarkExtrusion
+        //                    (
+        //                        localF,
+        //                        patchDisp,
+        //                        patchNLayers,
+        //                        extrudeStatus
+        //                    )
+        //                )
+        //                {
+        //                    nDiffering++;
+        //                    nChanged++;
+        //                }
+        //                break;
+        //            }
+        //        }
+        //    }
+        //}
+        //
+        //reduce(nDiffering, sumOp<label>());
+        //
+        //Info<< "truncateDisplacement : Unextruded " << nDiffering
+        //    << " faces due to having differing number of layers." << endl;
+
+        if (nPinched+nDiffering == 0)
+        {
+            break;
+        }
+    }
+
+    return nChanged;
+}
+
+
+// Setup layer information (at points and faces) to modify mesh topology in
+// regions where layer mesh terminates.
+void Foam::autoLayerDriver::setupLayerInfoTruncation
+(
+    const motionSmoother& meshMover,
+    const labelList& patchNLayers,
+    const List<extrudeMode>& extrudeStatus,
+    const label nBufferCellsNoExtrude,
+    labelList& nPatchPointLayers,
+    labelList& nPatchFaceLayers
+) const
+{
+    Info<< nl << "Setting up information for layer truncation ..." << endl;
+
+    const indirectPrimitivePatch& pp = meshMover.patch();
+    const polyMesh& mesh = meshMover.mesh();
+
+    if (nBufferCellsNoExtrude < 0)
+    {
+        Info<< nl << "Performing no layer truncation."
+            << " nBufferCellsNoExtrude set to less than 0  ..." << endl;
+
+        // Face layers if any point get extruded
+        forAll(pp.localFaces(), patchFaceI)
+        {
+            const face& f = pp.localFaces()[patchFaceI];
+
+            forAll(f, fp)
+            {
+                if (patchNLayers[f[fp]] > 0)
+                {
+                    nPatchFaceLayers[patchFaceI] = patchNLayers[f[fp]];
+                    break;
+                }
+            }
+        }
+        nPatchPointLayers = patchNLayers;
+    }
+    else
+    {
+        // Determine max point layers per face.
+        labelList maxLevel(pp.size(), 0);
+
+        forAll(pp.localFaces(), patchFaceI)
+        {
+            const face& f = pp.localFaces()[patchFaceI];
+
+            // find patch faces where layer terminates (i.e contains extrude
+            // and noextrude points).
+
+            bool noExtrude = false;
+            label mLevel = 0;
+
+            forAll(f, fp)
+            {
+                if (extrudeStatus[f[fp]] == NOEXTRUDE)
+                {
+                    noExtrude = true;
+                }
+                mLevel = max(mLevel, patchNLayers[f[fp]]);
+            }
+
+            if (mLevel > 0)
+            {
+                // So one of the points is extruded. Check if all are extruded
+                // or is a mix.
+
+                if (noExtrude)
+                {
+                    nPatchFaceLayers[patchFaceI] = 1;
+                    maxLevel[patchFaceI] = mLevel;
+                }
+                else
+                {
+                    maxLevel[patchFaceI] = mLevel;
+                }
+            }
+        }
+
+        // We have the seed faces (faces with nPatchFaceLayers != maxLevel)
+        // Now do a meshwave across the patch where we pick up neighbours
+        // of seed faces.
+        // Note: quite inefficient. Could probably be coded better.
+
+        const labelListList& pointFaces = pp.pointFaces();
+
+        label nLevels = gMax(patchNLayers);
+
+        // flag neighbouring patch faces with number of layers to grow
+        for (label ilevel = 1; ilevel < nLevels; ilevel++)
+        {
+            label nBuffer;
+
+            if (ilevel == 1)
+            {
+                nBuffer = nBufferCellsNoExtrude - 1;
+            }
+            else
+            {
+                nBuffer = nBufferCellsNoExtrude;
+            }
+
+            for (label ibuffer = 0; ibuffer < nBuffer + 1; ibuffer++)
+            {
+                labelList tempCounter(nPatchFaceLayers);
+
+                boolList foundNeighbour(pp.nPoints(), false);
+
+                forAll(pp.meshPoints(), patchPointI)
+                {
+                    forAll(pointFaces[patchPointI], pointFaceI)
+                    {
+                        label faceI = pointFaces[patchPointI][pointFaceI];
+
+                        if
+                        (
+                            nPatchFaceLayers[faceI] != -1
+                         && maxLevel[faceI] > 0
+                        )
+                        {
+                            foundNeighbour[patchPointI] = true;
+                            break;
+                        }
+                    }
+                }
+
+                syncTools::syncPointList
+                (
+                    mesh,
+                    pp.meshPoints(),
+                    foundNeighbour,
+                    orEqOp<bool>(),
+                    false,              // null value
+                    false               // no separation
+                );
+
+                forAll(pp.meshPoints(), patchPointI)
+                {
+                    if (foundNeighbour[patchPointI])
+                    {
+                        forAll(pointFaces[patchPointI], pointFaceI)
+                        {
+                            label faceI = pointFaces[patchPointI][pointFaceI];
+                            if
+                            (
+                                nPatchFaceLayers[faceI] == -1
+                             && maxLevel[faceI] > 0
+                             && ilevel < maxLevel[faceI]
+                            )
+                            {
+                                tempCounter[faceI] = ilevel;
+                            }
+                        }
+                    }
+                }
+                nPatchFaceLayers = tempCounter;
+            }
+        }
+
+        forAll(pp.localFaces(), patchFaceI)
+        {
+            if (nPatchFaceLayers[patchFaceI] == -1)
+            {
+                nPatchFaceLayers[patchFaceI] = maxLevel[patchFaceI];
+            }
+        }
+
+        forAll(pp.meshPoints(), patchPointI)
+        {
+            if (extrudeStatus[patchPointI] != NOEXTRUDE)
+            {
+                forAll(pointFaces[patchPointI], pointFaceI)
+                {
+                    label face = pointFaces[patchPointI][pointFaceI];
+                    nPatchPointLayers[patchPointI] = max
+                    (
+                        nPatchPointLayers[patchPointI],
+                        nPatchFaceLayers[face]
+                    );
+                }
+            }
+            else
+            {
+                nPatchPointLayers[patchPointI] = 0;
+            }
+        }
+        syncTools::syncPointList
+        (
+            mesh,
+            pp.meshPoints(),
+            nPatchPointLayers,
+            maxEqOp<label>(),
+            0,                  // null value
+            false               // no separation
+        );
+    }
+}
+
+
+// Does any of the cells use a face from faces?
+bool Foam::autoLayerDriver::cellsUseFace
+(
+    const polyMesh& mesh,
+    const labelList& cellLabels,
+    const labelHashSet& faces
+)
+{
+    forAll(cellLabels, i)
+    {
+        const cell& cFaces = mesh.cells()[cellLabels[i]];
+
+        forAll(cFaces, cFaceI)
+        {
+            if (faces.found(cFaces[cFaceI]))
+            {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+
+// Checks the newly added cells and locally unmarks points so they
+// will not get extruded next time round. Returns global number of unmarked
+// points (0 if all was fine)
+Foam::label Foam::autoLayerDriver::checkAndUnmark
+(
+    const addPatchCellLayer& addLayer,
+    const dictionary& meshQualityDict,
+    const indirectPrimitivePatch& pp,
+    const polyMesh& newMesh,
+
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+)
+{
+    // Check the resulting mesh for errors
+    Info<< nl << "Checking mesh with layer ..." << endl;
+    faceSet wrongFaces(newMesh, "wrongFaces", newMesh.nFaces()/1000);
+    motionSmoother::checkMesh(false, newMesh, meshQualityDict, wrongFaces);
+    Info<< "Detected " << returnReduce(wrongFaces.size(), sumOp<label>())
+        << " illegal faces"
+        << " (concave, zero area or negative cell pyramid volume)"
+        << endl;
+
+    // Undo local extrusion if
+    // - any of the added cells in error
+
+    label nChanged = 0;
+
+    // Get all cells in the layer.
+    labelListList addedCells
+    (
+        addPatchCellLayer::addedCells
+        (
+            newMesh,
+            addLayer.layerFaces()
+        )
+    );
+
+    // Check if any of the faces in error uses any face of an added cell
+    forAll(addedCells, oldPatchFaceI)
+    {
+        // Get the cells (in newMesh labels) per old patch face (in mesh
+        // labels)
+        const labelList& fCells = addedCells[oldPatchFaceI];
+
+        if (cellsUseFace(newMesh, fCells, wrongFaces))
+        {
+            // Unmark points on old mesh
+            if
+            (
+                unmarkExtrusion
+                (
+                    pp.localFaces()[oldPatchFaceI],
+                    patchDisp,
+                    patchNLayers,
+                    extrudeStatus
+                )
+            )
+            {
+                nChanged++;
+            }
+        }
+    }
+
+    return returnReduce(nChanged, sumOp<label>());
+}
+
+
+//- Count global number of extruded faces
+Foam::label Foam::autoLayerDriver::countExtrusion
+(
+    const indirectPrimitivePatch& pp,
+    const List<extrudeMode>& extrudeStatus
+)
+{
+    // Count number of extruded patch faces
+    label nExtruded = 0;
+    {
+        const faceList& localFaces = pp.localFaces();
+
+        forAll(localFaces, i)
+        {
+            const face& localFace = localFaces[i];
+
+            forAll(localFace, fp)
+            {
+                if (extrudeStatus[localFace[fp]] != NOEXTRUDE)
+                {
+                    nExtruded++;
+                    break;
+                }
+            }
+        }
+    }
+
+    return returnReduce(nExtruded, sumOp<label>());
+}
+
+
+// Collect layer faces and layer cells into bools for ease of handling
+void Foam::autoLayerDriver::getLayerCellsFaces
+(
+    const polyMesh& mesh,
+    const addPatchCellLayer& addLayer,
+    boolList& flaggedCells,
+    boolList& flaggedFaces
+)
+{
+    flaggedCells.setSize(mesh.nCells());
+    flaggedCells = false;
+    flaggedFaces.setSize(mesh.nFaces());
+    flaggedFaces = false;
+
+    // Mark all faces in the layer
+    const labelListList& layerFaces = addLayer.layerFaces();
+
+    // Mark all cells in the layer.
+    labelListList addedCells(addPatchCellLayer::addedCells(mesh, layerFaces));
+
+    forAll(addedCells, oldPatchFaceI)
+    {
+        const labelList& added = addedCells[oldPatchFaceI];
+
+        forAll(added, i)
+        {
+            flaggedCells[added[i]] = true;
+        }
+    }
+
+    forAll(layerFaces, oldPatchFaceI)
+    {
+        const labelList& layer = layerFaces[oldPatchFaceI];
+
+        if (layer.size())
+        {
+            for (label i = 1; i < layer.size()-1; i++)
+            {
+                flaggedFaces[layer[i]] = true;
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoLayerDriver::autoLayerDriver(meshRefinement& meshRefiner)
+:
+    meshRefiner_(meshRefiner)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::autoLayerDriver::mergePatchFacesUndo
+(
+    const layerParameters& layerParams,
+    const dictionary& motionDict
+)
+{
+    scalar minCos = Foam::cos
+    (
+        layerParams.featureAngle()
+      * mathematicalConstant::pi/180.0
+    );
+
+    scalar concaveCos = Foam::cos
+    (
+        layerParams.concaveAngle()
+      * mathematicalConstant::pi/180.0
+    );
+
+    Info<< nl
+        << "Merging all faces of a cell" << nl
+        << "---------------------------" << nl
+        << "    - which are on the same patch" << nl
+        << "    - which make an angle < " << layerParams.featureAngle()
+        << " degrees"
+        << nl
+        << "      (cos:" << minCos << ')' << nl
+        << "    - as long as the resulting face doesn't become concave"
+        << " by more than "
+        << layerParams.concaveAngle() << " degrees" << nl
+        << "      (0=straight, 180=fully concave)" << nl
+        << endl;
+
+    label nChanged = mergePatchFacesUndo(minCos, concaveCos, motionDict);
+
+    nChanged += mergeEdgesUndo(minCos, motionDict);
+}
+
+
+void Foam::autoLayerDriver::addLayers
+(
+    const layerParameters& layerParams,
+    const dictionary& motionDict,
+    const labelList& patchIDs,
+    const label nAllowableErrors,
+    decompositionMethod& decomposer,
+    fvMeshDistribute& distributor
+)
+{
+    fvMesh& mesh = meshRefiner_.mesh();
+
+    autoPtr<indirectPrimitivePatch> pp
+    (
+        meshRefinement::makePatch
+        (
+            mesh,
+            patchIDs
+        )
+    );
+
+    // Construct iterative mesh mover.
+    Info<< "Constructing mesh displacer ..." << endl;
+
+    autoPtr<motionSmoother> meshMover
+    (
+        new motionSmoother
+        (
+            mesh,
+            pp(),
+            patchIDs,
+            meshRefinement::makeDisplacementField
+            (
+                pointMesh::New(mesh),
+                patchIDs
+            ),
+            motionDict
+        )
+    );
+
+
+    // Point-wise extrusion data
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Displacement for all pp.localPoints.
+    vectorField patchDisp(pp().nPoints(), vector::one);
+
+    // Number of layers for all pp.localPoints. Note: only valid if
+    // extrudeStatus = EXTRUDE.
+    labelList patchNLayers(pp().nPoints(), 0);
+
+    // Whether to add edge for all pp.localPoints.
+    List<extrudeMode> extrudeStatus(pp().nPoints(), EXTRUDE);
+
+    {
+        // Get number of layer per point from number of layers per patch
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        setNumLayers
+        (
+            layerParams.numLayers(),    // per patch the num layers
+            meshMover().adaptPatchIDs(),// patches that are being moved
+            pp,                         // indirectpatch for all faces moving
+
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+        // Precalculate mesh edge labels for patch edges
+        labelList meshEdges(pp().meshEdges(mesh.edges(), mesh.pointEdges()));
+
+        // Disable extrusion on non-manifold points
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        handleNonManifolds
+        (
+            pp,
+            meshEdges,
+
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+        // Disable extrusion on feature angles
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        handleFeatureAngle
+        (
+            pp,
+            meshEdges,
+            layerParams.featureAngle()*mathematicalConstant::pi/180.0,
+
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+        // Disable extrusion on warped faces
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        // Undistorted edge length
+        const scalar edge0Len = meshRefiner_.meshCutter().level0EdgeLength();
+        const labelList& cellLevel = meshRefiner_.meshCutter().cellLevel();
+
+        handleWarpedFaces
+        (
+            pp,
+            layerParams.maxFaceThicknessRatio(),
+            edge0Len,
+            cellLevel,
+
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+        //// Disable extrusion on cells with multiple patch faces
+        //// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        //
+        //handleMultiplePatchFaces
+        //(
+        //    pp,
+        //
+        //    patchDisp,
+        //    patchNLayers,
+        //    extrudeStatus
+        //);
+
+
+        // Grow out region of non-extrusion
+        for (label i = 0; i < layerParams.nGrow(); i++)
+        {
+            growNoExtrusion
+            (
+                pp,
+                patchDisp,
+                patchNLayers,
+                extrudeStatus
+            );
+        }
+    }
+
+
+    // Undistorted edge length
+    const scalar edge0Len = meshRefiner_.meshCutter().level0EdgeLength();
+    const labelList& cellLevel = meshRefiner_.meshCutter().cellLevel();
+
+    // Determine (wanted) point-wise layer thickness and expansion ratio
+    scalarField thickness(pp().nPoints());
+    scalarField minThickness(pp().nPoints());
+    scalarField expansionRatio(pp().nPoints());
+    calculateLayerThickness
+    (
+        pp,
+        meshMover().adaptPatchIDs(),
+        layerParams.expansionRatio(),
+
+        layerParams.relativeSizes(),        // thickness relative to cellsize?
+        layerParams.finalLayerThickness(),  // wanted thicknes
+        layerParams.minThickness(),         // minimum thickness
+
+        cellLevel,
+        patchNLayers,
+        edge0Len,
+
+        thickness,
+        minThickness,
+        expansionRatio
+    );
+
+
+    // Print a bit
+    {
+        const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+        // Find maximum length of a patch name, for a nicer output
+        label maxPatchNameLen = 0;
+        forAll(meshMover().adaptPatchIDs(), i)
+        {
+            label patchI = meshMover().adaptPatchIDs()[i];
+            word patchName = patches[patchI].name();
+            maxPatchNameLen = max(maxPatchNameLen, label(patchName.size()));
+        }
+
+        Info<< nl
+            << setf(ios_base::left) << setw(maxPatchNameLen) << "patch"
+            << setw(0) << " faces    layers avg thickness[m]" << nl
+            << setf(ios_base::left) << setw(maxPatchNameLen) << " "
+            << setw(0) << "                 near-wall overall" << nl
+            << setf(ios_base::left) << setw(maxPatchNameLen) << "-----"
+            << setw(0) << " -----    ------ --------- -------" << endl;
+
+        forAll(meshMover().adaptPatchIDs(), i)
+        {
+            label patchI = meshMover().adaptPatchIDs()[i];
+
+            const labelList& meshPoints = patches[patchI].meshPoints();
+
+            //scalar maxThickness = -VGREAT;
+            //scalar minThickness = VGREAT;
+            scalar sumThickness = 0;
+            scalar sumNearWallThickness = 0;
+
+            forAll(meshPoints, patchPointI)
+            {
+                label ppPointI = pp().meshPointMap()[meshPoints[patchPointI]];
+
+                //maxThickness = max(maxThickness, thickness[ppPointI]);
+                //minThickness = min(minThickness, thickness[ppPointI]);
+                sumThickness += thickness[ppPointI];
+
+                label nLay = patchNLayers[ppPointI];
+                if (nLay > 0)
+                {
+                    if (expansionRatio[ppPointI] == 1)
+                    {
+                        sumNearWallThickness += thickness[ppPointI]/nLay;
+                    }
+                    else
+                    {
+                        scalar s =
+                            (1.0-pow(expansionRatio[ppPointI], nLay))
+                          / (1.0-expansionRatio[ppPointI]);
+                        sumNearWallThickness += thickness[ppPointI]/s;
+                    }
+                }
+            }
+
+            label totNPoints = returnReduce(meshPoints.size(), sumOp<label>());
+
+            // For empty patches, totNPoints is 0.
+            scalar avgThickness = 0;
+            scalar avgNearWallThickness = 0;
+
+            if (totNPoints > 0)
+            {
+                //reduce(maxThickness, maxOp<scalar>());
+                //reduce(minThickness, minOp<scalar>());
+                avgThickness =
+                    returnReduce(sumThickness, sumOp<scalar>())
+                  / totNPoints;
+                avgNearWallThickness =
+                    returnReduce(sumNearWallThickness, sumOp<scalar>())
+                  / totNPoints;
+            }
+
+            Info<< setf(ios_base::left) << setw(maxPatchNameLen)
+                << patches[patchI].name() << setprecision(3)
+                << " " << setw(8)
+                << returnReduce(patches[patchI].size(), sumOp<scalar>())
+                << " " << setw(6) << layerParams.numLayers()[patchI]
+                << " " << setw(8) << avgNearWallThickness
+                << "  " << setw(8) << avgThickness
+                //<< " " << setw(8) << minThickness
+                //<< " " << setw(8) << maxThickness
+                << endl;
+        }
+        Info<< endl;
+    }
+
+
+    // Calculate wall to medial axis distance for smoothing displacement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    pointScalarField pointMedialDist
+    (
+        IOobject
+        (
+            "pointMedialDist",
+            meshRefiner_.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        meshMover().pMesh(),
+        dimensionedScalar("pointMedialDist", dimless, 0.0)
+    );
+
+    pointVectorField dispVec
+    (
+        IOobject
+        (
+            "dispVec",
+            meshRefiner_.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        meshMover().pMesh(),
+        dimensionedVector("dispVec", dimless, vector::zero)
+    );
+
+    pointScalarField medialRatio
+    (
+        IOobject
+        (
+            "medialRatio",
+            meshRefiner_.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        meshMover().pMesh(),
+        dimensionedScalar("medialRatio", dimless, 0.0)
+    );
+
+    // Setup information for medial axis smoothing. Calculates medial axis
+    // and a smoothed displacement direction.
+    // - pointMedialDist : distance to medial axis
+    // - dispVec : normalised direction of nearest displacement
+    // - medialRatio : ratio of medial distance to wall distance.
+    //   (1 at wall, 0 at medial axis)
+    medialAxisSmoothingInfo
+    (
+        meshMover,
+        layerParams.nSmoothNormals(),
+        layerParams.nSmoothSurfaceNormals(),
+        layerParams.minMedianAxisAngleCos(),
+
+        dispVec,
+        medialRatio,
+        pointMedialDist
+    );
+
+
+
+    // Saved old points
+    pointField oldPoints(mesh.points());
+
+    // Last set of topology changes.  Changing mesh clears out directTopoChange
+    directTopoChange savedMeshMod(mesh.boundaryMesh().size());
+
+    boolList flaggedCells;
+    boolList flaggedFaces;
+
+    for
+    (
+        label iteration = 0;
+        iteration < layerParams.nLayerIter();
+        iteration++
+    )
+    {
+        Info<< nl
+            << "Layer addition iteration " << iteration << nl
+            << "--------------------------" << endl;
+
+
+        // Unset the extrusion at the pp.
+        const dictionary& meshQualityDict =
+        (
+            iteration < layerParams.nRelaxedIter()
+          ? motionDict
+          : motionDict.subDict("relaxed")
+        );
+
+        if (iteration >= layerParams.nRelaxedIter())
+        {
+            Info<< "Switched to relaxed meshQuality constraints." << endl;
+        }
+
+
+
+        // Make sure displacement is equal on both sides of coupled patches.
+        syncPatchDisplacement
+        (
+            meshMover,
+            minThickness,
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+        // Displacement acc. to pointnormals
+        getPatchDisplacement
+        (
+            meshMover,
+            thickness,
+            minThickness,
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+        // Shrink mesh by displacement value first.
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        {
+            pointField oldPatchPos(pp().localPoints());
+
+            //// Laplacian displacement shrinking.
+            //shrinkMeshDistance
+            //(
+            //    debug,
+            //    meshMover,
+            //    -patchDisp,     // Shrink in opposite direction of addedPoints
+            //    layerParams.nSmoothDisp(),
+            //    layerParams.nSnap()
+            //);
+
+            // Medial axis based shrinking
+            shrinkMeshMedialDistance
+            (
+                meshMover(),
+                meshQualityDict,
+
+                layerParams.nSmoothThickness(),
+                layerParams.maxThicknessToMedialRatio(),
+                nAllowableErrors,
+                layerParams.nSnap(),
+                layerParams.layerTerminationCos(),
+
+                thickness,
+                minThickness,
+
+                dispVec,
+                medialRatio,
+                pointMedialDist,
+
+                extrudeStatus,
+                patchDisp,
+                patchNLayers
+            );
+
+            // Update patchDisp (since not all might have been honoured)
+            patchDisp = oldPatchPos - pp().localPoints();
+        }
+
+        // Truncate displacements that are too small (this will do internal
+        // ones, coupled ones have already been truncated by syncPatch)
+        faceSet dummySet(mesh, "wrongPatchFaces", 0);
+        truncateDisplacement
+        (
+            meshMover(),
+            minThickness,
+            dummySet,
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+
+        // Dump to .obj file for debugging.
+        if (debug)
+        {
+            dumpDisplacement
+            (
+                mesh.time().path()/"layer",
+                pp(),
+                patchDisp,
+                extrudeStatus
+            );
+
+            const_cast<Time&>(mesh.time())++;
+            Info<< "Writing shrunk mesh to " << meshRefiner_.timeName()
+                << endl;
+
+            // See comment in autoSnapDriver why we should not remove meshPhi
+            // using mesh.clearPout().
+
+            mesh.write();
+        }
+
+
+        // Mesh topo change engine
+        directTopoChange meshMod(mesh);
+
+        // Grow layer of cells on to patch. Handles zero sized displacement.
+        addPatchCellLayer addLayer(mesh);
+
+        // Determine per point/per face number of layers to extrude. Also
+        // handles the slow termination of layers when going switching layers
+
+        labelList nPatchPointLayers(pp().nPoints(),-1);
+        labelList nPatchFaceLayers(pp().localFaces().size(),-1);
+        setupLayerInfoTruncation
+        (
+            meshMover(),
+            patchNLayers,
+            extrudeStatus,
+            layerParams.nBufferCellsNoExtrude(),
+            nPatchPointLayers,
+            nPatchFaceLayers
+        );
+
+        // Calculate displacement for first layer for addPatchLayer.
+        // (first layer = layer of cells next to the original mesh)
+        vectorField firstDisp(patchNLayers.size(), vector::zero);
+
+        forAll(patchNLayers, i)
+        {
+            if (patchNLayers[i] > 0)
+            {
+                if (expansionRatio[i] == 1.0)
+                {
+                    firstDisp[i] = patchDisp[i]/nPatchPointLayers[i];
+                }
+                else
+                {
+                    label nLay = nPatchPointLayers[i];
+                    scalar h =
+                        pow(expansionRatio[i], nLay - 1)
+                      * (1.0 - expansionRatio[i])
+                      / (1.0 - pow(expansionRatio[i], nLay));
+                    firstDisp[i] = h*patchDisp[i];
+                }
+            }
+        }
+
+        scalarField invExpansionRatio = 1.0 / expansionRatio;
+
+        // Add topo regardless of whether extrudeStatus is extruderemove.
+        // Not add layer if patchDisp is zero.
+        addLayer.setRefinement
+        (
+            invExpansionRatio,
+            pp(),
+            nPatchFaceLayers,   // layers per face
+            nPatchPointLayers,  // layers per point
+            firstDisp,          // thickness of layer nearest internal mesh
+            meshMod
+        );
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+        }
+
+        // Store mesh changes for if mesh is correct.
+        savedMeshMod = meshMod;
+
+
+        // With the stored topo changes we create a new mesh so we can
+        // undo if neccesary.
+
+        autoPtr<polyMesh> newMeshPtr;
+        autoPtr<mapPolyMesh> map = meshMod.makeMesh
+        (
+            newMeshPtr,
+            IOobject
+            (
+                //mesh.name()+"_layer",
+                mesh.name(),
+                static_cast<polyMesh&>(mesh).instance(),
+                mesh.time(),  // register with runTime
+                static_cast<polyMesh&>(mesh).readOpt(),
+                static_cast<polyMesh&>(mesh).writeOpt()
+            ),              // io params from original mesh but new name
+            mesh,           // original mesh
+            true            // parallel sync
+        );
+        polyMesh& newMesh = newMeshPtr();
+
+        // Update fields: removed.  HJ, 19/May/2011
+
+        if (meshRefiner_.overwrite())
+        {
+            newMesh.setInstance(meshRefiner_.oldInstance());
+        }
+
+        // Update numbering on addLayer:
+        // - cell/point labels to be newMesh.
+        // - patchFaces to remain in oldMesh order.
+        addLayer.updateMesh
+        (
+            map,
+            identity(pp().size()),
+            identity(pp().nPoints())
+        );
+
+        // Collect layer faces and cells for outside loop.
+        getLayerCellsFaces
+        (
+            newMesh,
+            addLayer,
+            flaggedCells,
+            flaggedFaces
+        );
+
+
+        if (debug)
+        {
+            Info<< "Writing layer mesh to " << meshRefiner_.timeName() << endl;
+            newMesh.write();
+
+            cellSet addedCellSet
+            (
+                newMesh,
+                "addedCells",
+                labelHashSet(findIndices(flaggedCells, true))
+            );
+            Info<< "Writing "
+                << returnReduce(addedCellSet.size(), sumOp<label>())
+                << " added cells to cellSet "
+                << addedCellSet.name() << endl;
+            addedCellSet.write();
+
+            faceSet layerFacesSet
+            (
+                newMesh,
+                "layerFaces",
+                labelHashSet(findIndices(flaggedCells, true))
+            );
+            Info<< "Writing "
+                << returnReduce(layerFacesSet.size(), sumOp<label>())
+                << " faces inside added layer to faceSet "
+                << layerFacesSet.name() << endl;
+            layerFacesSet.write();
+        }
+
+
+        label nTotChanged = checkAndUnmark
+        (
+            addLayer,
+            meshQualityDict,
+            pp(),
+            newMesh,
+
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+        Info<< "Extruding " << countExtrusion(pp, extrudeStatus)
+            << " out of " << returnReduce(pp().size(), sumOp<label>())
+            << " faces. Removed extrusion at " << nTotChanged << " faces."
+            << endl;
+
+        if (nTotChanged == 0)
+        {
+            break;
+        }
+
+        // Reset mesh points and start again
+        meshMover().movePoints(oldPoints);
+        meshMover().correct();
+
+        Info<< endl;
+    }
+
+
+    // At this point we have a (shrunk) mesh and a set of topology changes
+    // which will make a valid mesh with layer. Apply these changes to the
+    // current mesh.
+
+    // Apply the stored topo changes to the current mesh.
+    autoPtr<mapPolyMesh> map = savedMeshMod.changeMesh(mesh, false);
+
+    // Update fields
+    mesh.updateMesh(map);
+
+    // Move mesh (since morphing does not do this)
+    if (map().hasMotionPoints())
+    {
+        mesh.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh.clearOut();
+    }
+
+    if (meshRefiner_.overwrite())
+    {
+        mesh.setInstance(meshRefiner_.oldInstance());
+    }
+
+    meshRefiner_.updateMesh(map, labelList(0));
+
+
+    // Do final balancing
+    // ~~~~~~~~~~~~~~~~~~
+
+    if (Pstream::parRun())
+    {
+        Info<< nl
+            << "Doing final balancing" << nl
+            << "---------------------" << nl
+            << endl;
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+        }
+
+        // Balance. No restriction on face zones and baffles.
+        autoPtr<mapDistributePolyMesh> map = meshRefiner_.balance
+        (
+            false,
+            false,
+            scalarField(mesh.nCells(), 1.0),
+            decomposer,
+            distributor
+        );
+
+        // Re-distribute flag of layer faces and cells
+        map().distributeCellData(flaggedCells);
+        map().distributeFaceData(flaggedFaces);
+    }
+
+
+    // Write mesh
+    // ~~~~~~~~~~
+
+    cellSet addedCellSet
+    (
+        mesh,
+        "addedCells",
+        labelHashSet(findIndices(flaggedCells, true))
+    );
+    Info<< "Writing "
+        << returnReduce(addedCellSet.size(), sumOp<label>())
+        << " added cells to cellSet "
+        << addedCellSet.name() << endl;
+    addedCellSet.write();
+
+    faceSet layerFacesSet
+    (
+        mesh,
+        "layerFaces",
+        labelHashSet(findIndices(flaggedFaces, true))
+    );
+    Info<< "Writing "
+        << returnReduce(layerFacesSet.size(), sumOp<label>())
+        << " faces inside added layer to faceSet "
+        << layerFacesSet.name() << endl;
+    layerFacesSet.write();
+}
+
+
+void Foam::autoLayerDriver::doLayers
+(
+    const dictionary& shrinkDict,
+    const dictionary& motionDict,
+    const layerParameters& layerParams,
+    const bool preBalance,
+    decompositionMethod& decomposer,
+    fvMeshDistribute& distributor
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl
+        << "Shrinking and layer addition phase" << nl
+        << "----------------------------------" << nl
+        << endl;
+
+    Info<< "Using mesh parameters " << motionDict << nl << endl;
+
+    // Merge coplanar boundary faces
+    mergePatchFacesUndo(layerParams, motionDict);
+
+    // Per patch the number of layers (0 if no layer)
+    const labelList& numLayers = layerParams.numLayers();
+
+    // Patches that need to get a layer
+    DynamicList<label> patchIDs(numLayers.size());
+    label nFacesWithLayers = 0;
+    forAll(numLayers, patchI)
+    {
+        if (numLayers[patchI] > 0)
+        {
+            patchIDs.append(patchI);
+            nFacesWithLayers += mesh.boundaryMesh()[patchI].size();
+        }
+    }
+    patchIDs.shrink();
+
+    if (returnReduce(nFacesWithLayers, sumOp<label>()) == 0)
+    {
+        Info<< nl << "No layers to generate ..." << endl;
+    }
+    else
+    {
+        // Check that outside of mesh is not multiply connected.
+        checkMeshManifold();
+
+        // Check initial mesh
+        Info<< "Checking initial mesh ..." << endl;
+        labelHashSet wrongFaces(mesh.nFaces()/100);
+        motionSmoother::checkMesh(false, mesh, motionDict, wrongFaces);
+        const label nInitErrors = returnReduce
+        (
+            wrongFaces.size(),
+            sumOp<label>()
+        );
+
+        Info<< "Detected " << nInitErrors << " illegal faces"
+            << " (concave, zero area or negative cell pyramid volume)"
+            << endl;
+
+
+        // Balance
+        if (Pstream::parRun() && preBalance)
+        {
+            Info<< nl
+                << "Doing initial balancing" << nl
+                << "-----------------------" << nl
+                << endl;
+
+            scalarField cellWeights(mesh.nCells(), 1);
+            forAll(numLayers, patchI)
+            {
+                if (numLayers[patchI] > 0)
+                {
+                    const polyPatch& pp = mesh.boundaryMesh()[patchI];
+                    forAll(pp.faceCells(), i)
+                    {
+                        cellWeights[pp.faceCells()[i]] += numLayers[patchI];
+                    }
+                }
+            }
+
+            // Balance mesh (and meshRefinement). No restriction on face zones
+            // and baffles.
+            autoPtr<mapDistributePolyMesh> map = meshRefiner_.balance
+            (
+                false,
+                false,
+                cellWeights,
+                decomposer,
+                distributor
+            );
+
+            //{
+            //    globalIndex globalCells(mesh.nCells());
+            //
+            //    Info<< "** Distribution after balancing:" << endl;
+            //    for (label procI = 0; procI < Pstream::nProcs(); procI++)
+            //    {
+            //        Info<< "    " << procI << '\t'
+            //            << globalCells.localSize(procI) << endl;
+            //    }
+            //    Info<< endl;
+            //}
+        }
+
+
+        // Do all topo changes
+        addLayers
+        (
+            layerParams,
+            motionDict,
+            patchIDs,
+            nInitErrors,
+            decomposer,
+            distributor
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
new file mode 100644
index 000000000..d5a2cc04b
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -0,0 +1,561 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::autoLayerDriver
+
+Description
+    All to do with adding layers
+
+SourceFiles
+    autoLayerDriver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef autoLayerDriver_H
+#define autoLayerDriver_H
+
+#include "PackedBoolList.H"
+#include "meshRefinement.H"
+#include "wallPoint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class removePoints;
+class pointSet;
+class motionSmoother;
+class addPatchCellLayer;
+class pointData;
+class wallPoint;
+class faceSet;
+class layerParameters;
+
+/*---------------------------------------------------------------------------*\
+                           Class autoLayerDriver Declaration
+\*---------------------------------------------------------------------------*/
+
+class autoLayerDriver
+{
+    // Static data members
+
+        //- Extrusion controls
+        enum extrudeMode
+        {
+            NOEXTRUDE,      /*!< Do not extrude. No layers added. */
+            EXTRUDE,        /*!< Extrude */
+            EXTRUDEREMOVE   /*!< Extrude but afterwards remove added */
+                            /*!< faces locally */
+        };
+
+
+    // Private classes
+
+        //- Combine operator class to combine normal with other normal.
+        class nomalsCombine
+        {
+        public:
+
+            void operator()(vector& x, const vector& y) const
+            {
+                if (y != wallPoint::greatPoint)
+                {
+                    if (x == wallPoint::greatPoint)
+                    {
+                        x = y;
+                    }
+                    else
+                    {
+                        x *= (x&y);
+                    }
+                }
+            }
+        };
+
+
+    // Private data
+
+        //- Mesh+surface
+        meshRefinement& meshRefiner_;
+
+
+
+    // Private Member Functions
+
+
+        // Face merging
+
+            //- Merge patch faces. Undo until no checkMesh errors.
+            label mergePatchFacesUndo
+            (
+                const scalar minCos,
+                const scalar concaveCos,
+                const dictionary&
+            );
+
+            //- Remove points.
+            autoPtr<mapPolyMesh> doRemovePoints
+            (
+                removePoints& pointRemover,
+                const boolList& pointCanBeDeleted
+            );
+
+            //- Restore faces (which contain removed points)
+            autoPtr<mapPolyMesh> doRestorePoints
+            (
+                removePoints& pointRemover,
+                const labelList& facesToRestore
+            );
+
+            //- Return candidateFaces that are also in set.
+            labelList collectFaces
+            (
+                const labelList& candidateFaces,
+                const labelHashSet& set
+            ) const;
+
+            //- Pick up faces of cells of faces in set.
+            labelList growFaceCellFace(const labelHashSet&) const;
+
+            //- Remove points not used by any face or points used by only
+            //  two faces where the edges are in line
+            label mergeEdgesUndo(const scalar minCos, const dictionary&);
+
+
+        // Layers
+
+            //- For debugging: Dump displacement to .obj files
+            static void dumpDisplacement
+            (
+                const fileName&,
+                const indirectPrimitivePatch&,
+                const vectorField&,
+                const List<extrudeMode>&
+            );
+
+            //- Check that primitivePatch is not multiply connected.
+            //  Collect non-manifold points in pointSet.
+            static void checkManifold
+            (
+                const indirectPrimitivePatch&,
+                pointSet& nonManifoldPoints
+            );
+
+            //- Check that mesh outside is not multiply connected.
+            void checkMeshManifold() const;
+
+
+            // Static extrusion setup
+
+                //- Unset extrusion on point. Returns true if anything unset.
+                static bool unmarkExtrusion
+                (
+                    const label patchPointI,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                );
+
+                //- Unset extrusion on face. Returns true if anything unset.
+                static bool unmarkExtrusion
+                (
+                    const face& localFace,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                );
+
+                //- No extrusion at non-manifold points.
+                void handleNonManifolds
+                (
+                    const indirectPrimitivePatch& pp,
+                    const labelList& meshEdges,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
+                //- No extrusion on feature edges. Assumes non-manifold
+                //  edges already handled.
+                void handleFeatureAngle
+                (
+                    const indirectPrimitivePatch& pp,
+                    const labelList& meshEdges,
+                    const scalar minCos,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
+                //- No extrusion on warped faces
+                void handleWarpedFaces
+                (
+                    const indirectPrimitivePatch& pp,
+                    const scalar faceRatio,
+                    const scalar edge0Len,
+                    const labelList& cellLevel,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
+                //- Determine the number of layers per point from the number of
+                //  layers per surface.
+                void setNumLayers
+                (
+                    const labelList& patchToNLayers,
+                    const labelList& patchIDs,
+                    const indirectPrimitivePatch& pp,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
+                //- Grow no-extrusion layer.
+                static void growNoExtrusion
+                (
+                    const indirectPrimitivePatch& pp,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                );
+
+                //- Calculate pointwise wanted and minimum thickness.
+                //  thickness: wanted thickness
+                //  minthickness: when to give up and not extrude
+                //  Gets per patch parameters and determine pp pointwise
+                //  parameters.
+                void calculateLayerThickness
+                (
+                    const indirectPrimitivePatch& pp,
+                    const labelList& patchIDs,
+
+                    const scalarField& patchExpansionRatio,
+                    const bool relativeSizes,
+                    const scalarField& patchFinalLayerThickness,
+                    const scalarField& patchMinThickness,
+
+                    const labelList& cellLevel,
+                    const labelList& patchNLayers,
+                    const scalar edge0Len,
+
+                    scalarField& thickness,
+                    scalarField& minThickness,
+                    scalarField& expansionRatio
+                ) const;
+
+
+            // Extrusion execution
+
+                //- Synchronize displacement among coupled patches.
+                void syncPatchDisplacement
+                (
+                    const motionSmoother& meshMover,
+                    const scalarField& minThickness,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
+                //- Get nearest point on surface to snap to
+                void getPatchDisplacement
+                (
+                    const motionSmoother& meshMover,
+                    const scalarField& thickness,
+                    const scalarField& minThickness,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
+                //- Truncates displacement
+                // - for all patchFaces in the faceset displacement gets set
+                //   to zero
+                // - all displacement < minThickness gets set to zero
+                label truncateDisplacement
+                (
+                    const motionSmoother& meshMover,
+                    const scalarField& minThickness,
+                    const faceSet& illegalPatchFaces,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
+                //- Setup layer information (at points and faces) to
+                //  modify mesh topology in
+                //  regions where layer mesh terminates. Guarantees an
+                //  optional slow decreasing of the number of layers.
+                //  Returns the number of layers per face and per point
+                //  to go into the actual layer addition engine.
+                void setupLayerInfoTruncation
+                (
+                    const motionSmoother& meshMover,
+                    const labelList& patchNLayers,
+                    const List<extrudeMode>& extrudeStatus,
+                    const label nBufferCellsNoExtrude,
+                    labelList& nPatchPointLayers,
+                    labelList& nPatchFaceLayers
+                ) const;
+
+                //- Does any of the cells use a face from faces?
+                static bool cellsUseFace
+                (
+                    const polyMesh& mesh,
+                    const labelList& cellLabels,
+                    const labelHashSet& faces
+                );
+
+                //- Checks the newly added cells and locally unmarks points
+                //  so they will not get extruded next time round. Returns
+                //  global number of unmarked points (0 if all was fine)
+                static label checkAndUnmark
+                (
+                    const addPatchCellLayer& addLayer,
+                    const dictionary& motionDict,
+                    const indirectPrimitivePatch& pp,
+                    const polyMesh&,
+
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                );
+
+                //- Count global number of extruded faces
+                static label countExtrusion
+                (
+                    const indirectPrimitivePatch& pp,
+                    const List<extrudeMode>& extrudeStatus
+                );
+
+                //- Collect layer faces and layer cells into bools
+                //  for ease of handling
+                static void getLayerCellsFaces
+                (
+                    const polyMesh&,
+                    const addPatchCellLayer&,
+                    boolList&,
+                    boolList&
+                );
+
+            // Mesh shrinking (to create space for layers)
+
+                //- Average field (over all subset of mesh points) by
+                //  summing contribution from edges. Global parallel since only
+                //  does master edges for coupled edges.
+                template<class Type>
+                static void averageNeighbours
+                (
+                    const polyMesh& mesh,
+                    const PackedBoolList& isMasterEdge,
+                    const labelList& meshEdges,
+                    const labelList& meshPoints,
+                    const edgeList& edges,
+                    const scalarField& invSumWeight,
+                    const Field<Type>& data,
+                    Field<Type>& average
+                );
+
+                //- Calculate inverse sum of edge weights
+                //  (currently always 1.0)
+                void sumWeights
+                (
+                    const PackedBoolList& isMasterEdge,
+                    const labelList& meshEdges,
+                    const labelList& meshPoints,
+                    const edgeList& edges,
+                    scalarField& invSumWeight
+                ) const;
+
+                //- Smooth scalar field on patch
+                void smoothField
+                (
+                    const motionSmoother& meshMover,
+                    const PackedBoolList& isMasterEdge,
+                    const labelList& meshEdges,
+                    const scalarField& fieldMin,
+                    const label nSmoothDisp,
+                    scalarField& field
+                ) const;
+
+                //- Smooth normals on patch.
+                void smoothPatchNormals
+                (
+                    const motionSmoother& meshMover,
+                    const PackedBoolList& isMasterEdge,
+                    const labelList& meshEdges,
+                    const label nSmoothDisp,
+                    pointField& normals
+                ) const;
+
+                //- Smooth normals in interior.
+                void smoothNormals
+                (
+                    const label nSmoothDisp,
+                    const PackedBoolList& isMasterEdge,
+                    const labelList& fixedPoints,
+                    pointVectorField& normals
+                ) const;
+
+                bool isMaxEdge
+                (
+                    const List<pointData>&,
+                    const label edgeI,
+                    const scalar minCos
+                ) const;
+
+                //- Stop layer growth where mesh wraps around edge with a
+                //  large feature angle
+                void handleFeatureAngleLayerTerminations
+                (
+                    const indirectPrimitivePatch& pp,
+                    const scalar minCos,
+                    List<extrudeMode>& extrudeStatus,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    label& nPointCounter
+                ) const;
+
+                //- Find isolated islands (points, edges and faces and
+                // layer terminations)
+                // in the layer mesh and stop any layer growth at these points.
+                void findIsolatedRegions
+                (
+                    const indirectPrimitivePatch& pp,
+                    const PackedBoolList& isMasterEdge,
+                    const labelList& meshEdges,
+                    const scalar minCosLayerTermination,
+                    scalarField& field,
+                    List<extrudeMode>& extrudeStatus,
+                    pointField& patchDisp,
+                    labelList& patchNLayers
+                ) const;
+
+                // Calculate medial axis fields
+                void medialAxisSmoothingInfo
+                (
+                    const motionSmoother& meshMover,
+                    const label nSmoothNormals,
+                    const label nSmoothSurfaceNormals,
+                    const scalar minMedianAxisAngleCos,
+
+                    pointVectorField& dispVec,
+                    pointScalarField& medialRatio,
+                    pointScalarField& medialDist
+                ) const;
+
+                //- Main routine to shrink mesh
+                void shrinkMeshMedialDistance
+                (
+                    motionSmoother& meshMover,
+                    const dictionary& meshQualityDict,
+                    const label nSmoothThickness,
+                    const scalar maxThicknessToMedialRatio,
+                    const label nAllowableErrors,
+                    const label nSnap,
+                    const scalar minCosLayerTermination,
+
+                    const scalarField& layerThickness,
+                    const scalarField& minThickness,
+
+                    const pointVectorField& dispVec,
+                    const pointScalarField& medialRatio,
+                    const pointScalarField& medialDist,
+
+                    List<extrudeMode>& extrudeStatus,
+                    pointField& patchDisp,
+                    labelList& patchNLayers
+                ) const;
+
+
+
+        //- Disallow default bitwise copy construct
+        autoLayerDriver(const autoLayerDriver&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const autoLayerDriver&);
+
+
+public:
+
+    //- Runtime type information
+    ClassName("autoLayerDriver");
+
+    // Constructors
+
+        //- Construct from components
+        autoLayerDriver(meshRefinement& meshRefiner);
+
+
+    // Member Functions
+
+            //- Merge patch faces on same cell.
+            void mergePatchFacesUndo
+            (
+                const layerParameters& layerParams,
+                const dictionary& motionDict
+            );
+
+            //- Add cell layers
+            void addLayers
+            (
+                const layerParameters& layerParams,
+                const dictionary& motionDict,
+                const labelList& patchIDs,
+                const label nAllowableErrors,
+                decompositionMethod& decomposer,
+                fvMeshDistribute& distributor
+            );
+
+            //- Add layers according to the dictionary settings
+            void doLayers
+            (
+                const dictionary& shrinkDict,
+                const dictionary& motionDict,
+                const layerParameters& layerParams,
+                const bool preBalance,              // balance before adding?
+                decompositionMethod& decomposer,
+                fvMeshDistribute& distributor
+            );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "autoLayerDriverTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
new file mode 100644
index 000000000..eb06c3331
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -0,0 +1,1167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    Shrinking mesh (part of adding cell layers)
+
+\*---------------------------------------------------------------------------*/
+
+#include "autoLayerDriver.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "pointFields.H"
+#include "motionSmoother.H"
+#include "pointData.H"
+#include "PointEdgeWave.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Calculate inverse sum of edge weights (currently always 1.0)
+void Foam::autoLayerDriver::sumWeights
+(
+    const PackedBoolList& isMasterEdge,
+    const labelList& meshEdges,
+    const labelList& meshPoints,
+    const edgeList& edges,
+    scalarField& invSumWeight
+) const
+{
+    invSumWeight = 0;
+
+    forAll(edges, edgeI)
+    {
+        if (isMasterEdge.get(meshEdges[edgeI]) == 1)
+        {
+            const edge& e = edges[edgeI];
+            //scalar eWeight = edgeWeights[edgeI];
+            scalar eWeight = 1.0;
+
+            invSumWeight[e[0]] += eWeight;
+            invSumWeight[e[1]] += eWeight;
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        meshRefiner_.mesh(),
+        meshPoints,
+        invSumWeight,
+        plusEqOp<scalar>(),
+        scalar(0.0),        // null value
+        false               // no separation
+    );
+
+    forAll(invSumWeight, pointI)
+    {
+        scalar w = invSumWeight[pointI];
+
+        if (w > 0.0)
+        {
+            invSumWeight[pointI] = 1.0/w;
+        }
+    }
+}
+
+
+// Smooth field on moving patch
+void Foam::autoLayerDriver::smoothField
+(
+    const motionSmoother& meshMover,
+    const PackedBoolList& isMasterEdge,
+    const labelList& meshEdges,
+    const scalarField& fieldMin,
+    const label nSmoothDisp,
+    scalarField& field
+) const
+{
+    const indirectPrimitivePatch& pp = meshMover.patch();
+    const edgeList& edges = pp.edges();
+    const labelList& meshPoints = pp.meshPoints();
+
+    scalarField invSumWeight(pp.nPoints());
+    sumWeights
+    (
+        isMasterEdge,
+        meshEdges,
+        meshPoints,
+        edges,
+        invSumWeight
+    );
+
+    // Get smoothly varying patch field.
+    Info<< "shrinkMeshDistance : Smoothing field ..." << endl;
+
+    for (label iter = 0; iter < nSmoothDisp; iter++)
+    {
+        scalarField average(pp.nPoints());
+        averageNeighbours
+        (
+            meshMover.mesh(),
+            isMasterEdge,
+            meshEdges,
+            meshPoints,
+            pp.edges(),
+            invSumWeight,
+            field,
+            average
+        );
+
+        // Transfer to field
+        forAll(field, pointI)
+        {
+            //full smoothing neighbours + point value
+            average[pointI] = 0.5*(field[pointI]+average[pointI]);
+
+            // perform monotonic smoothing
+            if
+            (
+                average[pointI] < field[pointI]
+             && average[pointI] >= fieldMin[pointI]
+            )
+            {
+                field[pointI] = average[pointI];
+            }
+        }
+
+        // Do residual calculation every so often.
+        if ((iter % 10) == 0)
+        {
+            Info<< "    Iteration " << iter << "   residual "
+                <<  gSum(mag(field-average))
+                   /returnReduce(average.size(), sumOp<label>())
+                << endl;
+        }
+    }
+}
+
+
+// Smooth normals on moving patch.
+void Foam::autoLayerDriver::smoothPatchNormals
+(
+    const motionSmoother& meshMover,
+    const PackedBoolList& isMasterEdge,
+    const labelList& meshEdges,
+    const label nSmoothDisp,
+    pointField& normals
+) const
+{
+    const indirectPrimitivePatch& pp = meshMover.patch();
+    const edgeList& edges = pp.edges();
+    const labelList& meshPoints = pp.meshPoints();
+
+    // Calculate inverse sum of weights
+
+    scalarField invSumWeight(pp.nPoints());
+    sumWeights
+    (
+        isMasterEdge,
+        meshEdges,
+        meshPoints,
+        edges,
+        invSumWeight
+    );
+
+    // Get smoothly varying internal normals field.
+    Info<< "shrinkMeshDistance : Smoothing normals ..." << endl;
+
+    for (label iter = 0; iter < nSmoothDisp; iter++)
+    {
+        vectorField average(pp.nPoints());
+        averageNeighbours
+        (
+            meshMover.mesh(),
+            isMasterEdge,
+            meshEdges,
+            meshPoints,
+            pp.edges(),
+            invSumWeight,
+            normals,
+            average
+        );
+
+        // Do residual calculation every so often.
+        if ((iter % 10) == 0)
+        {
+            Info<< "    Iteration " << iter << "   residual "
+                <<  gSum(mag(normals-average))
+                   /returnReduce(average.size(), sumOp<label>())
+                << endl;
+        }
+
+        // Transfer to normals vector field
+        forAll(average, pointI)
+        {
+            // full smoothing neighbours + point value
+            average[pointI] = 0.5*(normals[pointI]+average[pointI]);
+            normals[pointI] = average[pointI];
+            normals[pointI] /= mag(normals[pointI]) + VSMALL;
+        }
+    }
+}
+
+
+// Smooth normals in interior.
+void Foam::autoLayerDriver::smoothNormals
+(
+    const label nSmoothDisp,
+    const PackedBoolList& isMasterEdge,
+    const labelList& fixedPoints,
+    pointVectorField& normals
+) const
+{
+    // Get smoothly varying internal normals field.
+    Info<< "shrinkMeshDistance : Smoothing normals ..." << endl;
+
+    const fvMesh& mesh = meshRefiner_.mesh();
+    const edgeList& edges = mesh.edges();
+
+    // Points that do not change.
+    PackedBoolList isFixedPoint(mesh.nPoints());
+
+    // Internal points that are fixed
+    forAll(fixedPoints, i)
+    {
+        label meshPointI = fixedPoints[i];
+        isFixedPoint.set(meshPointI, 1);
+    }
+
+    // Correspondence between local edges/points and mesh edges/points
+    const labelList meshEdges(identity(mesh.nEdges()));
+    const labelList meshPoints(identity(mesh.nPoints()));
+
+    // Calculate inverse sum of weights
+
+    scalarField invSumWeight(mesh.nPoints(), 0);
+    sumWeights
+    (
+        isMasterEdge,
+        meshEdges,
+        meshPoints,
+        edges,
+        invSumWeight
+    );
+
+    Info<< "shrinkMeshDistance : Smoothing normals in interior ..." << endl;
+
+    for (label iter = 0; iter < nSmoothDisp; iter++)
+    {
+        vectorField average(mesh.nPoints());
+        averageNeighbours
+        (
+            mesh,
+            isMasterEdge,
+            meshEdges,
+            meshPoints,
+            edges,
+            invSumWeight,
+            normals,
+            average
+        );
+
+        // Do residual calculation every so often.
+        if ((iter % 10) == 0)
+        {
+            Info<< "    Iteration " << iter << "   residual "
+                <<  gSum(mag(normals-average))
+                   /returnReduce(average.size(), sumOp<label>())
+                << endl;
+        }
+
+
+        // Transfer to normals vector field
+        forAll(average, pointI)
+        {
+            if (isFixedPoint.get(pointI) == 0)
+            {
+                //full smoothing neighbours + point value
+                average[pointI] = 0.5*(normals[pointI]+average[pointI]);
+                normals[pointI] = average[pointI];
+                normals[pointI] /= mag(normals[pointI]) + VSMALL;
+            }
+        }
+    }
+}
+
+
+// Tries and find a medial axis point. Done by comparing vectors to nearest
+// wall point for both vertices of edge.
+bool Foam::autoLayerDriver::isMaxEdge
+(
+    const List<pointData>& pointWallDist,
+    const label edgeI,
+    const scalar minCos
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+    const pointField& points = mesh.points();
+
+    // Do not mark edges with one side on moving wall.
+
+    const edge& e = mesh.edges()[edgeI];
+
+    vector v0(points[e[0]] - pointWallDist[e[0]].origin());
+    scalar magV0(mag(v0));
+
+    if (magV0 < SMALL)
+    {
+        return false;
+    }
+
+    vector v1(points[e[1]] - pointWallDist[e[1]].origin());
+    scalar magV1(mag(v1));
+
+    if (magV1 < SMALL)
+    {
+        return false;
+    }
+
+    v0 /= magV0;
+    v1 /= magV1;
+
+    // Test angle.
+    if ((v0 & v1) < minCos)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// Stop layer growth where mesh wraps around edge with a
+// large feature angle
+void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
+(
+    const indirectPrimitivePatch& pp,
+    const scalar minCos,
+    List<extrudeMode>& extrudeStatus,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    label& nPointCounter
+) const
+{
+    // Mark faces that have all points extruded
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    boolList extrudedFaces(pp.size(), true);
+
+    forAll(pp.localFaces(), faceI)
+    {
+        const face& f = pp.localFaces()[faceI];
+
+        forAll(f, fp)
+        {
+            if (extrudeStatus[f[fp]] == NOEXTRUDE)
+            {
+                extrudedFaces[faceI] = false;
+                break;
+            }
+        }
+    }
+
+
+    // Detect situation where two featureedge-neighbouring faces are partly or
+    // not extruded and the edge itself is extruded. In this case unmark the
+    // edge for extrusion.
+
+    forAll(pp.edgeFaces(), edgeI)
+    {
+        const labelList& eFaces = pp.edgeFaces()[edgeI];
+
+        if (eFaces.size() == 2)
+        {
+            const edge& e = pp.edges()[edgeI];
+            label v0 = e[0];
+            label v1 = e[1];
+
+            if
+            (
+                extrudeStatus[v0] != NOEXTRUDE
+             || extrudeStatus[v1] != NOEXTRUDE
+            )
+            {
+                if (!extrudedFaces[eFaces[0]] || !extrudedFaces[eFaces[1]])
+                {
+                    const vector& n0 = pp.faceNormals()[eFaces[0]];
+                    const vector& n1 = pp.faceNormals()[eFaces[1]];
+
+                    if ((n0 & n1) < minCos)
+                    {
+                        if
+                        (
+                            unmarkExtrusion
+                            (
+                                v0,
+                                patchDisp,
+                                patchNLayers,
+                                extrudeStatus
+                            )
+                        )
+                        {
+                            nPointCounter++;
+                        }
+                        if
+                        (
+                            unmarkExtrusion
+                            (
+                                v1,
+                                patchDisp,
+                                patchNLayers,
+                                extrudeStatus
+                            )
+                        )
+                        {
+                            nPointCounter++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+// Find isolated islands (points, edges and faces and layer terminations)
+// in the layer mesh and stop any layer growth at these points.
+void Foam::autoLayerDriver::findIsolatedRegions
+(
+    const indirectPrimitivePatch& pp,
+    const PackedBoolList& isMasterEdge,
+    const labelList& meshEdges,
+    const scalar minCosLayerTermination,
+    scalarField& field,
+    List<extrudeMode>& extrudeStatus,
+    pointField& patchDisp,
+    labelList& patchNLayers
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< "shrinkMeshDistance : Removing isolated regions ..." << endl;
+
+    // Keep count of number of points unextruded
+    label nPointCounter = 0;
+
+    while (true)
+    {
+        // Stop layer growth where mesh wraps around edge with a
+        // large feature angle
+        handleFeatureAngleLayerTerminations
+        (
+            pp,
+            minCosLayerTermination,
+
+            extrudeStatus,
+            patchDisp,
+            patchNLayers,
+            nPointCounter
+        );
+
+
+        // Do not extrude from point where all neighbouring
+        // faces are not grown
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        boolList extrudedFaces(pp.size(), true);
+        forAll(pp.localFaces(), faceI)
+        {
+            const face& f = pp.localFaces()[faceI];
+            forAll(f, fp)
+            {
+                if (extrudeStatus[f[fp]] == NOEXTRUDE)
+                {
+                    extrudedFaces[faceI] = false;
+                    break;
+                }
+            }
+        }
+
+        const labelListList& pointFaces = pp.pointFaces();
+
+        boolList keptPoints(pp.nPoints(), false);
+        forAll(keptPoints, patchPointI)
+        {
+            const labelList& pFaces = pointFaces[patchPointI];
+
+            forAll(pFaces, i)
+            {
+                label faceI = pFaces[i];
+                if (extrudedFaces[faceI])
+                {
+                    keptPoints[patchPointI] = true;
+                    break;
+                }
+            }
+        }
+
+        syncTools::syncPointList
+        (
+            mesh,
+            pp.meshPoints(),
+            keptPoints,
+            orEqOp<bool>(),
+            false,              // null value
+            false               // no separation
+        );
+
+        label nChanged = 0;
+
+        forAll(keptPoints, patchPointI)
+        {
+            if (!keptPoints[patchPointI])
+            {
+                if
+                (
+                    unmarkExtrusion
+                    (
+                        patchPointI,
+                        patchDisp,
+                        patchNLayers,
+                        extrudeStatus
+                    )
+                )
+                {
+                   nPointCounter++;
+                   nChanged++;
+                }
+           }
+       }
+
+
+       if (returnReduce(nChanged, sumOp<label>()) == 0)
+       {
+           break;
+       }
+   }
+
+    const edgeList& edges = pp.edges();
+
+
+    // Count number of mesh edges using a point
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList isolatedPoint(pp.nPoints(),0);
+
+    forAll(edges, edgeI)
+    {
+        if (isMasterEdge.get(meshEdges[edgeI]) == 1)
+        {
+            const edge& e = edges[edgeI];
+
+            label v0 = e[0];
+            label v1 = e[1];
+
+            if (extrudeStatus[v1] != NOEXTRUDE)
+            {
+                isolatedPoint[v0] += 1;
+            }
+            if (extrudeStatus[v0] != NOEXTRUDE)
+            {
+                isolatedPoint[v1] += 1;
+            }
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        isolatedPoint,
+        plusEqOp<label>(),
+        0,       // null value
+        false    // no separation
+    );
+
+    // stop layer growth on isolated faces
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    forAll(pp, faceI)
+    {
+        const face& f = pp.localFaces()[faceI];
+        bool failed = false;
+        forAll(f, fp)
+        {
+            if (isolatedPoint[f[fp]] > 2)
+            {
+                failed = true;
+                break;
+            }
+        }
+        bool allPointsExtruded = true;
+        if (!failed)
+        {
+            forAll(f, fp)
+            {
+                if (extrudeStatus[f[fp]] == NOEXTRUDE)
+                {
+                    allPointsExtruded = false;
+                    break;
+                }
+            }
+
+            if (allPointsExtruded)
+            {
+                forAll(f, fp)
+                {
+                    if
+                    (
+                        unmarkExtrusion
+                        (
+                            f[fp],
+                            patchDisp,
+                            patchNLayers,
+                            extrudeStatus
+                        )
+                    )
+                    {
+                        field[f[fp]] = 0.0;
+                        nPointCounter++;
+                    }
+                }
+            }
+        }
+    }
+
+    reduce(nPointCounter, sumOp<label>());
+    Info<< "Number isolated points extrusion stopped : "<< nPointCounter<< endl;
+}
+
+
+// Calculates medial axis fields:
+// dispVec     : normal of nearest wall. Where this normal changes direction
+//               defines the medial axis
+// medialDist  : distance to medial axis
+// medialRatio : ratio of medial distance to wall distance.
+//               (1 at wall, 0 at medial axis)
+void Foam::autoLayerDriver::medialAxisSmoothingInfo
+(
+    const motionSmoother& meshMover,
+    const label nSmoothNormals,
+    const label nSmoothSurfaceNormals,
+    const scalar minMedianAxisAngleCos,
+
+    pointVectorField& dispVec,
+    pointScalarField& medialRatio,
+    pointScalarField& medialDist
+) const
+{
+
+    Info<< "medialAxisSmoothingInfo :"
+        << " Calculate distance to Medial Axis ..." << endl;
+
+    const polyMesh& mesh = meshMover.mesh();
+    const pointField& points = mesh.points();
+
+    const indirectPrimitivePatch& pp = meshMover.patch();
+    const vectorField& faceNormals = pp.faceNormals();
+    const labelList& meshPoints = pp.meshPoints();
+
+    // Predetermine mesh edges
+    // ~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Precalulate master edge (only relevant for shared edges)
+    PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
+    // Precalculate meshEdge per pp edge
+    labelList meshEdges(pp.nEdges());
+
+    forAll(meshEdges, patchEdgeI)
+    {
+        const edge& e = pp.edges()[patchEdgeI];
+
+        label v0 = pp.meshPoints()[e[0]];
+        label v1 = pp.meshPoints()[e[1]];
+        meshEdges[patchEdgeI] = meshTools::findEdge
+        (
+            mesh.edges(),
+            mesh.pointEdges()[v0],
+            v0,
+            v1
+        );
+    }
+
+
+    // Determine pointNormal
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    pointField pointNormals(pp.nPoints(), vector::zero);
+    {
+        labelList nPointFaces(pp.nPoints(), 0);
+
+        forAll(faceNormals, faceI)
+        {
+            const face& f = pp.localFaces()[faceI];
+
+            forAll(f, fp)
+            {
+                pointNormals[f[fp]] += faceNormals[faceI];
+                nPointFaces[f[fp]] ++;
+            }
+        }
+
+        syncTools::syncPointList
+        (
+            mesh,
+            meshPoints,
+            pointNormals,
+            plusEqOp<vector>(),
+            vector::zero,       // null value
+            false               // no separation
+        );
+
+        syncTools::syncPointList
+        (
+            mesh,
+            meshPoints,
+            nPointFaces,
+            plusEqOp<label>(),
+            0,                  // null value
+            false               // no separation
+        );
+
+        forAll(pointNormals, i)
+        {
+            pointNormals[i] /= nPointFaces[i];
+        }
+    }
+
+    // Smooth patch normal vectors
+    smoothPatchNormals
+    (
+        meshMover,
+        isMasterEdge,
+        meshEdges,
+        nSmoothSurfaceNormals,
+        pointNormals
+    );
+
+
+    // Calculate distance to pp points
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Distance to wall
+    List<pointData> pointWallDist(mesh.nPoints());
+
+
+    // 1. Calculate distance to points where displacement is specified.
+    {
+        // Seed data.
+        List<pointData> wallInfo(meshPoints.size());
+
+        forAll(meshPoints, patchPointI)
+        {
+            label pointI = meshPoints[patchPointI];
+            wallInfo[patchPointI] = pointData
+            (
+                points[pointI],
+                0.0,
+                pointI,                       // passive scalar
+                pointNormals[patchPointI]     // surface normals
+            );
+        }
+
+        // Do all calculations
+        List<pointData> edgeWallDist(mesh.nEdges());
+        PointEdgeWave<pointData> wallDistCalc
+        (
+            mesh,
+            meshPoints,
+            wallInfo,
+            pointWallDist,
+            edgeWallDist,
+            mesh.globalData().nTotalPoints()    // max iterations
+        );
+    }
+
+    // 2. Find points with max distance and transport information back to
+    //    wall.
+    {
+        List<pointData> pointMedialDist(mesh.nPoints());
+        List<pointData> edgeMedialDist(mesh.nEdges());
+
+        // Seed point data.
+        DynamicList<pointData> maxInfo(meshPoints.size());
+        DynamicList<label> maxPoints(meshPoints.size());
+
+        // 1. Medial axis points
+
+        const edgeList& edges = mesh.edges();
+
+        forAll(edges, edgeI)
+        {
+            if (isMaxEdge(pointWallDist, edgeI, minMedianAxisAngleCos))
+            {
+                // Both end points of edge have very different nearest wall
+                // point. Mark both points as medial axis points.
+                const edge& e = edges[edgeI];
+
+                forAll(e, ep)
+                {
+                    label pointI = e[ep];
+
+                    if (!pointMedialDist[pointI].valid())
+                    {
+                        maxPoints.append(pointI);
+                        maxInfo.append
+                        (
+                            pointData
+                            (
+                                points[pointI],
+                                0.0,
+                                pointI,         // passive data
+                                vector::zero    // passive data
+                            )
+                        );
+                        pointMedialDist[pointI] = maxInfo[maxInfo.size()-1];
+                    }
+                }
+            }
+        }
+
+
+        // 2. Seed non-adapt patches
+        const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+        labelHashSet adaptPatches(meshMover.adaptPatchIDs());
+
+        forAll(patches, patchI)
+        {
+            const polyPatch& pp = patches[patchI];
+
+            if
+            (
+                !pp.coupled()
+             && !isA<emptyPolyPatch>(pp)
+             && !adaptPatches.found(patchI)
+            )
+            {
+                Info<< "Inserting points on patch " << pp.name() << endl;
+
+                const labelList& meshPoints = pp.meshPoints();
+
+                forAll(meshPoints, i)
+                {
+                    label pointI = meshPoints[i];
+
+                    if (!pointMedialDist[pointI].valid())
+                    {
+                        maxPoints.append(pointI);
+                        maxInfo.append
+                        (
+                            pointData
+                            (
+                                points[pointI],
+                                0.0,
+                                pointI,         // passive data
+                                vector::zero    // passive data
+                            )
+                        );
+                        pointMedialDist[pointI] = maxInfo[maxInfo.size()-1];
+                    }
+                }
+            }
+        }
+
+        maxInfo.shrink();
+        maxPoints.shrink();
+
+        // Do all calculations
+        PointEdgeWave<pointData> medialDistCalc
+        (
+            mesh,
+            maxPoints,
+            maxInfo,
+
+            pointMedialDist,
+            edgeMedialDist,
+            mesh.globalData().nTotalPoints()    // max iterations
+        );
+
+        // Extract medial axis distance as pointScalarField
+        forAll(pointMedialDist, pointI)
+        {
+            medialDist[pointI] = Foam::sqrt(pointMedialDist[pointI].distSqr());
+        }
+    }
+
+    // Extract transported surface normals as pointVectorField
+    forAll(dispVec, i)
+    {
+        dispVec[i] = pointWallDist[i].v();
+    }
+
+    // Smooth normal vectors. Do not change normals on pp.meshPoints
+    smoothNormals(nSmoothNormals, isMasterEdge, meshPoints, dispVec);
+
+    // Calculate ratio point medial distance to point wall distance
+    forAll(medialRatio, pointI)
+    {
+        scalar wDist2 = pointWallDist[pointI].distSqr();
+        scalar mDist = medialDist[pointI];
+
+        if (wDist2 < sqr(SMALL) && mDist < SMALL)
+        {
+            medialRatio[pointI] = 0.0;
+        }
+        else
+        {
+            medialRatio[pointI] = mDist / (Foam::sqrt(wDist2) + mDist);
+        }
+    }
+
+    if (debug)
+    {
+        Info<< "medialAxisSmoothingInfo :"
+            << " Writing:" << nl
+            << "    " << dispVec.name()
+            << " : normalised direction of nearest displacement" << nl
+            << "    " << medialDist.name()
+            << " : distance to medial axis" << nl
+            << "    " << medialRatio.name()
+            << " : ratio of medial distance to wall distance" << nl
+            << endl;
+        dispVec.write();
+        medialDist.write();
+        medialRatio.write();
+    }
+}
+
+
+void Foam::autoLayerDriver::shrinkMeshMedialDistance
+(
+    motionSmoother& meshMover,
+    const dictionary& meshQualityDict,
+    const label nSmoothThickness,
+    const scalar maxThicknessToMedialRatio,
+    const label nAllowableErrors,
+    const label nSnap,
+    const scalar minCosLayerTermination,
+
+    const scalarField& layerThickness,
+    const scalarField& minThickness,
+
+    const pointVectorField& dispVec,
+    const pointScalarField& medialRatio,
+    const pointScalarField& medialDist,
+
+    List<extrudeMode>& extrudeStatus,
+    pointField& patchDisp,
+    labelList& patchNLayers
+) const
+{
+    Info<< "shrinkMeshMedialDistance : Smoothing using Medial Axis ..." << endl;
+
+    const polyMesh& mesh = meshMover.mesh();
+
+    const indirectPrimitivePatch& pp = meshMover.patch();
+    const labelList& meshPoints = pp.meshPoints();
+
+    // Precalulate master edge (only relevant for shared edges)
+    PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
+    // Precalculate meshEdge per pp edge
+    labelList meshEdges(pp.nEdges());
+
+    forAll(meshEdges, patchEdgeI)
+    {
+        const edge& e = pp.edges()[patchEdgeI];
+
+        label v0 = pp.meshPoints()[e[0]];
+        label v1 = pp.meshPoints()[e[1]];
+        meshEdges[patchEdgeI] = meshTools::findEdge
+        (
+            mesh.edges(),
+            mesh.pointEdges()[v0],
+            v0,
+            v1
+        );
+    }
+
+
+    scalarField thickness(layerThickness.size());
+
+    thickness = mag(patchDisp);
+
+    forAll(thickness, patchPointI)
+    {
+        if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        {
+            thickness[patchPointI] = 0.0;
+        }
+    }
+
+    label numThicknessRatioExclude = 0;
+
+    // reduce thickness where thickness/medial axis distance large
+    forAll(meshPoints, patchPointI)
+    {
+        if (extrudeStatus[patchPointI] != NOEXTRUDE)
+        {
+            label pointI = meshPoints[patchPointI];
+
+            scalar mDist = medialDist[pointI];
+
+            scalar thicknessRatio = thickness[patchPointI]/(mDist+VSMALL);
+
+            if (thicknessRatio > maxThicknessToMedialRatio)
+            {
+                // Truncate thickness.
+                thickness[patchPointI] =
+                    0.5*(minThickness[patchPointI]+thickness[patchPointI]);
+
+                patchDisp[patchPointI] =
+                    thickness[patchPointI]
+                  * patchDisp[patchPointI]
+                  / (mag(patchDisp[patchPointI]) + VSMALL);
+                numThicknessRatioExclude++;
+            }
+        }
+    }
+
+    reduce(numThicknessRatioExclude, sumOp<label>());
+    Info<< "shrinkMeshMedialDistance : Reduce layer thickness at "
+        << numThicknessRatioExclude
+        << " nodes where thickness to medial axis distance is large " << endl;
+
+    // find points where layer growth isolated to a lone point, edge or face
+
+    findIsolatedRegions
+    (
+        pp,
+        isMasterEdge,
+        meshEdges,
+        minCosLayerTermination,
+        thickness,
+        extrudeStatus,
+        patchDisp,
+        patchNLayers
+    );
+
+    // smooth layer thickness on moving patch
+    smoothField
+    (
+        meshMover,
+        isMasterEdge,
+        meshEdges,
+        minThickness,
+        nSmoothThickness,
+        thickness
+    );
+
+    List<pointData> pointWallDist(mesh.nPoints());
+
+    const pointField& points = mesh.points();
+    // 1. Calculate distance to points where displacement is specified.
+    // This wave is used to transport layer thickness
+    {
+        // Distance to wall and medial axis on edges.
+        List<pointData> edgeWallDist(mesh.nEdges());
+        labelList wallPoints(meshPoints.size());
+
+        // Seed data.
+        List<pointData> wallInfo(meshPoints.size());
+
+        forAll(meshPoints, patchPointI)
+        {
+            label pointI = meshPoints[patchPointI];
+            wallPoints[patchPointI] = pointI;
+            wallInfo[patchPointI] = pointData
+            (
+                points[pointI],
+                0.0,
+                thickness[patchPointI],       // transport layer thickness
+                vector::zero                  // passive vector
+            );
+        }
+
+        // Do all calculations
+        PointEdgeWave<pointData> wallDistCalc
+        (
+            mesh,
+            wallPoints,
+            wallInfo,
+            pointWallDist,
+            edgeWallDist,
+            mesh.globalData().nTotalPoints()    // max iterations
+        );
+    }
+
+    // Calculate scaled displacement vector
+    pointVectorField& displacement = meshMover.displacement();
+
+    forAll(displacement, pointI)
+    {
+        // 1) displacement on nearest wall point, scaled by medialRatio
+        //    (wall distance / medial distance)
+        // 2) pointWallDist[pointI].s() is layer thickness transported
+        //    from closest wall point.
+        // 3) shrink in opposite direction of addedPoints
+        displacement[pointI] =
+            -medialRatio[pointI]
+            *pointWallDist[pointI].s()
+            *dispVec[pointI];
+    }
+
+    // Current faces to check. Gets modified in meshMover.scaleMesh
+    labelList checkFaces(identity(mesh.nFaces()));
+
+    Info<< "shrinkMeshMedialDistance : Moving mesh ..." << endl;
+    scalar oldErrorReduction = -1;
+
+    for (label iter = 0; iter < 2*nSnap ; iter++)
+    {
+        Info<< "Iteration " << iter << endl;
+        if (iter == nSnap)
+        {
+            Info<< "Displacement scaling for error reduction set to 0."
+                << endl;
+            oldErrorReduction = meshMover.setErrorReduction(0.0);
+        }
+
+        if
+        (
+            meshMover.scaleMesh
+            (
+                checkFaces,
+                List<labelPair>(0),
+                meshMover.paramDict(),
+                meshQualityDict,
+                true,
+                nAllowableErrors
+            )
+        )
+        {
+            Info<< "shrinkMeshMedialDistance : Successfully moved mesh"
+                << endl;
+            break;
+        }
+    }
+
+    if (oldErrorReduction >= 0)
+    {
+        meshMover.setErrorReduction(oldErrorReduction);
+    }
+
+    Info<< "shrinkMeshMedialDistance : Finished moving mesh ..." << endl;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/createPoints.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
similarity index 57%
rename from applications/utilities/mesh/generation/blockMesh/createPoints.C
rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
index 2c6f3b923..c6aabedc4 100644
--- a/applications/utilities/mesh/generation/blockMesh/createPoints.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
@@ -21,50 +21,55 @@ License
     You should have received a copy of the GNU General Public License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
-
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-#include "blockMesh.H"
+#include "autoLayerDriver.H"
+#include "syncTools.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::pointField Foam::blockMesh::createPoints(const dictionary& dict)
+template<class Type>
+void Foam::autoLayerDriver::averageNeighbours
+(
+    const polyMesh& mesh,
+    const PackedBoolList& isMasterEdge,
+    const labelList& meshEdges,
+    const labelList& meshPoints,
+    const edgeList& edges,
+    const scalarField& invSumWeight,
+    const Field<Type>& data,
+    Field<Type>& average
+)
 {
-    blockMesh& blocks = *this;
+    average = pTraits<Type>::zero;
 
-    scalar scaleFactor = 1.0;
-
-    // optional 'convertToMeters' (or 'scale'?)
-    if (!dict.readIfPresent("convertToMeters", scaleFactor))
+    forAll(edges, edgeI)
     {
-        dict.readIfPresent("scale", scaleFactor);
-    }
-
-    Info<< nl << "Creating points with scale " << scaleFactor << endl;
-
-    pointField points(nPoints_);
-
-    forAll(blocks, blockLabel)
-    {
-        const pointField& blockPoints = blocks[blockLabel].points();
-
-        forAll(blockPoints, blockPointLabel)
+        if (isMasterEdge.get(meshEdges[edgeI]) == 1)
         {
-            points
-            [
-                mergeList_
-                [
-                    blockPointLabel
-                  + blockOffsets_[blockLabel]
-                ]
-            ] = scaleFactor * blockPoints[blockPointLabel];
+            const edge& e = edges[edgeI];
+            //scalar eWeight = edgeWeights[edgeI];
+            scalar eWeight =  1.0;
+            label v0 = e[0];
+            label v1 = e[1];
+
+            average[v0] += eWeight*data[v1];
+            average[v1] += eWeight*data[v0];
         }
     }
 
-    return points;
+    syncTools::syncPointList
+    (
+        mesh,
+        meshPoints,
+        average,
+        plusEqOp<Type>(),
+        pTraits<Type>::zero,    // null value
+        false                   // no separation
+    );
+
+    average *= invSumWeight;
 }
 
+
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
new file mode 100644
index 000000000..4e0e6b5f2
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -0,0 +1,874 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*----------------------------------------------------------------------------*/
+
+#include "autoRefineDriver.H"
+#include "meshRefinement.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "cellSet.H"
+#include "syncTools.H"
+#include "refinementParameters.H"
+#include "featureEdgeMesh.H"
+#include "refinementSurfaces.H"
+#include "shellSurfaces.H"
+#include "mapDistributePolyMesh.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(autoRefineDriver, 0);
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Read explicit feature edges
+Foam::label Foam::autoRefineDriver::readFeatureEdges
+(
+    const PtrList<dictionary>& featDicts,
+    PtrList<featureEdgeMesh>& featureMeshes,
+    labelList& featureLevels
+) const
+{
+    Info<< "Reading external feature lines." << endl;
+
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    featureMeshes.setSize(featDicts.size());
+    featureLevels.setSize(featDicts.size());
+
+    forAll(featDicts, i)
+    {
+        const dictionary& dict = featDicts[i];
+
+        fileName featFileName(dict.lookup("file"));
+
+        featureMeshes.set
+        (
+            i,
+            new featureEdgeMesh
+            (
+                IOobject
+                (
+                    featFileName,                       // name
+                    //mesh.time().findInstance("triSurface", featFileName),
+                    //                                    // instance
+                    mesh.time().constant(),             // instance
+                    "triSurface",                       // local
+                    mesh.time(),                        // registry
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                )
+            )
+        );
+
+        featureMeshes[i].mergePoints(meshRefiner_.mergeDistance());
+        featureLevels[i] = readLabel(dict.lookup("level"));
+
+        Info<< "Refinement level " << featureLevels[i]
+            << " for all cells crossed by feature " << featFileName
+            << " (" << featureMeshes[i].points().size() << " points, "
+            << featureMeshes[i].edges().size() << " edges)." << endl;
+    }
+
+    Info<< "Read feature lines in = "
+        << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
+
+    return featureMeshes.size();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Construct from components
+Foam::autoRefineDriver::autoRefineDriver
+(
+    meshRefinement& meshRefiner,
+    decompositionMethod& decomposer,
+    fvMeshDistribute& distributor,
+    const labelList& globalToPatch
+)
+:
+    meshRefiner_(meshRefiner),
+    decomposer_(decomposer),
+    distributor_(distributor),
+    globalToPatch_(globalToPatch)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::autoRefineDriver::featureEdgeRefine
+(
+    const refinementParameters& refineParams,
+    const PtrList<dictionary>& featDicts,
+    const label maxIter,
+    const label minRefine
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Read explicit feature edges
+    PtrList<featureEdgeMesh> featureMeshes;
+    // Per feature the refinement level
+    labelList featureLevels;
+    readFeatureEdges(featDicts, featureMeshes, featureLevels);
+
+
+    label iter = 0;
+
+    if (featureMeshes.size() && maxIter > 0)
+    {
+        for (; iter < maxIter; iter++)
+        {
+            Info<< nl
+                << "Feature refinement iteration " << iter << nl
+                << "------------------------------" << nl
+                << endl;
+
+            labelList candidateCells
+            (
+                meshRefiner_.refineCandidates
+                (
+                    refineParams.keepPoints()[0],    // For now only use one.
+                    refineParams.curvature(),
+
+                    featureMeshes,
+                    featureLevels,
+
+                    true,               // featureRefinement
+                    false,              // internalRefinement
+                    false,              // surfaceRefinement
+                    false,              // curvatureRefinement
+                    refineParams.maxGlobalCells(),
+                    refineParams.maxLocalCells()
+                )
+            );
+            labelList cellsToRefine
+            (
+                meshRefiner_.meshCutter().consistentRefinement
+                (
+                    candidateCells,
+                    true
+                )
+            );
+            Info<< "Determined cells to refine in = "
+                << mesh.time().cpuTimeIncrement() << " s" << endl;
+
+
+
+            label nCellsToRefine = cellsToRefine.size();
+            reduce(nCellsToRefine, sumOp<label>());
+
+            Info<< "Selected for feature refinement : " << nCellsToRefine
+                << " cells (out of " << mesh.globalData().nTotalCells()
+                << ')' << endl;
+
+            if (nCellsToRefine <= minRefine)
+            {
+                Info<< "Stopping refining since too few cells selected."
+                    << nl << endl;
+                break;
+            }
+
+
+            if (debug > 0)
+            {
+                const_cast<Time&>(mesh.time())++;
+            }
+
+
+            if
+            (
+                returnReduce
+                (
+                    (mesh.nCells() >= refineParams.maxLocalCells()),
+                    orOp<bool>()
+                )
+            )
+            {
+                meshRefiner_.balanceAndRefine
+                (
+                    "feature refinement iteration " + name(iter),
+                    decomposer_,
+                    distributor_,
+                    cellsToRefine,
+                    refineParams.maxLoadUnbalance()
+                );
+            }
+            else
+            {
+                meshRefiner_.refineAndBalance
+                (
+                    "feature refinement iteration " + name(iter),
+                    decomposer_,
+                    distributor_,
+                    cellsToRefine,
+                    refineParams.maxLoadUnbalance()
+                );
+            }
+        }
+    }
+    return iter;
+}
+
+
+Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
+(
+    const refinementParameters& refineParams,
+    const label maxIter
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Determine the maximum refinement level over all surfaces. This
+    // determines the minumum number of surface refinement iterations.
+    label overallMaxLevel = max(meshRefiner_.surfaces().maxLevel());
+
+    label iter;
+    for (iter = 0; iter < maxIter; iter++)
+    {
+        Info<< nl
+            << "Surface refinement iteration " << iter << nl
+            << "------------------------------" << nl
+            << endl;
+
+
+        // Determine cells to refine
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~
+        // Only look at surface intersections (minLevel and surface curvature),
+        // do not do internal refinement (refinementShells)
+
+        const PtrList<featureEdgeMesh> dummyFeatures;
+
+        PtrList<featureEdgeMesh> dummy(0);
+
+        labelList candidateCells
+        (
+            meshRefiner_.refineCandidates
+            (
+                refineParams.keepPoints()[0],
+                refineParams.curvature(),
+
+                dummyFeatures,      // dummy featureMeshes;
+                labelList(0),       // dummy featureLevels;
+
+                false,              // featureRefinement
+                false,              // internalRefinement
+                true,               // surfaceRefinement
+                true,               // curvatureRefinement
+                refineParams.maxGlobalCells(),
+                refineParams.maxLocalCells()
+            )
+        );
+        labelList cellsToRefine
+        (
+            meshRefiner_.meshCutter().consistentRefinement
+            (
+                candidateCells,
+                true
+            )
+        );
+        Info<< "Determined cells to refine in = "
+            << mesh.time().cpuTimeIncrement() << " s" << endl;
+
+
+        label nCellsToRefine = cellsToRefine.size();
+        reduce(nCellsToRefine, sumOp<label>());
+
+        Info<< "Selected for refinement : " << nCellsToRefine
+            << " cells (out of " << mesh.globalData().nTotalCells()
+            << ')' << endl;
+
+        // Stop when no cells to refine or have done minimum nessecary
+        // iterations and not enough cells to refine.
+        if
+        (
+            nCellsToRefine == 0
+         || (
+                iter >= overallMaxLevel
+             && nCellsToRefine <= refineParams.minRefineCells()
+            )
+        )
+        {
+            Info<< "Stopping refining since too few cells selected."
+                << nl << endl;
+            break;
+        }
+
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+        }
+
+
+        if
+        (
+            returnReduce
+            (
+                (mesh.nCells() >= refineParams.maxLocalCells()),
+                orOp<bool>()
+            )
+        )
+        {
+            meshRefiner_.balanceAndRefine
+            (
+                "surface refinement iteration " + name(iter),
+                decomposer_,
+                distributor_,
+                cellsToRefine,
+                refineParams.maxLoadUnbalance()
+            );
+        }
+        else
+        {
+            meshRefiner_.refineAndBalance
+            (
+                "surface refinement iteration " + name(iter),
+                decomposer_,
+                distributor_,
+                cellsToRefine,
+                refineParams.maxLoadUnbalance()
+            );
+        }
+    }
+    return iter;
+}
+
+
+void Foam::autoRefineDriver::removeInsideCells
+(
+    const refinementParameters& refineParams,
+    const label nBufferLayers
+)
+{
+    Info<< nl
+        << "Removing mesh beyond surface intersections" << nl
+        << "------------------------------------------" << nl
+        << endl;
+
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    if (debug)
+    {
+       const_cast<Time&>(mesh.time())++;
+    }
+
+    meshRefiner_.splitMesh
+    (
+        nBufferLayers,                  // nBufferLayers
+        globalToPatch_,
+        refineParams.keepPoints()[0]
+    );
+
+    if (debug)
+    {
+        Pout<< "Writing subsetted mesh to time "
+            << meshRefiner_.timeName() << '.' << endl;
+        meshRefiner_.write(debug, mesh.time().path()/meshRefiner_.timeName());
+        Pout<< "Dumped mesh in = "
+            << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+    }
+}
+
+
+Foam::label Foam::autoRefineDriver::shellRefine
+(
+    const refinementParameters& refineParams,
+    const label maxIter
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Mark current boundary faces with 0. Have meshRefiner maintain them.
+    meshRefiner_.userFaceData().setSize(1);
+
+    // mark list to remove any refined faces
+    meshRefiner_.userFaceData()[0].first() = meshRefinement::REMOVE;
+    meshRefiner_.userFaceData()[0].second() = createWithValues<labelList>
+    (
+        mesh.nFaces(),
+        -1,
+        meshRefiner_.intersectedFaces(),
+        0
+    );
+
+    // Determine the maximum refinement level over all volume refinement
+    // regions. This determines the minumum number of shell refinement
+    // iterations.
+    label overallMaxShellLevel = meshRefiner_.shells().maxLevel();
+
+    label iter;
+    for (iter = 0; iter < maxIter; iter++)
+    {
+        Info<< nl
+            << "Shell refinement iteration " << iter << nl
+            << "----------------------------" << nl
+            << endl;
+
+        const PtrList<featureEdgeMesh> dummyFeatures;
+
+        PtrList<featureEdgeMesh> dummy(0);
+
+        labelList candidateCells
+        (
+            meshRefiner_.refineCandidates
+            (
+                refineParams.keepPoints()[0],
+                refineParams.curvature(),
+
+                dummyFeatures,      // dummy featureMeshes;
+                labelList(0),       // dummy featureLevels;
+
+                false,              // featureRefinement
+                true,               // internalRefinement
+                false,              // surfaceRefinement
+                false,              // curvatureRefinement
+                refineParams.maxGlobalCells(),
+                refineParams.maxLocalCells()
+            )
+        );
+
+        if (debug)
+        {
+            Pout<< "Dumping " << candidateCells.size()
+                << " cells to cellSet candidateCellsFromShells." << endl;
+
+            cellSet
+            (
+                mesh,
+                "candidateCellsFromShells",
+                labelHashSet(candidateCells)
+            ).write();
+        }
+
+        // Problem choosing starting faces for bufferlayers (bFaces)
+        //  - we can't use the current intersected boundary faces
+        //    (intersectedFaces) since this grows indefinitely
+        //  - if we use 0 faces we don't satisfy bufferLayers from the
+        //    surface.
+        //  - possibly we want to have bFaces only the initial set of faces
+        //    and maintain the list while doing the refinement.
+        labelList bFaces
+        (
+            findIndices(meshRefiner_.userFaceData()[0].second(), 0)
+        );
+
+        //Info<< "Collected boundary faces : "
+        //    << returnReduce(bFaces.size(), sumOp<label>()) << endl;
+
+        labelList cellsToRefine;
+
+        if (refineParams.nBufferLayers() <= 2)
+        {
+            cellsToRefine = meshRefiner_.meshCutter().consistentSlowRefinement
+            (
+                refineParams.nBufferLayers(),
+                candidateCells,                     // cells to refine
+                bFaces,                             // faces for nBufferLayers
+                1,                                  // point difference
+                meshRefiner_.intersectedPoints()    // points to check
+            );
+        }
+        else
+        {
+            cellsToRefine = meshRefiner_.meshCutter().consistentSlowRefinement2
+            (
+                refineParams.nBufferLayers(),
+                candidateCells,                 // cells to refine
+                bFaces                          // faces for nBufferLayers
+            );
+        }
+
+        Info<< "Determined cells to refine in = "
+            << mesh.time().cpuTimeIncrement() << " s" << endl;
+
+
+        label nCellsToRefine = cellsToRefine.size();
+        reduce(nCellsToRefine, sumOp<label>());
+
+        Info<< "Selected for internal refinement : " << nCellsToRefine
+            << " cells (out of " << mesh.globalData().nTotalCells()
+            << ')' << endl;
+
+        // Stop when no cells to refine or have done minimum nessecary
+        // iterations and not enough cells to refine.
+        if
+        (
+            nCellsToRefine == 0
+         || (
+                iter >= overallMaxShellLevel
+             && nCellsToRefine <= refineParams.minRefineCells()
+            )
+        )
+        {
+            Info<< "Stopping refining since too few cells selected."
+                << nl << endl;
+            break;
+        }
+
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+        }
+
+        if
+        (
+            returnReduce
+            (
+                (mesh.nCells() >= refineParams.maxLocalCells()),
+                orOp<bool>()
+            )
+        )
+        {
+            meshRefiner_.balanceAndRefine
+            (
+                "shell refinement iteration " + name(iter),
+                decomposer_,
+                distributor_,
+                cellsToRefine,
+                refineParams.maxLoadUnbalance()
+            );
+        }
+        else
+        {
+            meshRefiner_.refineAndBalance
+            (
+                "shell refinement iteration " + name(iter),
+                decomposer_,
+                distributor_,
+                cellsToRefine,
+                refineParams.maxLoadUnbalance()
+            );
+        }
+    }
+    meshRefiner_.userFaceData().clear();
+
+    return iter;
+}
+
+
+void Foam::autoRefineDriver::baffleAndSplitMesh
+(
+    const refinementParameters& refineParams,
+    const bool handleSnapProblems,
+    const dictionary& motionDict
+)
+{
+    Info<< nl
+        << "Splitting mesh at surface intersections" << nl
+        << "---------------------------------------" << nl
+        << endl;
+
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Introduce baffles at surface intersections. Note:
+    // meshRefiment::surfaceIndex() will
+    // be like boundary face from now on so not coupled anymore.
+    meshRefiner_.baffleAndSplitMesh
+    (
+        handleSnapProblems,             // detect&remove potential snap problem
+        false,                          // perpendicular edge connected cells
+        scalarField(0),                 // per region perpendicular angle
+        !handleSnapProblems,            // merge free standing baffles?
+        motionDict,
+        const_cast<Time&>(mesh.time()),
+        globalToPatch_,
+        refineParams.keepPoints()[0]
+    );
+}
+
+
+void Foam::autoRefineDriver::zonify
+(
+    const refinementParameters& refineParams
+)
+{
+    // Mesh is at its finest. Do zoning
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // This puts all faces with intersection across a zoneable surface
+    // into that surface's faceZone. All cells inside faceZone get given the
+    // same cellZone.
+
+    if (meshRefiner_.surfaces().getNamedSurfaces().size())
+    {
+        Info<< nl
+            << "Introducing zones for interfaces" << nl
+            << "--------------------------------" << nl
+            << endl;
+
+        const fvMesh& mesh = meshRefiner_.mesh();
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+        }
+
+        meshRefiner_.zonify
+        (
+            refineParams.keepPoints()[0],
+            refineParams.allowFreeStandingZoneFaces()
+        );
+
+        if (debug)
+        {
+            Pout<< "Writing zoned mesh to time "
+                << meshRefiner_.timeName() << '.' << endl;
+            meshRefiner_.write
+            (
+                debug,
+                mesh.time().path()/meshRefiner_.timeName()
+            );
+        }
+
+        // Check that all faces are synced
+        meshRefinement::checkCoupledFaceZones(mesh);
+    }
+}
+
+
+void Foam::autoRefineDriver::splitAndMergeBaffles
+(
+    const refinementParameters& refineParams,
+    const bool handleSnapProblems,
+    const dictionary& motionDict
+)
+{
+    Info<< nl
+        << "Handling cells with snap problems" << nl
+        << "---------------------------------" << nl
+        << endl;
+
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Introduce baffles and split mesh
+    if (debug)
+    {
+        const_cast<Time&>(mesh.time())++;
+    }
+
+    const scalarField& perpAngle = meshRefiner_.surfaces().perpendicularAngle();
+
+    meshRefiner_.baffleAndSplitMesh
+    (
+        handleSnapProblems,
+        handleSnapProblems,                 // remove perp edge connected cells
+        perpAngle,                          // perp angle
+        false,                              // merge free standing baffles?
+        motionDict,
+        const_cast<Time&>(mesh.time()),
+        globalToPatch_,
+        refineParams.keepPoints()[0]
+    );
+
+    if (debug)
+    {
+        const_cast<Time&>(mesh.time())++;
+    }
+
+    // Duplicate points on baffles that are on more than one cell
+    // region. This will help snapping pull them to separate surfaces.
+    meshRefiner_.dupNonManifoldPoints();
+
+
+    // Merge all baffles that are still remaining after duplicating points.
+    List<labelPair> couples
+    (
+        meshRefiner_.getDuplicateFaces   // get all baffles
+        (
+            identity(mesh.nFaces()-mesh.nInternalFaces())
+          + mesh.nInternalFaces()
+        )
+    );
+
+    label nCouples = returnReduce(couples.size(), sumOp<label>());
+
+    Info<< "Detected unsplittable baffles : "
+        << nCouples << endl;
+
+    if (nCouples > 0)
+    {
+        // Actually merge baffles. Note: not exactly parallellized. Should
+        // convert baffle faces into processor faces if they resulted
+        // from them.
+        meshRefiner_.mergeBaffles(couples);
+
+        if (debug)
+        {
+            // Debug:test all is still synced across proc patches
+            meshRefiner_.checkData();
+        }
+        Info<< "Merged free-standing baffles in = "
+            << mesh.time().cpuTimeIncrement() << " s." << endl;
+    }
+
+    if (debug)
+    {
+        Pout<< "Writing handleProblemCells mesh to time "
+            << meshRefiner_.timeName() << '.' << endl;
+        meshRefiner_.write(debug, mesh.time().path()/meshRefiner_.timeName());
+    }
+}
+
+
+void Foam::autoRefineDriver::mergePatchFaces
+(
+    const refinementParameters& refineParams
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl
+        << "Merge refined boundary faces" << nl
+        << "----------------------------" << nl
+        << endl;
+
+    if (debug)
+    {
+        const_cast<Time&>(mesh.time())++;
+    }
+
+    meshRefiner_.mergePatchFaces
+    (
+        Foam::cos(45*mathematicalConstant::pi/180.0),
+        Foam::cos(45*mathematicalConstant::pi/180.0),
+        meshRefiner_.meshedPatches()
+    );
+
+    if (debug)
+    {
+        meshRefiner_.checkData();
+    }
+
+    meshRefiner_.mergeEdges(Foam::cos(45*mathematicalConstant::pi/180.0));
+
+    if (debug)
+    {
+        meshRefiner_.checkData();
+    }
+}
+
+
+void Foam::autoRefineDriver::doRefine
+(
+    const dictionary& refineDict,
+    const refinementParameters& refineParams,
+    const bool prepareForSnapping,
+    const dictionary& motionDict
+)
+{
+    Info<< nl
+        << "Refinement phase" << nl
+        << "----------------" << nl
+        << endl;
+
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Check that all the keep points are inside the mesh.
+    refineParams.findCells(mesh);
+
+    PtrList<dictionary> featDicts(refineDict.lookup("features"));
+
+    // Refine around feature edges
+    featureEdgeRefine
+    (
+        refineParams,
+        featDicts,
+        100,    // maxIter
+        0       // min cells to refine
+    );
+
+    // Refine based on surface
+    surfaceOnlyRefine
+    (
+        refineParams,
+        100     // maxIter
+    );
+
+    // Remove cells (a certain distance) beyond surface intersections
+    removeInsideCells
+    (
+        refineParams,
+        1       // nBufferLayers
+    );
+
+    // Internal mesh refinement
+    shellRefine
+    (
+        refineParams,
+        100    // maxIter
+    );
+
+    // Introduce baffles at surface intersections
+    baffleAndSplitMesh(refineParams, prepareForSnapping, motionDict);
+
+    // Mesh is at its finest. Do optional zoning.
+    zonify(refineParams);
+
+    // Pull baffles apart
+    splitAndMergeBaffles(refineParams, prepareForSnapping, motionDict);
+
+    // Do something about cells with refined faces on the boundary
+    if (prepareForSnapping)
+    {
+        mergePatchFaces(refineParams);
+    }
+
+
+    if (Pstream::parRun())
+    {
+        Info<< nl
+            << "Doing final balancing" << nl
+            << "---------------------" << nl
+            << endl;
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+        }
+
+        // Do final balancing. Keep zoned faces on one processor since the
+        // snap phase will convert them to baffles and this only works for
+        // internal faces.
+        meshRefiner_.balance
+        (
+            true,
+            false,
+            scalarField(mesh.nCells(), 1), // dummy weights
+            decomposer_,
+            distributor_
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
new file mode 100644
index 000000000..8161b8a2a
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::autoRefineDriver
+
+Description
+
+SourceFiles
+    autoRefineDriver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef autoRefineDriver_H
+#define autoRefineDriver_H
+
+#include "treeBoundBox.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class featureEdgeMesh;
+class refinementParameters;
+class meshRefinement;
+class decompositionMethod;
+class fvMeshDistribute;
+
+/*---------------------------------------------------------------------------*\
+                           Class autoRefineDriver Declaration
+\*---------------------------------------------------------------------------*/
+
+class autoRefineDriver
+{
+    // Private data
+
+        //- Mesh+surface
+        meshRefinement& meshRefiner_;
+
+        //- Reference to decomposition method
+        decompositionMethod& decomposer_;
+
+        //- Reference to mesh distribution engine
+        fvMeshDistribute& distributor_;
+
+        //- From surface region to patch
+        const labelList globalToPatch_;
+
+
+    // Private Member Functions
+
+        //- Read explicit feature edges
+        label readFeatureEdges
+        (
+            const PtrList<dictionary>& featDicts,
+            PtrList<featureEdgeMesh>& featureMeshes,
+            labelList& featureLevel
+        ) const;
+
+        //- Refine all cells pierced by explicit feature edges
+        label featureEdgeRefine
+        (
+            const refinementParameters& refineParams,
+            const PtrList<dictionary>& featDicts,
+            const label maxIter,
+            const label minRefine
+        );
+
+        //- Refine all cells interacting with the surface
+        label surfaceOnlyRefine
+        (
+            const refinementParameters& refineParams,
+            const label maxIter
+        );
+
+        //- Remove all cells within intersected region
+        void removeInsideCells
+        (
+            const refinementParameters& refineParams,
+            const label nBufferLayers
+        );
+
+        //- Remove all cells inside/outside shell
+        label shellRefine
+        (
+            const refinementParameters& refineParams,
+            const label maxIter
+        );
+
+        //- Add baffles and remove unreachable cells
+        void baffleAndSplitMesh
+        (
+            const refinementParameters& refineParams,
+            const bool handleSnapProblems,
+            const dictionary& motionDict
+        );
+
+        //- Add zones
+        void zonify(const refinementParameters& refineParams);
+
+        void splitAndMergeBaffles
+        (
+            const refinementParameters& refineParams,
+            const bool handleSnapProblems,
+            const dictionary& motionDict
+        );
+
+        //- Merge refined boundary faces (from exposing coarser cell)
+        void mergePatchFaces
+        (
+            const refinementParameters& refineParams
+        );
+
+
+        //- Disallow default bitwise copy construct
+        autoRefineDriver(const autoRefineDriver&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const autoRefineDriver&);
+
+
+public:
+
+    //- Runtime type information
+    ClassName("autoRefineDriver");
+
+
+    // Constructors
+
+        //- Construct from components
+        autoRefineDriver
+        (
+            meshRefinement& meshRefiner,
+            decompositionMethod& decomposer,
+            fvMeshDistribute& distributor,
+            const labelList& globalToPatch
+        );
+
+
+    // Member Functions
+
+        //- Do all the refinement
+        void doRefine
+        (
+            const dictionary& refineDict,
+            const refinementParameters& refineParams,
+            const bool prepareForSnapping,
+            const dictionary& motionDict
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
new file mode 100644
index 000000000..92e20b56f
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -0,0 +1,1533 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    All to do with snapping to the surface
+
+\*----------------------------------------------------------------------------*/
+
+#include "autoSnapDriver.H"
+#include "Time.H"
+#include "motionSmoother.H"
+#include "directTopoChange.H"
+#include "OFstream.H"
+#include "syncTools.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "OFstream.H"
+#include "mapPolyMesh.H"
+#include "motionSmoother.H"
+#include "pointEdgePoint.H"
+#include "PointEdgeWave.H"
+#include "mergePoints.H"
+#include "snapParameters.H"
+#include "refinementSurfaces.H"
+
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(autoSnapDriver, 0);
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Get faces to repatch. Returns map from face to patch.
+Foam::Map<Foam::label> Foam::autoSnapDriver::getZoneBafflePatches
+(
+    const bool allowBoundary
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+    const refinementSurfaces& surfaces = meshRefiner_.surfaces();
+
+    Map<label> bafflePatch(mesh.nFaces()/1000);
+
+    const wordList& faceZoneNames = surfaces.faceZoneNames();
+    const faceZoneMesh& fZones = mesh.faceZones();
+
+    forAll(faceZoneNames, surfI)
+    {
+        if (faceZoneNames[surfI].size())
+        {
+            // Get zone
+            label zoneI = fZones.findZoneID(faceZoneNames[surfI]);
+
+            const faceZone& fZone = fZones[zoneI];
+
+            //// Get patch allocated for zone
+            //label patchI = surfaceToCyclicPatch_[surfI];
+            // Get patch of (first region) of surface
+            label patchI = globalToPatch_[surfaces.globalRegion(surfI, 0)];
+
+            Info<< "For surface "
+                << surfaces.names()[surfI]
+                << " found faceZone " << fZone.name()
+                << " and patch " << mesh.boundaryMesh()[patchI].name()
+                << endl;
+
+
+            forAll(fZone, i)
+            {
+                label faceI = fZone[i];
+
+                if (allowBoundary || mesh.isInternalFace(faceI))
+                {
+                    if (!bafflePatch.insert(faceI, patchI))
+                    {
+                        label oldPatchI = bafflePatch[faceI];
+
+                        if (oldPatchI != patchI)
+                        {
+                            FatalErrorIn("getZoneBafflePatches(const bool)")
+                                << "Face " << faceI
+                                << " fc:" << mesh.faceCentres()[faceI]
+                                << " in zone " << fZone.name()
+                                << " is in patch "
+                                << mesh.boundaryMesh()[oldPatchI].name()
+                                << " and in patch "
+                                << mesh.boundaryMesh()[patchI].name()
+                                << abort(FatalError);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return bafflePatch;
+}
+
+
+// Calculate geometrically collocated points, Requires PackedList to be
+// sized and initalised!
+Foam::label Foam::autoSnapDriver::getCollocatedPoints
+(
+    const scalar tol,
+    const pointField& points,
+    PackedBoolList& isCollocatedPoint
+)
+{
+    labelList pointMap;
+    pointField newPoints;
+    bool hasMerged = mergePoints
+    (
+        points,                         // points
+        tol,                            // mergeTol
+        false,                          // verbose
+        pointMap,
+        newPoints
+    );
+
+    if (!returnReduce(hasMerged, orOp<bool>()))
+    {
+        return 0;
+    }
+
+    // Determine which newPoints are referenced more than once
+    label nCollocated = 0;
+
+    // Per old point the newPoint. Or -1 (not set yet) or -2 (already seen
+    // twice)
+    labelList firstOldPoint(newPoints.size(), -1);
+    forAll(pointMap, oldPointI)
+    {
+        label newPointI = pointMap[oldPointI];
+
+        if (firstOldPoint[newPointI] == -1)
+        {
+            // First use of oldPointI. Store.
+            firstOldPoint[newPointI] = oldPointI;
+        }
+        else if (firstOldPoint[newPointI] == -2)
+        {
+            // Third or more reference of oldPointI -> non-manifold
+            isCollocatedPoint.set(oldPointI, 1u);
+            nCollocated++;
+        }
+        else
+        {
+            // Second reference of oldPointI -> non-manifold
+            isCollocatedPoint.set(firstOldPoint[newPointI], 1u);
+            nCollocated++;
+
+            isCollocatedPoint.set(oldPointI, 1u);
+            nCollocated++;
+
+            // Mark with special value to save checking next time round
+            firstOldPoint[newPointI] = -2;
+        }
+    }
+    return returnReduce(nCollocated, sumOp<label>());
+}
+
+
+// Calculate displacement as average of patch points.
+Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
+(
+    const motionSmoother& meshMover,
+    const List<labelPair>& baffles
+) const
+{
+    const indirectPrimitivePatch& pp = meshMover.patch();
+
+    // Calculate geometrically non-manifold points on the patch to be moved.
+    PackedBoolList nonManifoldPoint(pp.nPoints());
+    label nNonManifoldPoints = getCollocatedPoints
+    (
+        SMALL,
+        pp.localPoints(),
+        nonManifoldPoint
+    );
+    Info<< "Found " << nNonManifoldPoints << " non-mainfold point(s)."
+        << endl;
+
+
+    // Average points
+    // ~~~~~~~~~~~~~~
+
+    // We determine three points:
+    // - average of (centres of) connected patch faces
+    // - average of (centres of) connected internal mesh faces
+    // - as fallback: centre of any connected cell
+    // so we can do something moderately sensible for non/manifold points.
+
+    // Note: the averages are calculated properly parallel. This is
+    // necessary to get the points shared by processors correct.
+
+
+    const labelListList& pointFaces = pp.pointFaces();
+    const labelList& meshPoints = pp.meshPoints();
+    const pointField& points = pp.points();
+    const polyMesh& mesh = meshMover.mesh();
+
+    // Get labels of faces to count (master of coupled faces and baffle pairs)
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh));
+
+    {
+        forAll(baffles, i)
+        {
+            label f0 = baffles[i].first();
+            label f1 = baffles[i].second();
+
+            if (isMasterFace.get(f0) == 1)
+            {
+                // Make f1 a slave
+                isMasterFace.set(f1, 0);
+            }
+            else if (isMasterFace.get(f1) == 1)
+            {
+                isMasterFace.set(f0, 0);
+            }
+            else
+            {
+                FatalErrorIn("autoSnapDriver::smoothPatchDisplacement(..)")
+                    << "Both sides of baffle consisting of faces " << f0
+                    << " and " << f1 << " are already slave faces."
+                    << abort(FatalError);
+            }
+        }
+    }
+
+
+    // Get average position of boundary face centres
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    vectorField avgBoundary(pointFaces.size(), vector::zero);
+    labelList nBoundary(pointFaces.size(), 0);
+
+    forAll(pointFaces, patchPointI)
+    {
+        const labelList& pFaces = pointFaces[patchPointI];
+
+        forAll(pFaces, pfI)
+        {
+            label faceI = pFaces[pfI];
+
+            if (isMasterFace.get(pp.addressing()[faceI]) == 1)
+            {
+                avgBoundary[patchPointI] += pp[faceI].centre(points);
+                nBoundary[patchPointI]++;
+            }
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        avgBoundary,
+        plusEqOp<point>(),  // combine op
+        vector::zero,       // null value
+        false               // no separation
+    );
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        nBoundary,
+        plusEqOp<label>(),  // combine op
+        0,                  // null value
+        false               // no separation
+    );
+
+    forAll(avgBoundary, i)
+    {
+        avgBoundary[i] /= nBoundary[i];
+    }
+
+
+    // Get average position of internal face centres
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    vectorField avgInternal;
+    labelList nInternal;
+    {
+        vectorField globalSum(mesh.nPoints(), vector::zero);
+        labelList globalNum(mesh.nPoints(), 0);
+
+        // Note: no use of pointFaces
+        const faceList& faces = mesh.faces();
+
+        for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+        {
+            const face& f = faces[faceI];
+            const point& fc = mesh.faceCentres()[faceI];
+
+            forAll(f, fp)
+            {
+                globalSum[f[fp]] += fc;
+                globalNum[f[fp]]++;
+            }
+        }
+
+        // Count coupled faces as internal ones (but only once)
+        const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+        forAll(patches, patchI)
+        {
+            if (Pstream::parRun() && isA<processorPolyPatch>(patches[patchI]))
+            {
+                const processorPolyPatch& pp =
+                    refCast<const processorPolyPatch>(patches[patchI]);
+
+                if (pp.myProcNo() < pp.neighbProcNo())
+                {
+                    const vectorField::subField faceCentres = pp.faceCentres();
+
+                    forAll(pp, i)
+                    {
+                        const face& f = pp[i];
+                        const point& fc = faceCentres[i];
+
+                        forAll(f, fp)
+                        {
+                            globalSum[f[fp]] += fc;
+                            globalNum[f[fp]]++;
+                        }
+                    }
+                }
+            }
+            else if (isA<cyclicPolyPatch>(patches[patchI]))
+            {
+                const cyclicPolyPatch& pp =
+                    refCast<const cyclicPolyPatch>(patches[patchI]);
+
+                const vectorField::subField faceCentres = pp.faceCentres();
+
+                for (label i = 0; i < pp.size()/2; i++)
+                {
+                    const face& f = pp[i];
+                    const point& fc = faceCentres[i];
+
+                    forAll(f, fp)
+                    {
+                        globalSum[f[fp]] += fc;
+                        globalNum[f[fp]]++;
+                    }
+                }
+            }
+        }
+
+        syncTools::syncPointList
+        (
+            mesh,
+            globalSum,
+            plusEqOp<vector>(), // combine op
+            vector::zero,       // null value
+            false               // no separation
+        );
+        syncTools::syncPointList
+        (
+            mesh,
+            globalNum,
+            plusEqOp<label>(),  // combine op
+            0,                  // null value
+            false               // no separation
+        );
+
+        avgInternal.setSize(meshPoints.size());
+        nInternal.setSize(meshPoints.size());
+
+        forAll(avgInternal, patchPointI)
+        {
+            label meshPointI = meshPoints[patchPointI];
+
+            nInternal[patchPointI] = globalNum[meshPointI];
+
+            if (nInternal[patchPointI] == 0)
+            {
+                avgInternal[patchPointI] = globalSum[meshPointI];
+            }
+            else
+            {
+                avgInternal[patchPointI] =
+                    globalSum[meshPointI]
+                  / nInternal[patchPointI];
+            }
+        }
+    }
+
+
+    // Precalculate any cell using mesh point (replacement of pointCells()[])
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList anyCell(mesh.nPoints(), -1);
+    forAll(mesh.faceNeighbour(), faceI)
+    {
+        label own = mesh.faceOwner()[faceI];
+        const face& f = mesh.faces()[faceI];
+
+        forAll(f, fp)
+        {
+            anyCell[f[fp]] = own;
+        }
+    }
+    for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
+    {
+        label own = mesh.faceOwner()[faceI];
+
+        const face& f = mesh.faces()[faceI];
+
+        forAll(f, fp)
+        {
+            anyCell[f[fp]] = own;
+        }
+    }
+
+
+    // Displacement to calculate.
+    pointField patchDisp(meshPoints.size(), vector::zero);
+
+    forAll(pointFaces, i)
+    {
+        label meshPointI = meshPoints[i];
+        const point& currentPos = pp.points()[meshPointI];
+
+        // Now we have the two average points: avgBoundary and avgInternal
+        // and how many boundary/internal faces connect to the point
+        // (nBoundary, nInternal)
+        // Do some blending between the two.
+        // Note: the following section has some reasoning behind it but the
+        // blending factors can be experimented with.
+
+        point newPos;
+
+        if (nonManifoldPoint.get(i) == 0u)
+        {
+            // Points that are manifold. Weight the internal and boundary
+            // by their number of faces and blend with
+            scalar internalBlend = 0.1;
+            scalar blend = 0.1;
+
+            point avgPos =
+                (
+                   internalBlend*nInternal[i]*avgInternal[i]
+                  +(1-internalBlend)*nBoundary[i]*avgBoundary[i]
+                )
+              / (internalBlend*nInternal[i]+(1-internalBlend)*nBoundary[i]);
+
+            newPos = (1-blend)*avgPos + blend*currentPos;
+        }
+        else if (nInternal[i] == 0)
+        {
+            // Non-manifold without internal faces. Use any connected cell
+            // as internal point instead. Use precalculated any cell to avoid
+            // e.g. pointCells()[meshPointI][0]
+
+            const point& cc = mesh.cellCentres()[anyCell[meshPointI]];
+
+            scalar cellCBlend = 0.8;
+            scalar blend = 0.1;
+
+            point avgPos = (1-cellCBlend)*avgBoundary[i] + cellCBlend*cc;
+
+            newPos = (1-blend)*avgPos + blend*currentPos;
+        }
+        else
+        {
+            // Non-manifold point with internal faces connected to them
+            scalar internalBlend = 0.9;
+            scalar blend = 0.1;
+
+            point avgPos =
+                internalBlend*avgInternal[i]
+              + (1-internalBlend)*avgBoundary[i];
+
+            newPos = (1-blend)*avgPos + blend*currentPos;
+        }
+
+        patchDisp[i] = newPos - currentPos;
+    }
+
+    return patchDisp;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
+(
+    const pointMesh& pMesh,
+    const indirectPrimitivePatch& pp
+)
+{
+    const polyMesh& mesh = pMesh();
+
+    // Set initial changed points to all the patch points
+    List<pointEdgePoint> wallInfo(pp.nPoints());
+
+    forAll(pp.localPoints(), ppI)
+    {
+        wallInfo[ppI] = pointEdgePoint(pp.localPoints()[ppI], 0.0);
+    }
+
+    // Current info on points
+    List<pointEdgePoint> allPointInfo(mesh.nPoints());
+
+    // Current info on edges
+    List<pointEdgePoint> allEdgeInfo(mesh.nEdges());
+
+    PointEdgeWave<pointEdgePoint> wallCalc
+    (
+        mesh,
+        pp.meshPoints(),
+        wallInfo,
+
+        allPointInfo,
+        allEdgeInfo,
+        mesh.globalData().nTotalPoints()  // max iterations
+    );
+
+    // Copy edge values into scalarField
+    tmp<scalarField> tedgeDist(new scalarField(mesh.nEdges()));
+    scalarField& edgeDist = tedgeDist();
+
+    forAll(allEdgeInfo, edgeI)
+    {
+        edgeDist[edgeI] = Foam::sqrt(allEdgeInfo[edgeI].distSqr());
+    }
+
+
+    //{
+    //    // For debugging: dump to file
+    //    pointScalarField pointDist
+    //    (
+    //        IOobject
+    //        (
+    //            "pointDist",
+    //            meshRefiner_.timeName(),
+    //            mesh.DB(),
+    //            IOobject::NO_READ,
+    //            IOobject::AUTO_WRITE
+    //        ),
+    //        pMesh,
+    //        dimensionedScalar("pointDist", dimless, 0.0)
+    //    );
+    //
+    //    forAll(allEdgeInfo, edgeI)
+    //    {
+    //        scalar d = Foam::sqrt(allEdgeInfo[edgeI].distSqr());
+    //
+    //        const edge& e = mesh.edges()[edgeI];
+    //
+    //        pointDist[e[0]] += d;
+    //        pointDist[e[1]] += d;
+    //    }
+    //    forAll(pointDist, pointI)
+    //    {
+    //        pointDist[pointI] /= mesh.pointEdges()[pointI].size();
+    //    }
+    //    Info<< "Writing patch distance to " << pointDist.name()
+    //        << " at time " << meshRefiner_.timeName() << endl;
+    //
+    //    pointDist.write();
+    //}
+
+    return tedgeDist;
+}
+
+
+void Foam::autoSnapDriver::dumpMove
+(
+    const fileName& fName,
+    const pointField& meshPts,
+    const pointField& surfPts
+)
+{
+    // Dump direction of growth into file
+    Pout<< nl << "Dumping move direction to " << fName << nl
+        << "View this Lightwave-OBJ file with e.g. javaview" << nl
+        << endl;
+
+    OFstream nearestStream(fName);
+
+    label vertI = 0;
+
+    forAll(meshPts, ptI)
+    {
+        meshTools::writeOBJ(nearestStream, meshPts[ptI]);
+        vertI++;
+
+        meshTools::writeOBJ(nearestStream, surfPts[ptI]);
+        vertI++;
+
+        nearestStream<< "l " << vertI-1 << ' ' << vertI << nl;
+    }
+}
+
+
+// Check whether all displacement vectors point outwards of patch. Return true
+// if so.
+bool Foam::autoSnapDriver::outwardsDisplacement
+(
+    const indirectPrimitivePatch& pp,
+    const vectorField& patchDisp
+)
+{
+    const vectorField& faceNormals = pp.faceNormals();
+    const labelListList& pointFaces = pp.pointFaces();
+
+    forAll(pointFaces, pointI)
+    {
+        const labelList& pFaces = pointFaces[pointI];
+
+        vector disp(patchDisp[pointI]);
+
+        scalar magDisp = mag(disp);
+
+        if (magDisp > SMALL)
+        {
+            disp /= magDisp;
+
+            bool outwards = meshTools::visNormal(disp, faceNormals, pFaces);
+
+            if (!outwards)
+            {
+                Warning<< "Displacement " << patchDisp[pointI]
+                    << " at mesh point " << pp.meshPoints()[pointI]
+                    << " coord " << pp.points()[pp.meshPoints()[pointI]]
+                    << " points through the surrounding patch faces" << endl;
+                return false;
+            }
+        }
+        else
+        {
+            //? Displacement small but in wrong direction. Would probably be ok.
+        }
+    }
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoSnapDriver::autoSnapDriver
+(
+    meshRefinement& meshRefiner,
+    const labelList& globalToPatch
+)
+:
+    meshRefiner_(meshRefiner),
+    globalToPatch_(globalToPatch)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::createZoneBaffles
+(
+    List<labelPair>& baffles
+)
+{
+    labelList zonedSurfaces = meshRefiner_.surfaces().getNamedSurfaces();
+
+    autoPtr<mapPolyMesh> map;
+
+    // No need to sync; all processors will have all same zonedSurfaces.
+    if (zonedSurfaces.size())
+    {
+        fvMesh& mesh = meshRefiner_.mesh();
+
+        // Split internal faces on interface surfaces
+        Info<< "Converting zoned faces into baffles ..." << endl;
+
+        // Get faces (internal only) to be baffled. Map from face to patch
+        // label.
+        Map<label> faceToPatch(getZoneBafflePatches(false));
+
+        label nZoneFaces = returnReduce(faceToPatch.size(), sumOp<label>());
+        if (nZoneFaces > 0)
+        {
+            // Convert into labelLists
+            labelList ownPatch(mesh.nFaces(), -1);
+            forAllConstIter(Map<label>, faceToPatch, iter)
+            {
+                ownPatch[iter.key()] = iter();
+            }
+
+            // Create baffles. both sides same patch.
+            map = meshRefiner_.createBaffles(ownPatch, ownPatch);
+
+            // Get pairs of faces created.
+            // Just loop over faceMap and store baffle if we encounter a slave
+            // face.
+
+            baffles.setSize(faceToPatch.size());
+            label baffleI = 0;
+
+            const labelList& faceMap = map().faceMap();
+            const labelList& reverseFaceMap = map().reverseFaceMap();
+
+            forAll(faceMap, faceI)
+            {
+                label oldFaceI = faceMap[faceI];
+
+                // Does face originate from face-to-patch
+                Map<label>::const_iterator iter = faceToPatch.find(oldFaceI);
+
+                if (iter != faceToPatch.end())
+                {
+                    label masterFaceI = reverseFaceMap[oldFaceI];
+                    if (faceI != masterFaceI)
+                    {
+                        baffles[baffleI++] = labelPair(masterFaceI, faceI);
+                    }
+                }
+            }
+
+            if (baffleI != faceToPatch.size())
+            {
+                FatalErrorIn("autoSnapDriver::createZoneBaffles(..)")
+                    << "Had " << faceToPatch.size() << " patches to create "
+                    << " but encountered " << baffleI
+                    << " slave faces originating from patcheable faces."
+                    << abort(FatalError);
+            }
+
+            if (debug)
+            {
+                const_cast<Time&>(mesh.time())++;
+                Pout<< "Writing baffled mesh to time "
+                    << meshRefiner_.timeName() << endl;
+                mesh.write();
+            }
+        }
+        Info<< "Created " << nZoneFaces << " baffles in = "
+            << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+    }
+    return map;
+}
+
+
+Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::mergeZoneBaffles
+(
+    const List<labelPair>& baffles
+)
+{
+    labelList zonedSurfaces = meshRefiner_.surfaces().getNamedSurfaces();
+
+    autoPtr<mapPolyMesh> map;
+
+    // No need to sync; all processors will have all same zonedSurfaces.
+    label nBaffles = returnReduce(baffles.size(), sumOp<label>());
+    if (zonedSurfaces.size() && nBaffles > 0)
+    {
+        // Merge any baffles
+        Info<< "Converting " << nBaffles << " baffles back into zoned faces ..."
+            << endl;
+
+        map = meshRefiner_.mergeBaffles(baffles);
+
+        Info<< "Converted baffles in = "
+            << meshRefiner_.mesh().time().cpuTimeIncrement()
+            << " s\n" << nl << endl;
+    }
+
+    return map;
+}
+
+
+Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
+(
+    const snapParameters& snapParams,
+    const indirectPrimitivePatch& pp
+) const
+{
+    const edgeList& edges = pp.edges();
+    const labelListList& pointEdges = pp.pointEdges();
+    const pointField& localPoints = pp.localPoints();
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    scalarField maxEdgeLen(localPoints.size(), -GREAT);
+
+    forAll(pointEdges, pointI)
+    {
+        const labelList& pEdges = pointEdges[pointI];
+
+        forAll(pEdges, pEdgeI)
+        {
+            const edge& e = edges[pEdges[pEdgeI]];
+
+            scalar len = e.mag(localPoints);
+
+            maxEdgeLen[pointI] = max(maxEdgeLen[pointI], len);
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        maxEdgeLen,
+        maxEqOp<scalar>(),  // combine op
+        -GREAT,             // null value
+        false               // no separation
+    );
+
+    return snapParams.snapTol()*maxEdgeLen;
+}
+
+
+void Foam::autoSnapDriver::preSmoothPatch
+(
+    const snapParameters& snapParams,
+    const label nInitErrors,
+    const List<labelPair>& baffles,
+    motionSmoother& meshMover
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    labelList checkFaces;
+
+    Info<< "Smoothing patch points ..." << endl;
+    for
+    (
+        label smoothIter = 0;
+        smoothIter < snapParams.nSmoothPatch();
+        smoothIter++
+    )
+    {
+        Info<< "Smoothing iteration " << smoothIter << endl;
+        checkFaces.setSize(mesh.nFaces());
+        forAll(checkFaces, faceI)
+        {
+            checkFaces[faceI] = faceI;
+        }
+
+        pointField patchDisp(smoothPatchDisplacement(meshMover, baffles));
+
+        // The current mesh is the starting mesh to smooth from.
+        meshMover.setDisplacement(patchDisp);
+        meshMover.correct();
+
+        scalar oldErrorReduction = -1;
+
+        for (label snapIter = 0; snapIter < 2*snapParams.nSnap(); snapIter++)
+        {
+            Info<< nl << "Scaling iteration " << snapIter << endl;
+
+            if (snapIter == snapParams.nSnap())
+            {
+                Info<< "Displacement scaling for error reduction set to 0."
+                    << endl;
+                oldErrorReduction = meshMover.setErrorReduction(0.0);
+            }
+
+            // Try to adapt mesh to obtain displacement by smoothly
+            // decreasing displacement at error locations.
+            if (meshMover.scaleMesh(checkFaces, baffles, true, nInitErrors))
+            {
+                Info<< "Successfully moved mesh" << endl;
+                break;
+            }
+        }
+
+        if (oldErrorReduction >= 0)
+        {
+            meshMover.setErrorReduction(oldErrorReduction);
+        }
+        Info<< endl;
+    }
+
+
+    // The current mesh is the starting mesh to smooth from.
+    meshMover.correct();
+
+    if (debug)
+    {
+        const_cast<Time&>(mesh.time())++;
+        Pout<< "Writing patch smoothed mesh to time " << meshRefiner_.timeName()
+            << endl;
+
+        mesh.write();
+    }
+
+    Info<< "Patch points smoothed in = "
+        << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+}
+
+
+// Get (pp-local) indices of points that are both on zone and on patched surface
+Foam::labelList Foam::autoSnapDriver::getZoneSurfacePoints
+(
+    const indirectPrimitivePatch& pp,
+    const word& zoneName
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    label zoneI = mesh.faceZones().findZoneID(zoneName);
+
+    if (zoneI == -1)
+    {
+        FatalErrorIn
+        (
+            "autoSnapDriver::getZoneSurfacePoints"
+            "(const indirectPrimitivePatch&, const word&)"
+        )   << "Cannot find zone " << zoneName
+            << exit(FatalError);
+    }
+
+    const faceZone& fZone = mesh.faceZones()[zoneI];
+
+
+    // Could use PrimitivePatch & localFaces to extract points but might just
+    // as well do it ourselves.
+
+    boolList pointOnZone(pp.nPoints(), false);
+
+    forAll(fZone, i)
+    {
+        const face& f = mesh.faces()[fZone[i]];
+
+        forAll(f, fp)
+        {
+            label meshPointI = f[fp];
+
+            Map<label>::const_iterator iter =
+                pp.meshPointMap().find(meshPointI);
+
+            if (iter != pp.meshPointMap().end())
+            {
+                label pointI = iter();
+                pointOnZone[pointI] = true;
+            }
+        }
+    }
+
+    return findIndices(pointOnZone, true);
+}
+
+
+Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
+(
+    const scalarField& snapDist,
+    motionSmoother& meshMover
+) const
+{
+    Info<< "Calculating patchDisplacement as distance to nearest surface"
+        << " point ..." << endl;
+
+    const indirectPrimitivePatch& pp = meshMover.patch();
+    const pointField& localPoints = pp.localPoints();
+    const refinementSurfaces& surfaces = meshRefiner_.surfaces();
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Displacement per patch point
+    vectorField patchDisp(localPoints.size(), vector::zero);
+
+    if (returnReduce(localPoints.size(), sumOp<label>()) > 0)
+    {
+        // Current surface snapped to
+        labelList snapSurf(localPoints.size(), -1);
+
+        // Divide surfaces into zoned and unzoned
+        labelList zonedSurfaces =
+            meshRefiner_.surfaces().getNamedSurfaces();
+        labelList unzonedSurfaces =
+            meshRefiner_.surfaces().getUnnamedSurfaces();
+
+
+        // 1. All points to non-interface surfaces
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        {
+            List<pointIndexHit> hitInfo;
+            labelList hitSurface;
+            surfaces.findNearest
+            (
+                unzonedSurfaces,
+                localPoints,
+                sqr(4*snapDist),        // sqr of attract distance
+                hitSurface,
+                hitInfo
+            );
+
+            forAll(hitInfo, pointI)
+            {
+                if (hitInfo[pointI].hit())
+                {
+                    patchDisp[pointI] =
+                        hitInfo[pointI].hitPoint()
+                      - localPoints[pointI];
+
+                    snapSurf[pointI] = hitSurface[pointI];
+                }
+            }
+        }
+
+
+
+        // 2. All points on zones to their respective surface
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        // Surfaces with zone information
+        const wordList& faceZoneNames = surfaces.faceZoneNames();
+
+        // Current best snap distance
+        scalarField minSnapDist(snapDist);
+
+        forAll(zonedSurfaces, i)
+        {
+            label zoneSurfI = zonedSurfaces[i];
+
+            const labelList surfacesToTest(1, zoneSurfI);
+
+            // Get indices of points both on faceZone and on pp.
+            labelList zonePointIndices
+            (
+                getZoneSurfacePoints
+                (
+                    pp,
+                    faceZoneNames[zoneSurfI]
+                )
+            );
+
+            // Find nearest for points both on faceZone and pp.
+            List<pointIndexHit> hitInfo;
+            labelList hitSurface;
+            surfaces.findNearest
+            (
+                labelList(1, zoneSurfI),
+                pointField(localPoints, zonePointIndices),
+                sqr(4*scalarField(minSnapDist, zonePointIndices)),
+                hitSurface,
+                hitInfo
+            );
+
+            forAll(hitInfo, i)
+            {
+                label pointI = zonePointIndices[i];
+
+                if (hitInfo[i].hit())
+                {
+                    patchDisp[pointI] =
+                        hitInfo[i].hitPoint()
+                      - localPoints[pointI];
+
+                    minSnapDist[pointI] = min
+                    (
+                        minSnapDist[pointI],
+                        mag(patchDisp[pointI])
+                    );
+
+                    snapSurf[pointI] = zoneSurfI;
+                }
+            }
+        }
+
+        // Check if all points are being snapped
+        forAll(snapSurf, pointI)
+        {
+            if (snapSurf[pointI] == -1)
+            {
+                WarningIn("autoSnapDriver::calcNearestSurface(..)")
+                    << "For point:" << pointI
+                    << " coordinate:" << localPoints[pointI]
+                    << " did not find any surface within:"
+                    << minSnapDist[pointI]
+                    << " meter." << endl;
+            }
+        }
+
+        {
+            scalarField magDisp(mag(patchDisp));
+
+            Info<< "Wanted displacement : average:"
+                << gSum(magDisp)/returnReduce(patchDisp.size(), sumOp<label>())
+                << " min:" << gMin(magDisp)
+                << " max:" << gMax(magDisp) << endl;
+        }
+    }
+
+    Info<< "Calculated surface displacement in = "
+        << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+
+
+    // Limit amount of movement.
+    forAll(patchDisp, patchPointI)
+    {
+        scalar magDisp = mag(patchDisp[patchPointI]);
+
+        if (magDisp > snapDist[patchPointI])
+        {
+            patchDisp[patchPointI] *= snapDist[patchPointI] / magDisp;
+
+            Pout<< "Limiting displacement for " << patchPointI
+                << " from " << magDisp << " to " << snapDist[patchPointI]
+                << endl;
+        }
+    }
+
+    // Points on zones in one domain but only present as point on other
+    // will not do condition 2 on all. Sync explicitly.
+    syncTools::syncPointList
+    (
+        mesh,
+        pp.meshPoints(),
+        patchDisp,
+        minMagEqOp(),                   // combine op
+        vector(GREAT, GREAT, GREAT),    // null value
+        false                           // no separation
+    );
+
+
+    // Check for displacement being outwards.
+    outwardsDisplacement(pp, patchDisp);
+
+    // Set initial distribution of displacement field (on patches) from
+    // patchDisp and make displacement consistent with b.c. on displacement
+    // pointVectorField.
+    meshMover.setDisplacement(patchDisp);
+
+    if (debug)
+    {
+        dumpMove
+        (
+            mesh.time().path()/"patchDisplacement.obj",
+            pp.localPoints(),
+            pp.localPoints() + patchDisp
+        );
+    }
+
+    return patchDisp;
+}
+
+
+void Foam::autoSnapDriver::smoothDisplacement
+(
+    const snapParameters& snapParams,
+    motionSmoother& meshMover
+) const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+    const pointMesh& pMesh = meshMover.pMesh();
+    const indirectPrimitivePatch& pp = meshMover.patch();
+
+    Info<< "Smoothing displacement ..." << endl;
+
+    // Set edge diffusivity as inverse of distance to patch
+    scalarField edgeGamma(1.0/(edgePatchDist(pMesh, pp) + SMALL));
+    //scalarField edgeGamma(mesh.nEdges(), 1.0);
+    //scalarField edgeGamma(wallGamma(mesh, pp, 10, 1));
+
+    // Get displacement field
+    pointVectorField& disp = meshMover.displacement();
+
+    for (label iter = 0; iter < snapParams.nSmoothDispl(); iter++)
+    {
+        if ((iter % 10) == 0)
+        {
+            Info<< "Iteration " << iter << endl;
+        }
+        pointVectorField oldDisp(disp);
+
+        meshMover.smooth(oldDisp, edgeGamma, false, disp);
+    }
+    Info<< "Displacement smoothed in = "
+        << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+
+    if (debug)
+    {
+        const_cast<Time&>(mesh.time())++;
+        Pout<< "Writing smoothed mesh to time " << meshRefiner_.timeName()
+            << endl;
+
+        // Moving mesh creates meshPhi. Can be cleared out by a mesh.clearOut
+        // but this will also delete all pointMesh but not pointFields which
+        // gives an illegal situation.
+
+        mesh.write();
+
+        Pout<< "Writing displacement field ..." << endl;
+        disp.write();
+        tmp<pointScalarField> magDisp(mag(disp));
+        magDisp().write();
+
+        Pout<< "Writing actual patch displacement ..." << endl;
+        vectorField actualPatchDisp(disp, pp.meshPoints());
+        dumpMove
+        (
+            mesh.time().path()/"actualPatchDisplacement.obj",
+            pp.localPoints(),
+            pp.localPoints() + actualPatchDisp
+        );
+    }
+}
+
+
+void Foam::autoSnapDriver::scaleMesh
+(
+    const snapParameters& snapParams,
+    const label nInitErrors,
+    const List<labelPair>& baffles,
+    motionSmoother& meshMover
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    // Relax displacement until correct mesh
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    labelList checkFaces(identity(mesh.nFaces()));
+
+    scalar oldErrorReduction = -1;
+
+    Info<< "Moving mesh ..." << endl;
+    for (label iter = 0; iter < 2*snapParams.nSnap(); iter++)
+    {
+        Info<< nl << "Iteration " << iter << endl;
+
+        if (iter == snapParams.nSnap())
+        {
+            Info<< "Displacement scaling for error reduction set to 0." << endl;
+            oldErrorReduction = meshMover.setErrorReduction(0.0);
+        }
+
+        if (meshMover.scaleMesh(checkFaces, baffles, true, nInitErrors))
+        {
+            Info<< "Successfully moved mesh" << endl;
+
+            break;
+        }
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+            Pout<< "Writing scaled mesh to time " << meshRefiner_.timeName()
+                << endl;
+            mesh.write();
+
+            Pout<< "Writing displacement field ..." << endl;
+            meshMover.displacement().write();
+            tmp<pointScalarField> magDisp(mag(meshMover.displacement()));
+            magDisp().write();
+        }
+    }
+
+    if (oldErrorReduction >= 0)
+    {
+        meshMover.setErrorReduction(oldErrorReduction);
+    }
+    Info<< "Moved mesh in = "
+        << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+}
+
+
+// After snapping: correct patching according to nearest surface.
+// Code is very similar to calcNearestSurface.
+// - calculate face-wise snap distance as max of point-wise
+// - calculate face-wise nearest surface point
+// - repatch face according to patch for surface point.
+Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
+(
+    const snapParameters& snapParams,
+    const labelList& adaptPatchIDs
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+    const refinementSurfaces& surfaces = meshRefiner_.surfaces();
+
+    Info<< "Repatching faces according to nearest surface ..." << endl;
+
+    // Get the labels of added patches.
+    autoPtr<indirectPrimitivePatch> ppPtr
+    (
+        meshRefinement::makePatch
+        (
+            mesh,
+            adaptPatchIDs
+        )
+    );
+    indirectPrimitivePatch& pp = ppPtr();
+
+    // Divide surfaces into zoned and unzoned
+    labelList zonedSurfaces = meshRefiner_.surfaces().getNamedSurfaces();
+    labelList unzonedSurfaces = meshRefiner_.surfaces().getUnnamedSurfaces();
+
+
+    // Faces that do not move
+    PackedBoolList isZonedFace(mesh.nFaces(), 0);
+    {
+        // 1. All faces on zoned surfaces
+        const wordList& faceZoneNames = surfaces.faceZoneNames();
+        const faceZoneMesh& fZones = mesh.faceZones();
+
+        forAll(zonedSurfaces, i)
+        {
+            label zoneSurfI = zonedSurfaces[i];
+
+            label zoneI = fZones.findZoneID(faceZoneNames[zoneSurfI]);
+
+            const faceZone& fZone = fZones[zoneI];
+
+            forAll(fZone, i)
+            {
+                isZonedFace.set(fZone[i], 1);
+            }
+        }
+    }
+
+
+    // Determine per pp face which patch it should be in
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Patch that face should be in
+    labelList closestPatch(pp.size(), -1);
+    {
+        // face snap distance as max of point snap distance
+        scalarField faceSnapDist(pp.size(), -GREAT);
+        {
+            // Distance to attract to nearest feature on surface
+            const scalarField snapDist(calcSnapDistance(snapParams, pp));
+
+            const faceList& localFaces = pp.localFaces();
+
+            forAll(localFaces, faceI)
+            {
+                const face& f = localFaces[faceI];
+
+                forAll(f, fp)
+                {
+                    faceSnapDist[faceI] = max
+                    (
+                        faceSnapDist[faceI],
+                        snapDist[f[fp]]
+                    );
+                }
+            }
+        }
+
+        pointField localFaceCentres(mesh.faceCentres(), pp.addressing());
+
+        // Get nearest surface and region
+        labelList hitSurface;
+        labelList hitRegion;
+        surfaces.findNearestRegion
+        (
+            unzonedSurfaces,
+            localFaceCentres,
+            sqr(4*faceSnapDist),    // sqr of attract distance
+            hitSurface,
+            hitRegion
+        );
+
+        // Get patch
+        forAll(pp, i)
+        {
+            label faceI = pp.addressing()[i];
+
+            if (hitSurface[i] != -1 && (isZonedFace.get(faceI) == 0))
+            {
+                closestPatch[i] = globalToPatch_
+                [
+                    surfaces.globalRegion
+                    (
+                        hitSurface[i],
+                        hitRegion[i]
+                    )
+                ];
+            }
+        }
+    }
+
+
+    // Change those faces for which there is a different closest patch
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList ownPatch(mesh.nFaces(), -1);
+    labelList neiPatch(mesh.nFaces(), -1);
+
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        forAll(pp, i)
+        {
+            ownPatch[pp.start()+i] = patchI;
+            neiPatch[pp.start()+i] = patchI;
+        }
+    }
+
+    label nChanged = 0;
+    forAll(closestPatch, i)
+    {
+        label faceI = pp.addressing()[i];
+
+        if (closestPatch[i] != -1 && closestPatch[i] != ownPatch[faceI])
+        {
+            ownPatch[faceI] = closestPatch[i];
+            neiPatch[faceI] = closestPatch[i];
+            nChanged++;
+        }
+    }
+
+    Info<< "Repatched " << returnReduce(nChanged, sumOp<label>())
+        << " faces in = " << mesh.time().cpuTimeIncrement() << " s\n" << nl
+        << endl;
+
+    return meshRefiner_.createBaffles(ownPatch, neiPatch);
+}
+
+
+void Foam::autoSnapDriver::doSnap
+(
+    const dictionary& snapDict,
+    const dictionary& motionDict,
+    const snapParameters& snapParams
+)
+{
+    fvMesh& mesh = meshRefiner_.mesh();
+
+    Info<< nl
+        << "Morphing phase" << nl
+        << "--------------" << nl
+        << endl;
+
+    // Get the labels of added patches.
+    labelList adaptPatchIDs(meshRefiner_.meshedPatches());
+
+    // Create baffles (pairs of faces that share the same points)
+    // Baffles stored as owner and neighbour face that have been created.
+    List<labelPair> baffles;
+    createZoneBaffles(baffles);
+
+    {
+        autoPtr<indirectPrimitivePatch> ppPtr
+        (
+            meshRefinement::makePatch
+            (
+                mesh,
+                adaptPatchIDs
+            )
+        );
+        indirectPrimitivePatch& pp = ppPtr();
+
+        // Distance to attract to nearest feature on surface
+        const scalarField snapDist(calcSnapDistance(snapParams, pp));
+
+
+        // Construct iterative mesh mover.
+        Info<< "Constructing mesh displacer ..." << endl;
+        Info<< "Using mesh parameters " << motionDict << nl << endl;
+
+        const pointMesh& pMesh = pointMesh::New(mesh);
+
+        motionSmoother meshMover
+        (
+            mesh,
+            pp,
+            adaptPatchIDs,
+            meshRefinement::makeDisplacementField(pMesh, adaptPatchIDs),
+            motionDict
+        );
+
+
+        // Check initial mesh
+        Info<< "Checking initial mesh ..." << endl;
+        labelHashSet wrongFaces(mesh.nFaces()/100);
+        motionSmoother::checkMesh(false, mesh, motionDict, wrongFaces);
+        const label nInitErrors = returnReduce
+        (
+            wrongFaces.size(),
+            sumOp<label>()
+        );
+
+        Info<< "Detected " << nInitErrors << " illegal faces"
+            << " (concave, zero area or negative cell pyramid volume)"
+            << endl;
+
+
+        Info<< "Checked initial mesh in = "
+            << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+
+        // Pre-smooth patch vertices (so before determining nearest)
+        preSmoothPatch(snapParams, nInitErrors, baffles, meshMover);
+
+        // Calculate displacement at every patch point. Insert into
+        // meshMover.
+        calcNearestSurface(snapDist, meshMover);
+
+        //// Get smoothly varying internal displacement field.
+        //- 2009-12-16 : was not found to be beneficial. Keeping internal
+        // fields fixed slightly increases skewness (on boundary)
+        // but lowers non-orthogonality quite a bit (e.g. 65->59 degrees).
+        // Maybe if better smoother?
+        //smoothDisplacement(snapParams, meshMover);
+
+        // Apply internal displacement to mesh.
+        scaleMesh(snapParams, nInitErrors, baffles, meshMover);
+    }
+
+    // Merge any introduced baffles.
+    mergeZoneBaffles(baffles);
+
+    // Repatch faces according to nearest.
+    repatchToSurface(snapParams, adaptPatchIDs);
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
new file mode 100644
index 000000000..476d9db56
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -0,0 +1,242 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::autoSnapDriver
+
+Description
+    All to do with snapping to surface
+
+SourceFiles
+    autoSnapDriver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef autoSnapDriver_H
+#define autoSnapDriver_H
+
+#include "PackedBoolList.H"
+#include "meshRefinement.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class motionSmoother;
+class snapParameters;
+
+/*---------------------------------------------------------------------------*\
+                           Class autoSnapDriver Declaration
+\*---------------------------------------------------------------------------*/
+
+class autoSnapDriver
+{
+    // Private classes
+
+        //- Combine operator class for equalizing displacements.
+        class minMagEqOp
+        {
+        public:
+
+            void operator()(vector& x, const vector& y) const
+            {
+                if (magSqr(y) < magSqr(x))
+                {
+                    x = y;
+                }
+            }
+        };
+
+
+    // Private data
+
+        //- Mesh+surface
+        meshRefinement& meshRefiner_;
+
+        //- From surface region to patch
+        const labelList globalToPatch_;
+
+
+    // Private Member Functions
+
+
+        // Snapping
+
+            //- Get faces to repatch. Returns map from face to patch.
+            Map<label> getZoneBafflePatches(const bool allowBoundary) const;
+
+            //- Calculates (geometric) shared points
+            static label getCollocatedPoints
+            (
+                const scalar tol,
+                const pointField&,
+                PackedBoolList&
+            );
+
+            //- Calculate displacement per patch point to smooth out patch.
+            //  Quite complicated in determining which points to move where.
+            pointField smoothPatchDisplacement
+            (
+                const motionSmoother&,
+                const List<labelPair>&
+            ) const;
+
+            //- Check that face zones are synced
+            void checkCoupledFaceZones() const;
+
+            //- Per edge distance to patch
+            static tmp<scalarField> edgePatchDist
+            (
+                const pointMesh&,
+                const indirectPrimitivePatch&
+            );
+
+            //- Write displacement as .obj file.
+            static void dumpMove
+            (
+                const fileName&,
+                const pointField&,
+                const pointField&
+            );
+
+            //- Check displacement is outwards pointing
+            static bool outwardsDisplacement
+            (
+                const indirectPrimitivePatch&,
+                const vectorField&
+            );
+
+
+        //- Disallow default bitwise copy construct
+        autoSnapDriver(const autoSnapDriver&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const autoSnapDriver&);
+
+
+public:
+
+    //- Runtime type information
+    ClassName("autoSnapDriver");
+
+
+    // Constructors
+
+        //- Construct from components
+        autoSnapDriver
+        (
+            meshRefinement& meshRefiner,
+            const labelList& globalToPatch
+        );
+
+
+    // Member Functions
+
+        // Snapping
+
+            //- Create baffles for faces straddling zoned surfaces. Return
+            //  baffles.
+            autoPtr<mapPolyMesh> createZoneBaffles(List<labelPair>&);
+
+            //- Merge baffles.
+            autoPtr<mapPolyMesh> mergeZoneBaffles(const List<labelPair>&);
+
+            //- Calculate edge length per patch point.
+            scalarField calcSnapDistance
+            (
+                const snapParameters& snapParams,
+                const indirectPrimitivePatch&
+            ) const;
+
+            //- Smooth the mesh (patch and internal) to increase visibility
+            //  of surface points (on castellated mesh) w.r.t. surface.
+            void preSmoothPatch
+            (
+                const snapParameters& snapParams,
+                const label nInitErrors,
+                const List<labelPair>& baffles,
+                motionSmoother&
+            ) const;
+
+            //- Get points both on patch and facezone.
+            labelList getZoneSurfacePoints
+            (
+                const indirectPrimitivePatch&,
+                const word& zoneName
+            ) const;
+
+            //- Per patch point calculate point on nearest surface. Set as
+            //  boundary conditions of motionSmoother displacement field. Return
+            //  displacement of patch points.
+            vectorField calcNearestSurface
+            (
+                const scalarField& snapDist,
+                motionSmoother& meshMover
+            ) const;
+
+            //- Smooth the displacement field to the internal.
+            void smoothDisplacement
+            (
+                const snapParameters& snapParams,
+                motionSmoother&
+            ) const;
+
+            //- Do the hard work: move the mesh according to displacement,
+            //  locally relax the displacement.
+            void scaleMesh
+            (
+                const snapParameters& snapParams,
+                const label nInitErrors,
+                const List<labelPair>& baffles,
+                motionSmoother&
+            );
+
+            //- Repatch faces according to surface nearest the face centre
+            autoPtr<mapPolyMesh> repatchToSurface
+            (
+                const snapParameters& snapParams,
+                const labelList& adaptPatchIDs
+            );
+
+
+            void doSnap
+            (
+                const dictionary& snapDict,
+                const dictionary& motionDict,
+                const snapParameters& snapParams
+            );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
new file mode 100644
index 000000000..f100ed132
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
@@ -0,0 +1,384 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "layerParameters.H"
+#include "polyBoundaryMesh.H"
+#include "mathematicalConstants.H"
+#include "refinementSurfaces.H"
+#include "searchableSurfaces.H"
+#include "regExp.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const Foam::scalar Foam::layerParameters::defaultConcaveAngle = 90;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Read the number of layers from dictionary. Per patch 0 or the number
+// of layers.
+Foam::labelList Foam::layerParameters::readNumLayers
+(
+    const PtrList<dictionary>& surfaceDicts,
+    const refinementSurfaces& refineSurfaces,
+    const labelList& globalToPatch,
+    const polyBoundaryMesh& boundaryMesh
+)
+{
+    // Per surface the number of layers
+    labelList globalSurfLayers(surfaceDicts.size());
+    // Per surface, per region the number of layers
+    List<Map<label> > regionSurfLayers(surfaceDicts.size());
+
+    const labelList& surfaceIndices = refineSurfaces.surfaces();
+
+    forAll(surfaceDicts, surfI)
+    {
+        const dictionary& dict = surfaceDicts[surfI];
+
+        globalSurfLayers[surfI] = readLabel(dict.lookup("surfaceLayers"));
+
+        if (dict.found("regions"))
+        {
+            // Per-region layer information
+
+            PtrList<dictionary> regionDicts(dict.lookup("regions"));
+
+            const wordList& regionNames =
+                refineSurfaces.geometry()[surfaceIndices[surfI]].regions();
+
+            forAll(regionDicts, dictI)
+            {
+                const dictionary& regionDict = regionDicts[dictI];
+
+                const word regionName(regionDict.lookup("name"));
+
+                label regionI = findIndex(regionNames, regionName);
+
+                label nLayers = readLabel(regionDict.lookup("surfaceLayers"));
+
+                Info<< "    region " << regionName << ':'<< nl
+                    << "        surface layers:" << nLayers << nl;
+
+                regionSurfLayers[surfI].insert(regionI, nLayers);
+            }
+        }
+    }
+
+
+    // Transfer per surface/region information into patchwise region info
+
+    labelList nLayers(boundaryMesh.size(), 0);
+
+    forAll(surfaceIndices, surfI)
+    {
+        const wordList& regionNames =
+            refineSurfaces.geometry()[surfaceIndices[surfI]].regions();
+
+        forAll(regionNames, regionI)
+        {
+            const word& regionName = regionNames[regionI];
+
+            label global = refineSurfaces.globalRegion(surfI, regionI);
+
+            label patchI = globalToPatch[global];
+
+            // Initialise to surface-wise layers
+            nLayers[patchI] = globalSurfLayers[surfI];
+
+            // Override with region specific data if available
+            Map<label>::const_iterator iter =
+                regionSurfLayers[surfI].find(regionI);
+
+            if (iter != regionSurfLayers[surfI].end())
+            {
+                nLayers[patchI] = iter();
+            }
+
+            // Check
+            if (nLayers[patchI] < 0)
+            {
+                FatalErrorIn
+                (
+                    "layerParameters::readNumLayers(..)"
+                )   << "Illegal number of layers " << nLayers[patchI]
+                    << " for surface "
+                    << refineSurfaces.names()[surfI]
+                    << " region " << regionName << endl
+                    << exit(FatalError);
+            }
+        }
+    }
+    return nLayers;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Construct from dictionary
+Foam::layerParameters::layerParameters
+(
+    const PtrList<dictionary>& surfaceDicts,
+    const refinementSurfaces& refineSurfaces,
+    const labelList& globalToPatch,
+    const dictionary& dict,
+    const polyBoundaryMesh& boundaryMesh
+)
+:
+    numLayers_
+    (
+        readNumLayers
+        (
+            surfaceDicts,
+            refineSurfaces,
+            globalToPatch,
+            boundaryMesh
+        )
+    ),
+    expansionRatio_
+    (
+        numLayers_.size(),
+        readScalar(dict.lookup("expansionRatio"))
+    ),
+    relativeSizes_(false),
+    finalLayerThickness_
+    (
+        numLayers_.size(),
+        readScalar(dict.lookup("finalLayerRatio"))
+    ),
+    minThickness_
+    (
+        numLayers_.size(),
+        readScalar(dict.lookup("minThickness"))
+    ),
+    featureAngle_(readScalar(dict.lookup("featureAngle"))),
+    concaveAngle_
+    (
+        dict.lookupOrDefault("concaveAngle", defaultConcaveAngle)
+    ),
+    nGrow_(readLabel(dict.lookup("nGrow"))),
+    nSmoothSurfaceNormals_
+    (
+        readLabel(dict.lookup("nSmoothSurfaceNormals"))
+    ),
+    nSmoothNormals_(readLabel(dict.lookup("nSmoothNormals"))),
+    nSmoothThickness_(readLabel(dict.lookup("nSmoothThickness"))),
+    maxFaceThicknessRatio_
+    (
+        readScalar(dict.lookup("maxFaceThicknessRatio"))
+    ),
+    layerTerminationCos_
+    (
+        Foam::cos
+        (
+            0.5
+          * featureAngle_
+          * mathematicalConstant::pi/180.
+        )
+    ),
+    maxThicknessToMedialRatio_
+    (
+        readScalar(dict.lookup("maxThicknessToMedialRatio"))
+    ),
+    minMedianAxisAngleCos_
+    (
+        Foam::cos(readScalar(dict.lookup("minMedianAxisAngle")))
+      * mathematicalConstant::pi/180.
+    ),
+    nBufferCellsNoExtrude_
+    (
+        readLabel(dict.lookup("nBufferCellsNoExtrude"))
+    ),
+    nSnap_(readLabel(dict.lookup("nSnap"))),
+    nLayerIter_(readLabel(dict.lookup("nLayerIter"))),
+    nRelaxedIter_(labelMax)
+{
+    if (dict.found("nRelaxedIter"))
+    {
+        dict.lookup("nRelaxedIter") >> nRelaxedIter_;
+    }
+
+    if (nLayerIter_ < 0 || nRelaxedIter_ < 0)
+    {
+        FatalErrorIn("layerParameters::layerParameters(..)")
+            << "Layer iterations should be >= 0." << endl
+            << "nLayerIter:" << nLayerIter_
+            << " nRelaxedIter:" << nRelaxedIter_
+            << exit(FatalError);
+    }
+}
+
+
+// Construct from dictionary
+Foam::layerParameters::layerParameters
+(
+    const dictionary& dict,
+    const polyBoundaryMesh& boundaryMesh
+)
+:
+    numLayers_(boundaryMesh.size(), 0),
+    expansionRatio_
+    (
+        boundaryMesh.size(),
+        readScalar(dict.lookup("expansionRatio"))
+    ),
+    relativeSizes_(dict.lookup("relativeSizes")),
+    finalLayerThickness_
+    (
+        boundaryMesh.size(),
+        readScalar(dict.lookup("finalLayerThickness"))
+    ),
+    minThickness_
+    (
+        boundaryMesh.size(),
+        readScalar(dict.lookup("minThickness"))
+    ),
+    featureAngle_(readScalar(dict.lookup("featureAngle"))),
+    concaveAngle_
+    (
+        dict.lookupOrDefault("concaveAngle", defaultConcaveAngle)
+    ),
+    nGrow_(readLabel(dict.lookup("nGrow"))),
+    nSmoothSurfaceNormals_
+    (
+        readLabel(dict.lookup("nSmoothSurfaceNormals"))
+    ),
+    nSmoothNormals_(readLabel(dict.lookup("nSmoothNormals"))),
+    nSmoothThickness_(readLabel(dict.lookup("nSmoothThickness"))),
+    maxFaceThicknessRatio_
+    (
+        readScalar(dict.lookup("maxFaceThicknessRatio"))
+    ),
+    layerTerminationCos_
+    (
+        Foam::cos
+        (
+            0.5
+          * featureAngle_
+          * mathematicalConstant::pi/180.
+        )
+    ),
+    maxThicknessToMedialRatio_
+    (
+        readScalar(dict.lookup("maxThicknessToMedialRatio"))
+    ),
+    minMedianAxisAngleCos_
+    (
+        Foam::cos(readScalar(dict.lookup("minMedianAxisAngle")))
+      * mathematicalConstant::pi/180.
+    ),
+    nBufferCellsNoExtrude_
+    (
+        readLabel(dict.lookup("nBufferCellsNoExtrude"))
+    ),
+    nSnap_(readLabel(dict.lookup("nRelaxIter"))),
+    nLayerIter_(readLabel(dict.lookup("nLayerIter"))),
+    nRelaxedIter_(labelMax)
+{
+    if (dict.found("nRelaxedIter"))
+    {
+        dict.lookup("nRelaxedIter") >> nRelaxedIter_;
+    }
+    if (nLayerIter_ < 0 || nRelaxedIter_ < 0)
+    {
+        FatalErrorIn("layerParameters::layerParameters(..)")
+            << "Layer iterations should be >= 0." << endl
+            << "nLayerIter:" << nLayerIter_
+            << " nRelaxedIter:" << nRelaxedIter_
+            << exit(FatalError);
+    }
+
+
+    const dictionary& layersDict = dict.subDict("layers");
+
+    forAll(boundaryMesh, patchI)
+    {
+        const word& patchName = boundaryMesh[patchI].name();
+
+        if (layersDict.found(patchName))
+        {
+            const dictionary& layerDict = layersDict.subDict(patchName);
+
+            numLayers_[patchI] =
+                readLabel(layerDict.lookup("nSurfaceLayers"));
+
+            layerDict.readIfPresent
+            (
+                "expansionRatio",
+                expansionRatio_[patchI]
+            );
+            layerDict.readIfPresent
+            (
+                "finalLayerThickness",
+                finalLayerThickness_[patchI]
+            );
+            layerDict.readIfPresent
+            (
+                "minThickness",
+                minThickness_[patchI]
+            );
+        }
+    }
+
+
+    // Check whether layer specification matches any patches
+    const List<keyType> wildCards = layersDict.keys(true);
+
+    forAll(wildCards, i)
+    {
+        regExp re(wildCards[i]);
+
+        bool hasMatch = false;
+        forAll(boundaryMesh, patchI)
+        {
+            if (re.match(boundaryMesh[patchI].name()))
+            {
+                hasMatch = true;
+                break;
+            }
+        }
+        if (!hasMatch)
+        {
+            IOWarningIn("layerParameters::layerParameters(..)", layersDict)
+                << "Wildcard layer specification for " << wildCards[i]
+                << " does not match any patch." << endl;
+        }
+    }
+
+    const List<keyType> nonWildCards = layersDict.keys(false);
+
+    forAll(nonWildCards, i)
+    {
+        if (boundaryMesh.findPatchID(nonWildCards[i]) == -1)
+        {
+            IOWarningIn("layerParameters::layerParameters(..)", layersDict)
+                << "Layer specification for " << nonWildCards[i]
+                << " does not match any patch." << endl;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
new file mode 100644
index 000000000..8ece82fc9
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
@@ -0,0 +1,290 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::layerParameters
+
+Description
+    Simple container to keep together layer specific information.
+
+SourceFiles
+    layerParameters.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef layerParameters_H
+#define layerParameters_H
+
+#include "dictionary.H"
+#include "scalarField.H"
+#include "labelList.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Class forward declarations
+class polyBoundaryMesh;
+class refinementSurfaces;
+
+/*---------------------------------------------------------------------------*\
+                           Class layerParameters Declaration
+\*---------------------------------------------------------------------------*/
+
+class layerParameters
+{
+    // Static data members
+
+        //- Default angle for faces to be convcave
+        static const scalar defaultConcaveAngle;
+
+
+    // Private data
+
+        // Per patch (not region!) information
+
+            //- How many layers to add.
+            labelList numLayers_;
+
+            scalarField expansionRatio_;
+
+            Switch relativeSizes_;
+
+            scalarField finalLayerThickness_;
+
+            scalarField minThickness_;
+
+
+        scalar featureAngle_;
+
+        scalar concaveAngle_;
+
+        label nGrow_;
+
+        label nSmoothSurfaceNormals_;
+
+        label nSmoothNormals_;
+
+        label nSmoothThickness_;
+
+        scalar maxFaceThicknessRatio_;
+
+        scalar layerTerminationCos_;
+
+        scalar maxThicknessToMedialRatio_;
+
+        scalar minMedianAxisAngleCos_;
+
+        label nBufferCellsNoExtrude_;
+
+        label nSnap_;
+
+        label nLayerIter_;
+
+        label nRelaxedIter_;
+
+
+    // Private Member Functions
+
+        //- Extract patch-wise number of layers
+        static labelList readNumLayers
+        (
+            const PtrList<dictionary>& surfaceDicts,
+            const refinementSurfaces& refineSurfaces,
+            const labelList& globalToPatch,
+            const polyBoundaryMesh& boundaryMesh
+        );
+
+        //- Disallow default bitwise copy construct
+        layerParameters(const layerParameters&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const layerParameters&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from dictionary - old syntax
+        layerParameters
+        (
+            const PtrList<dictionary>& surfaceDicts,
+            const refinementSurfaces& refineSurfaces,
+            const labelList& globalToPatch,
+            const dictionary& dict,
+            const polyBoundaryMesh& boundaryMesh
+        );
+
+        //- Construct from dictionary - new syntax
+        layerParameters(const dictionary& dict, const polyBoundaryMesh&);
+
+
+    // Member Functions
+
+        // Access
+
+            // Per patch information
+
+                //- How many layers to add.
+                const labelList& numLayers() const
+                {
+                    return numLayers_;
+                }
+
+                // Expansion factor for layer mesh
+                const scalarField& expansionRatio() const
+                {
+                    return expansionRatio_;
+                }
+
+                //- Are size parameters relative to inner cell size or
+                //  absolute distances.
+                bool relativeSizes() const
+                {
+                    return relativeSizes_;
+                }
+
+                //- Wanted thickness of final added cell layer. If multiple
+                //  layers is the thickness of the layer furthest away
+                //  from the wall (i.e. nearest the original mesh)
+                //  If relativeSize() this number is relative to undistorted
+                //  size of the cell outside layer.
+                const scalarField& finalLayerThickness() const
+                {
+                    return finalLayerThickness_;
+                }
+
+                //- Minimum thickness of cell layer. If for any reason layer
+                //  cannot be above minThickness do not add layer.
+                //  If relativeSize() this number is relative to undistorted
+                //  size of the cell outside layer.
+                const scalarField& minThickness() const
+                {
+                    return minThickness_;
+                }
+
+
+            scalar featureAngle() const
+            {
+                return featureAngle_;
+            }
+
+            scalar concaveAngle() const
+            {
+                return concaveAngle_;
+            }
+
+            //- If points get not extruded do nGrow layers of connected faces
+            //  that are not grown. Is used to not do layers at all close to
+            //  features.
+            label nGrow() const
+            {
+                return nGrow_;
+            }
+
+            //- Number of smoothing iterations of surface normals
+            label nSmoothSurfaceNormals() const
+            {
+                return nSmoothSurfaceNormals_;
+            }
+
+            //- Number of smoothing iterations of interior mesh movement
+            //  direction
+            label nSmoothNormals() const
+            {
+                return nSmoothNormals_;
+            }
+
+            //- Stop layer growth on highly warped cells
+            scalar maxFaceThicknessRatio() const
+            {
+                return maxFaceThicknessRatio_;
+            }
+
+            scalar layerTerminationCos() const
+            {
+                return layerTerminationCos_;
+            }
+
+            //- Smooth layer thickness over surface patches
+            label nSmoothThickness() const
+            {
+                return nSmoothThickness_;
+            }
+
+            //- Reduce layer growth where ratio thickness to medial
+            //  distance is large
+            scalar maxThicknessToMedialRatio() const
+            {
+                return maxThicknessToMedialRatio_;
+            }
+
+            //- Angle used to pick up medial axis points
+            scalar minMedianAxisAngleCos() const
+            {
+                return minMedianAxisAngleCos_;
+            }
+
+            //- Create buffer region for new layer terminations
+            label nBufferCellsNoExtrude() const
+            {
+                return nBufferCellsNoExtrude_;
+            }
+
+            label nSnap() const
+            {
+                return nSnap_;
+            }
+
+            // Overall
+
+                //- Number of overall layer addition iterations
+                label nLayerIter() const
+                {
+                    return nLayerIter_;
+                }
+
+                //- Number of iterations after which relaxed motion rules
+                //  are to be used.
+                label nRelaxedIter() const
+                {
+                    return nRelaxedIter_;
+                }
+
+
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdgeList.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
similarity index 67%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdgeList.H
rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
index 4803ed24b..eff2cfd79 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdgeList.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
@@ -21,35 +21,30 @@ License
     You should have received a copy of the GNU General Public License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::curvedEdgeList
-
-Description
-    A PtrList of curvedEdges
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef curvedEdgeList_H
-#define curvedEdgeList_H
+#include "pointData.H"
 
-#include "curvedEdge.H"
-#include "PtrList.H"
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
+Foam::Ostream& Foam::operator<<(Ostream& os, const pointData& wDist)
 {
+    if (os.format() == IOstream::ASCII)
+    {
+        return os
+            << wDist.origin() << token::SPACE << wDist.distSqr()
+            << token::SPACE << wDist.s() << token::SPACE << wDist.v();
+    }
+    else
+    {
+        return os
+            << wDist.origin() << wDist.distSqr() << wDist.s() << wDist.v();
+    }
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef PtrList<curvedEdge> curvedEdgeList;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
+Foam::Istream& Foam::operator>>(Istream& is, pointData& wDist)
+{
+    return is >> wDist.origin_ >> wDist.distSqr_ >> wDist.s_ >> wDist.v_;
+}
 
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
new file mode 100644
index 000000000..771152ee2
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
@@ -0,0 +1,226 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::pointData
+
+Description
+    Holds information regarding nearest wall point. Used in pointEdgeWave.
+    (so not standard meshWave)
+
+    To be used in wall distance calculation.
+
+SourceFiles
+    pointDataI.H
+    pointData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pointData_H
+#define pointData_H
+
+#include "point.H"
+#include "label.H"
+#include "tensor.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Class forward declarations
+class polyPatch;
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class pointData Declaration
+\*---------------------------------------------------------------------------*/
+
+class pointData
+{
+    // Private data
+
+        //- position of nearest wall center
+        point origin_;
+
+        //- normal distance (squared) from point to origin
+        scalar distSqr_;
+
+        //- additional information.
+        scalar s_;
+
+        //- additional information.
+        vector v_;
+
+
+    // Private Member Functions
+
+        //- Evaluate distance to point. Update distSqr, origin from whomever
+        //  is nearer pt. Return true if w2 is closer to point,
+        //  false otherwise.
+        inline bool update
+        (
+            const point&,
+            const pointData& w2,
+            const scalar tol
+        );
+
+        //- Combine current with w2. Update distSqr, origin if w2 has smaller
+        //  quantities and returns true.
+        inline bool update
+        (
+            const pointData& w2,
+            const scalar tol
+        );
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline pointData();
+
+        //- Construct from origin, distance
+        inline pointData
+        (
+            const point& origin,
+            const scalar distSqr,
+            const scalar s,
+            const vector& v
+        );
+
+        //- Construct as copy
+        inline pointData(const pointData&);
+
+
+    // Member Functions
+
+        // Access
+
+            inline const point& origin() const;
+
+            inline scalar distSqr() const;
+
+            inline scalar s() const;
+
+            inline const vector& v() const;
+
+
+        // Needed by meshWave
+
+            //- Check whether origin has been changed at all or
+            //  still contains original (invalid) value.
+            inline bool valid() const;
+
+            //- Check for identical geometrical data. Used for cyclics checking.
+            inline bool sameGeometry(const pointData&, const scalar tol)
+             const;
+
+            //- Convert origin to relative vector to leaving point
+            //  (= point coordinate)
+            inline void leaveDomain
+            (
+                const polyPatch& patch,
+                const label patchPointI,
+                const point& pos
+            );
+
+            //- Convert relative origin to absolute by adding entering point
+            inline void enterDomain
+            (
+                const polyPatch& patch,
+                const label patchPointI,
+                const point& pos
+            );
+
+            //- Apply rotation matrix to origin
+            inline void transform(const tensor& rotTensor);
+
+            //- Influence of edge on point
+            inline bool updatePoint
+            (
+                const polyMesh& mesh,
+                const label pointI,
+                const label edgeI,
+                const pointData& edgeInfo,
+                const scalar tol
+            );
+
+            //- Influence of different value on same point.
+            //  Merge new and old info.
+            inline bool updatePoint
+            (
+                const polyMesh& mesh,
+                const label pointI,
+                const pointData& newPointInfo,
+                const scalar tol
+            );
+
+            //- Influence of different value on same point.
+            //  No information about current position whatsoever.
+            inline bool updatePoint
+            (
+                const pointData& newPointInfo,
+                const scalar tol
+            );
+
+            //- Influence of point on edge.
+            inline bool updateEdge
+            (
+                const polyMesh& mesh,
+                const label edgeI,
+                const label pointI,
+                const pointData& pointInfo,
+                const scalar tol
+            );
+
+
+    // Member Operators
+
+        //Note: Used to determine whether to call update.
+        inline bool operator==(const pointData&) const;
+
+        inline bool operator!=(const pointData&) const;
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<<(Ostream&, const pointData&);
+        friend Istream& operator>>(Istream&, pointData&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "pointDataI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
new file mode 100644
index 000000000..6f74d4d8f
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
@@ -0,0 +1,353 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polyMesh.H"
+#include "transform.H"
+#include "wallPoint.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Update this with w2 if w2 nearer to pt.
+inline bool Foam::pointData::update
+(
+    const point& pt,
+    const pointData& w2,
+    const scalar tol
+)
+{
+    scalar dist2 = magSqr(pt - w2.origin());
+
+    if (!valid())
+    {
+        distSqr_ = dist2;
+        origin_ = w2.origin();
+        s_ = w2.s();
+        v_ = w2.v();
+
+        return true;
+    }
+
+
+//    if (v_ != w2.v())
+//    {
+//        return false;
+//    }
+
+
+    scalar diff = distSqr_ - dist2;
+
+    if (diff < 0)
+    {
+        // already nearer to pt
+        return false;
+    }
+
+    if ((diff < SMALL) || ((distSqr_ > SMALL) && (diff/distSqr_ < tol)))
+    {
+        // don't propagate small changes
+        return false;
+    }
+    else
+    {
+        // update with new values
+        distSqr_ = dist2;
+        origin_ = w2.origin();
+        s_ = w2.s();
+        v_ = w2.v();
+
+        return true;
+    }
+}
+
+
+// Update this with w2 (information on same point)
+inline bool Foam::pointData::update
+(
+    const pointData& w2,
+    const scalar tol
+)
+{
+    if (!valid())
+    {
+        // current not yet set so use any value
+        distSqr_ = w2.distSqr();
+        origin_ = w2.origin();
+        s_ = w2.s();
+        v_ = w2.v();
+        return true;
+    }
+
+
+//    if (v_ != w2.v())
+//    {
+//        return false;
+//    }
+
+
+    scalar diff = distSqr_ - w2.distSqr();
+
+    if (diff < 0)
+    {
+        // already nearer to pt
+        return false;
+    }
+
+    if ((diff < SMALL) || ((distSqr_ > SMALL) && (diff/distSqr_ < tol)))
+    {
+        // don't propagate small changes
+        return false;
+    }
+    else
+    {
+        // update with new values
+        distSqr_ =  w2.distSqr();
+        origin_ = w2.origin();
+        s_ = w2.s();
+        v_ = w2.v();
+
+        return true;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Null constructor
+inline Foam::pointData::pointData()
+:
+    origin_(wallPoint::greatPoint),
+    distSqr_(GREAT),
+    s_(GREAT),
+    v_(wallPoint::greatPoint)
+{}
+
+
+// Construct from origin, distance
+inline Foam::pointData::pointData
+(
+    const point& origin,
+    const scalar distSqr,
+    const scalar s,
+    const vector& v
+)
+:
+    origin_(origin),
+    distSqr_(distSqr),
+    s_(s),
+    v_(v)
+{}
+
+
+// Construct as copy
+inline Foam::pointData::pointData(const pointData& wpt)
+:
+    origin_(wpt.origin()),
+    distSqr_(wpt.distSqr()),
+    s_(wpt.s()),
+    v_(wpt.v())
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::point& Foam::pointData::origin() const
+{
+    return origin_;
+}
+
+
+inline Foam::scalar Foam::pointData::distSqr() const
+{
+    return distSqr_;
+}
+
+
+inline Foam::scalar Foam::pointData::s() const
+{
+    return s_;
+}
+
+
+inline const Foam::vector& Foam::pointData::v() const
+{
+    return v_;
+}
+
+
+inline bool Foam::pointData::valid() const
+{
+    return origin_ != wallPoint::greatPoint;
+}
+
+
+// Checks for cyclic points
+inline bool Foam::pointData::sameGeometry
+(
+    const pointData& w2,
+    const scalar tol
+) const
+{
+    scalar diff = Foam::mag(distSqr() - w2.distSqr());
+
+    if (diff < SMALL)
+    {
+        return true;
+    }
+    else
+    {
+        if ((distSqr() > SMALL) && ((diff/distSqr()) < tol))
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}
+
+
+inline void Foam::pointData::leaveDomain
+(
+    const polyPatch& patch,
+    const label patchPointI,
+    const point& coord
+)
+{
+    origin_ -= coord;
+}
+
+
+inline void Foam::pointData::transform(const tensor& rotTensor)
+{
+    origin_ = Foam::transform(rotTensor, origin_);
+}
+
+
+// Update absolute geometric quantities. Note that distance (distSqr_)
+// is not affected by leaving/entering domain.
+inline void Foam::pointData::enterDomain
+(
+    const polyPatch& patch,
+    const label patchPointI,
+    const point& coord
+)
+{
+    // back to absolute form
+    origin_ += coord;
+}
+
+
+// Update this with information from connected edge
+inline bool Foam::pointData::updatePoint
+(
+    const polyMesh& mesh,
+    const label pointI,
+    const label edgeI,
+    const pointData& edgeInfo,
+    const scalar tol
+)
+{
+    return
+        update
+        (
+            mesh.points()[pointI],
+            edgeInfo,
+            tol
+        );
+    }
+
+
+// Update this with new information on same point
+inline bool Foam::pointData::updatePoint
+(
+    const polyMesh& mesh,
+    const label pointI,
+    const pointData& newPointInfo,
+    const scalar tol
+)
+{
+    return
+        update
+        (
+            mesh.points()[pointI],
+            newPointInfo,
+            tol
+        );
+}
+
+
+// Update this with new information on same point. No extra information.
+inline bool Foam::pointData::updatePoint
+(
+    const pointData& newPointInfo,
+    const scalar tol
+)
+{
+    return update(newPointInfo, tol);
+}
+
+
+// Update this with information from connected point
+inline bool Foam::pointData::updateEdge
+(
+    const polyMesh& mesh,
+    const label edgeI,
+    const label pointI,
+    const pointData& pointInfo,
+    const scalar tol
+)
+{
+    const pointField& points = mesh.points();
+
+    const edge& e = mesh.edges()[edgeI];
+
+    const point edgeMid(0.5*(points[e[0]] + points[e[1]]));
+
+    return
+        update
+        (
+            edgeMid,
+            pointInfo,
+            tol
+        );
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline bool Foam::pointData::operator==(const pointData& rhs) const
+{
+    return origin() == rhs.origin();
+}
+
+
+inline bool Foam::pointData::operator!=(const pointData& rhs) const
+{
+    return !(*this == rhs);
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
new file mode 100644
index 000000000..d55b55f33
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "refinementParameters.H"
+#include "mathematicalConstants.H"
+#include "polyMesh.H"
+#include "globalIndex.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Construct from dictionary
+Foam::refinementParameters::refinementParameters
+(
+    const dictionary& dict,
+    const label dummy
+)
+:
+    maxGlobalCells_(readLabel(dict.lookup("cellLimit"))),
+    maxLocalCells_(readLabel(dict.lookup("procCellLimit"))),
+    minRefineCells_(readLabel(dict.lookup("minimumRefine"))),
+    curvature_(readScalar(dict.lookup("curvature"))),
+    nBufferLayers_(readLabel(dict.lookup("nBufferLayers"))),
+    keepPoints_(dict.lookup("keepPoints")),
+    allowFreeStandingZoneFaces_
+    (
+        dict.lookupOrDefault<Switch>
+        (
+            "allowFreeStandingZoneFaces",
+            true
+        )
+    ),
+    maxLoadUnbalance_(dict.lookupOrDefault<scalar>("maxLoadUnbalance",0))
+{}
+
+
+Foam::refinementParameters::refinementParameters(const dictionary& dict)
+:
+    maxGlobalCells_(readLabel(dict.lookup("maxGlobalCells"))),
+    maxLocalCells_(readLabel(dict.lookup("maxLocalCells"))),
+    minRefineCells_(readLabel(dict.lookup("minRefinementCells"))),
+    nBufferLayers_(readLabel(dict.lookup("nCellsBetweenLevels"))),
+    keepPoints_(pointField(1, dict.lookup("locationInMesh"))),
+    allowFreeStandingZoneFaces_
+    (
+        dict.lookupOrDefault<Switch>
+        (
+            "allowFreeStandingZoneFaces",
+            true
+        )
+    ),
+    maxLoadUnbalance_(dict.lookupOrDefault<scalar>("maxLoadUnbalance",0))
+{
+    scalar featAngle(readScalar(dict.lookup("resolveFeatureAngle")));
+
+    if (featAngle < 0 || featAngle > 180)
+    {
+        curvature_ = -GREAT;
+    }
+    else
+    {
+        curvature_ = Foam::cos(featAngle*mathematicalConstant::pi/180.0);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::labelList Foam::refinementParameters::findCells(const polyMesh& mesh)
+ const
+{
+    // Global calculation engine
+    globalIndex globalCells(mesh.nCells());
+
+    // Cell label per point
+    labelList cellLabels(keepPoints_.size());
+
+    forAll(keepPoints_, i)
+    {
+        const point& keepPoint = keepPoints_[i];
+
+        label localCellI = mesh.findCell(keepPoint);
+
+        label globalCellI = -1;
+
+        if (localCellI != -1)
+        {
+            Pout<< "Found point " << keepPoint << " in cell " << localCellI
+                << " on processor " << Pstream::myProcNo() << endl;
+            globalCellI = globalCells.toGlobal(localCellI);
+        }
+
+        reduce(globalCellI, maxOp<label>());
+
+        if (globalCellI == -1)
+        {
+            FatalErrorIn
+            (
+                "refinementParameters::findCells(const polyMesh&) const"
+            )   << "Point " << keepPoint
+                << " is not inside the mesh or on a face or edge." << nl
+                << "Bounding box of the mesh:" << mesh.bounds()
+                << exit(FatalError);
+        }
+
+        if (globalCells.isLocal(globalCellI))
+        {
+            cellLabels[i] = localCellI;
+        }
+        else
+        {
+            cellLabels[i] = -1;
+        }
+    }
+    return cellLabels;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
new file mode 100644
index 000000000..3c40ba6f0
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::refinementParameters
+
+Description
+    Simple container to keep together refinement specific information.
+
+SourceFiles
+    refinementParameters.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef refinementParameters_H
+#define refinementParameters_H
+
+#include "dictionary.H"
+#include "pointField.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Class forward declarations
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class refinementParameters Declaration
+\*---------------------------------------------------------------------------*/
+
+class refinementParameters
+{
+    // Private data
+
+        //- Total number of cells
+        const label maxGlobalCells_;
+
+        //- Per processor max number of cells
+        const label maxLocalCells_;
+
+        //- When to stop refining
+        const label minRefineCells_;
+
+        //- Curvature
+        scalar curvature_;
+
+        //- Number of layers between different refinement levels
+        const label nBufferLayers_;
+
+        //- Areas to keep
+        const pointField keepPoints_;
+
+        //- FaceZone faces allowed which have owner and neighbour in same
+        //  cellZone?
+        Switch allowFreeStandingZoneFaces_;
+
+        //- Allowed load unbalance
+        scalar maxLoadUnbalance_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        refinementParameters(const refinementParameters&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const refinementParameters&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from dictionary - old syntax
+        refinementParameters(const dictionary& dict, const label dummy);
+
+        //- Construct from dictionary - new syntax
+        refinementParameters(const dictionary& dict);
+
+
+    // Member Functions
+
+        // Access
+
+            //- Total number of cells
+            label maxGlobalCells() const
+            {
+                return maxGlobalCells_;
+            }
+
+            //- Per processor max number of cells
+            label maxLocalCells() const
+            {
+                return maxLocalCells_;
+            }
+
+            //- When to stop refining
+            label minRefineCells() const
+            {
+                return minRefineCells_;
+            }
+
+            //- Curvature
+            scalar curvature() const
+            {
+                return curvature_;
+            }
+
+            //- Number of layers between different refinement levels
+            label nBufferLayers() const
+            {
+                return nBufferLayers_;
+            }
+
+            //- Areas to keep
+            const pointField& keepPoints() const
+            {
+                return keepPoints_;
+            }
+
+            //- Are zone faces allowed only inbetween different cell zones
+            //  or also just free standing?
+            bool allowFreeStandingZoneFaces() const
+            {
+                return allowFreeStandingZoneFaces_;
+            }
+
+            //- Allowed load unbalance
+            scalar maxLoadUnbalance() const
+            {
+                return maxLoadUnbalance_;
+            }
+
+
+        // Other
+
+            //- Checks that cells are in mesh. Returns cells they are in.
+            labelList findCells(const polyMesh&) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/createBlockOffsets.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
similarity index 60%
rename from applications/utilities/mesh/generation/blockMesh/createBlockOffsets.C
rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
index 11a576c94..9437f5c48 100644
--- a/applications/utilities/mesh/generation/blockMesh/createBlockOffsets.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
@@ -21,39 +21,33 @@ License
     You should have received a copy of the GNU General Public License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-#include "blockMesh.H"
+#include "snapParameters.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::labelList Foam::blockMesh::createBlockOffsets()
-{
-    Info<< nl << "Creating block offsets" << endl;
+// Construct from dictionary
+Foam::snapParameters::snapParameters(const dictionary& dict, const label dummy)
+:
+    nSmoothPatch_(readLabel(dict.lookup("nSmoothPatch"))),
+    snapTol_(readScalar(dict.lookup("snapTol"))),
+    nSmoothDispl_(readLabel(dict.lookup("nSmoothDispl"))),
+    nSnap_(readLabel(dict.lookup("nSnap")))
+{}
 
-    blockMesh& blocks = *this;
 
-    nPoints_ = blocks[0].points().size();
-    nCells_ = blocks[0].cells().size();
+// Construct from dictionary
+Foam::snapParameters::snapParameters(const dictionary& dict)
+:
+    nSmoothPatch_(readLabel(dict.lookup("nSmoothPatch"))),
+    snapTol_(readScalar(dict.lookup("tolerance"))),
+    nSmoothDispl_(readLabel(dict.lookup("nSolveIter"))),
+    nSnap_(readLabel(dict.lookup("nRelaxIter")))
+{}
 
-    labelList BlockOffsets(blocks.size());
-    BlockOffsets[0] = 0;
 
-    label blockLabel;
-    for (blockLabel=1; blockLabel<blocks.size(); blockLabel++)
-    {
-        nPoints_ += blocks[blockLabel].points().size();
-        nCells_ += blocks[blockLabel].cells().size();
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-        BlockOffsets[blockLabel]
-            = BlockOffsets[blockLabel-1]
-            + blocks[blockLabel-1].points().size();
-    }
-
-    return BlockOffsets;
-}
 
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
new file mode 100644
index 000000000..1cfe20c0b
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::snapParameters
+
+Description
+    Simple container to keep together snap specific information.
+
+SourceFiles
+    snapParameters.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef snapParameters_H
+#define snapParameters_H
+
+#include "dictionary.H"
+#include "scalar.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Class forward declarations
+
+/*---------------------------------------------------------------------------*\
+                           Class snapParameters Declaration
+\*---------------------------------------------------------------------------*/
+
+class snapParameters
+{
+    // Private data
+
+        const label nSmoothPatch_;
+
+        const scalar snapTol_;
+
+        const label nSmoothDispl_;
+
+        const label nSnap_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        snapParameters(const snapParameters&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const snapParameters&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from dictionary - old syntax
+        snapParameters(const dictionary& dict, const label dummy);
+
+        //- Construct from dictionary - new syntax
+        snapParameters(const dictionary& dict);
+
+
+    // Member Functions
+
+        // Access
+
+            //- Number of patch smoothing iterations before finding
+            //  correspondence to surface
+            label nSmoothPatch() const
+            {
+                return nSmoothPatch_;
+            }
+
+            //- Relative distance for points to be attracted by surface
+            //  feature point
+            //  or edge. True distance is this factor times local
+            //  maximum edge length.
+            scalar snapTol() const
+            {
+                return snapTol_;
+            }
+
+            //- Number of mesh displacement smoothing iterations.
+            label nSmoothDispl() const
+            {
+                return nSmoothDispl_;
+            }
+
+            //- Maximum number of snapping relaxation iterations. Should stop
+            //  before upon reaching a correct mesh.
+            label nSnap() const
+            {
+                return nSnap_;
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
new file mode 100644
index 000000000..b6b1801ff
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -0,0 +1,2292 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "meshRefinement.H"
+#include "volMesh.H"
+#include "volFields.H"
+#include "surfaceMesh.H"
+#include "syncTools.H"
+#include "Time.H"
+#include "refinementHistory.H"
+#include "refinementSurfaces.H"
+#include "decompositionMethod.H"
+#include "regionSplit.H"
+#include "fvMeshDistribute.H"
+#include "indirectPrimitivePatch.H"
+#include "directTopoChange.H"
+#include "removeCells.H"
+#include "mapDistributePolyMesh.H"
+#include "localPointRegion.H"
+#include "pointMesh.H"
+#include "pointFields.H"
+#include "slipPointPatchFields.H"
+#include "fixedValuePointPatchFields.H"
+#include "globalPointPatchFields.H"
+#include "calculatedPointPatchFields.H"
+#include "processorPointPatch.H"
+#include "globalIndex.H"
+#include "meshTools.H"
+#include "OFstream.H"
+#include "geomDecomp.H"
+#include "Random.H"
+#include "searchableSurfaces.H"
+#include "treeBoundBox.H"
+#include "zeroGradientFvPatchFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(meshRefinement, 0);
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::meshRefinement::calcNeighbourData
+(
+    labelList& neiLevel,
+    pointField& neiCc
+)  const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    label nBoundaryFaces = mesh_.nFaces() - mesh_.nInternalFaces();
+
+    if (neiLevel.size() != nBoundaryFaces || neiCc.size() != nBoundaryFaces)
+    {
+        FatalErrorIn("meshRefinement::calcNeighbour(..)") << "nBoundaries:"
+            << nBoundaryFaces << " neiLevel:" << neiLevel.size()
+            << abort(FatalError);
+    }
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    labelHashSet addedPatchIDSet(meshedPatches());
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        const unallocLabelList& faceCells = pp.faceCells();
+        const vectorField::subField faceCentres = pp.faceCentres();
+        const vectorField::subField faceAreas = pp.faceAreas();
+
+        label bFaceI = pp.start()-mesh_.nInternalFaces();
+
+        if (pp.coupled())
+        {
+            forAll(faceCells, i)
+            {
+                neiLevel[bFaceI] = cellLevel[faceCells[i]];
+                neiCc[bFaceI] = cellCentres[faceCells[i]];
+                bFaceI++;
+            }
+        }
+        else if (addedPatchIDSet.found(patchI))
+        {
+            // Face was introduced from cell-cell intersection. Try to
+            // reconstruct other side cell(centre). Three possibilities:
+            // - cells same size.
+            // - preserved cell smaller. Not handled.
+            // - preserved cell larger.
+            forAll(faceCells, i)
+            {
+                // Extrapolate the face centre.
+                vector fn = faceAreas[i];
+                fn /= mag(fn)+VSMALL;
+
+                label own = faceCells[i];
+                label ownLevel = cellLevel[own];
+                label faceLevel = meshCutter_.getAnchorLevel(pp.start()+i);
+
+                // Normal distance from face centre to cell centre
+                scalar d = ((faceCentres[i] - cellCentres[own]) & fn);
+                if (faceLevel > ownLevel)
+                {
+                    // Other cell more refined. Adjust normal distance
+                    d *= 0.5;
+                }
+                neiLevel[bFaceI] = cellLevel[ownLevel];
+                // Calculate other cell centre by extrapolation
+                neiCc[bFaceI] = faceCentres[i] + d*fn;
+                bFaceI++;
+            }
+        }
+        else
+        {
+            forAll(faceCells, i)
+            {
+                neiLevel[bFaceI] = cellLevel[faceCells[i]];
+                neiCc[bFaceI] = faceCentres[i];
+                bFaceI++;
+            }
+        }
+    }
+
+    // Swap coupled boundaries. Apply separation to cc since is coordinate.
+    syncTools::swapBoundaryFaceList(mesh_, neiCc, true);
+    syncTools::swapBoundaryFaceList(mesh_, neiLevel, false);
+}
+
+
+// Find intersections of edges (given by their two endpoints) with surfaces.
+// Returns first intersection if there are more than one.
+void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
+{
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    // Stats on edges to test. Count proc faces only once.
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
+
+    {
+        label nMasterFaces = 0;
+        forAll(isMasterFace, faceI)
+        {
+            if (isMasterFace.get(faceI) == 1)
+            {
+                nMasterFaces++;
+            }
+        }
+        reduce(nMasterFaces, sumOp<label>());
+
+        label nChangedFaces = 0;
+        forAll(changedFaces, i)
+        {
+            if (isMasterFace.get(changedFaces[i]) == 1)
+            {
+                nChangedFaces++;
+            }
+        }
+        reduce(nChangedFaces, sumOp<label>());
+
+        Info<< "Edge intersection testing:" << nl
+            << "    Number of edges             : " << nMasterFaces << nl
+            << "    Number of edges to retest   : " << nChangedFaces
+            << endl;
+    }
+
+
+    // Get boundary face centre and level. Coupled aware.
+    labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+    pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+    calcNeighbourData(neiLevel, neiCc);
+
+    // Collect segments we want to test for
+    pointField start(changedFaces.size());
+    pointField end(changedFaces.size());
+
+    forAll(changedFaces, i)
+    {
+        label faceI = changedFaces[i];
+        label own = mesh_.faceOwner()[faceI];
+
+        start[i] = cellCentres[own];
+        if (mesh_.isInternalFace(faceI))
+        {
+            end[i] = cellCentres[mesh_.faceNeighbour()[faceI]];
+        }
+        else
+        {
+            end[i] = neiCc[faceI-mesh_.nInternalFaces()];
+        }
+    }
+
+    // Do tests in one go
+    labelList surfaceHit;
+    {
+        labelList surfaceLevel;
+        surfaces_.findHigherIntersection
+        (
+            start,
+            end,
+            labelList(start.size(), -1),    // accept any intersection
+            surfaceHit,
+            surfaceLevel
+        );
+    }
+
+    // Keep just surface hit
+    forAll(surfaceHit, i)
+    {
+        surfaceIndex_[changedFaces[i]] = surfaceHit[i];
+    }
+
+    // Make sure both sides have same information. This should be
+    // case in general since same vectors but just to make sure.
+    syncTools::syncFaceList(mesh_, surfaceIndex_, maxEqOp<label>(), false);
+
+    label nHits = countHits();
+    label nTotHits = returnReduce(nHits, sumOp<label>());
+
+    Info<< "    Number of intersected edges : " << nTotHits << endl;
+
+    // Set files to same time as mesh
+    setInstance(mesh_.facesInstance());
+}
+
+
+void Foam::meshRefinement::checkData()
+{
+    Pout<< "meshRefinement::checkData() : Checking refinement structure."
+        << endl;
+    meshCutter_.checkMesh();
+
+    Pout<< "meshRefinement::checkData() : Checking refinement levels."
+        << endl;
+    meshCutter_.checkRefinementLevels(1, labelList(0));
+
+
+    label nBnd = mesh_.nFaces()-mesh_.nInternalFaces();
+
+    Pout<< "meshRefinement::checkData() : Checking synchronization."
+        << endl;
+
+    // Check face centres
+    {
+        // Boundary face centres
+        pointField::subList boundaryFc
+        (
+            mesh_.faceCentres(),
+            nBnd,
+            mesh_.nInternalFaces()
+        );
+
+        // Get neighbouring face centres
+        pointField neiBoundaryFc(boundaryFc);
+        syncTools::swapBoundaryFaceList
+        (
+            mesh_,
+            neiBoundaryFc,
+            true
+        );
+
+        // Compare
+        testSyncBoundaryFaceList
+        (
+            mergeDistance_,
+            "testing faceCentres : ",
+            boundaryFc,
+            neiBoundaryFc
+        );
+    }
+    // Check meshRefinement
+    {
+        // Get boundary face centre and level. Coupled aware.
+        labelList neiLevel(nBnd);
+        pointField neiCc(nBnd);
+        calcNeighbourData(neiLevel, neiCc);
+
+        // Collect segments we want to test for
+        pointField start(mesh_.nFaces());
+        pointField end(mesh_.nFaces());
+
+        forAll(start, faceI)
+        {
+            start[faceI] = mesh_.cellCentres()[mesh_.faceOwner()[faceI]];
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                end[faceI] = mesh_.cellCentres()[mesh_.faceNeighbour()[faceI]];
+            }
+            else
+            {
+                end[faceI] = neiCc[faceI-mesh_.nInternalFaces()];
+            }
+        }
+
+        // Do tests in one go
+        labelList surfaceHit;
+        {
+            labelList surfaceLevel;
+            surfaces_.findHigherIntersection
+            (
+                start,
+                end,
+                labelList(start.size(), -1),    // accept any intersection
+                surfaceHit,
+                surfaceLevel
+            );
+        }
+        // Get the coupled hit
+        labelList neiHit
+        (
+            SubList<label>
+            (
+                surfaceHit,
+                nBnd,
+                mesh_.nInternalFaces()
+            )
+        );
+        syncTools::swapBoundaryFaceList(mesh_, neiHit, false);
+
+        // Check
+        forAll(surfaceHit, faceI)
+        {
+            if (surfaceIndex_[faceI] != surfaceHit[faceI])
+            {
+                if (mesh_.isInternalFace(faceI))
+                {
+                    WarningIn("meshRefinement::checkData()")
+                        << "Internal face:" << faceI
+                        << " fc:" << mesh_.faceCentres()[faceI]
+                        << " cached surfaceIndex_:" << surfaceIndex_[faceI]
+                        << " current:" << surfaceHit[faceI]
+                        << " ownCc:"
+                        << mesh_.cellCentres()[mesh_.faceOwner()[faceI]]
+                        << " neiCc:"
+                        << mesh_.cellCentres()[mesh_.faceNeighbour()[faceI]]
+                        << endl;
+                }
+                else if
+                (
+                    surfaceIndex_[faceI]
+                 != neiHit[faceI-mesh_.nInternalFaces()]
+                )
+                {
+                    WarningIn("meshRefinement::checkData()")
+                        << "Boundary face:" << faceI
+                        << " fc:" << mesh_.faceCentres()[faceI]
+                        << " cached surfaceIndex_:" << surfaceIndex_[faceI]
+                        << " current:" << surfaceHit[faceI]
+                        << " ownCc:"
+                        << mesh_.cellCentres()[mesh_.faceOwner()[faceI]]
+                        << " end:" << end[faceI]
+                        << endl;
+                }
+            }
+        }
+    }
+    {
+        labelList::subList boundarySurface
+        (
+            surfaceIndex_,
+            mesh_.nFaces()-mesh_.nInternalFaces(),
+            mesh_.nInternalFaces()
+        );
+
+        labelList neiBoundarySurface(boundarySurface);
+        syncTools::swapBoundaryFaceList
+        (
+            mesh_,
+            neiBoundarySurface,
+            false
+        );
+
+        // Compare
+        testSyncBoundaryFaceList
+        (
+            0,                              // tolerance
+            "testing surfaceIndex() : ",
+            boundarySurface,
+            neiBoundarySurface
+        );
+    }
+
+
+    // Find duplicate faces
+    Pout<< "meshRefinement::checkData() : Counting duplicate faces."
+        << endl;
+
+    labelList duplicateFace
+    (
+        localPointRegion::findDuplicateFaces
+        (
+            mesh_,
+            identity(mesh_.nFaces()-mesh_.nInternalFaces())
+          + mesh_.nInternalFaces()
+        )
+    );
+
+    // Count
+    {
+        label nDup = 0;
+
+        forAll(duplicateFace, i)
+        {
+            if (duplicateFace[i] != -1)
+            {
+                nDup++;
+            }
+        }
+        nDup /= 2;  // will have counted both faces of duplicate
+        Pout<< "meshRefinement::checkData() : Found " << nDup
+            << " duplicate pairs of faces." << endl;
+    }
+}
+
+
+void Foam::meshRefinement::setInstance(const fileName& inst)
+{
+    meshCutter_.setInstance(inst);
+    surfaceIndex_.instance() = inst;
+}
+
+
+// Remove cells. Put exposedFaces (output of getExposedFaces(cellsToRemove))
+// into exposedPatchIDs.
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemoveCells
+(
+    const labelList& cellsToRemove,
+    const labelList& exposedFaces,
+    const labelList& exposedPatchIDs,
+    removeCells& cellRemover
+)
+{
+    directTopoChange meshMod(mesh_);
+
+    // Arbitrary: put exposed faces into last patch.
+    cellRemover.setRefinement
+    (
+        cellsToRemove,
+        exposedFaces,
+        exposedPatchIDs,
+        meshMod
+    );
+
+    // Change the mesh (no inflation)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+    // Update fields
+    mesh_.updateMesh(map);
+
+    // Move mesh (since morphing might not do this)
+    if (map().hasMotionPoints())
+    {
+        mesh_.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes. No other way to do this?
+        mesh_.clearOut();
+    }
+
+    if (overwrite_)
+    {
+        mesh_.setInstance(oldInstance_);
+    }
+
+    // Update local mesh data
+    cellRemover.updateMesh(map);
+
+    // Update intersections. Recalculate intersections for exposed faces.
+    labelList newExposedFaces = renumber
+    (
+        map().reverseFaceMap(),
+        exposedFaces
+    );
+
+    //Pout<< "removeCells : updating intersections for "
+    //    << newExposedFaces.size() << " newly exposed faces." << endl;
+
+    updateMesh(map, newExposedFaces);
+
+    return map;
+}
+
+
+// Determine for multi-processor regions the lowest numbered cell on the lowest
+// numbered processor.
+void Foam::meshRefinement::getCoupledRegionMaster
+(
+    const globalIndex& globalCells,
+    const boolList& blockedFace,
+    const regionSplit& globalRegion,
+    Map<label>& regionToMaster
+) const
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (isA<processorPolyPatch>(pp))
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start()+i;
+
+                if (!blockedFace[faceI])
+                {
+                    // Only if there is a connection to the neighbour
+                    // will there be a multi-domain region; if not through
+                    // this face then through another.
+
+                    label cellI = mesh_.faceOwner()[faceI];
+                    label globalCellI = globalCells.toGlobal(cellI);
+
+                    Map<label>::iterator iter =
+                        regionToMaster.find(globalRegion[cellI]);
+
+                    if (iter != regionToMaster.end())
+                    {
+                        label master = iter();
+                        iter() = min(master, globalCellI);
+                    }
+                    else
+                    {
+                        regionToMaster.insert
+                        (
+                            globalRegion[cellI],
+                            globalCellI
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    // Do reduction
+    Pstream::mapCombineGather(regionToMaster, minEqOp<label>());
+    Pstream::mapCombineScatter(regionToMaster);
+}
+
+
+void Foam::meshRefinement::calcLocalRegions
+(
+    const globalIndex& globalCells,
+    const labelList& globalRegion,
+    const Map<label>& coupledRegionToMaster,
+    const scalarField& cellWeights,
+
+    Map<label>& globalToLocalRegion,
+    pointField& localPoints,
+    scalarField& localWeights
+) const
+{
+    globalToLocalRegion.resize(globalRegion.size());
+    DynamicList<point> localCc(globalRegion.size()/2);
+    DynamicList<scalar> localWts(globalRegion.size()/2);
+
+    forAll(globalRegion, cellI)
+    {
+        Map<label>::const_iterator fndMaster =
+            coupledRegionToMaster.find(globalRegion[cellI]);
+
+        if (fndMaster != coupledRegionToMaster.end())
+        {
+            // Multi-processor region.
+            if (globalCells.toGlobal(cellI) == fndMaster())
+            {
+                // I am master. Allocate region for me.
+                globalToLocalRegion.insert(globalRegion[cellI], localCc.size());
+                localCc.append(mesh_.cellCentres()[cellI]);
+                localWts.append(cellWeights[cellI]);
+            }
+        }
+        else
+        {
+            // Single processor region.
+            if (globalToLocalRegion.insert(globalRegion[cellI], localCc.size()))
+            {
+                localCc.append(mesh_.cellCentres()[cellI]);
+                localWts.append(cellWeights[cellI]);
+            }
+        }
+    }
+
+    localPoints.transfer(localCc);
+    localWeights.transfer(localWts);
+
+    if (localPoints.size() != globalToLocalRegion.size())
+    {
+        FatalErrorIn("calcLocalRegions(..)")
+            << "localPoints:" << localPoints.size()
+            << " globalToLocalRegion:" << globalToLocalRegion.size()
+            << exit(FatalError);
+    }
+}
+
+
+Foam::label Foam::meshRefinement::getShiftedRegion
+(
+    const globalIndex& indexer,
+    const Map<label>& globalToLocalRegion,
+    const Map<label>& coupledRegionToShifted,
+    const label globalRegion
+)
+{
+    Map<label>::const_iterator iter =
+        globalToLocalRegion.find(globalRegion);
+
+    if (iter != globalToLocalRegion.end())
+    {
+        // Region is 'owned' locally. Convert local region index into global.
+        return indexer.toGlobal(iter());
+    }
+    else
+    {
+        return coupledRegionToShifted[globalRegion];
+    }
+}
+
+
+// Add if not yet present
+void Foam::meshRefinement::addUnique(const label elem, labelList& lst)
+{
+    if (findIndex(lst, elem) == -1)
+    {
+        label sz = lst.size();
+        lst.setSize(sz+1);
+        lst[sz] = elem;
+    }
+}
+
+
+void Foam::meshRefinement::calcRegionRegions
+(
+    const labelList& globalRegion,
+    const Map<label>& globalToLocalRegion,
+    const Map<label>& coupledRegionToMaster,
+    labelListList& regionRegions
+) const
+{
+    // Global region indexing since we now know the shifted regions.
+    globalIndex shiftIndexer(globalToLocalRegion.size());
+
+    // Redo the coupledRegionToMaster to be in shifted region indexing.
+    Map<label> coupledRegionToShifted(coupledRegionToMaster.size());
+    forAllConstIter(Map<label>, coupledRegionToMaster, iter)
+    {
+        label region = iter.key();
+
+        Map<label>::const_iterator fndRegion = globalToLocalRegion.find(region);
+
+        if (fndRegion != globalToLocalRegion.end())
+        {
+            // A local cell is master of this region. Get its shifted region.
+            coupledRegionToShifted.insert
+            (
+                region,
+                shiftIndexer.toGlobal(fndRegion())
+            );
+        }
+        Pstream::mapCombineGather(coupledRegionToShifted, minEqOp<label>());
+        Pstream::mapCombineScatter(coupledRegionToShifted);
+    }
+
+
+    // Determine region-region connectivity.
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // This is for all my regions (so my local ones or the ones I am master
+    // of) the neighbouring region indices.
+
+
+    // Transfer lists.
+    PtrList<HashSet<edge, Hash<edge> > > regionConnectivity(Pstream::nProcs());
+    forAll(regionConnectivity, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            regionConnectivity.set
+            (
+                procI,
+                new HashSet<edge, Hash<edge> >
+                (
+                    coupledRegionToShifted.size()
+                  / Pstream::nProcs()
+                )
+            );
+        }
+    }
+
+
+    // Connectivity. For all my local regions the connected regions.
+    regionRegions.setSize(globalToLocalRegion.size());
+
+    // Add all local connectivity to regionRegions; add all non-local
+    // to the transferlists.
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        label ownRegion = globalRegion[mesh_.faceOwner()[faceI]];
+        label neiRegion = globalRegion[mesh_.faceNeighbour()[faceI]];
+
+        if (ownRegion != neiRegion)
+        {
+            label shiftOwnRegion = getShiftedRegion
+            (
+                shiftIndexer,
+                globalToLocalRegion,
+                coupledRegionToShifted,
+                ownRegion
+            );
+            label shiftNeiRegion = getShiftedRegion
+            (
+                shiftIndexer,
+                globalToLocalRegion,
+                coupledRegionToShifted,
+                neiRegion
+            );
+
+
+            // Connection between two regions. Send to owner of region.
+            // - is ownRegion 'owned' by me
+            // - is neiRegion 'owned' by me
+
+            if (shiftIndexer.isLocal(shiftOwnRegion))
+            {
+                label localI = shiftIndexer.toLocal(shiftOwnRegion);
+                addUnique(shiftNeiRegion, regionRegions[localI]);
+            }
+            else
+            {
+                label masterProc = shiftIndexer.whichProcID(shiftOwnRegion);
+                regionConnectivity[masterProc].insert
+                (
+                    edge(shiftOwnRegion, shiftNeiRegion)
+                );
+            }
+
+            if (shiftIndexer.isLocal(shiftNeiRegion))
+            {
+                label localI = shiftIndexer.toLocal(shiftNeiRegion);
+                addUnique(shiftOwnRegion, regionRegions[localI]);
+            }
+            else
+            {
+                label masterProc = shiftIndexer.whichProcID(shiftNeiRegion);
+                regionConnectivity[masterProc].insert
+                (
+                    edge(shiftOwnRegion, shiftNeiRegion)
+                );
+            }
+        }
+    }
+
+
+    // Send
+    forAll(regionConnectivity, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            OPstream str(Pstream::blocking, procI);
+            str << regionConnectivity[procI];
+        }
+    }
+    // Receive
+    forAll(regionConnectivity, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            IPstream str(Pstream::blocking, procI);
+            str >> regionConnectivity[procI];
+        }
+    }
+
+    // Add to addressing.
+    forAll(regionConnectivity, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            for
+            (
+                HashSet<edge, Hash<edge> >::const_iterator iter =
+                    regionConnectivity[procI].begin();
+                iter != regionConnectivity[procI].end();
+                ++iter
+            )
+            {
+                const edge& e = iter.key();
+
+                bool someLocal = false;
+                if (shiftIndexer.isLocal(e[0]))
+                {
+                    label localI = shiftIndexer.toLocal(e[0]);
+                    addUnique(e[1], regionRegions[localI]);
+                    someLocal = true;
+                }
+                if (shiftIndexer.isLocal(e[1]))
+                {
+                    label localI = shiftIndexer.toLocal(e[1]);
+                    addUnique(e[0], regionRegions[localI]);
+                    someLocal = true;
+                }
+
+                if (!someLocal)
+                {
+                    FatalErrorIn("calcRegionRegions(..)")
+                        << "Received from processor " << procI
+                        << " connection " << e
+                        << " where none of the elements is local to me."
+                        << abort(FatalError);
+                }
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Construct from components
+Foam::meshRefinement::meshRefinement
+(
+    fvMesh& mesh,
+    const scalar mergeDistance,
+    const bool overwrite,
+    const refinementSurfaces& surfaces,
+    const shellSurfaces& shells
+)
+:
+    mesh_(mesh),
+    mergeDistance_(mergeDistance),
+    overwrite_(overwrite),
+    oldInstance_(mesh.pointsInstance()),
+    surfaces_(surfaces),
+    shells_(shells),
+    meshCutter_
+    (
+        mesh,
+        labelIOList
+        (
+            IOobject
+            (
+                "cellLevel",
+                mesh_.facesInstance(),
+                fvMesh::meshSubDir,
+                mesh,
+                IOobject::READ_IF_PRESENT,
+                IOobject::NO_WRITE,
+                false
+            ),
+            labelList(mesh_.nCells(), 0)
+        ),
+        labelIOList
+        (
+            IOobject
+            (
+                "pointLevel",
+                mesh_.facesInstance(),
+                fvMesh::meshSubDir,
+                mesh,
+                IOobject::READ_IF_PRESENT,
+                IOobject::NO_WRITE,
+                false
+            ),
+            labelList(mesh_.nPoints(), 0)
+        ),
+        refinementHistory
+        (
+            IOobject
+            (
+                "refinementHistory",
+                mesh_.facesInstance(),
+                fvMesh::meshSubDir,
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            List<refinementHistory::splitCell8>(0),
+            labelList(0)
+        )   // no unrefinement
+    ),
+    surfaceIndex_
+    (
+        IOobject
+        (
+            "surfaceIndex",
+            mesh_.facesInstance(),
+            fvMesh::meshSubDir,
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        labelList(mesh_.nFaces(), -1)
+    ),
+    userFaceData_(0)
+{
+    // recalculate intersections for all faces
+    updateIntersections(identity(mesh_.nFaces()));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::meshRefinement::countHits() const
+{
+    // Stats on edges to test. Count proc faces only once.
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
+
+    label nHits = 0;
+
+    forAll(surfaceIndex_, faceI)
+    {
+        if (surfaceIndex_[faceI] >= 0 && isMasterFace.get(faceI) == 1)
+        {
+            nHits++;
+        }
+    }
+    return nHits;
+}
+
+
+// Determine distribution to move connected regions onto one processor.
+Foam::labelList Foam::meshRefinement::decomposeCombineRegions
+(
+    const scalarField& cellWeights,
+    const boolList& blockedFace,
+    const List<labelPair>& explicitConnections,
+    decompositionMethod& decomposer
+) const
+{
+    // Determine global regions, separated by blockedFaces
+    regionSplit globalRegion(mesh_, blockedFace, explicitConnections);
+
+    // Now globalRegion has global region per cell. Problem is that
+    // the region might span multiple domains so we want to get
+    // a "region master" per domain. Note that multi-processor
+    // regions can only occur on cells on coupled patches.
+    // Note: since the number of regions does not change by this the
+    // process can be seen as just a shift of a region onto a single
+    // processor.
+
+
+    // Global cell numbering engine
+    globalIndex globalCells(mesh_.nCells());
+
+
+    // Determine per coupled region the master cell (lowest numbered cell
+    // on lowest numbered processor)
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // (does not determine master for non-coupled=fully-local regions)
+
+    Map<label> coupledRegionToMaster(mesh_.nFaces()-mesh_.nInternalFaces());
+    getCoupledRegionMaster
+    (
+        globalCells,
+        blockedFace,
+        globalRegion,
+        coupledRegionToMaster
+    );
+
+    // Determine my regions
+    // ~~~~~~~~~~~~~~~~~~~~
+    // These are the fully local ones or the coupled ones of which I am master.
+
+    Map<label> globalToLocalRegion;
+    pointField localPoints;
+    scalarField localWeights;
+    calcLocalRegions
+    (
+        globalCells,
+        globalRegion,
+        coupledRegionToMaster,
+        cellWeights,
+
+        globalToLocalRegion,
+        localPoints,
+        localWeights
+    );
+
+
+
+    // Find distribution for regions
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList regionDistribution;
+
+    if (isA<geomDecomp>(decomposer))
+    {
+        regionDistribution = decomposer.decompose(localPoints, localWeights);
+    }
+    else
+    {
+        labelListList regionRegions;
+        calcRegionRegions
+        (
+            globalRegion,
+            globalToLocalRegion,
+            coupledRegionToMaster,
+
+            regionRegions
+        );
+
+        regionDistribution = decomposer.decompose
+        (
+            regionRegions,
+            localPoints,
+            localWeights
+        );
+    }
+
+
+
+    // Convert region-based decomposition back to cell-based one
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Transfer destination processor back to all. Use global reduce for now.
+    Map<label> regionToDist(coupledRegionToMaster.size());
+    forAllConstIter(Map<label>, coupledRegionToMaster, iter)
+    {
+        label region = iter.key();
+
+        Map<label>::const_iterator regionFnd = globalToLocalRegion.find(region);
+
+        if (regionFnd != globalToLocalRegion.end())
+        {
+            // Master cell is local. Store my distribution.
+            regionToDist.insert(iter.key(), regionDistribution[regionFnd()]);
+        }
+        else
+        {
+            // Master cell is not on this processor. Make sure it is overridden.
+            regionToDist.insert(iter.key(), labelMax);
+        }
+    }
+    Pstream::mapCombineGather(regionToDist, minEqOp<label>());
+    Pstream::mapCombineScatter(regionToDist);
+
+
+    // Determine destination for all cells
+    labelList distribution(mesh_.nCells());
+
+    forAll(globalRegion, cellI)
+    {
+        Map<label>::const_iterator fndRegion =
+            regionToDist.find(globalRegion[cellI]);
+
+        if (fndRegion != regionToDist.end())
+        {
+            distribution[cellI] = fndRegion();
+        }
+        else
+        {
+            // region is local to the processor.
+            label localRegionI = globalToLocalRegion[globalRegion[cellI]];
+
+            distribution[cellI] = regionDistribution[localRegionI];
+        }
+    }
+
+    return distribution;
+}
+
+
+Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
+(
+    const bool keepZoneFaces,
+    const bool keepBaffles,
+    const scalarField& cellWeights,
+    decompositionMethod& decomposer,
+    fvMeshDistribute& distributor
+)
+{
+    autoPtr<mapDistributePolyMesh> map;
+
+    if (Pstream::parRun())
+    {
+        //if (debug_)
+        //{
+        //    const_cast<Time&>(mesh_.time())++;
+        //}
+
+        // Wanted distribution
+        labelList distribution;
+
+        if (keepZoneFaces || keepBaffles)
+        {
+            // Faces where owner and neighbour are not 'connected' so can
+            // go to different processors.
+            boolList blockedFace(mesh_.nFaces(), true);
+            label nUnblocked = 0;
+            // Pairs of baffles
+            List<labelPair> couples;
+
+            if (keepZoneFaces)
+            {
+                // Determine decomposition to keep/move surface zones
+                // on one processor. The reason is that snapping will make these
+                // into baffles, move and convert them back so if they were
+                // proc boundaries after baffling&moving the points might be no
+                // longer snychronised so recoupling will fail. To prevent this
+                // keep owner&neighbour of such a surface zone on the same
+                // processor.
+
+                const wordList& fzNames = surfaces().faceZoneNames();
+                const faceZoneMesh& fZones = mesh_.faceZones();
+
+                // Get faces whose owner and neighbour should stay together,
+                // i.e. they are not 'blocked'.
+
+                forAll(fzNames, surfI)
+                {
+                    if (fzNames[surfI].size())
+                    {
+                        // Get zone
+                        label zoneI = fZones.findZoneID(fzNames[surfI]);
+
+                        const faceZone& fZone = fZones[zoneI];
+
+                        forAll(fZone, i)
+                        {
+                            if (blockedFace[fZone[i]])
+                            {
+                                blockedFace[fZone[i]] = false;
+                                nUnblocked++;
+                            }
+                        }
+                    }
+                }
+
+
+                // If the faceZones are not synchronised the blockedFace
+                // might not be synchronised. If you are sure the faceZones
+                // are synchronised remove below check.
+                syncTools::syncFaceList
+                (
+                    mesh_,
+                    blockedFace,
+                    andEqOp<bool>(),    // combine operator
+                    false               // separation
+                );
+            }
+            reduce(nUnblocked, sumOp<label>());
+
+            if (keepZoneFaces)
+            {
+                Info<< "Found " << nUnblocked
+                    << " zoned faces to keep together." << endl;
+            }
+
+            if (keepBaffles)
+            {
+                // Get boundary baffles that need to stay together.
+                couples = getDuplicateFaces   // all baffles
+                (
+                    identity(mesh_.nFaces()-mesh_.nInternalFaces())
+                   +mesh_.nInternalFaces()
+                );
+            }
+            label nCouples = returnReduce(couples.size(), sumOp<label>());
+
+            if (keepBaffles)
+            {
+                Info<< "Found " << nCouples << " baffles to keep together."
+                    << endl;
+            }
+
+            if (nUnblocked > 0 || nCouples > 0)
+            {
+                Info<< "Applying special decomposition to keep baffles"
+                    << " and zoned faces together." << endl;
+
+                distribution = decomposeCombineRegions
+                (
+                    cellWeights,
+                    blockedFace,
+                    couples,
+                    decomposer
+                );
+
+                labelList nProcCells(distributor.countCells(distribution));
+                Pstream::listCombineGather(nProcCells, plusEqOp<label>());
+                Pstream::listCombineScatter(nProcCells);
+
+                Info<< "Calculated decomposition:" << endl;
+                forAll(nProcCells, procI)
+                {
+                    Info<< "    " << procI << '\t' << nProcCells[procI] << endl;
+                }
+                Info<< endl;
+            }
+            else
+            {
+                // Normal decomposition
+                distribution = decomposer.decompose
+                (
+                    mesh_.cellCentres(),
+                    cellWeights
+                );
+            }
+        }
+        else
+        {
+            // Normal decomposition
+            distribution = decomposer.decompose
+            (
+                mesh_.cellCentres(),
+                cellWeights
+            );
+        }
+
+        if (debug)
+        {
+            labelList nProcCells(distributor.countCells(distribution));
+            Pout<< "Wanted distribution:" << nProcCells << endl;
+
+            Pstream::listCombineGather(nProcCells, plusEqOp<label>());
+            Pstream::listCombineScatter(nProcCells);
+
+            Pout<< "Wanted resulting decomposition:" << endl;
+            forAll(nProcCells, procI)
+            {
+                Pout<< "    " << procI << '\t' << nProcCells[procI] << endl;
+            }
+            Pout<< endl;
+        }
+        // Do actual sending/receiving of mesh
+        map = distributor.distribute(distribution);
+
+        // Update numbering of meshRefiner
+        distribute(map);
+    }
+    return map;
+}
+
+
+// Helper function to get intersected faces
+Foam::labelList Foam::meshRefinement::intersectedFaces() const
+{
+    label nBoundaryFaces = 0;
+
+    forAll(surfaceIndex_, faceI)
+    {
+        if (surfaceIndex_[faceI] != -1)
+        {
+            nBoundaryFaces++;
+        }
+    }
+
+    labelList surfaceFaces(nBoundaryFaces);
+    nBoundaryFaces = 0;
+
+    forAll(surfaceIndex_, faceI)
+    {
+        if (surfaceIndex_[faceI] != -1)
+        {
+            surfaceFaces[nBoundaryFaces++] = faceI;
+        }
+    }
+    return surfaceFaces;
+}
+
+
+// Helper function to get points used by faces
+Foam::labelList Foam::meshRefinement::intersectedPoints() const
+{
+    const faceList& faces = mesh_.faces();
+
+    // Mark all points on faces that will become baffles
+    PackedBoolList isBoundaryPoint(mesh_.nPoints());
+    label nBoundaryPoints = 0;
+
+    forAll(surfaceIndex_, faceI)
+    {
+        if (surfaceIndex_[faceI] != -1)
+        {
+            const face& f = faces[faceI];
+
+            forAll(f, fp)
+            {
+                if (isBoundaryPoint.set(f[fp], 1u))
+                {
+                    nBoundaryPoints++;
+                }
+            }
+        }
+    }
+
+    //// Insert all meshed patches.
+    //labelList adaptPatchIDs(meshedPatches());
+    //forAll(adaptPatchIDs, i)
+    //{
+    //    label patchI = adaptPatchIDs[i];
+    //
+    //    if (patchI != -1)
+    //    {
+    //        const polyPatch& pp = mesh_.boundaryMesh()[patchI];
+    //
+    //        label faceI = pp.start();
+    //
+    //        forAll(pp, i)
+    //        {
+    //            const face& f = faces[faceI];
+    //
+    //            forAll(f, fp)
+    //            {
+    //                if (isBoundaryPoint.set(f[fp], 1u))
+    //                    nBoundaryPoints++;
+    //                }
+    //            }
+    //            faceI++;
+    //        }
+    //    }
+    //}
+
+
+    // Pack
+    labelList boundaryPoints(nBoundaryPoints);
+    nBoundaryPoints = 0;
+    forAll(isBoundaryPoint, pointI)
+    {
+        if (isBoundaryPoint.get(pointI) == 1u)
+        {
+            boundaryPoints[nBoundaryPoints++] = pointI;
+        }
+    }
+
+    return boundaryPoints;
+}
+
+
+//- Create patch from set of patches
+Foam::autoPtr<Foam::indirectPrimitivePatch> Foam::meshRefinement::makePatch
+(
+    const polyMesh& mesh,
+    const labelList& patchIDs
+)
+{
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    // Count faces.
+    label nFaces = 0;
+
+    forAll(patchIDs, i)
+    {
+        const polyPatch& pp = patches[patchIDs[i]];
+
+        nFaces += pp.size();
+    }
+
+    // Collect faces.
+    labelList addressing(nFaces);
+    nFaces = 0;
+
+    forAll(patchIDs, i)
+    {
+        const polyPatch& pp = patches[patchIDs[i]];
+
+        label meshFaceI = pp.start();
+
+        forAll(pp, i)
+        {
+            addressing[nFaces++] = meshFaceI++;
+        }
+    }
+
+    return autoPtr<indirectPrimitivePatch>
+    (
+        new indirectPrimitivePatch
+        (
+            IndirectList<face>(mesh.faces(), addressing),
+            mesh.points()
+        )
+    );
+}
+
+
+// Construct pointVectorField with correct boundary conditions
+Foam::tmp<Foam::pointVectorField> Foam::meshRefinement::makeDisplacementField
+(
+    const pointMesh& pMesh,
+    const labelList& adaptPatchIDs
+)
+{
+    const polyMesh& mesh = pMesh();
+
+    // Construct displacement field.
+    const pointBoundaryMesh& pointPatches = pMesh.boundary();
+
+    wordList patchFieldTypes
+    (
+        pointPatches.size(),
+        slipPointPatchVectorField::typeName
+    );
+
+    forAll(adaptPatchIDs, i)
+    {
+        patchFieldTypes[adaptPatchIDs[i]] =
+            fixedValuePointPatchVectorField::typeName;
+    }
+
+    forAll(pointPatches, patchI)
+    {
+        if (isA<globalPointPatch>(pointPatches[patchI]))
+        {
+            patchFieldTypes[patchI] = globalPointPatchVectorField::typeName;
+        }
+        else if (isA<processorPointPatch>(pointPatches[patchI]))
+        {
+            patchFieldTypes[patchI] = calculatedPointPatchVectorField::typeName;
+        }
+    }
+
+    tmp<pointVectorField> tfld
+    (
+        new pointVectorField
+        (
+            IOobject
+            (
+                "pointDisplacement",
+                mesh.time().timeName(), //timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            pMesh,
+            dimensionedVector("displacement", dimLength, vector::zero),
+            patchFieldTypes
+        )
+    );
+
+    return tfld;
+}
+
+
+void Foam::meshRefinement::checkCoupledFaceZones(const polyMesh& mesh)
+{
+    const faceZoneMesh& fZones = mesh.faceZones();
+
+    // Check any zones are present anywhere and in same order
+
+    {
+        List<wordList> zoneNames(Pstream::nProcs());
+        zoneNames[Pstream::myProcNo()] = fZones.names();
+        Pstream::gatherList(zoneNames);
+        Pstream::scatterList(zoneNames);
+        // All have same data now. Check.
+        forAll(zoneNames, procI)
+        {
+            if (procI != Pstream::myProcNo())
+            {
+                if (zoneNames[procI] != zoneNames[Pstream::myProcNo()])
+                {
+                    FatalErrorIn
+                    (
+                        "meshRefinement::checkCoupledFaceZones(const polyMesh&)"
+                    )   << "faceZones are not synchronised on processors." << nl
+                        << "Processor " << procI << " has faceZones "
+                        << zoneNames[procI] << nl
+                        << "Processor " << Pstream::myProcNo()
+                        << " has faceZones "
+                        << zoneNames[Pstream::myProcNo()] << nl
+                        << exit(FatalError);
+                }
+            }
+        }
+    }
+
+    // Check that coupled faces are present on both sides.
+
+    labelList faceToZone(mesh.nFaces()-mesh.nInternalFaces(), -1);
+
+    forAll(fZones, zoneI)
+    {
+        const faceZone& fZone = fZones[zoneI];
+
+        forAll(fZone, i)
+        {
+            label bFaceI = fZone[i]-mesh.nInternalFaces();
+
+            if (bFaceI >= 0)
+            {
+                if (faceToZone[bFaceI] == -1)
+                {
+                    faceToZone[bFaceI] = zoneI;
+                }
+                else if (faceToZone[bFaceI] == zoneI)
+                {
+                    FatalErrorIn
+                    (
+                        "meshRefinement::checkCoupledFaceZones(const polyMesh&)"
+                    )   << "Face " << fZone[i] << " in zone "
+                        << fZone.name()
+                        << " is twice in zone!"
+                        << abort(FatalError);
+                }
+                else
+                {
+                    FatalErrorIn
+                    (
+                        "meshRefinement::checkCoupledFaceZones(const polyMesh&)"
+                    )   << "Face " << fZone[i] << " in zone "
+                        << fZone.name()
+                        << " is also in zone "
+                        << fZones[faceToZone[bFaceI]].name()
+                        << abort(FatalError);
+                }
+            }
+        }
+    }
+
+    labelList neiFaceToZone(faceToZone);
+    syncTools::swapBoundaryFaceList(mesh, neiFaceToZone, false);
+
+    forAll(faceToZone, i)
+    {
+        if (faceToZone[i] != neiFaceToZone[i])
+        {
+            FatalErrorIn
+            (
+                "meshRefinement::checkCoupledFaceZones(const polyMesh&)"
+            )   << "Face " << mesh.nInternalFaces()+i
+                << " is in zone " << faceToZone[i]
+                << ", its coupled face is in zone " << neiFaceToZone[i]
+                << abort(FatalError);
+        }
+    }
+}
+
+
+// Adds patch if not yet there. Returns patchID.
+Foam::label Foam::meshRefinement::addPatch
+(
+    fvMesh& mesh,
+    const word& patchName,
+    const word& patchType
+)
+{
+    polyBoundaryMesh& polyPatches =
+        const_cast<polyBoundaryMesh&>(mesh.boundaryMesh());
+
+    label patchI = polyPatches.findPatchID(patchName);
+    if (patchI != -1)
+    {
+        if (polyPatches[patchI].type() == patchType)
+        {
+            // Already there
+            return patchI;
+        }
+        //else
+        //{
+        //    FatalErrorIn
+        //    (
+        //        "meshRefinement::addPatch(fvMesh&, const word&, const word&)"
+        //    )   << "Patch " << patchName << " already exists but with type "
+        //        << patchType << nl
+        //        << "Current patch names:" << polyPatches.names()
+        //        << exit(FatalError);
+        //}
+    }
+
+
+    label insertPatchI = polyPatches.size();
+    label startFaceI = mesh.nFaces();
+
+    forAll(polyPatches, patchI)
+    {
+        const polyPatch& pp = polyPatches[patchI];
+
+        if (isA<processorPolyPatch>(pp))
+        {
+            insertPatchI = patchI;
+            startFaceI = pp.start();
+            break;
+        }
+    }
+
+
+    // Below is all quite a hack. Feel free to change once there is a better
+    // mechanism to insert and reorder patches.
+
+    // Clear local fields and e.g. polyMesh parallelInfo.
+    mesh.clearOut();
+
+    label sz = polyPatches.size();
+
+    fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh.boundary());
+
+    // Add polyPatch at the end
+    polyPatches.setSize(sz + 1);
+    polyPatches.set
+    (
+        sz,
+        polyPatch::New
+        (
+            patchType,
+            patchName,
+            0,              // size
+            startFaceI,
+            insertPatchI,
+            polyPatches
+        )
+    );
+    fvPatches.setSize(sz+1);
+    fvPatches.set
+    (
+        sz,
+        fvPatch::New
+        (
+            polyPatches[sz],  // point to newly added polyPatch
+            mesh.boundary()
+        )
+    );
+
+    addPatchFields<volScalarField>
+    (
+        mesh,
+        calculatedFvPatchField<scalar>::typeName
+    );
+    addPatchFields<volVectorField>
+    (
+        mesh,
+        calculatedFvPatchField<vector>::typeName
+    );
+    addPatchFields<volSphericalTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<sphericalTensor>::typeName
+    );
+    addPatchFields<volSymmTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<symmTensor>::typeName
+    );
+    addPatchFields<volTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<tensor>::typeName
+    );
+
+    // Surface fields
+
+    addPatchFields<surfaceScalarField>
+    (
+        mesh,
+        calculatedFvPatchField<scalar>::typeName
+    );
+    addPatchFields<surfaceVectorField>
+    (
+        mesh,
+        calculatedFvPatchField<vector>::typeName
+    );
+    addPatchFields<surfaceSphericalTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<sphericalTensor>::typeName
+    );
+    addPatchFields<surfaceSymmTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<symmTensor>::typeName
+    );
+    addPatchFields<surfaceTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<tensor>::typeName
+    );
+
+    // Create reordering list
+    // patches before insert position stay as is
+    labelList oldToNew(sz+1);
+    for (label i = 0; i < insertPatchI; i++)
+    {
+        oldToNew[i] = i;
+    }
+    // patches after insert position move one up
+    for (label i = insertPatchI; i < sz; i++)
+    {
+        oldToNew[i] = i+1;
+    }
+    // appended patch gets moved to insert position
+    oldToNew[sz] = insertPatchI;
+
+    // Shuffle into place
+    polyPatches.reorder(oldToNew);
+    fvPatches.reorder(oldToNew);
+
+    reorderPatchFields<volScalarField>(mesh, oldToNew);
+    reorderPatchFields<volVectorField>(mesh, oldToNew);
+    reorderPatchFields<volSphericalTensorField>(mesh, oldToNew);
+    reorderPatchFields<volSymmTensorField>(mesh, oldToNew);
+    reorderPatchFields<volTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceScalarField>(mesh, oldToNew);
+    reorderPatchFields<surfaceVectorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceSphericalTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceSymmTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceTensorField>(mesh, oldToNew);
+
+    return insertPatchI;
+}
+
+
+Foam::label Foam::meshRefinement::addMeshedPatch
+(
+    const word& name,
+    const word& type
+)
+{
+    label meshedI = findIndex(meshedPatches_, name);
+
+    if (meshedI != -1)
+    {
+        // Already there. Get corresponding polypatch
+        return mesh_.boundaryMesh().findPatchID(name);
+    }
+    else
+    {
+        // Add patch
+        label patchI = addPatch(mesh_, name, type);
+
+        // Store
+        label sz = meshedPatches_.size();
+        meshedPatches_.setSize(sz+1);
+        meshedPatches_[sz] = name;
+
+        return patchI;
+    }
+}
+
+
+Foam::labelList Foam::meshRefinement::meshedPatches() const
+{
+    labelList patchIDs(meshedPatches_.size());
+    forAll(meshedPatches_, i)
+    {
+        patchIDs[i] = mesh_.boundaryMesh().findPatchID(meshedPatches_[i]);
+
+        if (patchIDs[i] == -1)
+        {
+            FatalErrorIn("meshRefinement::meshedPatches() const")
+                << "Problem : did not find patch " << meshedPatches_[i]
+                << abort(FatalError);
+        }
+    }
+
+    return patchIDs;
+}
+
+
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMeshRegions
+(
+    const point& keepPoint
+)
+{
+    // Determine connected regions. regionSplit is the labelList with the
+    // region per cell.
+    regionSplit cellRegion(mesh_);
+
+    label regionI = -1;
+
+    label cellI = mesh_.findCell(keepPoint);
+
+    if (cellI != -1)
+    {
+        regionI = cellRegion[cellI];
+    }
+
+    reduce(regionI, maxOp<label>());
+
+    if (regionI == -1)
+    {
+        FatalErrorIn
+        (
+            "meshRefinement::splitMeshRegions(const point&)"
+        )   << "Point " << keepPoint
+            << " is not inside the mesh." << nl
+            << "Bounding box of the mesh:" << mesh_.globalData().bb()
+            << exit(FatalError);
+    }
+
+    // Subset
+    // ~~~~~~
+
+    // Get cells to remove
+    DynamicList<label> cellsToRemove(mesh_.nCells());
+    forAll(cellRegion, cellI)
+    {
+        if (cellRegion[cellI] != regionI)
+        {
+            cellsToRemove.append(cellI);
+        }
+    }
+    cellsToRemove.shrink();
+
+    label nCellsToKeep = mesh_.nCells() - cellsToRemove.size();
+    reduce(nCellsToKeep, sumOp<label>());
+
+    Info<< "Keeping all cells in region " << regionI
+        << " containing point " << keepPoint << endl
+        << "Selected for keeping : "
+        << nCellsToKeep
+        << " cells." << endl;
+
+
+    // Remove cells
+    removeCells cellRemover(mesh_);
+
+    labelList exposedFaces(cellRemover.getExposedFaces(cellsToRemove));
+
+    if (exposedFaces.size())
+    {
+        FatalErrorIn
+        (
+            "meshRefinement::splitMeshRegions(const point&)"
+        )   << "Removing non-reachable cells should only expose boundary faces"
+            << nl
+            << "ExposedFaces:" << exposedFaces << abort(FatalError);
+    }
+
+    return doRemoveCells
+    (
+        cellsToRemove,
+        exposedFaces,
+        labelList(exposedFaces.size(),-1),  // irrelevant since 0 size.
+        cellRemover
+    );
+}
+
+
+void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
+{
+    // mesh_ already distributed; distribute my member data
+
+    // surfaceQueries_ ok.
+
+    // refinement
+    meshCutter_.distribute(map);
+
+    // surfaceIndex is face data.
+    map.distributeFaceData(surfaceIndex_);
+
+    // maintainedFaces are indices of faces.
+    forAll(userFaceData_, i)
+    {
+        map.distributeFaceData(userFaceData_[i].second());
+    }
+
+    // Redistribute surface and any fields on it.
+    {
+        Random rndGen(653213);
+
+        // Get local mesh bounding box. Single box for now.
+        List<treeBoundBox> meshBb(1);
+        treeBoundBox& bb = meshBb[0];
+        bb = treeBoundBox(mesh_.points());
+        bb = bb.extend(rndGen, 1E-4);
+
+        // Distribute all geometry (so refinementSurfaces and shellSurfaces)
+        searchableSurfaces& geometry =
+            const_cast<searchableSurfaces&>(surfaces_.geometry());
+
+        forAll(geometry, i)
+        {
+            autoPtr<mapDistribute> faceMap;
+            autoPtr<mapDistribute> pointMap;
+            geometry[i].distribute
+            (
+                meshBb,
+                false,          // do not keep outside triangles
+                faceMap,
+                pointMap
+            );
+
+            if (faceMap.valid())
+            {
+                // (ab)use the instance() to signal current modification time
+                geometry[i].instance() = geometry[i].time().timeName();
+            }
+
+            faceMap.clear();
+            pointMap.clear();
+        }
+    }
+}
+
+
+void Foam::meshRefinement::updateMesh
+(
+    const mapPolyMesh& map,
+    const labelList& changedFaces
+)
+{
+    Map<label> dummyMap(0);
+
+    updateMesh(map, changedFaces, dummyMap, dummyMap, dummyMap);
+}
+
+
+void Foam::meshRefinement::storeData
+(
+    const labelList& pointsToStore,
+    const labelList& facesToStore,
+    const labelList& cellsToStore
+)
+{
+    // For now only meshCutter has storable/retrievable data.
+    meshCutter_.storeData
+    (
+        pointsToStore,
+        facesToStore,
+        cellsToStore
+    );
+}
+
+
+void Foam::meshRefinement::updateMesh
+(
+    const mapPolyMesh& map,
+    const labelList& changedFaces,
+    const Map<label>& pointsToRestore,
+    const Map<label>& facesToRestore,
+    const Map<label>& cellsToRestore
+)
+{
+    // For now only meshCutter has storable/retrievable data.
+
+    // Update numbering of cells/vertices.
+    meshCutter_.updateMesh
+    (
+        map,
+        pointsToRestore,
+        facesToRestore,
+        cellsToRestore
+    );
+
+    // Update surfaceIndex
+    updateList(map.faceMap(), -1, surfaceIndex_);
+
+    // Update cached intersection information
+    updateIntersections(changedFaces);
+
+    // Update maintained faces
+    forAll(userFaceData_, i)
+    {
+        labelList& data = userFaceData_[i].second();
+
+        if (userFaceData_[i].first() == KEEPALL)
+        {
+            // extend list with face-from-face data
+            updateList(map.faceMap(), -1, data);
+        }
+        else if (userFaceData_[i].first() == MASTERONLY)
+        {
+            // keep master only
+            labelList newFaceData(map.faceMap().size(), -1);
+
+            forAll(newFaceData, faceI)
+            {
+                label oldFaceI = map.faceMap()[faceI];
+
+                if (oldFaceI >= 0 && map.reverseFaceMap()[oldFaceI] == faceI)
+                {
+                    newFaceData[faceI] = data[oldFaceI];
+                }
+            }
+            data.transfer(newFaceData);
+        }
+        else
+        {
+            // remove any face that has been refined i.e. referenced more than
+            // once.
+
+            // 1. Determine all old faces that get referenced more than once.
+            // These get marked with -1 in reverseFaceMap
+            labelList reverseFaceMap(map.reverseFaceMap());
+
+            forAll(map.faceMap(), faceI)
+            {
+                label oldFaceI = map.faceMap()[faceI];
+
+                if (oldFaceI >= 0)
+                {
+                    if (reverseFaceMap[oldFaceI] != faceI)
+                    {
+                        // faceI is slave face. Mark old face.
+                        reverseFaceMap[oldFaceI] = -1;
+                    }
+                }
+            }
+
+            // 2. Map only faces with intact reverseFaceMap
+            labelList newFaceData(map.faceMap().size(), -1);
+            forAll(newFaceData, faceI)
+            {
+                label oldFaceI = map.faceMap()[faceI];
+
+                if (oldFaceI >= 0)
+                {
+                    if (reverseFaceMap[oldFaceI] == faceI)
+                    {
+                        newFaceData[faceI] = data[oldFaceI];
+                    }
+                }
+            }
+            data.transfer(newFaceData);
+        }
+    }
+}
+
+
+bool Foam::meshRefinement::write() const
+{
+    bool writeOk =
+        mesh_.write()
+     && meshCutter_.write()
+     && surfaceIndex_.write();
+
+
+    // Make sure that any distributed surfaces (so ones which probably have
+    // been changed) get written as well.
+    // Note: should ideally have some 'modified' flag to say whether it
+    // has been changed or not.
+    searchableSurfaces& geometry =
+        const_cast<searchableSurfaces&>(surfaces_.geometry());
+
+    forAll(geometry, i)
+    {
+        searchableSurface& s = geometry[i];
+
+        // Check if instance() of surface is not constant or system.
+        // Is good hint that surface is distributed.
+        if
+        (
+            s.instance() != s.time().system()
+         && s.instance() != s.time().caseSystem()
+         && s.instance() != s.time().constant()
+         && s.instance() != s.time().caseConstant()
+        )
+        {
+            // Make sure it gets written to current time, not constant.
+            s.instance() = s.time().timeName();
+            writeOk = writeOk && s.write();
+        }
+    }
+
+    return writeOk;
+}
+
+
+void Foam::meshRefinement::printMeshInfo(const bool debug, const string& msg)
+ const
+{
+    const globalMeshData& pData = mesh_.globalData();
+
+    if (debug)
+    {
+        Pout<< msg.c_str()
+            << " : cells(local):" << mesh_.nCells()
+            << "  faces(local):" << mesh_.nFaces()
+            << "  points(local):" << mesh_.nPoints()
+            << endl;
+    }
+    else
+    {
+        Info<< msg.c_str()
+            << " : cells:" << pData.nTotalCells()
+            << "  faces:" << pData.nTotalFaces()
+            << "  points:" << pData.nTotalPoints()
+            << endl;
+    }
+
+
+    //if (debug)
+    {
+        const labelList& cellLevel = meshCutter_.cellLevel();
+
+        labelList nCells(gMax(cellLevel)+1, 0);
+
+        forAll(cellLevel, cellI)
+        {
+            nCells[cellLevel[cellI]]++;
+        }
+
+        Pstream::listCombineGather(nCells, plusEqOp<label>());
+        Pstream::listCombineScatter(nCells);
+
+        Info<< "Cells per refinement level:" << endl;
+        forAll(nCells, levelI)
+        {
+            Info<< "    " << levelI << '\t' << nCells[levelI]
+                << endl;
+        }
+    }
+}
+
+
+//- Return either time().constant() or oldInstance
+Foam::word Foam::meshRefinement::timeName() const
+{
+    if (overwrite_ && mesh_.time().timeIndex() == 0)
+    {
+        return oldInstance_;
+    }
+    else
+    {
+        return mesh_.time().timeName();
+    }
+}
+
+
+void Foam::meshRefinement::dumpRefinementLevel() const
+{
+    volScalarField volRefLevel
+    (
+        IOobject
+        (
+            "cellLevel",
+            timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE,
+            false
+        ),
+        mesh_,
+        dimensionedScalar("zero", dimless, 0),
+        zeroGradientFvPatchScalarField::typeName
+    );
+
+    const labelList& cellLevel = meshCutter_.cellLevel();
+
+    forAll(volRefLevel, cellI)
+    {
+        volRefLevel[cellI] = cellLevel[cellI];
+    }
+
+    volRefLevel.write();
+
+
+    const pointMesh& pMesh = pointMesh::New(mesh_);
+
+    pointScalarField pointRefLevel
+    (
+        IOobject
+        (
+            "pointLevel",
+            timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        pMesh,
+        dimensionedScalar("zero", dimless, 0)
+    );
+
+    const labelList& pointLevel = meshCutter_.pointLevel();
+
+    forAll(pointRefLevel, pointI)
+    {
+        pointRefLevel[pointI] = pointLevel[pointI];
+    }
+
+    pointRefLevel.write();
+}
+
+
+void Foam::meshRefinement::dumpIntersections(const fileName& prefix) const
+{
+    {
+        const pointField& cellCentres = mesh_.cellCentres();
+
+        OFstream str(prefix + "_edges.obj");
+        label vertI = 0;
+        Pout<< "meshRefinement::dumpIntersections :"
+            << " Writing cellcentre-cellcentre intersections to file "
+            << str.name() << endl;
+
+
+        // Redo all intersections
+        // ~~~~~~~~~~~~~~~~~~~~~~
+
+        // Get boundary face centre and level. Coupled aware.
+        labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+        pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+        calcNeighbourData(neiLevel, neiCc);
+
+        labelList intersectionFaces(intersectedFaces());
+
+        // Collect segments we want to test for
+        pointField start(intersectionFaces.size());
+        pointField end(intersectionFaces.size());
+
+        forAll(intersectionFaces, i)
+        {
+            label faceI = intersectionFaces[i];
+            start[i] = cellCentres[mesh_.faceOwner()[faceI]];
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                end[i] = cellCentres[mesh_.faceNeighbour()[faceI]];
+            }
+            else
+            {
+                end[i] = neiCc[faceI-mesh_.nInternalFaces()];
+            }
+        }
+
+        // Do tests in one go
+        labelList surfaceHit;
+        List<pointIndexHit> surfaceHitInfo;
+        surfaces_.findAnyIntersection
+        (
+            start,
+            end,
+            surfaceHit,
+            surfaceHitInfo
+        );
+
+        forAll(intersectionFaces, i)
+        {
+            if (surfaceHit[i] != -1)
+            {
+                meshTools::writeOBJ(str, start[i]);
+                vertI++;
+                meshTools::writeOBJ(str, surfaceHitInfo[i].hitPoint());
+                vertI++;
+                meshTools::writeOBJ(str, end[i]);
+                vertI++;
+                str << "l " << vertI-2 << ' ' << vertI-1 << nl
+                    << "l " << vertI-1 << ' ' << vertI << nl;
+            }
+        }
+    }
+
+    // Convert to vtk format
+    string cmd
+    (
+        "objToVTK " + prefix + "_edges.obj " + prefix + "_edges.vtk > /dev/null"
+    );
+    system(cmd.c_str());
+
+    Pout<< endl;
+}
+
+
+void Foam::meshRefinement::write
+(
+    const label flag,
+    const fileName& prefix
+) const
+{
+    if (flag & MESH)
+    {
+        write();
+    }
+    if (flag & SCALARLEVELS)
+    {
+        dumpRefinementLevel();
+    }
+    if (flag & OBJINTERSECTIONS && prefix.size())
+    {
+        dumpIntersections(prefix);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
new file mode 100644
index 000000000..cf9350d1f
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -0,0 +1,841 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::meshRefinement
+
+Description
+    Helper class which maintains intersections of (changing) mesh with
+    (static) surfaces.
+
+    Maintains
+    - per face any intersections of the cc-cc segment with any of the surfaces
+
+SourceFiles
+    meshRefinement.C
+    meshRefinementBaffles.C
+    meshRefinementMerge.C
+    meshRefinementProblemCells.C
+    meshRefinementRefine.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef meshRefinement_H
+#define meshRefinement_H
+
+#include "hexRef8.H"
+#include "mapPolyMesh.H"
+#include "autoPtr.H"
+#include "labelPair.H"
+#include "indirectPrimitivePatch.H"
+#include "pointFieldsFwd.H"
+#include "Tuple2.H"
+#include "pointIndexHit.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Class forward declarations
+class fvMesh;
+class mapDistributePolyMesh;
+class decompositionMethod;
+class refinementSurfaces;
+class shellSurfaces;
+class removeCells;
+class featureEdgeMesh;
+class fvMeshDistribute;
+class searchableSurface;
+class regionSplit;
+class globalIndex;
+
+/*---------------------------------------------------------------------------*\
+                           Class meshRefinement Declaration
+\*---------------------------------------------------------------------------*/
+
+class meshRefinement
+{
+
+public:
+
+    // Public data types
+
+        //- Enumeration for debug dumping
+        enum writeFlag
+        {
+            MESH = 1,
+            SCALARLEVELS = 2,
+            OBJINTERSECTIONS = 4
+        };
+
+
+        //- Enumeration for how the userdata is to be mapped upon refinement.
+        enum mapType
+        {
+            MASTERONLY = 1, /*!< maintain master only */
+            KEEPALL = 2,    /*!< have slaves (upon refinement) from master */
+            REMOVE = 4      /*!< set value to -1 any face that was refined */
+        };
+
+
+private:
+
+    // Private data
+
+        //- Reference to mesh
+        fvMesh& mesh_;
+
+        //- tolerance used for sorting coordinates (used in 'less' routine)
+        const scalar mergeDistance_;
+
+        //- overwrite the mesh?
+        const bool overwrite_;
+
+        //- Instance of mesh upon construction. Used when in overwrite_ mode.
+        const word oldInstance_;
+
+        //- All surface-intersection interaction
+        const refinementSurfaces& surfaces_;
+
+        //- All shell-refinement interaction
+        const shellSurfaces& shells_;
+
+        //- refinement engine
+        hexRef8 meshCutter_;
+
+        //- per cc-cc vector the index of the surface hit
+        labelIOList surfaceIndex_;
+
+        //- user supplied face based data.
+        List<Tuple2<mapType, labelList> > userFaceData_;
+
+        //- Meshed patches - are treated differently. Stored as wordList since
+        //  order changes.
+        wordList meshedPatches_;
+
+
+    // Private Member Functions
+
+        //- Reorder list according to map.
+        template<class T>
+        static void updateList
+        (
+            const labelList& newToOld,
+            const T& nullValue,
+            List<T>& elems
+        );
+
+        //- Add patchfield of given type to all fields on mesh
+        template<class GeoField>
+        static void addPatchFields(fvMesh&, const word& patchFieldType);
+
+        //- Reorder patchfields of all fields on mesh
+        template<class GeoField>
+        static void reorderPatchFields(fvMesh&, const labelList& oldToNew);
+
+        //- Find out which faces have changed given cells (old mesh labels)
+        //  that were marked for refinement.
+        static labelList getChangedFaces
+        (
+            const mapPolyMesh&,
+            const labelList& oldCellsToRefine
+        );
+
+        //- Calculate coupled boundary end vector and refinement level
+        void calcNeighbourData
+        (
+            labelList& neiLevel,
+            pointField& neiCc
+        ) const;
+
+        //- Find any intersection of surface. Store in surfaceIndex_.
+        void updateIntersections(const labelList& changedFaces);
+
+        //- Remove cells. Put exposedFaces into exposedPatchIDs.
+        autoPtr<mapPolyMesh> doRemoveCells
+        (
+            const labelList& cellsToRemove,
+            const labelList& exposedFaces,
+            const labelList& exposedPatchIDs,
+            removeCells& cellRemover
+        );
+
+        // Get cells which are inside any closed surface. Note that
+        // all closed surfaces
+        // will have already been oriented to have keepPoint outside.
+        labelList getInsideCells(const word&) const;
+
+        // Do all to remove inside cells
+        autoPtr<mapPolyMesh> removeInsideCells
+        (
+            const string& msg,
+            const label exposedPatchI
+        );
+
+        // For decomposeCombineRegions
+
+            //- Used in decomposeCombineRegions. Given global region per cell
+            //  determines master processor/cell for regions straddling
+            //  procboundaries.
+            void getCoupledRegionMaster
+            (
+                const globalIndex& globalCells,
+                const boolList& blockedFace,
+                const regionSplit& globalRegion,
+                Map<label>& regionToMaster
+            ) const;
+
+            //- Determine regions that are local to me or coupled ones that
+            //  are owned by me. Determine representative location.
+            void calcLocalRegions
+            (
+                const globalIndex& globalCells,
+                const labelList& globalRegion,
+                const Map<label>& coupledRegionToMaster,
+                const scalarField& cellWeights,
+
+                Map<label>& globalToLocalRegion,
+                pointField& localPoints,
+                scalarField& localWeights
+            ) const;
+
+            //- Convert region into global index.
+            static label getShiftedRegion
+            (
+                const globalIndex& indexer,
+                const Map<label>& globalToLocalRegion,
+                const Map<label>& coupledRegionToShifted,
+                const label globalRegion
+            );
+
+            //- helper: add element if not in list. Linear search.
+            static void addUnique(const label, labelList&);
+
+            //- Calculate region connectivity. Major communication.
+            void calcRegionRegions
+            (
+                const labelList& globalRegion,
+                const Map<label>& globalToLocalRegion,
+                const Map<label>& coupledRegionToMaster,
+                labelListList& regionRegions
+            ) const;
+
+
+        // Refinement candidate selection
+
+            //- Mark cell for refinement (if not already marked). Return false
+            // if refinelimit hit. Keeps running count (in nRefine) of cells
+            // marked for refinement
+            static bool markForRefine
+            (
+                const label markValue,
+                const label nAllowRefine,
+                label& cellValue,
+                label& nRefine
+            );
+
+            //- Calculate list of cells to refine based on intersection of
+            //  features.
+            label markFeatureRefinement
+            (
+                const point& keepPoint,
+                const PtrList<featureEdgeMesh>& featureMeshes,
+                const labelList& featureLevels,
+                const label nAllowRefine,
+
+                labelList& refineCell,
+                label& nRefine
+            ) const;
+
+            //- Mark cells for refinement-shells based refinement.
+            label markInternalRefinement
+            (
+                const label nAllowRefine,
+                labelList& refineCell,
+                label& nRefine
+            ) const;
+
+            //- Collect faces that are intersected and whose neighbours aren't
+            //  yet marked  for refinement.
+            labelList getRefineCandidateFaces
+            (
+                const labelList& refineCell
+            ) const;
+
+            //- Mark cells for surface intersection based refinement.
+            label markSurfaceRefinement
+            (
+                const label nAllowRefine,
+                const labelList& neiLevel,
+                const pointField& neiCc,
+                labelList& refineCell,
+                label& nRefine
+            ) const;
+
+            //- Mark cell if local curvature > curvature or
+            //  markDifferingRegions = true and intersections with different
+            //  regions.
+            bool checkCurvature
+            (
+                const scalar curvature,
+                const label nAllowRefine,
+                const label surfaceLevel,
+                const vector& surfaceNormal,
+                const label cellI,
+                label& cellMaxLevel,
+                vector& cellMaxNormal,
+                labelList& refineCell,
+                label& nRefine
+            ) const;
+
+
+            //- Mark cells for surface curvature based refinement. Marks if
+            //  local curvature > curvature or if on different regions
+            //  (markDifferingRegions)
+            label markSurfaceCurvatureRefinement
+            (
+                const scalar curvature,
+                const label nAllowRefine,
+                const labelList& neiLevel,
+                const pointField& neiCc,
+                labelList& refineCell,
+                label& nRefine
+            ) const;
+
+        // Baffle handling
+
+            //- Determine patches for baffles
+            void getBafflePatches
+            (
+                const labelList& globalToPatch,
+                const labelList& neiLevel,
+                const pointField& neiCc,
+                labelList& ownPatch,
+                labelList& neiPatch
+            ) const;
+
+            //- Determine patch for baffle using some heuristic (and not
+            //  surface)
+            label getBafflePatch
+            (
+                const labelList& facePatch,
+                const label faceI
+            ) const;
+
+            //- Repatches external face or creates baffle for internal face
+            //  with user specified patches (might be different for both sides).
+            //  Returns label of added face.
+            label createBaffle
+            (
+                const label faceI,
+                const label ownPatch,
+                const label neiPatch,
+                directTopoChange& meshMod
+            ) const;
+
+        // Problem cell handling
+
+            //- Helper function to mark face as being on 'boundary'. Used by
+            //  markFacesOnProblemCells
+            void markBoundaryFace
+            (
+                const label faceI,
+                boolList& isBoundaryFace,
+                boolList& isBoundaryEdge,
+                boolList& isBoundaryPoint
+            ) const;
+
+            void findNearest
+            (
+                const labelList& meshFaces,
+                List<pointIndexHit>& nearestInfo,
+                labelList& nearestSurface,
+                labelList& nearestRegion,
+                vectorField& nearestNormal
+            ) const;
+
+            Map<label> findEdgeConnectedProblemCells
+            (
+                const scalarField& perpendicularAngle,
+                const labelList&
+            ) const;
+
+            bool isCollapsedFace
+            (
+                const pointField&,
+                const pointField& neiCc,
+                const scalar minFaceArea,
+                const scalar maxNonOrtho,
+                const label faceI
+            ) const;
+
+            bool isCollapsedCell
+            (
+                const pointField&,
+                const scalar volFraction,
+                const label cellI
+            ) const;
+
+            //- Returns list with for every internal face -1 or the patch
+            //  they should be baffled into. If removeEdgeConnectedCells is set
+            //  removes cells based on perpendicularAngle.
+            labelList markFacesOnProblemCells
+            (
+                const dictionary& motionDict,
+                const bool removeEdgeConnectedCells,
+                const scalarField& perpendicularAngle,
+                const labelList& globalToPatch
+            ) const;
+
+            ////- Initial test of marking faces using geometric information.
+            //labelList markFacesOnProblemCellsGeometric
+            //(
+            //    const dictionary& motionDict
+            //) const;
+
+
+        // Baffle merging
+
+            //- Extract those baffles (duplicate) faces that are on the edge
+            //  of a baffle region. These are candidates for merging.
+            List<labelPair> filterDuplicateFaces(const List<labelPair>&) const;
+
+
+        // Zone handling
+
+            //- Finds zone per cell for cells inside closed named surfaces.
+            //  (uses geometric test for insideness)
+            //  Adapts namedSurfaceIndex so all faces on boundary of cellZone
+            //  have corresponding faceZone.
+            void findCellZoneGeometric
+            (
+                const labelList& closedNamedSurfaces,
+                labelList& namedSurfaceIndex,
+                const labelList& surfaceToCellZone,
+                labelList& cellToZone
+            ) const;
+
+            //- Determines cell zone from cell region information.
+            bool calcRegionToZone
+            (
+                const label surfZoneI,
+                const label ownRegion,
+                const label neiRegion,
+
+                labelList& regionToCellZone
+            ) const;
+
+            //- Finds zone per cell. Uses topological walk with all faces
+            //  marked in namedSurfaceIndex regarded as blocked.
+            void findCellZoneTopo
+            (
+                const point& keepPoint,
+                const labelList& namedSurfaceIndex,
+                const labelList& surfaceToCellZone,
+                labelList& cellToZone
+            ) const;
+
+            void makeConsistentFaceIndex
+            (
+                const labelList& cellToZone,
+                labelList& namedSurfaceIndex
+            ) const;
+
+
+        //- Disallow default bitwise copy construct
+        meshRefinement(const meshRefinement&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const meshRefinement&);
+
+public:
+
+    //- Runtime type information
+    ClassName("meshRefinement");
+
+
+    // Constructors
+
+        //- Construct from components
+        meshRefinement
+        (
+            fvMesh& mesh,
+            const scalar mergeDistance,
+            const bool overwrite,
+            const refinementSurfaces&,
+            const shellSurfaces&
+        );
+
+
+    // Member Functions
+
+        // Access
+
+            //- reference to mesh
+            const fvMesh& mesh() const
+            {
+                return mesh_;
+            }
+            fvMesh& mesh()
+            {
+                return mesh_;
+            }
+
+            scalar mergeDistance() const
+            {
+                return mergeDistance_;
+            }
+
+            //- Overwrite the mesh?
+            bool overwrite() const
+            {
+                return overwrite_;
+            }
+
+            //- (points)instance of mesh upon construction
+            const word& oldInstance() const
+            {
+                return oldInstance_;
+            }
+
+            //- reference to surface search engines
+            const refinementSurfaces& surfaces() const
+            {
+                return surfaces_;
+            }
+
+            //- reference to refinement shells (regions)
+            const shellSurfaces& shells() const
+            {
+                return shells_;
+            }
+
+            //- reference to meshcutting engine
+            const hexRef8& meshCutter() const
+            {
+                return meshCutter_;
+            }
+
+            //- per start-end edge the index of the surface hit
+            const labelList& surfaceIndex() const
+            {
+                return surfaceIndex_;
+            }
+
+            labelList& surfaceIndex()
+            {
+                return surfaceIndex_;
+            }
+
+            //- Additional face data that is maintained across
+            //  topo changes. Every entry is a list over all faces.
+            //  Bit of a hack. Additional flag to say whether to maintain master
+            //  only (false) or increase set to account for face-from-face.
+            const List<Tuple2<mapType, labelList> >& userFaceData() const
+            {
+                return userFaceData_;
+            }
+
+            List<Tuple2<mapType, labelList> >& userFaceData()
+            {
+                return userFaceData_;
+            }
+
+
+        // Other
+
+            //- Count number of intersections (local)
+            label countHits() const;
+
+            //- Helper function to get decomposition such that all connected
+            //  regions get moved onto one processor. Used to prevent baffles
+            //  straddling processor boundaries. explicitConnections is to
+            //  keep pairs of non-coupled boundary faces together
+            //  (e.g. to keep baffles together)
+            labelList decomposeCombineRegions
+            (
+                const scalarField& cellWeights,
+                const boolList& blockedFace,
+                const List<labelPair>& explicitConnections,
+                decompositionMethod&
+            ) const;
+
+            //- Redecompose according to cell count
+            //  keepZoneFaces : find all faceZones from zoned surfaces and keep
+            //                  owner and neighbour together
+            //  keepBaffles   : find all baffles and keep them together
+            autoPtr<mapDistributePolyMesh> balance
+            (
+                const bool keepZoneFaces,
+                const bool keepBaffles,
+                const scalarField& cellWeights,
+                decompositionMethod& decomposer,
+                fvMeshDistribute& distributor
+            );
+
+            //- Get faces with intersection.
+            labelList intersectedFaces() const;
+
+            //- Get points on surfaces with intersection and boundary faces.
+            labelList intersectedPoints() const;
+
+            //- Create patch from set of patches
+            static autoPtr<indirectPrimitivePatch> makePatch
+            (
+                const polyMesh&,
+                const labelList&
+            );
+
+            //- Helper function to make a pointVectorField with correct
+            //  bcs for mesh movement:
+            //  - adaptPatchIDs         : fixedValue
+            //  - processor             : calculated (so free to move)
+            //  - cyclic/wedge/symmetry : slip
+            //  - other                 : slip
+            static tmp<pointVectorField> makeDisplacementField
+            (
+                const pointMesh& pMesh,
+                const labelList& adaptPatchIDs
+            );
+
+            //- Helper function: check that face zones are synced
+            static void checkCoupledFaceZones(const polyMesh&);
+
+
+        // Refinement
+
+            //- Calculate list of cells to refine.
+            labelList refineCandidates
+            (
+                const point& keepPoint,
+                const scalar curvature,
+
+                const PtrList<featureEdgeMesh>& featureMeshes,
+                const labelList& featureLevels,
+
+                const bool featureRefinement,
+                const bool internalRefinement,
+                const bool surfaceRefinement,
+                const bool curvatureRefinement,
+                const label maxGlobalCells,
+                const label maxLocalCells
+            ) const;
+
+            //- Refine some cells
+            autoPtr<mapPolyMesh> refine(const labelList& cellsToRefine);
+
+            //- Refine some cells and rebalance
+            autoPtr<mapDistributePolyMesh> refineAndBalance
+            (
+                const string& msg,
+                decompositionMethod& decomposer,
+                fvMeshDistribute& distributor,
+                const labelList& cellsToRefine,
+                const scalar maxLoadUnbalance
+            );
+
+            //- Balance before refining some cells
+            autoPtr<mapDistributePolyMesh> balanceAndRefine
+            (
+                const string& msg,
+                decompositionMethod& decomposer,
+                fvMeshDistribute& distributor,
+                const labelList& cellsToRefine,
+                const scalar maxLoadUnbalance
+            );
+
+
+        // Baffle handling
+
+            //- Split off unreachable areas of mesh.
+            void baffleAndSplitMesh
+            (
+                const bool handleSnapProblems,
+                const bool removeEdgeConnectedCells,
+                const scalarField& perpendicularAngle,
+                const bool mergeFreeStanding,
+                const dictionary& motionDict,
+                Time& runTime,
+                const labelList& globalToPatch,
+                const point& keepPoint
+            );
+
+            //- Split off (with optional buffer layers) unreachable areas
+            //  of mesh. Does not introduce baffles.
+            autoPtr<mapPolyMesh> splitMesh
+            (
+                const label nBufferLayers,
+                const labelList& globalToPatch,
+                const point& keepPoint
+            );
+
+            //- Find boundary points that connect to more than one cell
+            //  region and split them.
+            autoPtr<mapPolyMesh> dupNonManifoldPoints();
+
+            //- Create baffle for every internal face where ownPatch != -1.
+            //  External faces get repatched according to ownPatch (neiPatch
+            //  should be -1 for these)
+            autoPtr<mapPolyMesh> createBaffles
+            (
+                const labelList& ownPatch,
+                const labelList& neiPatch
+            );
+
+            //- Return a list of coupled face pairs, i.e. faces that
+            //  use the same vertices.
+            List<labelPair> getDuplicateFaces(const labelList& testFaces) const;
+
+            //- Merge baffles. Gets pairs of faces.
+            autoPtr<mapPolyMesh> mergeBaffles(const List<labelPair>&);
+
+            //- Put faces/cells into zones according to surface specification.
+            //  Returns null if no zone surfaces present. Region containing
+            //  the keepPoint will not be put into a cellZone.
+            autoPtr<mapPolyMesh> zonify
+            (
+                const point& keepPoint,
+                const bool allowFreeStandingZoneFaces
+            );
+
+
+        // Other topo changes
+
+            //- Helper:add patch to mesh. Update all registered fields.
+            //  Use addMeshedPatch to add patches originating from surfaces.
+            static label addPatch(fvMesh&, const word& name, const word& type);
+
+            //- Add patch originating from meshing. Update meshedPatches_.
+            label addMeshedPatch(const word& name, const word& type);
+
+            //- Get patchIDs for patches added in addMeshedPatch.
+            labelList meshedPatches() const;
+
+            //- Split mesh. Keep part containing point.
+            autoPtr<mapPolyMesh> splitMeshRegions(const point& keepPoint);
+
+            //- Update local numbering for mesh redistribution
+            void distribute(const mapDistributePolyMesh&);
+
+            //- Update for external change to mesh. changedFaces are in new mesh
+            //  face labels.
+            void updateMesh
+            (
+                const mapPolyMesh&,
+                const labelList& changedFaces
+            );
+
+
+            // Restoring : is where other processes delete and reinsert data.
+
+                //- Signal points/face/cells for which to store data
+                void storeData
+                (
+                    const labelList& pointsToStore,
+                    const labelList& facesToStore,
+                    const labelList& cellsToStore
+                );
+
+                //- Update local numbering + undo
+                //  Data to restore given as new pointlabel + stored pointlabel
+                //  (i.e. what was in pointsToStore)
+                void updateMesh
+                (
+                    const mapPolyMesh&,
+                    const labelList& changedFaces,
+                    const Map<label>& pointsToRestore,
+                    const Map<label>& facesToRestore,
+                    const Map<label>& cellsToRestore
+                );
+
+
+            //- Merge faces on the same patch (usually from exposing refinement)
+            //  Returns global number of faces merged.
+            label mergePatchFaces
+            (
+                const scalar minCos,
+                const scalar concaveCos,
+                const labelList& patchIDs
+            );
+
+            //- Remove points not used by any face or points used
+            // by only two faces where the edges are in line
+            autoPtr<mapPolyMesh> mergeEdges(const scalar minCos);
+
+
+        // Debug/IO
+
+            //- Debugging: check that all faces still obey start()>end()
+            void checkData();
+
+            //- Compare two lists over all boundary faces
+            template<class T>
+            void testSyncBoundaryFaceList
+            (
+                const scalar mergeDistance,
+                const string&,
+                const UList<T>&,
+                const UList<T>&
+            ) const;
+
+            //- Print some mesh stats.
+            void printMeshInfo(const bool, const string&) const;
+
+            //- Replacement for Time::timeName() : return oldInstance (if
+            //  overwrite_)
+            word timeName() const;
+
+            //- Set instance of all local IOobjects
+            void setInstance(const fileName&);
+
+            //- Write mesh and all data
+            bool write() const;
+
+            //- Write refinement level as volScalarFields for postprocessing
+            void dumpRefinementLevel() const;
+
+            //- Debug: Write intersection information to OBJ format
+            void dumpIntersections(const fileName& prefix) const;
+
+            //- Do any one of above IO functions. flag is combination of
+            //  writeFlag values.
+            void write(const label flag, const fileName&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "meshRefinementTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
new file mode 100644
index 000000000..65cc227d6
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -0,0 +1,2529 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*----------------------------------------------------------------------------*/
+
+#include "meshRefinement.H"
+#include "fvMesh.H"
+#include "syncTools.H"
+#include "Time.H"
+#include "refinementSurfaces.H"
+#include "pointSet.H"
+#include "faceSet.H"
+#include "indirectPrimitivePatch.H"
+#include "directTopoChange.H"
+#include "meshTools.H"
+#include "polyModifyFace.H"
+#include "polyModifyCell.H"
+#include "polyAddFace.H"
+#include "polyRemoveFace.H"
+#include "polyAddPoint.H"
+#include "localPointRegion.H"
+#include "duplicatePoints.H"
+#include "OFstream.H"
+#include "regionSplit.H"
+#include "removeCells.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Repatches external face or creates baffle for internal face
+// with user specified patches (might be different for both sides).
+// Returns label of added face.
+Foam::label Foam::meshRefinement::createBaffle
+(
+    const label faceI,
+    const label ownPatch,
+    const label neiPatch,
+    directTopoChange& meshMod
+) const
+{
+    const face& f = mesh_.faces()[faceI];
+    label zoneID = mesh_.faceZones().whichZone(faceI);
+    bool zoneFlip = false;
+
+    if (zoneID >= 0)
+    {
+        const faceZone& fZone = mesh_.faceZones()[zoneID];
+        zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
+    }
+
+    meshMod.setAction
+    (
+        polyModifyFace
+        (
+            f,                          // modified face
+            faceI,                      // label of face
+            mesh_.faceOwner()[faceI],   // owner
+            -1,                         // neighbour
+            false,                      // face flip
+            ownPatch,                   // patch for face
+            false,                      // remove from zone
+            zoneID,                     // zone for face
+            zoneFlip                    // face flip in zone
+        )
+    );
+
+
+    label dupFaceI = -1;
+
+    if (mesh_.isInternalFace(faceI))
+    {
+        if (neiPatch == -1)
+        {
+            FatalErrorIn
+            (
+                "meshRefinement::createBaffle"
+                "(const label, const label, const label, directTopoChange&)"
+            )   << "No neighbour patch for internal face " << faceI
+                << " fc:" << mesh_.faceCentres()[faceI]
+                << " ownPatch:" << ownPatch << abort(FatalError);
+        }
+
+        bool reverseFlip = false;
+        if (zoneID >= 0)
+        {
+            reverseFlip = !zoneFlip;
+        }
+
+        dupFaceI = meshMod.setAction
+        (
+            polyAddFace
+            (
+                f.reverseFace(),            // modified face
+                mesh_.faceNeighbour()[faceI],// owner
+                -1,                         // neighbour
+                -1,                         // masterPointID
+                -1,                         // masterEdgeID
+                faceI,                      // masterFaceID,
+                true,                       // face flip
+                neiPatch,                   // patch for face
+                zoneID,                     // zone for face
+                reverseFlip                 // face flip in zone
+            )
+        );
+    }
+    return dupFaceI;
+}
+
+
+// Get an estimate for the patch the internal face should get. Bit heuristic.
+Foam::label Foam::meshRefinement::getBafflePatch
+(
+    const labelList& facePatch,
+    const label faceI
+) const
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Loop over face points
+    // for each point check all faces patch IDs
+    // as soon as an ID >= 0 is found, break and assign that ID
+    // to the current face.
+    // Check first for real patch (so proper surface intersection and then
+    // in facePatch array for patches to block off faces
+
+    forAll(mesh_.faces()[faceI], fp)
+    {
+        label pointI = mesh_.faces()[faceI][fp];
+
+        forAll(mesh_.pointFaces()[pointI], pf)
+        {
+            label pFaceI = mesh_.pointFaces()[pointI][pf];
+
+            label patchI = patches.whichPatch(pFaceI);
+
+            if (patchI != -1 && !patches[patchI].coupled())
+            {
+                return patchI;
+            }
+            else if (facePatch[pFaceI] != -1)
+            {
+                return facePatch[pFaceI];
+            }
+        }
+    }
+
+    // Loop over owner and neighbour cells, looking for the first face with a
+    // valid patch number
+    const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
+
+    forAll(ownFaces, i)
+    {
+        label cFaceI = ownFaces[i];
+
+        label patchI = patches.whichPatch(cFaceI);
+
+        if (patchI != -1 && !patches[patchI].coupled())
+        {
+            return patchI;
+        }
+        else if (facePatch[cFaceI] != -1)
+        {
+            return facePatch[cFaceI];
+        }
+    }
+
+    if (mesh_.isInternalFace(faceI))
+    {
+        const cell& neiFaces = mesh_.cells()[mesh_.faceNeighbour()[faceI]];
+
+        forAll(neiFaces, i)
+        {
+            label cFaceI = neiFaces[i];
+
+            label patchI = patches.whichPatch(cFaceI);
+
+            if (patchI != -1 && !patches[patchI].coupled())
+            {
+                return patchI;
+            }
+            else if (facePatch[cFaceI] != -1)
+            {
+                return facePatch[cFaceI];
+            }
+        }
+    }
+
+    WarningIn
+    (
+        "meshRefinement::getBafflePatch(const labelList&, const label)"
+    )   << "Could not find boundary face neighbouring internal face "
+        << faceI << " with face centre " << mesh_.faceCentres()[faceI]
+        << nl
+        << "Using arbitrary patch " << 0 << " instead." << endl;
+
+    return 0;
+}
+
+
+// Determine patches for baffles.
+void Foam::meshRefinement::getBafflePatches
+(
+    const labelList& globalToPatch,
+    const labelList& neiLevel,
+    const pointField& neiCc,
+
+    labelList& ownPatch,
+    labelList& neiPatch
+) const
+{
+    autoPtr<OFstream> str;
+    label vertI = 0;
+    if (debug&OBJINTERSECTIONS)
+    {
+        str.reset
+        (
+            new OFstream
+            (
+                mesh_.time().path()/timeName()/"intersections.obj"
+            )
+        );
+
+        Pout<< "getBafflePatches : Writing surface intersections to file "
+            << str().name() << nl << endl;
+    }
+
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    // Build list of surfaces that are not to be baffled.
+    const wordList& cellZoneNames = surfaces_.cellZoneNames();
+
+    labelList surfacesToBaffle(cellZoneNames.size());
+    label baffleI = 0;
+    forAll(cellZoneNames, surfI)
+    {
+        if (cellZoneNames[surfI].size())
+        {
+            if (debug)
+            {
+                Pout<< "getBafflePatches : Not baffling surface "
+                    << surfaces_.names()[surfI] << endl;
+            }
+        }
+        else
+        {
+            surfacesToBaffle[baffleI++] = surfI;
+        }
+    }
+    surfacesToBaffle.setSize(baffleI);
+
+    ownPatch.setSize(mesh_.nFaces());
+    ownPatch = -1;
+    neiPatch.setSize(mesh_.nFaces());
+    neiPatch = -1;
+
+
+    // Collect candidate faces
+    // ~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList testFaces(intersectedFaces());
+
+    // Collect segments
+    // ~~~~~~~~~~~~~~~~
+
+    pointField start(testFaces.size());
+    pointField end(testFaces.size());
+
+    forAll(testFaces, i)
+    {
+        label faceI = testFaces[i];
+
+        label own = mesh_.faceOwner()[faceI];
+
+        if (mesh_.isInternalFace(faceI))
+        {
+            start[i] = cellCentres[own];
+            end[i] = cellCentres[mesh_.faceNeighbour()[faceI]];
+        }
+        else
+        {
+            start[i] = cellCentres[own];
+            end[i] = neiCc[faceI-mesh_.nInternalFaces()];
+        }
+    }
+
+
+    // Do test for intersections
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    labelList surface1;
+    List<pointIndexHit> hit1;
+    labelList region1;
+    labelList surface2;
+    List<pointIndexHit> hit2;
+    labelList region2;
+    surfaces_.findNearestIntersection
+    (
+        surfacesToBaffle,
+        start,
+        end,
+
+        surface1,
+        hit1,
+        region1,
+
+        surface2,
+        hit2,
+        region2
+    );
+
+    forAll(testFaces, i)
+    {
+        label faceI = testFaces[i];
+
+        if (hit1[i].hit() && hit2[i].hit())
+        {
+            if (str.valid())
+            {
+                meshTools::writeOBJ(str(), start[i]);
+                vertI++;
+                meshTools::writeOBJ(str(), hit1[i].rawPoint());
+                vertI++;
+                meshTools::writeOBJ(str(), hit2[i].rawPoint());
+                vertI++;
+                meshTools::writeOBJ(str(), end[i]);
+                vertI++;
+                str()<< "l " << vertI-3 << ' ' << vertI-2 << nl;
+                str()<< "l " << vertI-2 << ' ' << vertI-1 << nl;
+                str()<< "l " << vertI-1 << ' ' << vertI << nl;
+            }
+
+            // Pick up the patches
+            ownPatch[faceI] = globalToPatch
+            [
+                surfaces_.globalRegion(surface1[i], region1[i])
+            ];
+            neiPatch[faceI] = globalToPatch
+            [
+                surfaces_.globalRegion(surface2[i], region2[i])
+            ];
+
+            if (ownPatch[faceI] == -1 || neiPatch[faceI] == -1)
+            {
+                FatalErrorIn("getBafflePatches(..)")
+                    << "problem." << abort(FatalError);
+            }
+        }
+    }
+
+    // No need to parallel sync since intersection data (surfaceIndex_ etc.)
+    // already guaranteed to be synced...
+    // However:
+    // - owncc and neicc are reversed on different procs so might pick
+    //   up different regions reversed? No problem. Neighbour on one processor
+    //   might not be owner on the other processor but the neighbour is
+    //   not used when creating baffles from proc faces.
+    // - tolerances issues occasionally crop up.
+    syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>(), false);
+    syncTools::syncFaceList(mesh_, neiPatch, maxEqOp<label>(), false);
+}
+
+
+// Create baffle for every face where ownPatch != -1
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
+(
+    const labelList& ownPatch,
+    const labelList& neiPatch
+)
+{
+    if
+    (
+        ownPatch.size() != mesh_.nFaces()
+     || neiPatch.size() != mesh_.nFaces()
+    )
+    {
+        FatalErrorIn
+        (
+            "meshRefinement::createBaffles"
+            "(const labelList&, const labelList&)"
+        )   << "Illegal size :"
+            << " ownPatch:" << ownPatch.size()
+            << " neiPatch:" << neiPatch.size()
+            << ". Should be number of faces:" << mesh_.nFaces()
+            << abort(FatalError);
+    }
+
+    if (debug)
+    {
+        labelList syncedOwnPatch(ownPatch);
+        syncTools::syncFaceList(mesh_, syncedOwnPatch, maxEqOp<label>(), false);
+        labelList syncedNeiPatch(neiPatch);
+        syncTools::syncFaceList(mesh_, syncedNeiPatch, maxEqOp<label>(), false);
+
+        forAll(syncedOwnPatch, faceI)
+        {
+            if
+            (
+                (ownPatch[faceI] == -1 && syncedOwnPatch[faceI] != -1)
+             || (neiPatch[faceI] == -1 && syncedNeiPatch[faceI] != -1)
+            )
+            {
+                FatalErrorIn
+                (
+                    "meshRefinement::createBaffles"
+                    "(const labelList&, const labelList&)"
+                )   << "Non synchronised at face:" << faceI
+                    << " on patch:" << mesh_.boundaryMesh().whichPatch(faceI)
+                    << " fc:" << mesh_.faceCentres()[faceI] << endl
+                    << "ownPatch:" << ownPatch[faceI]
+                    << " syncedOwnPatch:" << syncedOwnPatch[faceI]
+                    << " neiPatch:" << neiPatch[faceI]
+                    << " syncedNeiPatch:" << syncedNeiPatch[faceI]
+                    << abort(FatalError);
+            }
+        }
+    }
+
+    // Topochange container
+    directTopoChange meshMod(mesh_);
+
+    label nBaffles = 0;
+
+    forAll(ownPatch, faceI)
+    {
+        if (ownPatch[faceI] != -1)
+        {
+            // Create baffle or repatch face. Return label of inserted baffle
+            // face.
+            createBaffle
+            (
+                faceI,
+                ownPatch[faceI],   // owner side patch
+                neiPatch[faceI],   // neighbour side patch
+                meshMod
+            );
+            nBaffles++;
+        }
+    }
+
+    // Change the mesh (no inflation, parallel sync)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+    // Update fields
+    mesh_.updateMesh(map);
+
+    // Move mesh if in inflation mode
+    if (map().hasMotionPoints())
+    {
+        mesh_.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh_.clearOut();
+    }
+
+    if (overwrite())
+    {
+        mesh_.setInstance(oldInstance());
+    }
+
+    //- Redo the intersections on the newly create baffle faces. Note that
+    //  this changes also the cell centre positions.
+    faceSet baffledFacesSet(mesh_, "baffledFacesSet", 2*nBaffles);
+
+    const labelList& reverseFaceMap = map().reverseFaceMap();
+    const labelList& faceMap = map().faceMap();
+
+    // Pick up owner side of baffle
+    forAll(ownPatch, oldFaceI)
+    {
+        label faceI = reverseFaceMap[oldFaceI];
+
+        if (ownPatch[oldFaceI] != -1 && faceI >= 0)
+        {
+            const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
+
+            forAll(ownFaces, i)
+            {
+                baffledFacesSet.insert(ownFaces[i]);
+            }
+        }
+    }
+    // Pick up neighbour side of baffle (added faces)
+    forAll(faceMap, faceI)
+    {
+        label oldFaceI = faceMap[faceI];
+
+        if (oldFaceI >= 0 && reverseFaceMap[oldFaceI] != faceI)
+        {
+            const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
+
+            forAll(ownFaces, i)
+            {
+                baffledFacesSet.insert(ownFaces[i]);
+            }
+        }
+    }
+    baffledFacesSet.sync(mesh_);
+
+    updateMesh(map, baffledFacesSet.toc());
+
+    return map;
+}
+
+
+// Return a list of coupled face pairs, i.e. faces that use the same vertices.
+// (this information is recalculated instead of maintained since would be too
+// hard across splitMeshRegions).
+Foam::List<Foam::labelPair> Foam::meshRefinement::getDuplicateFaces
+(
+    const labelList& testFaces
+) const
+{
+    labelList duplicateFace
+    (
+        localPointRegion::findDuplicateFaces
+        (
+            mesh_,
+            testFaces
+        )
+    );
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Convert into list of coupled face pairs (mesh face labels).
+    List<labelPair> duplicateFaces(testFaces.size());
+    label dupI = 0;
+
+    forAll(duplicateFace, i)
+    {
+        label otherFaceI = duplicateFace[i];
+
+        if (otherFaceI != -1 && i < otherFaceI)
+        {
+            label meshFace0 = testFaces[i];
+            label patch0 = patches.whichPatch(meshFace0);
+            label meshFace1 = testFaces[otherFaceI];
+            label patch1 = patches.whichPatch(meshFace1);
+
+            if
+            (
+                (patch0 != -1 && isA<processorPolyPatch>(patches[patch0]))
+             || (patch1 != -1 && isA<processorPolyPatch>(patches[patch1]))
+            )
+            {
+                FatalErrorIn
+                (
+                    "meshRefinement::getDuplicateFaces"
+                    "(const bool, const labelList&)"
+                )   << "One of two duplicate faces is on"
+                    << " processorPolyPatch."
+                    << "This is not allowed." << nl
+                    << "Face:" << meshFace0
+                    << " is on patch:" << patches[patch0].name()
+                    << nl
+                    << "Face:" << meshFace1
+                    << " is on patch:" << patches[patch1].name()
+                    << abort(FatalError);
+            }
+
+            duplicateFaces[dupI++] = labelPair(meshFace0, meshFace1);
+        }
+    }
+    duplicateFaces.setSize(dupI);
+
+    Info<< "getDuplicateFaces : found " << returnReduce(dupI, sumOp<label>())
+        << " pairs of duplicate faces." << nl << endl;
+
+
+    if (debug)
+    {
+        faceSet duplicateFaceSet(mesh_, "duplicateFaces", 2*dupI);
+
+        forAll(duplicateFaces, i)
+        {
+            duplicateFaceSet.insert(duplicateFaces[i][0]);
+            duplicateFaceSet.insert(duplicateFaces[i][1]);
+        }
+        Pout<< "Writing duplicate faces (baffles) to faceSet "
+            << duplicateFaceSet.name() << nl << endl;
+        duplicateFaceSet.write();
+    }
+
+    return duplicateFaces;
+}
+
+
+// Extract those baffles (duplicate) faces that are on the edge of a baffle
+// region. These are candidates for merging.
+// Done by counting the number of baffles faces per mesh edge. If edge
+// has 2 boundary faces and both are baffle faces it is the edge of a baffle
+// region.
+Foam::List<Foam::labelPair> Foam::meshRefinement::filterDuplicateFaces
+(
+    const List<labelPair>& couples
+) const
+{
+    // Construct addressing engine for all duplicate faces (only one
+    // for each pair)
+
+    // Duplicate faces in mesh labels (first face of each pair only)
+    // (reused later on to mark off filtered couples. see below)
+    labelList duplicateFaces(couples.size());
+
+
+    // All duplicate faces on edge of the patch are to be merged.
+    // So we count for all edges of duplicate faces how many duplicate
+    // faces use them.
+    labelList nBafflesPerEdge(mesh_.nEdges(), 0);
+
+
+
+    // Count number of boundary faces per edge
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        // Count number of boundary faces. Discard coupled boundary faces.
+        if (!pp.coupled())
+        {
+            label faceI = pp.start();
+
+            forAll(pp, i)
+            {
+                const labelList& fEdges = mesh_.faceEdges(faceI);
+
+                forAll(fEdges, fEdgeI)
+                {
+                    nBafflesPerEdge[fEdges[fEdgeI]]++;
+                }
+                faceI++;
+            }
+        }
+    }
+
+
+    DynamicList<label> fe0;
+    DynamicList<label> fe1;
+
+
+    // Count number of duplicate boundary faces per edge
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    forAll(couples, i)
+    {
+        const labelList& fEdges0 = mesh_.faceEdges(couples[i].first(), fe0);
+
+        forAll(fEdges0, fEdgeI)
+        {
+            nBafflesPerEdge[fEdges0[fEdgeI]] += 1000000;
+        }
+
+        const labelList& fEdges1 = mesh_.faceEdges(couples[i].second(), fe1);
+
+        forAll(fEdges1, fEdgeI)
+        {
+            nBafflesPerEdge[fEdges1[fEdgeI]] += 1000000;
+        }
+    }
+
+    // Add nBaffles on shared edges
+    syncTools::syncEdgeList
+    (
+        mesh_,
+        nBafflesPerEdge,
+        plusEqOp<label>(),  // in-place add
+        0,                  // initial value
+        false               // no separation
+    );
+
+
+    // Baffles which are not next to other boundaries and baffles will have
+    // value 2*1000000+2*1
+
+    List<labelPair> filteredCouples(couples.size());
+    label filterI = 0;
+
+    forAll(couples, i)
+    {
+        const labelPair& couple = couples[i];
+
+        if
+        (
+            patches.whichPatch(couple.first())
+         == patches.whichPatch(couple.second())
+        )
+        {
+            const labelList& fEdges = mesh_.faceEdges(couples[i].first());
+
+            forAll(fEdges, fEdgeI)
+            {
+                label edgeI = fEdges[fEdgeI];
+
+                if (nBafflesPerEdge[edgeI] == 2*1000000+2*1)
+                {
+                    filteredCouples[filterI++] = couples[i];
+                    break;
+                }
+            }
+        }
+    }
+    filteredCouples.setSize(filterI);
+
+    //Info<< "filterDuplicateFaces : from "
+    //    << returnReduce(couples.size(), sumOp<label>())
+    //    << " down to "
+    //    << returnReduce(filteredCouples.size(), sumOp<label>())
+    //    << " baffles." << nl << endl;
+
+    return filteredCouples;
+}
+
+
+// Merge baffles. Gets pairs of faces.
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
+(
+    const List<labelPair>& couples
+)
+{
+    // Mesh change engine
+    directTopoChange meshMod(mesh_);
+
+    const faceList& faces = mesh_.faces();
+    const labelList& faceOwner = mesh_.faceOwner();
+    const faceZoneMesh& faceZones = mesh_.faceZones();
+
+    forAll(couples, i)
+    {
+        label face0 = couples[i].first();
+        label face1 = couples[i].second();
+
+        // face1 < 0 signals a coupled face that has been converted to baffle.
+
+        label own0 = faceOwner[face0];
+        label own1 = faceOwner[face1];
+
+        if (face1 < 0 || own0 < own1)
+        {
+            // Use face0 as the new internal face.
+            label zoneID = faceZones.whichZone(face0);
+            bool zoneFlip = false;
+
+            if (zoneID >= 0)
+            {
+                const faceZone& fZone = faceZones[zoneID];
+                zoneFlip = fZone.flipMap()[fZone.whichFace(face0)];
+            }
+
+            label nei = (face1 < 0 ? -1 : own1);
+
+            meshMod.setAction(polyRemoveFace(face1));
+            meshMod.setAction
+            (
+                polyModifyFace
+                (
+                    faces[face0],           // modified face
+                    face0,                  // label of face being modified
+                    own0,                   // owner
+                    nei,                    // neighbour
+                    false,                  // face flip
+                    -1,                     // patch for face
+                    false,                  // remove from zone
+                    zoneID,                 // zone for face
+                    zoneFlip                // face flip in zone
+                )
+            );
+        }
+        else
+        {
+            // Use face1 as the new internal face.
+            label zoneID = faceZones.whichZone(face1);
+            bool zoneFlip = false;
+
+            if (zoneID >= 0)
+            {
+                const faceZone& fZone = faceZones[zoneID];
+                zoneFlip = fZone.flipMap()[fZone.whichFace(face1)];
+            }
+
+            meshMod.setAction(polyRemoveFace(face0));
+            meshMod.setAction
+            (
+                polyModifyFace
+                (
+                    faces[face1],           // modified face
+                    face1,                  // label of face being modified
+                    own1,                   // owner
+                    own0,                   // neighbour
+                    false,                  // face flip
+                    -1,                     // patch for face
+                    false,                  // remove from zone
+                    zoneID,                 // zone for face
+                    zoneFlip                // face flip in zone
+                )
+            );
+        }
+    }
+
+    // Change the mesh (no inflation)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+    // Update fields
+    mesh_.updateMesh(map);
+
+    // Move mesh (since morphing does not do this)
+    if (map().hasMotionPoints())
+    {
+        mesh_.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh_.clearOut();
+    }
+
+    if (overwrite())
+    {
+        mesh_.setInstance(oldInstance());
+    }
+
+    // Update intersections. Recalculate intersections on merged faces since
+    // this seems to give problems? Note: should not be nessecary since
+    // baffles preserve intersections from when they were created.
+    labelList newExposedFaces(2*couples.size());
+    label newI = 0;
+
+    forAll(couples, i)
+    {
+        label newFace0 = map().reverseFaceMap()[couples[i].first()];
+        if (newFace0 != -1)
+        {
+            newExposedFaces[newI++] = newFace0;
+        }
+
+        label newFace1 = map().reverseFaceMap()[couples[i].second()];
+        if (newFace1 != -1)
+        {
+            newExposedFaces[newI++] = newFace1;
+        }
+    }
+    newExposedFaces.setSize(newI);
+    updateMesh(map, newExposedFaces);
+
+    return map;
+}
+
+
+// Finds region per cell for cells inside closed named surfaces
+void Foam::meshRefinement::findCellZoneGeometric
+(
+    const labelList& closedNamedSurfaces,   // indices of closed surfaces
+    labelList& namedSurfaceIndex,           // per face index of named surface
+    const labelList& surfaceToCellZone,     // cell zone index per surface
+
+    labelList& cellToZone
+) const
+{
+    const pointField& cellCentres = mesh_.cellCentres();
+    const labelList& faceOwner = mesh_.faceOwner();
+    const labelList& faceNeighbour = mesh_.faceNeighbour();
+
+    // Check if cell centre is inside
+    labelList insideSurfaces;
+    surfaces_.findInside
+    (
+        closedNamedSurfaces,
+        cellCentres,
+        insideSurfaces
+    );
+
+    forAll(insideSurfaces, cellI)
+    {
+        if (cellToZone[cellI] == -2)
+        {
+            label surfI = insideSurfaces[cellI];
+
+            if (surfI != -1)
+            {
+                cellToZone[cellI] = surfaceToCellZone[surfI];
+            }
+        }
+    }
+
+
+    // Some cells with cell centres close to surface might have
+    // had been put into wrong surface. Recheck with perturbed cell centre.
+
+
+    // 1. Collect points
+
+    // Count points to test.
+    label nCandidates = 0;
+    forAll(namedSurfaceIndex, faceI)
+    {
+        label surfI = namedSurfaceIndex[faceI];
+
+        if (surfI != -1)
+        {
+            if (mesh_.isInternalFace(faceI))
+            {
+                nCandidates += 2;
+            }
+            else
+            {
+                nCandidates += 1;
+            }
+        }
+    }
+
+    // Collect points.
+    pointField candidatePoints(nCandidates);
+    nCandidates = 0;
+    forAll(namedSurfaceIndex, faceI)
+    {
+        label surfI = namedSurfaceIndex[faceI];
+
+        if (surfI != -1)
+        {
+            label own = faceOwner[faceI];
+            const point& ownCc = cellCentres[own];
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                label nei = faceNeighbour[faceI];
+                const point& neiCc = cellCentres[nei];
+                // Perturbed cc
+                const vector d = 1E-4*(neiCc - ownCc);
+                candidatePoints[nCandidates++] = ownCc-d;
+                candidatePoints[nCandidates++] = neiCc+d;
+            }
+            else
+            {
+                const point& neiFc = mesh_.faceCentres()[faceI];
+                // Perturbed cc
+                const vector d = 1E-4*(neiFc - ownCc);
+                candidatePoints[nCandidates++] = ownCc-d;
+            }
+        }
+    }
+
+
+    // 2. Test points for inside
+
+    surfaces_.findInside
+    (
+        closedNamedSurfaces,
+        candidatePoints,
+        insideSurfaces
+    );
+
+
+    // 3. Update zone information
+
+    nCandidates = 0;
+    forAll(namedSurfaceIndex, faceI)
+    {
+        label surfI = namedSurfaceIndex[faceI];
+
+        if (surfI != -1)
+        {
+            label own = faceOwner[faceI];
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                label ownSurfI = insideSurfaces[nCandidates++];
+                if (ownSurfI != -1)
+                {
+                    cellToZone[own] = surfaceToCellZone[ownSurfI];
+                }
+
+                label neiSurfI = insideSurfaces[nCandidates++];
+                if (neiSurfI != -1)
+                {
+                    label nei = faceNeighbour[faceI];
+
+                    cellToZone[nei] = surfaceToCellZone[neiSurfI];
+                }
+            }
+            else
+            {
+                label ownSurfI = insideSurfaces[nCandidates++];
+                if (ownSurfI != -1)
+                {
+                    cellToZone[own] = surfaceToCellZone[ownSurfI];
+                }
+            }
+        }
+    }
+
+
+    // Adapt the namedSurfaceIndex
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // for if any cells were not completely covered.
+
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        label ownZone = cellToZone[mesh_.faceOwner()[faceI]];
+        label neiZone = cellToZone[mesh_.faceNeighbour()[faceI]];
+
+        if (namedSurfaceIndex[faceI] == -1 && (ownZone != neiZone))
+        {
+            // Give face the zone of max cell zone
+            namedSurfaceIndex[faceI] = findIndex
+            (
+                surfaceToCellZone,
+                max(ownZone, neiZone)
+            );
+        }
+    }
+
+    labelList neiCellZone(mesh_.nFaces()-mesh_.nInternalFaces());
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start()+i;
+                label ownZone = cellToZone[mesh_.faceOwner()[faceI]];
+                neiCellZone[faceI-mesh_.nInternalFaces()] = ownZone;
+            }
+        }
+    }
+    syncTools::swapBoundaryFaceList(mesh_, neiCellZone, false);
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start()+i;
+                label ownZone = cellToZone[mesh_.faceOwner()[faceI]];
+                label neiZone = neiCellZone[faceI-mesh_.nInternalFaces()];
+
+                if (namedSurfaceIndex[faceI] == -1 && (ownZone != neiZone))
+                {
+                    // Give face the max cell zone
+                    namedSurfaceIndex[faceI] = findIndex
+                    (
+                        surfaceToCellZone,
+                        max(ownZone, neiZone)
+                    );
+                }
+            }
+        }
+    }
+
+    // Sync
+    syncTools::syncFaceList
+    (
+        mesh_,
+        namedSurfaceIndex,
+        maxEqOp<label>(),
+        false
+    );
+}
+
+
+bool Foam::meshRefinement::calcRegionToZone
+(
+    const label surfZoneI,
+    const label ownRegion,
+    const label neiRegion,
+
+    labelList& regionToCellZone
+) const
+{
+    bool changed = false;
+
+    // Check whether inbetween different regions
+    if (ownRegion != neiRegion)
+    {
+        // Jump. Change one of the sides to my type.
+
+        // 1. Interface between my type and unset region.
+        // Set region to keepRegion
+
+        if (regionToCellZone[ownRegion] == -2)
+        {
+            if (regionToCellZone[neiRegion] == surfZoneI)
+            {
+                // Face between unset and my region. Put unset
+                // region into keepRegion
+                regionToCellZone[ownRegion] = -1;
+                changed = true;
+            }
+            else if (regionToCellZone[neiRegion] != -2)
+            {
+                // Face between unset and other region.
+                // Put unset region into my region
+                regionToCellZone[ownRegion] = surfZoneI;
+                changed = true;
+            }
+        }
+        else if (regionToCellZone[neiRegion] == -2)
+        {
+            if (regionToCellZone[ownRegion] == surfZoneI)
+            {
+                // Face between unset and my region. Put unset
+                // region into keepRegion
+                regionToCellZone[neiRegion] = -1;
+                changed = true;
+            }
+            else if (regionToCellZone[ownRegion] != -2)
+            {
+                // Face between unset and other region.
+                // Put unset region into my region
+                regionToCellZone[neiRegion] = surfZoneI;
+                changed = true;
+            }
+        }
+    }
+    return changed;
+}
+
+
+// Finds region per cell. Assumes:
+// - region containing keepPoint does not go into a cellZone
+// - all other regions can be found by crossing faces marked in
+//   namedSurfaceIndex.
+void Foam::meshRefinement::findCellZoneTopo
+(
+    const point& keepPoint,
+    const labelList& namedSurfaceIndex,
+    const labelList& surfaceToCellZone,
+    labelList& cellToZone
+) const
+{
+    // Analyse regions. Reuse regionsplit
+    boolList blockedFace(mesh_.nFaces());
+
+    forAll(namedSurfaceIndex, faceI)
+    {
+        if (namedSurfaceIndex[faceI] == -1)
+        {
+            blockedFace[faceI] = false;
+        }
+        else
+        {
+            blockedFace[faceI] = true;
+        }
+    }
+    // No need to sync since namedSurfaceIndex already is synced
+
+    // Set region per cell based on walking
+    regionSplit cellRegion(mesh_, blockedFace);
+    blockedFace.clear();
+
+    // Per mesh region the zone the cell should be put in.
+    // -2   : not analysed yet
+    // -1   : keepPoint region. Not put into any cellzone.
+    // >= 0 : index of cellZone
+    labelList regionToCellZone(cellRegion.nRegions(), -2);
+
+    // See which cells already are set in the cellToZone (from geometric
+    // searching) and use these to take over their zones.
+    // Note: could be improved to count number of cells per region.
+    forAll(cellToZone, cellI)
+    {
+        if (cellToZone[cellI] != -2)
+        {
+            regionToCellZone[cellRegion[cellI]] = cellToZone[cellI];
+        }
+    }
+
+
+
+    // Find the region containing the keepPoint
+    label keepRegionI = -1;
+
+    label cellI = mesh_.findCell(keepPoint);
+
+    if (cellI != -1)
+    {
+        keepRegionI = cellRegion[cellI];
+    }
+    reduce(keepRegionI, maxOp<label>());
+
+    Info<< "Found point " << keepPoint << " in cell " << cellI
+        << " in global region " << keepRegionI
+        << " out of " << cellRegion.nRegions() << " regions." << endl;
+
+    if (keepRegionI == -1)
+    {
+        FatalErrorIn
+        (
+            "meshRefinement::findCellZoneTopo"
+            "(const point&, const labelList&, const labelList&, labelList&)"
+        )   << "Point " << keepPoint
+            << " is not inside the mesh." << nl
+            << "Bounding box of the mesh:" << mesh_.globalData().bb()
+            << exit(FatalError);
+    }
+
+    // Mark default region with zone -1.
+    if (regionToCellZone[keepRegionI] == -2)
+    {
+        regionToCellZone[keepRegionI] = -1;
+    }
+
+
+    // Find correspondence between cell zone and surface
+    // by changing cell zone every time we cross a surface.
+    while (true)
+    {
+        // Synchronise regionToCellZone.
+        // Note:
+        // - region numbers are identical on all processors
+        // - keepRegion is identical ,,
+        // - cellZones are identical ,,
+        // This done at top of loop to account for geometric matching
+        // not being synchronised.
+        Pstream::listCombineGather(regionToCellZone, maxEqOp<label>());
+        Pstream::listCombineScatter(regionToCellZone);
+
+
+        bool changed = false;
+
+        // Internal faces
+
+        for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+        {
+            label surfI = namedSurfaceIndex[faceI];
+
+            if (surfI != -1)
+            {
+                // Calculate region to zone from cellRegions on either side
+                // of internal face.
+                bool changedCell = calcRegionToZone
+                (
+                    surfaceToCellZone[surfI],
+                    cellRegion[mesh_.faceOwner()[faceI]],
+                    cellRegion[mesh_.faceNeighbour()[faceI]],
+                    regionToCellZone
+                );
+
+                changed = changed | changedCell;
+            }
+        }
+
+        // Boundary faces
+
+        const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+        // Get coupled neighbour cellRegion
+        labelList neiCellRegion(mesh_.nFaces()-mesh_.nInternalFaces());
+        forAll(patches, patchI)
+        {
+            const polyPatch& pp = patches[patchI];
+
+            if (pp.coupled())
+            {
+                forAll(pp, i)
+                {
+                    label faceI = pp.start()+i;
+                    neiCellRegion[faceI-mesh_.nInternalFaces()] =
+                        cellRegion[mesh_.faceOwner()[faceI]];
+                }
+            }
+        }
+        syncTools::swapBoundaryFaceList(mesh_, neiCellRegion, false);
+
+        // Calculate region to zone from cellRegions on either side of coupled
+        // face.
+        forAll(patches, patchI)
+        {
+            const polyPatch& pp = patches[patchI];
+
+            if (pp.coupled())
+            {
+                forAll(pp, i)
+                {
+                    label faceI = pp.start()+i;
+
+                    label surfI = namedSurfaceIndex[faceI];
+
+                    if (surfI != -1)
+                    {
+                        bool changedCell = calcRegionToZone
+                        (
+                            surfaceToCellZone[surfI],
+                            cellRegion[mesh_.faceOwner()[faceI]],
+                            neiCellRegion[faceI-mesh_.nInternalFaces()],
+                            regionToCellZone
+                        );
+
+                        changed = changed | changedCell;
+                    }
+                }
+            }
+        }
+
+        if (!returnReduce(changed, orOp<bool>()))
+        {
+            break;
+        }
+    }
+
+
+    forAll(regionToCellZone, regionI)
+    {
+        label zoneI = regionToCellZone[regionI];
+
+        if (zoneI ==  -2)
+        {
+            FatalErrorIn
+            (
+                "meshRefinement::findCellZoneTopo"
+                "(const point&, const labelList&, const labelList&, labelList&)"
+            )   << "For region " << regionI << " haven't set cell zone."
+                << exit(FatalError);
+        }
+    }
+
+    if (debug)
+    {
+        forAll(regionToCellZone, regionI)
+        {
+            Pout<< "Region " << regionI
+                << " becomes cellZone:" << regionToCellZone[regionI]
+                << endl;
+        }
+    }
+
+    // Rework into cellToZone
+    forAll(cellToZone, cellI)
+    {
+        cellToZone[cellI] = regionToCellZone[cellRegion[cellI]];
+    }
+}
+
+
+// Make namedSurfaceIndex consistent with cellToZone - clear out any blocked
+// faces inbetween same cell zone.
+void Foam::meshRefinement::makeConsistentFaceIndex
+(
+    const labelList& cellToZone,
+    labelList& namedSurfaceIndex
+) const
+{
+    const labelList& faceOwner = mesh_.faceOwner();
+    const labelList& faceNeighbour = mesh_.faceNeighbour();
+
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        label ownZone = cellToZone[faceOwner[faceI]];
+        label neiZone = cellToZone[faceNeighbour[faceI]];
+
+        if (ownZone == neiZone && namedSurfaceIndex[faceI] != -1)
+        {
+            namedSurfaceIndex[faceI] = -1;
+        }
+        else if (ownZone != neiZone && namedSurfaceIndex[faceI] == -1)
+        {
+            FatalErrorIn("meshRefinement::zonify()")
+                << "Different cell zones on either side of face " << faceI
+                << " at " << mesh_.faceCentres()[faceI]
+                << " but face not marked with a surface."
+                << abort(FatalError);
+        }
+    }
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Get coupled neighbour cellZone
+    labelList neiCellZone(mesh_.nFaces()-mesh_.nInternalFaces());
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start()+i;
+                neiCellZone[faceI-mesh_.nInternalFaces()] =
+                    cellToZone[mesh_.faceOwner()[faceI]];
+            }
+        }
+    }
+    syncTools::swapBoundaryFaceList(mesh_, neiCellZone, false);
+
+    // Use coupled cellZone to do check
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start()+i;
+
+                label ownZone = cellToZone[faceOwner[faceI]];
+                label neiZone = neiCellZone[faceI-mesh_.nInternalFaces()];
+
+                if (ownZone == neiZone && namedSurfaceIndex[faceI] != -1)
+                {
+                    namedSurfaceIndex[faceI] = -1;
+                }
+                else if (ownZone != neiZone && namedSurfaceIndex[faceI] == -1)
+                {
+                    FatalErrorIn("meshRefinement::zonify()")
+                        << "Different cell zones on either side of face "
+                        << faceI << " at " << mesh_.faceCentres()[faceI]
+                        << " but face not marked with a surface."
+                        << abort(FatalError);
+                }
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Split off unreachable areas of mesh.
+void Foam::meshRefinement::baffleAndSplitMesh
+(
+    const bool handleSnapProblems,
+    const bool removeEdgeConnectedCells,
+    const scalarField& perpendicularAngle,
+    const bool mergeFreeStanding,
+    const dictionary& motionDict,
+    Time& runTime,
+    const labelList& globalToPatch,
+    const point& keepPoint
+)
+{
+    // Introduce baffles
+    // ~~~~~~~~~~~~~~~~~
+
+    // Split the mesh along internal faces wherever there is a pierce between
+    // two cell centres.
+
+    Info<< "Introducing baffles for "
+        << returnReduce(countHits(), sumOp<label>())
+        << " faces that are intersected by the surface." << nl << endl;
+
+    // Swap neighbouring cell centres and cell level
+    labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+    pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+    calcNeighbourData(neiLevel, neiCc);
+
+    labelList ownPatch, neiPatch;
+    getBafflePatches
+    (
+        globalToPatch,
+        neiLevel,
+        neiCc,
+
+        ownPatch,
+        neiPatch
+    );
+
+    if (debug)
+    {
+        runTime++;
+    }
+
+    createBaffles(ownPatch, neiPatch);
+
+    if (debug)
+    {
+        // Debug:test all is still synced across proc patches
+        checkData();
+    }
+
+    Info<< "Created baffles in = "
+        << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+
+    printMeshInfo(debug, "After introducing baffles");
+
+    if (debug)
+    {
+        Pout<< "Writing baffled mesh to time " << timeName()
+            << endl;
+        write(debug, runTime.path()/"baffles");
+        Pout<< "Dumped debug data in = "
+            << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+    }
+
+
+    // Introduce baffles to delete problem cells
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Create some additional baffles where we want surface cells removed.
+
+    if (handleSnapProblems)
+    {
+        Info<< nl
+            << "Introducing baffles to block off problem cells" << nl
+            << "----------------------------------------------" << nl
+            << endl;
+
+        labelList facePatch
+        (
+            markFacesOnProblemCells
+            (
+                motionDict,
+                removeEdgeConnectedCells,
+                perpendicularAngle,
+                globalToPatch
+            )
+            //markFacesOnProblemCellsGeometric(motionDict)
+        );
+        Info<< "Analyzed problem cells in = "
+            << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+
+        if (debug)
+        {
+            faceSet problemTopo(mesh_, "problemFacesTopo", 100);
+
+            const labelList facePatchTopo
+            (
+                markFacesOnProblemCells
+                (
+                    motionDict,
+                    removeEdgeConnectedCells,
+                    perpendicularAngle,
+                    globalToPatch
+                )
+            );
+            forAll(facePatchTopo, faceI)
+            {
+                if (facePatchTopo[faceI] != -1)
+                {
+                    problemTopo.insert(faceI);
+                }
+            }
+            Pout<< "Dumping " << problemTopo.size()
+                << " problem faces to " << problemTopo.objectPath() << endl;
+            problemTopo.write();
+        }
+
+        Info<< "Introducing baffles to delete problem cells." << nl << endl;
+
+        if (debug)
+        {
+            runTime++;
+        }
+
+        // Create baffles with same owner and neighbour for now.
+        createBaffles(facePatch, facePatch);
+
+        if (debug)
+        {
+            // Debug:test all is still synced across proc patches
+            checkData();
+        }
+        Info<< "Created baffles in = "
+            << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+
+        printMeshInfo(debug, "After introducing baffles");
+
+        if (debug)
+        {
+            Pout<< "Writing extra baffled mesh to time "
+                << timeName() << endl;
+            write(debug, runTime.path()/"extraBaffles");
+            Pout<< "Dumped debug data in = "
+                << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+        }
+    }
+
+
+    // Select part of mesh
+    // ~~~~~~~~~~~~~~~~~~~
+
+    Info<< nl
+        << "Remove unreachable sections of mesh" << nl
+        << "-----------------------------------" << nl
+        << endl;
+
+    if (debug)
+    {
+        runTime++;
+    }
+
+    splitMeshRegions(keepPoint);
+
+    if (debug)
+    {
+        // Debug:test all is still synced across proc patches
+        checkData();
+    }
+    Info<< "Split mesh in = "
+        << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+
+    printMeshInfo(debug, "After subsetting");
+
+    if (debug)
+    {
+        Pout<< "Writing subsetted mesh to time " << timeName()
+            << endl;
+        write(debug, runTime.path()/timeName());
+        Pout<< "Dumped debug data in = "
+            << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+    }
+
+
+    // Merge baffles
+    // ~~~~~~~~~~~~~
+
+    if (mergeFreeStanding)
+    {
+        Info<< nl
+            << "Merge free-standing baffles" << nl
+            << "---------------------------" << nl
+            << endl;
+
+        if (debug)
+        {
+            runTime++;
+        }
+
+        // List of pairs of freestanding baffle faces.
+        List<labelPair> couples
+        (
+            filterDuplicateFaces    // filter out freestanding baffles
+            (
+                getDuplicateFaces   // get all baffles
+                (
+                    identity(mesh_.nFaces()-mesh_.nInternalFaces())
+                   +mesh_.nInternalFaces()
+                )
+            )
+        );
+
+        label nCouples = couples.size();
+        reduce(nCouples, sumOp<label>());
+
+        Info<< "Detected free-standing baffles : " << nCouples << endl;
+
+        if (nCouples > 0)
+        {
+            // Actually merge baffles. Note: not exactly parallellized. Should
+            // convert baffle faces into processor faces if they resulted
+            // from them.
+            mergeBaffles(couples);
+
+            if (debug)
+            {
+                // Debug:test all is still synced across proc patches
+                checkData();
+            }
+        }
+        Info<< "Merged free-standing baffles in = "
+            << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+    }
+}
+
+
+// Split off (with optional buffer layers) unreachable areas of mesh.
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
+(
+    const label nBufferLayers,
+    const labelList& globalToPatch,
+    const point& keepPoint
+)
+{
+    // Determine patches to put intersections into
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Swap neighbouring cell centres and cell level
+    labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+    pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+    calcNeighbourData(neiLevel, neiCc);
+
+    labelList ownPatch, neiPatch;
+    getBafflePatches
+    (
+        globalToPatch,
+        neiLevel,
+        neiCc,
+
+        ownPatch,
+        neiPatch
+    );
+
+    // Analyse regions. Reuse regionsplit
+    boolList blockedFace(mesh_.nFaces(), false);
+
+    forAll(ownPatch, faceI)
+    {
+        if (ownPatch[faceI] != -1 || neiPatch[faceI] != -1)
+        {
+            blockedFace[faceI] = true;
+        }
+    }
+    syncTools::syncFaceList(mesh_, blockedFace, orEqOp<bool>(), false);
+
+    // Set region per cell based on walking
+    regionSplit cellRegion(mesh_, blockedFace);
+    blockedFace.clear();
+
+    // Find the region containing the keepPoint
+    label keepRegionI = -1;
+
+    label cellI = mesh_.findCell(keepPoint);
+
+    if (cellI != -1)
+    {
+        keepRegionI = cellRegion[cellI];
+    }
+    reduce(keepRegionI, maxOp<label>());
+
+    Info<< "Found point " << keepPoint << " in cell " << cellI
+        << " in global region " << keepRegionI
+        << " out of " << cellRegion.nRegions() << " regions." << endl;
+
+    if (keepRegionI == -1)
+    {
+        FatalErrorIn
+        (
+            "meshRefinement::splitMesh"
+            "(const label, const labelList&, const point&)"
+        )   << "Point " << keepPoint
+            << " is not inside the mesh." << nl
+            << "Bounding box of the mesh:" << mesh_.globalData().bb()
+            << exit(FatalError);
+    }
+
+
+    // Walk out nBufferlayers from region split
+    // (modifies cellRegion, ownPatch)
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Takes over face patch onto points and then back to faces and cells
+    // (so cell-face-point walk)
+
+    const labelList& faceOwner = mesh_.faceOwner();
+    const labelList& faceNeighbour = mesh_.faceNeighbour();
+
+    // Patch for exposed faces for lack of anything sensible.
+    label defaultPatch = 0;
+    if (globalToPatch.size())
+    {
+        defaultPatch = globalToPatch[0];
+    }
+
+    for (label i = 0; i < nBufferLayers; i++)
+    {
+        // 1. From cells (via faces) to points
+
+        labelList pointBaffle(mesh_.nPoints(), -1);
+
+        forAll(faceNeighbour, faceI)
+        {
+            const face& f = mesh_.faces()[faceI];
+
+            label ownRegion = cellRegion[faceOwner[faceI]];
+            label neiRegion = cellRegion[faceNeighbour[faceI]];
+
+            if (ownRegion == keepRegionI && neiRegion != keepRegionI)
+            {
+                // Note max(..) since possibly regionSplit might have split
+                // off extra unreachable parts of mesh. Note: or can this only
+                // happen for boundary faces?
+                forAll(f, fp)
+                {
+                    pointBaffle[f[fp]] = max(defaultPatch, ownPatch[faceI]);
+                }
+            }
+            else if (ownRegion != keepRegionI && neiRegion == keepRegionI)
+            {
+                label newPatchI = neiPatch[faceI];
+                if (newPatchI == -1)
+                {
+                    newPatchI = max(defaultPatch, ownPatch[faceI]);
+                }
+                forAll(f, fp)
+                {
+                    pointBaffle[f[fp]] = newPatchI;
+                }
+            }
+        }
+        for
+        (
+            label faceI = mesh_.nInternalFaces();
+            faceI < mesh_.nFaces();
+            faceI++
+        )
+        {
+            const face& f = mesh_.faces()[faceI];
+
+            label ownRegion = cellRegion[faceOwner[faceI]];
+
+            if (ownRegion == keepRegionI)
+            {
+                forAll(f, fp)
+                {
+                    pointBaffle[f[fp]] = max(defaultPatch, ownPatch[faceI]);
+                }
+            }
+        }
+
+        // Sync
+        syncTools::syncPointList
+        (
+            mesh_,
+            pointBaffle,
+            maxEqOp<label>(),
+            -1,                 // null value
+            false               // no separation
+        );
+
+
+        // 2. From points back to faces
+
+        const labelListList& pointFaces = mesh_.pointFaces();
+
+        forAll(pointFaces, pointI)
+        {
+            if (pointBaffle[pointI] != -1)
+            {
+                const labelList& pFaces = pointFaces[pointI];
+
+                forAll(pFaces, pFaceI)
+                {
+                    label faceI = pFaces[pFaceI];
+
+                    if (ownPatch[faceI] == -1)
+                    {
+                        ownPatch[faceI] = pointBaffle[pointI];
+                    }
+                }
+            }
+        }
+        syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>(), false);
+
+
+        // 3. From faces to cells (cellRegion) and back to faces (ownPatch)
+
+        labelList newOwnPatch(ownPatch);
+
+        forAll(ownPatch, faceI)
+        {
+            if (ownPatch[faceI] != -1)
+            {
+                label own = faceOwner[faceI];
+
+                if (cellRegion[own] != keepRegionI)
+                {
+                    cellRegion[own] = keepRegionI;
+
+                    const cell& ownFaces = mesh_.cells()[own];
+                    forAll(ownFaces, j)
+                    {
+                        if (ownPatch[ownFaces[j]] == -1)
+                        {
+                            newOwnPatch[ownFaces[j]] = ownPatch[faceI];
+                        }
+                    }
+                }
+                if (mesh_.isInternalFace(faceI))
+                {
+                    label nei = faceNeighbour[faceI];
+
+                    if (cellRegion[nei] != keepRegionI)
+                    {
+                        cellRegion[nei] = keepRegionI;
+
+                        const cell& neiFaces = mesh_.cells()[nei];
+                        forAll(neiFaces, j)
+                        {
+                            if (ownPatch[neiFaces[j]] == -1)
+                            {
+                                newOwnPatch[neiFaces[j]] = ownPatch[faceI];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        ownPatch.transfer(newOwnPatch);
+
+        syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>(), false);
+    }
+
+
+
+    // Subset
+    // ~~~~~~
+
+    // Get cells to remove
+    DynamicList<label> cellsToRemove(mesh_.nCells());
+    forAll(cellRegion, cellI)
+    {
+        if (cellRegion[cellI] != keepRegionI)
+        {
+            cellsToRemove.append(cellI);
+        }
+    }
+    cellsToRemove.shrink();
+
+    label nCellsToKeep = mesh_.nCells() - cellsToRemove.size();
+    reduce(nCellsToKeep, sumOp<label>());
+
+    Info<< "Keeping all cells in region " << keepRegionI
+        << " containing point " << keepPoint << endl
+        << "Selected for keeping : " << nCellsToKeep
+        << " cells." << endl;
+
+
+    // Remove cells
+    removeCells cellRemover(mesh_);
+
+    // Pick up patches for exposed faces
+    labelList exposedFaces(cellRemover.getExposedFaces(cellsToRemove));
+    labelList exposedPatches(exposedFaces.size());
+
+    forAll(exposedFaces, i)
+    {
+        label faceI = exposedFaces[i];
+
+        if (ownPatch[faceI] != -1)
+        {
+            exposedPatches[i] = ownPatch[faceI];
+        }
+        else
+        {
+            WarningIn("meshRefinement::splitMesh(..)")
+                << "For exposed face " << faceI
+                << " fc:" << mesh_.faceCentres()[faceI]
+                << " found no patch." << endl
+                << "    Taking patch " << defaultPatch
+                << " instead." << endl;
+            exposedPatches[i] = defaultPatch;
+        }
+    }
+
+    return doRemoveCells
+    (
+        cellsToRemove,
+        exposedFaces,
+        exposedPatches,
+        cellRemover
+    );
+}
+
+
+// Find boundary points that connect to more than one cell region and
+// split them.
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints()
+{
+    // Topochange container
+    directTopoChange meshMod(mesh_);
+
+
+    // Analyse which points need to be duplicated
+    localPointRegion regionSide(mesh_);
+
+    label nNonManifPoints = returnReduce
+    (
+        regionSide.meshPointMap().size(),
+        sumOp<label>()
+    );
+
+    Info<< "dupNonManifoldPoints : Found : " << nNonManifPoints
+        << " non-manifold points (out of "
+        << mesh_.globalData().nTotalPoints()
+        << ')' << endl;
+
+    // Topo change engine
+    duplicatePoints pointDuplicator(mesh_);
+
+    // Insert changes into meshMod
+    pointDuplicator.setRefinement(regionSide, meshMod);
+
+    // Change the mesh (no inflation, parallel sync)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+    // Update fields
+    mesh_.updateMesh(map);
+
+    // Move mesh if in inflation mode
+    if (map().hasMotionPoints())
+    {
+        mesh_.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh_.clearOut();
+    }
+
+    if (overwrite())
+    {
+        mesh_.setInstance(oldInstance());
+    }
+
+    // Update intersections. Is mapping only (no faces created, positions stay
+    // same) so no need to recalculate intersections.
+    updateMesh(map, labelList(0));
+
+    return map;
+}
+
+
+// Zoning
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
+(
+    const point& keepPoint,
+    const bool allowFreeStandingZoneFaces
+)
+{
+    const wordList& cellZoneNames = surfaces_.cellZoneNames();
+    const wordList& faceZoneNames = surfaces_.faceZoneNames();
+
+    labelList namedSurfaces(surfaces_.getNamedSurfaces());
+
+    boolList isNamedSurface(cellZoneNames.size(), false);
+
+    forAll(namedSurfaces, i)
+    {
+        label surfI = namedSurfaces[i];
+
+        isNamedSurface[surfI] = true;
+
+        Info<< "Surface : " << surfaces_.names()[surfI] << nl
+            << "    faceZone : " << faceZoneNames[surfI] << nl
+            << "    cellZone : " << cellZoneNames[surfI] << endl;
+    }
+
+
+    // Add zones to mesh
+
+    labelList surfaceToFaceZone(faceZoneNames.size(), -1);
+    {
+        faceZoneMesh& faceZones = mesh_.faceZones();
+
+        forAll(namedSurfaces, i)
+        {
+            label surfI = namedSurfaces[i];
+
+            label zoneI = faceZones.findZoneID(faceZoneNames[surfI]);
+
+            if (zoneI == -1)
+            {
+                zoneI = faceZones.size();
+                faceZones.setSize(zoneI+1);
+                faceZones.set
+                (
+                    zoneI,
+                    new faceZone
+                    (
+                        faceZoneNames[surfI],   //name
+                        labelList(0),           //addressing
+                        boolList(0),            //flipmap
+                        zoneI,                  //index
+                        faceZones               //faceZoneMesh
+                    )
+                );
+            }
+
+            if (debug)
+            {
+                Pout<< "Faces on " << surfaces_.names()[surfI]
+                    << " will go into faceZone " << zoneI << endl;
+            }
+            surfaceToFaceZone[surfI] = zoneI;
+        }
+
+        // Check they are synced
+        List<wordList> allFaceZones(Pstream::nProcs());
+        allFaceZones[Pstream::myProcNo()] = faceZones.names();
+        Pstream::gatherList(allFaceZones);
+        Pstream::scatterList(allFaceZones);
+
+        for (label procI = 1; procI < allFaceZones.size(); procI++)
+        {
+            if (allFaceZones[procI] != allFaceZones[0])
+            {
+                FatalErrorIn
+                (
+                    "meshRefinement::zonify"
+                    "(const label, const point&)"
+                )   << "Zones not synchronised among processors." << nl
+                    << " Processor0 has faceZones:" << allFaceZones[0]
+                    << " , processor" << procI
+                    << " has faceZones:" << allFaceZones[procI]
+                    << exit(FatalError);
+            }
+        }
+    }
+
+    labelList surfaceToCellZone(cellZoneNames.size(), -1);
+    {
+        cellZoneMesh& cellZones = mesh_.cellZones();
+
+        forAll(namedSurfaces, i)
+        {
+            label surfI = namedSurfaces[i];
+
+            label zoneI = cellZones.findZoneID(cellZoneNames[surfI]);
+
+            if (zoneI == -1)
+            {
+                zoneI = cellZones.size();
+                cellZones.setSize(zoneI+1);
+                cellZones.set
+                (
+                    zoneI,
+                    new cellZone
+                    (
+                        cellZoneNames[surfI],   //name
+                        labelList(0),           //addressing
+                        zoneI,                  //index
+                        cellZones               //cellZoneMesh
+                    )
+                );
+            }
+
+            if (debug)
+            {
+                Pout<< "Cells inside " << surfaces_.names()[surfI]
+                    << " will go into cellZone " << zoneI << endl;
+            }
+            surfaceToCellZone[surfI] = zoneI;
+        }
+
+        // Check they are synced
+        List<wordList> allCellZones(Pstream::nProcs());
+        allCellZones[Pstream::myProcNo()] = cellZones.names();
+        Pstream::gatherList(allCellZones);
+        Pstream::scatterList(allCellZones);
+
+        for (label procI = 1; procI < allCellZones.size(); procI++)
+        {
+            if (allCellZones[procI] != allCellZones[0])
+            {
+                FatalErrorIn
+                (
+                    "meshRefinement::zonify"
+                    "(const label, const point&)"
+                )   << "Zones not synchronised among processors." << nl
+                    << " Processor0 has cellZones:" << allCellZones[0]
+                    << " , processor" << procI
+                    << " has cellZones:" << allCellZones[procI]
+                    << exit(FatalError);
+            }
+        }
+    }
+
+
+
+    const pointField& cellCentres = mesh_.cellCentres();
+    const labelList& faceOwner = mesh_.faceOwner();
+    const labelList& faceNeighbour = mesh_.faceNeighbour();
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+
+    // Mark faces intersecting zoned surfaces
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+    // Like surfaceIndex_ but only for named surfaces.
+    labelList namedSurfaceIndex(mesh_.nFaces(), -1);
+
+    {
+        // Statistics: number of faces per faceZone
+        labelList nSurfFaces(faceZoneNames.size(), 0);
+
+        // Swap neighbouring cell centres and cell level
+        labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+        pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+        calcNeighbourData(neiLevel, neiCc);
+
+        // Note: for all internal faces? internal + coupled?
+        // Since zonify is run after baffling the surfaceIndex_ on baffles is
+        // not synchronised across both baffle faces. Fortunately we don't
+        // do zonify baffle faces anyway (they are normal boundary faces).
+
+        // Collect candidate faces
+        // ~~~~~~~~~~~~~~~~~~~~~~~
+
+        labelList testFaces(intersectedFaces());
+
+        // Collect segments
+        // ~~~~~~~~~~~~~~~~
+
+        pointField start(testFaces.size());
+        pointField end(testFaces.size());
+
+        forAll(testFaces, i)
+        {
+            label faceI = testFaces[i];
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                start[i] = cellCentres[faceOwner[faceI]];
+                end[i] = cellCentres[faceNeighbour[faceI]];
+            }
+            else
+            {
+                start[i] = cellCentres[faceOwner[faceI]];
+                end[i] = neiCc[faceI-mesh_.nInternalFaces()];
+            }
+        }
+
+
+        // Do test for intersections
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~
+        // Note that we intersect all intersected faces again. Could reuse
+        // the information already in surfaceIndex_.
+
+        labelList surface1;
+        labelList surface2;
+        {
+            List<pointIndexHit> hit1;
+            labelList region1;
+            List<pointIndexHit> hit2;
+            labelList region2;
+            surfaces_.findNearestIntersection
+            (
+                namedSurfaces,
+                start,
+                end,
+
+                surface1,
+                hit1,
+                region1,
+                surface2,
+                hit2,
+                region2
+            );
+        }
+
+        forAll(testFaces, i)
+        {
+            label faceI = testFaces[i];
+
+            if (surface1[i] != -1)
+            {
+                // If both hit should probably choose nearest. For later.
+                namedSurfaceIndex[faceI] = surface1[i];
+                nSurfFaces[surface1[i]]++;
+            }
+            else if (surface2[i] != -1)
+            {
+                namedSurfaceIndex[faceI] = surface2[i];
+                nSurfFaces[surface2[i]]++;
+            }
+        }
+
+
+        // surfaceIndex migh have different surfaces on both sides if
+        // there happen to be a (obviously thin) surface with different
+        // regions between the cell centres. If one is on a named surface
+        // and the other is not this might give problems so sync.
+        syncTools::syncFaceList
+        (
+            mesh_,
+            namedSurfaceIndex,
+            maxEqOp<label>(),
+            false
+        );
+
+        // Print a bit
+        if (debug)
+        {
+            forAll(nSurfFaces, surfI)
+            {
+                Pout<< "Surface:"
+                    << surfaces_.names()[surfI]
+                    << "  nZoneFaces:" << nSurfFaces[surfI] << nl;
+            }
+            Pout<< endl;
+        }
+    }
+
+
+    // Put the cells into the correct zone
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Closed surfaces with cellZone specified.
+    labelList closedNamedSurfaces(surfaces_.getClosedNamedSurfaces());
+
+    // Zone per cell:
+    // -2 : unset
+    // -1 : not in any zone
+    // >=0: zoneID
+    labelList cellToZone(mesh_.nCells(), -2);
+
+
+    // Set using geometric test
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    if (closedNamedSurfaces.size())
+    {
+        findCellZoneGeometric
+        (
+            closedNamedSurfaces,   // indices of closed surfaces
+            namedSurfaceIndex,     // per face index of named surface
+            surfaceToCellZone,     // cell zone index per surface
+            cellToZone
+        );
+    }
+
+    // Set using walking
+    // ~~~~~~~~~~~~~~~~~
+
+    //if (returnReduce(nSet, sumOp<label>()) < mesh_.globalData().nTotalCells())
+    {
+        // Topological walk
+        findCellZoneTopo
+        (
+            keepPoint,
+            namedSurfaceIndex,
+            surfaceToCellZone,
+            cellToZone
+        );
+    }
+
+
+    // Make sure namedSurfaceIndex is unset inbetween same cell cell zones.
+    if (!allowFreeStandingZoneFaces)
+    {
+        makeConsistentFaceIndex(cellToZone, namedSurfaceIndex);
+    }
+
+    // Topochange container
+    directTopoChange meshMod(mesh_);
+
+
+    // Put the faces into the correct zone
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        label surfI = namedSurfaceIndex[faceI];
+
+        if (surfI != -1)
+        {
+            // Orient face zone to have slave cells in max cell zone.
+            label ownZone = cellToZone[faceOwner[faceI]];
+            label neiZone = cellToZone[faceNeighbour[faceI]];
+
+            bool flip;
+            if (ownZone == max(ownZone, neiZone))
+            {
+                flip = false;
+            }
+            else
+            {
+                flip = true;
+            }
+
+            meshMod.setAction
+            (
+                polyModifyFace
+                (
+                    mesh_.faces()[faceI],           // modified face
+                    faceI,                          // label of face
+                    faceOwner[faceI],               // owner
+                    faceNeighbour[faceI],           // neighbour
+                    false,                          // face flip
+                    -1,                             // patch for face
+                    false,                          // remove from zone
+                    surfaceToFaceZone[surfI],       // zone for face
+                    flip                            // face flip in zone
+                )
+            );
+        }
+    }
+
+    // Get coupled neighbour cellZone. Set to -1 on non-coupled patches.
+    labelList neiCellZone(mesh_.nFaces()-mesh_.nInternalFaces(), -1);
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start()+i;
+                neiCellZone[faceI-mesh_.nInternalFaces()] =
+                    cellToZone[mesh_.faceOwner()[faceI]];
+            }
+        }
+    }
+    syncTools::swapBoundaryFaceList(mesh_, neiCellZone, false);
+
+    // Get per face whether is it master (of a coupled set of faces)
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
+
+    // Set owner as no-flip
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        label faceI = pp.start();
+
+        forAll(pp, i)
+        {
+            label surfI = namedSurfaceIndex[faceI];
+
+            if (surfI != -1)
+            {
+                label ownZone = cellToZone[faceOwner[faceI]];
+                label neiZone = neiCellZone[faceI-mesh_.nInternalFaces()];
+
+                bool flip;
+
+                label maxZone = max(ownZone, neiZone);
+
+                if (maxZone == -1)
+                {
+                    flip = false;
+                }
+                else if (ownZone == neiZone)
+                {
+                    // Free-standing zone face or coupled boundary. Keep master
+                    // face unflipped.
+                    flip = !isMasterFace[faceI];
+                }
+                else if (neiZone == maxZone)
+                {
+                    flip = true;
+                }
+                else
+                {
+                    flip = false;
+                }
+
+                meshMod.setAction
+                (
+                    polyModifyFace
+                    (
+                        mesh_.faces()[faceI],           // modified face
+                        faceI,                          // label of face
+                        faceOwner[faceI],               // owner
+                        -1,                             // neighbour
+                        false,                          // face flip
+                        patchI,                         // patch for face
+                        false,                          // remove from zone
+                        surfaceToFaceZone[surfI],       // zone for face
+                        flip                            // face flip in zone
+                    )
+                );
+            }
+            faceI++;
+        }
+    }
+
+
+    // Put the cells into the correct zone
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    forAll(cellToZone, cellI)
+    {
+        label zoneI = cellToZone[cellI];
+
+        if (zoneI >= 0)
+        {
+            meshMod.setAction
+            (
+                polyModifyCell
+                (
+                    cellI,
+                    false,          // removeFromZone
+                    zoneI
+                )
+            );
+        }
+    }
+
+    // Change the mesh (no inflation, parallel sync)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+    // Update fields
+    mesh_.updateMesh(map);
+
+    // Move mesh if in inflation mode
+    if (map().hasMotionPoints())
+    {
+        mesh_.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh_.clearOut();
+    }
+
+    if (overwrite())
+    {
+        mesh_.setInstance(oldInstance());
+    }
+
+    // None of the faces has changed, only the zones. Still...
+    updateMesh(map, labelList());
+
+    return map;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
new file mode 100644
index 000000000..661051e86
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
@@ -0,0 +1,246 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*----------------------------------------------------------------------------*/
+
+#include "meshRefinement.H"
+#include "combineFaces.H"
+#include "directTopoChange.H"
+#include "removePoints.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Merge faces that are in-line.
+Foam::label Foam::meshRefinement::mergePatchFaces
+(
+    const scalar minCos,
+    const scalar concaveCos,
+    const labelList& patchIDs
+)
+{
+    // Patch face merging engine
+    combineFaces faceCombiner(mesh_);
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Pick up all candidate cells on boundary
+    labelHashSet boundaryCells(mesh_.nFaces()-mesh_.nInternalFaces());
+
+    forAll(patchIDs, i)
+    {
+        label patchI = patchIDs[i];
+
+        const polyPatch& patch = patches[patchI];
+
+        if (!patch.coupled())
+        {
+            forAll(patch, i)
+            {
+                boundaryCells.insert(mesh_.faceOwner()[patch.start()+i]);
+            }
+        }
+    }
+
+    // Get all sets of faces that can be merged
+    labelListList mergeSets
+    (
+        faceCombiner.getMergeSets
+        (
+            minCos,
+            concaveCos,
+            boundaryCells
+        )
+    );
+
+    label nFaceSets = returnReduce(mergeSets.size(), sumOp<label>());
+
+    Info<< "mergePatchFaces : Merging " << nFaceSets
+        << " sets of faces." << endl;
+
+    if (nFaceSets > 0)
+    {
+        // Topology changes container
+        directTopoChange meshMod(mesh_);
+
+        // Merge all faces of a set into the first face of the set. Remove
+        // unused points.
+        faceCombiner.setRefinement(mergeSets, meshMod);
+
+        // Change the mesh (no inflation)
+        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh (since morphing does not do this)
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
+        else
+        {
+            // Delete mesh volumes. No other way to do this?
+            mesh_.clearOut();
+        }
+
+        if (overwrite())
+        {
+            mesh_.setInstance(oldInstance());
+        }
+
+        faceCombiner.updateMesh(map);
+
+        // Get the kept faces that need to be recalculated.
+        // Merging two boundary faces might shift the cell centre
+        // (unless the faces are absolutely planar)
+        labelHashSet retestFaces(6*mergeSets.size());
+
+        forAll(mergeSets, setI)
+        {
+            label oldMasterI = mergeSets[setI][0];
+
+            label faceI = map().reverseFaceMap()[oldMasterI];
+
+            // faceI is always uncoupled boundary face
+            const cell& cFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
+
+            forAll(cFaces, i)
+            {
+                retestFaces.insert(cFaces[i]);
+            }
+        }
+        updateMesh(map, retestFaces.toc());
+    }
+
+
+    return nFaceSets;
+}
+
+
+// Remove points not used by any face or points used by only two faces where
+// the edges are in line
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeEdges
+(
+    const scalar minCos
+)
+{
+    // Point removal analysis engine
+    removePoints pointRemover(mesh_);
+
+    // Count usage of points
+    boolList pointCanBeDeleted;
+    label nRemove = pointRemover.countPointUsage(minCos, pointCanBeDeleted);
+
+    Info<< "Removing " << nRemove
+        << " straight edge points." << endl;
+
+    autoPtr<mapPolyMesh> map;
+
+    if (nRemove > 0)
+    {
+        // Save my local faces that will change. These changed faces might
+        // cause a shift in the cell centre which needs to be retested.
+        // Have to do this before changing mesh since point will be removed.
+        labelHashSet retestOldFaces(nRemove / Pstream::nProcs());
+
+        {
+            const faceList& faces = mesh_.faces();
+
+            forAll(faces, faceI)
+            {
+                const face& f = faces[faceI];
+
+                forAll(f, fp)
+                {
+                    if (pointCanBeDeleted[f[fp]])
+                    {
+                        retestOldFaces.insert(faceI);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // Topology changes container
+        directTopoChange meshMod(mesh_);
+
+        pointRemover.setRefinement(pointCanBeDeleted, meshMod);
+
+        // Change the mesh (no inflation)
+        map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh (since morphing does not do this)
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
+        else
+        {
+            // Delete mesh volumes. No other way to do this?
+            mesh_.clearOut();
+        }
+
+        if (overwrite())
+        {
+            mesh_.setInstance(oldInstance());
+        }
+
+        pointRemover.updateMesh(map);
+
+        // Get the kept faces that need to be recalculated.
+        labelHashSet retestFaces(6*retestOldFaces.size());
+
+        const cellList& cells = mesh_.cells();
+
+        forAllConstIter(labelHashSet, retestOldFaces, iter)
+        {
+            label faceI = map().reverseFaceMap()[iter.key()];
+
+            const cell& ownFaces = cells[mesh_.faceOwner()[faceI]];
+
+            forAll(ownFaces, i)
+            {
+                retestFaces.insert(ownFaces[i]);
+            }
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                const cell& neiFaces = cells[mesh_.faceNeighbour()[faceI]];
+
+                forAll(neiFaces, i)
+                {
+                    retestFaces.insert(neiFaces[i]);
+                }
+            }
+        }
+        updateMesh(map, retestFaces.toc());
+    }
+
+    return map;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
new file mode 100644
index 000000000..2b918ead8
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -0,0 +1,1129 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "meshRefinement.H"
+#include "fvMesh.H"
+#include "syncTools.H"
+#include "Time.H"
+#include "refinementSurfaces.H"
+#include "pointSet.H"
+#include "faceSet.H"
+#include "indirectPrimitivePatch.H"
+#include "OFstream.H"
+#include "cellSet.H"
+#include "searchableSurfaces.H"
+#include "polyMeshGeometry.H"
+#include "IOmanip.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::meshRefinement::markBoundaryFace
+(
+    const label faceI,
+    boolList& isBoundaryFace,
+    boolList& isBoundaryEdge,
+    boolList& isBoundaryPoint
+) const
+{
+    isBoundaryFace[faceI] = true;
+
+    const labelList& fEdges = mesh_.faceEdges(faceI);
+
+    forAll(fEdges, fp)
+    {
+        isBoundaryEdge[fEdges[fp]] = true;
+    }
+
+    const face& f = mesh_.faces()[faceI];
+
+    forAll(f, fp)
+    {
+        isBoundaryPoint[f[fp]] = true;
+    }
+}
+
+
+void Foam::meshRefinement::findNearest
+(
+    const labelList& meshFaces,
+    List<pointIndexHit>& nearestInfo,
+    labelList& nearestSurface,
+    labelList& nearestRegion,
+    vectorField& nearestNormal
+) const
+{
+    pointField fc(meshFaces.size());
+    forAll(meshFaces, i)
+    {
+        fc[i] = mesh_.faceCentres()[meshFaces[i]];
+    }
+
+    const labelList allSurfaces(identity(surfaces_.surfaces().size()));
+
+    surfaces_.findNearest
+    (
+        allSurfaces,
+        fc,
+        scalarField(fc.size(), sqr(GREAT)),    // sqr of attraction
+        nearestSurface,
+        nearestInfo
+    );
+
+    // Do normal testing per surface.
+    nearestNormal.setSize(nearestInfo.size());
+    nearestRegion.setSize(nearestInfo.size());
+
+    forAll(allSurfaces, surfI)
+    {
+        DynamicList<pointIndexHit> localHits;
+
+        forAll(nearestSurface, i)
+        {
+            if (nearestSurface[i] == surfI)
+            {
+                localHits.append(nearestInfo[i]);
+            }
+        }
+
+        label geomI = surfaces_.surfaces()[surfI];
+
+        pointField localNormals;
+        surfaces_.geometry()[geomI].getNormal(localHits, localNormals);
+
+        labelList localRegion;
+        surfaces_.geometry()[geomI].getRegion(localHits, localRegion);
+
+        label localI = 0;
+        forAll(nearestSurface, i)
+        {
+            if (nearestSurface[i] == surfI)
+            {
+                nearestNormal[i] = localNormals[localI];
+                nearestRegion[i] = localRegion[localI];
+                localI++;
+            }
+        }
+    }
+}
+
+
+Foam::Map<Foam::label> Foam::meshRefinement::findEdgeConnectedProblemCells
+(
+    const scalarField& perpendicularAngle,
+    const labelList& globalToPatch
+) const
+{
+    // Construct addressing engine from all patches added for meshing.
+    autoPtr<indirectPrimitivePatch> ppPtr
+    (
+        meshRefinement::makePatch
+        (
+            mesh_,
+            meshedPatches()
+        )
+    );
+    const indirectPrimitivePatch& pp = ppPtr();
+
+
+    // 1. Collect faces to test
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    DynamicList<label> candidateFaces(pp.size()/20);
+
+    const labelListList& edgeFaces = pp.edgeFaces();
+
+    const labelList& cellLevel = meshCutter_.cellLevel();
+
+    forAll(edgeFaces, edgeI)
+    {
+        const labelList& eFaces = edgeFaces[edgeI];
+
+        if (eFaces.size() == 2)
+        {
+            label face0 = pp.addressing()[eFaces[0]];
+            label face1 = pp.addressing()[eFaces[1]];
+
+            label cell0 = mesh_.faceOwner()[face0];
+            label cell1 = mesh_.faceOwner()[face1];
+
+            if (cellLevel[cell0] > cellLevel[cell1])
+            {
+                // cell0 smaller.
+                const vector& n0 = pp.faceNormals()[eFaces[0]];
+                const vector& n1 = pp.faceNormals()[eFaces[1]];
+
+                if (mag(n0 & n1) < 0.1)
+                {
+                    candidateFaces.append(face0);
+                }
+            }
+            else if (cellLevel[cell1] > cellLevel[cell0])
+            {
+                // cell1 smaller.
+                const vector& n0 = pp.faceNormals()[eFaces[0]];
+                const vector& n1 = pp.faceNormals()[eFaces[1]];
+
+                if (mag(n0 & n1) < 0.1)
+                {
+                    candidateFaces.append(face1);
+                }
+            }
+        }
+    }
+    candidateFaces.shrink();
+
+    Info<< "Testing " << returnReduce(candidateFaces.size(), sumOp<label>())
+        << " faces on edge-connected cells of differing level."
+        << endl;
+
+    if (debug)
+    {
+        faceSet fSet
+        (
+            mesh_,
+            "edgeConnectedFaces",
+            labelHashSet(candidateFaces)
+        );
+        Pout<< "Writing " << fSet.size()
+            << " with problematic topology to faceSet "
+            << fSet.objectPath() << endl;
+        fSet.write();
+    }
+
+
+    // 2. Find nearest surface on candidate faces
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    List<pointIndexHit> nearestInfo;
+    labelList nearestSurface;
+    labelList nearestRegion;
+    vectorField nearestNormal;
+    findNearest
+    (
+        candidateFaces,
+        nearestInfo,
+        nearestSurface,
+        nearestRegion,
+        nearestNormal
+    );
+
+
+    // 3. Test angle to surface
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Map<label> candidateCells(candidateFaces.size());
+
+    faceSet perpFaces(mesh_, "perpendicularFaces", pp.size()/100);
+
+    forAll(candidateFaces, i)
+    {
+        label faceI = candidateFaces[i];
+
+        vector n = mesh_.faceAreas()[faceI];
+        n /= mag(n);
+
+        label region = surfaces_.globalRegion
+        (
+            nearestSurface[i],
+            nearestRegion[i]
+        );
+
+        scalar angle =
+            perpendicularAngle[region]
+          / 180.0
+          * mathematicalConstant::pi;
+
+        if (angle >= 0)
+        {
+            if (mag(n & nearestNormal[i]) < Foam::sin(angle))
+            {
+                perpFaces.insert(faceI);
+                candidateCells.insert
+                (
+                    mesh_.faceOwner()[faceI],
+                    globalToPatch[region]
+                );
+            }
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< "Writing " << perpFaces.size()
+            << " faces that are perpendicular to the surface to set "
+            << perpFaces.objectPath() << endl;
+        perpFaces.write();
+    }
+    return candidateCells;
+}
+
+
+// Check if moving face to new points causes a 'collapsed' face.
+// Uses new point position only for the face, not the neighbouring
+// cell centres
+bool Foam::meshRefinement::isCollapsedFace
+(
+    const pointField& points,
+    const pointField& neiCc,
+    const scalar minFaceArea,
+    const scalar maxNonOrtho,
+    const label faceI
+) const
+{
+    vector s = mesh_.faces()[faceI].normal(points);
+    scalar magS = mag(s);
+
+    // Check face area
+    if (magS < minFaceArea)
+    {
+        return true;
+    }
+
+    // Check orthogonality
+    const point& ownCc = mesh_.cellCentres()[mesh_.faceOwner()[faceI]];
+
+    if (mesh_.isInternalFace(faceI))
+    {
+        label nei = mesh_.faceNeighbour()[faceI];
+        vector d = ownCc - mesh_.cellCentres()[nei];
+
+        scalar dDotS = (d & s)/(mag(d)*magS + VSMALL);
+
+        if (dDotS < maxNonOrtho)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    else
+    {
+        label patchI = mesh_.boundaryMesh().whichPatch(faceI);
+
+        if (mesh_.boundaryMesh()[patchI].coupled())
+        {
+            vector d = ownCc - neiCc[faceI-mesh_.nInternalFaces()];
+
+            scalar dDotS = (d & s)/(mag(d)*magS + VSMALL);
+
+            if (dDotS < maxNonOrtho)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        else
+        {
+            // Collapsing normal boundary face does not cause problems with
+            // non-orthogonality
+            return true;
+        }
+    }
+}
+
+
+// Check if moving cell to new points causes it to collapse.
+bool Foam::meshRefinement::isCollapsedCell
+(
+    const pointField& points,
+    const scalar volFraction,
+    const label cellI
+) const
+{
+    scalar vol = mesh_.cells()[cellI].mag(points, mesh_.faces());
+
+    if (vol/mesh_.cellVolumes()[cellI] < volFraction)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// Returns list with for every internal face -1 or the patch they should
+// be baffled into. Gets run after createBaffles so all the unzoned surface
+// intersections have already been turned into baffles. (Note: zoned surfaces
+// are not baffled at this stage)
+// Used to remove cells by baffling all their faces and have the
+// splitMeshRegions chuck away non used regions.
+Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
+(
+    const dictionary& motionDict,
+    const bool removeEdgeConnectedCells,
+    const scalarField& perpendicularAngle,
+    const labelList& globalToPatch
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const labelList& pointLevel = meshCutter_.pointLevel();
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Per internal face (boundary faces not used) the patch that the
+    // baffle should get (or -1)
+    labelList facePatch(mesh_.nFaces(), -1);
+
+    // Mark all points and edges on baffle patches (so not on any inlets,
+    // outlets etc.)
+    boolList isBoundaryPoint(mesh_.nPoints(), false);
+    boolList isBoundaryEdge(mesh_.nEdges(), false);
+    boolList isBoundaryFace(mesh_.nFaces(), false);
+
+    // Fill boundary data. All elements on meshed patches get marked.
+    // Get the labels of added patches.
+    labelList adaptPatchIDs(meshedPatches());
+
+    forAll(adaptPatchIDs, i)
+    {
+        label patchI = adaptPatchIDs[i];
+
+        const polyPatch& pp = patches[patchI];
+
+        label faceI = pp.start();
+
+        forAll(pp, j)
+        {
+            markBoundaryFace
+            (
+                faceI,
+                isBoundaryFace,
+                isBoundaryEdge,
+                isBoundaryPoint
+            );
+
+            faceI++;
+        }
+    }
+
+    // Swap neighbouring cell centres and cell level
+    labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+    pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+    calcNeighbourData(neiLevel, neiCc);
+
+
+    // Count of faces marked for baffling
+    label nBaffleFaces = 0;
+
+    // Count of faces not baffled since would not cause a collapse
+    label nPrevented = 0;
+
+    if (removeEdgeConnectedCells && max(perpendicularAngle) >= 0)
+    {
+        Info<< "markFacesOnProblemCells :"
+            << " Checking for edge-connected cells of highly differing sizes."
+            << endl;
+
+        // Pick up the cells that need to be removed and (a guess for)
+        // the patch they should be patched with.
+        Map<label> problemCells
+        (
+            findEdgeConnectedProblemCells
+            (
+                perpendicularAngle,
+                globalToPatch
+            )
+        );
+
+        // Baffle all faces of cells that need to be removed
+        forAllConstIter(Map<label>, problemCells, iter)
+        {
+            const cell& cFaces = mesh_.cells()[iter.key()];
+
+            forAll(cFaces, i)
+            {
+                label faceI = cFaces[i];
+
+                if (facePatch[faceI] == -1 && mesh_.isInternalFace(faceI))
+                {
+                    facePatch[faceI] = getBafflePatch(facePatch, faceI);
+                    nBaffleFaces++;
+
+                    // Mark face as a 'boundary'
+                    markBoundaryFace
+                    (
+                        faceI,
+                        isBoundaryFace,
+                        isBoundaryEdge,
+                        isBoundaryPoint
+                    );
+                }
+            }
+        }
+        Info<< "markFacesOnProblemCells : Marked "
+            << returnReduce(nBaffleFaces, sumOp<label>())
+            << " additional internal faces to be converted into baffles"
+            << " due to "
+            << returnReduce(problemCells.size(), sumOp<label>())
+            << " cells edge-connected to lower level cells." << endl;
+
+        if (debug)
+        {
+            cellSet problemCellSet
+            (
+                mesh_,
+                "problemCells",
+                labelHashSet(problemCells.toc())
+            );
+            Pout<< "Writing " << problemCellSet.size()
+                << " cells that are edge connected to coarser cell to set "
+                << problemCellSet.objectPath() << endl;
+            problemCellSet.write();
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        mesh_,
+        isBoundaryPoint,
+        orEqOp<bool>(),
+        false,              // null value
+        false               // no separation
+    );
+
+    syncTools::syncEdgeList
+    (
+        mesh_,
+        isBoundaryEdge,
+        orEqOp<bool>(),
+        false,              // null value
+        false               // no separation
+    );
+
+    syncTools::syncFaceList
+    (
+        mesh_,
+        isBoundaryFace,
+        orEqOp<bool>(),
+        false               // no separation
+    );
+
+
+    // See if checking for collapse
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Collapse checking parameters
+    scalar volFraction = -1;
+    if (motionDict.found("minVolCollapseRatio"))
+    {
+        volFraction = readScalar(motionDict.lookup("minVolCollapseRatio"));
+    }
+    const bool checkCollapse = (volFraction > 0);
+    scalar minArea = -1;
+    scalar maxNonOrtho = -1;
+
+
+    // Find nearest (non-baffle) surface
+    pointField newPoints;
+
+    if (checkCollapse)
+    {
+        minArea = readScalar(motionDict.lookup("minArea"));
+        maxNonOrtho = readScalar(motionDict.lookup("maxNonOrtho"));
+
+        Info<< "markFacesOnProblemCells :"
+            << " Deleting all-anchor surface cells only if"
+            << "snapping them violates mesh quality constraints:" << nl
+            << "    snapped/original cell volume < " << volFraction << nl
+            << "    face area                    < " << minArea << nl
+            << "    non-orthogonality            > " << maxNonOrtho << nl
+            << endl;
+
+        // Construct addressing engine.
+        autoPtr<indirectPrimitivePatch> ppPtr
+        (
+            meshRefinement::makePatch
+            (
+                mesh_,
+                adaptPatchIDs
+            )
+        );
+        const indirectPrimitivePatch& pp = ppPtr();
+        const pointField& localPoints = pp.localPoints();
+        const labelList& meshPoints = pp.meshPoints();
+
+        List<pointIndexHit> hitInfo;
+        labelList hitSurface;
+        surfaces_.findNearest
+        (
+            surfaces_.getUnnamedSurfaces(),
+            localPoints,
+            scalarField(localPoints.size(), sqr(GREAT)),    // sqr of attraction
+            hitSurface,
+            hitInfo
+        );
+
+        // Start of from current points
+        newPoints = mesh_.points();
+
+        forAll(hitInfo, i)
+        {
+            if (hitInfo[i].hit())
+            {
+                newPoints[meshPoints[i]] = hitInfo[i].hitPoint();
+            }
+        }
+    }
+
+
+
+    // For each cell count the number of anchor points that are on
+    // the boundary:
+    // 8 : check the number of (baffle) boundary faces. If 3 or more block
+    //     off the cell since the cell would get squeezed down to a diamond
+    //     (probably; if the 3 or more faces are unrefined (only use the
+    //      anchor points))
+    // 7 : store. Used to check later on whether there are points with
+    //     3 or more of these cells. (note that on a flat surface a boundary
+    //     point will only have 4 cells connected to it)
+
+
+    // Does cell have exactly 7 of its 8 anchor points on the boundary?
+    PackedBoolList hasSevenBoundaryAnchorPoints(mesh_.nCells());
+    // If so what is the remaining non-boundary anchor point?
+    labelHashSet nonBoundaryAnchors(mesh_.nCells()/10000);
+
+    // On-the-fly addressing storage.
+    DynamicList<label> dynFEdges;
+    DynamicList<label> dynCPoints;
+
+    forAll(cellLevel, cellI)
+    {
+        const labelList& cPoints = mesh_.cellPoints(cellI, dynCPoints);
+
+        // Get number of anchor points (pointLevel <= cellLevel)
+
+        label nBoundaryAnchors = 0;
+        label nNonAnchorBoundary = 0;
+        label nonBoundaryAnchor = -1;
+
+        forAll(cPoints, i)
+        {
+            label pointI = cPoints[i];
+
+            if (pointLevel[pointI] <= cellLevel[cellI])
+            {
+                // Anchor point
+                if (isBoundaryPoint[pointI])
+                {
+                    nBoundaryAnchors++;
+                }
+                else
+                {
+                    // Anchor point which is not on the surface
+                    nonBoundaryAnchor = pointI;
+                }
+            }
+            else if (isBoundaryPoint[pointI])
+            {
+                nNonAnchorBoundary++;
+            }
+        }
+
+        if (nBoundaryAnchors == 8)
+        {
+            const cell& cFaces = mesh_.cells()[cellI];
+
+            // Count boundary faces.
+            label nBfaces = 0;
+
+            forAll(cFaces, cFaceI)
+            {
+                if (isBoundaryFace[cFaces[cFaceI]])
+                {
+                    nBfaces++;
+                }
+            }
+
+            // If nBfaces > 1 make all non-boundary non-baffle faces baffles.
+            // We assume that this situation is where there is a single
+            // cell sticking out which would get flattened.
+
+            // Eugene: delete cell no matter what.
+            //if (nBfaces > 1)
+            {
+                if
+                (
+                    checkCollapse
+                && !isCollapsedCell(newPoints, volFraction, cellI)
+                )
+                {
+                    nPrevented++;
+                    //Pout<< "Preventing collapse of 8 anchor point cell "
+                    //    << cellI << " at " << mesh_.cellCentres()[cellI]
+                    //    << " since new volume "
+                    //    << mesh_.cells()[cellI].mag(newPoints, mesh_.faces())
+                    //    << " old volume " << mesh_.cellVolumes()[cellI]
+                    //    << endl;
+                }
+                else
+                {
+                    // Block all faces of cell
+                    forAll(cFaces, cf)
+                    {
+                        label faceI = cFaces[cf];
+
+                        if
+                        (
+                            facePatch[faceI] == -1
+                         && mesh_.isInternalFace(faceI)
+                        )
+                        {
+                            facePatch[faceI] = getBafflePatch(facePatch, faceI);
+                            nBaffleFaces++;
+
+                            // Mark face as a 'boundary'
+                            markBoundaryFace
+                            (
+                                faceI,
+                                isBoundaryFace,
+                                isBoundaryEdge,
+                                isBoundaryPoint
+                            );
+                        }
+                    }
+                }
+            }
+        }
+        else if (nBoundaryAnchors == 7)
+        {
+            // Mark the cell. Store the (single!) non-boundary anchor point.
+            hasSevenBoundaryAnchorPoints.set(cellI, 1u);
+            nonBoundaryAnchors.insert(nonBoundaryAnchor);
+        }
+    }
+
+
+    // Loop over all points. If a point is connected to 4 or more cells
+    // with 7 anchor points on the boundary set those cell's non-boundary faces
+    // to baffles
+
+    DynamicList<label> dynPCells;
+
+    forAllConstIter(labelHashSet, nonBoundaryAnchors, iter)
+    {
+        label pointI = iter.key();
+
+        const labelList& pCells = mesh_.pointCells(pointI, dynPCells);
+
+        // Count number of 'hasSevenBoundaryAnchorPoints' cells.
+        label n = 0;
+
+        forAll(pCells, i)
+        {
+            if (hasSevenBoundaryAnchorPoints.get(pCells[i]) == 1u)
+            {
+                n++;
+            }
+        }
+
+        if (n > 3)
+        {
+            // Point in danger of being what? Remove all 7-cells.
+            forAll(pCells, i)
+            {
+                label cellI = pCells[i];
+
+                if (hasSevenBoundaryAnchorPoints.get(cellI) == 1u)
+                {
+                    if
+                    (
+                        checkCollapse
+                    && !isCollapsedCell(newPoints, volFraction, cellI)
+                    )
+                    {
+                        nPrevented++;
+                        //Pout<< "Preventing collapse of 7 anchor cell "
+                        //    << cellI
+                        //    << " at " << mesh_.cellCentres()[cellI]
+                        //    << " since new volume "
+                        //    << mesh_.cells()[cellI].mag
+                        //        (newPoints, mesh_.faces())
+                        //    << " old volume " << mesh_.cellVolumes()[cellI]
+                        //    << endl;
+                    }
+                    else
+                    {
+                        const cell& cFaces = mesh_.cells()[cellI];
+
+                        forAll(cFaces, cf)
+                        {
+                            label faceI = cFaces[cf];
+
+                            if
+                            (
+                                facePatch[faceI] == -1
+                             && mesh_.isInternalFace(faceI)
+                            )
+                            {
+                                facePatch[faceI] = getBafflePatch
+                                (
+                                    facePatch,
+                                    faceI
+                                );
+                                nBaffleFaces++;
+
+                                // Mark face as a 'boundary'
+                                markBoundaryFace
+                                (
+                                    faceI,
+                                    isBoundaryFace,
+                                    isBoundaryEdge,
+                                    isBoundaryPoint
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    // Sync all. (note that pointdata and facedata not used anymore but sync
+    // anyway)
+
+    syncTools::syncPointList
+    (
+        mesh_,
+        isBoundaryPoint,
+        orEqOp<bool>(),
+        false,              // null value
+        false               // no separation
+    );
+
+    syncTools::syncEdgeList
+    (
+        mesh_,
+        isBoundaryEdge,
+        orEqOp<bool>(),
+        false,              // null value
+        false               // no separation
+    );
+
+    syncTools::syncFaceList
+    (
+        mesh_,
+        isBoundaryFace,
+        orEqOp<bool>(),
+        false               // no separation
+    );
+
+
+    // Find faces with all edges on the boundary and make them baffles
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        if (facePatch[faceI] == -1)
+        {
+            const labelList& fEdges = mesh_.faceEdges(faceI, dynFEdges);
+            label nFaceBoundaryEdges = 0;
+
+            forAll(fEdges, fe)
+            {
+                if (isBoundaryEdge[fEdges[fe]])
+                {
+                    nFaceBoundaryEdges++;
+                }
+            }
+
+            if (nFaceBoundaryEdges == fEdges.size())
+            {
+                if
+                (
+                    checkCollapse
+                && !isCollapsedFace
+                    (
+                        newPoints,
+                        neiCc,
+                        minArea,
+                        maxNonOrtho,
+                        faceI
+                    )
+                )
+                {
+                    nPrevented++;
+                    //Pout<< "Preventing collapse of face " << faceI
+                    //    << " with all boundary edges "
+                    //    << " at " << mesh_.faceCentres()[faceI]
+                    //    << endl;
+                }
+                else
+                {
+                    facePatch[faceI] = getBafflePatch(facePatch, faceI);
+                    nBaffleFaces++;
+
+                    // Do NOT update boundary data since this would grow blocked
+                    // faces across gaps.
+                }
+            }
+        }
+    }
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            label faceI = pp.start();
+
+            forAll(pp, i)
+            {
+                if (facePatch[faceI] == -1)
+                {
+                    const labelList& fEdges = mesh_.faceEdges(faceI, dynFEdges);
+                    label nFaceBoundaryEdges = 0;
+
+                    forAll(fEdges, fe)
+                    {
+                        if (isBoundaryEdge[fEdges[fe]])
+                        {
+                            nFaceBoundaryEdges++;
+                        }
+                    }
+
+                    if (nFaceBoundaryEdges == fEdges.size())
+                    {
+                        if
+                        (
+                            checkCollapse
+                        && !isCollapsedFace
+                            (
+                                newPoints,
+                                neiCc,
+                                minArea,
+                                maxNonOrtho,
+                                faceI
+                            )
+                        )
+                        {
+                            nPrevented++;
+                            //Pout<< "Preventing collapse of coupled face "
+                            //    << faceI
+                            //    << " with all boundary edges "
+                            //    << " at " << mesh_.faceCentres()[faceI]
+                            //    << endl;
+                        }
+                        else
+                        {
+                            facePatch[faceI] = getBafflePatch(facePatch, faceI);
+                            nBaffleFaces++;
+
+                            // Do NOT update boundary data since this would grow
+                            // blocked faces across gaps.
+                        }
+                    }
+                }
+
+                faceI++;
+            }
+        }
+    }
+
+    Info<< "markFacesOnProblemCells : marked "
+        << returnReduce(nBaffleFaces, sumOp<label>())
+        << " additional internal faces to be converted into baffles."
+        << endl;
+
+    if (checkCollapse)
+    {
+        Info<< "markFacesOnProblemCells : prevented "
+            << returnReduce(nPrevented, sumOp<label>())
+            << " internal faces fom getting converted into baffles."
+            << endl;
+    }
+
+    return facePatch;
+}
+
+
+//// Mark faces to be baffled to prevent snapping problems. Does
+//// test to find nearest surface and checks which faces would get squashed.
+//Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
+//(
+//    const dictionary& motionDict
+//) const
+//{
+//    // Construct addressing engine.
+//    autoPtr<indirectPrimitivePatch> ppPtr
+//    (
+//        meshRefinement::makePatch
+//        (
+//            mesh_,
+//            meshedPatches()
+//        )
+//    );
+//    const indirectPrimitivePatch& pp = ppPtr();
+//    const pointField& localPoints = pp.localPoints();
+//    const labelList& meshPoints = pp.meshPoints();
+//
+//    // Find nearest (non-baffle) surface
+//    pointField newPoints(mesh_.points());
+//    {
+//        List<pointIndexHit> hitInfo;
+//        labelList hitSurface;
+//        surfaces_.findNearest
+//        (
+//            surfaces_.getUnnamedSurfaces(),
+//            localPoints,
+//            scalarField(localPoints.size(), sqr(GREAT)),// sqr of attraction
+//            hitSurface,
+//            hitInfo
+//        );
+//
+//        forAll(hitInfo, i)
+//        {
+//            if (hitInfo[i].hit())
+//            {
+//                //label pointI = meshPoints[i];
+//                //Pout<< "   " << pointI << " moved from "
+//                //    << mesh_.points()[pointI] << " by "
+//                //    << mag(hitInfo[i].hitPoint()-mesh_.points()[pointI])
+//                //    << endl;
+//                newPoints[meshPoints[i]] = hitInfo[i].hitPoint();
+//            }
+//        }
+//    }
+//
+//    // Per face (internal or coupled!) the patch that the
+//    // baffle should get (or -1).
+//    labelList facePatch(mesh_.nFaces(), -1);
+//    // Count of baffled faces
+//    label nBaffleFaces = 0;
+//
+//    {
+//        pointField oldPoints(mesh_.points());
+//        mesh_.movePoints(newPoints);
+//        faceSet wrongFaces(mesh_, "wrongFaces", 100);
+//        {
+//            //motionSmoother::checkMesh(false, mesh_, motionDict, wrongFaces);
+//
+//            // Just check the errors from squashing
+//            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+//            const labelList allFaces(identity(mesh_.nFaces()));
+//            label nWrongFaces = 0;
+//
+//            scalar minArea(readScalar(motionDict.lookup("minArea")));
+//            if (minArea > -SMALL)
+//            {
+//                polyMeshGeometry::checkFaceArea
+//                (
+//                    false,
+//                    minArea,
+//                    mesh_,
+//                    mesh_.faceAreas(),
+//                    allFaces,
+//                    &wrongFaces
+//                );
+//
+//                label nNewWrongFaces = returnReduce
+//                (
+//                    wrongFaces.size(),
+//                    sumOp<label>()
+//                );
+//
+//                Info<< "    faces with area < "
+//                    << setw(5) << minArea
+//                    << " m^2                            : "
+//                    << nNewWrongFaces-nWrongFaces << endl;
+//
+//                nWrongFaces = nNewWrongFaces;
+//            }
+//
+////            scalar minDet(readScalar(motionDict.lookup("minDeterminant")));
+//            scalar minDet = 0.01;
+//            if (minDet > -1)
+//            {
+//                polyMeshGeometry::checkCellDeterminant
+//                (
+//                    false,
+//                    minDet,
+//                    mesh_,
+//                    mesh_.faceAreas(),
+//                    allFaces,
+//                    polyMeshGeometry::affectedCells(mesh_, allFaces),
+//                    &wrongFaces
+//                );
+//
+//                label nNewWrongFaces = returnReduce
+//                (
+//                    wrongFaces.size(),
+//                    sumOp<label>()
+//                );
+//
+//                Info<< "    faces on cells with determinant < "
+//                    << setw(5) << minDet << "                : "
+//                    << nNewWrongFaces-nWrongFaces << endl;
+//
+//                nWrongFaces = nNewWrongFaces;
+//            }
+//        }
+//
+//
+//        forAllConstIter(faceSet, wrongFaces, iter)
+//        {
+//            label patchI = mesh_.boundaryMesh().whichPatch(iter.key());
+//
+//            if (patchI == -1 || mesh_.boundaryMesh()[patchI].coupled())
+//            {
+//                facePatch[iter.key()] = getBafflePatch(facePatch, iter.key());
+//                nBaffleFaces++;
+//
+//                //Pout<< "    " << iter.key()
+//                //    //<< " on patch " << mesh_.boundaryMesh()[patchI].name()
+//                //    << " is destined for patch " << facePatch[iter.key()]
+//                //    << endl;
+//            }
+//        }
+//        // Restore points.
+//        mesh_.movePoints(oldPoints);
+//    }
+//
+//
+//    Info<< "markFacesOnProblemCellsGeometric : marked "
+//        << returnReduce(nBaffleFaces, sumOp<label>())
+//        << " additional internal and coupled faces"
+//        << " to be converted into baffles." << endl;
+//
+//    syncTools::syncFaceList
+//    (
+//        mesh_,
+//        facePatch,
+//        maxEqOp<label>(),
+//        false               // no separation
+//    );
+//
+//    return facePatch;
+//}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
new file mode 100644
index 000000000..858020005
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -0,0 +1,1513 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "meshRefinement.H"
+#include "trackedParticle.H"
+#include "syncTools.H"
+#include "Time.H"
+#include "refinementSurfaces.H"
+#include "shellSurfaces.H"
+#include "faceSet.H"
+#include "decompositionMethod.H"
+#include "fvMeshDistribute.H"
+#include "directTopoChange.H"
+#include "mapDistributePolyMesh.H"
+#include "featureEdgeMesh.H"
+#include "Cloud.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Get faces (on the new mesh) that have in some way been affected by the
+// mesh change. Picks up all faces but those that are between two
+// unrefined faces. (Note that of an unchanged face the edge still might be
+// split but that does not change any face centre or cell centre.
+Foam::labelList Foam::meshRefinement::getChangedFaces
+(
+    const mapPolyMesh& map,
+    const labelList& oldCellsToRefine
+)
+{
+    const polyMesh& mesh = map.mesh();
+
+    labelList changedFaces;
+    {
+        // Mark any face on a cell which has been added or changed
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // Note that refining a face changes the face centre (for a warped face)
+        // which changes the cell centre. This again changes the cellcentre-
+        // cellcentre edge across all faces of the cell.
+        // Note: this does not happen for unwarped faces but unfortunately
+        // we don't have this information.
+
+        const labelList& faceOwner = mesh.faceOwner();
+        const labelList& faceNeighbour = mesh.faceNeighbour();
+        const cellList& cells = mesh.cells();
+        const label nInternalFaces = mesh.nInternalFaces();
+
+        // Mark refined cells on old mesh
+        PackedBoolList oldRefineCell(map.nOldCells());
+
+        forAll(oldCellsToRefine, i)
+        {
+            oldRefineCell.set(oldCellsToRefine[i], 1u);
+        }
+
+        // Mark refined faces
+        PackedBoolList refinedInternalFace(nInternalFaces);
+
+        // 1. Internal faces
+
+        for (label faceI = 0; faceI < nInternalFaces; faceI++)
+        {
+            label oldOwn = map.cellMap()[faceOwner[faceI]];
+            label oldNei = map.cellMap()[faceNeighbour[faceI]];
+
+            if
+            (
+                oldOwn >= 0
+             && oldRefineCell.get(oldOwn) == 0u
+             && oldNei >= 0
+             && oldRefineCell.get(oldNei) == 0u
+            )
+            {
+                // Unaffected face since both neighbours were not refined.
+            }
+            else
+            {
+                refinedInternalFace.set(faceI, 1u);
+            }
+        }
+
+
+        // 2. Boundary faces
+
+        boolList refinedBoundaryFace(mesh.nFaces()-nInternalFaces, false);
+
+        forAll(mesh.boundaryMesh(), patchI)
+        {
+            const polyPatch& pp = mesh.boundaryMesh()[patchI];
+
+            label faceI = pp.start();
+
+            forAll(pp, i)
+            {
+                label oldOwn = map.cellMap()[faceOwner[faceI]];
+
+                if (oldOwn >= 0 && oldRefineCell.get(oldOwn) == 0u)
+                {
+                    // owner did exist and wasn't refined.
+                }
+                else
+                {
+                    refinedBoundaryFace[faceI-nInternalFaces] = true;
+                }
+                faceI++;
+            }
+        }
+
+        // Synchronise refined face status
+        syncTools::syncBoundaryFaceList
+        (
+            mesh,
+            refinedBoundaryFace,
+            orEqOp<bool>(),
+            false
+        );
+
+
+        // 3. Mark all faces affected by refinement. Refined faces are in
+        //    - refinedInternalFace
+        //    - refinedBoundaryFace
+        boolList changedFace(mesh.nFaces(), false);
+
+        forAll(refinedInternalFace, faceI)
+        {
+            if (refinedInternalFace.get(faceI) == 1u)
+            {
+                const cell& ownFaces = cells[faceOwner[faceI]];
+                forAll(ownFaces, ownI)
+                {
+                    changedFace[ownFaces[ownI]] = true;
+                }
+                const cell& neiFaces = cells[faceNeighbour[faceI]];
+                forAll(neiFaces, neiI)
+                {
+                    changedFace[neiFaces[neiI]] = true;
+                }
+            }
+        }
+
+        forAll(refinedBoundaryFace, i)
+        {
+            if (refinedBoundaryFace[i])
+            {
+                const cell& ownFaces = cells[faceOwner[i+nInternalFaces]];
+                forAll(ownFaces, ownI)
+                {
+                    changedFace[ownFaces[ownI]] = true;
+                }
+            }
+        }
+
+        syncTools::syncFaceList
+        (
+            mesh,
+            changedFace,
+            orEqOp<bool>(),
+            false
+        );
+
+
+        // Now we have in changedFace marked all affected faces. Pack.
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        label nChanged = 0;
+
+        forAll(changedFace, faceI)
+        {
+            if (changedFace[faceI])
+            {
+                nChanged++;
+            }
+        }
+
+        changedFaces.setSize(nChanged);
+        nChanged = 0;
+
+        forAll(changedFace, faceI)
+        {
+            if (changedFace[faceI])
+            {
+                changedFaces[nChanged++] = faceI;
+            }
+        }
+    }
+
+    label nChangedFaces = changedFaces.size();
+    reduce(nChangedFaces, sumOp<label>());
+
+    if (debug)
+    {
+        Pout<< "getChangedFaces : Detected "
+            << " local:" << changedFaces.size()
+            << " global:" << nChangedFaces
+            << " changed faces out of " << mesh.globalData().nTotalFaces()
+            << endl;
+
+        faceSet changedFacesSet
+        (
+            mesh,
+            "changedFaces",
+            labelHashSet(changedFaces)
+        );
+        Pout<< "getChangedFaces : Writing " << changedFaces.size()
+            << " changed faces to faceSet " << changedFacesSet.name()
+            << endl;
+        changedFacesSet.write();
+    }
+
+    return changedFaces;
+}
+
+
+// Mark cell for refinement (if not already marked). Return false if
+// refinelimit hit. Keeps running count (in nRefine) of cells marked for
+// refinement
+bool Foam::meshRefinement::markForRefine
+(
+    const label markValue,
+    const label nAllowRefine,
+
+    label& cellValue,
+    label& nRefine
+)
+{
+    if (cellValue == -1)
+    {
+        cellValue = markValue;
+        nRefine++;
+    }
+
+    return nRefine <= nAllowRefine;
+}
+
+
+// Calculates list of cells to refine based on intersection with feature edge.
+Foam::label Foam::meshRefinement::markFeatureRefinement
+(
+    const point& keepPoint,
+    const PtrList<featureEdgeMesh>& featureMeshes,
+    const labelList& featureLevels,
+    const label nAllowRefine,
+
+    labelList& refineCell,
+    label& nRefine
+) const
+{
+    // We want to refine all cells containing a feature edge.
+    // - don't want to search over whole mesh
+    // - don't want to build octree for whole mesh
+    // - so use tracking to follow the feature edges
+    //
+    // 1. find non-manifold points on feature edges (i.e. start of feature edge
+    //    or 'knot')
+    // 2. seed particle starting at keepPoint going to this non-manifold point
+    // 3. track particles to their non-manifold point
+    //
+    // 4. track particles across their connected feature edges, marking all
+    //    visited cells with their level (through trackingData)
+    // 5. do 4 until all edges have been visited.
+
+
+    // Find all start cells of features. Is done by tracking from keepPoint.
+    Cloud<trackedParticle> cloud(mesh_, IDLList<trackedParticle>());
+
+    // Create particles on whichever processor holds the keepPoint.
+    label cellI = mesh_.findCell(keepPoint);
+
+    if (cellI != -1)
+    {
+        forAll(featureMeshes, featI)
+        {
+            const featureEdgeMesh& featureMesh = featureMeshes[featI];
+            const labelListList& pointEdges = featureMesh.pointEdges();
+
+            forAll(pointEdges, pointI)
+            {
+                if (pointEdges[pointI].size() != 2)
+                {
+                    if (debug)
+                    {
+                        Pout<< "Adding particle from point:" << pointI
+                            << " coord:" << featureMesh.points()[pointI]
+                            << " pEdges:" << pointEdges[pointI]
+                            << endl;
+                    }
+
+                    // Non-manifold point. Create particle.
+                    cloud.addParticle
+                    (
+                        new trackedParticle
+                        (
+                            cloud,
+                            keepPoint,
+                            cellI,
+                            featureMesh.points()[pointI],   // endpos
+                            featureLevels[featI],           // level
+                            featI,                          // featureMesh
+                            pointI                          // end point
+                        )
+                    );
+                }
+            }
+        }
+    }
+
+
+    // Largest refinement level of any feature passed through
+    labelList maxFeatureLevel(mesh_.nCells(), -1);
+
+    // Database to pass into trackedParticle::move
+    trackedParticle::trackData td(cloud, maxFeatureLevel);
+
+    // Track all particles to their end position (= starting feature point)
+    cloud.move(td);
+
+    // Reset level
+    maxFeatureLevel = -1;
+
+    // Whether edge has been visited.
+    List<PackedBoolList> featureEdgeVisited(featureMeshes.size());
+
+    forAll(featureMeshes, featI)
+    {
+        featureEdgeVisited[featI].setSize(featureMeshes[featI].edges().size());
+        featureEdgeVisited[featI] = 0u;
+    }
+
+    while (true)
+    {
+        label nParticles = 0;
+
+        // Make particle follow edge.
+        forAllIter(Cloud<trackedParticle>, cloud, iter)
+        {
+            trackedParticle& tp = iter();
+
+            label featI = tp.i();
+            label pointI = tp.j();
+
+            const featureEdgeMesh& featureMesh = featureMeshes[featI];
+            const labelList& pEdges = featureMesh.pointEdges()[pointI];
+
+            // Particle now at pointI. Check connected edges to see which one
+            // we have to visit now.
+
+            bool keepParticle = false;
+
+            forAll(pEdges, i)
+            {
+                label edgeI = pEdges[i];
+
+                if (featureEdgeVisited[featI].set(edgeI, 1u))
+                {
+                    // Unvisited edge. Make the particle go to the other point
+                    // on the edge.
+
+                    const edge& e = featureMesh.edges()[edgeI];
+                    label otherPointI = e.otherVertex(pointI);
+
+                    tp.end() = featureMesh.points()[otherPointI];
+                    tp.j() = otherPointI;
+                    keepParticle = true;
+                    break;
+                }
+            }
+
+            if (!keepParticle)
+            {
+                // Particle at 'knot' where another particle already has been
+                // seeded. Delete particle.
+                cloud.deleteParticle(tp);
+            }
+            else
+            {
+                // Keep particle
+                nParticles++;
+            }
+        }
+
+        reduce(nParticles, sumOp<label>());
+        if (nParticles == 0)
+        {
+            break;
+        }
+
+        // Track all particles to their end position.
+        cloud.move(td);
+    }
+
+
+    // See which cells to refine. maxFeatureLevel will hold highest level
+    // of any feature edge that passed through.
+
+    const labelList& cellLevel = meshCutter_.cellLevel();
+
+    label oldNRefine = nRefine;
+
+    forAll(maxFeatureLevel, cellI)
+    {
+        if (maxFeatureLevel[cellI] > cellLevel[cellI])
+        {
+            // Mark
+            if
+            (
+               !markForRefine
+                (
+                    0,                      // surface (n/a)
+                    nAllowRefine,
+                    refineCell[cellI],
+                    nRefine
+                )
+            )
+            {
+                // Reached limit
+                break;
+            }
+        }
+    }
+
+    if
+    (
+        returnReduce(nRefine, sumOp<label>())
+      > returnReduce(nAllowRefine, sumOp<label>())
+    )
+    {
+        Info<< "Reached refinement limit." << endl;
+    }
+
+    return returnReduce(nRefine-oldNRefine,  sumOp<label>());
+}
+
+
+// Mark cells for non-surface intersection based refinement.
+Foam::label Foam::meshRefinement::markInternalRefinement
+(
+    const label nAllowRefine,
+
+    labelList& refineCell,
+    label& nRefine
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    label oldNRefine = nRefine;
+
+    // Collect cells to test
+    pointField testCc(cellLevel.size()-nRefine);
+    labelList testLevels(cellLevel.size()-nRefine);
+    label testI = 0;
+
+    forAll(cellLevel, cellI)
+    {
+        if (refineCell[cellI] == -1)
+        {
+            testCc[testI] = cellCentres[cellI];
+            testLevels[testI] = cellLevel[cellI];
+            testI++;
+        }
+    }
+
+    // Do test to see whether cells is inside/outside shell with higher level
+    labelList maxLevel;
+    shells_.findHigherLevel(testCc, testLevels, maxLevel);
+
+    // Mark for refinement. Note that we didn't store the original cellID so
+    // now just reloop in same order.
+    testI = 0;
+    forAll(cellLevel, cellI)
+    {
+        if (refineCell[cellI] == -1)
+        {
+            if (maxLevel[testI] > testLevels[testI])
+            {
+                bool reachedLimit = !markForRefine
+                (
+                    maxLevel[testI],    // mark with any positive value
+                    nAllowRefine,
+                    refineCell[cellI],
+                    nRefine
+                );
+
+                if (reachedLimit)
+                {
+                    if (debug)
+                    {
+                        Pout<< "Stopped refining internal cells"
+                            << " since reaching my cell limit of "
+                            << mesh_.nCells()+7*nRefine << endl;
+                    }
+                    break;
+                }
+            }
+            testI++;
+        }
+    }
+
+    if
+    (
+        returnReduce(nRefine, sumOp<label>())
+      > returnReduce(nAllowRefine, sumOp<label>())
+    )
+    {
+        Info<< "Reached refinement limit." << endl;
+    }
+
+    return returnReduce(nRefine-oldNRefine, sumOp<label>());
+}
+
+
+// Collect faces that are intersected and whose neighbours aren't yet marked
+// for refinement.
+Foam::labelList Foam::meshRefinement::getRefineCandidateFaces
+(
+    const labelList& refineCell
+) const
+{
+    labelList testFaces(mesh_.nFaces());
+
+    label nTest = 0;
+
+    forAll(surfaceIndex_, faceI)
+    {
+        if (surfaceIndex_[faceI] != -1)
+        {
+            label own = mesh_.faceOwner()[faceI];
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                label nei = mesh_.faceNeighbour()[faceI];
+
+                if (refineCell[own] == -1 || refineCell[nei] == -1)
+                {
+                    testFaces[nTest++] = faceI;
+                }
+            }
+            else
+            {
+                if (refineCell[own] == -1)
+                {
+                    testFaces[nTest++] = faceI;
+                }
+            }
+        }
+    }
+    testFaces.setSize(nTest);
+
+    return testFaces;
+}
+
+
+// Mark cells for surface intersection based refinement.
+Foam::label Foam::meshRefinement::markSurfaceRefinement
+(
+    const label nAllowRefine,
+    const labelList& neiLevel,
+    const pointField& neiCc,
+
+    labelList& refineCell,
+    label& nRefine
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    label oldNRefine = nRefine;
+
+    // Use cached surfaceIndex_ to detect if any intersection. If so
+    // re-intersect to determine level wanted.
+
+    // Collect candidate faces
+    // ~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList testFaces(getRefineCandidateFaces(refineCell));
+
+    // Collect segments
+    // ~~~~~~~~~~~~~~~~
+
+    pointField start(testFaces.size());
+    pointField end(testFaces.size());
+    labelList minLevel(testFaces.size());
+
+    forAll(testFaces, i)
+    {
+        label faceI = testFaces[i];
+
+        label own = mesh_.faceOwner()[faceI];
+
+        if (mesh_.isInternalFace(faceI))
+        {
+            label nei = mesh_.faceNeighbour()[faceI];
+
+            start[i] = cellCentres[own];
+            end[i] = cellCentres[nei];
+            minLevel[i] = min(cellLevel[own], cellLevel[nei]);
+        }
+        else
+        {
+            label bFaceI = faceI - mesh_.nInternalFaces();
+
+            start[i] = cellCentres[own];
+            end[i] = neiCc[bFaceI];
+            minLevel[i] = min(cellLevel[own], neiLevel[bFaceI]);
+        }
+    }
+
+
+    // Do test for higher intersections
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList surfaceHit;
+    labelList surfaceMinLevel;
+    surfaces_.findHigherIntersection
+    (
+        start,
+        end,
+        minLevel,
+
+        surfaceHit,
+        surfaceMinLevel
+    );
+
+
+    // Mark cells for refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    forAll(testFaces, i)
+    {
+        label faceI = testFaces[i];
+
+        label surfI = surfaceHit[i];
+
+        if (surfI != -1)
+        {
+            // Found intersection with surface with higher wanted
+            // refinement. Check if the level field on that surface
+            // specifies an even higher level. Note:this is weird. Should
+            // do the check with the surfaceMinLevel whilst intersecting the
+            // surfaces?
+
+            label own = mesh_.faceOwner()[faceI];
+
+            if (surfaceMinLevel[i] > cellLevel[own])
+            {
+                // Owner needs refining
+                if
+                (
+                   !markForRefine
+                    (
+                        surfI,
+                        nAllowRefine,
+                        refineCell[own],
+                        nRefine
+                    )
+                )
+                {
+                    break;
+                }
+            }
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                label nei = mesh_.faceNeighbour()[faceI];
+                if (surfaceMinLevel[i] > cellLevel[nei])
+                {
+                    // Neighbour needs refining
+                    if
+                    (
+                       !markForRefine
+                        (
+                            surfI,
+                            nAllowRefine,
+                            refineCell[nei],
+                            nRefine
+                        )
+                    )
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    if
+    (
+        returnReduce(nRefine, sumOp<label>())
+      > returnReduce(nAllowRefine, sumOp<label>())
+    )
+    {
+        Info<< "Reached refinement limit." << endl;
+    }
+
+    return returnReduce(nRefine-oldNRefine, sumOp<label>());
+}
+
+
+// Checks if multiple intersections of a cell (by a surface with a higher
+// max than the cell level) and if so if the normals at these intersections
+// make a large angle.
+// Returns false if the nRefine limit has been reached, true otherwise.
+bool Foam::meshRefinement::checkCurvature
+(
+    const scalar curvature,
+    const label nAllowRefine,
+
+    const label surfaceLevel,   // current intersection max level
+    const vector& surfaceNormal,// current intersection normal
+
+    const label cellI,
+
+    label& cellMaxLevel,        // cached max surface level for this cell
+    vector& cellMaxNormal,      // cached surface normal for this cell
+
+    labelList& refineCell,
+    label& nRefine
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+
+    // Test if surface applicable
+    if (surfaceLevel > cellLevel[cellI])
+    {
+        if (cellMaxLevel == -1)
+        {
+            // First visit of cell. Store
+            cellMaxLevel = surfaceLevel;
+            cellMaxNormal = surfaceNormal;
+        }
+        else
+        {
+            // Second or more visit. Check curvature.
+            if ((cellMaxNormal & surfaceNormal) < curvature)
+            {
+                return markForRefine
+                (
+                    surfaceLevel,   // mark with any non-neg number.
+                    nAllowRefine,
+                    refineCell[cellI],
+                    nRefine
+                );
+            }
+
+            // Set normal to that of highest surface. Not really necessary
+            // over here but we reuse cellMax info when doing coupled faces.
+            if (surfaceLevel > cellMaxLevel)
+            {
+                cellMaxLevel = surfaceLevel;
+                cellMaxNormal = surfaceNormal;
+            }
+        }
+    }
+
+    // Did not reach refinement limit.
+    return true;
+}
+
+
+// Mark cells for surface curvature based refinement.
+Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
+(
+    const scalar curvature,
+    const label nAllowRefine,
+    const labelList& neiLevel,
+    const pointField& neiCc,
+
+    labelList& refineCell,
+    label& nRefine
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    label oldNRefine = nRefine;
+
+    // 1. local test: any cell on more than one surface gets refined
+    // (if its current level is < max of the surface max level)
+
+    // 2. 'global' test: any cell on only one surface with a neighbour
+    // on a different surface gets refined (if its current level etc.)
+
+
+    // Collect candidate faces (i.e. intersecting any surface and
+    // owner/neighbour not yet refined.
+    labelList testFaces(getRefineCandidateFaces(refineCell));
+
+    // Collect segments
+    pointField start(testFaces.size());
+    pointField end(testFaces.size());
+    labelList minLevel(testFaces.size());
+
+    forAll(testFaces, i)
+    {
+        label faceI = testFaces[i];
+
+        label own = mesh_.faceOwner()[faceI];
+
+        if (mesh_.isInternalFace(faceI))
+        {
+            label nei = mesh_.faceNeighbour()[faceI];
+
+            start[i] = cellCentres[own];
+            end[i] = cellCentres[nei];
+            minLevel[i] = min(cellLevel[own], cellLevel[nei]);
+        }
+        else
+        {
+            label bFaceI = faceI - mesh_.nInternalFaces();
+
+            start[i] = cellCentres[own];
+            end[i] = neiCc[bFaceI];
+            minLevel[i] = min(cellLevel[own], neiLevel[bFaceI]);
+        }
+    }
+
+    // Test for all intersections (with surfaces of higher max level than
+    // minLevel) and cache per cell the max surface level and the local normal
+    // on that surface.
+    labelList cellMaxLevel(mesh_.nCells(), -1);
+    vectorField cellMaxNormal(mesh_.nCells(), vector::zero);
+
+    {
+        // Per segment the normals of the surfaces
+        List<vectorList> surfaceNormal;
+        // Per segment the list of levels of the surfaces
+        labelListList surfaceLevel;
+
+        surfaces_.findAllHigherIntersections
+        (
+            start,
+            end,
+            minLevel,           // max level of surface has to be bigger
+                                // than min level of neighbouring cells
+            surfaceNormal,
+            surfaceLevel
+        );
+        // Clear out unnecessary data
+        start.clear();
+        end.clear();
+        minLevel.clear();
+
+        // Extract per cell information on the surface with the highest max
+        forAll(testFaces, i)
+        {
+            label faceI = testFaces[i];
+            label own = mesh_.faceOwner()[faceI];
+
+            const vectorList& fNormals = surfaceNormal[i];
+            const labelList& fLevels = surfaceLevel[i];
+
+            forAll(fLevels, hitI)
+            {
+                checkCurvature
+                (
+                    curvature,
+                    nAllowRefine,
+
+                    fLevels[hitI],
+                    fNormals[hitI],
+
+                    own,
+                    cellMaxLevel[own],
+                    cellMaxNormal[own],
+
+                    refineCell,
+                    nRefine
+                );
+            }
+
+            if (mesh_.isInternalFace(faceI))
+            {
+                label nei = mesh_.faceNeighbour()[faceI];
+
+                forAll(fLevels, hitI)
+                {
+                    checkCurvature
+                    (
+                        curvature,
+                        nAllowRefine,
+
+                        fLevels[hitI],
+                        fNormals[hitI],
+
+                        nei,
+                        cellMaxLevel[nei],
+                        cellMaxNormal[nei],
+
+                        refineCell,
+                        nRefine
+                    );
+                }
+            }
+        }
+    }
+
+    // 2. Find out a measure of surface curvature and region edges.
+    // Send over surface region and surface normal to neighbour cell.
+
+    labelList neiBndMaxLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+    vectorField neiBndMaxNormal(mesh_.nFaces()-mesh_.nInternalFaces());
+
+    for (label faceI = mesh_.nInternalFaces(); faceI < mesh_.nFaces(); faceI++)
+    {
+        label bFaceI = faceI-mesh_.nInternalFaces();
+        label own = mesh_.faceOwner()[faceI];
+
+        neiBndMaxLevel[bFaceI] = cellMaxLevel[own];
+        neiBndMaxNormal[bFaceI] = cellMaxNormal[own];
+    }
+    syncTools::swapBoundaryFaceList(mesh_, neiBndMaxLevel, false);
+    syncTools::swapBoundaryFaceList(mesh_, neiBndMaxNormal, false);
+
+    // Loop over all faces. Could only be checkFaces.. except if they're coupled
+
+    // Internal faces
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        label own = mesh_.faceOwner()[faceI];
+        label nei = mesh_.faceNeighbour()[faceI];
+
+        if (cellMaxLevel[own] != -1 && cellMaxLevel[nei] != -1)
+        {
+            // Have valid data on both sides. Check curvature.
+            if ((cellMaxNormal[own] & cellMaxNormal[nei]) < curvature)
+            {
+                // See which side to refine
+                if (cellLevel[own] < cellMaxLevel[own])
+                {
+                    if
+                    (
+                        !markForRefine
+                        (
+                            cellMaxLevel[own],
+                            nAllowRefine,
+                            refineCell[own],
+                            nRefine
+                        )
+                    )
+                    {
+                        if (debug)
+                        {
+                            Pout<< "Stopped refining since reaching my cell"
+                                << " limit of " << mesh_.nCells()+7*nRefine
+                                << endl;
+                        }
+                        break;
+                    }
+                }
+
+                if (cellLevel[nei] < cellMaxLevel[nei])
+                {
+                    if
+                    (
+                        !markForRefine
+                        (
+                            cellMaxLevel[nei],
+                            nAllowRefine,
+                            refineCell[nei],
+                            nRefine
+                        )
+                    )
+                    {
+                        if (debug)
+                        {
+                            Pout<< "Stopped refining since reaching my cell"
+                                << " limit of " << mesh_.nCells()+7*nRefine
+                                << endl;
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    // Boundary faces
+    for (label faceI = mesh_.nInternalFaces(); faceI < mesh_.nFaces(); faceI++)
+    {
+        label own = mesh_.faceOwner()[faceI];
+        label bFaceI = faceI - mesh_.nInternalFaces();
+
+        if (cellLevel[own] < cellMaxLevel[own] && neiBndMaxLevel[bFaceI] != -1)
+        {
+            // Have valid data on both sides. Check curvature.
+            if ((cellMaxNormal[own] & neiBndMaxNormal[bFaceI]) < curvature)
+            {
+                if
+                (
+                    !markForRefine
+                    (
+                        cellMaxLevel[own],
+                        nAllowRefine,
+                        refineCell[own],
+                        nRefine
+                    )
+                )
+                {
+                    if (debug)
+                    {
+                        Pout<< "Stopped refining since reaching my cell"
+                            << " limit of " << mesh_.nCells()+7*nRefine
+                            << endl;
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    if
+    (
+        returnReduce(nRefine, sumOp<label>())
+      > returnReduce(nAllowRefine, sumOp<label>())
+    )
+    {
+        Info<< "Reached refinement limit." << endl;
+    }
+
+    return returnReduce(nRefine-oldNRefine, sumOp<label>());
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Calculate list of cells to refine. Gets for any edge (start - end)
+// whether it intersects the surface. Does more accurate test and checks
+// the wanted level on the surface intersected.
+// Does approximate precalculation of how many cells can be refined before
+// hitting overall limit maxGlobalCells.
+Foam::labelList Foam::meshRefinement::refineCandidates
+(
+    const point& keepPoint,
+    const scalar curvature,
+
+    const PtrList<featureEdgeMesh>& featureMeshes,
+    const labelList& featureLevels,
+
+    const bool featureRefinement,
+    const bool internalRefinement,
+    const bool surfaceRefinement,
+    const bool curvatureRefinement,
+    const label maxGlobalCells,
+    const label maxLocalCells
+) const
+{
+    label totNCells = mesh_.globalData().nTotalCells();
+
+    labelList cellsToRefine;
+
+    if (totNCells >= maxGlobalCells)
+    {
+        Info<< "No cells marked for refinement since reached limit "
+            << maxGlobalCells << '.' << endl;
+    }
+    else
+    {
+        // Every cell I refine adds 7 cells. Estimate the number of cells
+        // I am allowed to refine.
+        // Assume perfect distribution so can only refine as much the fraction
+        // of the mesh I hold. This prediction step prevents us having to do
+        // lots of reduces to keep count of the total number of cells selected
+        // for refinement.
+
+        //scalar fraction = scalar(mesh_.nCells())/totNCells;
+        //label myMaxCells = label(maxGlobalCells*fraction);
+        //label nAllowRefine = (myMaxCells - mesh_.nCells())/7;
+        ////label nAllowRefine = (maxLocalCells - mesh_.nCells())/7;
+        //
+        //Pout<< "refineCandidates:" << nl
+        //    << "    total cells:" << totNCells << nl
+        //    << "    local cells:" << mesh_.nCells() << nl
+        //    << "    local fraction:" << fraction << nl
+        //    << "    local allowable cells:" << myMaxCells << nl
+        //    << "    local allowable refinement:" << nAllowRefine << nl
+        //    << endl;
+
+        //- Disable refinement shortcut. nAllowRefine is per processor limit.
+        label nAllowRefine = labelMax / Pstream::nProcs();
+
+        // Marked for refinement (>= 0) or not (-1). Actual value is the
+        // index of the surface it intersects.
+        labelList refineCell(mesh_.nCells(), -1);
+        label nRefine = 0;
+
+
+        // Swap neighbouring cell centres and cell level
+        labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+        pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+        calcNeighbourData(neiLevel, neiCc);
+
+
+
+        // Cells pierced by feature lines
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        if (featureRefinement)
+        {
+            label nFeatures = markFeatureRefinement
+            (
+                keepPoint,
+                featureMeshes,
+                featureLevels,
+                nAllowRefine,
+
+                refineCell,
+                nRefine
+            );
+
+            Info<< "Marked for refinement due to explicit features    : "
+                << nFeatures << " cells."  << endl;
+        }
+
+        // Inside refinement shells
+        // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+        if (internalRefinement)
+        {
+            label nShell = markInternalRefinement
+            (
+                nAllowRefine,
+
+                refineCell,
+                nRefine
+            );
+            Info<< "Marked for refinement due to refinement shells    : "
+                << nShell << " cells."  << endl;
+        }
+
+        // Refinement based on intersection of surface
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        if (surfaceRefinement)
+        {
+            label nSurf = markSurfaceRefinement
+            (
+                nAllowRefine,
+                neiLevel,
+                neiCc,
+
+                refineCell,
+                nRefine
+            );
+            Info<< "Marked for refinement due to surface intersection : "
+                << nSurf << " cells."  << endl;
+        }
+
+        // Refinement based on curvature of surface
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        if
+        (
+            curvatureRefinement
+         && (curvature >= -1 && curvature <= 1)
+         && (surfaces_.minLevel() != surfaces_.maxLevel())
+        )
+        {
+            label nCurv = markSurfaceCurvatureRefinement
+            (
+                curvature,
+                nAllowRefine,
+                neiLevel,
+                neiCc,
+
+                refineCell,
+                nRefine
+            );
+            Info<< "Marked for refinement due to curvature/regions    : "
+                << nCurv << " cells."  << endl;
+        }
+
+        // Pack cells-to-refine
+        // ~~~~~~~~~~~~~~~~~~~~
+
+        cellsToRefine.setSize(nRefine);
+        nRefine = 0;
+
+        forAll(refineCell, cellI)
+        {
+            if (refineCell[cellI] != -1)
+            {
+                cellsToRefine[nRefine++] = cellI;
+            }
+        }
+    }
+
+    return cellsToRefine;
+}
+
+
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::refine
+(
+    const labelList& cellsToRefine
+)
+{
+    // Mesh changing engine.
+    directTopoChange meshMod(mesh_);
+
+    // Play refinement commands into mesh changer.
+    meshCutter_.setRefinement(cellsToRefine, meshMod);
+
+    // Create mesh (no inflation), return map from old to new mesh.
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false);
+
+    // Update fields
+    mesh_.updateMesh(map);
+
+    // Optionally inflate mesh
+    if (map().hasMotionPoints())
+    {
+        mesh_.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh_.clearOut();
+    }
+
+    if (overwrite())
+    {
+        mesh_.setInstance(oldInstance());
+    }
+
+    // Update intersection info
+    updateMesh(map, getChangedFaces(map, cellsToRefine));
+
+    return map;
+}
+
+
+// Do refinement of consistent set of cells followed by truncation and
+// load balancing.
+Foam::autoPtr<Foam::mapDistributePolyMesh>
+Foam::meshRefinement::refineAndBalance
+(
+    const string& msg,
+    decompositionMethod& decomposer,
+    fvMeshDistribute& distributor,
+    const labelList& cellsToRefine,
+    const scalar maxLoadUnbalance
+)
+{
+    // Do all refinement
+    refine(cellsToRefine);
+
+    if (debug)
+    {
+        Pout<< "Writing refined but unbalanced " << msg
+            << " mesh to time " << timeName() << endl;
+        write
+        (
+            debug,
+            mesh_.time().path()
+           /timeName()
+        );
+        Pout<< "Dumped debug data in = "
+            << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+        // test all is still synced across proc patches
+        checkData();
+    }
+
+    Info<< "Refined mesh in = "
+        << mesh_.time().cpuTimeIncrement() << " s" << endl;
+    printMeshInfo(debug, "After refinement " + msg);
+
+
+    // Load balancing
+    // ~~~~~~~~~~~~~~
+
+    autoPtr<mapDistributePolyMesh> distMap;
+
+    if (Pstream::nProcs() > 1)
+    {
+        scalar nIdealCells =
+            mesh_.globalData().nTotalCells()
+          / Pstream::nProcs();
+
+        scalar unbalance = returnReduce
+        (
+            mag(1.0-mesh_.nCells()/nIdealCells),
+            maxOp<scalar>()
+        );
+
+        if (unbalance <= maxLoadUnbalance)
+        {
+            Info<< "Skipping balancing since max unbalance " << unbalance
+                << " is less than allowable " << maxLoadUnbalance
+                << endl;
+        }
+        else
+        {
+            scalarField cellWeights(mesh_.nCells(), 1);
+
+            distMap = balance
+            (
+                false,  //keepZoneFaces
+                false,  //keepBaffles
+                cellWeights,
+                decomposer,
+                distributor
+            );
+
+            Info<< "Balanced mesh in = "
+                << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+            printMeshInfo(debug, "After balancing " + msg);
+
+
+            if (debug)
+            {
+                Pout<< "Writing balanced " << msg
+                    << " mesh to time " << timeName() << endl;
+                write
+                (
+                    debug,
+                    mesh_.time().path()/timeName()
+                );
+                Pout<< "Dumped debug data in = "
+                    << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+                // test all is still synced across proc patches
+                checkData();
+            }
+        }
+    }
+
+    return distMap;
+}
+
+
+// Do load balancing followed by refinement of consistent set of cells.
+Foam::autoPtr<Foam::mapDistributePolyMesh>
+Foam::meshRefinement::balanceAndRefine
+(
+    const string& msg,
+    decompositionMethod& decomposer,
+    fvMeshDistribute& distributor,
+    const labelList& initCellsToRefine,
+    const scalar maxLoadUnbalance
+)
+{
+    labelList cellsToRefine(initCellsToRefine);
+
+    //{
+    //    globalIndex globalCells(mesh_.nCells());
+    //
+    //    Info<< "** Distribution before balancing/refining:" << endl;
+    //    for (label procI = 0; procI < Pstream::nProcs(); procI++)
+    //    {
+    //        Info<< "    " << procI << '\t'
+    //            << globalCells.localSize(procI) << endl;
+    //    }
+    //    Info<< endl;
+    //}
+    //{
+    //    globalIndex globalCells(cellsToRefine.size());
+    //
+    //    Info<< "** Cells to be refined:" << endl;
+    //    for (label procI = 0; procI < Pstream::nProcs(); procI++)
+    //    {
+    //        Info<< "    " << procI << '\t'
+    //            << globalCells.localSize(procI) << endl;
+    //    }
+    //    Info<< endl;
+    //}
+
+
+    // Load balancing
+    // ~~~~~~~~~~~~~~
+
+    autoPtr<mapDistributePolyMesh> distMap;
+
+    if (Pstream::nProcs() > 1)
+    {
+        // First check if we need to balance at all. Precalculate number of
+        // cells after refinement and see what maximum difference is.
+        scalar nNewCells = scalar(mesh_.nCells() + 7*cellsToRefine.size());
+        scalar nIdealNewCells =
+            returnReduce(nNewCells, sumOp<scalar>())
+          / Pstream::nProcs();
+        scalar unbalance = returnReduce
+        (
+            mag(1.0-nNewCells/nIdealNewCells),
+            maxOp<scalar>()
+        );
+
+        if (unbalance <= maxLoadUnbalance)
+        {
+            Info<< "Skipping balancing since max unbalance " << unbalance
+                << " is less than allowable " << maxLoadUnbalance
+                << endl;
+        }
+        else
+        {
+            scalarField cellWeights(mesh_.nCells(), 1);
+            forAll(cellsToRefine, i)
+            {
+                cellWeights[cellsToRefine[i]] += 7;
+            }
+
+            distMap = balance
+            (
+                false,  //keepZoneFaces
+                false,  //keepBaffles
+                cellWeights,
+                decomposer,
+                distributor
+            );
+
+            // Update cells to refine
+            distMap().distributeCellIndices(cellsToRefine);
+
+            Info<< "Balanced mesh in = "
+                << mesh_.time().cpuTimeIncrement() << " s" << endl;
+        }
+
+        //{
+        //    globalIndex globalCells(mesh_.nCells());
+        //
+        //    Info<< "** Distribution after balancing:" << endl;
+        //    for (label procI = 0; procI < Pstream::nProcs(); procI++)
+        //    {
+        //        Info<< "    " << procI << '\t'
+        //            << globalCells.localSize(procI) << endl;
+        //    }
+        //    Info<< endl;
+        //}
+
+        printMeshInfo(debug, "After balancing " + msg);
+
+        if (debug)
+        {
+            Pout<< "Writing balanced " << msg
+                << " mesh to time " << timeName() << endl;
+            write
+            (
+                debug,
+                mesh_.time().path()/timeName()
+            );
+            Pout<< "Dumped debug data in = "
+                << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+            // test all is still synced across proc patches
+            checkData();
+        }
+    }
+
+
+    // Refinement
+    // ~~~~~~~~~~
+
+    refine(cellsToRefine);
+
+    if (debug)
+    {
+        Pout<< "Writing refined " << msg
+            << " mesh to time " << timeName() << endl;
+        write
+        (
+            debug,
+            mesh_.time().path()
+           /timeName()
+        );
+        Pout<< "Dumped debug data in = "
+            << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+        // test all is still synced across proc patches
+        checkData();
+    }
+
+    Info<< "Refined mesh in = "
+        << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+    //{
+    //    globalIndex globalCells(mesh_.nCells());
+    //
+    //    Info<< "** After refinement distribution:" << endl;
+    //    for (label procI = 0; procI < Pstream::nProcs(); procI++)
+    //    {
+    //        Info<< "    " << procI << '\t'
+    //            << globalCells.localSize(procI) << endl;
+    //    }
+    //    Info<< endl;
+    //}
+
+    printMeshInfo(debug, "After refinement " + msg);
+
+    return distMap;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
new file mode 100644
index 000000000..b3e9a43da
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "meshRefinement.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Add a T entry
+template<class T> void meshRefinement::updateList
+(
+    const labelList& newToOld,
+    const T& nullValue,
+    List<T>& elems
+)
+{
+    List<T> newElems(newToOld.size(), nullValue);
+
+    forAll(newElems, i)
+    {
+        label oldI = newToOld[i];
+
+        if (oldI >= 0)
+        {
+            newElems[i] = elems[oldI];
+        }
+    }
+
+    elems.transfer(newElems);
+}
+
+
+// Compare two lists over all boundary faces
+template<class T>
+void meshRefinement::testSyncBoundaryFaceList
+(
+    const scalar tol,
+    const string& msg,
+    const UList<T>& faceData,
+    const UList<T>& syncedFaceData
+) const
+{
+    label nBFaces = mesh_.nFaces() - mesh_.nInternalFaces();
+
+    if (faceData.size() != nBFaces || syncedFaceData.size() != nBFaces)
+    {
+        FatalErrorIn
+        (
+            "meshRefinement::testSyncBoundaryFaceList"
+            "(const scalar, const string&, const List<T>&, const List<T>&)"
+        )   << "Boundary faces:" << nBFaces
+            << " faceData:" << faceData.size()
+            << " syncedFaceData:" << syncedFaceData.size()
+            << abort(FatalError);
+    }
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        label bFaceI = pp.start() - mesh_.nInternalFaces();
+
+        forAll(pp, i)
+        {
+            const T& data = faceData[bFaceI];
+            const T& syncData = syncedFaceData[bFaceI];
+
+            if (mag(data - syncData) > tol)
+            {
+                label faceI = pp.start()+i;
+
+                FatalErrorIn("testSyncFaces")
+                    << msg
+                    << "patchFace:" << i
+                    << " face:" << faceI
+                    << " fc:" << mesh_.faceCentres()[faceI]
+                    << " patch:" << pp.name()
+                    << " faceData:" << data
+                    << " syncedFaceData:" << syncData
+                    << " diff:" << mag(data - syncData)
+                    << abort(FatalError);
+            }
+
+            bFaceI++;
+        }
+    }
+}
+
+
+//template <class T, class Mesh>
+template<class GeoField>
+void meshRefinement::addPatchFields(fvMesh& mesh, const word& patchFieldType)
+{
+    HashTable<const GeoField*> flds
+    (
+        mesh.objectRegistry::lookupClass<GeoField>()
+    );
+
+    for
+    (
+        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
+        iter != flds.end();
+        ++iter
+    )
+    {
+        const GeoField& fld = *iter();
+
+        typename GeoField::GeometricBoundaryField& bfld =
+            const_cast<typename GeoField::GeometricBoundaryField&>
+            (
+                fld.boundaryField()
+            );
+
+        label sz = bfld.size();
+        bfld.setSize(sz+1);
+        bfld.set
+        (
+            sz,
+            GeoField::PatchFieldType::New
+            (
+                patchFieldType,
+                mesh.boundary()[sz],
+                fld.dimensionedInternalField()
+            )
+        );
+    }
+}
+
+
+// Reorder patch field
+template<class GeoField>
+void meshRefinement::reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
+{
+    HashTable<const GeoField*> flds
+    (
+        mesh.objectRegistry::lookupClass<GeoField>()
+    );
+
+    for
+    (
+        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
+        iter != flds.end();
+        ++iter
+    )
+    {
+        const GeoField& fld = *iter();
+
+        typename GeoField::GeometricBoundaryField& bfld =
+            const_cast<typename GeoField::GeometricBoundaryField&>
+            (
+                fld.boundaryField()
+            );
+
+        bfld.reorder(oldToNew);
+    }
+}
+
+
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
new file mode 100644
index 000000000..93c693e6f
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -0,0 +1,1180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "refinementSurfaces.H"
+#include "Time.H"
+#include "searchableSurfaces.H"
+#include "shellSurfaces.H"
+#include "triSurfaceMesh.H"
+#include "labelPair.H"
+#include "searchableSurfacesQueries.H"
+#include "UPtrList.H"
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Construct from components
+Foam::refinementSurfaces::refinementSurfaces
+(
+    const searchableSurfaces& allGeometry,
+    const PtrList<dictionary>& surfaceDicts
+)
+:
+    allGeometry_(allGeometry),
+    surfaces_(surfaceDicts.size()),
+    names_(surfaceDicts.size()),
+    faceZoneNames_(surfaceDicts.size()),
+    cellZoneNames_(surfaceDicts.size()),
+    zoneInside_(surfaceDicts.size()),
+    regionOffset_(surfaceDicts.size())
+{
+    labelList globalMinLevel(surfaceDicts.size(), 0);
+    labelList globalMaxLevel(surfaceDicts.size(), 0);
+    scalarField globalAngle(surfaceDicts.size(), -GREAT);
+    List<Map<label> > regionMinLevel(surfaceDicts.size());
+    List<Map<label> > regionMaxLevel(surfaceDicts.size());
+    List<Map<scalar> > regionAngle(surfaceDicts.size());
+
+    //wordList globalPatchType(surfaceDicts.size());
+    //List<HashTable<word> > regionPatchType(surfaceDicts.size());
+    //List<HashTable<word> > regionPatchName(surfaceDicts.size());
+
+    forAll(surfaceDicts, surfI)
+    {
+        const dictionary& dict = surfaceDicts[surfI];
+
+        dict.lookup("name") >> names_[surfI];
+
+        surfaces_[surfI] = allGeometry_.findSurfaceID(names_[surfI]);
+
+        // Global refinement level
+        globalMinLevel[surfI] = readLabel(dict.lookup("minRefinementLevel"));
+        globalMaxLevel[surfI] = readLabel(dict.lookup("maxRefinementLevel"));
+
+        // Global zone names per surface
+        if (dict.found("faceZone"))
+        {
+            dict.lookup("faceZone") >> faceZoneNames_[surfI];
+            dict.lookup("cellZone") >> cellZoneNames_[surfI];
+            dict.lookup("zoneInside") >> zoneInside_[surfI];
+        }
+
+        // Global perpendicular angle
+        if (dict.found("perpendicularAngle"))
+        {
+            globalAngle[surfI] = readScalar(dict.lookup("perpendicularAngle"));
+        }
+
+        //// Global patch name per surface
+        //if (dict.found("patchType"))
+        //{
+        //    dict.lookup("patchType") >> globalPatchType[surfI];
+        //}
+
+
+        if (dict.found("regions"))
+        {
+            PtrList<dictionary> regionDicts(dict.lookup("regions"));
+
+            const wordList& regionNames =
+                allGeometry_[surfaces_[surfI]].regions();
+
+            forAll(regionDicts, dictI)
+            {
+                const dictionary& regionDict = regionDicts[dictI];
+
+                const word regionName(regionDict.lookup("name"));
+
+                label regionI = findIndex(regionNames, regionName);
+
+                if (regionI == -1)
+                {
+                    FatalErrorIn
+                    (
+                        "refinementSurfaces::refinementSurfaces"
+                        "(const IOobject&, const PtrList<dictionary>&)"
+                    )   << "No region called " << regionName << " on surface "
+                        << allGeometry_[surfaces_[surfI]].name() << endl
+                        << "Valid regions are " << regionNames
+                        << exit(FatalError);
+                }
+
+
+                label min = readLabel(regionDict.lookup("minRefinementLevel"));
+                label max = readLabel(regionDict.lookup("maxRefinementLevel"));
+
+                bool hasInserted = regionMinLevel[surfI].insert(regionI, min);
+                if (!hasInserted)
+                {
+                    FatalErrorIn
+                    (
+                        "refinementSurfaces::refinementSurfaces"
+                        "(const IOobject&, const PtrList<dictionary>&)"
+                    )   << "Duplicate region name " << regionName
+                        << " on surface " << names_[surfI]
+                        << exit(FatalError);
+                }
+                regionMaxLevel[surfI].insert(regionI, max);
+
+                if (regionDict.found("perpendicularAngle"))
+                {
+                    regionAngle[surfI].insert
+                    (
+                        regionI,
+                        readScalar(regionDict.lookup("perpendicularAngle"))
+                    );
+                }
+            }
+        }
+    }
+
+
+    // Check for duplicate surface names
+    {
+        HashTable<label> surfaceNames(names_.size());
+
+        forAll(names_, surfI)
+        {
+            if (!surfaceNames.insert(names_[surfI], surfI))
+            {
+                FatalErrorIn
+                (
+                    "refinementSurfaces::refinementSurfaces"
+                    "(const IOobject&, const PtrList<dictionary>&)"
+                )   << "Duplicate surface name " << names_[surfI] << endl
+                    << "Previous occurrence of name at surface "
+                    << surfaceNames[names_[surfI]]
+                    << exit(FatalError);
+            }
+        }
+    }
+
+    // Calculate local to global region offset
+    label nRegions = 0;
+
+    forAll(surfaceDicts, surfI)
+    {
+        regionOffset_[surfI] = nRegions;
+
+        nRegions += allGeometry_[surfaces_[surfI]].regions().size();
+    }
+
+    // Rework surface specific information into information per global region
+    minLevel_.setSize(nRegions);
+    minLevel_ = 0;
+    maxLevel_.setSize(nRegions);
+    maxLevel_ = 0;
+    perpendicularAngle_.setSize(nRegions);
+    perpendicularAngle_ = -GREAT;
+    //patchName_.setSize(nRegions);
+    //patchType_.setSize(nRegions);
+
+    forAll(surfaceDicts, surfI)
+    {
+        label nRegions = allGeometry_[surfaces_[surfI]].regions().size();
+
+        // Initialise to global (i.e. per surface)
+        for (label i = 0; i < nRegions; i++)
+        {
+            minLevel_[regionOffset_[surfI] + i] = globalMinLevel[surfI];
+            maxLevel_[regionOffset_[surfI] + i] = globalMaxLevel[surfI];
+            perpendicularAngle_[regionOffset_[surfI] + i] = globalAngle[surfI];
+        }
+
+        // Overwrite with region specific information
+        forAllConstIter(Map<label>, regionMinLevel[surfI], iter)
+        {
+            label globalRegionI = regionOffset_[surfI] + iter.key();
+
+            minLevel_[globalRegionI] = iter();
+            maxLevel_[globalRegionI] = regionMaxLevel[surfI][iter.key()];
+
+            // Check validity
+            if
+            (
+                minLevel_[globalRegionI] < 0
+             || maxLevel_[globalRegionI] < minLevel_[globalRegionI]
+            )
+            {
+                FatalErrorIn
+                (
+                    "refinementSurfaces::refinementSurfaces"
+                    "(const IOobject&, const PtrList<dictionary>&)"
+                )   << "Illegal level or layer specification for surface "
+                    << names_[surfI]
+                    << " : minLevel:" << minLevel_[globalRegionI]
+                    << " maxLevel:" << maxLevel_[globalRegionI]
+                    << exit(FatalError);
+            }
+        }
+        forAllConstIter(Map<scalar>, regionAngle[surfI], iter)
+        {
+            label globalRegionI = regionOffset_[surfI] + iter.key();
+
+            perpendicularAngle_[globalRegionI] = regionAngle[surfI][iter.key()];
+        }
+
+
+        //// Optional patch names and patch types
+        //forAllConstIter(HashTable<word>, regionPatchName[surfI], iter)
+        //{
+        //    label regionI = findIndex(regionNames, iter.key());
+        //    label globalRegionI = regionOffset_[surfI] + regionI;
+        //
+        //    patchName_[globalRegionI] = iter();
+        //    patchType_[globalRegionI] = regionPatchType[surfI][iter.key()];
+        //}
+    }
+}
+
+
+Foam::refinementSurfaces::refinementSurfaces
+(
+    const searchableSurfaces& allGeometry,
+    const dictionary& surfacesDict
+)
+:
+    allGeometry_(allGeometry),
+    surfaces_(surfacesDict.size()),
+    names_(surfacesDict.size()),
+    faceZoneNames_(surfacesDict.size()),
+    cellZoneNames_(surfacesDict.size()),
+    zoneInside_(surfacesDict.size()),
+    regionOffset_(surfacesDict.size())
+{
+    // Wilcard specification : loop over all surface, all regions
+    // and try to find a match.
+
+    // Count number of surfaces.
+    label surfI = 0;
+    forAll(allGeometry.names(), geomI)
+    {
+        const word& geomName = allGeometry_.names()[geomI];
+
+        if (surfacesDict.found(geomName))
+        {
+            surfI++;
+        }
+    }
+
+    // Size lists
+    surfaces_.setSize(surfI);
+    names_.setSize(surfI);
+    faceZoneNames_.setSize(surfI);
+    cellZoneNames_.setSize(surfI);
+    zoneInside_.setSize(surfI);
+    regionOffset_.setSize(surfI);
+
+    labelList globalMinLevel(surfI, 0);
+    labelList globalMaxLevel(surfI, 0);
+    scalarField globalAngle(surfI, -GREAT);
+    List<Map<label> > regionMinLevel(surfI);
+    List<Map<label> > regionMaxLevel(surfI);
+    List<Map<scalar> > regionAngle(surfI);
+
+    surfI = 0;
+    forAll(allGeometry.names(), geomI)
+    {
+        const word& geomName = allGeometry_.names()[geomI];
+
+        if (surfacesDict.found(geomName))
+        {
+            const dictionary& dict = surfacesDict.subDict(geomName);
+
+            names_[surfI] = geomName;
+            surfaces_[surfI] = geomI;
+
+            const labelPair refLevel(dict.lookup("level"));
+            globalMinLevel[surfI] = refLevel[0];
+            globalMaxLevel[surfI] = refLevel[1];
+
+            // Global zone names per surface
+            if (dict.found("faceZone"))
+            {
+                dict.lookup("faceZone") >> faceZoneNames_[surfI];
+                dict.lookup("cellZone") >> cellZoneNames_[surfI];
+                dict.lookup("zoneInside") >> zoneInside_[surfI];
+            }
+
+            // Global perpendicular angle
+            if (dict.found("perpendicularAngle"))
+            {
+                globalAngle[surfI] = readScalar
+                (
+                    dict.lookup("perpendicularAngle")
+                );
+            }
+
+            if (dict.found("regions"))
+            {
+                const dictionary& regionsDict = dict.subDict("regions");
+                const wordList& regionNames =
+                    allGeometry_[surfaces_[surfI]].regions();
+
+                forAll(regionNames, regionI)
+                {
+                    if (regionsDict.found(regionNames[regionI]))
+                    {
+                        // Get the dictionary for region
+                        const dictionary& regionDict = regionsDict.subDict
+                        (
+                            regionNames[regionI]
+                        );
+
+                        const labelPair refLevel(regionDict.lookup("level"));
+
+                        regionMinLevel[surfI].insert(regionI, refLevel[0]);
+                        regionMaxLevel[surfI].insert(regionI, refLevel[1]);
+
+                        if (regionDict.found("perpendicularAngle"))
+                        {
+                            regionAngle[surfI].insert
+                            (
+                                regionI,
+                                readScalar
+                                (
+                                    regionDict.lookup("perpendicularAngle")
+                                )
+                            );
+                        }
+                    }
+                }
+            }
+            surfI++;
+        }
+    }
+
+    // Calculate local to global region offset
+    label nRegions = 0;
+
+    forAll(surfaces_, surfI)
+    {
+        regionOffset_[surfI] = nRegions;
+        nRegions += allGeometry_[surfaces_[surfI]].regions().size();
+    }
+
+    // Rework surface specific information into information per global region
+    minLevel_.setSize(nRegions);
+    minLevel_ = 0;
+    maxLevel_.setSize(nRegions);
+    maxLevel_ = 0;
+    perpendicularAngle_.setSize(nRegions);
+    perpendicularAngle_ = -GREAT;
+
+
+    forAll(globalMinLevel, surfI)
+    {
+        label nRegions = allGeometry_[surfaces_[surfI]].regions().size();
+
+        // Initialise to global (i.e. per surface)
+        for (label i = 0; i < nRegions; i++)
+        {
+            minLevel_[regionOffset_[surfI] + i] = globalMinLevel[surfI];
+            maxLevel_[regionOffset_[surfI] + i] = globalMaxLevel[surfI];
+            perpendicularAngle_[regionOffset_[surfI] + i] = globalAngle[surfI];
+        }
+
+        // Overwrite with region specific information
+        forAllConstIter(Map<label>, regionMinLevel[surfI], iter)
+        {
+            label globalRegionI = regionOffset_[surfI] + iter.key();
+
+            minLevel_[globalRegionI] = iter();
+            maxLevel_[globalRegionI] = regionMaxLevel[surfI][iter.key()];
+
+            // Check validity
+            if
+            (
+                minLevel_[globalRegionI] < 0
+             || maxLevel_[globalRegionI] < minLevel_[globalRegionI]
+            )
+            {
+                FatalErrorIn
+                (
+                    "refinementSurfaces::refinementSurfaces"
+                    "(const searchableSurfaces&, const dictionary>&"
+                )   << "Illegal level or layer specification for surface "
+                    << names_[surfI]
+                    << " : minLevel:" << minLevel_[globalRegionI]
+                    << " maxLevel:" << maxLevel_[globalRegionI]
+                    << exit(FatalError);
+            }
+        }
+        forAllConstIter(Map<scalar>, regionAngle[surfI], iter)
+        {
+            label globalRegionI = regionOffset_[surfI] + iter.key();
+
+            perpendicularAngle_[globalRegionI] = regionAngle[surfI][iter.key()];
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Get indices of unnamed surfaces (surfaces without faceZoneName)
+Foam::labelList Foam::refinementSurfaces::getUnnamedSurfaces() const
+{
+    labelList anonymousSurfaces(faceZoneNames_.size());
+
+    label i = 0;
+    forAll(faceZoneNames_, surfI)
+    {
+        if (faceZoneNames_[surfI].empty())
+        {
+            anonymousSurfaces[i++] = surfI;
+        }
+    }
+    anonymousSurfaces.setSize(i);
+
+    return anonymousSurfaces;
+}
+
+
+// Get indices of named surfaces (surfaces with faceZoneName)
+Foam::labelList Foam::refinementSurfaces::getNamedSurfaces() const
+{
+   labelList namedSurfaces(faceZoneNames_.size());
+
+    label namedI = 0;
+    forAll(faceZoneNames_, surfI)
+    {
+        if (faceZoneNames_[surfI].size())
+        {
+            namedSurfaces[namedI++] = surfI;
+        }
+    }
+    namedSurfaces.setSize(namedI);
+
+    return namedSurfaces;
+}
+
+
+// Get indices of closed named surfaces
+Foam::labelList Foam::refinementSurfaces::getClosedNamedSurfaces() const
+{
+    labelList named(getNamedSurfaces());
+
+    labelList closed(named.size());
+    label closedI = 0;
+
+    forAll(named, i)
+    {
+        label surfI = named[i];
+
+        if (allGeometry_[surfaces_[surfI]].hasVolumeType())
+        {
+            closed[closedI++] = surfI;
+        }
+    }
+    closed.setSize(closedI);
+
+    return closed;
+}
+
+
+// // Count number of triangles per surface region
+// Foam::labelList Foam::refinementSurfaces::countRegions(const triSurface& s)
+// {
+//     const geometricSurfacePatchList& regions = s.patches();
+//
+//     labelList nTris(regions.size(), 0);
+//
+//     forAll(s, triI)
+//     {
+//         nTris[s[triI].region()]++;
+//     }
+//     return nTris;
+// }
+
+
+// // Pre-calculate the refinement level for every element
+// void Foam::refinementSurfaces::wantedRefinementLevel
+// (
+//     const shellSurfaces& shells,
+//     const label surfI,
+//     const List<pointIndexHit>& info,    // Indices
+//     const pointField& ctrs,             // Representative coordinate
+//     labelList& minLevelField
+// ) const
+// {
+//     const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
+//
+//     // Get per element the region
+//     labelList region;
+//     geom.getRegion(info, region);
+//
+//     // Initialise fields to region wise minLevel
+//     minLevelField.setSize(ctrs.size());
+//     minLevelField = -1;
+//
+//     forAll(minLevelField, i)
+//     {
+//         if (info[i].hit())
+//         {
+//             minLevelField[i] = minLevel(surfI, region[i]);
+//         }
+//     }
+//
+//     // Find out if triangle inside shell with higher level
+//     // What level does shell want to refine fc to?
+//     labelList shellLevel;
+//     shells.findHigherLevel(ctrs, minLevelField, shellLevel);
+//
+//     forAll(minLevelField, i)
+//     {
+//         minLevelField[i] = max(minLevelField[i], shellLevel[i]);
+//     }
+// }
+
+
+// Precalculate the refinement level for every element of the searchable
+// surface.
+void Foam::refinementSurfaces::setMinLevelFields
+(
+    const shellSurfaces& shells
+)
+{
+    forAll(surfaces_, surfI)
+    {
+        const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
+
+        // Precalculation only makes sense if there are different regions
+        // (so different refinement levels possible) and there are some
+        // elements. Possibly should have 'enough' elements to have fine
+        // enough resolution but for now just make sure we don't catch e.g.
+        // searchableBox (size=6)
+        if (geom.regions().size() > 1 && geom.globalSize() > 10)
+        {
+            // Representative local coordinates
+            const pointField ctrs = geom.coordinates();
+
+            labelList minLevelField(ctrs.size(), -1);
+            {
+                // Get the element index in a roundabout way. Problem is e.g.
+                // distributed surface where local indices differ from global
+                // ones (needed for getRegion call)
+                List<pointIndexHit> info;
+                geom.findNearest
+                (
+                    ctrs,
+                    scalarField(ctrs.size(), sqr(GREAT)),
+                    info
+                );
+
+                // Get per element the region
+                labelList region;
+                geom.getRegion(info, region);
+
+                // From the region get the surface-wise refinement level
+                forAll(minLevelField, i)
+                {
+                    if (info[i].hit())
+                    {
+                        minLevelField[i] = minLevel(surfI, region[i]);
+                    }
+                }
+            }
+
+            // Find out if triangle inside shell with higher level
+            // What level does shell want to refine fc to?
+            labelList shellLevel;
+            shells.findHigherLevel(ctrs, minLevelField, shellLevel);
+
+            forAll(minLevelField, i)
+            {
+                minLevelField[i] = max(minLevelField[i], shellLevel[i]);
+            }
+
+            // Store minLevelField on surface
+            const_cast<searchableSurface&>(geom).setField(minLevelField);
+        }
+    }
+}
+
+
+// Find intersections of edge. Return -1 or first surface with higher minLevel
+// number.
+void Foam::refinementSurfaces::findHigherIntersection
+(
+    const pointField& start,
+    const pointField& end,
+    const labelList& currentLevel,   // current cell refinement level
+
+    labelList& surfaces,
+    labelList& surfaceLevel
+) const
+{
+    surfaces.setSize(start.size());
+    surfaces = -1;
+    surfaceLevel.setSize(start.size());
+    surfaceLevel = -1;
+
+    if (surfaces_.empty())
+    {
+        return;
+    }
+
+    if (surfaces_.size() == 1)
+    {
+        // Optimisation: single segmented surface. No need to duplicate
+        // point storage.
+
+        label surfI = 0;
+
+        const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
+
+        // Do intersection test
+        List<pointIndexHit> intersectionInfo(start.size());
+        geom.findLineAny(start, end, intersectionInfo);
+
+        // See if a cached level field available
+        labelList minLevelField;
+        geom.getField(intersectionInfo, minLevelField);
+        bool haveLevelField =
+        (
+            returnReduce(minLevelField.size(), sumOp<label>())
+          > 0
+        );
+
+        if (!haveLevelField && geom.regions().size() == 1)
+        {
+            minLevelField = labelList
+            (
+                intersectionInfo.size(),
+                minLevel(surfI, 0)
+            );
+            haveLevelField = true;
+        }
+
+        if (haveLevelField)
+        {
+            forAll(intersectionInfo, i)
+            {
+                if
+                (
+                    intersectionInfo[i].hit()
+                 && minLevelField[i] > currentLevel[i]
+                )
+                {
+                    surfaces[i] = surfI;    // index of surface
+                    surfaceLevel[i] = minLevelField[i];
+                }
+            }
+            return;
+        }
+    }
+
+
+
+    // Work arrays
+    pointField p0(start);
+    pointField p1(end);
+    labelList intersectionToPoint(identity(start.size()));
+    List<pointIndexHit> intersectionInfo(start.size());
+
+    forAll(surfaces_, surfI)
+    {
+        const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
+
+        // Do intersection test
+        geom.findLineAny(p0, p1, intersectionInfo);
+
+        // See if a cached level field available
+        labelList minLevelField;
+        geom.getField(intersectionInfo, minLevelField);
+
+        // Copy all hits into arguments, In-place compact misses.
+        label missI = 0;
+        forAll(intersectionInfo, i)
+        {
+            // Get the minLevel for the point
+            label minLocalLevel = -1;
+
+            if (intersectionInfo[i].hit())
+            {
+                // Check if minLevelField for this surface.
+                if (minLevelField.size())
+                {
+                    minLocalLevel = minLevelField[i];
+                }
+                else
+                {
+                    // Use the min level for the surface instead. Assume
+                    // single region 0.
+                    minLocalLevel = minLevel(surfI, 0);
+                }
+            }
+
+
+            label pointI = intersectionToPoint[i];
+
+            if (minLocalLevel > currentLevel[pointI])
+            {
+                // Mark point for refinement
+                surfaces[pointI] = surfI;
+                surfaceLevel[pointI] = minLocalLevel;
+            }
+            else
+            {
+                p0[missI] = start[pointI];
+                p1[missI] = end[pointI];
+                intersectionToPoint[missI] = pointI;
+                missI++;
+            }
+        }
+
+        // All done? Note that this decision should be synchronised
+        if (returnReduce(missI, sumOp<label>()) == 0)
+        {
+            break;
+        }
+
+        // Trim misses
+        p0.setSize(missI);
+        p1.setSize(missI);
+        intersectionToPoint.setSize(missI);
+        intersectionInfo.setSize(missI);
+    }
+}
+
+
+void Foam::refinementSurfaces::findAllHigherIntersections
+(
+    const pointField& start,
+    const pointField& end,
+    const labelList& currentLevel,   // current cell refinement level
+
+    List<vectorList>& surfaceNormal,
+    labelListList& surfaceLevel
+) const
+{
+    surfaceLevel.setSize(start.size());
+    surfaceNormal.setSize(start.size());
+
+    if (surfaces_.empty())
+    {
+        return;
+    }
+
+    // Work arrays
+    List<List<pointIndexHit> > hitInfo;
+    labelList pRegions;
+    vectorField pNormals;
+
+    forAll(surfaces_, surfI)
+    {
+        allGeometry_[surfaces_[surfI]].findLineAll(start, end, hitInfo);
+
+        // Repack hits for surface into flat list
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // To avoid overhead of calling getRegion for every point
+
+        label n = 0;
+        forAll(hitInfo, pointI)
+        {
+            n += hitInfo[pointI].size();
+        }
+
+        List<pointIndexHit> surfInfo(n);
+        labelList pointMap(n);
+        n = 0;
+
+        forAll(hitInfo, pointI)
+        {
+            const List<pointIndexHit>& pHits = hitInfo[pointI];
+
+            forAll(pHits, i)
+            {
+                surfInfo[n] = pHits[i];
+                pointMap[n] = pointI;
+                n++;
+            }
+        }
+
+        labelList surfRegion(n);
+        vectorField surfNormal(n);
+        allGeometry_[surfaces_[surfI]].getRegion(surfInfo, surfRegion);
+        allGeometry_[surfaces_[surfI]].getNormal(surfInfo, surfNormal);
+
+        surfInfo.clear();
+
+
+        // Extract back into pointwise
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        forAll(surfRegion, i)
+        {
+            label region = globalRegion(surfI, surfRegion[i]);
+            label pointI = pointMap[i];
+
+            if (maxLevel_[region] > currentLevel[pointI])
+            {
+                // Append to pointI info
+                label sz = surfaceNormal[pointI].size();
+                surfaceNormal[pointI].setSize(sz+1);
+                surfaceNormal[pointI][sz] = surfNormal[i];
+
+                surfaceLevel[pointI].setSize(sz+1);
+                surfaceLevel[pointI][sz] = maxLevel_[region];
+            }
+        }
+    }
+}
+
+
+void Foam::refinementSurfaces::findNearestIntersection
+(
+    const labelList& surfacesToTest,
+    const pointField& start,
+    const pointField& end,
+
+    labelList& surface1,
+    List<pointIndexHit>& hit1,
+    labelList& region1,
+    labelList& surface2,
+    List<pointIndexHit>& hit2,
+    labelList& region2
+) const
+{
+    // 1. intersection from start to end
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Initialize arguments
+    surface1.setSize(start.size());
+    surface1 = -1;
+    hit1.setSize(start.size());
+    region1.setSize(start.size());
+
+    // Current end of segment to test.
+    pointField nearest(end);
+    // Work array
+    List<pointIndexHit> nearestInfo(start.size());
+    labelList region;
+
+    forAll(surfacesToTest, testI)
+    {
+        label surfI = surfacesToTest[testI];
+
+        // See if any intersection between start and current nearest
+        allGeometry_[surfaces_[surfI]].findLine
+        (
+            start,
+            nearest,
+            nearestInfo
+        );
+        allGeometry_[surfaces_[surfI]].getRegion
+        (
+            nearestInfo,
+            region
+        );
+
+        forAll(nearestInfo, pointI)
+        {
+            if (nearestInfo[pointI].hit())
+            {
+                hit1[pointI] = nearestInfo[pointI];
+                surface1[pointI] = surfI;
+                region1[pointI] = region[pointI];
+                nearest[pointI] = hit1[pointI].hitPoint();
+            }
+        }
+    }
+
+
+    // 2. intersection from end to last intersection
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Find the nearest intersection from end to start. Note that we initialize
+    // to the first intersection (if any).
+    surface2 = surface1;
+    hit2 = hit1;
+    region2 = region1;
+
+    // Set current end of segment to test.
+    forAll(nearest, pointI)
+    {
+        if (hit1[pointI].hit())
+        {
+            nearest[pointI] = hit1[pointI].hitPoint();
+        }
+        else
+        {
+            // Disable testing by setting to end.
+            nearest[pointI] = end[pointI];
+        }
+    }
+
+    forAll(surfacesToTest, testI)
+    {
+        label surfI = surfacesToTest[testI];
+
+        // See if any intersection between end and current nearest
+        allGeometry_[surfaces_[surfI]].findLine
+        (
+            end,
+            nearest,
+            nearestInfo
+        );
+        allGeometry_[surfaces_[surfI]].getRegion
+        (
+            nearestInfo,
+            region
+        );
+
+        forAll(nearestInfo, pointI)
+        {
+            if (nearestInfo[pointI].hit())
+            {
+                hit2[pointI] = nearestInfo[pointI];
+                surface2[pointI] = surfI;
+                region2[pointI] = region[pointI];
+                nearest[pointI] = hit2[pointI].hitPoint();
+            }
+        }
+    }
+
+
+    // Make sure that if hit1 has hit something, hit2 will have at least the
+    // same point (due to tolerances it might miss its end point)
+    forAll(hit1, pointI)
+    {
+        if (hit1[pointI].hit() && !hit2[pointI].hit())
+        {
+            hit2[pointI] = hit1[pointI];
+            surface2[pointI] = surface1[pointI];
+            region2[pointI] = region1[pointI];
+        }
+    }
+}
+
+
+void Foam::refinementSurfaces::findAnyIntersection
+(
+    const pointField& start,
+    const pointField& end,
+
+    labelList& hitSurface,
+    List<pointIndexHit>& hitInfo
+) const
+{
+    searchableSurfacesQueries::findAnyIntersection
+    (
+        allGeometry_,
+        surfaces_,
+        start,
+        end,
+        hitSurface,
+        hitInfo
+    );
+}
+
+
+void Foam::refinementSurfaces::findNearest
+(
+    const labelList& surfacesToTest,
+    const pointField& samples,
+    const  scalarField& nearestDistSqr,
+    labelList& hitSurface,
+    List<pointIndexHit>& hitInfo
+) const
+{
+    labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+
+    // Do the tests. Note that findNearest returns index in geometries.
+    searchableSurfacesQueries::findNearest
+    (
+        allGeometry_,
+        geometries,
+        samples,
+        nearestDistSqr,
+        hitSurface,
+        hitInfo
+    );
+
+    // Rework the hitSurface to be surface (i.e. index into surfaces_)
+    forAll(hitSurface, pointI)
+    {
+        if (hitSurface[pointI] != -1)
+        {
+            hitSurface[pointI] = surfacesToTest[hitSurface[pointI]];
+        }
+    }
+}
+
+
+void Foam::refinementSurfaces::findNearestRegion
+(
+    const labelList& surfacesToTest,
+    const pointField& samples,
+    const  scalarField& nearestDistSqr,
+    labelList& hitSurface,
+    labelList& hitRegion
+) const
+{
+    labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+
+    // Do the tests. Note that findNearest returns index in geometries.
+    List<pointIndexHit> hitInfo;
+    searchableSurfacesQueries::findNearest
+    (
+        allGeometry_,
+        geometries,
+        samples,
+        nearestDistSqr,
+        hitSurface,
+        hitInfo
+    );
+
+    // Rework the hitSurface to be surface (i.e. index into surfaces_)
+    forAll(hitSurface, pointI)
+    {
+        if (hitSurface[pointI] != -1)
+        {
+            hitSurface[pointI] = surfacesToTest[hitSurface[pointI]];
+        }
+    }
+
+    // Collect the region
+    hitRegion.setSize(hitSurface.size());
+    hitRegion = -1;
+
+    forAll(surfacesToTest, i)
+    {
+        label surfI = surfacesToTest[i];
+
+        // Collect hits for surfI
+        const labelList localIndices(findIndices(hitSurface, surfI));
+
+        List<pointIndexHit> localHits
+        (
+            UIndirectList<pointIndexHit>
+            (
+                hitInfo,
+                localIndices
+            )
+        );
+
+        labelList localRegion;
+        allGeometry_[surfaces_[surfI]].getRegion(localHits, localRegion);
+
+        forAll(localIndices, i)
+        {
+            hitRegion[localIndices[i]] = localRegion[i];
+        }
+    }
+}
+
+
+//// Find intersection with max of edge. Return -1 or the surface
+//// with the highest maxLevel above currentLevel
+//Foam::label Foam::refinementSurfaces::findHighestIntersection
+//(
+//    const point& start,
+//    const point& end,
+//    const label currentLevel,   // current cell refinement level
+//
+//    pointIndexHit& maxHit
+//) const
+//{
+//    // surface with highest maxlevel
+//    label maxSurface = -1;
+//    // maxLevel of maxSurface
+//    label maxLevel = currentLevel;
+//
+//    forAll(*this, surfI)
+//    {
+//        pointIndexHit hit = operator[](surfI).findLineAny(start, end);
+//
+//        if (hit.hit())
+//        {
+//            const triSurface& s = operator[](surfI);
+//
+//            label region = globalRegion(surfI, s[hit.index()].region());
+//
+//            if (maxLevel_[region] > maxLevel)
+//            {
+//                maxSurface = surfI;
+//                maxLevel = maxLevel_[region];
+//                maxHit = hit;
+//            }
+//        }
+//    }
+//
+//    if (maxSurface == -1)
+//    {
+//        // maxLevel unchanged. No interesting surface hit.
+//        maxHit.setMiss();
+//    }
+//
+//    return maxSurface;
+//}
+
+
+void Foam::refinementSurfaces::findInside
+(
+    const labelList& testSurfaces,
+    const pointField& pt,
+    labelList& insideSurfaces
+) const
+{
+    insideSurfaces.setSize(pt.size());
+    insideSurfaces = -1;
+
+    forAll(testSurfaces, i)
+    {
+        label surfI = testSurfaces[i];
+
+        if (allGeometry_[surfaces_[surfI]].hasVolumeType())
+        {
+            List<searchableSurface::volumeType> volType;
+            allGeometry_[surfaces_[surfI]].getVolumeType(pt, volType);
+
+            forAll(volType, pointI)
+            {
+                if (insideSurfaces[pointI] == -1)
+                {
+                    if
+                    (
+                        (
+                            volType[pointI] == triSurfaceMesh::INSIDE
+                         && zoneInside_[surfI]
+                        )
+                     || (
+                            volType[pointI] == triSurfaceMesh::OUTSIDE
+                         && !zoneInside_[surfI]
+                        )
+                    )
+                    {
+                        insideSurfaces[pointI] = surfI;
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
new file mode 100644
index 000000000..8014d0d0b
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -0,0 +1,317 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::refinementSurfaces
+
+Description
+    Container for data on surfaces used for surface-driven refinement.
+    Contains all the data about the level of refinement needed per
+    surface.
+
+SourceFiles
+    refinementSurfaces.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef refinementSurfaces_H
+#define refinementSurfaces_H
+
+#include "triSurfaceGeoMesh.H"
+#include "triSurfaceFields.H"
+#include "vectorList.H"
+#include "pointIndexHit.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class searchableSurfaces;
+class shellSurfaces;
+class triSurfaceMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class refinementSurfaces Declaration
+\*---------------------------------------------------------------------------*/
+
+class refinementSurfaces
+{
+    // Private data
+
+        //- Reference to all geometry.
+        const searchableSurfaces& allGeometry_;
+
+        //- Indices of surfaces that are refinement ones
+        labelList surfaces_;
+
+        //- Surface name (word)
+        wordList names_;
+
+        //- Per 'interface' surface : name of faceZone to put faces into
+        wordList faceZoneNames_;
+
+        //- Per 'interface' surface : name of cellZone to put cells into
+        wordList cellZoneNames_;
+
+        //- Per 'interface' surface : (only used if surface is closed)
+        //  whether to zone cells inside or outside surface.
+        boolList zoneInside_;
+
+
+        //- From local region number to global region number
+        labelList regionOffset_;
+
+        //- From global region number to refinement level
+        labelList minLevel_;
+
+        //- From global region number to refinement level
+        labelList maxLevel_;
+
+        //- From global region number to perpendicular angle
+        scalarField perpendicularAngle_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        refinementSurfaces(const refinementSurfaces&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const refinementSurfaces&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from surfaces and dictionaries
+        refinementSurfaces
+        (
+            const searchableSurfaces& allGeometry,
+            const PtrList<dictionary>&
+        );
+
+        //- Construct from surfaces and dictionary
+        refinementSurfaces
+        (
+            const searchableSurfaces& allGeometry,
+            const dictionary&
+        );
+
+
+    // Member Functions
+
+        // Access
+
+            const searchableSurfaces& geometry() const
+            {
+                return allGeometry_;
+            }
+
+            const labelList& surfaces() const
+            {
+                return surfaces_;
+            }
+
+            //- Names of surfaces
+            const wordList& names() const
+            {
+                return names_;
+            }
+
+            //- Per 'interface' surface : name of faceZone to put faces into
+            const wordList& faceZoneNames() const
+            {
+                return faceZoneNames_;
+            }
+
+            //- Per 'interface' surface : name of cellZone to put cells into
+            const wordList& cellZoneNames() const
+            {
+                return cellZoneNames_;
+            }
+
+            //- Get indices of unnamed surfaces (surfaces without faceZoneName)
+            labelList getUnnamedSurfaces() const;
+
+            //- Get indices of named surfaces (surfaces with faceZoneName)
+            labelList getNamedSurfaces() const;
+
+            //- Get indices of closed named surfaces
+            labelList getClosedNamedSurfaces() const;
+
+            //- From local region number to global region number
+            const labelList& regionOffset() const
+            {
+                return regionOffset_;
+            }
+
+            //- From global region number to refinement level
+            const labelList& minLevel() const
+            {
+                return minLevel_;
+            }
+
+            //- From global region number to refinement level
+            const labelList& maxLevel() const
+            {
+                return maxLevel_;
+            }
+
+            //- From global region number to perpendicular angle
+            const scalarField& perpendicularAngle() const
+            {
+                return perpendicularAngle_;
+            }
+
+
+        // Helper
+
+            //- From surface and region on surface to global region
+            label globalRegion(const label surfI, const label regionI) const
+            {
+                return regionOffset_[surfI]+regionI;
+            }
+
+            //- Min level for surface and region on surface
+            label minLevel(const label surfI, const label regionI) const
+            {
+                return minLevel_[globalRegion(surfI, regionI)];
+            }
+
+            //- Max level for surface and region on surface
+            label maxLevel(const label surfI, const label regionI) const
+            {
+                return maxLevel_[globalRegion(surfI, regionI)];
+            }
+
+            label nRegions() const
+            {
+                return minLevel_.size();
+            }
+
+            //- Calculate minLevelFields
+            void setMinLevelFields
+            (
+                const shellSurfaces& shells
+            );
+
+            ////- Helper: count number of triangles per region
+            //static labelList countRegions(const triSurface&);
+
+
+        // Searching
+
+            //- Find intersection of edge. Return -1 or first surface
+            //  with higher (than currentLevel) minlevel.
+            //  Return surface number and level.
+            void findHigherIntersection
+            (
+                const pointField& start,
+                const pointField& end,
+                const labelList& currentLevel,  // current cell refinement level
+
+                labelList& surfaces,
+                labelList& surfaceLevel
+            ) const;
+
+            //- Find all intersections of edge. Unsorted order.
+            void findAllHigherIntersections
+            (
+                const pointField& start,
+                const pointField& end,
+                const labelList& currentLevel,  // current cell refinement level
+
+                List<vectorList>& surfaceNormal,
+                labelListList& surfaceLevel
+            ) const;
+
+            //- Find intersection nearest to the endpoints. surface1,2 are
+            //  not indices into surfacesToTest but refinement surface indices.
+            //  Returns surface, region on surface (so not global surface)
+            //  and position on surface.
+            void findNearestIntersection
+            (
+                const labelList& surfacesToTest,
+                const pointField& start,
+                const pointField& end,
+
+                labelList& surface1,
+                List<pointIndexHit>& hit1,
+                labelList& region1,
+                labelList& surface2,
+                List<pointIndexHit>& hit2,
+                labelList& region2
+            ) const;
+
+            //- Used for debugging only: find intersection of edge.
+            void findAnyIntersection
+            (
+                const pointField& start,
+                const pointField& end,
+                labelList& surfaces,
+                List<pointIndexHit>&
+            ) const;
+
+            //- Find nearest point on surfaces.
+            void findNearest
+            (
+                const labelList& surfacesToTest,
+                const pointField& samples,
+                const scalarField& nearestDistSqr,
+                labelList& surfaces,
+                List<pointIndexHit>&
+            ) const;
+
+            //- Find nearest point on surfaces. Return surface and region on
+            //  surface (so not global surface)
+            void findNearestRegion
+            (
+                const labelList& surfacesToTest,
+                const pointField& samples,
+                const scalarField& nearestDistSqr,
+                labelList& hitSurface,
+                labelList& hitRegion
+            ) const;
+
+            //- Detect if a point is 'inside' (closed) surfaces.
+            //  Returns -1 if not, returns first surface it is.
+            void findInside
+            (
+                const labelList& surfacesToTest,
+                const pointField& pt,
+                labelList& insideSurfaces
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
new file mode 100644
index 000000000..b33e9829b
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
@@ -0,0 +1,481 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "searchableSurface.H"
+#include "shellSurfaces.H"
+#include "boundBox.H"
+#include "triSurfaceMesh.H"
+#include "refinementSurfaces.H"
+#include "searchableSurfaces.H"
+#include "orientedSurface.H"
+#include "pointIndexHit.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+
+namespace Foam
+{
+
+template<>
+const char*
+NamedEnum<shellSurfaces::refineMode, 3>::
+names[] =
+{
+    "inside",
+    "outside",
+    "distance"
+};
+
+const NamedEnum<shellSurfaces::refineMode, 3> shellSurfaces::refineModeNames_;
+
+} // End namespace Foam
+
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::shellSurfaces::setAndCheckLevels
+(
+    const label shellI,
+    const List<Tuple2<scalar, label> >& distLevels
+)
+{
+    if (modes_[shellI] != DISTANCE && distLevels.size() != 1)
+    {
+        FatalErrorIn
+        (
+            "shellSurfaces::shellSurfaces"
+            "(const searchableSurfaces&, const dictionary&)"
+        )   << "For refinement mode "
+            << refineModeNames_[modes_[shellI]]
+            << " specify only one distance+level."
+            << " (its distance gets discarded)"
+            << exit(FatalError);
+    }
+    // Extract information into separate distance and level
+    distances_[shellI].setSize(distLevels.size());
+    levels_[shellI].setSize(distLevels.size());
+
+    forAll(distLevels, j)
+    {
+        distances_[shellI][j] = distLevels[j].first();
+        levels_[shellI][j] = distLevels[j].second();
+
+        // Check in incremental order
+        if (j > 0)
+        {
+            if
+            (
+                (distances_[shellI][j] <= distances_[shellI][j-1])
+             || (levels_[shellI][j] > levels_[shellI][j-1])
+            )
+            {
+                FatalErrorIn
+                (
+                    "shellSurfaces::shellSurfaces"
+                    "(const searchableSurfaces&, const dictionary&)"
+                )   << "For refinement mode "
+                    << refineModeNames_[modes_[shellI]]
+                    << " : Refinement should be specified in order"
+                    << " of increasing distance"
+                    << " (and decreasing refinement level)." << endl
+                    << "Distance:" << distances_[shellI][j]
+                    << " refinementLevel:" << levels_[shellI][j]
+                    << exit(FatalError);
+            }
+        }
+    }
+
+    const searchableSurface& shell = allGeometry_[shells_[shellI]];
+
+    if (modes_[shellI] == DISTANCE)
+    {
+        Info<< "Refinement level according to distance to "
+            << shell.name() << endl;
+        forAll(levels_[shellI], j)
+        {
+            Info<< "    level " << levels_[shellI][j]
+                << " for all cells within " << distances_[shellI][j]
+                << " meter." << endl;
+        }
+    }
+    else
+    {
+        if (!allGeometry_[shells_[shellI]].hasVolumeType())
+        {
+            FatalErrorIn
+            (
+                "shellSurfaces::shellSurfaces"
+                "(const searchableSurfaces&"
+                ", const PtrList<dictionary>&)"
+            )   << "Shell " << shell.name()
+                << " does not support testing for "
+                << refineModeNames_[modes_[shellI]] << endl
+                << "Probably it is not closed."
+                << exit(FatalError);
+        }
+
+        if (modes_[shellI] == INSIDE)
+        {
+            Info<< "Refinement level " << levels_[shellI][0]
+                << " for all cells inside " << shell.name() << endl;
+        }
+        else
+        {
+            Info<< "Refinement level " << levels_[shellI][0]
+                << " for all cells outside " << shell.name() << endl;
+        }
+    }
+}
+
+
+// Specifically orient triSurfaces using a calculated point outside.
+// Done since quite often triSurfaces not of consistent orientation which
+// is (currently) necessary for sideness calculation
+void Foam::shellSurfaces::orient()
+{
+    // Determine outside point.
+    boundBox overallBb = boundBox::invertedBox;
+
+    bool hasSurface = false;
+
+    forAll(shells_, shellI)
+    {
+        const searchableSurface& s = allGeometry_[shells_[shellI]];
+
+        if (modes_[shellI] != DISTANCE && isA<triSurfaceMesh>(s))
+        {
+            const triSurfaceMesh& shell = refCast<const triSurfaceMesh>(s);
+
+            if (shell.triSurface::size())
+            {
+                const pointField& points = shell.points();
+
+                hasSurface = true;
+
+                boundBox shellBb(points[0], points[0]);
+                // Assume surface is compact!
+                for (label i = 0; i < points.size(); i++)
+                {
+                    const point& pt = points[i];
+                    shellBb.min() = min(shellBb.min(), pt);
+                    shellBb.max() = max(shellBb.max(), pt);
+                }
+
+                overallBb.min() = min(overallBb.min(), shellBb.min());
+                overallBb.max() = max(overallBb.max(), shellBb.max());
+            }
+        }
+    }
+
+    if (hasSurface)
+    {
+        const point outsidePt = overallBb.max() + overallBb.span();
+
+        //Info<< "Using point " << outsidePt << " to orient shells" << endl;
+
+        forAll(shells_, shellI)
+        {
+            const searchableSurface& s = allGeometry_[shells_[shellI]];
+
+            if (modes_[shellI] != DISTANCE && isA<triSurfaceMesh>(s))
+            {
+                triSurfaceMesh& shell = const_cast<triSurfaceMesh&>
+                (
+                    refCast<const triSurfaceMesh>(s)
+                );
+
+                // Flip surface so outsidePt is outside.
+                bool anyFlipped = orientedSurface::orient
+                (
+                    shell,
+                    outsidePt,
+                    true
+                );
+
+                if (anyFlipped)
+                {
+                    // orientedSurface will have done a clearOut of the surface.
+                    // we could do a clearout of the triSurfaceMeshes::trees()
+                    // but these aren't affected by orientation
+                    // (except for cached
+                    // sideness which should not be set at this point.
+                    // !!Should check!)
+
+                    Info<< "shellSurfaces : Flipped orientation of surface "
+                        << s.name()
+                        << " so point " << outsidePt << " is outside." << endl;
+                }
+            }
+        }
+    }
+}
+
+
+// Find maximum level of a shell.
+void Foam::shellSurfaces::findHigherLevel
+(
+    const pointField& pt,
+    const label shellI,
+    labelList& maxLevel
+) const
+{
+    const labelList& levels = levels_[shellI];
+
+    if (modes_[shellI] == DISTANCE)
+    {
+        // Distance mode.
+
+        const scalarField& distances = distances_[shellI];
+
+        // Collect all those points that have a current maxLevel less than
+        // (any of) the shell. Also collect the furthest distance allowable
+        // to any shell with a higher level.
+
+        pointField candidates(pt.size());
+        labelList candidateMap(pt.size());
+        scalarField candidateDistSqr(pt.size());
+        label candidateI = 0;
+
+        forAll(maxLevel, pointI)
+        {
+            forAllReverse(levels, levelI)
+            {
+                if (levels[levelI] > maxLevel[pointI])
+                {
+                    candidates[candidateI] = pt[pointI];
+                    candidateMap[candidateI] = pointI;
+                    candidateDistSqr[candidateI] = sqr(distances[levelI]);
+                    candidateI++;
+                    break;
+                }
+            }
+        }
+        candidates.setSize(candidateI);
+        candidateMap.setSize(candidateI);
+        candidateDistSqr.setSize(candidateI);
+
+        // Do the expensive nearest test only for the candidate points.
+        List<pointIndexHit> nearInfo;
+        allGeometry_[shells_[shellI]].findNearest
+        (
+            candidates,
+            candidateDistSqr,
+            nearInfo
+        );
+
+        // Update maxLevel
+        forAll(nearInfo, candidateI)
+        {
+            if (nearInfo[candidateI].hit())
+            {
+                // Check which level it actually is in.
+                label minDistI = findLower
+                (
+                    distances,
+                    mag(nearInfo[candidateI].hitPoint()-candidates[candidateI])
+                );
+
+                label pointI = candidateMap[candidateI];
+
+                // pt is inbetween shell[minDistI] and shell[minDistI+1]
+                maxLevel[pointI] = levels[minDistI+1];
+            }
+        }
+    }
+    else
+    {
+        // Inside/outside mode
+
+        // Collect all those points that have a current maxLevel less than the
+        // shell.
+
+        pointField candidates(pt.size());
+        labelList candidateMap(pt.size());
+        label candidateI = 0;
+
+        forAll(maxLevel, pointI)
+        {
+            if (levels[0] > maxLevel[pointI])
+            {
+                candidates[candidateI] = pt[pointI];
+                candidateMap[candidateI] = pointI;
+                candidateI++;
+            }
+        }
+        candidates.setSize(candidateI);
+        candidateMap.setSize(candidateI);
+
+        // Do the expensive nearest test only for the candidate points.
+        List<searchableSurface::volumeType> volType;
+        allGeometry_[shells_[shellI]].getVolumeType(candidates, volType);
+
+        forAll(volType, i)
+        {
+            label pointI = candidateMap[i];
+
+            if
+            (
+                (
+                    modes_[shellI] == INSIDE
+                 && volType[i] == searchableSurface::INSIDE
+                )
+             || (
+                    modes_[shellI] == OUTSIDE
+                 && volType[i] == searchableSurface::OUTSIDE
+                )
+            )
+            {
+                maxLevel[pointI] = levels[0];
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::shellSurfaces::shellSurfaces
+(
+    const searchableSurfaces& allGeometry,
+    const PtrList<dictionary>& shellDicts
+)
+:
+    allGeometry_(allGeometry)
+{
+    shells_.setSize(shellDicts.size());
+    modes_.setSize(shellDicts.size());
+    distances_.setSize(shellDicts.size());
+    levels_.setSize(shellDicts.size());
+
+    forAll(shellDicts, shellI)
+    {
+        const dictionary& dict = shellDicts[shellI];
+        const word name = dict.lookup("name");
+        const word type = dict.lookup("type");
+
+        shells_[shellI] = allGeometry_.findSurfaceID(name);
+
+        if (shells_[shellI] == -1)
+        {
+            FatalErrorIn
+            (
+                "shellSurfaces::shellSurfaces"
+                "(const searchableSurfaces&, const PtrList<dictionary>&)"
+            )   << "No surface called " << name << endl
+                << "Valid surfaces are " << allGeometry_.names()
+                << exit(FatalError);
+        }
+
+        modes_[shellI] = refineModeNames_.read(dict.lookup("refineMode"));
+
+        // Read pairs of distance+level
+        setAndCheckLevels(shellI, dict.lookup("levels"));
+    }
+
+    // Orient shell surfaces before any searching is done. Note that this
+    // only needs to be done for inside or outside. Orienting surfaces
+    // constructs lots of addressing which we want to avoid.
+    orient();
+}
+
+
+Foam::shellSurfaces::shellSurfaces
+(
+    const searchableSurfaces& allGeometry,
+    const dictionary& shellsDict
+)
+:
+    allGeometry_(allGeometry)
+{
+    shells_.setSize(shellsDict.size());
+    modes_.setSize(shellsDict.size());
+    distances_.setSize(shellsDict.size());
+    levels_.setSize(shellsDict.size());
+
+    label shellI = 0;
+    forAllConstIter(dictionary, shellsDict, iter)
+    {
+        shells_[shellI] = allGeometry_.findSurfaceID(iter().keyword());
+
+        if (shells_[shellI] == -1)
+        {
+            FatalErrorIn
+            (
+                "shellSurfaces::shellSurfaces"
+                "(const searchableSurfaces&, const dictionary>&"
+            )   << "No surface called " << iter().keyword() << endl
+                << "Valid surfaces are " << allGeometry_.names()
+                << exit(FatalError);
+        }
+        const dictionary& dict = shellsDict.subDict(iter().keyword());
+
+        modes_[shellI] = refineModeNames_.read(dict.lookup("mode"));
+
+        // Read pairs of distance+level
+        setAndCheckLevels(shellI, dict.lookup("levels"));
+
+        shellI++;
+    }
+
+    // Orient shell surfaces before any searching is done. Note that this
+    // only needs to be done for inside or outside. Orienting surfaces
+    // constructs lots of addressing which we want to avoid.
+    orient();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Highest shell level
+Foam::label Foam::shellSurfaces::maxLevel() const
+{
+    label overallMax = 0;
+    forAll(levels_, shellI)
+    {
+        overallMax = max(overallMax, max(levels_[shellI]));
+    }
+    return overallMax;
+}
+
+
+void Foam::shellSurfaces::findHigherLevel
+(
+    const pointField& pt,
+    const labelList& ptLevel,
+    labelList& maxLevel
+) const
+{
+    // Maximum level of any shell. Start off with level of point.
+    maxLevel = ptLevel;
+
+    forAll(shells_, shellI)
+    {
+        findHigherLevel(pt, shellI, maxLevel);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
new file mode 100644
index 000000000..6643f46c2
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
@@ -0,0 +1,181 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::shellSurfaces
+
+Description
+    Encapsulates queries for volume refinement ('refine all cells within
+    shell').
+
+SourceFiles
+    shellSurfaces.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef shellSurfaces_H
+#define shellSurfaces_H
+
+#include "searchableSurface.H"
+#include "Tuple2.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class searchableSurfaces;
+
+/*---------------------------------------------------------------------------*\
+                           Class shellSurfaces Declaration
+\*---------------------------------------------------------------------------*/
+
+class shellSurfaces
+{
+public:
+
+    // Public data types
+
+        //- Volume refinement controls
+        enum refineMode
+        {
+            INSIDE,         // Refine all inside shell
+            OUTSIDE,        // ,,         outside
+            DISTANCE        // Refine based on distance to shell
+        };
+
+
+private:
+
+    // Private data
+
+        //- Reference to all geometry.
+        const searchableSurfaces& allGeometry_;
+
+        //- Indices of surfaces that are shells
+        labelList shells_;
+
+        //- Per shell whether to refine inside or outside
+        List<refineMode> modes_;
+
+        //- Per shell the list of ranges
+        List<scalarField> distances_;
+
+        //- Per shell per distance the refinement level
+        labelListList levels_;
+
+
+    // Private data
+
+        //- refineMode names
+        static const NamedEnum<refineMode, 3> refineModeNames_;
+
+
+    // Private Member Functions
+
+        //- Helper function for initialisation.
+        void setAndCheckLevels
+        (
+            const label shellI,
+            const List<Tuple2<scalar, label> >&
+        );
+
+        void orient();
+
+        void findHigherLevel
+        (
+            const pointField& pt,
+            const label shellI,
+            labelList& maxLevel
+        ) const;
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        shellSurfaces
+        (
+            const searchableSurfaces& allGeometry,
+            const labelList& shells,
+            const List<refineMode>& modes,
+            const List<scalarField>& distances,
+            const labelListList& levels
+        );
+
+        //- Construct from geometry and dictionaries
+        shellSurfaces
+        (
+            const searchableSurfaces& allGeometry,
+            const PtrList<dictionary>& shellDicts
+        );
+
+        //- Construct from geometry and dictionary
+        shellSurfaces
+        (
+            const searchableSurfaces& allGeometry,
+            const dictionary& shellsDict
+        );
+
+
+    // Member Functions
+
+        // Access
+
+            //const List<scalarField>& distances() const
+            //{
+            //    return distances_;
+            //}
+            //
+            ////- Per shell per distance the refinement level
+            //const labelListList& levels() const
+            //{
+            //    return levels_;
+            //}
+
+
+        // Query
+
+            //- Highest shell level
+            label maxLevel() const;
+
+            //- Find shell level higher than ptLevel
+            void findHigherLevel
+            (
+                const pointField& pt,
+                const labelList& ptLevel,
+                labelList& maxLevel
+            ) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C
new file mode 100644
index 000000000..2c14a7662
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C
@@ -0,0 +1,261 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "ExactParticle.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParticleType>
+template<class TrackingData>
+Foam::label Foam::ExactParticle<ParticleType>::track
+(
+    const vector& endPosition,
+    TrackingData& td
+)
+{
+    this->facei_ = -1;
+
+    // Tracks to endPosition or stop on boundary
+    while (!this->onBoundary() && this->stepFraction_ < 1.0 - SMALL)
+    {
+        this->stepFraction_ +=
+            trackToFace(endPosition, td)
+           *(1.0 - this->stepFraction_);
+    }
+
+    return this->facei_;
+}
+
+
+template<class ParticleType>
+Foam::label Foam::ExactParticle<ParticleType>::track
+(
+    const vector& endPosition
+)
+{
+    int dummyTd;
+    return track(endPosition, dummyTd);
+}
+
+
+template<class ParticleType>
+template<class TrackingData>
+Foam::scalar Foam::ExactParticle<ParticleType>::trackToFace
+(
+    const vector& endPosition,
+    TrackingData& td
+)
+{
+    const polyMesh& mesh = this->cloud().pMesh();
+    const labelList& cFaces = mesh.cells()[this->celli_];
+
+    point intersection(vector::zero);
+    scalar trackFraction = VGREAT;
+    label hitFacei = -1;
+
+    const vector vec = endPosition-this->position_;
+
+    forAll(cFaces, i)
+    {
+        label facei = cFaces[i];
+
+        if (facei != this->face())
+        {
+            pointHit inter = mesh.faces()[facei].fastIntersection
+            (
+                this->position_,
+                vec,
+                mesh.faceCentres()[facei],
+                mesh.points(),
+                intersection::HALF_RAY
+            );
+
+            if (inter.hit() && inter.distance() < trackFraction)
+            {
+                trackFraction = inter.distance();
+                hitFacei = facei;
+                intersection = inter.hitPoint();
+            }
+        }
+    }
+
+    if (hitFacei == -1)
+    {
+        // Did not find any intersection. Fall back to original approximate
+        // algorithm
+        return Particle<ParticleType>::trackToFace
+        (
+            endPosition,
+            td
+        );
+    }
+
+    if (trackFraction >= (1.0-SMALL))
+    {
+        // Nearest intersection beyond endPosition so we hit endPosition.
+        trackFraction = 1.0;
+        this->position_ = endPosition;
+        this->facei_ = -1;
+        return 1.0;
+    }
+    else
+    {
+        this->position_ = intersection;
+        this->facei_ = hitFacei;
+    }
+
+
+    // Normal situation (trackFraction 0..1). Straight copy
+    // of Particle::trackToFace.
+
+    bool internalFace = this->cloud().internalFace(this->facei_);
+
+    // change cell
+    if (internalFace) // Internal face
+    {
+        if (this->celli_ == mesh.faceOwner()[this->facei_])
+        {
+            this->celli_ = mesh.faceNeighbour()[this->facei_];
+        }
+        else if (this->celli_ == mesh.faceNeighbour()[this->facei_])
+        {
+            this->celli_ = mesh.faceOwner()[this->facei_];
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "ExactParticle::trackToFace"
+                "(const vector&, TrackingData&)"
+            )<< "addressing failure" << nl
+             << abort(FatalError);
+        }
+    }
+    else
+    {
+        ParticleType& p = static_cast<ParticleType&>(*this);
+
+        // Soft-sphere algorithm ignores the boundary
+        if (p.softImpact())
+        {
+            trackFraction = 1.0;
+            this->position_ = endPosition;
+        }
+
+        label patchi = this->patch(this->facei_);
+        const polyPatch& patch = mesh.boundaryMesh()[patchi];
+
+        if (isA<wedgePolyPatch>(patch))
+        {
+            p.hitWedgePatch
+            (
+                static_cast<const wedgePolyPatch&>(patch), td
+            );
+        }
+        else if (isA<symmetryPolyPatch>(patch))
+        {
+            p.hitSymmetryPatch
+            (
+                static_cast<const symmetryPolyPatch&>(patch), td
+            );
+        }
+        else if (isA<cyclicPolyPatch>(patch))
+        {
+            p.hitCyclicPatch
+            (
+                static_cast<const cyclicPolyPatch&>(patch), td
+            );
+        }
+        else if (isA<processorPolyPatch>(patch))
+        {
+            p.hitProcessorPatch
+            (
+                static_cast<const processorPolyPatch&>(patch), td
+            );
+        }
+        else if (isA<wallPolyPatch>(patch))
+        {
+            p.hitWallPatch
+            (
+                static_cast<const wallPolyPatch&>(patch), td
+            );
+        }
+        else if (isA<polyPatch>(patch))
+        {
+            p.hitPatch
+            (
+                static_cast<const polyPatch&>(patch), td
+            );
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "ExactParticle::trackToFace"
+                "(const vector& endPosition, scalar& trackFraction)"
+            )<< "patch type " << patch.type() << " not suported" << nl
+             << abort(FatalError);
+        }
+    }
+
+    // If the trackFraction = 0 something went wrong.
+    // Either the particle is flipping back and forth across a face perhaps
+    // due to velocity interpolation errors or it is in a "hole" in the mesh
+    // caused by face warpage.
+    // In both cases resolve the positional ambiguity by moving the particle
+    // slightly towards the cell-centre.
+    if (trackFraction < SMALL)
+    {
+        this->position_ +=
+            1.0e-6*(mesh.cellCentres()[this->celli_] - this->position_);
+    }
+
+    return trackFraction;
+}
+
+
+template<class ParticleType>
+Foam::scalar Foam::ExactParticle<ParticleType>::trackToFace
+(
+    const vector& endPosition
+)
+{
+    int dummyTd;
+    return trackToFace(endPosition, dummyTd);
+}
+
+
+template<class ParticleType>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const ExactParticle<ParticleType>& p
+)
+{
+    return operator<<(os, static_cast<const Particle<ParticleType>&>(p));
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
new file mode 100644
index 000000000..df8ab50f5
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
@@ -0,0 +1,192 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::ExactParticle
+
+Description
+    Special version of Particle to do tracking on non-convex cells.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ExactParticle_H
+#define ExactParticle_H
+
+#include "face.H"
+#include "Particle.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class ExactParticle>
+class Cloud;
+
+// Forward declaration of friend functions and operators
+
+template<class ParticleType>
+class ExactParticle;
+
+template<class ParticleType>
+Ostream& operator<<
+(
+    Ostream&,
+    const ExactParticle<ParticleType>&
+);
+
+
+/*---------------------------------------------------------------------------*\
+                           Class ExactParticle Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParticleType>
+class ExactParticle
+:
+    public Particle<ParticleType>
+{
+
+public:
+
+    friend class Cloud<ParticleType>;
+
+
+    // Constructors
+
+        //- Construct from components
+        ExactParticle
+        (
+            const Cloud<ParticleType>& cloud,
+            const vector& position,
+            const label celli
+        )
+        :
+            Particle<ParticleType>(cloud, position, celli)
+        {}
+
+
+        //- Construct from Istream
+        ExactParticle
+        (
+            const Cloud<ParticleType>& cloud,
+            Istream& is,
+            bool readFields = true
+        )
+        :
+            Particle<ParticleType>(cloud, is, readFields)
+        {}
+
+
+        //- Factory class to read-construct particles used for parallel transfer
+        class iNew
+        {
+
+            // Private data
+
+            const Cloud<ParticleType>& cloud_;
+
+
+        public:
+
+            iNew(const Cloud<ParticleType>& cloud)
+            :
+                cloud_(cloud)
+            {}
+
+            autoPtr<ParticleType> operator()(Istream& is) const
+            {
+                return autoPtr<ParticleType>
+                (
+                    new ParticleType(cloud_, is)
+                );
+            }
+        };
+
+
+    // Destructor
+
+        virtual ~ExactParticle()
+        {}
+
+
+    // Member Functions
+
+            //- Track particle to end of trajectory
+            //  or until it hits the boundary.
+            //  On entry 'stepFraction()' should be set to the fraction of the
+            //  time-step at which the tracking starts and on exit it contains
+            //  the fraction of the time-step completed.
+            //  Returns the boundary face index if the track stops at the
+            //  boundary, -1 otherwise.
+            template<class TrackingData>
+            label track
+            (
+                const vector& endPosition,
+                TrackingData& td
+            );
+
+            //- Calls the templated track with dummy TrackingData
+            label track(const vector& endPosition);
+
+            //- Track particle to a given position and returns 1.0 if the
+            //  trajectory is completed without hitting a face otherwise
+            //  stops at the face and returns the fraction of the trajectory
+            //  completed.
+            //  on entry 'stepFraction()' should be set to the fraction of the
+            //  time-step at which the tracking starts.
+            template<class TrackingData>
+            scalar trackToFace
+            (
+                const vector& endPosition,
+                TrackingData& td
+            );
+
+            //- Calls the templated trackToFace with dummy TrackingData
+            scalar trackToFace(const vector& endPosition);
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<< <ParticleType>
+        (
+            Ostream&,
+            const ExactParticle<ParticleType>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ExactParticle.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
new file mode 100644
index 000000000..fdafb11a8
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
@@ -0,0 +1,282 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*----------------------------------------------------------------------------*/
+
+#include "trackedParticle.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+//- Construct from components
+Foam::trackedParticle::trackedParticle
+(
+    const Cloud<trackedParticle>& c,
+    const vector& position,
+    const label celli,
+    const point& end,
+    const label level,
+    const label i,
+    const label j
+)
+:
+    ExactParticle<trackedParticle>(c, position, celli),
+    end_(end),
+    level_(level),
+    i_(i),
+    j_(j)
+{}
+
+
+//- Construct from Istream
+Foam::trackedParticle::trackedParticle
+(
+    const Cloud<trackedParticle>& c,
+    Istream& is,
+    bool readFields
+)
+:
+    ExactParticle<trackedParticle>(c, is, readFields)
+{
+    if (readFields)
+    {
+        if (is.format() == IOstream::ASCII)
+        {
+            is >> end_;
+            level_ = readLabel(is);
+            i_ = readLabel(is);
+            j_ = readLabel(is);
+        }
+        else
+        {
+            is.read
+            (
+                reinterpret_cast<char*>(&end_),
+                sizeof(end_) + sizeof(level_) + sizeof(i_) + sizeof(j_)
+            );
+        }
+    }
+
+    // Check state of Istream
+    is.check
+    (
+        "trackedParticle::trackedParticle"
+        "(const Cloud<trackedParticle>&, Istream&, bool)"
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::trackedParticle::move(trackedParticle::trackData& td)
+{
+    td.switchProcessor = false;
+    td.keepParticle = true;
+
+    scalar deltaT = cloud().pMesh().time().deltaT().value();
+    scalar tEnd = (1.0 - stepFraction())*deltaT;
+    scalar dtMax = tEnd;
+
+    while (td.keepParticle && !td.switchProcessor && tEnd > SMALL)
+    {
+        // set the lagrangian time-step
+        scalar dt = min(dtMax, tEnd);
+
+        // mark visited cell with max level.
+        td.maxLevel()[cell()] = max(td.maxLevel()[cell()], level_);
+
+        dt *= trackToFace(end_, td);
+
+        tEnd -= dt;
+        stepFraction() = 1.0 - tEnd/deltaT;
+    }
+
+    return td.keepParticle;
+}
+
+
+bool Foam::trackedParticle::hitPatch
+(
+    const polyPatch&,
+    trackedParticle::trackData& td,
+    const label patchI
+)
+{
+    return false;
+}
+
+
+bool Foam::trackedParticle::hitPatch
+(
+    const polyPatch&,
+    int&,
+    const label
+)
+{
+    return false;
+}
+
+
+void Foam::trackedParticle::hitWedgePatch
+(
+    const wedgePolyPatch&,
+    trackedParticle::trackData& td
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
+void Foam::trackedParticle::hitWedgePatch
+(
+    const wedgePolyPatch&,
+    int&
+)
+{}
+
+
+void Foam::trackedParticle::hitSymmetryPatch
+(
+    const symmetryPolyPatch&,
+    trackedParticle::trackData& td
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
+void Foam::trackedParticle::hitSymmetryPatch
+(
+    const symmetryPolyPatch&,
+    int&
+)
+{}
+
+
+void Foam::trackedParticle::hitCyclicPatch
+(
+    const cyclicPolyPatch&,
+    trackedParticle::trackData& td
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
+void Foam::trackedParticle::hitCyclicPatch
+(
+    const cyclicPolyPatch&,
+    int&
+)
+{}
+
+
+void Foam::trackedParticle::hitProcessorPatch
+(
+    const processorPolyPatch&,
+    trackedParticle::trackData& td
+)
+{
+    // Remove particle
+    td.switchProcessor = true;
+}
+
+
+void Foam::trackedParticle::hitProcessorPatch
+(
+    const processorPolyPatch&,
+    int&
+)
+{}
+
+
+void Foam::trackedParticle::hitWallPatch
+(
+    const wallPolyPatch& wpp,
+    trackedParticle::trackData& td
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
+void Foam::trackedParticle::hitWallPatch
+(
+    const wallPolyPatch& wpp,
+    int&
+)
+{}
+
+
+void Foam::trackedParticle::hitPatch
+(
+    const polyPatch& wpp,
+    trackedParticle::trackData& td
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
+void Foam::trackedParticle::hitPatch
+(
+    const polyPatch& wpp,
+    int&
+)
+{}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const trackedParticle& p)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const ExactParticle<trackedParticle>&>(p)
+            << token::SPACE << p.end_
+            << token::SPACE << p.level_
+            << token::SPACE << p.i_
+            << token::SPACE << p.j_;
+    }
+    else
+    {
+        os  << static_cast<const ExactParticle<trackedParticle>&>(p);
+        os.write
+        (
+            reinterpret_cast<const char*>(&p.end_),
+            sizeof(p.end_) + sizeof(p.level_) + sizeof(p.i_) + sizeof(p.j_)
+        );
+    }
+
+    // Check state of Ostream
+    os.check("Ostream& operator<<(Ostream&, const trackedParticle&)");
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
new file mode 100644
index 000000000..20f2b3c13
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
@@ -0,0 +1,290 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::trackedParticle
+
+Description
+    Particle class that marks cells it passes through. Used to mark cells
+    visited by feature edges. Uses ExactParticle tracking class so
+    will work on concave cells.
+
+SourceFiles
+    trackedParticle.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef trackedParticle_H
+#define trackedParticle_H
+
+#include "ExactParticle.H"
+#include "autoPtr.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class trackedParticleCloud;
+
+/*---------------------------------------------------------------------------*\
+                           Class trackedParticle Declaration
+\*---------------------------------------------------------------------------*/
+
+class trackedParticle
+:
+    public ExactParticle<trackedParticle>
+{
+    // Private data
+
+        //- end point to track to
+        point end_;
+
+        //- level of this particle
+        label level_;
+
+        //- passive label
+        label i_;
+
+        //- passive label
+        label j_;
+
+public:
+
+    friend class Cloud<trackedParticle>;
+
+    //- Class used to pass tracking data to the trackToFace function
+    class trackData
+    {
+        //- Reference to the cloud containing this particle
+        Cloud<trackedParticle>& cloud_;
+
+        labelList& maxLevel_;
+
+    public:
+
+        bool switchProcessor;
+        bool keepParticle;
+
+
+        // Constructors
+
+            trackData(Cloud<trackedParticle>& cloud, labelList& maxLevel)
+            :
+                cloud_(cloud),
+                maxLevel_(maxLevel)
+            {}
+
+
+        // Member functions
+
+            Cloud<trackedParticle>& cloud()
+            {
+                return cloud_;
+            }
+
+            labelList& maxLevel()
+            {
+                return maxLevel_;
+            }
+    };
+
+
+
+    // Constructors
+
+        //- Construct from components
+        trackedParticle
+        (
+            const Cloud<trackedParticle>& c,
+            const vector& position,
+            const label celli,
+            const point& end,
+            const label level,
+            const label i,
+            const label j
+        );
+
+        //- Construct from Istream
+        trackedParticle
+        (
+            const Cloud<trackedParticle>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct and return a clone
+        autoPtr<trackedParticle> clone() const
+        {
+            return autoPtr<trackedParticle>(new trackedParticle(*this));
+        }
+
+
+    // Member Functions
+
+        //- point to track to
+        point& end()
+        {
+            return end_;
+        }
+
+        //- transported label
+        label& i()
+        {
+            return i_;
+        }
+
+        //- transported label
+        label& j()
+        {
+            return j_;
+        }
+
+
+
+        // Tracking
+
+            //- Track all particles to their end point
+            bool move(trackData&);
+
+
+            //- Overridable function to handle the particle hitting a patch
+            //  Executed before other patch-hitting functions
+            bool hitPatch
+            (
+                const polyPatch&,
+                trackedParticle::trackData& td,
+                const label patchI
+            );
+            bool hitPatch
+            (
+                const polyPatch&,
+                int&,
+                const label patchI
+           );
+
+            //- Overridable function to handle the particle hitting a wedge
+            void hitWedgePatch
+            (
+                const wedgePolyPatch&,
+                trackedParticle::trackData& td
+            );
+            void hitWedgePatch
+            (
+                const wedgePolyPatch&,
+                int&
+            );
+
+            //- Overridable function to handle the particle hitting a
+            //  symmetryPlane
+            void hitSymmetryPatch
+            (
+                const symmetryPolyPatch&,
+                trackedParticle::trackData& td
+            );
+            void hitSymmetryPatch
+            (
+                const symmetryPolyPatch&,
+                int&
+            );
+
+            //- Overridable function to handle the particle hitting a cyclic
+            void hitCyclicPatch
+            (
+                const cyclicPolyPatch&,
+                trackedParticle::trackData& td
+            );
+            void hitCyclicPatch
+            (
+                const cyclicPolyPatch&,
+                int&
+            );
+
+            //- Overridable function to handle the particle hitting a
+            //- processorPatch
+            void hitProcessorPatch
+            (
+                const processorPolyPatch&,
+                trackedParticle::trackData& td
+            );
+            void hitProcessorPatch
+            (
+                const processorPolyPatch&,
+                int&
+            );
+
+            //- Overridable function to handle the particle hitting a wallPatch
+            void hitWallPatch
+            (
+                const wallPolyPatch&,
+                trackedParticle::trackData& td
+            );
+            void hitWallPatch
+            (
+                const wallPolyPatch&,
+                int&
+            );
+
+            //- Overridable function to handle the particle hitting a polyPatch
+            void hitPatch
+            (
+                const polyPatch&,
+                trackedParticle::trackData& td
+            );
+            void hitPatch
+            (
+                const polyPatch&,
+                int&
+            );
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream&, const trackedParticle&);
+
+
+};
+
+
+template<>
+inline bool contiguous<trackedParticle>()
+{
+    return true;
+}
+
+//template<>
+//void Cloud<trackedParticle>::readFields();
+//
+//template<>
+//void Cloud<trackedParticle>::writeFields() const;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockList.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
similarity index 81%
rename from applications/utilities/mesh/generation/blockMesh/blockList.H
rename to src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
index df1b12e1f..3124271b8 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockList.H
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
@@ -21,38 +21,23 @@ License
     You should have received a copy of the GNU General Public License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
-InClass
-    Foam::blockList
-
-Description
-
-SourceFiles
-    blockList.C
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef blockList_H
-#define blockList_H
-
-#include "block.H"
-#include "PtrList.H"
+#include "trackedParticle.H"
+#include "Cloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-typedef PtrList<block> blockList;
+defineParticleTypeNameAndDebug(trackedParticle, 0);
+defineTemplateTypeNameAndDebug(Cloud<trackedParticle>, 0);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
 // ************************************************************************* //
-
diff --git a/src/mesh/blockMesh/Make/files b/src/mesh/blockMesh/Make/files
new file mode 100644
index 000000000..0a5ea385e
--- /dev/null
+++ b/src/mesh/blockMesh/Make/files
@@ -0,0 +1,25 @@
+curvedEdges/BSpline.C
+curvedEdges/CatmullRomSpline.C
+curvedEdges/polyLine.C
+
+curvedEdges/arcEdge.C
+curvedEdges/curvedEdge.C
+curvedEdges/lineEdge.C
+curvedEdges/polyLineEdge.C
+curvedEdges/lineDivide.C
+curvedEdges/splineEdge.C
+curvedEdges/ellipseEdge.C
+
+blockDescriptor/blockDescriptor.C
+blockDescriptor/blockDescriptorEdges.C
+
+block/block.C
+block/blockCreate.C
+
+blockMesh/blockMesh.C
+blockMesh/blockMeshCreate.C
+blockMesh/blockMeshTopology.C
+blockMesh/blockMeshCheck.C
+blockMesh/blockMeshMerge.C
+
+LIB = $(FOAM_LIBBIN)/libblockMesh
diff --git a/src/mesh/blockMesh/Make/options b/src/mesh/blockMesh/Make/options
new file mode 100644
index 000000000..0d07a1d06
--- /dev/null
+++ b/src/mesh/blockMesh/Make/options
@@ -0,0 +1,9 @@
+EXE_INC = \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/ODE/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude
+
+LIB_LIBS = \
+    -lmeshTools \
+    -lODE \
+    -ldynamicMesh
diff --git a/src/mesh/blockMesh/block/block.C b/src/mesh/blockMesh/block/block.C
new file mode 100644
index 000000000..74b7eb38b
--- /dev/null
+++ b/src/mesh/blockMesh/block/block.C
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "error.H"
+#include "block.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::block::block
+(
+    const pointField& blockPointField,
+    const curvedEdgeList& edges,
+    Istream& is
+)
+:
+    blockDescriptor(blockPointField, edges, is),
+    vertices_(0),
+    cells_(0),
+    boundaryPatches_(0)
+{}
+
+
+Foam::block::block(const blockDescriptor& blockDesc)
+:
+    blockDescriptor(blockDesc),
+    vertices_(0),
+    cells_(0),
+    boundaryPatches_(0)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::block::~block()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::pointField& Foam::block::points() const
+{
+    if (vertices_.empty())
+    {
+        createPoints();
+    }
+
+    return vertices_;
+}
+
+
+const Foam::labelListList& Foam::block::cells() const
+{
+    if (cells_.empty())
+    {
+        createCells();
+    }
+
+    return cells_;
+}
+
+
+const Foam::labelListListList& Foam::block::boundaryPatches() const
+{
+    if (boundaryPatches_.empty())
+    {
+        createBoundary();
+    }
+
+    return boundaryPatches_;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const block& b)
+{
+    os << b.points() << nl
+       << b.cells() << nl
+       << b.boundaryPatches() << endl;
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/block/block.H b/src/mesh/blockMesh/block/block.H
new file mode 100644
index 000000000..05f41b92a
--- /dev/null
+++ b/src/mesh/blockMesh/block/block.H
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::block
+
+Description
+    Creates a single block of cells from point coordinates, numbers of
+    cells in each direction and an expansion ratio.
+
+Note
+    The vertices and cells for filling the block are demand-driven.
+
+SourceFiles
+    block.C
+    blockCreate.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef block_H
+#define block_H
+
+#include "pointField.H"
+#include "labelList.H"
+
+#include "blockDescriptor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// Forward declaration of friend functions and operators
+class block;
+Ostream& operator<<(Ostream&, const block&);
+
+/*---------------------------------------------------------------------------*\
+                           Class block Declaration
+\*---------------------------------------------------------------------------*/
+
+class block
+:
+    public blockDescriptor
+{
+    // Private data
+
+        //- List of vertices
+        mutable pointField vertices_;
+
+        //- List of cells
+        mutable labelListList cells_;
+
+        //- Boundary patches
+        mutable labelListListList boundaryPatches_;
+
+
+    // Private Member Functions
+
+        //- Creates vertices for cells filling the block
+        void createPoints() const;
+
+        //- Creates cells for filling the block
+        void createCells() const;
+
+        //- Creates boundary patch faces for the block
+        void createBoundary() const;
+
+        //- Disallow default bitwise copy construct
+        block(const block&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const block&);
+
+public:
+
+    // Constructors
+
+        //- Construct from components with Istream
+        block
+        (
+            const pointField& blockPointField,
+            const curvedEdgeList&,
+            Istream&
+        );
+
+        //- Construct from a block definition
+        block(const blockDescriptor&);
+
+        //- Clone
+        autoPtr<block> clone() const
+        {
+            notImplemented("block::clone()");
+            return autoPtr<block>(NULL);
+        }
+
+
+    //- Destructor
+    ~block();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the block definition
+            inline const blockDescriptor& blockDef() const
+            {
+                return *this;
+            }
+
+            //- Vertex label offset for a particular i,j,k position
+            label vtxLabel(label i, label j, label k) const;
+
+            //- Return the points for filling the block
+            const pointField& points() const;
+
+            //- Return the cells for filling the block
+            const labelListList& cells() const;
+
+            //- Return the boundary patch faces for the block
+            const labelListListList& boundaryPatches() const;
+
+
+        // Edit
+
+            //- Clear geometry (internal points, cells, boundaryPatches)
+            void clearGeom();
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream&, const block&);
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/block/blockCreate.C b/src/mesh/blockMesh/block/blockCreate.C
new file mode 100644
index 000000000..038f278ce
--- /dev/null
+++ b/src/mesh/blockMesh/block/blockCreate.C
@@ -0,0 +1,477 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "error.H"
+#include "block.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::label Foam::block::vtxLabel(label i, label j, label k) const
+{
+    return
+    (
+        i
+      + j * (meshDensity().x() + 1)
+      + k * (meshDensity().x() + 1) * (meshDensity().y() + 1)
+    );
+}
+
+
+void Foam::block::createPoints() const
+{
+    // set local variables for mesh specification
+    const label ni = meshDensity().x();
+    const label nj = meshDensity().y();
+    const label nk = meshDensity().z();
+
+    const point& p000 = blockPoint(0);
+    const point& p100 = blockPoint(1);
+    const point& p110 = blockPoint(2);
+    const point& p010 = blockPoint(3);
+
+    const point& p001 = blockPoint(4);
+    const point& p101 = blockPoint(5);
+    const point& p111 = blockPoint(6);
+    const point& p011 = blockPoint(7);
+
+
+    // list of edge point and weighting factors
+    const List< List<point> >& p = blockEdgePoints();
+    const scalarListList& w = blockEdgeWeights();
+
+    //
+    // generate vertices
+    //
+    vertices_.clear();
+    vertices_.setSize(nPoints());
+
+    for (label k = 0; k <= nk; k++)
+    {
+        for (label j = 0; j <= nj; j++)
+        {
+            for (label i = 0; i <= ni; i++)
+            {
+                const label vertexNo = vtxLabel(i, j, k);
+
+                // points on edges
+                vector edgex1 = p000 + (p100 - p000)*w[0][i];
+                vector edgex2 = p010 + (p110 - p010)*w[1][i];
+                vector edgex3 = p011 + (p111 - p011)*w[2][i];
+                vector edgex4 = p001 + (p101 - p001)*w[3][i];
+
+                vector edgey1 = p000 + (p010 - p000)*w[4][j];
+                vector edgey2 = p100 + (p110 - p100)*w[5][j];
+                vector edgey3 = p101 + (p111 - p101)*w[6][j];
+                vector edgey4 = p001 + (p011 - p001)*w[7][j];
+
+                vector edgez1 = p000 + (p001 - p000)*w[8][k];
+                vector edgez2 = p100 + (p101 - p100)*w[9][k];
+                vector edgez3 = p110 + (p111 - p110)*w[10][k];
+                vector edgez4 = p010 + (p011 - p010)*w[11][k];
+
+
+                // calculate the importance factors for all edges
+
+                // x-direction
+                scalar impx1 =
+                (
+                    (1.0 - w[0][i])*(1.0 - w[4][j])*(1.0 - w[8][k])
+                  + w[0][i]*(1.0 - w[5][j])*(1.0 - w[9][k])
+                );
+
+                scalar impx2 =
+                (
+                    (1.0 - w[1][i])*w[4][j]*(1.0 - w[11][k])
+                  + w[1][i]*w[5][j]*(1.0 - w[10][k])
+                );
+
+                scalar impx3 =
+                (
+                     (1.0 - w[2][i])*w[7][j]*w[11][k]
+                   + w[2][i]*w[6][j]*w[10][k]
+                );
+
+                scalar impx4 =
+                (
+                    (1.0 - w[3][i])*(1.0 - w[7][j])*w[8][k]
+                  + w[3][i]*(1.0 - w[6][j])*w[9][k]
+                );
+
+                scalar magImpx = impx1 + impx2 + impx3 + impx4;
+                impx1 /= magImpx;
+                impx2 /= magImpx;
+                impx3 /= magImpx;
+                impx4 /= magImpx;
+
+
+                // y-direction
+                scalar impy1 =
+                (
+                    (1.0 - w[4][j])*(1.0 - w[0][i])*(1.0 - w[8][k])
+                  + w[4][j]*(1.0 - w[1][i])*(1.0 - w[11][k])
+                );
+
+                scalar impy2 =
+                (
+                    (1.0 - w[5][j])*w[0][i]*(1.0 - w[9][k])
+                  + w[5][j]*w[1][i]*(1.0 - w[10][k])
+                );
+
+                scalar impy3 =
+                (
+                    (1.0 - w[6][j])*w[3][i]*w[9][k]
+                  + w[6][j]*w[2][i]*w[10][k]
+                );
+
+                scalar impy4 =
+                (
+                    (1.0 - w[7][j])*(1.0 - w[3][i])*w[8][k]
+                  + w[7][j]*(1.0 - w[2][i])*w[11][k]
+                );
+
+                scalar magImpy = impy1 + impy2 + impy3 + impy4;
+                impy1 /= magImpy;
+                impy2 /= magImpy;
+                impy3 /= magImpy;
+                impy4 /= magImpy;
+
+
+                // z-direction
+                scalar impz1 =
+                (
+                    (1.0 - w[8][k])*(1.0 - w[0][i])*(1.0 - w[4][j])
+                  + w[8][k]*(1.0 - w[3][i])*(1.0 - w[7][j])
+                );
+
+                scalar impz2 =
+                (
+                    (1.0 - w[9][k])*w[0][i]*(1.0 - w[5][j])
+                  + w[9][k]*w[3][i]*(1.0 - w[6][j])
+                );
+
+                scalar impz3 =
+                (
+                    (1.0 - w[10][k])*w[1][i]*w[5][j]
+                  + w[10][k]*w[2][i]*w[6][j]
+                );
+
+                scalar impz4 =
+                (
+                    (1.0 - w[11][k])*(1.0 - w[1][i])*w[4][j]
+                  + w[11][k]*(1.0 - w[2][i])*w[7][j]
+                );
+
+                scalar magImpz = impz1 + impz2 + impz3 + impz4;
+                impz1 /= magImpz;
+                impz2 /= magImpz;
+                impz3 /= magImpz;
+                impz4 /= magImpz;
+
+
+                // calculate the correction vectors
+                vector corx1 = impx1*(p[0][i] - edgex1);
+                vector corx2 = impx2*(p[1][i] - edgex2);
+                vector corx3 = impx3*(p[2][i] - edgex3);
+                vector corx4 = impx4*(p[3][i] - edgex4);
+
+                vector cory1 = impy1*(p[4][j] - edgey1);
+                vector cory2 = impy2*(p[5][j] - edgey2);
+                vector cory3 = impy3*(p[6][j] - edgey3);
+                vector cory4 = impy4*(p[7][j] - edgey4);
+
+                vector corz1 = impz1*(p[8][k] - edgez1);
+                vector corz2 = impz2*(p[9][k] - edgez2);
+                vector corz3 = impz3*(p[10][k] - edgez3);
+                vector corz4 = impz4*(p[11][k] - edgez4);
+
+
+                // multiply by the importance factor
+
+                // x-direction
+                edgex1 *= impx1;
+                edgex2 *= impx2;
+                edgex3 *= impx3;
+                edgex4 *= impx4;
+
+                // y-direction
+                edgey1 *= impy1;
+                edgey2 *= impy2;
+                edgey3 *= impy3;
+                edgey4 *= impy4;
+
+                // z-direction
+                edgez1 *= impz1;
+                edgez2 *= impz2;
+                edgez3 *= impz3;
+                edgez4 *= impz4;
+
+
+                // add the contributions
+                vertices_[vertexNo] =
+                (
+                    edgex1 + edgex2 + edgex3 + edgex4
+                  + edgey1 + edgey2 + edgey3 + edgey4
+                  + edgez1 + edgez2 + edgez3 + edgez4
+                ) / 3.0;
+
+                vertices_[vertexNo] +=
+                (
+                    corx1 + corx2 + corx3 + corx4
+                  + cory1 + cory2 + cory3 + cory4
+                  + corz1 + corz2 + corz3 + corz4
+                );
+            }
+        }
+    }
+}
+
+
+void Foam::block::createCells() const
+{
+    const label ni = meshDensity().x();
+    const label nj = meshDensity().y();
+    const label nk = meshDensity().z();
+
+    //
+    // generate cells
+    //
+    cells_.clear();
+    cells_.setSize(nCells());
+
+    label cellNo = 0;
+
+    for (label k = 0; k < nk; k++)
+    {
+        for (label j = 0; j < nj; j++)
+        {
+            for (label i = 0; i < ni; i++)
+            {
+                cells_[cellNo].setSize(8);
+
+                cells_[cellNo][0] =  vtxLabel(i, j, k);
+                cells_[cellNo][1] =  vtxLabel(i+1, j, k);
+                cells_[cellNo][2] =  vtxLabel(i+1, j+1, k);
+                cells_[cellNo][3] =  vtxLabel(i, j+1, k);
+                cells_[cellNo][4] =  vtxLabel(i, j, k+1);
+                cells_[cellNo][5] =  vtxLabel(i+1, j, k+1);
+                cells_[cellNo][6] =  vtxLabel(i+1, j+1, k+1);
+                cells_[cellNo][7] =  vtxLabel(i, j+1, k+1);
+                cellNo++;
+            }
+        }
+    }
+}
+
+
+void Foam::block::createBoundary() const
+{
+    const label ni = meshDensity().x();
+    const label nj = meshDensity().y();
+    const label nk = meshDensity().z();
+
+    //
+    // generate boundaries on each side of the hex
+    //
+    boundaryPatches_.clear();
+    boundaryPatches_.setSize(6);
+
+
+    // x-direction
+
+    label wallLabel = 0;
+    label wallCellLabel = 0;
+
+    // x-min
+    boundaryPatches_[wallLabel].setSize(nj*nk);
+    for (label k = 0; k < nk; k++)
+    {
+        for (label j = 0; j < nj; j++)
+        {
+            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
+
+            // set the points
+            boundaryPatches_[wallLabel][wallCellLabel][0] =
+                vtxLabel(0, j, k);
+            boundaryPatches_[wallLabel][wallCellLabel][1] =
+                vtxLabel(0, j, k + 1);
+            boundaryPatches_[wallLabel][wallCellLabel][2] =
+                vtxLabel(0, j + 1, k + 1);
+            boundaryPatches_[wallLabel][wallCellLabel][3] =
+                vtxLabel(0, j + 1, k);
+
+            // update the counter
+            wallCellLabel++;
+        }
+    }
+
+    // x-max
+    wallLabel++;
+    wallCellLabel = 0;
+
+    boundaryPatches_[wallLabel].setSize(nj*nk);
+
+    for (label k = 0; k < nk; k++)
+    {
+        for (label j = 0; j < nj; j++)
+        {
+            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
+
+            // set the points
+            boundaryPatches_[wallLabel][wallCellLabel][0] =
+                vtxLabel(ni, j, k);
+            boundaryPatches_[wallLabel][wallCellLabel][1] =
+                vtxLabel(ni, j+1, k);
+            boundaryPatches_[wallLabel][wallCellLabel][2] =
+                vtxLabel(ni, j+1, k+1);
+            boundaryPatches_[wallLabel][wallCellLabel][3] =
+                vtxLabel(ni, j, k+1);
+
+            // update the counter
+            wallCellLabel++;
+        }
+    }
+
+    // y-direction
+
+    // y-min
+    wallLabel++;
+    wallCellLabel = 0;
+
+    boundaryPatches_[wallLabel].setSize(ni*nk);
+    for (label i = 0; i < ni; i++)
+    {
+        for (label k = 0; k < nk; k++)
+        {
+            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
+
+            // set the points
+            boundaryPatches_[wallLabel][wallCellLabel][0] =
+                vtxLabel(i, 0, k);
+            boundaryPatches_[wallLabel][wallCellLabel][1] =
+                vtxLabel(i + 1, 0, k);
+            boundaryPatches_[wallLabel][wallCellLabel][2] =
+                vtxLabel(i + 1, 0, k + 1);
+            boundaryPatches_[wallLabel][wallCellLabel][3] =
+                vtxLabel(i, 0, k + 1);
+
+            // update the counter
+            wallCellLabel++;
+        }
+    }
+
+    // y-max
+    wallLabel++;
+    wallCellLabel = 0;
+
+    boundaryPatches_[wallLabel].setSize(ni*nk);
+
+    for (label i = 0; i < ni; i++)
+    {
+        for (label k = 0; k < nk; k++)
+        {
+            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
+
+            // set the points
+            boundaryPatches_[wallLabel][wallCellLabel][0] =
+                vtxLabel(i, nj, k);
+            boundaryPatches_[wallLabel][wallCellLabel][1] =
+                vtxLabel(i, nj, k + 1);
+            boundaryPatches_[wallLabel][wallCellLabel][2] =
+                vtxLabel(i + 1, nj, k + 1);
+            boundaryPatches_[wallLabel][wallCellLabel][3] =
+                vtxLabel(i + 1, nj, k);
+
+            // update the counter
+            wallCellLabel++;
+        }
+    }
+
+    // z-direction
+
+    // z-min
+    wallLabel++;
+    wallCellLabel = 0;
+
+    boundaryPatches_[wallLabel].setSize(ni*nj);
+
+    for (label i = 0; i < ni; i++)
+    {
+        for (label j = 0; j < nj; j++)
+        {
+            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
+
+            // set the points
+            boundaryPatches_[wallLabel][wallCellLabel][0] =
+                vtxLabel(i, j, 0);
+            boundaryPatches_[wallLabel][wallCellLabel][1] =
+                vtxLabel(i, j + 1, 0);
+            boundaryPatches_[wallLabel][wallCellLabel][2] =
+                vtxLabel(i + 1, j + 1, 0);
+            boundaryPatches_[wallLabel][wallCellLabel][3] =
+                vtxLabel(i + 1, j, 0);
+
+            // update the counter
+            wallCellLabel++;
+        }
+    }
+
+    // z-max
+    wallLabel++;
+    wallCellLabel = 0;
+
+    boundaryPatches_[wallLabel].setSize(ni*nj);
+
+    for (label i = 0; i < ni; i++)
+    {
+        for (label j = 0; j < nj; j++)
+        {
+            boundaryPatches_[wallLabel][wallCellLabel].setSize(4);
+
+            // set the points
+            boundaryPatches_[wallLabel][wallCellLabel][0] =
+                vtxLabel(i, j, nk);
+            boundaryPatches_[wallLabel][wallCellLabel][1] =
+                vtxLabel(i + 1, j, nk);
+            boundaryPatches_[wallLabel][wallCellLabel][2] =
+                vtxLabel(i + 1, j + 1, nk);
+            boundaryPatches_[wallLabel][wallCellLabel][3] =
+                vtxLabel(i, j + 1, nk);
+
+            // update the counter
+            wallCellLabel++;
+        }
+    }
+}
+
+
+void Foam::block::clearGeom()
+{
+    vertices_.clear();
+    cells_.clear();
+    boundaryPatches_.clear();
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/block/blockList.H b/src/mesh/blockMesh/block/blockList.H
new file mode 100644
index 000000000..bfca6c9c6
--- /dev/null
+++ b/src/mesh/blockMesh/block/blockList.H
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Typedef
+    Foam::blockList
+
+Description
+    A PtrList of blocks
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef blockList_H
+#define blockList_H
+
+#include "block.H"
+#include "PtrList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef PtrList<block> blockList;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
new file mode 100644
index 000000000..7fd7ad315
--- /dev/null
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "error.H"
+#include "blockDescriptor.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::blockDescriptor::blockDescriptor
+(
+    const cellShape& bshape,
+    const pointField& blockPointField,
+    const curvedEdgeList& edges,
+    const Vector<label>& meshDensity,
+    const UList<scalar>& expand,
+    const word& zoneName
+)
+:
+    blockPointField_(blockPointField),
+    curvedEdges_(edges),
+    blockShape_(bshape),
+    meshDensity_(meshDensity),
+    edgePoints_(12),
+    edgeWeights_(12),
+    expand_(expand),
+    zoneName_(zoneName)
+{
+    if (expand_.size() != 12)
+    {
+        FatalErrorIn
+        (
+            "blockDescriptor::blockDescriptor"
+            "(const cellShape&, const pointField& blockPointField, "
+            "const curvedEdgeList&, const Vector<label>& meshDensity, "
+            "const scalarList& expand, const word& zoneName)"
+        )   << "Unknown definition of expansion ratios"
+            << exit(FatalError);
+    }
+
+    // create a list of edges
+    makeBlockEdges();
+}
+
+
+Foam::blockDescriptor::blockDescriptor
+(
+    const pointField& blockPointField,
+    const curvedEdgeList& edges,
+    Istream& is
+)
+:
+    blockPointField_(blockPointField),
+    curvedEdges_(edges),
+    blockShape_(is),
+    meshDensity_(),
+    edgePoints_(12),
+    edgeWeights_(12),
+    expand_(12, 1.0),
+    zoneName_()
+{
+    // Examine next token
+    token t(is);
+
+    // Optional zone name
+    if (t.isWord())
+    {
+        zoneName_ = t.wordToken();
+
+        // Examine next token
+        is >> t;
+    }
+    is.putBack(t);
+
+    if (t.isPunctuation())
+    {
+        // new-style: read a list of 3 values
+        if (t.pToken() == token::BEGIN_LIST)
+        {
+            is >> meshDensity_;
+        }
+        else
+        {
+            FatalIOErrorIn
+            (
+                "blockDescriptor::blockDescriptor"
+                "(const pointField&, const curvedEdgeList&, Istream&)",
+                is
+            )   << "incorrect token while reading n, expected '(', found "
+                << t.info()
+                << exit(FatalIOError);
+        }
+    }
+    else
+    {
+        // old-style: read three labels
+        is  >> meshDensity_.x()
+            >> meshDensity_.y()
+            >> meshDensity_.z();
+    }
+
+    is >> t;
+    if (!t.isWord())
+    {
+        is.putBack(t);
+    }
+
+    scalarList expRatios(is);
+
+    if (expRatios.size() == 1)
+    {
+        // identical in x/y/z-directions
+        expand_ = expRatios[0];
+    }
+    else if (expRatios.size() == 3)
+    {
+        // x-direction
+        expand_[0]  = expRatios[0];
+        expand_[1]  = expRatios[0];
+        expand_[2]  = expRatios[0];
+        expand_[3]  = expRatios[0];
+
+        // y-direction
+        expand_[4]  = expRatios[1];
+        expand_[5]  = expRatios[1];
+        expand_[6]  = expRatios[1];
+        expand_[7]  = expRatios[1];
+
+        // z-direction
+        expand_[8]  = expRatios[2];
+        expand_[9]  = expRatios[2];
+        expand_[10] = expRatios[2];
+        expand_[11] = expRatios[2];
+    }
+    else if (expRatios.size() == 12)
+    {
+        expand_ = expRatios;
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "blockDescriptor::blockDescriptor"
+            "(const pointField&, const curvedEdgeList&, Istream&)"
+        )   << "Unknown definition of expansion ratios: " << expRatios
+            << exit(FatalError);
+    }
+
+    // create a list of edges
+    makeBlockEdges();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::blockDescriptor::~blockDescriptor()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::pointField& Foam::blockDescriptor::blockPointField() const
+{
+    return blockPointField_;
+}
+
+
+const Foam::cellShape& Foam::blockDescriptor::blockShape() const
+{
+    return blockShape_;
+}
+
+
+const Foam::List< Foam::List< Foam::point > >&
+Foam::blockDescriptor::blockEdgePoints() const
+{
+    return edgePoints_;
+}
+
+
+const Foam::scalarListList& Foam::blockDescriptor::blockEdgeWeights() const
+{
+    return edgeWeights_;
+}
+
+
+const Foam::Vector<Foam::label>& Foam::blockDescriptor::meshDensity() const
+{
+    return meshDensity_;
+}
+
+
+const Foam::word& Foam::blockDescriptor::zoneName() const
+{
+    return zoneName_;
+}
+
+
+Foam::label Foam::blockDescriptor::nPoints() const
+{
+    return
+    (
+        (meshDensity_.x() + 1)
+      * (meshDensity_.y() + 1)
+      * (meshDensity_.z() + 1)
+    );
+}
+
+
+Foam::label Foam::blockDescriptor::nCells() const
+{
+    return
+    (
+        meshDensity_.x()
+      * meshDensity_.y()
+      * meshDensity_.z()
+    );
+}
+
+
+const Foam::point& Foam::blockDescriptor::blockPoint(const label i) const
+{
+    return blockPointField_[blockShape_[i]];
+}
+
+
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const blockDescriptor& bd)
+{
+    const cellShape& bshape = bd.blockShape();
+    const labelList& blockLabels = bshape;
+
+    os  << bshape.model().name() << " (";
+
+    forAll(blockLabels, labelI)
+    {
+        if (labelI)
+        {
+            os  << ' ';
+        }
+        os  << blockLabels[labelI];
+    }
+    os  << ')';
+
+    if (bd.zoneName().size())
+    {
+        os  << ' ' << bd.zoneName();
+    }
+
+    os  << ' '  << bd.meshDensity()
+        << " simpleGrading (";
+
+
+    const scalarList& expand = bd.expand_;
+
+    // can we use a compact notation?
+    if
+    (
+        // x-direction
+        (
+            expand[0] == expand[1]
+         && expand[0] == expand[2]
+         && expand[0] == expand[3]
+        )
+     && // y-direction
+        (
+            expand[4] == expand[5]
+         && expand[4] == expand[6]
+         && expand[4] == expand[7]
+        )
+     && // z-direction
+        (
+            expand[8] == expand[9]
+         && expand[8] == expand[10]
+         && expand[8] == expand[11]
+        )
+    )
+    {
+        os  << expand[0] << ' ' << expand[4] << ' ' << expand[8];
+    }
+    else
+    {
+        forAll(expand, edgeI)
+        {
+            if (edgeI)
+            {
+                os  << ' ';
+            }
+            os  << expand[edgeI];
+        }
+    }
+
+
+    os  << ")";
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
new file mode 100644
index 000000000..b99d6786f
--- /dev/null
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::blockDescriptor
+
+Description
+    Takes the description of the block and the list of curved edges and
+    creates a list of points on edges together with the weighting factors
+
+SourceFiles
+    blockDescriptor.C
+    blockDescriptorEdges.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef blockDescriptor_H
+#define blockDescriptor_H
+
+#include "cellShape.H"
+#include "pointField.H"
+#include "scalarList.H"
+#include "curvedEdgeList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// Forward declaration of friend functions and operators
+class blockMesh;
+class blockDescriptor;
+Ostream& operator<<(Ostream&, const blockDescriptor&);
+
+/*---------------------------------------------------------------------------*\
+                       Class blockDescriptor Declaration
+\*---------------------------------------------------------------------------*/
+
+class blockDescriptor
+{
+    // Private data
+
+        //- Reference to point field defining the block mesh
+        const pointField& blockPointField_;
+
+        //- Reference to a list of curved edges
+        const curvedEdgeList& curvedEdges_;
+
+        //- Block shape
+        cellShape blockShape_;
+
+        //- The number of cells in the i,j,k directions
+        Vector<label> meshDensity_;
+
+        //- Block edge points
+        List< List<point> > edgePoints_;
+
+        //- Block edge weighting factors
+        scalarListList edgeWeights_;
+
+        //- Expansion ratios in all directions
+        scalarList expand_;
+
+        //- Name of the zone (empty string if none)
+        word zoneName_;
+
+    // Private Member Functions
+
+        //- Set the points/weights for all edges
+        void makeBlockEdges();
+
+        //- Set the edge points/weights
+        void setEdge(label edgeI, label start, label end, label dim);
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise assignment
+        void operator=(const blockDescriptor&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components. Optional cellSet/zone name.
+        blockDescriptor
+        (
+            const cellShape&,
+            const pointField& blockPointField,
+            const curvedEdgeList&,
+            const Vector<label>& meshDensity,
+            const UList<scalar>& expand,
+            const word& zoneName = ""
+        );
+
+        //- Construct from Istream
+        blockDescriptor
+        (
+            const pointField& blockPointField,
+            const curvedEdgeList&,
+            Istream&
+        );
+
+        //- Clone
+        autoPtr<blockDescriptor> clone() const
+        {
+            notImplemented("blockDescriptor::clone()");
+            return autoPtr<blockDescriptor>(NULL);
+        }
+
+
+    //- Destructor
+    ~blockDescriptor();
+
+
+    // Member Functions
+
+        // Access
+
+        //- Reference to point field defining the block mesh
+        const pointField& blockPointField() const;
+
+        //- Return the block shape
+        const cellShape& blockShape() const;
+
+        //- Return the block points along each edge
+        const List< List<point> >& blockEdgePoints() const;
+
+        //- Return the weightings along each edge
+        const scalarListList& blockEdgeWeights() const;
+
+        //- Return the mesh density (number of cells) in the i,j,k directions
+        const Vector<label>& meshDensity() const;
+
+        //- Return the (optional) zone name
+        const word& zoneName() const;
+
+
+        //- Return the number of points
+        label nPoints() const;
+
+        //- Return the number of cells
+        label nCells() const;
+
+        //- Return block point at local label i
+        const point& blockPoint(const label i) const;
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<<(Ostream&, const blockDescriptor&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptorEdges.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptorEdges.C
new file mode 100644
index 000000000..30fc5dfe3
--- /dev/null
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptorEdges.C
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "error.H"
+#include "blockDescriptor.H"
+
+#include "lineEdge.H"
+#include "lineDivide.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    //! \cond fileScope
+    //  Calculate the geometric expension factor from the expansion ratio
+    inline scalar calcGexp(const scalar expRatio, const label dim)
+    {
+        return dim > 1 ? pow(expRatio, 1.0/(dim - 1)) : 0.0;
+    }
+    //! \endcond
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::blockDescriptor::makeBlockEdges()
+{
+    const label ni = meshDensity_.x();
+    const label nj = meshDensity_.y();
+    const label nk = meshDensity_.z();
+
+    // these edges correspond to the "hex" cellModel
+
+    // x-direction
+    setEdge(0,  0, 1, ni);
+    setEdge(1,  3, 2, ni);
+    setEdge(2,  7, 6, ni);
+    setEdge(3,  4, 5, ni);
+
+    // y-direction
+    setEdge(4,  0, 3, nj);
+    setEdge(5,  1, 2, nj);
+    setEdge(6,  5, 6, nj);
+    setEdge(7,  4, 7, nj);
+
+    // z-direction
+    setEdge(8,  0, 4, nk);
+    setEdge(9,  1, 5, nk);
+    setEdge(10, 2, 6, nk);
+    setEdge(11, 3, 7, nk);
+}
+
+
+void Foam::blockDescriptor::setEdge
+(
+    label edgeI,
+    label start,
+    label end,
+    label dim
+)
+{
+    // set reference to the list of labels defining the block
+    const labelList& blockLabels = blockShape_;
+
+    // set reference to global list of points
+    const pointField blockPoints = blockShape_.points(blockPointField_);
+
+    // Set the edge points/weights
+    // The edge is a straight-line if it is not in the list of curvedEdges
+
+    // calc geometric expension factor from the expansion ratio
+    const scalar gExp = calcGexp(expand_[edgeI], dim);
+
+    forAll(curvedEdges_, cedgeI)
+    {
+        const curvedEdge& cedge = curvedEdges_[cedgeI];
+
+        int cmp = cedge.compare(blockLabels[start], blockLabels[end]);
+
+        if (cmp)
+        {
+            if (cmp > 0)
+            {
+                // curve has the same orientation
+
+                // divide the line
+                lineDivide divEdge(cedge, dim, gExp);
+
+                edgePoints_[edgeI]  = divEdge.points();
+                edgeWeights_[edgeI] = divEdge.lambdaDivisions();
+            }
+            else
+            {
+                // curve has the opposite orientation
+
+                // divide the line
+                lineDivide divEdge(cedge, dim, 1.0/(gExp+SMALL));
+
+                const pointField& p = divEdge.points();
+                const scalarList& d = divEdge.lambdaDivisions();
+
+                edgePoints_[edgeI].setSize(p.size());
+                edgeWeights_[edgeI].setSize(d.size());
+
+                label pMax = p.size() - 1;
+                forAll(p, pI)
+                {
+                    edgePoints_[edgeI][pI]  = p[pMax - pI];
+                    edgeWeights_[edgeI][pI] = 1.0 - d[pMax - pI];
+                }
+
+            }
+
+            // found curved-edge: done
+            return;
+        }
+    }
+
+
+    // not found: divide the edge as a straight line
+
+    lineDivide divEdge
+    (
+        lineEdge(blockPoints, start, end),
+        dim,
+        gExp
+    );
+
+    edgePoints_[edgeI]  = divEdge.points();
+    edgeWeights_[edgeI] = divEdge.lambdaDivisions();
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.C b/src/mesh/blockMesh/blockMesh/blockMesh.C
new file mode 100644
index 000000000..ff7b1f902
--- /dev/null
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.C
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "blockMesh.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+bool Foam::blockMesh::blockMesh::verboseOutput(false);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::blockMesh::blockMesh(const IOdictionary& dict, const word& regionName)
+:
+    blockPointField_(dict.lookup("vertices")),
+    scaleFactor_(1.0),
+    topologyPtr_(createTopology(dict, regionName))
+{
+    calcMergeInfo();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::blockMesh::~blockMesh()
+{
+    delete topologyPtr_;
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::blockMesh::verbose(const bool on)
+{
+    verboseOutput = on;
+}
+
+
+const Foam::pointField& Foam::blockMesh::blockPointField() const
+{
+    return blockPointField_;
+}
+
+
+const Foam::polyMesh& Foam::blockMesh::topology() const
+{
+    if (!topologyPtr_)
+    {
+        FatalErrorIn("blockMesh::topology() const")
+            << "topologyPtr_ not allocated"
+            << exit(FatalError);
+    }
+
+    return *topologyPtr_;
+}
+
+
+Foam::PtrList<Foam::dictionary> Foam::blockMesh::patchDicts() const
+{
+    const polyPatchList& patchTopologies = topology().boundaryMesh();
+
+    PtrList<dictionary> patchDicts(patchTopologies.size());
+
+    forAll(patchTopologies, patchI)
+    {
+        OStringStream os;
+        patchTopologies[patchI].write(os);
+        IStringStream is(os.str());
+        patchDicts.set(patchI, new dictionary(is));
+    }
+    return patchDicts;
+}
+
+
+Foam::scalar Foam::blockMesh::scaleFactor() const
+{
+    return scaleFactor_;
+}
+
+
+const Foam::pointField& Foam::blockMesh::points() const
+{
+    if (points_.empty())
+    {
+        createPoints();
+    }
+
+    return points_;
+}
+
+
+const Foam::cellShapeList& Foam::blockMesh::cells() const
+{
+    if (cells_.empty())
+    {
+        createCells();
+    }
+
+    return cells_;
+}
+
+
+const Foam::faceListList& Foam::blockMesh::patches() const
+{
+    if (patches_.empty())
+    {
+        createPatches();
+    }
+
+    return patches_;
+}
+
+
+Foam::wordList Foam::blockMesh::patchNames() const
+{
+    return topology().boundaryMesh().names();
+}
+
+
+//Foam::wordList Foam::blockMesh::patchTypes() const
+//{
+//    return topology().boundaryMesh().types();
+//}
+//
+//
+//Foam::wordList Foam::blockMesh::patchPhysicalTypes() const
+//{
+//    return topology().boundaryMesh().physicalTypes();
+//}
+
+
+Foam::label Foam::blockMesh::numZonedBlocks() const
+{
+    label num = 0;
+
+    forAll(*this, blockI)
+    {
+        if (operator[](blockI).zoneName().size())
+        {
+            num++;
+        }
+    }
+
+    return num;
+}
+
+
+void Foam::blockMesh::writeTopology(Ostream& os) const
+{
+    const pointField& pts = topology().points();
+
+    forAll(pts, pI)
+    {
+        const point& pt = pts[pI];
+
+        os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
+    }
+
+    const edgeList& edges = topology().edges();
+
+    forAll(edges, eI)
+    {
+        const edge& e = edges[eI];
+
+        os << "l " << e.start() + 1 << ' ' << e.end() + 1 << endl;
+    }
+}
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.H b/src/mesh/blockMesh/blockMesh/blockMesh.H
new file mode 100644
index 000000000..e3a6619ce
--- /dev/null
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.H
@@ -0,0 +1,223 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::blockMesh
+
+Description
+    A multi-block mesh generator
+
+Note
+    The vertices, cells and patches for filling the blocks are demand-driven.
+
+SourceFiles
+    blockMesh.C
+    blockMeshCheck.C
+    blockMeshCreate.C
+    blockMeshMerge.C
+    blockMeshTopology.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef blockMesh_H
+#define blockMesh_H
+
+#include "blockList.H"
+#include "polyMesh.H"
+#include "IOdictionary.H"
+#include "curvedEdgeList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class blockMesh Declaration
+\*---------------------------------------------------------------------------*/
+
+class blockMesh
+:
+    public blockList
+{
+    // Private data
+        static bool verboseOutput;
+
+        //- Point field defining the block mesh (corners)
+        pointField blockPointField_;
+
+        //- The list of curved edges
+        curvedEdgeList edges_;
+
+        //- The scaling factor to convert to metres
+        scalar scaleFactor_;
+
+        //- The blocks themselves (the topology) as a polyMesh
+        polyMesh* topologyPtr_;
+
+        label nPoints_;
+
+        //- The sum of all cells in each block
+        label nCells_;
+
+        //- The point offset added to each block
+        labelList blockOffsets_;
+
+        //- The merge points information
+        labelList mergeList_;
+
+        mutable pointField points_;
+
+        mutable cellShapeList cells_;
+
+        mutable faceListList patches_;
+
+
+    // Private Member Functions
+
+        bool blockLabelsOK
+        (
+            const label blockLabel,
+            const pointField& points,
+            const cellShape& blockShape
+        ) const;
+
+        bool patchLabelsOK
+        (
+            const label patchLabel,
+            const pointField& points,
+            const faceList& patchShapes
+        ) const;
+
+        bool readPatches
+        (
+            const dictionary& meshDescription,
+            faceListList& tmpBlocksPatches,
+            wordList& patchNames,
+            wordList& patchTypes,
+            wordList& nbrPatchNames
+        );
+
+        bool readBoundary
+        (
+            const dictionary& meshDescription,
+            wordList& patchNames,
+            faceListList& tmpBlocksPatches,
+            PtrList<dictionary>& patchDicts
+        );
+
+        void createCellShapes(cellShapeList& tmpBlockCells);
+
+        polyMesh* createTopology(const IOdictionary&, const word& regionName);
+        void checkBlockMesh(const polyMesh&) const;
+
+        //- Determine the merge info and the final number of cells/points
+        void calcMergeInfo();
+
+        faceList createPatchFaces(const polyPatch& patchTopologyFaces) const;
+
+        void createPoints() const;
+        void createCells() const;
+        void createPatches() const;
+
+        //- as copy (not implemented)
+        blockMesh(const blockMesh&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from IOdictionary
+        blockMesh(const IOdictionary&, const word& regionName);
+
+
+    //- Destructor
+    ~blockMesh();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Reference to point field defining the block mesh
+            //  these points have not been scaled by scaleFactor
+            const pointField& blockPointField() const;
+
+            const polyMesh& topology() const;
+
+            const curvedEdgeList& edges() const
+            {
+                return edges_;
+            }
+
+            //- The scaling factor used to convert to metres
+            scalar scaleFactor() const;
+
+            //- The points for the entire mesh
+            //  these points have been scaled by scaleFactor
+            const pointField& points() const;
+
+            const cellShapeList& cells() const;
+
+            const faceListList& patches() const;
+
+
+            //- Get patch information from the topology mesh
+            PtrList<dictionary> patchDicts() const;
+
+            wordList patchNames() const;
+
+//            wordList patchTypes() const;
+//
+//            wordList patchPhysicalTypes() const;
+
+            //- Number of blocks with specified zones
+            label numZonedBlocks() const;
+
+
+        // Edit
+
+            //- Clear geometry (internal points, cells, boundaryPatches)
+            void clearGeom();
+
+            //- Enable/disable verbose information about the progress
+            static void verbose(const bool on=true);
+
+        // Write
+
+            //- Writes edges of blockMesh in OBJ format.
+            void writeTopology(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCheck.C b/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
new file mode 100644
index 000000000..b44f7259b
--- /dev/null
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
@@ -0,0 +1,236 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "blockMesh.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Check the blockMesh topology
+void Foam::blockMesh::checkBlockMesh(const polyMesh& bm) const
+{
+    if (verboseOutput)
+    {
+        Info<< nl << "Check topology" << endl;
+    }
+
+    bool ok = true;
+
+    const pointField& points = bm.points();
+    const faceList& faces = bm.faces();
+    const cellList& cells = bm.cells();
+    const polyPatchList& patches = bm.boundaryMesh();
+
+    label nBoundaryFaces = 0;
+    forAll(cells, celli)
+    {
+        nBoundaryFaces += cells[celli].nFaces();
+    }
+
+    nBoundaryFaces -= 2*bm.nInternalFaces();
+
+    label nDefinedBoundaryFaces = 0;
+    forAll(patches, patchi)
+    {
+        nDefinedBoundaryFaces += patches[patchi].size();
+    }
+
+
+    if (verboseOutput)
+    {
+        Info<< nl << tab << "Basic statistics" << nl
+            << tab << tab << "Number of internal faces : "
+            << bm.nInternalFaces() << nl
+            << tab << tab << "Number of boundary faces : "
+            << nBoundaryFaces << nl
+            << tab << tab << "Number of defined boundary faces : "
+            << nDefinedBoundaryFaces << nl
+            << tab << tab << "Number of undefined boundary faces : "
+            << nBoundaryFaces - nDefinedBoundaryFaces << nl;
+
+        if ((nBoundaryFaces - nDefinedBoundaryFaces) > 0)
+        {
+            Info<< tab << tab << tab
+                << "(Warning : only leave undefined the front and back planes "
+                << "of 2D planar geometries!)" << endl;
+        }
+
+        Info<< tab << "Checking patch -> block consistency" << endl;
+    }
+
+
+    forAll(patches, patchi)
+    {
+        const faceList& Patch = patches[patchi];
+
+        forAll(Patch, patchFacei)
+        {
+            const face& patchFace = Patch[patchFacei];
+            bool patchFaceOK = false;
+
+            forAll(cells, celli)
+            {
+                const labelList& cellFaces = cells[celli];
+
+                forAll(cellFaces, cellFacei)
+                {
+                    if (patchFace == faces[cellFaces[cellFacei]])
+                    {
+                        patchFaceOK = true;
+
+                        if
+                        (
+                            (
+                                patchFace.normal(points)
+                              & faces[cellFaces[cellFacei]].normal(points)
+                            ) < 0.0
+                        )
+                        {
+                            Info<< tab << tab
+                                << "Face " << patchFacei
+                                << " of patch " << patchi
+                                << " (" << patches[patchi].name() << ")"
+                                << " points inwards"
+                                << endl;
+
+                            ok = false;
+                        }
+                    }
+                }
+            }
+
+            if (!patchFaceOK)
+            {
+                Info<< tab << tab
+                    << "Face " << patchFacei
+                    << " of patch " << patchi
+                    << " (" << patches[patchi].name() << ")"
+                    << " does not match any block faces" << endl;
+
+                ok = false;
+            }
+        }
+    }
+
+    if (verboseOutput)
+    {
+        Info<< endl;
+    }
+
+    if (!ok)
+    {
+        FatalErrorIn("blockMesh::checkBlockMesh(const polyMesh& bm)")
+            << "Block mesh topology incorrect, stopping mesh generation!"
+            << exit(FatalError);
+    }
+}
+
+
+bool Foam::blockMesh::blockLabelsOK
+(
+    const label blockLabel,
+    const pointField& points,
+    const cellShape& blockShape
+) const
+{
+    bool ok = true;
+
+    forAll(blockShape, blockI)
+    {
+        if (blockShape[blockI] < 0)
+        {
+            ok = false;
+
+            WarningIn
+            (
+                "bool Foam::blockMesh::blockLabelsOK(...)"
+            )   << "out-of-range point label " << blockShape[blockI]
+                << " (min = 0"
+                << ") in block " << blockLabel << endl;
+        }
+        else if (blockShape[blockI] >= points.size())
+        {
+            ok = false;
+
+            WarningIn
+            (
+                "bool Foam::blockMesh::blockLabelsOK(...)"
+            )   << "out-of-range point label " << blockShape[blockI]
+                << " (max = " << points.size() - 1
+                << ") in block " << blockLabel << endl;
+        }
+    }
+
+    return ok;
+}
+
+
+bool Foam::blockMesh::patchLabelsOK
+(
+    const label patchLabel,
+    const pointField& points,
+    const faceList& patchFaces
+) const
+{
+    bool ok = true;
+
+    forAll(patchFaces, faceI)
+    {
+        const labelList& f = patchFaces[faceI];
+
+        forAll(f, fp)
+        {
+            if (f[fp] < 0)
+            {
+                ok = false;
+
+                WarningIn
+                (
+                    "bool Foam::blockMesh::patchLabelsOK(...)"
+                )   << "out-of-range point label " << f[fp]
+                    << " (min = 0"
+                    << ") on patch " << patchLabel
+                    << ", face " << faceI << endl;
+            }
+            else if (f[fp] >= points.size())
+            {
+                ok = false;
+
+                WarningIn
+                (
+                    "bool Foam::blockMesh::patchLabelsOK(...)"
+                )   << "out-of-range point label " << f[fp]
+                    << " (max = " << points.size() - 1
+                    << ") on patch " << patchLabel
+                    << ", face " << faceI << endl;
+
+            }
+        }
+    }
+
+    return ok;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
new file mode 100644
index 000000000..9225c7cb9
--- /dev/null
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
@@ -0,0 +1,293 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+#include "blockMesh.H"
+#include "cellModeller.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::blockMesh::createPoints() const
+{
+    const blockList& blocks = *this;
+
+    if (verboseOutput)
+    {
+        Info<< "Creating points with scale " << scaleFactor_ << endl;
+    }
+
+    //
+    // generate points
+    //
+    points_.clear();
+    points_.setSize(nPoints_);
+
+    forAll(blocks, blockI)
+    {
+        const pointField& blockPoints = blocks[blockI].points();
+
+        if (verboseOutput)
+        {
+            const Vector<label>& density = blocks[blockI].meshDensity();
+
+            label v0 = blocks[blockI].vtxLabel(0, 0, 0);
+            label vi1 = blocks[blockI].vtxLabel(1, 0, 0);
+            scalar diStart = mag(blockPoints[vi1]-blockPoints[v0]);
+
+            label vinM1 = blocks[blockI].vtxLabel(density.x()-1, 0, 0);
+            label vin = blocks[blockI].vtxLabel(density.x(), 0, 0);
+            scalar diFinal = mag(blockPoints[vin]-blockPoints[vinM1]);
+
+            label vj1 = blocks[blockI].vtxLabel(0, 1, 0);
+            scalar djStart = mag(blockPoints[vj1]-blockPoints[v0]);
+            label vjnM1 = blocks[blockI].vtxLabel(0, density.y()-1, 0);
+            label vjn = blocks[blockI].vtxLabel(0, density.y(), 0);
+            scalar djFinal = mag(blockPoints[vjn]-blockPoints[vjnM1]);
+
+            label vk1 = blocks[blockI].vtxLabel(0, 0, 1);
+            scalar dkStart = mag(blockPoints[vk1]-blockPoints[v0]);
+            label vknM1 = blocks[blockI].vtxLabel(0, 0, density.z()-1);
+            label vkn = blocks[blockI].vtxLabel(0, 0, density.z());
+            scalar dkFinal = mag(blockPoints[vkn]-blockPoints[vknM1]);
+
+            Info<< "    Block " << blockI << " cell size :" << nl
+                << "        i : " << scaleFactor_*diStart << " .. "
+                << scaleFactor_*diFinal << nl
+                << "        j : " << scaleFactor_*djStart << " .. "
+                << scaleFactor_*djFinal << nl
+                << "        k : " << scaleFactor_*dkStart << " .. "
+                << scaleFactor_*dkFinal << nl
+                << endl;
+        }
+
+        forAll(blockPoints, blockPointI)
+        {
+            points_
+            [
+                mergeList_
+                [
+                    blockOffsets_[blockI] + blockPointI
+                ]
+            ] = scaleFactor_ * blockPoints[blockPointI];
+        }
+    }
+}
+
+
+void Foam::blockMesh::createCells() const
+{
+    const blockList& blocks = *this;
+    const cellModel& hex = *(cellModeller::lookup("hex"));
+
+    if (verboseOutput)
+    {
+        Info<< "Creating cells" << endl;
+    }
+
+    //
+    // generate cells
+    //
+    cells_.clear();
+    cells_.setSize(nCells_);
+
+    label cellLabel = 0;
+
+    forAll(blocks, blockI)
+    {
+        const labelListList& blockCells = blocks[blockI].cells();
+
+        forAll(blockCells, blockCellI)
+        {
+            labelList cellPoints(blockCells[blockCellI].size());
+
+            forAll(cellPoints, cellPointI)
+            {
+                cellPoints[cellPointI] =
+                    mergeList_
+                    [
+                        blockCells[blockCellI][cellPointI]
+                      + blockOffsets_[blockI]
+                    ];
+            }
+
+            // Construct collapsed cell and add to list
+            cells_[cellLabel] = cellShape(hex, cellPoints, true);
+
+            cellLabel++;
+        }
+    }
+}
+
+
+Foam::faceList Foam::blockMesh::createPatchFaces
+(
+    const polyPatch& patchTopologyFaces
+) const
+{
+    const blockList& blocks = *this;
+
+    labelList blockLabels = patchTopologyFaces.polyPatch::faceCells();
+
+    label nFaces = 0;
+
+    forAll(patchTopologyFaces, patchTopologyFaceLabel)
+    {
+        const label blockI = blockLabels[patchTopologyFaceLabel];
+
+        faceList blockFaces = blocks[blockI].blockShape().faces();
+
+        forAll(blockFaces, blockFaceLabel)
+        {
+            if
+            (
+                blockFaces[blockFaceLabel]
+             == patchTopologyFaces[patchTopologyFaceLabel]
+            )
+            {
+                nFaces +=
+                    blocks[blockI].boundaryPatches()[blockFaceLabel].size();
+            }
+        }
+    }
+
+
+    faceList patchFaces(nFaces);
+    face quadFace(4);
+    label faceLabel = 0;
+
+    forAll(patchTopologyFaces, patchTopologyFaceLabel)
+    {
+        const label blockI = blockLabels[patchTopologyFaceLabel];
+
+        faceList blockFaces = blocks[blockI].blockShape().faces();
+
+        forAll(blockFaces, blockFaceLabel)
+        {
+            if
+            (
+                blockFaces[blockFaceLabel]
+                == patchTopologyFaces[patchTopologyFaceLabel]
+            )
+            {
+                const labelListList& blockPatchFaces =
+                    blocks[blockI].boundaryPatches()[blockFaceLabel];
+
+                forAll(blockPatchFaces, blockFaceLabel)
+                {
+                    // Lookup the face points
+                    // and collapse duplicate point labels
+
+                    quadFace[0] =
+                        mergeList_
+                        [
+                            blockPatchFaces[blockFaceLabel][0]
+                          + blockOffsets_[blockI]
+                        ];
+
+                    label nUnique = 1;
+
+                    for
+                    (
+                        label facePointLabel = 1;
+                        facePointLabel < 4;
+                        facePointLabel++
+                    )
+                    {
+                        quadFace[nUnique] =
+                            mergeList_
+                            [
+                                blockPatchFaces[blockFaceLabel][facePointLabel]
+                              + blockOffsets_[blockI]
+                            ];
+
+                        if (quadFace[nUnique] != quadFace[nUnique-1])
+                        {
+                            nUnique++;
+                        }
+                    }
+
+                    if (quadFace[nUnique-1] == quadFace[0])
+                    {
+                        nUnique--;
+                    }
+
+                    if (nUnique == 4)
+                    {
+                        patchFaces[faceLabel++] = quadFace;
+                    }
+                    else if (nUnique == 3)
+                    {
+                        patchFaces[faceLabel++] = face
+                        (
+                            labelList::subList(quadFace, 3)
+                        );
+                    }
+                    // else the face has collapsed to an edge or point
+                }
+            }
+        }
+    }
+
+    patchFaces.setSize(faceLabel);
+
+    return patchFaces;
+}
+
+
+void Foam::blockMesh::createPatches() const
+{
+    const polyPatchList& topoPatches = topology().boundaryMesh();
+
+    if (verboseOutput)
+    {
+        Info<< "Creating patches" << endl;
+    }
+
+    //
+    // generate points
+    //
+
+    patches_.clear();
+    patches_.setSize(topoPatches.size());
+
+    forAll(topoPatches, patchI)
+    {
+        patches_[patchI] = createPatchFaces(topoPatches[patchI]);
+    }
+
+}
+
+
+void Foam::blockMesh::clearGeom()
+{
+    blockList& blocks = *this;
+
+    forAll(blocks, blockI)
+    {
+        blocks[blockI].clearGeom();
+    }
+}
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/createMergeList.C b/src/mesh/blockMesh/blockMesh/blockMeshMerge.C
similarity index 80%
rename from applications/utilities/mesh/generation/blockMesh/createMergeList.C
rename to src/mesh/blockMesh/blockMesh/blockMeshMerge.C
index 905edd3bd..5d0d7f421 100644
--- a/applications/utilities/mesh/generation/blockMesh/createMergeList.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshMerge.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
@@ -27,13 +27,38 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::labelList Foam::blockMesh::createMergeList()
+void Foam::blockMesh::calcMergeInfo()
 {
-    Info<< nl << "Creating merge list " << flush;
+    const blockList& blocks = *this;
 
-    labelList MergeList(nPoints_, -1);
+    if (verboseOutput)
+    {
+        Info<< "Creating block offsets" << endl;
+    }
+
+    blockOffsets_.setSize(blocks.size());
+
+    nPoints_ = 0;
+    nCells_  = 0;
+
+    forAll(blocks, blockI)
+    {
+        blockOffsets_[blockI] = nPoints_;
+
+        nPoints_ += blocks[blockI].nPoints();
+        nCells_  += blocks[blockI].nCells();
+    }
+
+
+    if (verboseOutput)
+    {
+        Info<< "Creating merge list " << flush;
+    }
+
+    // set unused to -1
+    mergeList_.setSize(nPoints_);
+    mergeList_ = -1;
 
-    blockMesh& blocks = *this;
 
     const pointField& blockPoints = topology().points();
     const cellList& blockCells = topology().cells();
@@ -45,6 +70,7 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
     const labelList& faceNeighbourBlocks = topology().faceNeighbour();
 
+
     forAll(blockFaces, blockFaceLabel)
     {
         label blockPlabel = faceOwnerBlocks[blockFaceLabel];
@@ -73,10 +99,10 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
         if (!foundFace)
         {
-            FatalErrorIn("blockMesh::createMergeList()")
+            FatalErrorIn("blockMesh::calcMergeInfo()")
                 << "Cannot find merge face for block " << blockPlabel
                 << exit(FatalError);
-        };
+        }
 
         const labelListList& blockPfaceFaces =
             blocks[blockPlabel].boundaryPatches()[blockPfaceLabel];
@@ -92,7 +118,7 @@ Foam::labelList Foam::blockMesh::createMergeList()
         // the size of the block.
 
         boundBox bb(blockCells[blockPlabel].points(blockFaces, blockPoints));
-        const scalar mergeSqrDist = SMALL*magSqr(bb.span());
+        const scalar mergeSqrDist = magSqr(SMALL*bb.span());
 
         // This is an N^2 algorithm
 
@@ -129,17 +155,17 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
                             label minPP2 = min(PpointLabel, PpointLabel2);
 
-                            if (MergeList[PpointLabel] != -1)
+                            if (mergeList_[PpointLabel] != -1)
                             {
-                                minPP2 = min(minPP2, MergeList[PpointLabel]);
+                                minPP2 = min(minPP2, mergeList_[PpointLabel]);
                             }
 
-                            if (MergeList[PpointLabel2] != -1)
+                            if (mergeList_[PpointLabel2] != -1)
                             {
-                                minPP2 = min(minPP2, MergeList[PpointLabel2]);
+                                minPP2 = min(minPP2, mergeList_[PpointLabel2]);
                             }
 
-                            MergeList[PpointLabel] = MergeList[PpointLabel2]
+                            mergeList_[PpointLabel] = mergeList_[PpointLabel2]
                                 = minPP2;
                         }
                         else
@@ -182,22 +208,23 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
         if (!foundFace)
         {
-            FatalErrorIn("blockMesh::createMergeList()")
+            FatalErrorIn("blockMesh::calcMergeInfo()")
                 << "Cannot find merge face for block " << blockNlabel
                 << exit(FatalError);
-        };
+        }
 
         const labelListList& blockNfaceFaces =
             blocks[blockNlabel].boundaryPatches()[blockNfaceLabel];
 
         if (blockPfaceFaces.size() != blockNfaceFaces.size())
         {
-            FatalErrorIn("blockMesh::createMergeList()")
+            FatalErrorIn("blockMesh::calcMergeInfo()")
                 << "Inconsistent number of faces between block pair "
                 << blockPlabel << " and " << blockNlabel
                 << exit(FatalError);
         }
 
+
         // N-squared point search over all points of all faces of
         // master block over all point of all faces of slave block
         forAll(blockPfaceFaces, blockPfaceFaceLabel)
@@ -211,8 +238,6 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
             forAll(blockPfaceFacePoints, blockPfaceFacePointLabel)
             {
-                bool found = false;
-
                 forAll(blockNfaceFaces, blockNfaceFaceLabel)
                 {
                     const labelList& blockNfaceFacePoints
@@ -232,7 +257,6 @@ Foam::labelList Foam::blockMesh::createMergeList()
                         )
                         {
                             // Found a new pair
-                            found = true;
 
                             cp[blockPfaceFacePointLabel] =
                                 blockNfaceFacePoints[blockNfaceFacePointLabel];
@@ -247,17 +271,17 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
                             label minPN = min(PpointLabel, NpointLabel);
 
-                            if (MergeList[PpointLabel] != -1)
+                            if (mergeList_[PpointLabel] != -1)
                             {
-                                minPN = min(minPN, MergeList[PpointLabel]);
+                                minPN = min(minPN, mergeList_[PpointLabel]);
                             }
 
-                            if (MergeList[NpointLabel] != -1)
+                            if (mergeList_[NpointLabel] != -1)
                             {
-                                minPN = min(minPN, MergeList[NpointLabel]);
+                                minPN = min(minPN, mergeList_[NpointLabel]);
                             }
 
-                            MergeList[PpointLabel] = MergeList[NpointLabel]
+                            mergeList_[PpointLabel] = mergeList_[NpointLabel]
                                 = minPN;
                         }
                     }
@@ -267,7 +291,7 @@ Foam::labelList Foam::blockMesh::createMergeList()
             {
                 if (cp[blockPfaceFacePointLabel] == -1)
                 {
-                    FatalErrorIn("blockMesh::createMergeList()")
+                    FatalErrorIn("blockMesh::calcMergeInfo()")
                         << "Inconsistent point locations between block pair "
                         << blockPlabel << " and " << blockNlabel << nl
                         << "    probably due to inconsistent grading."
@@ -321,6 +345,8 @@ Foam::labelList Foam::blockMesh::createMergeList()
                 }
             }
 
+// FIXME? - there seems to be some logic missing here
+
             label blockNfaceLabel;
             for
             (
@@ -339,6 +365,9 @@ Foam::labelList Foam::blockMesh::createMergeList()
                 }
             }
 
+// FIXME? - there seems to be some logic missing here
+
+
             const labelListList& blockPfaceFaces =
                 blocks[blockPlabel].boundaryPatches()[blockPfaceLabel];
 
@@ -361,34 +390,41 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
                     if
                     (
-                        MergeList[PpointLabel]
-                     != MergeList[NpointLabel]
+                        mergeList_[PpointLabel]
+                     != mergeList_[NpointLabel]
                     )
                     {
                         changedPointMerge = true;
 
-                        MergeList[PpointLabel]
-                      = MergeList[NpointLabel]
+                        mergeList_[PpointLabel]
+                      = mergeList_[NpointLabel]
                       = min
                         (
-                            MergeList[PpointLabel],
-                            MergeList[NpointLabel]
+                            mergeList_[PpointLabel],
+                            mergeList_[NpointLabel]
                         );
                     }
                 }
             }
         }
-        Info << "." << flush;
+        if (verboseOutput)
+        {
+            Info<< "." << flush;
+        }
 
         if (nPasses > 100)
         {
-            FatalErrorIn("blockMesh::createMergeList()")
+            FatalErrorIn("blockMesh::calcMergeInfo()")
                 << "Point merging failed after max number of passes."
                 << abort(FatalError);
         }
     }
     while (changedPointMerge);
-    Info << endl;
+
+    if (verboseOutput)
+    {
+        Info<< endl;
+    }
 
     forAll(blockInternalFaces, blockFaceLabel)
     {
@@ -423,10 +459,10 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
         if (!foundFace)
         {
-            FatalErrorIn("blockMesh::createMergeList()")
+            FatalErrorIn("blockMesh::calcMergeInfo()")
                 << "Cannot find merge face for block " << blockPlabel
                 << exit(FatalError);
-        };
+        }
 
         foundFace = false;
         label blockNfaceLabel;
@@ -450,10 +486,10 @@ Foam::labelList Foam::blockMesh::createMergeList()
 
         if (!foundFace)
         {
-            FatalErrorIn("blockMesh::createMergeList()")
+            FatalErrorIn("blockMesh::calcMergeInfo()")
                 << "Cannot find merge face for block " << blockNlabel
                 << exit(FatalError);
-        };
+        }
 
         const labelListList& blockPfaceFaces =
             blocks[blockPlabel].boundaryPatches()[blockPfaceLabel];
@@ -472,9 +508,9 @@ Foam::labelList Foam::blockMesh::createMergeList()
                     blockPfaceFacePoints[blockPfaceFacePointLabel]
                   + blockOffsets_[blockPlabel];
 
-                if (MergeList[PpointLabel] == -1)
+                if (mergeList_[PpointLabel] == -1)
                 {
-                    FatalErrorIn("blockMesh::createMergeList()")
+                    FatalErrorIn("blockMesh::calcMergeInfo()")
                         << "Unable to merge point "
                         << blockPfaceFacePointLabel
                         << ' ' << blockPpoints[blockPfaceFacePointLabel]
@@ -498,9 +534,9 @@ Foam::labelList Foam::blockMesh::createMergeList()
                     blockNfaceFacePoints[blockNfaceFacePointLabel]
                   + blockOffsets_[blockNlabel];
 
-                if (MergeList[NpointLabel] == -1)
+                if (mergeList_[NpointLabel] == -1)
                 {
-                    FatalErrorIn("blockMesh::createMergeList()")
+                    FatalErrorIn("blockMesh::calcMergeInfo()")
                         << "unable to merge point "
                         << blockNfaceFacePointLabel
                         << ' ' << blockNpoints[blockNfaceFacePointLabel]
@@ -519,33 +555,31 @@ Foam::labelList Foam::blockMesh::createMergeList()
     // given old point label
     label newPointLabel = 0;
 
-    forAll(MergeList, pointLabel)
+    forAll(mergeList_, pointLabel)
     {
-        if (MergeList[pointLabel] > pointLabel)
+        if (mergeList_[pointLabel] > pointLabel)
         {
-            FatalErrorIn("blockMesh::createMergeList()")
+            FatalErrorIn("blockMesh::calcMergeInfo()")
                 << "ouch" << exit(FatalError);
         }
 
         if
         (
-            (MergeList[pointLabel] == -1)
-         || MergeList[pointLabel] == pointLabel
+            mergeList_[pointLabel] == -1
+         || mergeList_[pointLabel] == pointLabel
         )
         {
-            MergeList[pointLabel] = newPointLabel;
+            mergeList_[pointLabel] = newPointLabel;
             newPointLabel++;
         }
         else
         {
-            MergeList[pointLabel] = MergeList[MergeList[pointLabel]];
+            mergeList_[pointLabel] = mergeList_[mergeList_[pointLabel]];
         }
     }
 
     nPoints_ = newPointLabel;
 
-
-    return MergeList;
 }
 
 // ************************************************************************* //
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
new file mode 100644
index 000000000..a4b9b548c
--- /dev/null
+++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
@@ -0,0 +1,608 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "blockMesh.H"
+#include "Time.H"
+#include "preservePatchTypes.H"
+#include "emptyPolyPatch.H"
+#include "cyclicPolyPatch.H"
+
+
+bool Foam::blockMesh::readPatches
+(
+    const dictionary& meshDescription,
+    faceListList& tmpBlocksPatches,
+    wordList& patchNames,
+    wordList& patchTypes,
+    wordList& nbrPatchNames
+)
+{
+    bool topologyOK = true;
+
+    ITstream& patchStream(meshDescription.lookup("patches"));
+
+    // read number of patches in mesh
+    label nPatches = 0;
+
+    token firstToken(patchStream);
+
+    if (firstToken.isLabel())
+    {
+        nPatches = firstToken.labelToken();
+
+        tmpBlocksPatches.setSize(nPatches);
+        patchNames.setSize(nPatches);
+        patchTypes.setSize(nPatches);
+        nbrPatchNames.setSize(nPatches);
+    }
+    else
+    {
+        patchStream.putBack(firstToken);
+    }
+
+    // Read beginning of blocks
+    patchStream.readBegin("patches");
+
+    nPatches = 0;
+
+    token lastToken(patchStream);
+    while
+    (
+        !(
+            lastToken.isPunctuation()
+            && lastToken.pToken() == token::END_LIST
+        )
+    )
+    {
+        if (tmpBlocksPatches.size() <= nPatches)
+        {
+            tmpBlocksPatches.setSize(nPatches + 1);
+            patchNames.setSize(nPatches + 1);
+            patchTypes.setSize(nPatches + 1);
+            nbrPatchNames.setSize(nPatches + 1);
+        }
+
+        patchStream.putBack(lastToken);
+
+        patchStream
+            >> patchTypes[nPatches]
+            >> patchNames[nPatches];
+
+        // Read patch faces
+        patchStream >> tmpBlocksPatches[nPatches];
+
+
+        // Catch multiple patches asap.
+        for (label i = 0; i < nPatches; i++)
+        {
+            if (patchNames[nPatches] == patchNames[i])
+            {
+                FatalErrorIn
+                (
+                    "blockMesh::createTopology(IOdictionary&)"
+                )   << "Duplicate patch " << patchNames[nPatches]
+                    << " at line " << patchStream.lineNumber()
+                    << ". Exiting !" << nl
+                    << exit(FatalError);
+            }
+        }
+
+        topologyOK = topologyOK && patchLabelsOK
+        (
+            nPatches,
+            blockPointField_,
+            tmpBlocksPatches[nPatches]
+        );
+
+        nPatches++;
+
+
+        // Split old style cyclics
+
+        if (patchTypes[nPatches-1] == cyclicPolyPatch::typeName)
+        {
+            word halfA = patchNames[nPatches-1] + "_half0";
+            word halfB = patchNames[nPatches-1] + "_half1";
+
+            WarningIn("blockMesh::createTopology(IOdictionary&)")
+                << "Old-style cyclic definition."
+                << " Splitting patch "
+                << patchNames[nPatches-1] << " into two halves "
+                << halfA << " and " << halfB << endl
+                << "    Alternatively use new 'boundary' dictionary syntax."
+                << endl;
+
+            // Add extra patch
+            if (tmpBlocksPatches.size() <= nPatches)
+            {
+                tmpBlocksPatches.setSize(nPatches + 1);
+                patchNames.setSize(nPatches + 1);
+                patchTypes.setSize(nPatches + 1);
+                nbrPatchNames.setSize(nPatches + 1);
+            }
+
+            // Update halfA info
+            patchNames[nPatches-1] = halfA;
+            nbrPatchNames[nPatches-1] = halfB;
+            // Update halfB info
+            patchTypes[nPatches] = patchTypes[nPatches-1];
+            patchNames[nPatches] = halfB;
+            nbrPatchNames[nPatches] = halfA;
+
+            // Split faces
+            if ((tmpBlocksPatches[nPatches-1].size() % 2) != 0)
+            {
+                FatalErrorIn
+                (
+                    "blockMesh::createTopology(IOdictionary&)"
+                )   << "Size of cyclic faces is not a multiple of 2 :"
+                    << tmpBlocksPatches[nPatches-1]
+                    << exit(FatalError);
+            }
+            label sz = tmpBlocksPatches[nPatches-1].size()/2;
+            faceList unsplitFaces(tmpBlocksPatches[nPatches-1], true);
+            tmpBlocksPatches[nPatches-1] = faceList
+            (
+                SubList<face>(unsplitFaces, sz)
+            );
+            tmpBlocksPatches[nPatches] = faceList
+            (
+                SubList<face>(unsplitFaces, sz, sz)
+            );
+
+            nPatches++;
+        }
+
+        patchStream >> lastToken;
+    }
+    patchStream.putBack(lastToken);
+
+    // Read end of blocks
+    patchStream.readEnd("patches");
+
+    return topologyOK;
+}
+
+
+bool Foam::blockMesh::readBoundary
+(
+    const dictionary& meshDescription,
+    wordList& patchNames,
+    faceListList& tmpBlocksPatches,
+    PtrList<dictionary>& patchDicts
+)
+{
+    bool topologyOK = true;
+
+    // Read like boundary file
+    const PtrList<entry> patchesInfo
+    (
+        meshDescription.lookup("boundary")
+    );
+
+    patchNames.setSize(patchesInfo.size());
+    tmpBlocksPatches.setSize(patchesInfo.size());
+    patchDicts.setSize(patchesInfo.size());
+
+    forAll(tmpBlocksPatches, patchI)
+    {
+        const entry& patchInfo = patchesInfo[patchI];
+
+        if (!patchInfo.isDict())
+        {
+            FatalIOErrorIn("blockMesh::readBoundary(..)", meshDescription)
+                << "Entry " << patchInfo << " in boundary section is not a"
+                << " valid dictionary." << exit(FatalIOError);
+        }
+
+        patchNames[patchI] = patchInfo.keyword();
+        // Construct dictionary
+        patchDicts.set(patchI, new dictionary(patchInfo.dict()));
+        // Read block faces
+        patchDicts[patchI].lookup("faces") >> tmpBlocksPatches[patchI];
+
+        topologyOK = topologyOK && patchLabelsOK
+        (
+            patchI,
+            blockPointField_,
+            tmpBlocksPatches[patchI]
+        );
+    }
+
+    return topologyOK;
+}
+
+
+void Foam::blockMesh::createCellShapes
+(
+    cellShapeList& tmpBlockCells
+)
+{
+    const blockMesh& blocks = *this;
+
+    tmpBlockCells.setSize(blocks.size());
+    forAll(blocks, blockI)
+    {
+        tmpBlockCells[blockI] = cellShape(blocks[blockI].blockShape());
+
+        if (tmpBlockCells[blockI].mag(blockPointField_) < 0.0)
+        {
+            WarningIn
+            (
+                "blockMesh::createTopology(IOdictionary&)"
+            )   << "negative volume block : " << blockI
+                << ", probably defined inside-out" << endl;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::polyMesh* Foam::blockMesh::createTopology
+(
+    const IOdictionary& meshDescription,
+    const word& regionName
+)
+{
+    bool topologyOK = true;
+
+    blockList& blocks = *this;
+
+    word defaultPatchName = "defaultFaces";
+    word defaultPatchType = emptyPolyPatch::typeName;
+
+    // get names/types for the unassigned patch faces
+    // this is a bit heavy handed (and ugly), but there is currently
+    // no easy way to rename polyMesh patches subsequently
+    if (const dictionary* dictPtr = meshDescription.subDictPtr("defaultPatch"))
+    {
+        dictPtr->readIfPresent("name", defaultPatchName);
+        dictPtr->readIfPresent("type", defaultPatchType);
+    }
+
+    // optional 'convertToMeters' or 'scale'  scaling factor
+    if (!meshDescription.readIfPresent("convertToMeters", scaleFactor_))
+    {
+        meshDescription.readIfPresent("scale", scaleFactor_);
+    }
+
+
+    //
+    // get the non-linear edges in mesh
+    //
+    if (meshDescription.found("edges"))
+    {
+        if (verboseOutput)
+        {
+            Info<< "Creating curved edges" << endl;
+        }
+
+        ITstream& is(meshDescription.lookup("edges"));
+
+        // read number of edges in mesh
+        label nEdges = 0;
+
+        token firstToken(is);
+
+        if (firstToken.isLabel())
+        {
+            nEdges = firstToken.labelToken();
+            edges_.setSize(nEdges);
+        }
+        else
+        {
+            is.putBack(firstToken);
+        }
+
+        // Read beginning of edges
+        is.readBegin("edges");
+
+        nEdges = 0;
+
+        token lastToken(is);
+        while
+        (
+           !(
+                 lastToken.isPunctuation()
+              && lastToken.pToken() == token::END_LIST
+            )
+        )
+        {
+            if (edges_.size() <= nEdges)
+            {
+                edges_.setSize(nEdges + 1);
+            }
+
+            is.putBack(lastToken);
+
+            edges_.set
+            (
+                nEdges,
+                curvedEdge::New(blockPointField_, is)
+            );
+
+            nEdges++;
+
+            is >> lastToken;
+        }
+        is.putBack(lastToken);
+
+        // Read end of edges
+        is.readEnd("edges");
+    }
+    else if (verboseOutput)
+    {
+        Info<< "No non-linear edges defined" << endl;
+    }
+
+
+    //
+    // Create the blocks
+    //
+    if (verboseOutput)
+    {
+        Info<< "Creating topology blocks" << endl;
+    }
+
+    {
+        ITstream& is(meshDescription.lookup("blocks"));
+
+        // read number of blocks in mesh
+        label nBlocks = 0;
+
+        token firstToken(is);
+
+        if (firstToken.isLabel())
+        {
+            nBlocks = firstToken.labelToken();
+            blocks.setSize(nBlocks);
+        }
+        else
+        {
+            is.putBack(firstToken);
+        }
+
+        // Read beginning of blocks
+        is.readBegin("blocks");
+
+        nBlocks = 0;
+
+        token lastToken(is);
+        while
+        (
+           !(
+                 lastToken.isPunctuation()
+              && lastToken.pToken() == token::END_LIST
+            )
+        )
+        {
+            if (blocks.size() <= nBlocks)
+            {
+                blocks.setSize(nBlocks + 1);
+            }
+
+            is.putBack(lastToken);
+
+            blocks.set
+            (
+                nBlocks,
+                new block
+                (
+                    blockPointField_,
+                    edges_,
+                    is
+                )
+            );
+
+            topologyOK = topologyOK && blockLabelsOK
+            (
+                nBlocks,
+                blockPointField_,
+                blocks[nBlocks].blockShape()
+            );
+
+            nBlocks++;
+
+            is >> lastToken;
+        }
+        is.putBack(lastToken);
+
+        // Read end of blocks
+        is.readEnd("blocks");
+    }
+
+
+    polyMesh* blockMeshPtr = NULL;
+
+    //
+    // Create the patches
+    //
+    if (verboseOutput)
+    {
+        Info<< "Creating topology patches" << endl;
+    }
+
+    if (meshDescription.found("patches"))
+    {
+        Info<< nl << "Reading patches section" << endl;
+
+        faceListList tmpBlocksPatches;
+        wordList patchNames;
+        wordList patchTypes;
+        wordList nbrPatchNames;
+
+        topologyOK = topologyOK && readPatches
+        (
+            meshDescription,
+            tmpBlocksPatches,
+            patchNames,
+            patchTypes,
+            nbrPatchNames
+        );
+
+        if (!topologyOK)
+        {
+            FatalErrorIn("blockMesh::createTopology(IOdictionary&)")
+                << "Cannot create mesh due to errors in topology, exiting !"
+                << nl << exit(FatalError);
+        }
+
+        Info<< nl << "Creating block mesh topology" << endl;
+
+        cellShapeList tmpBlockCells(blocks.size());
+        createCellShapes(tmpBlockCells);
+
+
+        Info<< nl << "Reading physicalType from existing boundary file" << endl;
+
+        PtrList<dictionary> patchDicts(patchNames.size());
+        word defaultFacesType;
+
+        preservePatchTypes
+        (
+            meshDescription.time(),
+            meshDescription.time().constant(),
+            polyMesh::meshSubDir,
+            patchNames,
+            patchDicts,
+            defaultPatchName,
+            defaultPatchType
+        );
+
+
+        // Add cyclic info (might not be present from older file)
+        forAll(patchDicts, patchI)
+        {
+            if (!patchDicts.set(patchI))
+            {
+                patchDicts.set(patchI, new dictionary());
+            }
+
+            dictionary& dict = patchDicts[patchI];
+
+            // Add but not override type
+            if (!dict.found("type"))
+            {
+                dict.add("type", patchTypes[patchI], false);
+            }
+            else if (word(dict.lookup("type")) != patchTypes[patchI])
+            {
+                IOWarningIn
+                (
+                    "blockMesh::createTopology(IOdictionary&)",
+                    meshDescription
+                )   << "For patch " << patchNames[patchI]
+                    << " overriding type '" << patchTypes[patchI]
+                    << "' with '" << word(dict.lookup("type"))
+                    << "' (read from boundary file)"
+                    << endl;
+            }
+
+            // Override neighbourpatch name
+            if (nbrPatchNames[patchI] != word::null)
+            {
+                dict.set("neighbourPatch", nbrPatchNames[patchI]);
+            }
+        }
+
+
+        blockMeshPtr = new polyMesh
+        (
+            IOobject
+            (
+                regionName,
+                meshDescription.time().constant(),
+                meshDescription.time(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            xferCopy(blockPointField_),   // copy these points, do NOT move
+            tmpBlockCells,
+            tmpBlocksPatches,
+            patchNames,
+            patchDicts,
+            defaultPatchName,
+            defaultPatchType
+        );
+    }
+    else if (meshDescription.found("boundary"))
+    {
+        wordList patchNames;
+        faceListList tmpBlocksPatches;
+        PtrList<dictionary> patchDicts;
+
+        topologyOK = topologyOK && readBoundary
+        (
+            meshDescription,
+            patchNames,
+            tmpBlocksPatches,
+            patchDicts
+        );
+
+        if (!topologyOK)
+        {
+            FatalErrorIn("blockMesh::createTopology(IOdictionary&)")
+                << "Cannot create mesh due to errors in topology, exiting !"
+                << nl << exit(FatalError);
+        }
+
+
+        Info<< nl << "Creating block mesh topology" << endl;
+
+        cellShapeList tmpBlockCells(blocks.size());
+        createCellShapes(tmpBlockCells);
+
+        // Extract
+
+        blockMeshPtr = new polyMesh
+        (
+            IOobject
+            (
+                regionName,
+                meshDescription.time().constant(),
+                meshDescription.time(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            xferCopy(blockPointField_),   // copy these points, do NOT move
+            tmpBlockCells,
+            tmpBlocksPatches,
+            patchNames,
+            patchDicts,
+            defaultPatchName,
+            defaultPatchType
+        );
+    }
+
+    checkBlockMesh(*blockMeshPtr);
+
+    return blockMeshPtr;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/BSpline.C b/src/mesh/blockMesh/curvedEdges/BSpline.C
similarity index 73%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/BSpline.C
rename to src/mesh/blockMesh/curvedEdges/BSpline.C
index 2978cadd5..e101bf22e 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/BSpline.C
+++ b/src/mesh/blockMesh/curvedEdges/BSpline.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,11 +45,11 @@ Foam::point Foam::BSpline::position(const scalar mu) const
     // endpoints
     if (mu < SMALL)
     {
-        return points_[0];
+        return points().first();
     }
     else if (mu > 1 - SMALL)
     {
-        return points_[points_.size()-1];
+        return points().last();
     }
 
     scalar lambda = mu;
@@ -67,11 +67,11 @@ Foam::point Foam::BSpline::position
     // out-of-bounds
     if (segment < 0)
     {
-        return points_[0];
+        return points().first();
     }
     else if (segment > nSegments())
     {
-        return points_[points_.size()-1];
+        return points().last();
     }
 
     const point& p0 = points()[segment];
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/BSpline.H b/src/mesh/blockMesh/curvedEdges/BSpline.H
similarity index 79%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/BSpline.H
rename to src/mesh/blockMesh/curvedEdges/BSpline.H
index 84b5c5566..2e4efa271 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/BSpline.H
+++ b/src/mesh/blockMesh/curvedEdges/BSpline.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::BSpline
@@ -30,14 +30,14 @@ Description
     In this implementation, the end tangents are created automatically
     by reflection.
 
-    In matrix form, the @e local interpolation on the interval t=[0..1] is
+    In matrix form, the \e local interpolation on the interval t=[0..1] is
     described as follows:
-    @verbatim
+    \verbatim
     P(t) = 1/6 * [ t^3 t^2 t 1 ] * [ -1  3 -3  1 ] * [ P-1 ]
                                    [  3 -6  3  0 ]   [ P0 ]
                                    [ -3  0  3  0 ]   [ P1 ]
                                    [  1  4  1  0 ]   [ P2 ]
-    @endverbatim
+    \endverbatim
 
     Where P-1 and P2 represent the neighbouring points or the extrapolated
     end points. Simple reflection is used to automatically create the end
@@ -47,12 +47,11 @@ Description
     segments. In rare cases (sections with very high curvatures), the
     resulting distribution may be sub-optimal.
 
+    A future implementation could also handle closed splines.
+
 SeeAlso
     CatmullRomSpline
 
-ToDo
-    A future implementation could also handle closed splines.
-
 SourceFiles
     BSpline.C
 
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/CatmullRomSpline.C b/src/mesh/blockMesh/curvedEdges/CatmullRomSpline.C
similarity index 74%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/CatmullRomSpline.C
rename to src/mesh/blockMesh/curvedEdges/CatmullRomSpline.C
index 6fa80b835..22d3ed25b 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/CatmullRomSpline.C
+++ b/src/mesh/blockMesh/curvedEdges/CatmullRomSpline.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,11 +45,11 @@ Foam::point Foam::CatmullRomSpline::position(const scalar mu) const
     // endpoints
     if (mu < SMALL)
     {
-        return points()[0];
+        return points().first();
     }
     else if (mu > 1 - SMALL)
     {
-        return points()[points().size()-1];
+        return points().last();
     }
 
     scalar lambda = mu;
@@ -67,11 +67,11 @@ Foam::point Foam::CatmullRomSpline::position
     // out-of-bounds
     if (segment < 0)
     {
-        return points()[0];
+        return points().first();
     }
     else if (segment > nSegments())
     {
-        return points()[points().size()-1];
+        return points().last();
     }
 
     const point& p0 = points()[segment];
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/CatmullRomSpline.H b/src/mesh/blockMesh/curvedEdges/CatmullRomSpline.H
similarity index 78%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/CatmullRomSpline.H
rename to src/mesh/blockMesh/curvedEdges/CatmullRomSpline.H
index fa464085e..4d69a1329 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/CatmullRomSpline.H
+++ b/src/mesh/blockMesh/curvedEdges/CatmullRomSpline.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::CatmullRomSpline
@@ -31,14 +31,14 @@ Description
     In this implementation, the end tangents are created automatically
     by reflection.
 
-    In matrix form, the @e local interpolation on the interval t=[0..1] is
+    In matrix form, the \e local interpolation on the interval t=[0..1] is
     described as follows:
-    @verbatim
+    \verbatim
     P(t) = 1/2 * [ t^3 t^2 t 1 ] * [ -1  3 -3  1 ] * [ P-1 ]
                                    [  2 -5  4 -1 ]   [ P0 ]
                                    [ -1  0  1  0 ]   [ P1 ]
                                    [  0  2  0  0 ]   [ P2 ]
-    @endverbatim
+    \endverbatim
 
     Where P-1 and P2 represent the neighbouring points or the extrapolated
     end points. Simple reflection is used to automatically create the end
@@ -48,13 +48,12 @@ Description
     segments. In rare cases (sections with very high curvatures), the
     resulting distribution may be sub-optimal.
 
+    A future implementation could also handle closed splines.
+
 SeeAlso
     http://www.algorithmist.net/catmullrom.html provides a nice
     introduction
 
-ToDo
-    A future implementation could also handle closed splines.
-
 SourceFiles
     CatmullRomSpline.C
 
@@ -109,7 +108,7 @@ public:
         //  0 <= lambda <= 1 on the given segment
         point position(const label segment, const scalar lambda) const;
 
-        //- Return the length of the curve - not implemented
+        //- Return the length of the curve
         scalar length() const;
 };
 
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/arcEdge.C b/src/mesh/blockMesh/curvedEdges/arcEdge.C
similarity index 79%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/arcEdge.C
rename to src/mesh/blockMesh/curvedEdges/arcEdge.C
index aecd8e6ce..1f42125f9 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/arcEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/arcEdge.C
@@ -1,30 +1,30 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
 #include "arcEdge.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -70,8 +70,7 @@ Foam::cylindricalCS Foam::arcEdge::calcAngle()
     vector r3(p3_ - centre);
 
     // find angles
-    angle_ = (acos((r3 & r1)/(mag(r3) * mag(r1))))
-        * 180.0/mathematicalConstant::pi;
+    angle_ = radToDeg(acos((r3 & r1)/(mag(r3) * mag(r1))));
 
     // check if the vectors define an exterior or an interior arcEdge
     if (((r1 ^ r2) & (r1 ^ r3)) < 0.0)
@@ -158,7 +157,7 @@ Foam::point Foam::arcEdge::position(const scalar lambda) const
 
 Foam::scalar Foam::arcEdge::length() const
 {
-    return (angle_ * radius_) * mathematicalConstant::pi/180.0;
+    return degToRad(angle_*radius_);
 }
 
 
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/arcEdge.H b/src/mesh/blockMesh/curvedEdges/arcEdge.H
similarity index 76%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/arcEdge.H
rename to src/mesh/blockMesh/curvedEdges/arcEdge.H
index 3d7ed0073..51e128c58 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/arcEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/arcEdge.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::arcEdge
@@ -89,9 +89,8 @@ public:
         arcEdge(const pointField& points, Istream&);
 
 
-    // Destructor
-
-        virtual ~arcEdge(){}
+    //- Destructor
+    virtual ~arcEdge(){}
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C b/src/mesh/blockMesh/curvedEdges/curvedEdge.C
similarity index 79%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C
rename to src/mesh/blockMesh/curvedEdges/curvedEdge.C
index 7eea169fd..1a36cde6c 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/curvedEdge.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
@@ -30,7 +30,6 @@ License
 
 namespace Foam
 {
-
     defineTypeNameAndDebug(curvedEdge, 0);
     defineRunTimeSelectionTable(curvedEdge, Istream);
 }
@@ -87,7 +86,7 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
             << endl;
     }
 
-    word edgeType(is);
+    const word edgeType(is);
 
     IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(edgeType);
@@ -95,7 +94,8 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
         FatalErrorIn("curvedEdge::New(const pointField&, Istream&)")
-            << "Unknown curvedEdge type " << edgeType << endl << endl
+            << "Unknown curvedEdge type "
+            << edgeType << nl << nl
             << "Valid curvedEdge types are" << endl
             << IstreamConstructorTablePtr_->toc()
             << abort(FatalError);
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.H b/src/mesh/blockMesh/curvedEdges/curvedEdge.H
similarity index 84%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.H
rename to src/mesh/blockMesh/curvedEdges/curvedEdge.H
index e7048a5a5..7c3e37a29 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/curvedEdge.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::curvedEdge
@@ -117,9 +117,8 @@ public:
         static autoPtr<curvedEdge> New(const pointField&, Istream&);
 
 
-    // Destructor
-
-        virtual ~curvedEdge(){}
+    //- Destructor
+    virtual ~curvedEdge(){}
 
 
     // Member Functions
@@ -131,18 +130,21 @@ public:
         inline label end() const;
 
         //- Compare the given start and end points with this curve
+        //  Return:
         //  -  0: different
         //  - +1: identical
         //  - -1: same edge, but different orientation
         inline int compare(const curvedEdge&) const;
 
         //- Compare the given start and end points with this curve
+        //  Return:
         //  -  0: different
         //  - +1: identical
         //  - -1: same edge, but different orientation
         inline int compare(const edge&) const;
 
         //- Compare the given start and end points with this curve
+        //  Return:
         //  -  0: different
         //  - +1: identical
         //  - -1: same edge, but different orientation
@@ -160,6 +162,7 @@ public:
 
         void operator=(const curvedEdge&);
 
+
     // Ostream operator
 
         friend Ostream& operator<<(Ostream&, const curvedEdge&);
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdgeI.H b/src/mesh/blockMesh/curvedEdges/curvedEdgeI.H
similarity index 65%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdgeI.H
rename to src/mesh/blockMesh/curvedEdges/curvedEdgeI.H
index 8bd6ee7ad..8b2e32cae 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdgeI.H
+++ b/src/mesh/blockMesh/curvedEdges/curvedEdgeI.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdgeList.H b/src/mesh/blockMesh/curvedEdges/curvedEdgeList.H
new file mode 100644
index 000000000..7a36186bb
--- /dev/null
+++ b/src/mesh/blockMesh/curvedEdges/curvedEdgeList.H
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Typedef
+    Foam::curvedEdgeList
+
+Description
+    A PtrList of curvedEdges
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef curvedEdgeList_H
+#define curvedEdgeList_H
+
+#include "curvedEdge.H"
+#include "PtrList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef PtrList<curvedEdge> curvedEdgeList;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/ellipseEdge.C b/src/mesh/blockMesh/curvedEdges/ellipseEdge.C
similarity index 100%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/ellipseEdge.C
rename to src/mesh/blockMesh/curvedEdges/ellipseEdge.C
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/ellipseEdge.H b/src/mesh/blockMesh/curvedEdges/ellipseEdge.H
similarity index 100%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/ellipseEdge.H
rename to src/mesh/blockMesh/curvedEdges/ellipseEdge.H
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/lineDivide.C b/src/mesh/blockMesh/curvedEdges/lineDivide.C
similarity index 70%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/lineDivide.C
rename to src/mesh/blockMesh/curvedEdges/lineDivide.C
index 2d3c12d7a..28c9e8c06 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/lineDivide.C
+++ b/src/mesh/blockMesh/curvedEdges/lineDivide.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/lineDivide.H b/src/mesh/blockMesh/curvedEdges/lineDivide.H
similarity index 72%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/lineDivide.H
rename to src/mesh/blockMesh/curvedEdges/lineDivide.H
index 656b62dd9..d46ec74be 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/lineDivide.H
+++ b/src/mesh/blockMesh/curvedEdges/lineDivide.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::lineDivide
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/lineEdge.C b/src/mesh/blockMesh/curvedEdges/lineEdge.C
similarity index 72%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/lineEdge.C
rename to src/mesh/blockMesh/curvedEdges/lineEdge.C
index 2605a9b50..f5bd3348e 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/lineEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/lineEdge.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/lineEdge.H b/src/mesh/blockMesh/curvedEdges/lineEdge.H
similarity index 68%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/lineEdge.H
rename to src/mesh/blockMesh/curvedEdges/lineEdge.H
index 439b2dde6..c50489fb5 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/lineEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/lineEdge.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::lineEdge
@@ -51,13 +51,6 @@ class lineEdge
 :
     public curvedEdge
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        lineEdge(const lineEdge&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const lineEdge&);
 
 public:
 
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLine.C b/src/mesh/blockMesh/curvedEdges/polyLine.C
similarity index 78%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLine.C
rename to src/mesh/blockMesh/curvedEdges/polyLine.C
index 9c03895c0..a3c05d34d 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLine.C
+++ b/src/mesh/blockMesh/curvedEdges/polyLine.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
@@ -42,12 +42,12 @@ void Foam::polyLine::calcParam()
         }
 
         // normalize on the interval 0-1
-        lineLength_ = param_[param_.size()-1];
+        lineLength_ = param_.last();
         for (label i=1; i < param_.size() - 1; i++)
         {
             param_[i] /= lineLength_;
         }
-        param_[param_.size()-1] = 1.0;
+        param_.last() = 1.0;
     }
     else
     {
@@ -123,11 +123,11 @@ Foam::point Foam::polyLine::position(const scalar mu) const
     // check endpoints
     if (mu < SMALL)
     {
-        return points_[0];
+        return points_.first();
     }
     else if (mu > 1 - SMALL)
     {
-        return points_[points_.size()-1];
+        return points_.last();
     }
 
 
@@ -146,11 +146,11 @@ Foam::point Foam::polyLine::position
     // out-of-bounds
     if (segment < 0)
     {
-        return points_[0];
+        return points_.first();
     }
     else if (segment > nSegments())
     {
-        return points_[points_.size()-1];
+        return points_.last();
     }
 
     const point& p0 = points()[segment];
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLine.H b/src/mesh/blockMesh/curvedEdges/polyLine.H
similarity index 80%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLine.H
rename to src/mesh/blockMesh/curvedEdges/polyLine.H
index 19f87b610..e7da4517f 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLine.H
+++ b/src/mesh/blockMesh/curvedEdges/polyLine.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::polyLine
@@ -28,7 +28,6 @@ Description
     A series of straight line segments, which can also be interpreted as
     a series of control points for splines, etc.
 
-ToDo
     A future implementation could also handle a closed polyLine.
 
 SourceFiles
@@ -62,6 +61,7 @@ class polyLine
         //- Disallow default bitwise assignment
         void operator=(const polyLine&);
 
+
 protected:
 
     // Protected data
@@ -75,17 +75,18 @@ protected:
         //- The rational (0-1) cumulative parameter value for each point
         scalarList param_;
 
-    // Protected member functions
+
+    // Protected Member Functions
 
         //- Precalculate the rational cumulative parameter value
         //  and the line-length
         void calcParam();
 
-
         //- Return the line segment and the local parameter [0..1]
         //  corresponding to the global lambda [0..1]
         label localParameter(scalar& lambda) const;
 
+
 public:
 
     // Constructors
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLineEdge.C b/src/mesh/blockMesh/curvedEdges/polyLineEdge.C
similarity index 71%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLineEdge.C
rename to src/mesh/blockMesh/curvedEdges/polyLineEdge.C
index 546321b98..4af139610 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLineEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/polyLineEdge.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLineEdge.H b/src/mesh/blockMesh/curvedEdges/polyLineEdge.H
similarity index 77%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLineEdge.H
rename to src/mesh/blockMesh/curvedEdges/polyLineEdge.H
index bbbaa6d26..62bb85e1a 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polyLineEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/polyLineEdge.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::polyLineEdge
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/rotEllipse2D.H b/src/mesh/blockMesh/curvedEdges/rotEllipse2D.H
similarity index 100%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/rotEllipse2D.H
rename to src/mesh/blockMesh/curvedEdges/rotEllipse2D.H
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/splineEdge.C b/src/mesh/blockMesh/curvedEdges/splineEdge.C
similarity index 64%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/splineEdge.C
rename to src/mesh/blockMesh/curvedEdges/splineEdge.C
index 82c6edc14..345c026de 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/splineEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/splineEdge.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,25 +39,6 @@ namespace Foam
         splineEdge,
         Istream
     );
-
-    // compatibility with old names
-    addNamedToRunTimeSelectionTable
-    (
-        curvedEdge,
-        splineEdge,
-        Istream,
-        simpleSpline
-    );
-
-    // compatibility with old names
-    addNamedToRunTimeSelectionTable
-    (
-        curvedEdge,
-        splineEdge,
-        Istream,
-        polySpline
-    );
-
 }
 
 
@@ -84,7 +65,7 @@ Foam::splineEdge::splineEdge(const pointField& points, Istream& is)
     token t(is);
     is.putBack(t);
 
-    // compatibility - might also have start/end tangents - discard them
+    // discard unused start/end tangents
     if (t == token::BEGIN_LIST)
     {
         vector tangent0Ignored(is);
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/splineEdge.H b/src/mesh/blockMesh/curvedEdges/splineEdge.H
similarity index 75%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/splineEdge.H
rename to src/mesh/blockMesh/curvedEdges/splineEdge.H
index 7ad689b6e..318caa3f4 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/splineEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/splineEdge.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | For copyright notice see file Copyright
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
-    This file is part of foam-extend.
+    This file is part of OpenFOAM.
 
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
 
     You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::splineEdge
@@ -27,10 +27,6 @@ Class
 Description
     A curvedEdge interface for Catmull-Rom splines.
 
-Note
-    For compatibility, also accepts the type names 'polySpline' and
-    'simpleSpline'.
-
 SourceFiles
     splineEdge.C
 
diff --git a/src/mesh/extrudeModel/Make/files b/src/mesh/extrudeModel/Make/files
new file mode 100644
index 000000000..c8d0cc571
--- /dev/null
+++ b/src/mesh/extrudeModel/Make/files
@@ -0,0 +1,9 @@
+extrudeModel/extrudeModel.C
+extrudeModel/newExtrudeModel.C
+linearNormal/linearNormal.C
+linearRadial/linearRadial.C
+sigmaRadial/sigmaRadial.C
+wedge/wedge.C
+
+LIB = $(FOAM_LIBBIN)/libextrudeModel
+
diff --git a/src/mesh/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options
new file mode 100644
index 000000000..3c57befe4
--- /dev/null
+++ b/src/mesh/extrudeModel/Make/options
@@ -0,0 +1,8 @@
+EXE_INC = \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude
+
+EXE_LIBS = \
+    -lmeshTools \
+    -ldynamicMesh
+
diff --git a/src/mesh/extrudeModel/extrudeModel/extrudeModel.C b/src/mesh/extrudeModel/extrudeModel/extrudeModel.C
new file mode 100644
index 000000000..af3f30887
--- /dev/null
+++ b/src/mesh/extrudeModel/extrudeModel/extrudeModel.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "extrudeModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(extrudeModel, 0);
+    defineRunTimeSelectionTable(extrudeModel, dictionary);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::extrudeModel::extrudeModel
+(
+    const word& modelType,
+    const dictionary& dict
+)
+:
+    nLayers_(readLabel(dict.lookup("nLayers"))),
+    dict_(dict),
+    coeffDict_(dict.subDict(modelType + "Coeffs"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::extrudeModel::~extrudeModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::extrudeModel::nLayers() const
+{
+    return nLayers_;
+}
+
+
+// ************************************************************************* //
+
diff --git a/applications/utilities/mesh/generation/blockMesh/block.H b/src/mesh/extrudeModel/extrudeModel/extrudeModel.H
similarity index 55%
rename from applications/utilities/mesh/generation/blockMesh/block.H
rename to src/mesh/extrudeModel/extrudeModel/extrudeModel.H
index ecb74dbc6..ed388a9cd 100644
--- a/applications/utilities/mesh/generation/blockMesh/block.H
+++ b/src/mesh/extrudeModel/extrudeModel/extrudeModel.H
@@ -22,103 +22,108 @@ License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::block
+    Foam::extrudeModel
 
 Description
-    creates a single block of cells from point coordinates,
-    numbers of cells in each direction and expansion ratio
+    Top level extrusion model class
 
 SourceFiles
-    block.C
+    extrudeModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef block_H
-#define block_H
+#ifndef extrudeModel_H
+#define extrudeModel_H
 
-#include "pointField.H"
-#include "labelList.H"
-
-#include "blockDescriptor.H"
+#include "dictionary.H"
+#include "point.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-class Istream;
-class Ostream;
-
 /*---------------------------------------------------------------------------*\
-                           Class block Declaration
+                        Class extrudeModel Declaration
 \*---------------------------------------------------------------------------*/
 
-class block
+class extrudeModel
 {
-    // Private data
+protected:
 
-        //- block definition
-        blockDescriptor blockDef_;
+    // Protected data
 
-        //- list of vertices
-        pointField vertices_;
+        const label nLayers_;
 
-        //- list of cells
-        labelListList cells_;
+        const dictionary& dict_;
 
-        //- boundary patches
-        labelListListList boundaryPatches_;
+        const dictionary& coeffDict_;
 
 
-    // Private member functions
+    // Private Member Functions
 
-        label vtxLabel(label i, label j, label k);
+        //- Disallow default bitwise copy construct
+        extrudeModel(const extrudeModel&);
 
-        void blockPoints();
-
-        void blockCells();
-
-        void blockBoundary();
+        //- Disallow default bitwise assignment
+        void operator=(const extrudeModel&);
 
 
 public:
 
+    //- Runtime type information
+    TypeName("extrudeModel");
+
+    //- Declare runtime constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            extrudeModel,
+            dictionary,
+            (
+                const dictionary& dict
+            ),
+            (dict)
+        );
+
+
     // Constructors
 
-        //- Construct from the block definition
-        block(const blockDescriptor&);
+        //- Construct from dictionary
+        extrudeModel(const word& modelType, const dictionary&);
 
-        //- Clone
-        autoPtr<block> clone() const
-        {
-            notImplemented("block::clone()");
-            return autoPtr<block>(NULL);
-        }
+
+    // Selectors
+
+        //- Select null constructed
+        static autoPtr<extrudeModel> New(const dictionary&);
+
+
+    //- Destructor
+    virtual ~extrudeModel();
 
 
     // Member Functions
 
         // Access
 
-            const blockDescriptor& blockDef() const;
-            const pointField& points() const;
-            const labelListList& cells() const;
-            const labelListListList& boundaryPatches() const;
+            label nLayers() const;
 
 
-    // Ostream Operator
+    // Member Operators
 
-        friend Ostream& operator<<(Ostream&, const block&);
+        virtual point operator()
+        (
+            const point& surfacePoint,
+            const vector& surfaceNormal,
+            const label layer
+        ) const = 0;
 };
 
 
-inline Istream& operator>>(Istream& is, block*)
-{
-    notImplemented("Istream& operator>>(Istream& is, block*)");
-    return is;
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/mesh/extrudeModel/extrudeModel/newExtrudeModel.C b/src/mesh/extrudeModel/extrudeModel/newExtrudeModel.C
new file mode 100644
index 000000000..6113c7b5c
--- /dev/null
+++ b/src/mesh/extrudeModel/extrudeModel/newExtrudeModel.C
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "extrudeModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::extrudeModel> Foam::extrudeModel::New
+(
+    const dictionary& dict
+)
+{
+    word extrudeModelType(dict.lookup("extrudeModel"));
+
+    Info<< "Selecting extrudeModel " << extrudeModelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(extrudeModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn("extrudeModel::New(const dictionary&)")
+            << "Unknown extrudeModelType type "
+            << extrudeModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid extrudeModel types are :" << nl
+            << dictionaryConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<extrudeModel>(cstrIter()(dict));
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/mesh/extrudeModel/linearNormal/linearNormal.C b/src/mesh/extrudeModel/linearNormal/linearNormal.C
new file mode 100644
index 000000000..8d7205fbb
--- /dev/null
+++ b/src/mesh/extrudeModel/linearNormal/linearNormal.C
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "linearNormal.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace extrudeModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(linearNormal, 0);
+
+addToRunTimeSelectionTable(extrudeModel, linearNormal, dictionary);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+linearNormal::linearNormal(const dictionary& dict)
+:
+    extrudeModel(typeName, dict),
+    thickness_(readScalar(coeffDict_.lookup("thickness")))
+{
+    if (thickness_ <= SMALL)
+    {
+        FatalErrorIn("linearNormal(const dictionary&)")
+            << "thickness should be positive : " << thickness_
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+linearNormal::~linearNormal()
+{}
+
+
+// * * * * * * * * * * * * * * * * Operators * * * * * * * * * * * * * * * * //
+
+point linearNormal::operator()
+(
+    const point& surfacePoint,
+    const vector& surfaceNormal,
+    const label layer
+) const
+{
+    scalar d = thickness_*layer/nLayers_;
+    return surfacePoint + d*surfaceNormal;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// ************************************************************************* //
+
diff --git a/src/mesh/extrudeModel/linearNormal/linearNormal.H b/src/mesh/extrudeModel/linearNormal/linearNormal.H
new file mode 100644
index 000000000..5c886c2dc
--- /dev/null
+++ b/src/mesh/extrudeModel/linearNormal/linearNormal.H
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::extrudeModels::linearNormal
+
+Description
+    Extrudes by transforming points normal to the surface by a given distance
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef linearNormal_H
+#define linearNormal_H
+
+#include "point.H"
+#include "extrudeModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace extrudeModels
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class linearNormal Declaration
+\*---------------------------------------------------------------------------*/
+
+class linearNormal
+:
+    public extrudeModel
+{
+    // Private data
+
+        //- layer thickness
+        scalar thickness_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("linearNormal");
+
+    // Constructors
+
+        //- Construct from components
+        linearNormal(const dictionary& dict);
+
+
+    //- Destructor
+    ~linearNormal();
+
+
+    // Member Operators
+
+        point operator()
+        (
+            const point& surfacePoint,
+            const vector& surfaceNormal,
+            const label layer
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/mesh/extrudeModel/linearRadial/linearRadial.C b/src/mesh/extrudeModel/linearRadial/linearRadial.C
new file mode 100644
index 000000000..85b31a8b2
--- /dev/null
+++ b/src/mesh/extrudeModel/linearRadial/linearRadial.C
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "linearRadial.H"
+#include "addToRunTimeSelectionTable.H"
+
+namespace Foam
+{
+namespace extrudeModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(linearRadial, 0);
+
+addToRunTimeSelectionTable(extrudeModel, linearRadial, dictionary);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+linearRadial::linearRadial(const dictionary& dict)
+:
+    extrudeModel(typeName, dict),
+    R_(readScalar(coeffDict_.lookup("R")))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+linearRadial::~linearRadial()
+{}
+
+
+// * * * * * * * * * * * * * * * * Operators * * * * * * * * * * * * * * * * //
+
+point linearRadial::operator()
+(
+    const point& surfacePoint,
+    const vector& surfaceNormal,
+    const label layer
+) const
+{
+    // radius of the surface
+    scalar rs = mag(surfacePoint);
+    vector rsHat = surfacePoint/rs;
+
+    scalar delta = (R_ - rs)/nLayers_;
+    scalar r = rs + layer*delta;
+    return r*rsHat;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// ************************************************************************* //
+
diff --git a/src/mesh/extrudeModel/linearRadial/linearRadial.H b/src/mesh/extrudeModel/linearRadial/linearRadial.H
new file mode 100644
index 000000000..09af929ee
--- /dev/null
+++ b/src/mesh/extrudeModel/linearRadial/linearRadial.H
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::extrudeModels::linearRadial
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef linearRadial_H
+#define linearRadial_H
+
+#include "extrudeModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace extrudeModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class linearRadial Declaration
+\*---------------------------------------------------------------------------*/
+
+class linearRadial
+:
+    public extrudeModel
+{
+    // Private data
+
+        scalar R_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("linearRadial");
+
+    // Constructors
+
+        //- Construct from components
+        linearRadial(const dictionary& dict);
+
+
+    //- Destructor
+    ~linearRadial();
+
+
+    // Member Operators
+
+        point operator()
+        (
+            const point& surfacePoint,
+            const vector& surfaceNormal,
+            const label layer
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
new file mode 100644
index 000000000..5a368a032
--- /dev/null
+++ b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "sigmaRadial.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace extrudeModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(sigmaRadial, 0);
+
+addToRunTimeSelectionTable(extrudeModel, sigmaRadial, dictionary);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+sigmaRadial::sigmaRadial(const dictionary& dict)
+:
+    extrudeModel(typeName, dict),
+    RTbyg_(readScalar(coeffDict_.lookup("RTbyg"))),
+    pRef_(readScalar(coeffDict_.lookup("pRef"))),
+    pStrat_(readScalar(coeffDict_.lookup("pStrat")))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+sigmaRadial::~sigmaRadial()
+{}
+
+
+// * * * * * * * * * * * * * * * * Operators * * * * * * * * * * * * * * * * //
+
+point sigmaRadial::operator()
+(
+    const point& surfacePoint,
+    const vector& surfaceNormal,
+    const label layer
+) const
+{
+    // radius of the surface
+    scalar rs = mag(surfacePoint);
+    vector rsHat = surfacePoint/rs;
+
+    scalar p = pRef_ - layer*(pRef_ - pStrat_)/nLayers_;
+    scalar r = rs - RTbyg_*log(p/pRef_);
+
+    return r*rsHat;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// ************************************************************************* //
+
diff --git a/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.H b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.H
new file mode 100644
index 000000000..fbb5e205b
--- /dev/null
+++ b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.H
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::extrudeModels::sigmaRadial
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef sigmaRadial_H
+#define sigmaRadial_H
+
+#include "extrudeModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace extrudeModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class sigmaRadial Declaration
+\*---------------------------------------------------------------------------*/
+
+class sigmaRadial
+:
+    public extrudeModel
+{
+    // Private data
+
+        scalar RTbyg_;
+        scalar pRef_;
+        scalar pStrat_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("sigmaRadial");
+
+    // Constructors
+
+        //- Construct from components
+        sigmaRadial(const dictionary& dict);
+
+
+    //-Destructor
+    ~sigmaRadial();
+
+
+    // Member Operators
+
+        point operator()
+        (
+            const point& surfacePoint,
+            const vector& surfaceNormal,
+            const label layer
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/mesh/extrudeModel/wedge/wedge.C b/src/mesh/extrudeModel/wedge/wedge.C
new file mode 100644
index 000000000..3efa46b5c
--- /dev/null
+++ b/src/mesh/extrudeModel/wedge/wedge.C
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     |
+    \\  /    A nd           | For copyright notice see file Copyright
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "wedge.H"
+#include "addToRunTimeSelectionTable.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace extrudeModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(wedge, 0);
+
+addToRunTimeSelectionTable(extrudeModel, wedge, dictionary);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+wedge::wedge(const dictionary& dict)
+:
+    extrudeModel(typeName, dict),
+    axisPt_(coeffDict_.lookup("axisPt")),
+    axis_(coeffDict_.lookup("axis")),
+    angle_
+    (
+        readScalar(coeffDict_.lookup("angle"))
+       *mathematicalConstant::pi/180.0
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+wedge::~wedge()
+{}
+
+
+// * * * * * * * * * * * * * * * * Operators * * * * * * * * * * * * * * * * //
+
+point wedge::operator()
+(
+    const point& surfacePoint,
+    const vector& surfaceNormal,
+    const label layer
+) const
+{
+    scalar sliceAngle;
+    // For the case of a single layer extrusion assume a
+    // symmetric wedge about the reference plane is required
+    if (nLayers_ == 1)
+    {
+        if (layer == 0)
+        {
+            sliceAngle = -angle_/2.0;
+        }
+        else
+        {
+            sliceAngle = angle_/2.0;
+        }
+    }
+    else
+    {
+        //sliceAngle = angle_*(layer + 1)/nLayers_;
+        sliceAngle = angle_*layer/nLayers_;
+    }
+
+    // Find projection onto axis (or rather decompose surfacePoint
+    // into vector along edge (proj), vector normal to edge in plane
+    // of surface point and surface normal.
+    point d = surfacePoint - axisPt_;
+
+    d -= (axis_ & d)*axis_;
+
+    scalar dMag = mag(d);
+
+    point edgePt = surfacePoint - d;
+
+    // Rotate point around sliceAngle.
+    point rotatedPoint = edgePt;
+
+    if (dMag > VSMALL)
+    {
+        vector n = (d/dMag) ^ axis_;
+
+        rotatedPoint +=
+          + cos(sliceAngle)*d
+          - sin(sliceAngle)*mag(d)*n; // Use either n or surfaceNormal
+    }
+
+    return rotatedPoint;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polySplineEdge.H b/src/mesh/extrudeModel/wedge/wedge.H
similarity index 56%
rename from applications/utilities/mesh/generation/blockMesh/curvedEdges/polySplineEdge.H
rename to src/mesh/extrudeModel/wedge/wedge.H
index ec5a511de..b4defae7c 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/polySplineEdge.H
+++ b/src/mesh/extrudeModel/wedge/wedge.H
@@ -22,96 +22,82 @@ License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::polySplineEdge
+    Foam::extrudeModels::wedge
 
 Description
-    polySplineEdge class : representation of a spline via a polyLine
-
-SourceFiles
-    polySplineEdge.C
+    Extrudes by rotating a surface around an axis
+    - extrusion is opposite the surface/patch normal so inwards the source
+      mesh
+    - axis direction has to be consistent with this.
+    - use -mergeFaces option if doing full 360 and want to merge front and back
+    - note direction of axis. This should be consistent with rotating against
+      the patch normal direction. If you get it wrong you'll see all cells
+      with extreme aspect ratio and internal faces wrong way around in
+      checkMesh
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef polySplineEdge_H
-#define polySplineEdge_H
+#ifndef wedge_H
+#define wedge_H
 
-#include "curvedEdge.H"
-#include "polyLine.H"
+#include "extrudeModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace extrudeModels
+{
 
 /*---------------------------------------------------------------------------*\
-                           Class polySplineEdge Declaration
+                         Class wedge Declaration
 \*---------------------------------------------------------------------------*/
 
-class polySplineEdge
+class wedge
 :
-    public curvedEdge,
-    public polyLine
+    public extrudeModel
 {
     // Private data
 
-        pointField otherKnots_;
+        //- Point on axis
+        const point axisPt_;
 
+        //- Normalized direction of axis
+        const vector axis_;
 
-    // Private member functions
-
-        pointField intervening
-        (
-            const pointField& otherknots,
-             const label nbetweenKnots,
-            const vector&, const vector&
-        );
-
-        label nsize(const label otherknotsSize, const label nbetweenKnots)
-        {
-            return otherknotsSize*(1 + nbetweenKnots) + nbetweenKnots + 2;
-        }
+        //- Overall angle (radians)
+        const scalar angle_;
 
 
 public:
 
     //- Runtime type information
-    TypeName("polySpline");
-
+    TypeName("wedge");
 
     // Constructors
 
         //- Construct from components
-        polySplineEdge
+        wedge(const dictionary& dict);
+
+
+    //- Destrcuctor
+    ~wedge();
+
+
+    // Member Operators
+
+        point operator()
         (
-            const pointField& ps,
-            const label start,
-            const label end,
-            const pointField& otherknots,
-            const label nInterKnots = 20
-        );
-
-        //- Construct from Istream setting pointsList
-        polySplineEdge(const pointField& points,Istream& is);
-
-
-    // Destructor
-
-        virtual ~polySplineEdge(){}
-
-
-    // Member Functions
-
-        //- Return the position of a point on the curve given by
-        //  the parameter 0 <= lambda <= 1
-        vector position(const scalar mu) const;
-
-        //- Return the length of the curve
-        scalar length() const;
+            const point& surfacePoint,
+            const vector& surfaceNormal,
+            const label layer
+        ) const;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace extrudeModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
index 87d543e44..10f72255e 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
@@ -37,23 +37,62 @@ edges
 (
 );
 
-patches
+boundary
 (
-    cyclic patch0
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
-    cyclic patch1
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-    )
-    cyclic patch2
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
+    patch0_half0
+    {
+        type cyclic;
+        neighbourPatch patch0_half1;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+    patch0_half1
+    {
+        type cyclic;
+        neighbourPatch patch0_half0;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+    patch1_half0
+    {
+        type cyclic;
+        neighbourPatch patch1_half1;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    patch1_half1
+    {
+        type cyclic;
+        neighbourPatch patch1_half0;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    patch2_half0
+    {
+        type cyclic;
+        neighbourPatch patch2_half1;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    patch2_half1
+    {
+        type cyclic;
+        neighbourPatch patch2_half0;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/PODSolver/1DPODdiffusion/constant/polyMesh/blockMeshDict b/tutorials/basic/PODSolver/1DPODdiffusion/constant/polyMesh/blockMeshDict
index 190efb1c9..ce37ee8eb 100644
--- a/tutorials/basic/PODSolver/1DPODdiffusion/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/PODSolver/1DPODdiffusion/constant/polyMesh/blockMeshDict
@@ -37,23 +37,37 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch left
-    (
-        (0 4 7 3)
-    )
-    patch right
-    (
-        (2 6 5 1)
-    )
-    empty frontAndBack
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    left
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    right
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/PODSolver/1DPODsin/constant/polyMesh/blockMeshDict b/tutorials/basic/PODSolver/1DPODsin/constant/polyMesh/blockMeshDict
index 190efb1c9..ce37ee8eb 100644
--- a/tutorials/basic/PODSolver/1DPODsin/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/PODSolver/1DPODsin/constant/polyMesh/blockMeshDict
@@ -37,23 +37,37 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch left
-    (
-        (0 4 7 3)
-    )
-    patch right
-    (
-        (2 6 5 1)
-    )
-    empty frontAndBack
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    left
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    right
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/Allrun b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/Allrun
index 6e9b80a06..cbbb576d8 100755
--- a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/Allrun
+++ b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/Allrun
@@ -18,53 +18,6 @@ echo "$caseName: Creating the file blockMeshDict using m4"
 echo "$caseName: Running blockMesh"
 runApplicationAndReportOnError blockMesh
 
-echo "$caseName: Updating the GGI and mixingPlane interfaces parameters"
-
-# Let's see if pyFoamChangeMixingPlaneBoundary.py is available
-command -v pyFoamChangeMixingPlaneBoundary.py >/dev/null
-if [ $? -eq 0 ];
-then
-    echo "Using pyFoamChangeMixingPlaneBoundary.py"
-    pyFoamChangeMixingPlaneBoundary.py . B_UPSTREAM   \
-	--shadowPatch                    B_DOWNSTREAM \
-	--zone                           B_UPSTREAMZone  \
-	--ribbonPatchDiscretisation      bothPatches  \
-	--ribbonPatchStackAxis           R            \
-	--ribbonPatchSweepAxis           Theta        \
-	--coordinateSystemType           cylindrical  \
-	--coordinateSystemOrigin         "(0 0 0)"    \
-	--coordinateSystemE1             "(1 0 0)"    \
-	--coordinateSystemE3             "(0 0 1)"    \
-
-    pyFoamChangeMixingPlaneBoundary.py . B_DOWNSTREAM \
-	--shadowPatch                    B_UPSTREAM   \
-	--zone                           B_DOWNSTREAMZone  \
-	--ribbonPatchDiscretisation      bothPatches  \
-	--ribbonPatchStackAxis           R            \
-	--ribbonPatchSweepAxis           Theta        \
-	--coordinateSystemType           cylindrical  \
-	--coordinateSystemOrigin         "(0 0 0)"    \
-	--coordinateSystemE1             "(1 0 0)"    \
-	--coordinateSystemE3             "(0 0 1)"    \
-
-    echo "Using pyFoamChangeGGIBoundary.py"
-    pyFoamChangeGGIBoundary.py . sideWallA_BB_cyclic1   \
-	--shadowPatch            sideWallA_BB_cyclic2   \
-	--rotationAxis           "(0 0 1)"              \
-	--rotationAngle          60                     \
-	--zone                   sideWallA_BB_cyclic1Zone
-
-    pyFoamChangeGGIBoundary.py . sideWallA_BB_cyclic2   \
-	--shadowPatch            sideWallA_BB_cyclic1   \
-	--rotationAxis           "(0 0 1)"              \
-	--rotationAngle          -60                    \
-	--zone                   sideWallA_BB_cyclic2Zone
-
-else
-    echo "pyFoamChangeMixingPlaneBoundary.py is missing. Using the file constant/polyMesh/boundary.preconfigured"
-    cp constant/polyMesh/boundary.preconfigured constant/polyMesh/boundary
-fi
-
 echo "$caseName: Creating the starting time directory"
 cp -r 0_orig 0
 
diff --git a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/constant/polyMesh/blockMeshDict.m4 b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/constant/polyMesh/blockMeshDict.m4
index 0bdb7cd40..29eba1b78 100644
--- a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/constant/polyMesh/blockMeshDict.m4
@@ -268,74 +268,168 @@ edges
 
 );
 
-// Defining patches:
-patches
+// Defining boundary:
+boundary
 (
-    patch inlet
-    (
-       (A0 A2 A1 A0)
-    )
-    patch outlet
-    (
-       (F0 F1 F2 F0)
-       (F0 F2 F3 F0)
-       (F0 F3 F4 F0)
-       (F0 F4 F1 F0)
-    )
-    wall wallProlongation
-    (
-      (E1 E2 F2 F1)
-      (E2 E3 F3 F2)
-      (E3 E4 F4 F3)
-      (E4 E1 F1 F4)
-    )
-    wall wallDiffuser
-    (
-      (D1 D2 E2 E1)
-      (D2 D3 E3 E2)
-      (D3 D4 E4 E3)
-      (D4 D1 E1 E4)
-    )
-    wall statSwirlWallB_C
-    (
-      (B1 B2 C2 C1)
-      (B2 B3 C3 C2)
-      (B3 B4 C4 C3)
-      (B4 B1 C1 C4)
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (A0 A2 A1 A0)
+        );
+    }
+    
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (F0 F1 F2 F0)
+            (F0 F2 F3 F0)
+            (F0 F3 F4 F0)
+            (F0 F4 F1 F0)
+        );
+    }
+    
+    wallProlongation
+    {
+        type wall;
+        faces
+        (
+            (E1 E2 F2 F1)
+            (E2 E3 F3 F2)
+            (E3 E4 F4 F3)
+            (E4 E1 F1 F4)
+        );
+    }
+    
+    wallDiffuser
+    {
+        type wall;
+        faces
+        (
+            (D1 D2 E2 E1)
+            (D2 D3 E3 E2)
+            (D3 D4 E4 E3)
+            (D4 D1 E1 E4)
+        );
+    }
+    
+    statSwirlWallB_C
+    {
+        type wall;
+        faces
+        (
+            (B1 B2 C2 C1)
+            (B2 B3 C3 C2)
+            (B3 B4 C4 C3)
+            (B4 B1 C1 C4)
+            
+            (C1 C2 D2 D1)
+            (C2 C3 D3 D2)
+            (C3 C4 D4 D3)
+            (C4 C1 D1 D4)
+        );
+    }
+ 
+    rotSwirlWallA_BB
+    {
+        type wall;
+        faces
+        (
+            (A1 A2 BB2 BB1)
+        );
+    }
 
-      (C1 C2 D2 D1)
-      (C2 C3 D3 D2)
-      (C3 C4 D4 D3)
-      (C4 C1 D1 D4)
-    )
-   wall rotSwirlWallA_BB
-   (
-      (A1 A2 BB2 BB1)
-   )
+    sideWallA_BB_cyclic1
+    {
+        type cyclicGgi;
 
-    cyclicGgi sideWallA_BB_cyclic1
-    (
-      (A0 BB0 BB1 A1)
-    )
+        shadowPatch sideWallA_BB_cyclic2;
+        zone sideWallA_BB_cyclic1Zone;
+        bridgeOverlap off;
+        rotationAxis (0 0 1);
+        rotationAngle 60;
+        separationOffset (0 0 0);
 
-    cyclicGgi sideWallA_BB_cyclic2
-    (
-      (BB0 A0 A2 BB2)
-    )
+        faces
+        (
+            (A0 BB0 BB1 A1)
+        );
+    }
 
-    mixingPlane B_UPSTREAM   // BB : master
-    (
-       (BB0 BB2 BB1 BB0)
-    )
+    sideWallA_BB_cyclic2
+    {
+        type cyclicGgi;
 
-    mixingPlane B_DOWNSTREAM  // B : master
-    (
-       (B0 B2 B1 B0)
-       (B0 B1 B4 B0)
-       (B0 B4 B3 B0)
-       (B0 B3 B2 B0)
-    )
+        shadowPatch sideWallA_BB_cyclic1;
+        zone sideWallA_BB_cyclic2Zone;
+        bridgeOverlap off;
+        rotationAxis (0 0 1);
+        rotationAngle -60;
+        separationOffset (0 0 0);
 
+        faces
+        (
+            (BB0 A0 A2 BB2)
+        );
+    }
+
+    B_UPSTREAM   // BB : master
+    {
+        type mixingPlane;
+        shadowPatch B_DOWNSTREAM;
+        zone B_UPSTREAMZone;
+        ribbonPatch
+        {
+        	discretisation bothPatches;
+        	stackAxis R;
+        	sweepAxis Theta;
+        }
+        
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0);
+            axis (0 0 1);
+            direction (1 0 0);
+        }
+
+        faces
+        (
+            (BB0 BB2 BB1 BB0)
+        );
+    }
+
+    B_DOWNSTREAM  // B : master
+    {
+        type mixingPlane;
+        shadowPatch B_UPSTREAM;
+        zone B_DOWNSTREAMZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis R;
+            sweepAxis Theta;
+        }
+    
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0);
+            axis (0 0 1);
+            direction (1 0 0);
+        }
+
+        faces
+        (
+            (B0 B2 B1 B0)
+            (B0 B1 B4 B0)
+            (B0 B4 B3 B0)
+            (B0 B3 B2 B0)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/Allrun b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/Allrun
index e25c0d885..1e571ce8f 100755
--- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/Allrun
+++ b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/Allrun
@@ -15,38 +15,6 @@ export caseName=`basename $PWD`
 echo "$caseName: Running blockMesh"
 runApplicationAndReportOnError blockMesh
 
-echo "$caseName: Updating the boundary file"
-# Let's see if pyFoamChangeMixingPlaneBoundary.py is available
-command -v pyFoamChangeMixingPlaneBoundary.py >/dev/null
-if [ $? -eq 0 ];
-then
-    echo "Using pyFoamChangeMixingPlaneBoundary.py"
-    pyFoamChangeMixingPlaneBoundary.py . mixpLeftOut      \
-    --shadowPatch                    mixpRightIn      \
-    --zone                           mixpLeftOutZone  \
-    --ribbonPatchDiscretisation      bothPatches      \
-    --ribbonPatchStackAxis           Y                \
-    --ribbonPatchSweepAxis           Z                \
-    --coordinateSystemType           coordinateSystem \
-    --coordinateSystemOrigin         "(0 0 0.005)"    \
-    --coordinateSystemE1             "(1 0 0)"        \
-    --coordinateSystemE3             "(0 0 1)"
-
-    pyFoamChangeMixingPlaneBoundary.py . mixpRightIn      \
-    --shadowPatch                    mixpLeftOut      \
-    --zone                           mixpRightInZone  \
-    --ribbonPatchDiscretisation      bothPatches      \
-    --ribbonPatchStackAxis           Y                \
-    --ribbonPatchSweepAxis           Z                \
-    --coordinateSystemType           coordinateSystem \
-    --coordinateSystemOrigin         "(0 0 0.005)"    \
-    --coordinateSystemE1             "(1 0 0)"        \
-    --coordinateSystemE3             "(0 0 1)"
-else
-    echo "pyFoamChangeMixingPlaneBoundary.py is missing. Using the file constant/polyMesh/boundary.preconfigured"
-    cp constant/polyMesh/boundary.preconfigured constant/polyMesh/boundary
-fi
-
 echo "$caseName: Creating zones for the mixingPlane"
 runApplicationAndReportOnError setSet -batch setBatch
 runApplicationAndReportOnError setsToZones -noFlipMap
diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/constant/polyMesh/blockMeshDict b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/constant/polyMesh/blockMeshDict
index a083d6f92..e78249c09 100644
--- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/constant/polyMesh/blockMeshDict
@@ -47,41 +47,111 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (3 7 6 2)
-        (11 15 14 10)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-        (9 13 12 8)
-    )
-    patch leftIn
-    (
-        (0 4 7 3)
-    )
-    mixingPlane mixpLeftOut
-    (
-        (2 6 5 1)
-    )
-    mixingPlane mixpRightIn
-    (
-        (8 12 15 11)
-    )
-    patch rightOut
-    (
-        (10 14 13 9)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-        (8 11 10 9)
-        (12 13 14 15)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+           (3 7 6 2)
+           (11 15 14 10)
+        );
+    }
+
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+            (9 13 12 8)
+        );
+    }
+
+    leftIn
+    {
+        type patch;
+        faces
+        (
+           (0 4 7 3)
+        );
+    }
+
+    mixpLeftOut
+    {
+        type mixingPlane;
+
+        shadowPatch mixpRightIn;
+        zone mixpLeftOutZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
+
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0.005);
+            axis (1 0 0);
+            direction (0 0 1);
+        }
+
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    mixpRightIn
+    {
+        type mixingPlane;
+
+        shadowPatch mixpLeftOut;
+        zone mixpRightInZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
+
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0.005);
+            axis (1 0 0);
+            direction (0 0 1);
+        }
+
+        faces
+        (
+           (8 12 15 11)
+        );
+    }
+
+    rightOut
+    {
+        type patch;
+        faces
+        (
+            (10 14 13 9)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+            (8 11 10 9)
+            (12 13 14 15)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/constant/polyMesh/boundary.preconfigured b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/constant/polyMesh/boundary.preconfigured
deleted file mode 100644
index b87b25da5..000000000
--- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/constant/polyMesh/boundary.preconfigured
+++ /dev/null
@@ -1,84 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-7
-(
-    top
-    {
-        type            wall;
-        nFaces          20;
-        startFace       360;
-    }
-    bottom
-    {
-        type            wall;
-        nFaces          20;
-        startFace       380;
-    }
-    leftIn
-    {
-        type            patch;
-        nFaces          10;
-        startFace       400;
-    }
-    mixpLeftOut
-    {
-        type            mixingPlane;
-        nFaces          10;
-        startFace       410;
-        shadowPatch     mixpRightIn;
-        orientation dirY_spanZ;
-        assembly both;
-        coordinateSystem
-        {
-            type coordinateSystem;
-            origin (0 0 0.005);
-            axis (0 0 1);
-            direction (1 0 0);
-        }
-    }
-    mixpRightIn
-    {
-        type            mixingPlane;
-        nFaces          10;
-        startFace       420;
-        shadowPatch     mixpLeftOut;
-        orientation dirY_spanZ;
-        assembly both;
-        coordinateSystem
-        {
-            type coordinateSystem;
-            origin (0 0 0.005);
-            axis (0 0 1);
-            direction (1 0 0);
-        }
-    }
-    rightOut
-    {
-        type            patch;
-        nFaces          10;
-        startFace       430;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          400;
-        startFace       440;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/Allrun b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/Allrun
index e25c0d885..1e571ce8f 100755
--- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/Allrun
+++ b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/Allrun
@@ -15,38 +15,6 @@ export caseName=`basename $PWD`
 echo "$caseName: Running blockMesh"
 runApplicationAndReportOnError blockMesh
 
-echo "$caseName: Updating the boundary file"
-# Let's see if pyFoamChangeMixingPlaneBoundary.py is available
-command -v pyFoamChangeMixingPlaneBoundary.py >/dev/null
-if [ $? -eq 0 ];
-then
-    echo "Using pyFoamChangeMixingPlaneBoundary.py"
-    pyFoamChangeMixingPlaneBoundary.py . mixpLeftOut      \
-    --shadowPatch                    mixpRightIn      \
-    --zone                           mixpLeftOutZone  \
-    --ribbonPatchDiscretisation      bothPatches      \
-    --ribbonPatchStackAxis           Y                \
-    --ribbonPatchSweepAxis           Z                \
-    --coordinateSystemType           coordinateSystem \
-    --coordinateSystemOrigin         "(0 0 0.005)"    \
-    --coordinateSystemE1             "(1 0 0)"        \
-    --coordinateSystemE3             "(0 0 1)"
-
-    pyFoamChangeMixingPlaneBoundary.py . mixpRightIn      \
-    --shadowPatch                    mixpLeftOut      \
-    --zone                           mixpRightInZone  \
-    --ribbonPatchDiscretisation      bothPatches      \
-    --ribbonPatchStackAxis           Y                \
-    --ribbonPatchSweepAxis           Z                \
-    --coordinateSystemType           coordinateSystem \
-    --coordinateSystemOrigin         "(0 0 0.005)"    \
-    --coordinateSystemE1             "(1 0 0)"        \
-    --coordinateSystemE3             "(0 0 1)"
-else
-    echo "pyFoamChangeMixingPlaneBoundary.py is missing. Using the file constant/polyMesh/boundary.preconfigured"
-    cp constant/polyMesh/boundary.preconfigured constant/polyMesh/boundary
-fi
-
 echo "$caseName: Creating zones for the mixingPlane"
 runApplicationAndReportOnError setSet -batch setBatch
 runApplicationAndReportOnError setsToZones -noFlipMap
diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/constant/polyMesh/blockMeshDict b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/constant/polyMesh/blockMeshDict
index e6724e582..737f0bf17 100644
--- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/constant/polyMesh/blockMeshDict
@@ -47,41 +47,111 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (3 7 6 2)
-        (11 15 14 10)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-        (9 13 12 8)
-    )
-    patch leftIn
-    (
-        (0 4 7 3)
-    )
-    mixingPlane mixpLeftOut
-    (
-        (2 6 5 1)
-    )
-    mixingPlane mixpRightIn
-    (
-        (8 12 15 11)
-    )
-    patch rightOut
-    (
-        (10 14 13 9)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-        (8 11 10 9)
-        (12 13 14 15)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+           (3 7 6 2)
+           (11 15 14 10)
+        );
+    }
+
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+            (9 13 12 8)
+        );
+    }
+
+    leftIn
+    {
+        type patch;
+        faces
+        (
+           (0 4 7 3)
+        );
+    }
+
+    mixpLeftOut
+    {
+        type mixingPlane;
+
+        shadowPatch mixpRightIn;
+        zone mixpLeftOutZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
+
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0.005);
+            axis (1 0 0);
+            direction (0 0 1);
+        }
+
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    mixpRightIn
+    {
+        type mixingPlane;
+
+        shadowPatch mixpLeftOut;
+        zone mixpRightInZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
+
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0.005);
+            axis (1 0 0);
+            direction (0 0 1);
+        }
+
+        faces
+        (
+           (8 12 15 11)
+        );
+    }
+
+    rightOut
+    {
+        type patch;
+        faces
+        (
+            (10 14 13 9)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+            (8 11 10 9)
+            (12 13 14 15)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/constant/polyMesh/boundary.preconfigured b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/constant/polyMesh/boundary.preconfigured
deleted file mode 100644
index e97890e45..000000000
--- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/constant/polyMesh/boundary.preconfigured
+++ /dev/null
@@ -1,84 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-7
-(
-    top
-    {
-        type            wall;
-        nFaces          20;
-        startFace       227;
-    }
-    bottom
-    {
-        type            wall;
-        nFaces          20;
-        startFace       247;
-    }
-    leftIn
-    {
-        type            patch;
-        nFaces          10;
-        startFace       267;
-    }
-    mixpLeftOut
-    {
-        type            mixingPlane;
-        nFaces          10;
-        startFace       277;
-        shadowPatch     mixpRightIn;
-        orientation dirY_spanZ;
-        assembly both;
-        coordinateSystem
-        {
-            type coordinateSystem;
-            origin (0 0 0.005);
-            axis (0 0 1);
-            direction (1 0 0);
-        }
-    }
-    mixpRightIn
-    {
-        type            mixingPlane;
-        nFaces          3;
-        startFace       287;
-        shadowPatch     mixpLeftOut;
-        orientation dirY_spanZ;
-        assembly both;
-        coordinateSystem
-        {
-            type coordinateSystem;
-            origin (0 0 0.005);
-            axis (0 0 1);
-            direction (1 0 0);
-        }
-    }
-    rightOut
-    {
-        type            patch;
-        nFaces          3;
-        startFace       290;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          260;
-        startFace       293;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
index 12bd58d79..511e78bdd 100644
--- a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
@@ -92,39 +92,59 @@ edges
     arc 34 28 (-0.34202 0.939693 0.5)
 );
 
-patches
+boundary
 (
-    symmetryPlane down
-    (
-        (0 1 20 19)
-        (1 2 21 20)
-        (12 11 30 31)
-        (13 12 31 32)
-    )
-    patch right
-    (
-        (2 3 22 21)
-        (3 6 25 22)
-    )
-    symmetryPlane up
-    (
-        (7 8 27 26)
-        (6 7 26 25)
-        (8 18 37 27)
-        (18 17 36 37)
-    )
-    patch left
-    (
-        (14 13 32 33)
-        (17 14 33 36)
-    )
-    symmetryPlane cylinder
-    (
-        (10 5 24 29)
-        (5 0 19 24)
-        (16 10 29 35)
-        (11 16 35 30)
-    )
+    down
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 20 19)
+            (1 2 21 20)
+            (12 11 30 31)
+            (13 12 31 32)
+        );
+    }
+    right
+    {
+        type patch;
+        faces
+        (
+            (2 3 22 21)
+            (3 6 25 22)
+        );
+    }
+    up
+    {
+        type symmetryPlane;
+        faces
+        (
+            (7 8 27 26)
+            (6 7 26 25)
+            (8 18 37 27)
+            (18 17 36 37)
+        );
+    }
+    left
+    {
+        type patch;
+        faces
+        (
+            (14 13 32 33)
+            (17 14 33 36)
+        );
+    }
+    cylinder
+    {
+        type symmetry;
+        faces
+        (
+            (10 5 24 29)
+            (5 0 19 24)
+            (16 10 29 35)
+            (11 16 35 30)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
index 4987f5c8b..f320149c9 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
@@ -85,65 +85,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
index 4987f5c8b..f320149c9 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
@@ -85,65 +85,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/basic/scalarTransportFoam/swirlTest/constant/polyMesh/blockMeshDict b/tutorials/basic/scalarTransportFoam/swirlTest/constant/polyMesh/blockMeshDict
index 99e5fe8e5..267e2387e 100644
--- a/tutorials/basic/scalarTransportFoam/swirlTest/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/scalarTransportFoam/swirlTest/constant/polyMesh/blockMeshDict
@@ -42,23 +42,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (4 10 11 5)
-    )
-    patch outlet
-    (
-        (3 9 10 4)
-    )
-    wall fixedWalls
-    (
-        (3 0 6 9)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 5 11 8)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (4 10 11 5)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 9 10 4)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (3 0 6 9)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 5 11 8)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
index 537fb333e..464d6eb7d 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
@@ -85,65 +85,89 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
deleted file mode 100644
index d9d52338f..000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       24170;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          57;
-        startFace       24200;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          223;
-        startFace       24257;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          250;
-        startFace       24480;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          24450;
-        startFace       24730;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
index b4ecd0c56..2beb25098 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
@@ -85,65 +85,89 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    cyclic frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+
+    frontAndBack
+    {
+        type cyclic;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
deleted file mode 100644
index 0f51de167..000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          600;
-        startFace       715675;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          1140;
-        startFace       716275;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          4460;
-        startFace       717415;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          5000;
-        startFace       721875;
-    }
-    frontAndBack
-    {
-        type            cyclic;
-        nFaces          24450;
-        startFace       726875;
-        featureCos      0.9;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
index 00d40649d..e85ebada4 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
@@ -37,29 +37,49 @@ edges
 (
 );
 
-patches
+boundary
 (
-    symmetryPlane left
-    (
-        (0 4 5 1)
-    )
-    symmetryPlane right
-    (
-        (2 3 7 6)
-    )
-    symmetryPlane top
-    (
-        (1 5 7 3)
-    )
-    symmetryPlane bottom
-    (
-        (0 2 6 4)
-    )
-    empty frontAndBack
-    (
-        (4 5 7 6)
-        (0 1 3 2)
-    )
+    left
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 4 5 1)
+        );
+    }
+    right
+    {
+        type symmetryPlane;
+        faces
+        (
+            (2 3 7 6)
+        );
+    }
+    top
+    {
+        type symmetryPlane;
+        faces
+        (
+            (1 5 7 3)
+        );
+    }
+    bottom
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 2 6 4)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (4 5 7 6)
+            (0 1 3 2)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary
deleted file mode 100644
index abbc0ed47..000000000
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    left
-    {
-        type            symmetryPlane;
-        nFaces          35;
-        startFace       4795;
-    }
-    right
-    {
-        type            symmetryPlane;
-        nFaces          35;
-        startFace       4830;
-    }
-    top
-    {
-        type            symmetryPlane;
-        nFaces          70;
-        startFace       4865;
-    }
-    bottom
-    {
-        type            symmetryPlane;
-        nFaces          70;
-        startFace       4935;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          4900;
-        startFace       5005;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
index 42214a767..1c58f7576 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
@@ -37,17 +37,21 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall walls
-    (
-        (2 6 5 1)
-        (0 4 7 3)
-        (0 1 5 4)
-        (4 5 6 7)
-        (7 6 2 3)
-        (3 2 1 0)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            (2 6 5 1)
+            (0 4 7 3)
+            (0 1 5 4)
+            (4 5 6 7)
+            (7 6 2 3)
+            (3 2 1 0)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
deleted file mode 100644
index 705f345b2..000000000
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
-    walls
-    {
-        type            wall;
-        nFaces          19762;
-        startFace       494419;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict
index 09cb3bd3e..589ef2594 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict
@@ -38,26 +38,42 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch base
-    (
-        (0 1 5 4)
-    )
-    patch outlet
-    (
-        (3 2 6 7)
-    )
-    patch sides
-    (
-        (1 5 6 2)
-        (0 4 7 3)
-    )
-    empty frontAndBack
-    (
-        (0 1 2 3)
-        (4 5 6 7)
-    )
+    base
+    {
+        type patch;
+        faces
+        (
+            (0 1 5 4)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 2 6 7)
+        );
+    }
+    sides
+    {
+        type patch;
+        faces
+        (
+            (1 5 6 2)
+            (0 4 7 3)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 1 2 3)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
deleted file mode 100644
index eec665204..000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    base
-    {
-        type            patch;
-        nFaces          134;
-        startFace       44700;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          150;
-        startFace       44834;
-    }
-    sides
-    {
-        type            patch;
-        nFaces          300;
-        startFace       44984;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          45000;
-        startFace       45284;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          16;
-        startFace       90284;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
index 20a42e82f..7833a677b 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
@@ -37,26 +37,42 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch fuel
-    (
-        (0 4 7 3)
-    )
-    patch air
-    (
-        (1 2 6 5)
-    )
-    patch outlet
-    (
-        (0 1 5 4)
-        (7 6 2 3)
-    )
-    empty frontAndBack
-    (
-        (4 5 6 7)
-        (0 3 2 1)
-    )
+    fuel
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    air
+    {
+        type patch;
+        faces
+        (
+            (1 2 6 5)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (0 1 5 4)
+            (7 6 2 3)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (4 5 6 7)
+            (0 3 2 1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/boundary b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/boundary
deleted file mode 100644
index 6f2d1c0bb..000000000
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    fuel
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7860;
-    }
-    air
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7900;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          200;
-        startFace       7940;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          8000;
-        startFace       8140;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
index 41c261f59..9dbef7619 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
@@ -40,40 +40,64 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 2 6 0)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 2 6 0)
+        );
+    }
 
-   patch outlet
-    (
-        (1 3 7 1)
-        (3 5 9 7)
-   )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (1 3 7 1)
+            (3 5 9 7)
+        );
+    }
 
-    patch freestreamInlet
-    (
-        (2 4 8 6)
-    )
+    freestreamInlet
+    {
+        type patch;
+        faces
+        (
+            (2 4 8 6)
+        );
+    }
 
-    patch freestream
-    (
-        (4 8 9 5)
-    )
+    freestream
+    {
+        type patch;
+        faces
+        (
+            (4 8 9 5)
+        );
+    }
 
-    wedge wedge1
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-    )
+    wedge1
+    {
+        type wedge;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+        );
+    }
 
-    wedge wedge2
-    (
-        (0 1 7 6)
-        (6 7 9 8)
-    )
+    wedge2
+    {
+        type wedge;
+        faces
+        (
+            (0 1 7 6)
+            (6 7 9 8)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
index 11bbd6ca4..9a39b7a4a 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
@@ -37,37 +37,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch cone
-    (
-        (1 5 4 0)
-    )
+    cone
+    {
+        type patch;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
 
-    patch outlet
-    (
-        (2 6 5 1)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
 
-    patch freestream
-    (
-        (3 7 6 2)
-    )
+    freestream
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
 
-    symmetryPlane centreLeft
-    (
-        (0 4 7 3)
-    )
+    centreLeft
+    {
+        type symmetry;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
 
-    patch wedge1
-    (
-        (0 3 2 1)
-    )
+    wedge1
+    {
+        type patch;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
 
-    patch wedge2
-    (
-        (4 5 6 7)
-    )
+    wedge2
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
index 37717e48d..dadf41fa8 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
@@ -47,31 +47,51 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 8 10 2)
-        (2 10 13 5)
-    )
-    patch outlet
-    (
-        (4 7 15 12)
-    )
-    symmetryPlane bottom
-    (
-        (0 1 9 8)
-    )
-    symmetryPlane top
-    (
-        (5 13 14 6)
-        (6 14 15 7)
-    )
-    patch obstacle
-    (
-        (1 3 11 9)
-        (3 4 12 11)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 8 10 2)
+            (2 10 13 5)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (4 7 15 12)
+        );
+    }
+    bottom
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 9 8)
+        );
+    }
+    top
+    {
+        type symmetryPlane;
+        faces
+        (
+            (5 13 14 6)
+            (6 14 15 7)
+        );
+    }
+    obstacle
+    {
+        type patch;
+        faces
+        (
+            (1 3 11 9)
+            (3 4 12 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
index 96e0564e3..ebe3b3c19 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
@@ -37,29 +37,49 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (3 7 6 2)
-    )
-    wall inlet
-    (
-        (0 4 7 3)
-    )
-    wall outlet
-    (
-        (2 6 5 1)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    bottom
+    {
+        type symmetryPlane;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
index 4e7385ca2..92298fc64 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
@@ -37,20 +37,28 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch sides
-    (
-        (1 2 6 5)
-        (0 4 7 3)
-    )
-    empty empty
-    (
-        (0 1 5 4)
-        (5 6 7 4)
-        (3 7 6 2)
-        (0 3 2 1)
-    )
+    sides
+    {
+        type patch;
+        faces
+        (
+            (1 2 6 5)
+            (0 4 7 3)
+        );
+    }
+    empty
+    {
+        type empty;
+        faces
+        (
+            (0 1 5 4)
+            (5 6 7 4)
+            (3 7 6 2)
+            (0 3 2 1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
index b83880ed9..e1b3394c0 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
@@ -44,29 +44,49 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 6 9 3)
-    )
-    patch outlet
-    (
-        (2 5 11 8)
-    )
-    symmetryPlane bottom
-    (
-        (0 1 7 6)
-    )
-    symmetryPlane top
-    (
-        (3 9 10 4)
-        (4 10 11 5)
-    )
-    patch obstacle
-    (
-        (1 2 8 7)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 6 9 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 5 11 8)
+        );
+    }
+    bottom
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 7 6)
+        );
+    }
+    top
+    {
+        type symmetryPlane;
+        faces
+        (
+            (3 9 10 4)
+            (4 10 11 5)
+        );
+    }
+    obstacle
+    {
+        type patch;
+        faces
+        (
+            (1 2 8 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict
index 8c41fc57a..48eb9549a 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      ;
     class       dictionary;
     object      blockMeshDict;
 }
@@ -16,34 +16,34 @@ FoamFile
 // block definition for a porosity with an angled inlet/outlet
 // the porosity is not aligned with the main axes
 //
-
+                             
 convertToMeters 0.001;
 
 vertices
 (
     // inlet region
-    ( -150  0  -25 )  // pt 0 (in1b)
-    ( -150 35.35533906  -25 ) // pt 1 (in2b)
-    ( -150  0  25 )  // pt 2 (in1f)
-    ( -150 35.35533906  25 ) // pt 3 (in2f)
+    ( -150  0  -25 )  // pt 0 (in1b) 
+    ( -150 35.35533906  -25 ) // pt 1 (in2b) 
+    ( -150  0  25 )  // pt 2 (in1f) 
+    ( -150 35.35533906  25 ) // pt 3 (in2f) 
 
     // join inlet->outlet
-    (  0 0  -25 )    // pt 4 (join1b)
-    ( -35.35533906   35.35533906  -25 ) // pt 5 (join2b)
-    (  0 0  25 )    // pt 6 (join1f)
-    ( -35.35533906   35.35533906  25 ) // pt 7 (join2f)
+    (  0 0  -25 )    // pt 4 (join1b) 
+    ( -35.35533906   35.35533906  -25 ) // pt 5 (join2b) 
+    (  0 0  25 )    // pt 6 (join1f) 
+    ( -35.35533906   35.35533906  25 ) // pt 7 (join2f) 
 
     // porosity ends ->outlet
-    ( 70.71067812 70.71067812  -25 )  // pt 8 (poro1b)
-    ( 35.35533906 106.06601718  -25 )  // pt 9 (poro2b)
-    ( 70.71067812 70.71067812  25 )  // pt 10 (poro1f)
-    ( 35.35533906 106.06601718  25 )  // pt 11 (poro2f)
+    ( 70.71067812 70.71067812  -25 )  // pt 8 (poro1b) 
+    ( 35.35533906 106.06601718  -25 )  // pt 9 (poro2b) 
+    ( 70.71067812 70.71067812  25 )  // pt 10 (poro1f) 
+    ( 35.35533906 106.06601718  25 )  // pt 11 (poro2f) 
 
     // outlet
-    ( 141.42135624 141.42135624 -25 ) // pt 12 (out1b)
-    ( 106.06601718 176.7766953 -25 ) // pt 13 (out2b)
-    ( 141.42135624 141.42135624 25 ) // pt 14 (out1f)
-    ( 106.06601718 176.7766953 25 ) // pt 15 (out2f)
+    ( 141.42135624 141.42135624 -25 ) // pt 12 (out1b) 
+    ( 106.06601718 176.7766953 -25 ) // pt 13 (out2b) 
+    ( 141.42135624 141.42135624 25 ) // pt 14 (out1f) 
+    ( 106.06601718 176.7766953 25 ) // pt 15 (out2f) 
 );
 
 blocks
@@ -65,55 +65,79 @@ edges
 (
 );
 
-patches
+boundary
 (
     // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    (2 6 7 3)
-    // outlet block
-    (10 14 15 11)
-    )
+    front
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (2 6 7 3)
+            // outlet block
+            (10 14 15 11)
+        );
+    }
 
-    wall back
-    (
-    // inlet block
-    (1 5 4 0)
-    // outlet block
-    (9 13 12 8)
-    )
+    back
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (1 5 4 0)
+            // outlet block
+            (9 13 12 8)
+        );
+    }
 
-    wall wall
-    (
-    // inlet block
-    (2 0 4 6)
-    (7 5 1 3)
-    // outlet block
-    (10 8 12 14)
-    (15 13 9 11)
-    )
+    wall
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (2 0 4 6)
+            (7 5 1 3)
+            // outlet block
+            (10 8 12 14)
+            (15 13 9 11)
+        );
+    }
 
-    wall porosityWall
-    (
-    // porosity block
-    (6 10 11 7)
-    // porosity block
-    (5 9 8 4)
-    // porosity block
-    (6 4 8 10)
-    (11 9 5 7)
-    )
+    porosityWall
+    {
+        type wall;
+        faces
+        (
+            // porosity block
+            (6 10 11 7)
+            // porosity block
+            (5 9 8 4)
+            // porosity block
+            (6 4 8 10)
+            (11 9 5 7)
+        );
+    }
 
-    patch inlet
-    (
-    (3 1 0 2)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (3 1 0 2)
+        );
+    }
 
-    patch outlet
-    (
-    (15 13 12 14)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (15 13 12 14)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
index 846abc3f8..6f6c125f0 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
@@ -107,55 +107,79 @@ edges
 (
 );
 
-patches
+boundary
 (
     // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    frontQuad(in1, join1, join2, in2)
-    // outlet block
-    frontQuad(poro1, out1, out2, poro2)
-    )
+    front
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            frontQuad(in1, join1, join2, in2)
+            // outlet block
+            frontQuad(poro1, out1, out2, poro2)
+        );
+    }
 
-    wall back
-    (
-    // inlet block
-    backQuad(in1, join1, join2, in2)
-    // outlet block
-    backQuad(poro1, out1, out2, poro2)
-    )
+    back
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            backQuad(in1, join1, join2, in2)
+            // outlet block
+            backQuad(poro1, out1, out2, poro2)
+        );
+    }
 
-    wall wall
-    (
-    // inlet block
-    quad2D(in1, join1)
-    quad2D(join2, in2)
-    // outlet block
-    quad2D(poro1, out1)
-    quad2D(out2, poro2)
-    )
+    wall
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            quad2D(in1, join1)
+            quad2D(join2, in2)
+            // outlet block
+            quad2D(poro1, out1)
+            quad2D(out2, poro2)
+        );
+    }
 
-    wall porosityWall
-    (
-    // porosity block
-    frontQuad(join1, poro1, poro2, join2)
-    // porosity block
-    backQuad(join1, poro1, poro2, join2)
-    // porosity block
-    quad2D(join1, poro1)
-    quad2D(poro2, join2)
-    )
+    porosityWall
+    {
+        type wall;
+        faces
+        (
+            // porosity block
+            frontQuad(join1, poro1, poro2, join2)
+            // porosity block
+            backQuad(join1, poro1, poro2, join2)
+            // porosity block
+            quad2D(join1, poro1)
+            quad2D(poro2, join2)
+        );
+    }
 
-    patch inlet
-    (
-    quad2D(in2, in1)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            quad2D(in2, in1)
+        );
+    }
 
-    patch outlet
-    (
-    quad2D(out2, out1)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            quad2D(out2, out1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
deleted file mode 100644
index 4c71faeb2..000000000
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        nFaces          700;
-        startFace       64100;
-    }
-    wall
-    {
-        type            wall;
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
index 4987f5c8b..f320149c9 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
@@ -85,65 +85,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
index 0fee1e1e9..7a6a81c47 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
@@ -37,23 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (3 7 6 2)
-    )
-    wall fixedWalls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
index e89ba3778..ed8101dcd 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
@@ -8,155 +8,416 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      ;
     class       dictionary;
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General macros to create 2D/extruded-2D meshes
 
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 convertToMeters 0.1;
 
 // Hub radius
 
+
 // Impeller-tip radius
 
+
 // Baffle-tip radius
 
+
 // Tank radius
 
+
 // MRF region radius
 
+
 // Thickness of 2D slab
 
+
 // Base z
 
+
 // Top z
 
+
 // Number of cells radially between hub and impeller tip
 
+
 // Number of cells radially in each of the two regions between
 // impeller and baffle tips
 
+
 // Number of cells radially between baffle tip and tank
 
+
 // Number of cells azimuthally in each of the 8 blocks
 
+
 // Number of cells in the thickness of the slab
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 vertices
 (
-    (0.2 0 0) // Vertex r0b = 0
-    (0.2 0 0) // Vertex r0sb = 1
-    (0.141421356364228 -0.141421356110391 0) // Vertex r1b = 2
-    (3.58979347393082e-10 -0.2 0) // Vertex r2b = 3
-    (3.58979347393082e-10 -0.2 0) // Vertex r2sb = 4
-    (-0.141421355856554 -0.141421356618065 0) // Vertex r3b = 5
-    (-0.2 7.17958694786164e-10 0) // Vertex r4b = 6
-    (-0.2 7.17958694786164e-10 0) // Vertex r4sb = 7
-    (-0.141421355856554 0.141421356618065 0) // Vertex r5b = 8
-    (3.58979347393082e-10 0.2 0) // Vertex r6b = 9
-    (3.58979347393082e-10 0.2 0) // Vertex r6sb = 10
-    (0.141421356364228 0.141421356110391 0) // Vertex r7b = 11
+    (0.2 0 0) // Vertex r0b = 0 
+    (0.2 0 0) // Vertex r0sb = 1 
+    (0.141421356364228 -0.141421356110391 0) // Vertex r1b = 2 
+    (3.58979347393082e-10 -0.2 0) // Vertex r2b = 3 
+    (3.58979347393082e-10 -0.2 0) // Vertex r2sb = 4 
+    (-0.141421355856554 -0.141421356618065 0) // Vertex r3b = 5 
+    (-0.2 7.17958694786164e-10 0) // Vertex r4b = 6 
+    (-0.2 7.17958694786164e-10 0) // Vertex r4sb = 7 
+    (-0.141421355856554 0.141421356618065 0) // Vertex r5b = 8 
+    (3.58979347393082e-10 0.2 0) // Vertex r6b = 9 
+    (3.58979347393082e-10 0.2 0) // Vertex r6sb = 10 
+    (0.141421356364228 0.141421356110391 0) // Vertex r7b = 11 
 
-    (0.5 0 0) // Vertex rb0b = 12
-    (0.353553390910569 -0.353553390275978 0) // Vertex rb1b = 13
-    (8.97448368482705e-10 -0.5 0) // Vertex rb2b = 14
-    (-0.353553389641386 -0.353553391545162 0) // Vertex rb3b = 15
-    (-0.5 1.79489673696541e-09 0) // Vertex rb4b = 16
-    (-0.353553389641386 0.353553391545162 0) // Vertex rb5b = 17
-    (8.97448368482705e-10 0.5 0) // Vertex rb6b = 18
-    (0.353553390910569 0.353553390275978 0) // Vertex rb7b = 19
+    (0.5 0 0) // Vertex rb0b = 12 
+    (0.353553390910569 -0.353553390275978 0) // Vertex rb1b = 13 
+    (8.97448368482705e-10 -0.5 0) // Vertex rb2b = 14 
+    (-0.353553389641386 -0.353553391545162 0) // Vertex rb3b = 15 
+    (-0.5 1.79489673696541e-09 0) // Vertex rb4b = 16 
+    (-0.353553389641386 0.353553391545162 0) // Vertex rb5b = 17 
+    (8.97448368482705e-10 0.5 0) // Vertex rb6b = 18 
+    (0.353553390910569 0.353553390275978 0) // Vertex rb7b = 19 
 
-    (0.6 0 0) // Vertex ri0b = 20
-    (0.424264069092683 -0.424264068331174 0) // Vertex ri1b = 21
-    (1.07693804217925e-09 -0.6 0) // Vertex ri2b = 22
-    (-0.424264067569663 -0.424264069854194 0) // Vertex ri3b = 23
-    (-0.6 2.15387608435849e-09 0) // Vertex ri4b = 24
-    (-0.424264067569663 0.424264069854194 0) // Vertex ri5b = 25
-    (1.07693804217925e-09 0.6 0) // Vertex ri6b = 26
-    (0.424264069092683 0.424264068331174 0) // Vertex ri7b = 27
+    (0.6 0 0) // Vertex ri0b = 20 
+    (0.424264069092683 -0.424264068331174 0) // Vertex ri1b = 21 
+    (1.07693804217925e-09 -0.6 0) // Vertex ri2b = 22 
+    (-0.424264067569663 -0.424264069854194 0) // Vertex ri3b = 23 
+    (-0.6 2.15387608435849e-09 0) // Vertex ri4b = 24 
+    (-0.424264067569663 0.424264069854194 0) // Vertex ri5b = 25 
+    (1.07693804217925e-09 0.6 0) // Vertex ri6b = 26 
+    (0.424264069092683 0.424264068331174 0) // Vertex ri7b = 27 
 
-    (0.7 0 0) // Vertex Rb0b = 28
-    (0.494974747274797 -0.494974746386369 0) // Vertex Rb1b = 29
-    (1.25642771587579e-09 -0.7 0) // Vertex Rb2b = 30
-    (-0.49497474549794 -0.494974748163226 0) // Vertex Rb3b = 31
-    (-0.7 2.51285543175157e-09 0) // Vertex Rb4b = 32
-    (-0.49497474549794 0.494974748163226 0) // Vertex Rb5b = 33
-    (1.25642771587579e-09 0.7 0) // Vertex Rb6b = 34
-    (0.494974747274797 0.494974746386369 0) // Vertex Rb7b = 35
+    (0.7 0 0) // Vertex Rb0b = 28 
+    (0.494974747274797 -0.494974746386369 0) // Vertex Rb1b = 29 
+    (1.25642771587579e-09 -0.7 0) // Vertex Rb2b = 30 
+    (-0.49497474549794 -0.494974748163226 0) // Vertex Rb3b = 31 
+    (-0.7 2.51285543175157e-09 0) // Vertex Rb4b = 32 
+    (-0.49497474549794 0.494974748163226 0) // Vertex Rb5b = 33 
+    (1.25642771587579e-09 0.7 0) // Vertex Rb6b = 34 
+    (0.494974747274797 0.494974746386369 0) // Vertex Rb7b = 35 
 
-    (1 0 0) // Vertex R0b = 36
-    (0.707106781821139 -0.707106780551956 0) // Vertex R1b = 37
-    (0.707106781821139 -0.707106780551956 0) // Vertex R1sb = 38
-    (1.79489673696541e-09 -1 0) // Vertex R2b = 39
-    (-0.707106779282772 -0.707106783090323 0) // Vertex R3b = 40
-    (-0.707106779282772 -0.707106783090323 0) // Vertex R3sb = 41
-    (-1 3.58979347393082e-09 0) // Vertex R4b = 42
-    (-0.707106779282772 0.707106783090323 0) // Vertex R5b = 43
-    (-0.707106779282772 0.707106783090323 0) // Vertex R5sb = 44
-    (1.79489673696541e-09 1 0) // Vertex R6b = 45
-    (0.707106781821139 0.707106780551956 0) // Vertex R7b = 46
-    (0.707106781821139 0.707106780551956 0) // Vertex R7sb = 47
+    (1 0 0) // Vertex R0b = 36 
+    (0.707106781821139 -0.707106780551956 0) // Vertex R1b = 37 
+    (0.707106781821139 -0.707106780551956 0) // Vertex R1sb = 38 
+    (1.79489673696541e-09 -1 0) // Vertex R2b = 39 
+    (-0.707106779282772 -0.707106783090323 0) // Vertex R3b = 40 
+    (-0.707106779282772 -0.707106783090323 0) // Vertex R3sb = 41 
+    (-1 3.58979347393082e-09 0) // Vertex R4b = 42 
+    (-0.707106779282772 0.707106783090323 0) // Vertex R5b = 43 
+    (-0.707106779282772 0.707106783090323 0) // Vertex R5sb = 44 
+    (1.79489673696541e-09 1 0) // Vertex R6b = 45 
+    (0.707106781821139 0.707106780551956 0) // Vertex R7b = 46 
+    (0.707106781821139 0.707106780551956 0) // Vertex R7sb = 47 
 
-    (0.2 0 0.1) // Vertex r0t = 48
-    (0.2 0 0.1) // Vertex r0st = 49
-    (0.141421356364228 -0.141421356110391 0.1) // Vertex r1t = 50
-    (3.58979347393082e-10 -0.2 0.1) // Vertex r2t = 51
-    (3.58979347393082e-10 -0.2 0.1) // Vertex r2st = 52
-    (-0.141421355856554 -0.141421356618065 0.1) // Vertex r3t = 53
-    (-0.2 7.17958694786164e-10 0.1) // Vertex r4t = 54
-    (-0.2 7.17958694786164e-10 0.1) // Vertex r4st = 55
-    (-0.141421355856554 0.141421356618065 0.1) // Vertex r5t = 56
-    (3.58979347393082e-10 0.2 0.1) // Vertex r6t = 57
-    (3.58979347393082e-10 0.2 0.1) // Vertex r6st = 58
-    (0.141421356364228 0.141421356110391 0.1) // Vertex r7t = 59
+    (0.2 0 0.1) // Vertex r0t = 48 
+    (0.2 0 0.1) // Vertex r0st = 49 
+    (0.141421356364228 -0.141421356110391 0.1) // Vertex r1t = 50 
+    (3.58979347393082e-10 -0.2 0.1) // Vertex r2t = 51 
+    (3.58979347393082e-10 -0.2 0.1) // Vertex r2st = 52 
+    (-0.141421355856554 -0.141421356618065 0.1) // Vertex r3t = 53 
+    (-0.2 7.17958694786164e-10 0.1) // Vertex r4t = 54 
+    (-0.2 7.17958694786164e-10 0.1) // Vertex r4st = 55 
+    (-0.141421355856554 0.141421356618065 0.1) // Vertex r5t = 56 
+    (3.58979347393082e-10 0.2 0.1) // Vertex r6t = 57 
+    (3.58979347393082e-10 0.2 0.1) // Vertex r6st = 58 
+    (0.141421356364228 0.141421356110391 0.1) // Vertex r7t = 59 
 
-    (0.5 0 0.1) // Vertex rb0t = 60
-    (0.353553390910569 -0.353553390275978 0.1) // Vertex rb1t = 61
-    (8.97448368482705e-10 -0.5 0.1) // Vertex rb2t = 62
-    (-0.353553389641386 -0.353553391545162 0.1) // Vertex rb3t = 63
-    (-0.5 1.79489673696541e-09 0.1) // Vertex rb4t = 64
-    (-0.353553389641386 0.353553391545162 0.1) // Vertex rb5t = 65
-    (8.97448368482705e-10 0.5 0.1) // Vertex rb6t = 66
-    (0.353553390910569 0.353553390275978 0.1) // Vertex rb7t = 67
+    (0.5 0 0.1) // Vertex rb0t = 60 
+    (0.353553390910569 -0.353553390275978 0.1) // Vertex rb1t = 61 
+    (8.97448368482705e-10 -0.5 0.1) // Vertex rb2t = 62 
+    (-0.353553389641386 -0.353553391545162 0.1) // Vertex rb3t = 63 
+    (-0.5 1.79489673696541e-09 0.1) // Vertex rb4t = 64 
+    (-0.353553389641386 0.353553391545162 0.1) // Vertex rb5t = 65 
+    (8.97448368482705e-10 0.5 0.1) // Vertex rb6t = 66 
+    (0.353553390910569 0.353553390275978 0.1) // Vertex rb7t = 67 
 
-    (0.6 0 0.1) // Vertex ri0t = 68
-    (0.424264069092683 -0.424264068331174 0.1) // Vertex ri1t = 69
-    (1.07693804217925e-09 -0.6 0.1) // Vertex ri2t = 70
-    (-0.424264067569663 -0.424264069854194 0.1) // Vertex ri3t = 71
-    (-0.6 2.15387608435849e-09 0.1) // Vertex ri4t = 72
-    (-0.424264067569663 0.424264069854194 0.1) // Vertex ri5t = 73
-    (1.07693804217925e-09 0.6 0.1) // Vertex ri6t = 74
-    (0.424264069092683 0.424264068331174 0.1) // Vertex ri7t = 75
+    (0.6 0 0.1) // Vertex ri0t = 68 
+    (0.424264069092683 -0.424264068331174 0.1) // Vertex ri1t = 69 
+    (1.07693804217925e-09 -0.6 0.1) // Vertex ri2t = 70 
+    (-0.424264067569663 -0.424264069854194 0.1) // Vertex ri3t = 71 
+    (-0.6 2.15387608435849e-09 0.1) // Vertex ri4t = 72 
+    (-0.424264067569663 0.424264069854194 0.1) // Vertex ri5t = 73 
+    (1.07693804217925e-09 0.6 0.1) // Vertex ri6t = 74 
+    (0.424264069092683 0.424264068331174 0.1) // Vertex ri7t = 75 
 
-    (0.7 0 0.1) // Vertex Rb0t = 76
-    (0.494974747274797 -0.494974746386369 0.1) // Vertex Rb1t = 77
-    (1.25642771587579e-09 -0.7 0.1) // Vertex Rb2t = 78
-    (-0.49497474549794 -0.494974748163226 0.1) // Vertex Rb3t = 79
-    (-0.7 2.51285543175157e-09 0.1) // Vertex Rb4t = 80
-    (-0.49497474549794 0.494974748163226 0.1) // Vertex Rb5t = 81
-    (1.25642771587579e-09 0.7 0.1) // Vertex Rb6t = 82
-    (0.494974747274797 0.494974746386369 0.1) // Vertex Rb7t = 83
+    (0.7 0 0.1) // Vertex Rb0t = 76 
+    (0.494974747274797 -0.494974746386369 0.1) // Vertex Rb1t = 77 
+    (1.25642771587579e-09 -0.7 0.1) // Vertex Rb2t = 78 
+    (-0.49497474549794 -0.494974748163226 0.1) // Vertex Rb3t = 79 
+    (-0.7 2.51285543175157e-09 0.1) // Vertex Rb4t = 80 
+    (-0.49497474549794 0.494974748163226 0.1) // Vertex Rb5t = 81 
+    (1.25642771587579e-09 0.7 0.1) // Vertex Rb6t = 82 
+    (0.494974747274797 0.494974746386369 0.1) // Vertex Rb7t = 83 
 
-    (1 0 0.1) // Vertex R0t = 84
-    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1t = 85
-    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1st = 86
-    (1.79489673696541e-09 -1 0.1) // Vertex R2t = 87
-    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3t = 88
-    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3st = 89
-    (-1 3.58979347393082e-09 0.1) // Vertex R4t = 90
-    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5t = 91
-    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5st = 92
-    (1.79489673696541e-09 1 0.1) // Vertex R6t = 93
-    (0.707106781821139 0.707106780551956 0.1) // Vertex R7t = 94
-    (0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95
+    (1 0 0.1) // Vertex R0t = 84 
+    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1t = 85 
+    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1st = 86 
+    (1.79489673696541e-09 -1 0.1) // Vertex R2t = 87 
+    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3t = 88 
+    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3st = 89 
+    (-1 3.58979347393082e-09 0.1) // Vertex R4t = 90 
+    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5t = 91 
+    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5st = 92 
+    (1.79489673696541e-09 1 0.1) // Vertex R6t = 93 
+    (0.707106781821139 0.707106780551956 0.1) // Vertex R7t = 94 
+    (0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95 
 );
 
 blocks
@@ -447,127 +708,143 @@ edges
     arc 94 84 (0.923879532683006 0.382683431950523 0.1)
 );
 
-patches
+boundary
 (
-    wall rotor
-    (
-        (0 2 50 48)
-        (2 4 52 50)
-        (3 5 53 51)
-        (5 7 55 53)
-        (6 8 56 54)
-        (8 10 58 56)
-        (9 11 59 57)
-        (11 1 49 59)
+    rotor
+    {
+        type wall;
+        faces
+        (
+            (0 2 50 48)
+            (2 4 52 50)
+            (3 5 53 51)
+            (5 7 55 53)
+            (6 8 56 54)
+            (8 10 58 56)
+            (9 11 59 57)
+            (11 1 49 59)
+    
+            (0 12 60 48)
+            (1 12 60 49)
+    
+            (3 14 62 51)
+            (4 14 62 52)
+    
+            (6 16 64 54)
+            (7 16 64 55)
+    
+            (9 18 66 57)
+            (10 18 66 58)
+        );
+    }    
 
-        (0 12 60 48)
-        (1 12 60 49)
+    stator
+    {
+        type wall;
+        faces
+        (
+            (36 38 86 84)
+            (37 39 87 85)
+            (39 41 89 87)
+            (40 42 90 88)
+            (42 44 92 90)
+            (43 45 93 91)
+            (45 47 95 93)
+            (46 36 84 94)
+    
+            (37 29 77 85)
+            (38 29 77 86)
+    
+            (40 31 79 88)
+            (41 31 79 89)
+    
+            (43 33 81 91)
+            (44 33 81 92)
+    
+            (46 35 83 94)
+            (47 35 83 95)
+        );
+    }    
 
-        (3 14 62 51)
-        (4 14 62 52)
+    front
+    {
+        type empty;
+        faces
+        (
+            (48 50 61 60)
+            (50 52 62 61)
+            (51 53 63 62)
+            (53 55 64 63)
+            (54 56 65 64)
+            (56 58 66 65)
+            (57 59 67 66)
+            (59 49 60 67)
+            (60 61 69 68)
+            (61 62 70 69)
+            (62 63 71 70)
+            (63 64 72 71)
+            (64 65 73 72)
+            (65 66 74 73)
+            (66 67 75 74)
+            (67 60 68 75)
+            (68 69 77 76)
+            (69 70 78 77)
+            (70 71 79 78)
+            (71 72 80 79)
+            (72 73 81 80)
+            (73 74 82 81)
+            (74 75 83 82)
+            (75 68 76 83)
+            (76 77 86 84)
+            (77 78 87 85)
+            (78 79 89 87)
+            (79 80 90 88)
+            (80 81 92 90)
+            (81 82 93 91)
+            (82 83 95 93)
+            (83 76 84 94)
+        );
+    }    
 
-        (6 16 64 54)
-        (7 16 64 55)
-
-        (9 18 66 57)
-        (10 18 66 58)
-    )
-
-    wall stator
-    (
-        (36 38 86 84)
-        (37 39 87 85)
-        (39 41 89 87)
-        (40 42 90 88)
-        (42 44 92 90)
-        (43 45 93 91)
-        (45 47 95 93)
-        (46 36 84 94)
-
-        (37 29 77 85)
-        (38 29 77 86)
-
-        (40 31 79 88)
-        (41 31 79 89)
-
-        (43 33 81 91)
-        (44 33 81 92)
-
-        (46 35 83 94)
-        (47 35 83 95)
-    )
-
-    empty front
-    (
-        (48 50 61 60)
-        (50 52 62 61)
-        (51 53 63 62)
-        (53 55 64 63)
-        (54 56 65 64)
-        (56 58 66 65)
-        (57 59 67 66)
-        (59 49 60 67)
-        (60 61 69 68)
-        (61 62 70 69)
-        (62 63 71 70)
-        (63 64 72 71)
-        (64 65 73 72)
-        (65 66 74 73)
-        (66 67 75 74)
-        (67 60 68 75)
-        (68 69 77 76)
-        (69 70 78 77)
-        (70 71 79 78)
-        (71 72 80 79)
-        (72 73 81 80)
-        (73 74 82 81)
-        (74 75 83 82)
-        (75 68 76 83)
-        (76 77 86 84)
-        (77 78 87 85)
-        (78 79 89 87)
-        (79 80 90 88)
-        (80 81 92 90)
-        (81 82 93 91)
-        (82 83 95 93)
-        (83 76 84 94)
-    )
-
-    empty back
-    (
-        (0 12 13 2)
-        (2 13 14 4)
-        (3 14 15 5)
-        (5 15 16 7)
-        (6 16 17 8)
-        (8 17 18 10)
-        (9 18 19 11)
-        (11 19 12 1)
-        (12 20 21 13)
-        (13 21 22 14)
-        (14 22 23 15)
-        (15 23 24 16)
-        (16 24 25 17)
-        (17 25 26 18)
-        (18 26 27 19)
-        (19 27 20 12)
-        (20 28 29 21)
-        (21 29 30 22)
-        (22 30 31 23)
-        (23 31 32 24)
-        (24 32 33 25)
-        (25 33 34 26)
-        (26 34 35 27)
-        (27 35 28 20)
-        (28 36 38 29)
-        (29 37 39 30)
-        (30 39 41 31)
-        (31 40 42 32)
-        (32 42 44 33)
-        (33 43 45 34)
-        (34 45 47 35)
-        (35 46 36 28)
-    )
+    back
+    {
+        type empty;
+        faces
+        (
+            (0 12 13 2)
+            (2 13 14 4)
+            (3 14 15 5)
+            (5 15 16 7)
+            (6 16 17 8)
+            (8 17 18 10)
+            (9 18 19 11)
+            (11 19 12 1)
+            (12 20 21 13)
+            (13 21 22 14)
+            (14 22 23 15)
+            (15 23 24 16)
+            (16 24 25 17)
+            (17 25 26 18)
+            (18 26 27 19)
+            (19 27 20 12)
+            (20 28 29 21)
+            (21 29 30 22)
+            (22 30 31 23)
+            (23 31 32 24)
+            (24 32 33 25)
+            (25 33 34 26)
+            (26 34 35 27)
+            (27 35 28 20)
+            (28 36 38 29)
+            (29 37 39 30)
+            (30 39 41 31)
+            (31 40 42 32)
+            (32 42 44 33)
+            (33 43 45 34)
+            (34 45 47 35)
+            (35 46 36 28)
+        );
+    }    
 );
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
index 28fb15506..6b7062de2 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -708,127 +708,143 @@ edges
     arc R7t R0t evert(4, 7, Zt)
 );
 
-patches
+boundary
 (
-    wall rotor
-    (
-        quad2D(r0, r1)
-        quad2D(r1, r2s)
-        quad2D(r2, r3)
-        quad2D(r3, r4s)
-        quad2D(r4, r5)
-        quad2D(r5, r6s)
-        quad2D(r6, r7)
-        quad2D(r7, r0s)
+    rotor
+    {
+        type wall;
+        faces
+        (
+            quad2D(r0, r1)
+            quad2D(r1, r2s)
+            quad2D(r2, r3)
+            quad2D(r3, r4s)
+            quad2D(r4, r5)
+            quad2D(r5, r6s)
+            quad2D(r6, r7)
+            quad2D(r7, r0s)
+    
+            quad2D(r0, rb0)
+            quad2D(r0s, rb0)
+    
+            quad2D(r2, rb2)
+            quad2D(r2s, rb2)
+    
+            quad2D(r4, rb4)
+            quad2D(r4s, rb4)
+    
+            quad2D(r6, rb6)
+            quad2D(r6s, rb6)
+        );
+    }    
 
-        quad2D(r0, rb0)
-        quad2D(r0s, rb0)
+    stator
+    {
+        type wall;
+        faces
+        (
+            quad2D(R0, R1s)
+            quad2D(R1, R2)
+            quad2D(R2, R3s)
+            quad2D(R3, R4)
+            quad2D(R4, R5s)
+            quad2D(R5, R6)
+            quad2D(R6, R7s)
+            quad2D(R7, R0)
+    
+            quad2D(R1, Rb1)
+            quad2D(R1s, Rb1)
+    
+            quad2D(R3, Rb3)
+            quad2D(R3s, Rb3)
+    
+            quad2D(R5, Rb5)
+            quad2D(R5s, Rb5)
+    
+            quad2D(R7, Rb7)
+            quad2D(R7s, Rb7)
+        );
+    }    
 
-        quad2D(r2, rb2)
-        quad2D(r2s, rb2)
+    front
+    {
+        type empty;
+        faces
+        (
+            frontQuad(r0, r1, rb1, rb0)
+            frontQuad(r1, r2s, rb2, rb1)
+            frontQuad(r2, r3, rb3, rb2)
+            frontQuad(r3, r4s, rb4, rb3)
+            frontQuad(r4, r5, rb5, rb4)
+            frontQuad(r5, r6s, rb6, rb5)
+            frontQuad(r6, r7, rb7, rb6)
+            frontQuad(r7, r0s, rb0, rb7)
+            frontQuad(rb0, rb1, ri1, ri0)
+            frontQuad(rb1, rb2, ri2, ri1)
+            frontQuad(rb2, rb3, ri3, ri2)
+            frontQuad(rb3, rb4, ri4, ri3)
+            frontQuad(rb4, rb5, ri5, ri4)
+            frontQuad(rb5, rb6, ri6, ri5)
+            frontQuad(rb6, rb7, ri7, ri6)
+            frontQuad(rb7, rb0, ri0, ri7)
+            frontQuad(ri0, ri1, Rb1, Rb0)
+            frontQuad(ri1, ri2, Rb2, Rb1)
+            frontQuad(ri2, ri3, Rb3, Rb2)
+            frontQuad(ri3, ri4, Rb4, Rb3)
+            frontQuad(ri4, ri5, Rb5, Rb4)
+            frontQuad(ri5, ri6, Rb6, Rb5)
+            frontQuad(ri6, ri7, Rb7, Rb6)
+            frontQuad(ri7, ri0, Rb0, Rb7)
+            frontQuad(Rb0, Rb1, R1s, R0)
+            frontQuad(Rb1, Rb2, R2, R1)
+            frontQuad(Rb2, Rb3, R3s, R2)
+            frontQuad(Rb3, Rb4, R4, R3)
+            frontQuad(Rb4, Rb5, R5s, R4)
+            frontQuad(Rb5, Rb6, R6, R5)
+            frontQuad(Rb6, Rb7, R7s, R6)
+            frontQuad(Rb7, Rb0, R0, R7)
+        );
+    }    
 
-        quad2D(r4, rb4)
-        quad2D(r4s, rb4)
-
-        quad2D(r6, rb6)
-        quad2D(r6s, rb6)
-    )
-
-    wall stator
-    (
-        quad2D(R0, R1s)
-        quad2D(R1, R2)
-        quad2D(R2, R3s)
-        quad2D(R3, R4)
-        quad2D(R4, R5s)
-        quad2D(R5, R6)
-        quad2D(R6, R7s)
-        quad2D(R7, R0)
-
-        quad2D(R1, Rb1)
-        quad2D(R1s, Rb1)
-
-        quad2D(R3, Rb3)
-        quad2D(R3s, Rb3)
-
-        quad2D(R5, Rb5)
-        quad2D(R5s, Rb5)
-
-        quad2D(R7, Rb7)
-        quad2D(R7s, Rb7)
-    )
-
-    empty front
-    (
-        frontQuad(r0, r1, rb1, rb0)
-        frontQuad(r1, r2s, rb2, rb1)
-        frontQuad(r2, r3, rb3, rb2)
-        frontQuad(r3, r4s, rb4, rb3)
-        frontQuad(r4, r5, rb5, rb4)
-        frontQuad(r5, r6s, rb6, rb5)
-        frontQuad(r6, r7, rb7, rb6)
-        frontQuad(r7, r0s, rb0, rb7)
-        frontQuad(rb0, rb1, ri1, ri0)
-        frontQuad(rb1, rb2, ri2, ri1)
-        frontQuad(rb2, rb3, ri3, ri2)
-        frontQuad(rb3, rb4, ri4, ri3)
-        frontQuad(rb4, rb5, ri5, ri4)
-        frontQuad(rb5, rb6, ri6, ri5)
-        frontQuad(rb6, rb7, ri7, ri6)
-        frontQuad(rb7, rb0, ri0, ri7)
-        frontQuad(ri0, ri1, Rb1, Rb0)
-        frontQuad(ri1, ri2, Rb2, Rb1)
-        frontQuad(ri2, ri3, Rb3, Rb2)
-        frontQuad(ri3, ri4, Rb4, Rb3)
-        frontQuad(ri4, ri5, Rb5, Rb4)
-        frontQuad(ri5, ri6, Rb6, Rb5)
-        frontQuad(ri6, ri7, Rb7, Rb6)
-        frontQuad(ri7, ri0, Rb0, Rb7)
-        frontQuad(Rb0, Rb1, R1s, R0)
-        frontQuad(Rb1, Rb2, R2, R1)
-        frontQuad(Rb2, Rb3, R3s, R2)
-        frontQuad(Rb3, Rb4, R4, R3)
-        frontQuad(Rb4, Rb5, R5s, R4)
-        frontQuad(Rb5, Rb6, R6, R5)
-        frontQuad(Rb6, Rb7, R7s, R6)
-        frontQuad(Rb7, Rb0, R0, R7)
-    )
-
-    empty back
-    (
-        backQuad(r0, r1, rb1, rb0)
-        backQuad(r1, r2s, rb2, rb1)
-        backQuad(r2, r3, rb3, rb2)
-        backQuad(r3, r4s, rb4, rb3)
-        backQuad(r4, r5, rb5, rb4)
-        backQuad(r5, r6s, rb6, rb5)
-        backQuad(r6, r7, rb7, rb6)
-        backQuad(r7, r0s, rb0, rb7)
-        backQuad(rb0, rb1, ri1, ri0)
-        backQuad(rb1, rb2, ri2, ri1)
-        backQuad(rb2, rb3, ri3, ri2)
-        backQuad(rb3, rb4, ri4, ri3)
-        backQuad(rb4, rb5, ri5, ri4)
-        backQuad(rb5, rb6, ri6, ri5)
-        backQuad(rb6, rb7, ri7, ri6)
-        backQuad(rb7, rb0, ri0, ri7)
-        backQuad(ri0, ri1, Rb1, Rb0)
-        backQuad(ri1, ri2, Rb2, Rb1)
-        backQuad(ri2, ri3, Rb3, Rb2)
-        backQuad(ri3, ri4, Rb4, Rb3)
-        backQuad(ri4, ri5, Rb5, Rb4)
-        backQuad(ri5, ri6, Rb6, Rb5)
-        backQuad(ri6, ri7, Rb7, Rb6)
-        backQuad(ri7, ri0, Rb0, Rb7)
-        backQuad(Rb0, Rb1, R1s, R0)
-        backQuad(Rb1, Rb2, R2, R1)
-        backQuad(Rb2, Rb3, R3s, R2)
-        backQuad(Rb3, Rb4, R4, R3)
-        backQuad(Rb4, Rb5, R5s, R4)
-        backQuad(Rb5, Rb6, R6, R5)
-        backQuad(Rb6, Rb7, R7s, R6)
-        backQuad(Rb7, Rb0, R0, R7)
-    )
+    back
+    {
+        type empty;
+        faces
+        (
+            backQuad(r0, r1, rb1, rb0)
+            backQuad(r1, r2s, rb2, rb1)
+            backQuad(r2, r3, rb3, rb2)
+            backQuad(r3, r4s, rb4, rb3)
+            backQuad(r4, r5, rb5, rb4)
+            backQuad(r5, r6s, rb6, rb5)
+            backQuad(r6, r7, rb7, rb6)
+            backQuad(r7, r0s, rb0, rb7)
+            backQuad(rb0, rb1, ri1, ri0)
+            backQuad(rb1, rb2, ri2, ri1)
+            backQuad(rb2, rb3, ri3, ri2)
+            backQuad(rb3, rb4, ri4, ri3)
+            backQuad(rb4, rb5, ri5, ri4)
+            backQuad(rb5, rb6, ri6, ri5)
+            backQuad(rb6, rb7, ri7, ri6)
+            backQuad(rb7, rb0, ri0, ri7)
+            backQuad(ri0, ri1, Rb1, Rb0)
+            backQuad(ri1, ri2, Rb2, Rb1)
+            backQuad(ri2, ri3, Rb3, Rb2)
+            backQuad(ri3, ri4, Rb4, Rb3)
+            backQuad(ri4, ri5, Rb5, Rb4)
+            backQuad(ri5, ri6, Rb6, Rb5)
+            backQuad(ri6, ri7, Rb7, Rb6)
+            backQuad(ri7, ri0, Rb0, Rb7)
+            backQuad(Rb0, Rb1, R1s, R0)
+            backQuad(Rb1, Rb2, R2, R1)
+            backQuad(Rb2, Rb3, R3s, R2)
+            backQuad(Rb3, Rb4, R4, R3)
+            backQuad(Rb4, Rb5, R5s, R4)
+            backQuad(Rb5, Rb6, R6, R5)
+            backQuad(Rb6, Rb7, R7s, R6)
+            backQuad(Rb7, Rb0, R0, R7)
+        );
+    }    
 );
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
index 8c41fc57a..48eb9549a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      ;
     class       dictionary;
     object      blockMeshDict;
 }
@@ -16,34 +16,34 @@ FoamFile
 // block definition for a porosity with an angled inlet/outlet
 // the porosity is not aligned with the main axes
 //
-
+                             
 convertToMeters 0.001;
 
 vertices
 (
     // inlet region
-    ( -150  0  -25 )  // pt 0 (in1b)
-    ( -150 35.35533906  -25 ) // pt 1 (in2b)
-    ( -150  0  25 )  // pt 2 (in1f)
-    ( -150 35.35533906  25 ) // pt 3 (in2f)
+    ( -150  0  -25 )  // pt 0 (in1b) 
+    ( -150 35.35533906  -25 ) // pt 1 (in2b) 
+    ( -150  0  25 )  // pt 2 (in1f) 
+    ( -150 35.35533906  25 ) // pt 3 (in2f) 
 
     // join inlet->outlet
-    (  0 0  -25 )    // pt 4 (join1b)
-    ( -35.35533906   35.35533906  -25 ) // pt 5 (join2b)
-    (  0 0  25 )    // pt 6 (join1f)
-    ( -35.35533906   35.35533906  25 ) // pt 7 (join2f)
+    (  0 0  -25 )    // pt 4 (join1b) 
+    ( -35.35533906   35.35533906  -25 ) // pt 5 (join2b) 
+    (  0 0  25 )    // pt 6 (join1f) 
+    ( -35.35533906   35.35533906  25 ) // pt 7 (join2f) 
 
     // porosity ends ->outlet
-    ( 70.71067812 70.71067812  -25 )  // pt 8 (poro1b)
-    ( 35.35533906 106.06601718  -25 )  // pt 9 (poro2b)
-    ( 70.71067812 70.71067812  25 )  // pt 10 (poro1f)
-    ( 35.35533906 106.06601718  25 )  // pt 11 (poro2f)
+    ( 70.71067812 70.71067812  -25 )  // pt 8 (poro1b) 
+    ( 35.35533906 106.06601718  -25 )  // pt 9 (poro2b) 
+    ( 70.71067812 70.71067812  25 )  // pt 10 (poro1f) 
+    ( 35.35533906 106.06601718  25 )  // pt 11 (poro2f) 
 
     // outlet
-    ( 141.42135624 141.42135624 -25 ) // pt 12 (out1b)
-    ( 106.06601718 176.7766953 -25 ) // pt 13 (out2b)
-    ( 141.42135624 141.42135624 25 ) // pt 14 (out1f)
-    ( 106.06601718 176.7766953 25 ) // pt 15 (out2f)
+    ( 141.42135624 141.42135624 -25 ) // pt 12 (out1b) 
+    ( 106.06601718 176.7766953 -25 ) // pt 13 (out2b) 
+    ( 141.42135624 141.42135624 25 ) // pt 14 (out1f) 
+    ( 106.06601718 176.7766953 25 ) // pt 15 (out2f) 
 );
 
 blocks
@@ -65,55 +65,79 @@ edges
 (
 );
 
-patches
+boundary
 (
     // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    (2 6 7 3)
-    // outlet block
-    (10 14 15 11)
-    )
+    front
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (2 6 7 3)
+            // outlet block
+            (10 14 15 11)
+        );
+    }
 
-    wall back
-    (
-    // inlet block
-    (1 5 4 0)
-    // outlet block
-    (9 13 12 8)
-    )
+    back
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (1 5 4 0)
+            // outlet block
+            (9 13 12 8)
+        );
+    }
 
-    wall wall
-    (
-    // inlet block
-    (2 0 4 6)
-    (7 5 1 3)
-    // outlet block
-    (10 8 12 14)
-    (15 13 9 11)
-    )
+    wall
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (2 0 4 6)
+            (7 5 1 3)
+            // outlet block
+            (10 8 12 14)
+            (15 13 9 11)
+        );
+    }
 
-    wall porosityWall
-    (
-    // porosity block
-    (6 10 11 7)
-    // porosity block
-    (5 9 8 4)
-    // porosity block
-    (6 4 8 10)
-    (11 9 5 7)
-    )
+    porosityWall
+    {
+        type wall;
+        faces
+        (
+            // porosity block
+            (6 10 11 7)
+            // porosity block
+            (5 9 8 4)
+            // porosity block
+            (6 4 8 10)
+            (11 9 5 7)
+        );
+    }
 
-    patch inlet
-    (
-    (3 1 0 2)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (3 1 0 2)
+        );
+    }
 
-    patch outlet
-    (
-    (15 13 12 14)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (15 13 12 14)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
index 846abc3f8..6f6c125f0 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
@@ -107,55 +107,79 @@ edges
 (
 );
 
-patches
+boundary
 (
     // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    frontQuad(in1, join1, join2, in2)
-    // outlet block
-    frontQuad(poro1, out1, out2, poro2)
-    )
+    front
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            frontQuad(in1, join1, join2, in2)
+            // outlet block
+            frontQuad(poro1, out1, out2, poro2)
+        );
+    }
 
-    wall back
-    (
-    // inlet block
-    backQuad(in1, join1, join2, in2)
-    // outlet block
-    backQuad(poro1, out1, out2, poro2)
-    )
+    back
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            backQuad(in1, join1, join2, in2)
+            // outlet block
+            backQuad(poro1, out1, out2, poro2)
+        );
+    }
 
-    wall wall
-    (
-    // inlet block
-    quad2D(in1, join1)
-    quad2D(join2, in2)
-    // outlet block
-    quad2D(poro1, out1)
-    quad2D(out2, poro2)
-    )
+    wall
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            quad2D(in1, join1)
+            quad2D(join2, in2)
+            // outlet block
+            quad2D(poro1, out1)
+            quad2D(out2, poro2)
+        );
+    }
 
-    wall porosityWall
-    (
-    // porosity block
-    frontQuad(join1, poro1, poro2, join2)
-    // porosity block
-    backQuad(join1, poro1, poro2, join2)
-    // porosity block
-    quad2D(join1, poro1)
-    quad2D(poro2, join2)
-    )
+    porosityWall
+    {
+        type wall;
+        faces
+        (
+            // porosity block
+            frontQuad(join1, poro1, poro2, join2)
+            // porosity block
+            backQuad(join1, poro1, poro2, join2)
+            // porosity block
+            quad2D(join1, poro1)
+            quad2D(poro2, join2)
+        );
+    }
 
-    patch inlet
-    (
-    quad2D(in2, in1)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            quad2D(in2, in1)
+        );
+    }
 
-    patch outlet
-    (
-    quad2D(out2, out1)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            quad2D(out2, out1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
deleted file mode 100644
index 7fbdfc30e..000000000
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        nFaces          700;
-        startFace       64100;
-    }
-    wall
-    {
-        type            wall;
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/constant/polyMesh/blockMeshDict
index 646f18594..b1093e0d4 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/constant/polyMesh/blockMeshDict
@@ -42,33 +42,57 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 4 7 3)
-        (3 7 10 8)
-    )
-    patch outlet
-    (
-        (2 6 5 1)
-        (6 2 9 11)
-    )
-    wall upperWall
-    (
-        (8 9 11 10)
-    )
-    wall lowerWall
-    (
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (2 3 8 9)
-        (6 7 10 11)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+            (3 7 10 8)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+            (6 2 9 11)
+        );
+    }
+
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (8 9 11 10)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (2 3 8 9)
+            (6 7 10 11)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/constant/polyMesh/boundary
deleted file mode 100644
index 551e96587..000000000
--- a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7860;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7900;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          100;
-        startFace       7940;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          100;
-        startFace       8040;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          8000;
-        startFace       8140;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/constant/polyMesh/blockMeshDict
index 59dc55449..c11e3391b 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/constant/polyMesh/blockMeshDict
@@ -47,28 +47,47 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 4 7 3)
-    )
-    patch outlet
-    (
-        (12 14 15 13)
-    )
-    wall upperWall
-    (
-        (2 3 7 6)
-        (2 6 11 9)
-        (9 11 15 13)
-    )
-    wall lowerWall
-    (
-        (1 5 4 0)
-        (1 5 10 8)
-        (10 8 12 14)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (12 14 15 13)
+        );
+    }
+
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (2 3 7 6)
+            (2 6 11 9)
+            (9 11 15 13)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+            (1 5 10 8)
+            (10 8 12 14)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/constant/polyMesh/boundary
deleted file mode 100644
index 6a6d8ca90..000000000
--- a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          20;
-        startFace       6220;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          20;
-        startFace       6240;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          160;
-        startFace       6260;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          160;
-        startFace       6420;
-    }
-    defaultFaces
-    {
-        type            empty;
-        nFaces          6400;
-        startFace       6580;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
index ffbc72f94..dd78d3e24 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
@@ -47,31 +47,51 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 8 10 2)
-        (2 10 13 5)
-    )
-    patch outlet
-    (
-        (4 7 15 12)
-    )
-    symmetryPlane bottom
-    (
-        (0 1 9 8)
-    )
-    symmetryPlane top
-    (
-        (5 13 14 6)
-        (6 14 15 7)
-    )
-    patch obstacle
-    (
-        (1 3 11 9)
-        (3 4 12 11)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 8 10 2)
+            (2 10 13 5)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (4 7 15 12)
+        );
+    }
+    bottom
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 9 8)
+        );
+    }
+    top
+    {
+        type symmetryPlane;
+        faces
+        (
+            (5 13 14 6)
+            (6 14 15 7)
+        );
+    }
+    obstacle
+    {
+        type patch;
+        faces
+        (
+            (1 3 11 9)
+            (3 4 12 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary
deleted file mode 100644
index 1dcf25a50..000000000
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    inlet
-    {
-        type            patch;
-        nFaces          50;
-        startFace       10325;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       10375;
-    }
-    bottom
-    {
-        type            symmetryPlane;
-        nFaces          25;
-        startFace       10415;
-    }
-    top
-    {
-        type            symmetryPlane;
-        nFaces          125;
-        startFace       10440;
-    }
-    obstacle
-    {
-        type            patch;
-        nFaces          110;
-        startFace       10565;
-    }
-    defaultFaces
-    {
-        type            empty;
-        nFaces          10500;
-        startFace       10675;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
index 7cf730ba9..b21264106 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
@@ -37,20 +37,28 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch sides
-    (
-        (1 2 6 5)
-        (0 4 7 3)
-    )
-    empty empty
-    (
-        (0 1 5 4)
-        (5 6 7 4)
-        (3 7 6 2)
-        (0 3 2 1)
-    )
+    sides
+    {
+        type patch;
+        faces
+        (
+            (1 2 6 5)
+            (0 4 7 3)
+        );
+    }
+    empty
+    {
+        type empty;
+        faces
+        (
+            (0 1 5 4)
+            (5 6 7 4)
+            (3 7 6 2)
+            (0 3 2 1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary
deleted file mode 100644
index 0e12f133e..000000000
--- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-2
-(
-    sides
-    {
-        type            patch;
-        nFaces          2;
-        startFace       999;
-    }
-    empty
-    {
-        type            empty;
-        nFaces          4000;
-        startFace       1001;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
index ffbc72f94..dd78d3e24 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
@@ -47,31 +47,51 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 8 10 2)
-        (2 10 13 5)
-    )
-    patch outlet
-    (
-        (4 7 15 12)
-    )
-    symmetryPlane bottom
-    (
-        (0 1 9 8)
-    )
-    symmetryPlane top
-    (
-        (5 13 14 6)
-        (6 14 15 7)
-    )
-    patch obstacle
-    (
-        (1 3 11 9)
-        (3 4 12 11)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 8 10 2)
+            (2 10 13 5)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (4 7 15 12)
+        );
+    }
+    bottom
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 9 8)
+        );
+    }
+    top
+    {
+        type symmetryPlane;
+        faces
+        (
+            (5 13 14 6)
+            (6 14 15 7)
+        );
+    }
+    obstacle
+    {
+        type patch;
+        faces
+        (
+            (1 3 11 9)
+            (3 4 12 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
index 7cf730ba9..b21264106 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
@@ -37,20 +37,28 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch sides
-    (
-        (1 2 6 5)
-        (0 4 7 3)
-    )
-    empty empty
-    (
-        (0 1 5 4)
-        (5 6 7 4)
-        (3 7 6 2)
-        (0 3 2 1)
-    )
+    sides
+    {
+        type patch;
+        faces
+        (
+            (1 2 6 5)
+            (0 4 7 3)
+        );
+    }
+    empty
+    {
+        type empty;
+        faces
+        (
+            (0 1 5 4)
+            (5 6 7 4)
+            (3 7 6 2)
+            (0 3 2 1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
deleted file mode 100644
index 0e12f133e..000000000
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-2
-(
-    sides
-    {
-        type            patch;
-        nFaces          2;
-        startFace       999;
-    }
-    empty
-    {
-        type            empty;
-        nFaces          4000;
-        startFace       1001;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
index 28a175cae..0c4e93ef5 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
@@ -85,41 +85,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 26 4)
-        (4 26 30 8)
-        (8 30 36 14)
-        (14 36 40 18)
-    )
-    patch outlet
-    (
-        (3 7 29 25)
-        (7 11 33 29)
-        (11 13 35 33)
-        (13 17 39 35)
-        (17 21 43 39)
-    )
-    patch bottomWall
-    (
-        (0 1 23 22)
-        (1 2 24 23)
-        (2 3 25 24)
-    )
-    patch topWall
-    (
-        (18 40 41 19)
-        (19 41 42 20)
-        (20 42 43 21)
-    )
-    wall prismWall
-    (
-        (12 10 32 34)
-        (12 34 31 9)
-        (9 31 32 10)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 26 4)
+            (4 26 30 8)
+            (8 30 36 14)
+            (14 36 40 18)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 7 29 25)
+            (7 11 33 29)
+            (11 13 35 33)
+            (13 17 39 35)
+            (17 21 43 39)
+        );
+    }
+    bottomWall
+    {
+        type patch;
+        faces
+        (
+            (0 1 23 22)
+            (1 2 24 23)
+            (2 3 25 24)
+        );
+    }
+    topWall
+    {
+        type patch;
+        faces
+        (
+            (18 40 41 19)
+            (19 41 42 20)
+            (20 42 43 21)
+        );
+    }
+    prismWall
+    {
+        type wall;
+        faces
+        (
+            (12 10 32 34)
+            (12 34 31 9)
+            (9 31 32 10)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
deleted file mode 100644
index 8ecff5c0b..000000000
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    inlet
-    {
-        type            patch;
-        nFaces          48;
-        startFace       13081;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          68;
-        startFace       13129;
-    }
-    bottomWall
-    {
-        type            patch;
-        nFaces          107;
-        startFace       13197;
-    }
-    topWall
-    {
-        type            patch;
-        nFaces          107;
-        startFace       13304;
-    }
-    prismWall
-    {
-        type            wall;
-        nFaces          52;
-        startFace       13411;
-    }
-    defaultFaces
-    {
-        type            empty;
-        nFaces          13272;
-        startFace       13463;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
index 0314d72d0..98a60c231 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
@@ -52,41 +52,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall outerWall
-    (
-        (0 1 11 10)
-        (1 3 13 11)
-        (3 4 14 13)
-        (7 6 16 17)
-        (6 9 19 16)
-        (9 8 18 19)
-    )
-    symmetryPlane axis
-    (
-        (0 10 12 2)
-        (2 12 15 5)
-        (5 15 18 8)
-    )
-    patch nozzle
-    (
-        (4 7 17 14)
-    )
-    empty back
-    (
-        (0 2 3 1)
-        (2 5 6 3)
-        (3 6 7 4)
-        (5 8 9 6)
-    )
-    empty front
-    (
-        (10 11 13 12)
-        (12 13 16 15)
-        (13 14 17 16)
-        (15 16 19 18)
-    )
+    outerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 11 10)
+            (1 3 13 11)
+            (3 4 14 13)
+            (7 6 16 17)
+            (6 9 19 16)
+            (9 8 18 19)
+        );
+    }
+    axis
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 15 5)
+            (5 15 18 8)
+        );
+    }
+    nozzle
+    {
+        type patch;
+        faces
+        (
+            (4 7 17 14)
+        );
+    }
+    back
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 5 6 3)
+            (3 6 7 4)
+            (5 8 9 6)
+        );
+    }
+    front
+    {
+        type empty;
+        faces
+        (
+            (10 11 13 12)
+            (12 13 16 15)
+            (13 14 17 16)
+            (15 16 19 18)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
deleted file mode 100644
index a9f0f2c8e..000000000
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    outerWall
-    {
-        type            wall;
-        nFaces          225;
-        startFace       7275;
-    }
-    axis
-    {
-        type            symmetryPlane;
-        nFaces          120;
-        startFace       7500;
-    }
-    nozzle
-    {
-        type            patch;
-        nFaces          5;
-        startFace       7620;
-    }
-    back
-    {
-        type            empty;
-        nFaces          3725;
-        startFace       7625;
-    }
-    front
-    {
-        type            empty;
-        nFaces          3725;
-        startFace       11350;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/blockMeshDict b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/blockMeshDict
index 99e5fe8e5..267e2387e 100644
--- a/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/blockMeshDict
+++ b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/blockMeshDict
@@ -42,23 +42,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (4 10 11 5)
-    )
-    patch outlet
-    (
-        (3 9 10 4)
-    )
-    wall fixedWalls
-    (
-        (3 0 6 9)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 5 11 8)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (4 10 11 5)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 9 10 4)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (3 0 6 9)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 5 11 8)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allrun b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allrun
index 0e2b95757..c539eabb3 100755
--- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allrun
+++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/Allrun
@@ -7,12 +7,10 @@
 application=`getApplication`
 
 runApplication -l log.blockMesh.solid blockMesh -region solid
-cp constant/solid/polyMesh/boundaryCoupled constant/solid/polyMesh/boundary
 runApplication -l log.setSet.solid setSet -region solid -batch solid.setSet
 runApplication -l log.setsToZones.solid setsToZones -region solid -noFlipMap
 
 runApplication blockMesh
-cp constant/polyMesh/boundaryCoupled constant/polyMesh/boundary
 runApplication setSet -batch fluid.setSet
 runApplication setsToZones -noFlipMap
 
diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/blockMeshDict b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/blockMeshDict
index ad63e7a0e..a9c6f253f 100644
--- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/polyMesh/blockMeshDict
@@ -37,29 +37,59 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (3 7 6 2)
-    )
-    wall left
-    (
-        (0 4 7 3)
-    )
-    wall right
-    (
-        (2 6 5 1)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    left
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    right
+    {
+        type regionCouple;
+
+        shadowRegion    solid;
+        shadowPatch     left;
+        attached        off;
+        isWall          on;
+
+        zone            rightZone;
+        master          on;
+        bridgeOverlap   off;
+
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/solid/polyMesh/blockMeshDict b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/solid/polyMesh/blockMeshDict
index ae4499ca8..7821a8e62 100644
--- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/solid/polyMesh/blockMeshDict
+++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/constant/solid/polyMesh/blockMeshDict
@@ -37,26 +37,54 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch topAndBottom
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
-    patch left
-    (
-        (0 4 7 3)
-    )
-    patch right
-    (
-        (2 6 5 1)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    topAndBottom
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+        );
+    }
+
+    left
+    {
+        type regionCouple;
+
+        shadowRegion    region0;
+        shadowPatch     right;
+        attached        off;
+        isWall          on;
+        zone            leftZone;
+        master          off;
+        bridgeOverlap   off;
+
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    right
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/Allrun b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/Allrun
index 0e2b95757..c539eabb3 100755
--- a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/Allrun
+++ b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/Allrun
@@ -7,12 +7,10 @@
 application=`getApplication`
 
 runApplication -l log.blockMesh.solid blockMesh -region solid
-cp constant/solid/polyMesh/boundaryCoupled constant/solid/polyMesh/boundary
 runApplication -l log.setSet.solid setSet -region solid -batch solid.setSet
 runApplication -l log.setsToZones.solid setsToZones -region solid -noFlipMap
 
 runApplication blockMesh
-cp constant/polyMesh/boundaryCoupled constant/polyMesh/boundary
 runApplication setSet -batch fluid.setSet
 runApplication setsToZones -noFlipMap
 
diff --git a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/constant/polyMesh/blockMeshDict b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/constant/polyMesh/blockMeshDict
index ad63e7a0e..a9c6f253f 100644
--- a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/constant/polyMesh/blockMeshDict
@@ -37,29 +37,59 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (3 7 6 2)
-    )
-    wall left
-    (
-        (0 4 7 3)
-    )
-    wall right
-    (
-        (2 6 5 1)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    left
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    right
+    {
+        type regionCouple;
+
+        shadowRegion    solid;
+        shadowPatch     left;
+        attached        off;
+        isWall          on;
+
+        zone            rightZone;
+        master          on;
+        bridgeOverlap   off;
+
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/constant/solid/polyMesh/blockMeshDict b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/constant/solid/polyMesh/blockMeshDict
index ae4499ca8..7821a8e62 100644
--- a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/constant/solid/polyMesh/blockMeshDict
+++ b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/constant/solid/polyMesh/blockMeshDict
@@ -37,26 +37,54 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch topAndBottom
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
-    patch left
-    (
-        (0 4 7 3)
-    )
-    patch right
-    (
-        (2 6 5 1)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    topAndBottom
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+        );
+    }
+
+    left
+    {
+        type regionCouple;
+
+        shadowRegion    region0;
+        shadowPatch     right;
+        attached        off;
+        isWall          on;
+        zone            leftZone;
+        master          off;
+        bridgeOverlap   off;
+
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    right
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
index 78f8e88f9..fb8d7d808 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
@@ -33,28 +33,37 @@ blocks
     hex (0 1 2 3 4 5 6 7) (20 16 16) simpleGrading (1 1 1)
 );
 
-patches
+boundary
 (
-    cyclic
     xPeriodic
-    (
+    {
+        type cyclic;
+        faces
+        (
         (1 2 6 5)
         (0 4 7 3)
-    )
+        );
+    }
 
-    cyclic
     yPeriodic
-    (
+    {
+        type cyclic;
+        faces
+        (
         (2 3 7 6)
         (0 1 5 4)
-    )
+        );
+    }
 
-    cyclic
     zPeriodic
-    (
-        (4 5 6 7)
-        (0 3 2 1)
-    )
+    {
+        type cyclic;
+        faces
+        (
+            (4 5 6 7)
+            (0 3 2 1)
+        );
+    }
 )
 
 mergePatchPairs
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/boundary b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/boundary
deleted file mode 100644
index 2944da404..000000000
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/boundary
+++ /dev/null
@@ -1,43 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    xPeriodic
-    {
-        type            cyclic;
-        nFaces          512;
-        startFace       14464;
-        featureCos      0.9;
-    }
-    yPeriodic
-    {
-        type            cyclic;
-        nFaces          640;
-        startFace       14976;
-        featureCos      0.9;
-    }
-    zPeriodic
-    {
-        type            cyclic;
-        nFaces          640;
-        startFace       15616;
-        featureCos      0.9;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
index c5d613bf2..ecd2e9134 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
@@ -33,32 +33,42 @@ blocks
     hex (0 1 2 3 4 5 6 7) (20 16 16) simpleGrading (1 1 1)
 );
 
-patches
+boundary
 (
-    patch
     outlet
-    (
-        (1 2 6 5)
-    )
+    {
+        type patch;
+        faces
+        (
+            (1 2 6 5)
+        );
+    }
 
-    patch
     inlet
-    (
-        (0 4 7 3)
-    )
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
 
-    patch
     sides
-    (
-        (2 3 7 6)
-        (0 1 5 4)
-        (4 5 6 7)
-        (0 3 2 1)
-    )
+    {
+        type patch;
+        faces
+        (
+            (2 3 7 6)
+            (0 1 5 4)
+            (4 5 6 7)
+            (0 3 2 1)
+        );
+    }
 )
 
 mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
index dca52fe5e..4424d653d 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
@@ -12,6 +12,7 @@ FoamFile
     class       dictionary;
     object      blockMeshDict;
 }
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 convertToMeters 0.01;
@@ -39,36 +40,46 @@ blocks
     hex (1 8 9 2 5 10 11 6) (50 36 36) simpleGrading (1 1 1)
 );
 
-patches
+boundary
 (
-    patch
     flow
-    (
-        (8 9 11 10)
-        (0 4 7 3)
-        (2 3 7 6)
-        (2 6 11 9)
-        (4 5 6 7)
-        (5 10 11 6)
-    )
+    {
+        type patch;
+        faces
+        (
+            (8 9 11 10)
+            (0 4 7 3)
+            (2 3 7 6)
+            (2 6 11 9)
+            (4 5 6 7)
+            (5 10 11 6)
+        );
+    }
 
-    symmetryPlane
     entrance
-    (
-        (0 1 5 4)
-        (0 3 2 1)
-    )
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 5 4)
+            (0 3 2 1)
+        );
+    }
 
-    wall
     walls
-    (
-        (1 8 10 5)
-        (1 2 9 8)
-    )
+    {
+        type wall;
+        faces
+        (
+            (1 8 10 5)
+            (1 2 9 8)
+        );
+    }
 )
 
 mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
index b67dafb26..0c15b2ce6 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
@@ -44,27 +44,39 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch flow
-    (
-        (0 6 9 3)
-        (2 5 11 8)
-        (0 1 7 6)
-        (3 9 10 4)
-        (4 10 11 5)
-    )
-    wall obstacle
-    (
-        (1 2 8 7)
-    )
-    cyclic periodic
-    (
-        (0 3 4 1)
-        (1 4 5 2)
-        (6 7 10 9)
-        (7 8 11 10)
-    )
+    flow
+    {
+        type patch;
+        faces
+        (
+            (0 6 9 3)
+            (2 5 11 8)
+            (0 1 7 6)
+            (3 9 10 4)
+            (4 10 11 5)
+        );
+    }
+    obstacle
+    {
+        type wall;
+        faces
+        (
+            (1 2 8 7)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 4 1)
+            (1 4 5 2)
+            (6 7 10 9)
+            (7 8 11 10)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict
index 6a8a68696..d22fb8d54 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict
@@ -33,28 +33,37 @@ blocks
     hex (0 1 2 3 4 5 6 7) liquid (12 12 12) simpleGrading (1 1 1)
 );
 
-patches
+boundary
 (
-    cyclic
     periodicX
-    (
-        (1 2 6 5)
-        (0 4 7 3)
-    )
+    {
+        type cyclic;
+        faces
+        (
+            (1 2 6 5)
+            (0 4 7 3)
+        )
+    }
 
-    cyclic
     periodicY
-    (
-        (2 3 7 6)
-        (0 1 5 4)
-    )
+    {
+        type cyclic;
+        faces
+        (
+            (2 3 7 6)
+            (0 1 5 4)
+        )
+    }
 
-    cyclic
     periodicZ
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    {
+        type cyclic;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        )
+    }
 )
 
 mergePatchPairs
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict
index 38c182f45..aaeb8ae82 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict
@@ -35,26 +35,35 @@ blocks
 
 patches
 (
-    cyclic
     periodicX
-    (
-        (1 2 6 5)
-        (0 4 7 3)
-    )
+    {
+        type cyclic;
+        faces
+        (
+            (1 2 6 5)
+            (0 4 7 3)
+        )
+    }
 
-    cyclic
     periodicY
-    (
-        (2 3 7 6)
-        (0 1 5 4)
-    )
+    {
+        type cyclic;
+        faces
+        (
+            (2 3 7 6)
+            (0 1 5 4)
+        )
+    }
 
-    cyclic
     periodicZ
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    {
+        type cyclic;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        )
+    }
 )
 
 mergePatchPairs
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
index 4b7b30b21..f92737641 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
@@ -18,97 +18,115 @@ convertToMeters 3.2e-9;
 
 vertices
 (
-	(0 0 0)
-	(3.5 0 0)
-	(3.5 3 0)
-	(0 3 0)
-	(0 0 3)
-	(3.5 0 3)
-	(3.5 3 3)
-	(0 3 3)
-	(7.5 1 0.5)
-	(7.5 2 0.5)
-	(7.5 1 2.5)
-	(7.5 2 2.5)
-	(10 1 0.5)
-	(10 2 0.5)
-	(10 1 2.5)
-	(10 2 2.5)
-	(11.5 0.5 -0.5)
-	(11.5 2.5 -0.5)
-	(11.5 0.5 3.5)
-	(11.5 2.5 3.5)
-	(16 0.5 -0.5)
-	(16 2.5 -0.5)
-	(16 0.5 3.5)
-	(16 2.5 3.5)
+    (0 0 0)
+    (3.5 0 0)
+    (3.5 3 0)
+    (0 3 0)
+    (0 0 3)
+    (3.5 0 3)
+    (3.5 3 3)
+    (0 3 3)
+    (7.5 1 0.5)
+    (7.5 2 0.5)
+    (7.5 1 2.5)
+    (7.5 2 2.5)
+    (10 1 0.5)
+    (10 2 0.5)
+    (10 1 2.5)
+    (10 2 2.5)
+    (11.5 0.5 -0.5)
+    (11.5 2.5 -0.5)
+    (11.5 0.5 3.5)
+    (11.5 2.5 3.5)
+    (16 0.5 -0.5)
+    (16 2.5 -0.5)
+    (16 0.5 3.5)
+    (16 2.5 3.5)
 );
 
 blocks
 (
-	hex (0 1 2 3 4 5 6 7) sectionA (20 16 16) simpleGrading (1 1 1)
+    hex (0 1 2 3 4 5 6 7) sectionA (20 16 16) simpleGrading (1 1 1)
     hex (1 8 9 2 5 10 11 6) sectionA (20 16 16) simpleGrading (1 1 1)
-	hex (8 12 13 9 10 14 15 11) sectionB (29 16 16) simpleGrading (1 1 1)
-	hex (12 16 17 13 14 18 19 15) sectionC (17 16 16) simpleGrading (1 1 1)
-	hex (16 20 21 17 18 22 23 19) sectionC (20 16 16) simpleGrading (1 1 1)
+    hex (8 12 13 9 10 14 15 11) sectionB (29 16 16) simpleGrading (1 1 1)
+    hex (12 16 17 13 14 18 19 15) sectionC (17 16 16) simpleGrading (1 1 1)
+    hex (16 20 21 17 18 22 23 19) sectionC (20 16 16) simpleGrading (1 1 1)
 );
 
 edges
 ();
 
-patches
+boundary
 (
-	patch
-	sectionAEnd
-	(
-		(0 4 7 3)
-	)
+    sectionAEnd
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
 
-	wall
-	sectionCEnd
-	(
-		(20 21 23 22)
-	)
+    sectionCEnd
+    {
+        type wall;
+        faces
+        (
+            (20 21 23 22)
+        );
+    }
 
-	wall
-	front
-	(
-		(0 1 5 4)
-		(1 8 10 5)
-		(8 12 14 10)
-		(12 16 18 14)
-		(16 20 22 18)
-	)
+    front
+    {
+        type wall;
+        faces
+        (
+            (0 1 5 4)
+            (1 8 10 5)
+            (8 12 14 10)
+            (12 16 18 14)
+            (16 20 22 18)
+        );
+    }
 
-	wall
-	back
-	(
-		(2 3 7 6)
-		(2 6 11 9)
-		(9 11 15 13)
-		(13 15 19 17)
-		(17 19 23 21)
-	)
+    back
+    {
+        type wall;
+        faces
+        (
+            (2 3 7 6)
+            (2 6 11 9)
+            (9 11 15 13)
+            (13 15 19 17)
+            (17 19 23 21)
+        );
+    }
 
-	wall
-	top
-	(
-		(4 5 6 7)
-		(5 10 11 6)
-		(10 14 15 11)
-		(14 18 19 15)
-		(18 22 23 19)
-	)
+    top
+    {
+        type wall;
+        faces
+        (
+            (4 5 6 7)
+            (5 10 11 6)
+            (10 14 15 11)
+            (14 18 19 15)
+            (18 22 23 19)
+        );
+    }
 
-	wall
-	bottom
-	(
-		(0 3 2 1)
-		(1 2 9 8)
-		(8 9 13 12)
-		(12 13 17 16)
-		(16 17 21 20)
-	)
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+            (1 2 9 8)
+            (8 9 13 12)
+            (12 13 17 16)
+            (16 17 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
index 2a9e599b3..66fe9df9a 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
@@ -63,33 +63,53 @@ edges
     arc 15 20 (0.0145419 0.0351074 0.01)
 );
 
-patches
+boundary
 (
-    symmetryPlane left
-    (
-        (8 9 20 19)
-        (9 10 21 20)
-    )
-    symmetryPlane right
-    (
-        (2 3 14 13)
-        (3 6 17 14)
-    )
-    symmetryPlane down
-    (
-        (0 1 12 11)
-        (1 2 13 12)
-    )
-    patch up
-    (
-        (7 8 19 18)
-        (6 7 18 17)
-    )
-    patch hole
-    (
-        (10 5 16 21)
-        (5 0 11 16)
-    )
+    left
+    {
+        type symmetryPlane;
+        faces
+        (
+            (8 9 20 19)
+            (9 10 21 20)
+        );
+    }
+    right
+    {
+        type symmetryPlane;
+        faces
+        (
+            (2 3 14 13)
+            (3 6 17 14)
+        );
+    }
+    down
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 12 11)
+            (1 2 13 12)
+        );
+    }
+    up
+    {
+        type patch;
+        faces
+        (
+            (7 8 19 18)
+            (6 7 18 17)
+        );
+    }
+    hole
+    {
+        type patch;
+        faces
+        (
+            (10 5 16 21)
+            (5 0 11 16)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
index c3b36259b..6f033e7bd 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
@@ -37,29 +37,49 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 4 7 3)
-    )
-    patch outlet
-    (
-        (2 6 5 1)
-    )
-    patch lowerWall
-    (
-        (1 5 4 0)
-    )
-    patch upperWall
-    (
-        (3 7 6 2)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    lowerWall
+    {
+        type patch;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    upperWall
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/equationReader/equationReaderDemo/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/equationReader/equationReaderDemo/pitzDaily/constant/polyMesh/blockMeshDict
index 4987f5c8b..f320149c9 100644
--- a/tutorials/equationReader/equationReaderDemo/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/equationReader/equationReaderDemo/pitzDaily/constant/polyMesh/blockMeshDict
@@ -85,65 +85,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/equationReader/equationReaderDemo/pitzDaily/constant/polyMesh/boundary b/tutorials/equationReader/equationReaderDemo/pitzDaily/constant/polyMesh/boundary
deleted file mode 100644
index d9d52338f..000000000
--- a/tutorials/equationReader/equationReaderDemo/pitzDaily/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       24170;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          57;
-        startFace       24200;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          223;
-        startFace       24257;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          250;
-        startFace       24480;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          24450;
-        startFace       24730;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
index f77ae0039..3f9f26283 100644
--- a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
+++ b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
@@ -37,16 +37,24 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch lowValue
-    (
-        (0 4 7 3)
-    )
-    patch highValue
-    (
-        (2 6 5 1)
-    )
+    lowValue
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    highValue
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/constant/polyMesh/blockMeshDict
index 566b2b70a..d1062142a 100644
--- a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/constant/polyMesh/blockMeshDict
@@ -37,29 +37,53 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (3 7 6 2)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-    )
-    wall left
-    (
-        (0 4 7 3)
-    )
-    wall right
-    (
-        (2 6 5 1)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+
+    left
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    right
+    {
+        type wall;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
index a0790ed96..902bdf28b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
@@ -37,23 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall floor
-    (
-        (1 5 4 0)
-    )
-    wall ceiling
-    (
-        (3 7 6 2)
-    )
-    wall fixedWalls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    floor
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    ceiling
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/boundary
deleted file mode 100644
index 9921ec521..000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    floor
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11200;
-    }
-    ceiling
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11600;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          800;
-        startFace       12000;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
index a0790ed96..902bdf28b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
@@ -37,23 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall floor
-    (
-        (1 5 4 0)
-    )
-    wall ceiling
-    (
-        (3 7 6 2)
-    )
-    wall fixedWalls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    floor
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    ceiling
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary
deleted file mode 100644
index 9921ec521..000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    floor
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11200;
-    }
-    ceiling
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11600;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          800;
-        startFace       12000;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
index bb7c8c059..275db5311 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
@@ -37,37 +37,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    empty maxY
-    (
-        (3 7 6 2)
-    )
+    maxY
+    {
+        type symmetryPlane;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
 
-    empty minX
-    (
-        (0 4 7 3)
-    )
+    minX
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
 
-    empty maxX
-    (
-        (2 6 5 1)
-    )
+    maxX
+    {
+        type symmetryPlane;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
 
-    empty minY
-    (
-        (1 5 4 0)
-    )
+    minY
+    {
+        type symmetryPlane;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
 
-    wall ground
-    (
-        (0 3 2 1)
-    )
+    ground
+    {
+        type        wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
 
-    empty maxZ
-    (
-        (4 5 6 7)
-    )
+    maxZ
+    {
+        type symmetryPlane;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
index a0790ed96..902bdf28b 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
@@ -37,23 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall floor
-    (
-        (1 5 4 0)
-    )
-    wall ceiling
-    (
-        (3 7 6 2)
-    )
-    wall fixedWalls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    floor
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    ceiling
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/boundary
deleted file mode 100644
index 9921ec521..000000000
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    floor
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11200;
-    }
-    ceiling
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11600;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          800;
-        startFace       12000;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
index a0790ed96..902bdf28b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
@@ -37,23 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall floor
-    (
-        (1 5 4 0)
-    )
-    wall ceiling
-    (
-        (3 7 6 2)
-    )
-    wall fixedWalls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    floor
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    ceiling
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary
deleted file mode 100644
index 9921ec521..000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    floor
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11200;
-    }
-    ceiling
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11600;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          800;
-        startFace       12000;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
index df6e73af9..d973ce9b6 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
@@ -98,69 +98,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall box
-    (
-        ( 6 22 21  5)
-        (10 26 22  6)
-        ( 9 25 26 10)
-        ( 5 21 25  9)
-        (22 26 25 21)
-    )
-    wall floor
-    (
-        ( 1  5  4  0)
-        ( 2  6  5  1)
-        ( 3  7  6  2)
-        ( 5  9  8  4)
-        ( 7 11 10  6)
-        ( 9 13 12  8)
-        (10 14 13  9)
-        (11 15 14 10)
-    )
-    wall ceiling
-    (
-        (33 37 36 32)
-        (34 38 37 33)
-        (35 39 38 34)
-        (37 41 40 36)
-        (38 42 41 37)
-        (39 43 42 38)
-        (41 45 44 40)
-        (42 46 45 41)
-        (43 47 46 42)
-    )
-    wall fixedWalls
-    (
-        ( 1 17 16  0)
-        ( 2 18 17  1)
-        ( 3 19 18  2)
-        (17 33 32 16)
-        (18 34 33 17)
-        (19 35 34 18)
+    box
+    {
+        type wall;
+        faces
+        (
+            ( 6 22 21  5)
+            (10 26 22  6)
+            ( 9 25 26 10)
+            ( 5 21 25  9)
+            (22 26 25 21)
+        );
+    }
+    floor
+    {
+        type wall;
+        faces
+        (
+            ( 1  5  4  0)
+            ( 2  6  5  1)
+            ( 3  7  6  2)
+            ( 5  9  8  4)
+            ( 7 11 10  6)
+            ( 9 13 12  8)
+            (10 14 13  9)
+            (11 15 14 10)
+        );
+    }
+    ceiling
+    {
+        type wall;
+        faces
+        (
+            (33 37 36 32)
+            (34 38 37 33)
+            (35 39 38 34)
+            (37 41 40 36)
+            (38 42 41 37)
+            (39 43 42 38)
+            (41 45 44 40)
+            (42 46 45 41)
+            (43 47 46 42)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            ( 1 17 16  0)
+            ( 2 18 17  1)
+            ( 3 19 18  2)
+            (17 33 32 16)
+            (18 34 33 17)
+            (19 35 34 18)
 
-        ( 7 23 19  3)
-        (11 27 23  7)
-        (15 31 27 11)
-        (23 39 35 19)
-        (27 43 39 23)
-        (31 47 43 27)
+            ( 7 23 19  3)
+            (11 27 23  7)
+            (15 31 27 11)
+            (23 39 35 19)
+            (27 43 39 23)
+            (31 47 43 27)
 
-        (14 30 31 15)
-        (13 29 30 14)
-        (12 28 29 13)
-        (30 46 47 31)
-        (29 45 46 30)
-        (28 44 45 29)
+            (14 30 31 15)
+            (13 29 30 14)
+            (12 28 29 13)
+            (30 46 47 31)
+            (29 45 46 30)
+            (28 44 45 29)
 
-        ( 8 24 28 12)
-        ( 4 20 24  8)
-        ( 0 16 20  4)
-        (24 40 44 28)
-        (20 36 40 24)
-        (16 32 36 20)
-    )
+            ( 8 24 28 12)
+            ( 4 20 24  8)
+            ( 0 16 20  4)
+            (24 40 44 28)
+            (20 36 40 24)
+            (16 32 36 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary
deleted file mode 100644
index d8b87d31e..000000000
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    box
-    {
-        type            wall;
-        nFaces          300;
-        startFace       303675;
-    }
-    floor
-    {
-        type            wall;
-        nFaces          5125;
-        startFace       303975;
-    }
-    ceiling
-    {
-        type            wall;
-        nFaces          5225;
-        startFace       309100;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          6000;
-        startFace       314325;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict
index 607816c4e..d973ce9b6 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict
@@ -98,69 +98,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall box
-    (
-        ( 6 22 21  5)
-        (10 26 22  6)
-        ( 9 25 26 10)
-        ( 5 21 25  9)
-        (22 26 25 21)
-    )
-    wall floor
-    (
-        ( 1  5  4  0)
-        ( 2  6  5  1)
-        ( 3  7  6  2)
-        ( 5  9  8  4)
-        ( 7 11 10  6)
-        ( 9 13 12  8)
-        (10 14 13  9)
-        (11 15 14 10)
-    )
-    wall ceiling
-    (
-        (33 37 36 32)
-        (34    38 37 33)
-        (35 39 38 34)
-        (37 41 40 36)
-        (38 42 41 37)
-        (39 43 42 38)
-        (41 45 44 40)
-        (42 46 45 41)
-        (43 47 46 42)
-    )
-    wall fixedWalls
-    (
-        ( 1 17 16  0)
-        ( 2 18 17  1)
-        ( 3 19 18  2)
-        (17 33 32 16)
-        (18 34 33 17)
-        (19 35 34 18)
+    box
+    {
+        type wall;
+        faces
+        (
+            ( 6 22 21  5)
+            (10 26 22  6)
+            ( 9 25 26 10)
+            ( 5 21 25  9)
+            (22 26 25 21)
+        );
+    }
+    floor
+    {
+        type wall;
+        faces
+        (
+            ( 1  5  4  0)
+            ( 2  6  5  1)
+            ( 3  7  6  2)
+            ( 5  9  8  4)
+            ( 7 11 10  6)
+            ( 9 13 12  8)
+            (10 14 13  9)
+            (11 15 14 10)
+        );
+    }
+    ceiling
+    {
+        type wall;
+        faces
+        (
+            (33 37 36 32)
+            (34 38 37 33)
+            (35 39 38 34)
+            (37 41 40 36)
+            (38 42 41 37)
+            (39 43 42 38)
+            (41 45 44 40)
+            (42 46 45 41)
+            (43 47 46 42)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            ( 1 17 16  0)
+            ( 2 18 17  1)
+            ( 3 19 18  2)
+            (17 33 32 16)
+            (18 34 33 17)
+            (19 35 34 18)
 
-        ( 7 23 19  3)
-        (11 27 23  7)
-        (15 31 27 11)
-        (23 39 35 19)
-        (27 43 39 23)
-        (31 47 43 27)
+            ( 7 23 19  3)
+            (11 27 23  7)
+            (15 31 27 11)
+            (23 39 35 19)
+            (27 43 39 23)
+            (31 47 43 27)
 
-        (14 30 31 15)
-        (13 29 30 14)
-        (12 28 29 13)
-        (30 46 47 31)
-        (29 45 46 30)
-        (28 44 45 29)
+            (14 30 31 15)
+            (13 29 30 14)
+            (12 28 29 13)
+            (30 46 47 31)
+            (29 45 46 30)
+            (28 44 45 29)
 
-        ( 8 24 28 12)
-        ( 4 20 24  8)
-        ( 0 16 20  4)
-        (24 40 44 28)
-        (20 36 40 24)
-        (16 32 36 20)
-    )
+            ( 8 24 28 12)
+            ( 4 20 24  8)
+            ( 0 16 20  4)
+            (24 40 44 28)
+            (20 36 40 24)
+            (16 32 36 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary
deleted file mode 100644
index 4b142ec8d..000000000
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    box
-    {
-        type            wall;
-        nFaces          300;
-        startFace       303675;
-    }
-    floor
-    {
-        type            wall;
-        nFaces          5125;
-        startFace       303975;
-    }
-    ceiling
-    {
-        type            wall;
-        nFaces          5225;
-        startFace       309100;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          6000;
-        startFace       314325;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
index 04616bc3f..7482a81c8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
@@ -37,32 +37,56 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall maxY
-    (
-        (3 7 6 2)
-    )
-    patch minX
-    (
-        (0 4 7 3)
-    )
-    patch maxX
-    (
-        (2 6 5 1)
-    )
-    wall minY
-    (
-        (1 5 4 0)
-    )
-    wall minZ
-    (
-        (0 3 2 1)
-    )
-    wall maxZ
-    (
-        (4 5 6 7)
-    )
+    maxY
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    minX
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    maxX
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    minY
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    minZ
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+    maxZ
+    {
+        type wall;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
index 04616bc3f..7482a81c8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
@@ -37,32 +37,56 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall maxY
-    (
-        (3 7 6 2)
-    )
-    patch minX
-    (
-        (0 4 7 3)
-    )
-    patch maxX
-    (
-        (2 6 5 1)
-    )
-    wall minY
-    (
-        (1 5 4 0)
-    )
-    wall minZ
-    (
-        (0 3 2 1)
-    )
-    wall maxZ
-    (
-        (4 5 6 7)
-    )
+    maxY
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    minX
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    maxX
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    minY
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    minZ
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+    maxZ
+    {
+        type wall;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
index 04616bc3f..7482a81c8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
@@ -37,32 +37,56 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall maxY
-    (
-        (3 7 6 2)
-    )
-    patch minX
-    (
-        (0 4 7 3)
-    )
-    patch maxX
-    (
-        (2 6 5 1)
-    )
-    wall minY
-    (
-        (1 5 4 0)
-    )
-    wall minZ
-    (
-        (0 3 2 1)
-    )
-    wall maxZ
-    (
-        (4 5 6 7)
-    )
+    maxY
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    minX
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    maxX
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    minY
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    minZ
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+    maxZ
+    {
+        type wall;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
deleted file mode 100644
index 8e6f00a26..000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    maxY
-    {
-        type            wall;
-        nFaces          300;
-        startFace       8300;
-    }
-    minX
-    {
-        type            patch;
-        nFaces          100;
-        startFace       8600;
-    }
-    maxX
-    {
-        type            patch;
-        nFaces          100;
-        startFace       8700;
-    }
-    minY
-    {
-        type            wall;
-        nFaces          300;
-        startFace       8800;
-    }
-    minZ
-    {
-        type            wall;
-        nFaces          300;
-        startFace       9100;
-    }
-    maxZ
-    {
-        type            wall;
-        nFaces          300;
-        startFace       9400;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
index e29b8c86d..05a6af733 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
@@ -433,127 +433,143 @@ edges
     arc 94 84 (0.923879532683006 0.382683431950523 0.1)
 );
 
-patches
+boundary
 (
-    wall rotor
-    (
-        (0 2 50 48)
-        (2 4 52 50)
-        (3 5 53 51)
-        (5 7 55 53)
-        (6 8 56 54)
-        (8 10 58 56)
-        (9 11 59 57)
-        (11 1 49 59)
+    rotor
+    {
+        type wall;
+        faces
+        (
+            (0 2 50 48)
+            (2 4 52 50)
+            (3 5 53 51)
+            (5 7 55 53)
+            (6 8 56 54)
+            (8 10 58 56)
+            (9 11 59 57)
+            (11 1 49 59)
 
-        (0 12 60 48)
-        (1 12 60 49)
+            (0 12 60 48)
+            (1 12 60 49)
 
-        (3 14 62 51)
-        (4 14 62 52)
+            (3 14 62 51)
+            (4 14 62 52)
 
-        (6 16 64 54)
-        (7 16 64 55)
+            (6 16 64 54)
+            (7 16 64 55)
 
-        (9 18 66 57)
-        (10 18 66 58)
-    )
+            (9 18 66 57)
+            (10 18 66 58)
+        );
+    }
 
-    wall stator
-    (
-        (36 38 86 84)
-        (37 39 87 85)
-        (39 41 89 87)
-        (40 42 90 88)
-        (42 44 92 90)
-        (43 45 93 91)
-        (45 47 95 93)
-        (46 36 84 94)
+    stator
+    {
+        type wall;
+        faces
+        (
+            (36 38 86 84)
+            (37 39 87 85)
+            (39 41 89 87)
+            (40 42 90 88)
+            (42 44 92 90)
+            (43 45 93 91)
+            (45 47 95 93)
+            (46 36 84 94)
 
-        (37 29 77 85)
-        (38 29 77 86)
+            (37 29 77 85)
+            (38 29 77 86)
 
-        (40 31 79 88)
-        (41 31 79 89)
+            (40 31 79 88)
+            (41 31 79 89)
 
-        (43 33 81 91)
-        (44 33 81 92)
+            (43 33 81 91)
+            (44 33 81 92)
 
-        (46 35 83 94)
-        (47 35 83 95)
-    )
+            (46 35 83 94)
+            (47 35 83 95)
+        );
+    }
 
-    empty front
-    (
-        (48 50 61 60)
-        (50 52 62 61)
-        (51 53 63 62)
-        (53 55 64 63)
-        (54 56 65 64)
-        (56 58 66 65)
-        (57 59 67 66)
-        (59 49 60 67)
-        (60 61 69 68)
-        (61 62 70 69)
-        (62 63 71 70)
-        (63 64 72 71)
-        (64 65 73 72)
-        (65 66 74 73)
-        (66 67 75 74)
-        (67 60 68 75)
-        (68 69 77 76)
-        (69 70 78 77)
-        (70 71 79 78)
-        (71 72 80 79)
-        (72 73 81 80)
-        (73 74 82 81)
-        (74 75 83 82)
-        (75 68 76 83)
-        (76 77 86 84)
-        (77 78 87 85)
-        (78 79 89 87)
-        (79 80 90 88)
-        (80 81 92 90)
-        (81 82 93 91)
-        (82 83 95 93)
-        (83 76 84 94)
-    )
+    front
+    {
+        type empty;
+        faces
+        (
+            (48 50 61 60)
+            (50 52 62 61)
+            (51 53 63 62)
+            (53 55 64 63)
+            (54 56 65 64)
+            (56 58 66 65)
+            (57 59 67 66)
+            (59 49 60 67)
+            (60 61 69 68)
+            (61 62 70 69)
+            (62 63 71 70)
+            (63 64 72 71)
+            (64 65 73 72)
+            (65 66 74 73)
+            (66 67 75 74)
+            (67 60 68 75)
+            (68 69 77 76)
+            (69 70 78 77)
+            (70 71 79 78)
+            (71 72 80 79)
+            (72 73 81 80)
+            (73 74 82 81)
+            (74 75 83 82)
+            (75 68 76 83)
+            (76 77 86 84)
+            (77 78 87 85)
+            (78 79 89 87)
+            (79 80 90 88)
+            (80 81 92 90)
+            (81 82 93 91)
+            (82 83 95 93)
+            (83 76 84 94)
+        );
+    }
 
-    empty back
-    (
-        (0 12 13 2)
-        (2 13 14 4)
-        (3 14 15 5)
-        (5 15 16 7)
-        (6 16 17 8)
-        (8 17 18 10)
-        (9 18 19 11)
-        (11 19 12 1)
-        (12 20 21 13)
-        (13 21 22 14)
-        (14 22 23 15)
-        (15 23 24 16)
-        (16 24 25 17)
-        (17 25 26 18)
-        (18 26 27 19)
-        (19 27 20 12)
-        (20 28 29 21)
-        (21 29 30 22)
-        (22 30 31 23)
-        (23 31 32 24)
-        (24 32 33 25)
-        (25 33 34 26)
-        (26 34 35 27)
-        (27 35 28 20)
-        (28 36 38 29)
-        (29 37 39 30)
-        (30 39 41 31)
-        (31 40 42 32)
-        (32 42 44 33)
-        (33 43 45 34)
-        (34 45 47 35)
-        (35 46 36 28)
-    )
+    back
+    {
+        type empty;
+        faces
+        (
+            (0 12 13 2)
+            (2 13 14 4)
+            (3 14 15 5)
+            (5 15 16 7)
+            (6 16 17 8)
+            (8 17 18 10)
+            (9 18 19 11)
+            (11 19 12 1)
+            (12 20 21 13)
+            (13 21 22 14)
+            (14 22 23 15)
+            (15 23 24 16)
+            (16 24 25 17)
+            (17 25 26 18)
+            (18 26 27 19)
+            (19 27 20 12)
+            (20 28 29 21)
+            (21 29 30 22)
+            (22 30 31 23)
+            (23 31 32 24)
+            (24 32 33 25)
+            (25 33 34 26)
+            (26 34 35 27)
+            (27 35 28 20)
+            (28 36 38 29)
+            (29 37 39 30)
+            (30 39 41 31)
+            (31 40 42 32)
+            (32 42 44 33)
+            (33 43 45 34)
+            (34 45 47 35)
+            (35 46 36 28)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
index 96bad0058..ee6638412 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -693,127 +693,143 @@ edges
     arc R7t R0t evert(4, 7, Zt)
 );
 
-patches
+boundary
 (
-    wall rotor
-    (
-        quad2D(r0, r1)
-        quad2D(r1, r2s)
-        quad2D(r2, r3)
-        quad2D(r3, r4s)
-        quad2D(r4, r5)
-        quad2D(r5, r6s)
-        quad2D(r6, r7)
-        quad2D(r7, r0s)
+    rotor
+    {
+        type wall;
+        faces
+        (
+            quad2D(r0, r1)
+            quad2D(r1, r2s)
+            quad2D(r2, r3)
+            quad2D(r3, r4s)
+            quad2D(r4, r5)
+            quad2D(r5, r6s)
+            quad2D(r6, r7)
+            quad2D(r7, r0s)
+    
+            quad2D(r0, rb0)
+            quad2D(r0s, rb0)
+    
+            quad2D(r2, rb2)
+            quad2D(r2s, rb2)
+    
+            quad2D(r4, rb4)
+            quad2D(r4s, rb4)
+    
+            quad2D(r6, rb6)
+            quad2D(r6s, rb6)
+        );
+    }
 
-        quad2D(r0, rb0)
-        quad2D(r0s, rb0)
+    stator
+    {
+        type wall;
+        faces
+        (
+            quad2D(R0, R1s)
+            quad2D(R1, R2)
+            quad2D(R2, R3s)
+            quad2D(R3, R4)
+            quad2D(R4, R5s)
+            quad2D(R5, R6)
+            quad2D(R6, R7s)
+            quad2D(R7, R0)
+    
+            quad2D(R1, Rb1)
+            quad2D(R1s, Rb1)
+    
+            quad2D(R3, Rb3)
+            quad2D(R3s, Rb3)
+    
+            quad2D(R5, Rb5)
+            quad2D(R5s, Rb5)
+    
+            quad2D(R7, Rb7)
+            quad2D(R7s, Rb7)
+        );
+    }
 
-        quad2D(r2, rb2)
-        quad2D(r2s, rb2)
+    front
+    {
+        type empty;
+        faces
+        (
+            frontQuad(r0, r1, rb1, rb0)
+            frontQuad(r1, r2s, rb2, rb1)
+            frontQuad(r2, r3, rb3, rb2)
+            frontQuad(r3, r4s, rb4, rb3)
+            frontQuad(r4, r5, rb5, rb4)
+            frontQuad(r5, r6s, rb6, rb5)
+            frontQuad(r6, r7, rb7, rb6)
+            frontQuad(r7, r0s, rb0, rb7)
+            frontQuad(rb0, rb1, ri1, ri0)
+            frontQuad(rb1, rb2, ri2, ri1)
+            frontQuad(rb2, rb3, ri3, ri2)
+            frontQuad(rb3, rb4, ri4, ri3)
+            frontQuad(rb4, rb5, ri5, ri4)
+            frontQuad(rb5, rb6, ri6, ri5)
+            frontQuad(rb6, rb7, ri7, ri6)
+            frontQuad(rb7, rb0, ri0, ri7)
+            frontQuad(ri0, ri1, Rb1, Rb0)
+            frontQuad(ri1, ri2, Rb2, Rb1)
+            frontQuad(ri2, ri3, Rb3, Rb2)
+            frontQuad(ri3, ri4, Rb4, Rb3)
+            frontQuad(ri4, ri5, Rb5, Rb4)
+            frontQuad(ri5, ri6, Rb6, Rb5)
+            frontQuad(ri6, ri7, Rb7, Rb6)
+            frontQuad(ri7, ri0, Rb0, Rb7)
+            frontQuad(Rb0, Rb1, R1s, R0)
+            frontQuad(Rb1, Rb2, R2, R1)
+            frontQuad(Rb2, Rb3, R3s, R2)
+            frontQuad(Rb3, Rb4, R4, R3)
+            frontQuad(Rb4, Rb5, R5s, R4)
+            frontQuad(Rb5, Rb6, R6, R5)
+            frontQuad(Rb6, Rb7, R7s, R6)
+            frontQuad(Rb7, Rb0, R0, R7)
+        );
+    }
 
-        quad2D(r4, rb4)
-        quad2D(r4s, rb4)
-
-        quad2D(r6, rb6)
-        quad2D(r6s, rb6)
-    )
-
-    wall stator
-    (
-        quad2D(R0, R1s)
-        quad2D(R1, R2)
-        quad2D(R2, R3s)
-        quad2D(R3, R4)
-        quad2D(R4, R5s)
-        quad2D(R5, R6)
-        quad2D(R6, R7s)
-        quad2D(R7, R0)
-
-        quad2D(R1, Rb1)
-        quad2D(R1s, Rb1)
-
-        quad2D(R3, Rb3)
-        quad2D(R3s, Rb3)
-
-        quad2D(R5, Rb5)
-        quad2D(R5s, Rb5)
-
-        quad2D(R7, Rb7)
-        quad2D(R7s, Rb7)
-    )
-
-    empty front
-    (
-        frontQuad(r0, r1, rb1, rb0)
-        frontQuad(r1, r2s, rb2, rb1)
-        frontQuad(r2, r3, rb3, rb2)
-        frontQuad(r3, r4s, rb4, rb3)
-        frontQuad(r4, r5, rb5, rb4)
-        frontQuad(r5, r6s, rb6, rb5)
-        frontQuad(r6, r7, rb7, rb6)
-        frontQuad(r7, r0s, rb0, rb7)
-        frontQuad(rb0, rb1, ri1, ri0)
-        frontQuad(rb1, rb2, ri2, ri1)
-        frontQuad(rb2, rb3, ri3, ri2)
-        frontQuad(rb3, rb4, ri4, ri3)
-        frontQuad(rb4, rb5, ri5, ri4)
-        frontQuad(rb5, rb6, ri6, ri5)
-        frontQuad(rb6, rb7, ri7, ri6)
-        frontQuad(rb7, rb0, ri0, ri7)
-        frontQuad(ri0, ri1, Rb1, Rb0)
-        frontQuad(ri1, ri2, Rb2, Rb1)
-        frontQuad(ri2, ri3, Rb3, Rb2)
-        frontQuad(ri3, ri4, Rb4, Rb3)
-        frontQuad(ri4, ri5, Rb5, Rb4)
-        frontQuad(ri5, ri6, Rb6, Rb5)
-        frontQuad(ri6, ri7, Rb7, Rb6)
-        frontQuad(ri7, ri0, Rb0, Rb7)
-        frontQuad(Rb0, Rb1, R1s, R0)
-        frontQuad(Rb1, Rb2, R2, R1)
-        frontQuad(Rb2, Rb3, R3s, R2)
-        frontQuad(Rb3, Rb4, R4, R3)
-        frontQuad(Rb4, Rb5, R5s, R4)
-        frontQuad(Rb5, Rb6, R6, R5)
-        frontQuad(Rb6, Rb7, R7s, R6)
-        frontQuad(Rb7, Rb0, R0, R7)
-    )
-
-    empty back
-    (
-        backQuad(r0, r1, rb1, rb0)
-        backQuad(r1, r2s, rb2, rb1)
-        backQuad(r2, r3, rb3, rb2)
-        backQuad(r3, r4s, rb4, rb3)
-        backQuad(r4, r5, rb5, rb4)
-        backQuad(r5, r6s, rb6, rb5)
-        backQuad(r6, r7, rb7, rb6)
-        backQuad(r7, r0s, rb0, rb7)
-        backQuad(rb0, rb1, ri1, ri0)
-        backQuad(rb1, rb2, ri2, ri1)
-        backQuad(rb2, rb3, ri3, ri2)
-        backQuad(rb3, rb4, ri4, ri3)
-        backQuad(rb4, rb5, ri5, ri4)
-        backQuad(rb5, rb6, ri6, ri5)
-        backQuad(rb6, rb7, ri7, ri6)
-        backQuad(rb7, rb0, ri0, ri7)
-        backQuad(ri0, ri1, Rb1, Rb0)
-        backQuad(ri1, ri2, Rb2, Rb1)
-        backQuad(ri2, ri3, Rb3, Rb2)
-        backQuad(ri3, ri4, Rb4, Rb3)
-        backQuad(ri4, ri5, Rb5, Rb4)
-        backQuad(ri5, ri6, Rb6, Rb5)
-        backQuad(ri6, ri7, Rb7, Rb6)
-        backQuad(ri7, ri0, Rb0, Rb7)
-        backQuad(Rb0, Rb1, R1s, R0)
-        backQuad(Rb1, Rb2, R2, R1)
-        backQuad(Rb2, Rb3, R3s, R2)
-        backQuad(Rb3, Rb4, R4, R3)
-        backQuad(Rb4, Rb5, R5s, R4)
-        backQuad(Rb5, Rb6, R6, R5)
-        backQuad(Rb6, Rb7, R7s, R6)
-        backQuad(Rb7, Rb0, R0, R7)
-    )
+    back
+    {
+        type empty;
+        faces
+        (
+            backQuad(r0, r1, rb1, rb0)
+            backQuad(r1, r2s, rb2, rb1)
+            backQuad(r2, r3, rb3, rb2)
+            backQuad(r3, r4s, rb4, rb3)
+            backQuad(r4, r5, rb5, rb4)
+            backQuad(r5, r6s, rb6, rb5)
+            backQuad(r6, r7, rb7, rb6)
+            backQuad(r7, r0s, rb0, rb7)
+            backQuad(rb0, rb1, ri1, ri0)
+            backQuad(rb1, rb2, ri2, ri1)
+            backQuad(rb2, rb3, ri3, ri2)
+            backQuad(rb3, rb4, ri4, ri3)
+            backQuad(rb4, rb5, ri5, ri4)
+            backQuad(rb5, rb6, ri6, ri5)
+            backQuad(rb6, rb7, ri7, ri6)
+            backQuad(rb7, rb0, ri0, ri7)
+            backQuad(ri0, ri1, Rb1, Rb0)
+            backQuad(ri1, ri2, Rb2, Rb1)
+            backQuad(ri2, ri3, Rb3, Rb2)
+            backQuad(ri3, ri4, Rb4, Rb3)
+            backQuad(ri4, ri5, Rb5, Rb4)
+            backQuad(ri5, ri6, Rb6, Rb5)
+            backQuad(ri6, ri7, Rb7, Rb6)
+            backQuad(ri7, ri0, Rb0, Rb7)
+            backQuad(Rb0, Rb1, R1s, R0)
+            backQuad(Rb1, Rb2, R2, R1)
+            backQuad(Rb2, Rb3, R3s, R2)
+            backQuad(Rb3, Rb4, R4, R3)
+            backQuad(Rb4, Rb5, R5s, R4)
+            backQuad(Rb5, Rb6, R6, R5)
+            backQuad(Rb6, Rb7, R7s, R6)
+            backQuad(Rb7, Rb0, R0, R7)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 2d2f1709e..000000000
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-rotor
-{
-    type wall;
-    nFaces 192;
-    startFace 5952;
-}
-
-stator
-{
-    type wall;
-    nFaces 192;
-    startFace 6144;
-}
-
-front
-{
-    type empty;
-    nFaces 3072;
-    startFace 6336;
-}
-
-back
-{
-    type empty;
-    nFaces 3072;
-    startFace 9408;
-}
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
index 35e6fa9db..3c5172ab0 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
@@ -42,26 +42,38 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall lowerWall
-    (
-        (0 3 9 6)
-    )
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 3 9 6)
+        );
+    }
 
-    wall upperWall
-    (
-        (2 8 11 5)
-    )
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (2 8 11 5)
+        );
+    }
 
-    cyclic frontBack
-    (
-        (0 6 7 1)
-        (1 7 8 2)
+    frontBack
+    {
+		type cyclic;
+		faces
+		(
+		    (0 6 7 1)
+		    (1 7 8 2)
 
-        (9 3 4 10)
-        (10 4 5 11)
-    )
+		    (9 3 4 10)
+		    (10 4 5 11)
+		);
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/blockMeshDict
index 8675c426a..8895f5853 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/blockMeshDict
@@ -42,25 +42,39 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall lowerWall
-    (
-        (0 3 9 6)
-    )
-    wall upperWall
-    (
-        (2 8 11 5)
-    )
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 3 9 6)
+        );
+    }
 
-    cyclic flow
-    (
-        (0 6 7 1)
-        (1 7 8 2)
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (2 8 11 5)
+        );
+    }
 
-        (3 4 10 9)
-        (4 5 11 10)
-    )
+    flow
+    {
+		type cyclic;
+		faces
+		(
+
+            (0 6 7 1)
+            (1 7 8 2)
+
+            (3 4 10 9)
+            (4 5 11 10)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/boundaryWallFunctions/0/R b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/0/R
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R
diff --git a/tutorials/incompressible/boundaryWallFunctions/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/0/U
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
diff --git a/tutorials/incompressible/boundaryWallFunctions/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/0/epsilon
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
diff --git a/tutorials/incompressible/boundaryWallFunctions/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/0/k
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
diff --git a/tutorials/incompressible/boundaryWallFunctions/0/nu.xy b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nu.xy
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/0/nu.xy
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nu.xy
diff --git a/tutorials/incompressible/boundaryWallFunctions/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/0/nuTilda
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
diff --git a/tutorials/incompressible/boundaryWallFunctions/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/Allrun
old mode 100644
new mode 100755
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/Allrun
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/Allrun
diff --git a/tutorials/incompressible/boundaryWallFunctions/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/constant/RASProperties
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties
diff --git a/tutorials/incompressible/boundaryWallFunctions/constant/gammaDot.xy b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/gammaDot.xy
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/constant/gammaDot.xy
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/gammaDot.xy
diff --git a/tutorials/incompressible/boundaryWallFunctions/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
similarity index 84%
rename from tutorials/incompressible/boundaryWallFunctions/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
index b78ef6fa9..1c8bf0a1f 100644
--- a/tutorials/incompressible/boundaryWallFunctions/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
@@ -42,16 +42,25 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall lowerWall
-    (
-        (0 3 9 6)
-    )
-    wall upperWall
-    (
-        (2 8 11 5)
-    )
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 3 9 6)
+        );
+    }
+
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (2 8 11 5)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/boundaryWallFunctions/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/constant/polyMesh/boundary
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/boundaryWallFunctions/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/constant/transportProperties
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
diff --git a/tutorials/incompressible/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/constant/turbulenceProperties
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
diff --git a/tutorials/incompressible/boundaryWallFunctions/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/system/controlDict
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
diff --git a/tutorials/incompressible/boundaryWallFunctions/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/system/fvSchemes
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
diff --git a/tutorials/incompressible/boundaryWallFunctions/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/boundaryWallFunctions/system/fvSolution
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
index e2ca1fa8e..31c4f8afd 100644
--- a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
@@ -42,36 +42,65 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall bottomWall
-    (
-        (0 1 7 6)
-    )
-    wall topWall
-    (
-        (4 10 11 5)
-    )
-    cyclic sides1
-    (
-        (0 2 3 1)
-        (6 7 9 8)
-    )
-    cyclic sides2
-    (
-        (2 4 5 3)
-        (8 9 11 10)
-    )
-    cyclic inout1
-    (
-        (1 3 9 7)
-        (0 6 8 2)
-    )
-    cyclic inout2
-    (
-        (3 5 11 9)
-        (2 8 10 4)
-    )
+    bottomWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 7 6)
+        );
+    }
+
+    topWall
+    {
+        type wall;
+        faces
+        (
+            (4 10 11 5)
+        );
+    }
+
+    sides1
+    {
+        type cyclic;
+        faces
+        (
+            (0 2 3 1)
+            (6 7 9 8)
+        );
+    }
+
+    sides2
+    {
+        type cyclic;
+        faces
+        (
+            (2 4 5 3)
+            (8 9 11 10)
+        );
+    }
+
+    inout1
+    {
+        type cyclic;
+        faces
+        (
+            (1 3 9 7)
+            (0 6 8 2)
+        );
+    }
+
+    inout2
+    {
+        type cyclic;
+        faces
+        (
+            (3 5 11 9)
+            (2 8 10 4)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/blockMeshDict
index d0b88cf87..e98381789 100644
--- a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/blockMeshDict
@@ -188,60 +188,79 @@ edges
     arc 72 40 (-4.33013 2.5 0.5)
 );
 
-patches
+boundary
 (
-    wall impellerWall
-    (
-        (7 47 58 18)
-        (18 58 57 17)
-        (17 57 59 19)
-        (19 59 49 9)
-        (9 49 50 10)
-        (10 50 48 8)
-        (8 48 61 21)
-        (21 61 62 22)
-        (22 62 60 20)
-        (20 60 46 6)
-        (6 46 45 5)
-        (5 45 47 7)
-    )
-    wall baffleWall
-    (
-        (1 24 64 41)
-        (24 26 66 64)
-        (26 25 65 66)
-        (25 28 68 65)
-        (28 30 70 68)
-        (30 29 69 70)
-        (29 15 55 69)
-        (15 13 53 55)
-        (13 14 54 53)
-        (14 37 77 54)
-        (37 38 78 77)
-        (38 36 76 78)
-        (36 33 73 76)
-        (33 34 74 73)
-        (34 32 72 74)
-        (32 0 40 72)
-        (0 2 42 40)
-        (2 42 41 1)
-    )
-    patch insideSlider
-    (
-        (4 16 56 44)
-        (16 11 51 56)
-        (11 23 63 51)
-        (23 4 44 63)
-    )
-    patch outsideSlider
-    (
-        (3 43 67 27)
-        (27 67 71 31)
-        (31 71 52 12)
-        (12 52 79 39)
-        (39 79 75 35)
-        (35 75 43 3)
-    )
+    impellerWall
+    {
+        type wall;
+        faces
+        (
+            (7 47 58 18)
+            (18 58 57 17)
+            (17 57 59 19)
+            (19 59 49 9)
+            (9 49 50 10)
+            (10 50 48 8)
+            (8 48 61 21)
+            (21 61 62 22)
+            (22 62 60 20)
+            (20 60 46 6)
+            (6 46 45 5)
+            (5 45 47 7)
+        );
+    }
+
+    baffleWall
+    {
+        type wall;
+        faces
+        (
+            (1 24 64 41)
+            (24 26 66 64)
+            (26 25 65 66)
+            (25 28 68 65)
+            (28 30 70 68)
+            (30 29 69 70)
+            (29 15 55 69)
+            (15 13 53 55)
+            (13 14 54 53)
+            (14 37 77 54)
+            (37 38 78 77)
+            (38 36 76 78)
+            (36 33 73 76)
+            (33 34 74 73)
+            (34 32 72 74)
+            (32 0 40 72)
+            (0 2 42 40)
+            (2 42 41 1)
+        );
+    }
+
+    insideSlider
+    {
+        type patch;
+        faces
+        (
+            (4 16 56 44)
+            (16 11 51 56)
+            (11 23 63 51)
+            (23 4 44 63)
+        );
+    }
+
+    outsideSlider
+    {
+        type patch;
+        faces
+        (
+            (3 43 67 27)
+            (27 67 71 31)
+            (31 71 52 12)
+            (12 52 79 39)
+            (39 79 75 35)
+            (35 75 43 3)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoDyMFoam/mixerGgi/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoDyMFoam/mixerGgi/constant/polyMesh/blockMeshDict
index d0b88cf87..071bbd596 100644
--- a/tutorials/incompressible/icoDyMFoam/mixerGgi/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoDyMFoam/mixerGgi/constant/polyMesh/blockMeshDict
@@ -188,60 +188,80 @@ edges
     arc 72 40 (-4.33013 2.5 0.5)
 );
 
-patches
+boundary
 (
-    wall impellerWall
-    (
-        (7 47 58 18)
-        (18 58 57 17)
-        (17 57 59 19)
-        (19 59 49 9)
-        (9 49 50 10)
-        (10 50 48 8)
-        (8 48 61 21)
-        (21 61 62 22)
-        (22 62 60 20)
-        (20 60 46 6)
-        (6 46 45 5)
-        (5 45 47 7)
-    )
-    wall baffleWall
-    (
-        (1 24 64 41)
-        (24 26 66 64)
-        (26 25 65 66)
-        (25 28 68 65)
-        (28 30 70 68)
-        (30 29 69 70)
-        (29 15 55 69)
-        (15 13 53 55)
-        (13 14 54 53)
-        (14 37 77 54)
-        (37 38 78 77)
-        (38 36 76 78)
-        (36 33 73 76)
-        (33 34 74 73)
-        (34 32 72 74)
-        (32 0 40 72)
-        (0 2 42 40)
-        (2 42 41 1)
-    )
-    patch insideSlider
-    (
-        (4 16 56 44)
-        (16 11 51 56)
-        (11 23 63 51)
-        (23 4 44 63)
-    )
-    patch outsideSlider
-    (
-        (3 43 67 27)
-        (27 67 71 31)
-        (31 71 52 12)
-        (12 52 79 39)
-        (39 79 75 35)
-        (35 75 43 3)
-    )
+    impellerWall
+    {
+        type wall;
+        faces
+        (
+
+            (7 47 58 18)
+            (18 58 57 17)
+            (17 57 59 19)
+            (19 59 49 9)
+            (9 49 50 10)
+            (10 50 48 8)
+            (8 48 61 21)
+            (21 61 62 22)
+            (22 62 60 20)
+            (20 60 46 6)
+            (6 46 45 5)
+            (5 45 47 7)
+        );
+    }
+
+    baffleWall
+    {
+        type wall;
+        faces
+        (
+            (1 24 64 41)
+            (24 26 66 64)
+            (26 25 65 66)
+            (25 28 68 65)
+            (28 30 70 68)
+            (30 29 69 70)
+            (29 15 55 69)
+            (15 13 53 55)
+            (13 14 54 53)
+            (14 37 77 54)
+            (37 38 78 77)
+            (38 36 76 78)
+            (36 33 73 76)
+            (33 34 74 73)
+            (34 32 72 74)
+            (32 0 40 72)
+            (0 2 42 40)
+            (2 42 41 1)
+        );
+    }
+
+    insideSlider
+    {
+        type patch;
+        faces
+        (
+            (4 16 56 44)
+            (16 11 51 56)
+            (11 23 63 51)
+            (23 4 44 63)
+        );
+    }
+
+    outsideSlider
+    {
+        type patch;
+        faces
+        (
+            (3 43 67 27)
+            (27 67 71 31)
+            (31 71 52 12)
+            (12 52 79 39)
+            (39 79 75 35)
+            (35 75 43 3)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/blockMeshDict
index 561f7a199..715d0fce2 100644
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/blockMeshDict
@@ -84,65 +84,88 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall block
-    (
-        (2 5 21 18)
-        (5 21 25 9)
-        (9 25 28 12)
-        (12 28 18 2)
-    )
+    block
+    {
+        type wall;
+        faces
+        (
+            (2 5 21 18)
+            (5 21 25 9)
+            (9 25 28 12)
+            (12 28 18 2)
+        );
+    }
 
-    patch top
-    (
-        (15 13 29 31)
-        (13 11 27 29)
-        (11 10 26 27)
-    )
+    top
+    {
+        type patch;
+        faces
+        (
+            (15 13 29 31)
+            (13 11 27 29)
+            (11 10 26 27)
+        );
+    }
 
-    wall bottom
-    (
-        (0 1 17 16)
-        (1 4 20 17)
-        (4 6 22 20)
-    )
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (0 1 17 16)
+            (1 4 20 17)
+            (4 6 22 20)
+        );
+    }
 
-    wall left
-    (
-        (0 16 19 3)
-        (3 19 30 14)
-        (14 30 31 15)
-    )
+    left
+    {
+        type wall;
+        faces
+        (
+            (0 16 19 3)
+            (3 19 30 14)
+            (14 30 31 15)
+        );
+    }
 
-    wall right
-    (
-        (6 22 23 7)
-        (7 23 24 8)
-        (8 24 26 10)
-    )
+    right
+    {
+        type wall;
+        faces
+        (
+            (6 22 23 7)
+            (7 23 24 8)
+            (8 24 26 10)
+        );
+    }
 
-    empty frontAndBack
-    (
-        (0 1 2 3)
-        (1 4 5 2)
-        (4 6 7 5)
-        (5 7 8 9)
-        (9 8 10 11)
-        (12 9 11 13)
-        (14 12 13 15)
-        (3 2 12 14)
-
-        (16 17 18 19)
-        (17 20 21 18)
-        (20 22 23 21)
-        (21 23 24 25)
-        (25 24 26 27)
-        (28 25 27 29)
-        (30 28 29 31)
-        (19 18 28 30)
-    )
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 1 2 3)
+            (1 4 5 2)
+            (4 6 7 5)
+            (5 7 8 9)
+            (9 8 10 11)
+            (12 9 11 13)
+            (14 12 13 15)
+            (3 2 12 14)
 
+            (16 17 18 19)
+            (17 20 21 18)
+            (20 22 23 21)
+            (21 23 24 25)
+            (25 24 26 27)
+            (28 25 27 29)
+            (30 28 29 31)
+            (19 18 28 30)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/blockMeshDict
index aaad436d2..ac89eb50d 100644
--- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/blockMeshDict
@@ -53,54 +53,93 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (1 5 13 1)
-        (5 6 14 13)
-        (2 2 14 6)
-    )
-    patch farFieldMoving
-    (
-        (9 17 18 10)
-    )
-    wall fixedWall
-    (
-        (3 7 15 3)
-        (7 11 19 15)
-    )
-    empty axis
-    (
-        (0 1 1 0)
-        (2 3 3 2)
-    )
-    patch left
-    (
-        (0 0 12 4)
-        (4 12 16 8)
-    )
-    patch farField
-    (
-        (8 16 17 9)
-        (10 18 19 11)
-    )
-    wedge back
-    (
-        (0 4 5 1)
-        (2 6 7 3)
-        (4 8 9 5)
-        (5 9 10 6)
-        (6 10 11 7)
-    )
-    wedge front
-    (
-        (0 1 13 12)
-        (2 3 15 14)
-        (12 13 17 16)
-        (13 14 18 17)
-        (14 15 19 18)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (1 5 13 1)
+            (5 6 14 13)
+            (2 2 14 6)
+        );
+    }
+
+    farFieldMoving
+    {
+        type patch;
+        faces
+        (
+            (9 17 18 10)
+        );
+    }
+
+    fixedWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 15 3)
+            (7 11 19 15)
+        );
+    }
+
+    axis
+    {
+        type empty;
+        faces
+        (
+            (0 1 1 0)
+            (2 3 3 2)
+        );
+    }
+
+    left
+    {
+        type patch;
+        faces
+        (
+            (0 0 12 4)
+            (4 12 16 8)
+        );
+    }
+
+    farField
+    {
+        type patch;
+        faces
+        (
+            (8 16 17 9)
+            (10 18 19 11)
+        );
+    }
+
+    back
+    {
+        type wedge;
+        faces
+        (
+            (0 4 5 1)
+            (2 6 7 3)
+            (4 8 9 5)
+            (5 9 10 6)
+            (6 10 11 7)
+        );
+    }
+
+    front
+    {
+        type wedge;
+        faces
+        (
+            (0 1 13 12)
+            (2 3 15 14)
+            (12 13 17 16)
+            (13 14 18 17)
+            (14 15 19 18)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoDyMFoam/movingConeTopo/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoDyMFoam/movingConeTopo/constant/polyMesh/blockMeshDict
index f620099cf..8a16a0108 100644
--- a/tutorials/incompressible/icoDyMFoam/movingConeTopo/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoDyMFoam/movingConeTopo/constant/polyMesh/blockMeshDict
@@ -57,54 +57,93 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (1 5 17 13)
-        (5 6 18 17)
-        (2 14 18 6)
-    )
-    patch farFieldMoving
-    (
-        (9 21 22 10)
-    )
-    wall fixedWall
-    (
-        (3 7 19 15)
-        (7 11 23 19)
-    )
-    symmetryPlane axis
-    (
-        (0 1 13 12)
-        (2 3 15 14)
-    )
-    patch left
-    (
-        (0 12 16 4)
-        (4 16 20 8)
-    )
-    patch farField
-    (
-        (8 20 21 9)
-        (10 22 23 11)
-    )
-    wedge back
-    (
-        (0 4 5 1)
-        (2 6 7 3)
-        (4 8 9 5)
-        (5 9 10 6)
-        (6 10 11 7)
-    )
-    wedge front
-    (
-        (12 13 17 16)
-        (14 15 19 18)
-        (16 17 21 20)
-        (17 18 22 21)
-        (18 19 23 22)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+        );
+    }
+
+    farFieldMoving
+    {
+        type patch;
+        faces
+        (
+            (9 21 22 10)
+        );
+    }
+
+    fixedWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 19 15)
+            (7 11 23 19)
+        );
+    }
+
+    axis
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 13 12)
+            (2 3 15 14)
+        );
+    }
+
+    left
+    {
+        type patch;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+
+    farField
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (10 22 23 11)
+        );
+    }
+
+    back
+    {
+        type wedge;
+        faces
+        (
+            (0 4 5 1)
+            (2 6 7 3)
+            (4 8 9 5)
+            (5 9 10 6)
+            (6 10 11 7)
+        );
+    }
+
+    front
+    {
+        type wedge;
+        faces
+        (
+            (12 13 17 16)
+            (14 15 19 18)
+            (16 17 21 20)
+            (17 18 22 21)
+            (18 19 23 22)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/Allrun b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/Allrun
index ecdd56b46..fbd642e94 100755
--- a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/Allrun
+++ b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/Allrun
@@ -5,7 +5,6 @@
 application="icoDyMFoam"
 
 runApplication blockMesh
-cp constant/polyMesh/boundary.org constant/polyMesh/boundary
 runApplication setSet -batch setBatch
 runApplication regionCellSets
 runApplication setsToZones -noFlipMap
diff --git a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/constant/polyMesh/blockMeshDict
index 6aaeecbe5..eb5a30644 100644
--- a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/constant/polyMesh/blockMeshDict
@@ -68,55 +68,127 @@ arc  10 22 ( 28.97777479   7.76457135   0.        )
 arc  11 23 ( 28.97777479   7.76457135  10.        )
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 12 13 1)
-    )
-    patch outlet
-    (
-        (10 22 23 11)
-    )
-    wall fixedWalls
-    (
-        (6 18 20 8)
-        (7 19 21 9)
-        (8 20 22 10)
-        (9 21 23 11)
-        (20 22 23 21)
-        (8 10 11 9)
-    )
-    patch movingwalls
-    (
-        (2 14 16 4)
-        (3 15 17 5)
-        (0 12 14 2)
-        (1 13 15 3)
-        (12 14 15 13)
-        (0 2 3 1)
-    )
-    cyclicGgi rotor_cyclic_upper
-    (
-        (14 16 17 15)
-    )
-    cyclicGgi rotor_cyclic_lower
-    (
-        (2 4 5 3)
-    )
-    cyclic stator_cyclics
-    (
-        (6 8 9 7)
-        (18 20 21 19)
-    )
-    overlapGgi interface1
-    (
-        (4 5 17 16)
-    )
-    overlapGgi interface2
-    (
-        (6 7 19 18)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 12 13 1)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (10 22 23 11)
+        );
+    }
+
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 18 20 8)
+            (7 19 21 9)
+            (8 20 22 10)
+            (9 21 23 11)
+            (20 22 23 21)
+            (8 10 11 9)
+        );
+    }
+
+    movingwalls
+    {
+        type patch;
+        faces
+        (
+            (2 14 16 4)
+            (3 15 17 5)
+            (0 12 14 2)
+            (1 13 15 3)
+            (12 14 15 13)
+            (0 2 3 1)
+        );
+    }
+
+    rotor_cyclic_upper
+    {
+        type cyclicGgi;
+
+        shadowPatch     rotor_cyclic_lower;
+        zone            rotor_cyclic_upper_faces;
+        bridgeOverlap   false;
+        rotationAxis    (0 0 1);
+        rotationAngle   -30;
+        separationOffset (0 0 0);
+
+        faces
+        (
+            (14 16 17 15)
+        );
+    }
+
+    rotor_cyclic_lower
+    {
+        type cyclicGgi;
+
+        shadowPatch     rotor_cyclic_upper;
+        zone            rotor_cyclic_lower_faces;
+        bridgeOverlap   false;
+        rotationAxis    (0 0 1);
+        rotationAngle   30;
+        separationOffset (0 0 0);
+
+        faces
+        (
+            (2 4 5 3)
+        );
+    }
+
+    stator_cyclics
+    {
+        type cyclic;
+        faces
+        (
+            (6 8 9 7)
+            (18 20 21 19)
+        );
+    }
+
+    interface1
+    {
+        type overlapGgi;
+
+        rotationAxis    (0 0 1);
+        nCopies         12;
+        shadowPatch     interface2;
+        zone            interface1_faces;
+
+        faces
+        (
+            (4 5 17 16)
+        );
+    }
+
+    interface2
+    {
+        type overlapGgi;
+
+        rotationAxis    (0 0 1);
+        nCopies         12;
+        shadowPatch     interface1;
+        zone            interface2_faces;
+
+        faces
+        (
+            (6 7 19 18)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/constant/polyMesh/boundary.org b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/constant/polyMesh/boundary.org
deleted file mode 100644
index b598632bd..000000000
--- a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/constant/polyMesh/boundary.org
+++ /dev/null
@@ -1,97 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-9
-(
-    inlet
-    {
-        type            patch;
-        nFaces          200;
-        startFace       28100;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          200;
-        startFace       28300;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          1400;
-        startFace       28500;
-    }
-    movingwalls
-    {
-        type            patch;
-        nFaces          1400;
-        startFace       29900;
-    }
-    rotor_cyclic_upper
-    {
-        type            cyclicGgi;
-        nFaces          50;
-        startFace       31300;
-        shadowPatch     rotor_cyclic_lower;
-        zone            rotor_cyclic_upper_faces;
-        bridgeOverlap   false;
-        rotationAxis    (0 0 1);
-        rotationAngle   -30;
-        separationOffset (0 0 0);
-    }
-    rotor_cyclic_lower
-    {
-        type            cyclicGgi;
-        nFaces          50;
-        startFace       31350;
-        shadowPatch     rotor_cyclic_upper;
-        zone            rotor_cyclic_lower_faces;
-        bridgeOverlap   false;
-        rotationAxis    (0 0 1);
-        rotationAngle   30;
-        separationOffset (0 0 0);
-    }
-    stator_cyclics
-    {
-        type            cyclic;
-        nFaces          100;
-        startFace       31400;
-        featureCos      0.9;
-    }
-    interface1
-    {
-        type            overlapGgi;
-        nFaces          200;
-        startFace       31500;
-        rotationAxis    (0 0 1);
-        nCopies         12;
-        shadowPatch     interface2;
-        zone            interface1_faces;
-    }
-    interface2
-    {
-        type            overlapGgi;
-        nFaces          200;
-        startFace       31700;
-        rotationAxis    (0 0 1);
-        nCopies         12;
-        shadowPatch     interface1;
-        zone            interface2_faces;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
index 0fee1e1e9..d629f7cea 100644
--- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -37,23 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (3 7 6 2)
-    )
-    wall fixedWalls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary
rename to tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
index a36f303fd..d21e5ed3d 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary
+++ b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
+|  \\    /   O peration     | Version:  3.0                                   |
 |   \\  /    A nd           | Web:         http://www.extend-project.de       |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
index 82205dfe4..f05ad2cfe 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
@@ -49,31 +49,43 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall lid
-    (
-        (5 13 14 6)
-        (6 14 15 7)
-    )
-    wall fixedWalls
-    (
-        (0 8 10 2)
-        (2 10 13 5)
-        (7 15 12 4)
-        (4 12 11 3)
-        (3 11 9 1)
-        (1 9 8 0)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 5 6 3)
-        (3 6 7 4)
-        (8 9 11 10)
-        (10 11 14 13)
-        (11 12 15 14)
-    )
+    lid
+    {
+        type wall;
+        faces
+        (
+            (5 13 14 6)
+            (6 14 15 7)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 8 10 2)
+            (2 10 13 5)
+            (7 15 12 4)
+            (4 12 11 3)
+            (3 11 9 1)
+            (1 9 8 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 5 6 3)
+            (3 6 7 4)
+            (8 9 11 10)
+            (10 11 14 13)
+            (11 12 15 14)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
index fff255100..ffd36b8e8 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
@@ -50,33 +50,45 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (6 15 16 7)
-        (7 16 17 8)
-    )
-    wall fixedWalls
-    (
-        (3 12 15 6)
-        (0 9 12 3)
-        (0 1 10 9)
-        (1 2 11 10)
-        (2 5 14 11)
-        (5 8 17 14)
-    )
-    empty frontAndBack
-    (
-        (0 3 4 1)
-        (1 4 5 2)
-        (3 6 7 4)
-        (4 7 8 5)
-        (9 10 13 12)
-        (10 11 14 13)
-        (12 13 16 15)
-        (13 14 17 16)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (6 15 16 7)
+            (7 16 17 8)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (3 12 15 6)
+            (0 9 12 3)
+            (0 1 10 9)
+            (1 2 11 10)
+            (2 5 14 11)
+            (5 8 17 14)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 4 1)
+            (1 4 5 2)
+            (3 6 7 4)
+            (4 7 8 5)
+            (9 10 13 12)
+            (10 11 14 13)
+            (12 13 16 15)
+            (13 14 17 16)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/constant/polyMesh/blockMeshDict
index e6724e582..bc90fde07 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/constant/polyMesh/blockMeshDict
@@ -47,41 +47,111 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (3 7 6 2)
-        (11 15 14 10)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-        (9 13 12 8)
-    )
-    patch leftIn
-    (
-        (0 4 7 3)
-    )
-    mixingPlane mixpLeftOut
-    (
-        (2 6 5 1)
-    )
-    mixingPlane mixpRightIn
-    (
-        (8 12 15 11)
-    )
-    patch rightOut
-    (
-        (10 14 13 9)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-        (8 11 10 9)
-        (12 13 14 15)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (11 15 14 10)
+        );
+    }
+
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+            (9 13 12 8)
+        );
+    }
+
+    leftIn
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    mixpLeftOut
+    {
+        type mixingPlane;
+
+        shadowPatch mixpRightIn;
+        zone mixpLeftOutZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
+
+        coordinateSystem
+        {
+            type coordinateSystem;
+            origin (0 0 0.005);
+            axis (0 0 1);
+            direction (1 0 0);
+        }
+
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    mixpRightIn
+    {
+        type mixingPlane;
+
+        shadowPatch mixpLeftOut;
+        zone mixpRightInZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
+
+        coordinateSystem
+        {
+            type coordinateSystem;
+            origin (0 0 0.005);
+            axis (0 0 1);
+            direction (1 0 0);
+        }
+
+        faces
+        (
+            (8 12 15 11)
+        );
+    }
+
+    rightOut
+    {
+        type patch;
+        faces
+        (
+            (10 14 13 9)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+            (8 11 10 9)
+            (12 13 14 15)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/constant/polyMesh/blockMeshDict
index a083d6f92..9a78f9508 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/constant/polyMesh/blockMeshDict
@@ -47,41 +47,111 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (3 7 6 2)
-        (11 15 14 10)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-        (9 13 12 8)
-    )
-    patch leftIn
-    (
-        (0 4 7 3)
-    )
-    mixingPlane mixpLeftOut
-    (
-        (2 6 5 1)
-    )
-    mixingPlane mixpRightIn
-    (
-        (8 12 15 11)
-    )
-    patch rightOut
-    (
-        (10 14 13 9)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-        (8 11 10 9)
-        (12 13 14 15)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (11 15 14 10)
+        );
+    }
+
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+            (9 13 12 8)
+        );
+    }
+
+    leftIn
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    mixpLeftOut
+    {
+        type mixingPlane;
+
+        shadowPatch mixpRightIn;
+        zone mixpLeftOutZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
+
+        coordinateSystem
+        {
+            type coordinateSystem;
+            origin (0 0 0.005);
+            axis (0 0 1);
+            direction (1 0 0);
+        }
+
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    mixpRightIn
+    {
+        type mixingPlane;
+
+        shadowPatch mixpLeftOut;
+        zone mixpRightInZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
+
+        coordinateSystem
+        {
+            type coordinateSystem;
+            origin (0 0 0.005);
+            axis (0 0 1);
+            direction (1 0 0);
+        }
+
+        faces
+        (
+            (8 12 15 11)
+        );
+    }
+
+    rightOut
+    {
+        type patch;
+        faces
+        (
+            (10 14 13 9)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+            (8 11 10 9)
+            (12 13 14 15)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/constant/polyMesh/blockMeshDict
index a083d6f92..c46bcb314 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/constant/polyMesh/blockMeshDict
@@ -47,41 +47,111 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (3 7 6 2)
-        (11 15 14 10)
-    )
-    wall bottom
-    (
-        (1 5 4 0)
-        (9 13 12 8)
-    )
-    patch leftIn
-    (
-        (0 4 7 3)
-    )
-    mixingPlane mixpLeftOut
-    (
-        (2 6 5 1)
-    )
-    mixingPlane mixpRightIn
-    (
-        (8 12 15 11)
-    )
-    patch rightOut
-    (
-        (10 14 13 9)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-        (8 11 10 9)
-        (12 13 14 15)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (11 15 14 10)
+        );
+    }
+
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+            (9 13 12 8)
+        );
+    }
+
+    leftIn
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    mixpLeftOut
+    {
+        type mixingPlane;
+
+        shadowPatch mixpRightIn;
+        zone mixpLeftOutZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Z;
+            sweepAxis Y;
+        }
+
+        coordinateSystem
+        {
+            type coordinateSystem;
+            origin (0 0 0.005);
+            axis (0 0 1);
+            direction (1 0 0);
+        }
+
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    mixpRightIn
+    {
+        type mixingPlane;
+
+        shadowPatch mixpLeftOut;
+        zone mixpRightInZone;
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Z;
+            sweepAxis Y;
+        }
+
+        coordinateSystem
+        {
+            type coordinateSystem;
+            origin (0 0 0.005);
+            axis (0 0 1);
+            direction (1 0 0);
+        }
+
+        faces
+        (
+            (8 12 15 11)
+        );
+    }
+
+    rightOut
+    {
+        type patch;
+        faces
+        (
+            (10 14 13 9)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+            (8 11 10 9)
+            (12 13 14 15)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
index a85d018a1..7df93a1f9 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
@@ -144,47 +144,67 @@ edges
     arc 60 57 (-0.535757 -1.29343 1)
 );
 
-patches
+boundary
 (
-    patch left
-    (
-        (17 14 46 49)
-        (14 13 45 46)
-        (13 27 59 45)
-        (27 30 62 59)
-    )
-    patch right
-    (
-        (22 19 51 54)
-        (19 2 34 51)
-        (2 3 35 34)
-        (3 6 38 35)
-    )
-    wall down
-    (
-        (30 31 63 62)
-        (31 24 56 63)
-        (24 23 55 56)
-        (23 22 54 55)
-    )
-    wall up
-    (
-        (6 7 39 38)
-        (7 8 40 39)
-        (8 18 50 40)
-        (18 17 49 50)
-    )
-    wall cylinder
-    (
-        (0 5 37 32)
-        (5 10 42 37)
-        (10 16 48 42)
-        (16 11 43 48)
-        (11 29 61 43)
-        (29 26 58 61)
-        (26 21 53 58)
-        (21 0 32 53)
-    )
+    left
+    {
+        type patch;
+        faces
+        (
+            (17 14 46 49)
+            (14 13 45 46)
+            (13 27 59 45)
+            (27 30 62 59)
+        );
+    }
+    right
+    {
+        type patch;
+        faces
+        (
+            (22 19 51 54)
+            (19 2 34 51)
+            (2 3 35 34)
+            (3 6 38 35)
+        );
+    }
+    down
+    {
+        type wall;
+        faces
+        (
+            (30 31 63 62)
+            (31 24 56 63)
+            (24 23 55 56)
+            (23 22 54 55)
+        );
+    }
+    up
+    {
+        type wall;
+        faces
+        (
+            (6 7 39 38)
+            (7 8 40 39)
+            (8 18 50 40)
+            (18 17 49 50)
+        );
+    }
+    cylinder
+    {
+        type wall;
+        faces
+        (
+            (0 5 37 32)
+            (5 10 42 37)
+            (10 16 48 42)
+            (16 11 43 48)
+            (11 29 61 43)
+            (29 26 58 61)
+            (26 21 53 58)
+            (21 0 32 53)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
index 79651d43a..dd75d63a1 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
@@ -53,54 +53,86 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (1 5 13 1)
-        (5 6 14 13)
-        (2 2 14 6)
-    )
-    patch farFieldMoving
-    (
-        (9 17 18 10)
-    )
-    wall fixedWall
-    (
-        (3 7 15 3)
-        (7 11 19 15)
-    )
-    symmetryPlane axis
-    (
-        (0 1 1 0)
-        (2 3 3 2)
-    )
-    patch left
-    (
-        (0 0 12 4)
-        (4 12 16 8)
-    )
-    patch farField
-    (
-        (8 16 17 9)
-        (10 18 19 11)
-    )
-    wedge back
-    (
-        (0 4 5 1)
-        (2 6 7 3)
-        (4 8 9 5)
-        (5 9 10 6)
-        (6 10 11 7)
-    )
-    wedge front
-    (
-        (0 1 13 12)
-        (2 3 15 14)
-        (12 13 17 16)
-        (13 14 18 17)
-        (14 15 19 18)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (1 5 13 1)
+            (5 6 14 13)
+            (2 2 14 6)
+        );
+    }
+    farFieldMoving
+    {
+        type patch;
+        faces
+        (
+            (9 17 18 10)
+        );
+    }
+    fixedWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 15 3)
+            (7 11 19 15)
+        );
+    }
+    axis
+    {
+        type empty;
+        faces
+        (
+            (0 1 1 0)
+            (2 3 3 2)
+        );
+    }
+    left
+    {
+        type patch;
+        faces
+        (
+            (0 0 12 4)
+            (4 12 16 8)
+        );
+    }
+    farField
+    {
+        type patch;
+        faces
+        (
+            (8 16 17 9)
+            (10 18 19 11)
+        );
+    }
+    back
+    {
+        type wedge;
+        faces
+        (
+            (0 4 5 1)
+            (2 6 7 3)
+            (4 8 9 5)
+            (5 9 10 6)
+            (6 10 11 7)
+        );
+    }
+    front
+    {
+        type wedge;
+        faces
+        (
+            (0 1 13 12)
+            (2 3 15 14)
+            (12 13 17 16)
+            (13 14 18 17)
+            (14 15 19 18)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/blockMeshDict
index 9c1c85542..ec80c6798 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/blockMeshDict
@@ -37,33 +37,53 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch topAndBottom
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
+    topAndBottom
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+        );
+    }
 
-    patch inlet
-    (
-        (0 4 7 3)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
 
-    patch outlet
-    (
-        (2 6 5 1)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
 
-    empty front
-    (
-        (4 5 6 7)
-    )
+    symFront
+    {
+        type symmetryPlane;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 
-    empty back
-    (
-        (0 3 2 1)
-    )
+    symBack
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
index 63ffe36b4..0843dfe8d 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
@@ -84,22 +84,34 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10 13 3)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 13 3)
+        );
+    }
 
-    patch outlet1
-    (
-        (6 7 17 16)
-    )
+    outlet1
+    {
+        type patch;
+        faces
+        (
+            (6 7 17 16)
+        );
+    }
 
-    patch outlet2
-    (
-        (8 18 19 9)
-    )
+    outlet2
+    {
+        type patch;
+        faces
+        (
+            (8 18 19 9)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
index 4987f5c8b..f320149c9 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
@@ -85,65 +85,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
deleted file mode 100644
index d9d52338f..000000000
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       24170;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          57;
-        startFace       24200;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          223;
-        startFace       24257;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          250;
-        startFace       24480;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          24450;
-        startFace       24730;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
index 0fee1e1e9..7a6a81c47 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
@@ -37,23 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall movingWall
-    (
-        (3 7 6 2)
-    )
-    wall fixedWalls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
index 8c41fc57a..f7a87a223 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
@@ -65,55 +65,79 @@ edges
 (
 );
 
-patches
+boundary
 (
     // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    (2 6 7 3)
-    // outlet block
-    (10 14 15 11)
-    )
+    front
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (2 6 7 3)
+            // outlet block
+            (10 14 15 11)
+        );
+    }
 
-    wall back
-    (
-    // inlet block
-    (1 5 4 0)
-    // outlet block
-    (9 13 12 8)
-    )
+    back
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (1 5 4 0)
+            // outlet block
+            (9 13 12 8)
+        );
+    }
 
-    wall wall
-    (
-    // inlet block
-    (2 0 4 6)
-    (7 5 1 3)
-    // outlet block
-    (10 8 12 14)
-    (15 13 9 11)
-    )
+    wall
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            (2 0 4 6)
+            (7 5 1 3)
+            // outlet block
+            (10 8 12 14)
+            (15 13 9 11)
+        );
+    }
 
-    wall porosityWall
-    (
-    // porosity block
-    (6 10 11 7)
-    // porosity block
-    (5 9 8 4)
-    // porosity block
-    (6 4 8 10)
-    (11 9 5 7)
-    )
+    porosityWall
+    {
+        type wall;
+        faces
+        (
+            // porosity block
+            (6 10 11 7)
+            // porosity block
+            (5 9 8 4)
+            // porosity block
+            (6 4 8 10)
+            (11 9 5 7)
+        );
+    }
 
-    patch inlet
-    (
-    (3 1 0 2)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (3 1 0 2)
+        );
+    }
 
-    patch outlet
-    (
-    (15 13 12 14)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (15 13 12 14)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
index 846abc3f8..6f6c125f0 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
@@ -107,55 +107,79 @@ edges
 (
 );
 
-patches
+boundary
 (
     // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    frontQuad(in1, join1, join2, in2)
-    // outlet block
-    frontQuad(poro1, out1, out2, poro2)
-    )
+    front
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            frontQuad(in1, join1, join2, in2)
+            // outlet block
+            frontQuad(poro1, out1, out2, poro2)
+        );
+    }
 
-    wall back
-    (
-    // inlet block
-    backQuad(in1, join1, join2, in2)
-    // outlet block
-    backQuad(poro1, out1, out2, poro2)
-    )
+    back
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            backQuad(in1, join1, join2, in2)
+            // outlet block
+            backQuad(poro1, out1, out2, poro2)
+        );
+    }
 
-    wall wall
-    (
-    // inlet block
-    quad2D(in1, join1)
-    quad2D(join2, in2)
-    // outlet block
-    quad2D(poro1, out1)
-    quad2D(out2, poro2)
-    )
+    wall
+    {
+        type wall;
+        faces
+        (
+            // inlet block
+            quad2D(in1, join1)
+            quad2D(join2, in2)
+            // outlet block
+            quad2D(poro1, out1)
+            quad2D(out2, poro2)
+        );
+    }
 
-    wall porosityWall
-    (
-    // porosity block
-    frontQuad(join1, poro1, poro2, join2)
-    // porosity block
-    backQuad(join1, poro1, poro2, join2)
-    // porosity block
-    quad2D(join1, poro1)
-    quad2D(poro2, join2)
-    )
+    porosityWall
+    {
+        type wall;
+        faces
+        (
+            // porosity block
+            frontQuad(join1, poro1, poro2, join2)
+            // porosity block
+            backQuad(join1, poro1, poro2, join2)
+            // porosity block
+            quad2D(join1, poro1)
+            quad2D(poro2, join2)
+        );
+    }
 
-    patch inlet
-    (
-    quad2D(in2, in1)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            quad2D(in2, in1)
+        );
+    }
 
-    patch outlet
-    (
-    quad2D(out2, out1)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            quad2D(out2, out1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
deleted file mode 100644
index 7fbdfc30e..000000000
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        nFaces          700;
-        startFace       64100;
-    }
-    wall
-    {
-        type            wall;
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/constant/polyMesh/blockMeshDict b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/constant/polyMesh/blockMeshDict
index 646f18594..b1093e0d4 100644
--- a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/constant/polyMesh/blockMeshDict
@@ -42,33 +42,57 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 4 7 3)
-        (3 7 10 8)
-    )
-    patch outlet
-    (
-        (2 6 5 1)
-        (6 2 9 11)
-    )
-    wall upperWall
-    (
-        (8 9 11 10)
-    )
-    wall lowerWall
-    (
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (2 3 8 9)
-        (6 7 10 11)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+            (3 7 10 8)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+            (6 2 9 11)
+        );
+    }
+
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (8 9 11 10)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (2 3 8 9)
+            (6 7 10 11)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/constant/polyMesh/boundary b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/constant/polyMesh/boundary
deleted file mode 100644
index 551e96587..000000000
--- a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7860;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7900;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          100;
-        startFace       7940;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          100;
-        startFace       8040;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          8000;
-        startFace       8140;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/porousPlug/constant/polyMesh/blockMeshDict b/tutorials/incompressible/porousSimpleFoam/porousPlug/constant/polyMesh/blockMeshDict
index 59dc55449..c11e3391b 100644
--- a/tutorials/incompressible/porousSimpleFoam/porousPlug/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/porousPlug/constant/polyMesh/blockMeshDict
@@ -47,28 +47,47 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 4 7 3)
-    )
-    patch outlet
-    (
-        (12 14 15 13)
-    )
-    wall upperWall
-    (
-        (2 3 7 6)
-        (2 6 11 9)
-        (9 11 15 13)
-    )
-    wall lowerWall
-    (
-        (1 5 4 0)
-        (1 5 10 8)
-        (10 8 12 14)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (12 14 15 13)
+        );
+    }
+
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (2 3 7 6)
+            (2 6 11 9)
+            (9 11 15 13)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+            (1 5 10 8)
+            (10 8 12 14)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict
index 852952f87..97bad1835 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict
@@ -37,26 +37,42 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch sides
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
-    patch inlet
-    (
-        (0 4 7 3)
-    )
-    patch outlet
-    (
-        (2 6 5 1)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    sides
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+        );
+    }
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict
index 951494c67..72435b497 100644
--- a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict
@@ -12,6 +12,42 @@ FoamFile
     class       dictionary;
     object      blockMeshDict;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//process this file using: m4 -P blockMeshDict.m4 > blockMeshDict
+
+//m4 definitions -----------------------------
+
+
+
+
+
+
+
+//Geometry -----------------------------------
+// 2 planes levels
+
+
+
+// Angle span for inner block
+
+
+
+// Angle span for outer block
+
+
+
+// Radial dimensions
+
+
+
+
+// Mesh parameters
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 convertToMeters 1;
@@ -20,29 +56,29 @@ vertices
 (
 //Plane A:
 //Bottom of curved block
-(0.499999999999998 0.86602540378444 0.0) // Vertex A0 = 0
-(0.999999999999996 1.73205080756888 0.0) // Vertex A1 = 1
-(-0.866025403784436 0.500000000000004 0.0) // Vertex A2 = 2
-(-1.73205080756887 1.00000000000001 0.0) // Vertex A3 = 3
+(0.499999999999998 0.86602540378444 0.0) // Vertex A0 = 0 
+(0.999999999999996 1.73205080756888 0.0) // Vertex A1 = 1 
+(-0.866025403784436 0.500000000000004 0.0) // Vertex A2 = 2 
+(-1.73205080756887 1.00000000000001 0.0) // Vertex A3 = 3 
 
 //Plane B:
 //Top of curved block
-(0.499999999999998 0.86602540378444 0.1) // Vertex B0 = 4
-(0.999999999999996 1.73205080756888 0.1) // Vertex B1 = 5
-(-0.866025403784436 0.500000000000004 0.1) // Vertex B2 = 6
-(-1.73205080756887 1.00000000000001 0.1) // Vertex B3 = 7
+(0.499999999999998 0.86602540378444 0.1) // Vertex B0 = 4 
+(0.999999999999996 1.73205080756888 0.1) // Vertex B1 = 5 
+(-0.866025403784436 0.500000000000004 0.1) // Vertex B2 = 6 
+(-1.73205080756887 1.00000000000001 0.1) // Vertex B3 = 7 
 
 //Plane A: Bottom of straight block
-(1.99238939618349 0.174311485495316 0.0) // Vertex B4 = 8
-(2.98858409427524 0.261467228242975 0.0) // Vertex B5 = 9
-(1.50941916044554 1.31211805798101 0.0) // Vertex B6 = 10
-(2.26412874066832 1.96817708697152 0.0) // Vertex B7 = 11
+(1.99238939618349 0.174311485495316 0.0) // Vertex B4 = 8 
+(2.98858409427524 0.261467228242975 0.0) // Vertex B5 = 9 
+(1.50941916044554 1.31211805798101 0.0) // Vertex B6 = 10 
+(2.26412874066832 1.96817708697152 0.0) // Vertex B7 = 11 
 
 //Plane B: Top of straight block
-(1.99238939618349 0.174311485495316 0.1) // Vertex C0 = 12
-(2.98858409427524 0.261467228242975 0.1) // Vertex C1 = 13
-(1.50941916044554 1.31211805798101 0.1) // Vertex C2 = 14
-(2.26412874066832 1.96817708697152 0.1) // Vertex C3 = 15
+(1.99238939618349 0.174311485495316 0.1) // Vertex C0 = 12 
+(2.98858409427524 0.261467228242975 0.1) // Vertex C1 = 13 
+(1.50941916044554 1.31211805798101 0.1) // Vertex C2 = 14 
+(2.26412874066832 1.96817708697152 0.1) // Vertex C3 = 15 
 
 );
 
@@ -71,58 +107,160 @@ edges
     arc  13 15  (2.76151456035732 1.17219338546782 0.1)
 );
 
-patches
+boundary
 (
-    patch outflow
-    (
-        ( 9 11 15 13 )
-    )
-    patch inflow
-    (
-        ( 0 4 6 2 )
-    )
+    outflow
+    {
+        type patch;
+        faces
+        (
+            (9 11 15 13)
+        );
+    }
+    
+    inflow
+    {
+        type patch;
+        faces
+        (
+            (0 4 6 2)
+        );
+    }
 
-    cyclicGgi upstreamPerio1
-    (
-        (8 9 13 12)
-    )
+    upstreamPerio1
+    {
+        type cyclicGgi;
 
-    cyclicGgi upstreamPerio2
-    (
-        (10 14 15 11)
-    )
+        shadowPatch upstreamPerio2;
+        zone upstreamPerio1Zone;
+        bridgeOverlap false;
+        rotationAxis (0 0 1);
+        rotationAngle 36;
+        separationOffset (0 0 0);
 
-    mixingPlane upstreamMixingPlanePatch
-    (
-        ( 8 12 14 10 )
-    )
+        faces
+        (
+            (8 9 13 12)
+        );
+    }
 
-    mixingPlane downstreamMixingPlanePatch
-    (
-        ( 1 3 7 5 )
-    )
+    upstreamPerio2
+    {
+        type cyclicGgi;
 
-    symmetryPlane downstreamWall
-    (
-        ( 0 2 3 1 )
-        ( 4 5 7 6 )
-    )
+        shadowPatch upstreamPerio1;
+        zone upstreamPerio2Zone;
+        bridgeOverlap false;
+        rotationAxis (0 0 1);
+        rotationAngle -36;
+        separationOffset (0 0 0);
 
-    symmetryPlane upstreamWall
-    (
-        ( 13 15 14 12)
-        (8 10 11 9)
-    )
+        faces
+        (
+            (10 14 15 11)
+        );
+    }
 
-    cyclicGgi downstreamPerio1
-    (
-        (0 1 5 4)
-    )
+    upstreamMixingPlanePatch
+    {
+        type mixingPlane;
 
-    cyclicGgi downstreamPerio2
-    (
-        (2 6 7 3)
-    )
+        shadowPatch downstreamMixingPlanePatch;
+        zone upstreamMixingPlaneZone;
+        ribbonPatch
+        {
+            discretisation  bothPatches;
+            sweepAxis       Theta;
+            stackAxis       Z;
+        }
+
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0);
+            axis (0 0 1);
+            direction (1 1 0);
+        }
+
+        faces
+        (
+            (8 12 14 10)
+        );
+    }
+
+    downstreamMixingPlanePatch
+    {
+        type mixingPlane;
+
+        shadowPatch upstreamMixingPlanePatch;
+        zone downstreamMixingPlaneZone;
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0);
+            axis (0 0 1);
+            direction (1 1 0);
+        }
+
+        faces
+        (
+            (1 3 7 5)
+        );
+    }
+
+    downstreamWall
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 2 3 1)
+            (4 5 7 6)
+        );
+    }
+
+    upstreamWall
+    {
+        type symmetryPlane;
+        faces
+        (
+            (13 15 14 12)
+            (8 10 11 9)
+        );
+    }
+
+    downstreamPerio1
+    {
+        type cyclicGgi;
+
+        shadowPatch downstreamPerio2;
+        zone downstreamPerio1Zone;
+        bridgeOverlap false;
+        rotationAxis (0 0 1);
+        rotationAngle 90;
+        separationOffset (0 0 0);
+
+        faces
+        (
+            (0 1 5 4)
+        );
+    }
+
+    downstreamPerio2
+    {
+        type cyclicGgi;
+
+        shadowPatch downstreamPerio1;
+        zone downstreamPerio2Zone;
+        bridgeOverlap false;
+        rotationAxis (0 0 1);
+        rotationAngle -90;
+        separationOffset (0 0 0);
+
+        faces
+        (
+            (2 6 7 3)
+        );
+    }
 
 );
 
diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict.m4
index 24196f4a6..2823aa47f 100644
--- a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict.m4
@@ -107,58 +107,160 @@ edges
     arc  C1 C3  (calc(r3*cos((angleA+angleC)/2)) calc(r3*sin((angleA+angleC)/2)) zB)
 );
 
-patches
+boundary
 (
-    patch outflow
-    (
-        ( B5 B7 C3 C1 )
-    )
-    patch inflow
-    (
-        ( A0 B0 B2 A2 )
-    )
+    outflow
+    {
+        type patch;
+        faces
+        (
+            (B5 B7 C3 C1)
+        );
+    }
+    
+    inflow
+    {
+        type patch;
+        faces
+        (
+            (A0 B0 B2 A2)
+        );
+    }
 
-    cyclicGgi upstreamPerio1
-    (
-        (B4 B5 C1 C0)
-    )
+    upstreamPerio1
+    {
+        type cyclicGgi;
 
-    cyclicGgi upstreamPerio2
-    (
-        (B6 C2 C3 B7)
-    )
+        shadowPatch upstreamPerio2;
+        zone upstreamPerio1Zone;
+        bridgeOverlap false;
+        rotationAxis (0 0 1);
+        rotationAngle 36;
+        separationOffset (0 0 0);
 
-    mixingPlane upstreamMixingPlanePatch
-    (
-        ( B4 C0 C2 B6 )
-    )
+        faces
+        (
+            (B4 B5 C1 C0)
+        );
+    }
 
-    mixingPlane downstreamMixingPlanePatch
-    (
-        ( A1 A3 B3 B1 )
-    )
+    upstreamPerio2
+    {
+        type cyclicGgi;
 
-    symmetryPlane downstreamWall
-    (
-        ( A0 A2 A3 A1 )
-        ( B0 B1 B3 B2 )
-    )
+        shadowPatch upstreamPerio1;
+        zone upstreamPerio2Zone;
+        bridgeOverlap false;
+        rotationAxis (0 0 1);
+        rotationAngle -36;
+        separationOffset (0 0 0);
 
-    symmetryPlane upstreamWall
-    (
-        ( C1 C3 C2 C0)
-        (B4 B6 B7 B5)
-    )
+        faces
+        (
+            (B6 C2 C3 B7)
+        );
+    }
 
-    cyclicGgi downstreamPerio1
-    (
-        (A0 A1 B1 B0)
-    )
+    upstreamMixingPlanePatch
+    {
+        type mixingPlane;
 
-    cyclicGgi downstreamPerio2
-    (
-        (A2 B2 B3 A3)
-    )
+        shadowPatch downstreamMixingPlanePatch;
+        zone upstreamMixingPlaneZone;
+        ribbonPatch
+        {
+            discretisation  bothPatches;
+            sweepAxis       Theta;
+            stackAxis       Z;
+        }
+
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0);
+            axis (0 0 1);
+            direction (1 1 0);
+        }
+
+        faces
+        (
+            (B4 C0 C2 B6)
+        );
+    }
+
+    downstreamMixingPlanePatch
+    {
+        type mixingPlane;
+
+        shadowPatch upstreamMixingPlanePatch;
+        zone downstreamMixingPlaneZone;
+        coordinateSystem
+        {
+            type cylindrical;
+            origin (0 0 0);
+            axis (0 0 1);
+            direction (1 1 0);
+        }
+
+        faces
+        (
+            (A1 A3 B3 B1)
+        );
+    }
+
+    downstreamWall
+    {
+        type symmetryPlane;
+        faces
+        (
+            (A0 A2 A3 A1)
+            (B0 B1 B3 B2)
+        );
+    }
+
+    upstreamWall
+    {
+        type symmetryPlane;
+        faces
+        (
+            (C1 C3 C2 C0)
+            (B4 B6 B7 B5)
+        );
+    }
+
+    downstreamPerio1
+    {
+        type cyclicGgi;
+
+        shadowPatch downstreamPerio2;
+        zone downstreamPerio1Zone;
+        bridgeOverlap false;
+        rotationAxis (0 0 1);
+        rotationAngle 90;
+        separationOffset (0 0 0);
+
+        faces
+        (
+            (A0 A1 B1 B0)
+        );
+    }
+
+    downstreamPerio2
+    {
+        type cyclicGgi;
+
+        shadowPatch downstreamPerio1;
+        zone downstreamPerio2Zone;
+        bridgeOverlap false;
+        rotationAxis (0 0 1);
+        rotationAngle -90;
+        separationOffset (0 0 0);
+
+        faces
+        (
+            (A2 B2 B3 A3)
+        );
+    }
 
 );
 
diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/boundary
deleted file mode 100644
index 54bd542a7..000000000
--- a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/boundary
+++ /dev/null
@@ -1,155 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-(
-  outflow
-
-  {
-    type patch;
-    nFaces 27;
-    startFace 2106;
-
-  }
-  inflow
-
-  {
-    type patch;
-    nFaces 17;
-    startFace 2133;
-
-  }
-  upstreamPerio1
-
-  {
-    type cyclicGgi;
-    nFaces 25;
-    startFace 2150;
-    shadowPatch upstreamPerio2;
-    zone upstreamPerio1Zone;
-    bridgeOverlap false;
-    rotationAxis (0 0 1);
-    rotationAngle 36;
-    separationOffset (0 0 0);
-
-  }
-  upstreamPerio2
-
-  {
-    type cyclicGgi;
-    nFaces 25;
-    startFace 2175;
-    shadowPatch upstreamPerio1;
-    zone upstreamPerio2Zone;
-    bridgeOverlap false;
-    rotationAxis (0 0 1);
-    rotationAngle -36;
-    separationOffset (0 0 0);
-
-  }
-  upstreamMixingPlanePatch
-
-  {
-    type mixingPlane;
-    nFaces 27;
-    startFace 2200;
-    shadowPatch downstreamMixingPlanePatch;
-    zone upstreamMixingPlaneZone;
-    coordinateSystem
-    {
-      name mixingCS;
-      type cylindrical;
-      origin (0 0 0);
-      e1 (1 0 0);
-      e3 (0 0 1);
-    }
-    ribbonPatch
-    {
-      sweepAxis Theta;
-      stackAxis Z;
-      discretisation bothPatches;
-    }
-
-  }
-  downstreamMixingPlanePatch
-
-  {
-    type mixingPlane;
-    nFaces 17;
-    startFace 2227;
-    shadowPatch upstreamMixingPlanePatch; 	/* empty */
-    zone downstreamMixingPlaneZone;
-    coordinateSystem
-    {
-      name mixingCS;
-      type cylindrical;
-      origin (0 0 0);
-      e1 (1 0 0);
-      e3 (0 0 1);
-    }
-    ribbonPatch
-    {
-      sweepAxis Theta;
-      stackAxis Z;
-      discretisation bothPatches;
-    }
-
-  }
-  downstreamWall
-
-  {
-    type symmetryPlane;
-    nFaces 850;
-    startFace 2244;
-
-  }
-  upstreamWall
-
-  {
-    type symmetryPlane;
-    nFaces 1350;
-    startFace 3094;
-
-  }
-  downstreamPerio1
-
-  {
-    type cyclicGgi;
-    nFaces 25;
-    startFace 4444;
-    shadowPatch downstreamPerio2;
-    zone downstreamPerio1Zone;
-    bridgeOverlap false;
-    rotationAxis (0 0 1);
-    rotationAngle 90;
-    separationOffset (0 0 0);
-
-  }
-  downstreamPerio2
-
-  {
-    type cyclicGgi;
-    nFaces 25;
-    startFace 4469;
-    shadowPatch downstreamPerio1;
-    zone downstreamPerio2Zone;
-    bridgeOverlap false;
-    rotationAxis (0 0 1);
-    rotationAngle -90;
-    separationOffset (0 0 0);
-
-  }
-)
-
-// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/boundary.preconfigured b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/boundary.preconfigured
deleted file mode 100644
index 705753270..000000000
--- a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/boundary.preconfigured
+++ /dev/null
@@ -1,133 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-10
-(
-    outflow
-    {
-        type            patch;
-        nFaces          27;
-        startFace       2106;
-    }
-    inflow
-    {
-        type            patch;
-        nFaces          17;
-        startFace       2133;
-    }
-    upstreamPerio1
-    {
-        type cyclicGgi;
-        nFaces 25;
-        startFace 2150;
-        shadowPatch upstreamPerio2;
-        zone upstreamPerio1Zone;
-        bridgeOverlap false;
-        rotationAxis (0 0 1);
-        rotationAngle 36;
-        separationOffset (0 0 0);
-    }
-    upstreamPerio2
-    {
-        type cyclicGgi;
-        nFaces 25;
-        startFace 2175;
-        shadowPatch upstreamPerio1;
-        zone upstreamPerio2Zone;
-        bridgeOverlap false;
-        rotationAxis (0 0 1);
-        rotationAngle -36;
-        separationOffset (0 0 0);
-    }
-    upstreamMixingPlanePatch
-    {
-        type mixingPlane;
-        nFaces 27;
-        startFace 2200;
-        shadowPatch downstreamMixingPlanePatch;
-        zone upstreamMixingPlaneZone;
-        ribbonPatch
-        {
-            discretisation  bothPatches;
-            sweepAxis       Theta;
-            stackAxis       Z;
-        }
-
-        coordinateSystem
-        {
-            type cylindrical;
-            origin (0 0 0);
-            axis (0 0 1);
-            direction (1 1 0);
-        }
-    }
-    downstreamMixingPlanePatch
-    {
-        type mixingPlane;
-        nFaces 17;
-        startFace 2227;
-        shadowPatch upstreamMixingPlanePatch;
-        zone downstreamMixingPlaneZone;
-        coordinateSystem
-        {
-            type cylindrical;
-            origin (0 0 0);
-            axis (0 0 1);
-            direction (1 1 0);
-        }
-        assembly both;
-        orientation dirZ_spanTheta;
-    }
-    downstreamWall
-    {
-        type symmetryPlane;
-        nFaces 850;
-        startFace 2244;
-    }
-    upstreamWall
-    {
-        type symmetryPlane;
-        nFaces 1350;
-        startFace 3094;
-    }
-    downstreamPerio1
-    {
-        type cyclicGgi;
-        nFaces 25;
-        startFace 4444;
-        shadowPatch downstreamPerio2;
-        zone downstreamPerio1Zone;
-        bridgeOverlap false;
-        rotationAxis (0 0 1);
-        rotationAngle 90;
-        separationOffset (0 0 0);
-    }
-    downstreamPerio2
-    {
-        type cyclicGgi;
-        nFaces 25;
-        startFace 4469;
-        shadowPatch downstreamPerio1;
-        zone downstreamPerio2Zone;
-        bridgeOverlap false;
-        rotationAxis (0 0 1);
-        rotationAngle -90;
-        separationOffset (0 0 0);
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/blockMeshDict b/tutorials/incompressible/simpleFoam/motorBike/blockMeshDict
index c693c2c59..bbfb4ef58 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/blockMeshDict
@@ -37,29 +37,53 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch frontAndBack
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
-    patch inlet
-    (
-        (0 4 7 3)
-    )
-    patch outlet
-    (
-        (2 6 5 1)
-    )
-    wall lowerWall
-    (
-        (0 3 2 1)
-    )
-    patch upperWall
-    (
-        (4 5 6 7)
-    )
+    frontAndBack
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+        );
+    }
+
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+
+    upperWall
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict
index c693c2c59..bbfb4ef58 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict
@@ -37,29 +37,53 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch frontAndBack
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
-    patch inlet
-    (
-        (0 4 7 3)
-    )
-    patch outlet
-    (
-        (2 6 5 1)
-    )
-    wall lowerWall
-    (
-        (0 3 2 1)
-    )
-    patch upperWall
-    (
-        (4 5 6 7)
-    )
+    frontAndBack
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+        );
+    }
+
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+
+    upperWall
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
index 4987f5c8b..f320149c9 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
@@ -85,65 +85,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/constant/polyMesh/blockMeshDict
index 25f539f3a..683765de7 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/constant/polyMesh/blockMeshDict
@@ -49,40 +49,73 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 9 10 1)
-    )
-    patch outlet
-    (
-        (8 17 16 7)
-    )
-    wall upperWall
-    (
-        (1 10 13 4)
-        (4 13 15 6)
-        (6 15 17 8)
-    )
-    wall lowerWall
-    (
-        (7 16 14 5)
-        (5 14 11 2)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 9 10 1)
+        );
+    }
 
-    wall lowerWallInterface
-    (
-        (2 11 13 4)
-    )
-    wall lowerWallInlet
-    (
-        (3 12 9 0)
-    )
-    patch interface
-    (
-        (4 13 12 3)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 17 16 7)
+        );
+    }
+
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (1 10 13 4)
+            (4 13 15 6)
+            (6 15 17 8)
+        );
+    }
+
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (7 16 14 5)
+            (5 14 11 2)
+        );
+    }
+
+    lowerWallInterface
+    {
+        type wall;
+        faces
+        (
+            (2 11 13 4)
+        );
+    }
+
+    lowerWallInlet
+    {
+        type wall;
+        faces
+        (
+            (3 12 9 0)
+        );
+    }
+
+    interface
+    {
+        type patch;
+        faces
+        (
+            (4 13 12 3)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
index 4987f5c8b..f320149c9 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
@@ -85,65 +85,85 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 22 23 1)
-        (1 23 24 2)
-        (2 24 25 3)
-    )
-    patch outlet
-    (
-        (16 17 39 38)
-        (17 18 40 39)
-        (18 19 41 40)
-        (19 20 42 41)
-        (20 21 43 42)
-    )
-    wall upperWall
-    (
-        (3 25 31 9)
-        (9 31 37 15)
-        (15 37 43 21)
-    )
-    wall lowerWall
-    (
-        (0 6 28 22)
-        (6 5 27 28)
-        (5 4 26 27)
-        (4 10 32 26)
-        (10 16 38 32)
-    )
-    empty frontAndBack
-    (
-        (22 28 29 23)
-        (23 29 30 24)
-        (24 30 31 25)
-        (26 32 33 27)
-        (27 33 34 28)
-        (28 34 35 29)
-        (29 35 36 30)
-        (30 36 37 31)
-        (32 38 39 33)
-        (33 39 40 34)
-        (34 40 41 35)
-        (35 41 42 36)
-        (36 42 43 37)
-        (0 1 7 6)
-        (1 2 8 7)
-        (2 3 9 8)
-        (4 5 11 10)
-        (5 6 12 11)
-        (6 7 13 12)
-        (7 8 14 13)
-        (8 9 15 14)
-        (10 11 17 16)
-        (11 12 18 17)
-        (12 13 19 18)
-        (13 14 20 19)
-        (14 15 21 20)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 22 23 1)
+            (1 23 24 2)
+            (2 24 25 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 39 38)
+            (17 18 40 39)
+            (18 19 41 40)
+            (19 20 42 41)
+            (20 21 43 42)
+        );
+    }
+    upperWall
+    {
+        type wall;
+        faces
+        (
+            (3 25 31 9)
+            (9 31 37 15)
+            (15 37 43 21)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 6 28 22)
+            (6 5 27 28)
+            (5 4 26 27)
+            (4 10 32 26)
+            (10 16 38 32)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (22 28 29 23)
+            (23 29 30 24)
+            (24 30 31 25)
+            (26 32 33 27)
+            (27 33 34 28)
+            (28 34 35 29)
+            (29 35 36 30)
+            (30 36 37 31)
+            (32 38 39 33)
+            (33 39 40 34)
+            (34 40 41 35)
+            (35 41 42 36)
+            (36 42 43 37)
+            (0 1 7 6)
+            (1 2 8 7)
+            (2 3 9 8)
+            (4 5 11 10)
+            (5 6 12 11)
+            (6 7 13 12)
+            (7 8 14 13)
+            (8 9 15 14)
+            (10 11 17 16)
+            (11 12 18 17)
+            (12 13 19 18)
+            (13 14 20 19)
+            (14 15 21 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary
deleted file mode 100644
index bbd62e0f5..000000000
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-inlet
-{
-    type patch;
-    nFaces 30;
-    startFace 24170;
-}
-
-outlet
-{
-    type patch;
-    nFaces 57;
-    startFace 24200;
-}
-
-upperWall
-{
-    type wall;
-    nFaces 223;
-    startFace 24257;
-}
-
-lowerWall
-{
-    type wall;
-    nFaces 250;
-    startFace 24480;
-}
-
-frontAndBack
-{
-    type empty;
-    nFaces 24450;
-    startFace 24730;
-}
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
index 4ba759775..84f7aea83 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
@@ -69,45 +69,69 @@ edges
       arc  23 19 (       0.034        0.094        2.000 )
 );
 
-patches
+boundary
 (
-      patch inlet
-      (
-            (13 12 21 16)
-            (14 13 16 18)
-            (15 14 18 20)
-            (17 22 12 13)
-            (23 19 14 15)
-      )
-      patch outlet
-      (
-            (1 4 9 0)
-            (2 6 4 1)
-            (3 8 6 2)
-            (5 1 0 10)
-            (11 3 2 7)
-      )
-      wall innerWall
-      (
-            (2 1 13 14)
-            (5 10 22 17)
-            (5 17 13 1)
-            (11 7 19 23)
-            (7 2 14 19)
-      )
-      wall outerWall
-      (
-            (4 16 21 9)
-            (6 18 16 4)
-            (8 20 18 6)
-      )
-      cyclic cyclic
-      (
-            (0 9 21 12)
-            (10 0 12 22)
-            (3 15 20 8)
-            (11 23 15 3)
-      )
+    inlet
+    {
+        type patch;
+        faces
+        (
+        (13 12 21 16)
+        (14 13 16 18)
+        (15 14 18 20)
+        (17 22 12 13)
+        (23 19 14 15)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+        (1 4 9 0)
+        (2 6 4 1)
+        (3 8 6 2)
+        (5 1 0 10)
+        (11 3 2 7)
+        );
+    }
+
+    innerWall
+    {
+        type wall;
+        faces
+        (
+        (2 1 13 14)
+        (5 10 22 17)
+        (5 17 13 1)
+        (11 7 19 23)
+        (7 2 14 19)
+        );
+    }
+
+    outerWall
+    {
+        type wall;
+        faces
+        (
+        (4 16 21 9)
+        (6 18 16 4)
+        (8 20 18 6)
+        );
+    }
+
+    cyclic
+    {
+        type cyclic;
+        faces
+        (
+        (0 9 21 12)
+        (10 0 12 22)
+        (3 15 20 8)
+        (11 23 15 3)
+        );
+    }
 );
 
 mergeMatchPairs
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
index 487408951..f44ae4303 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
@@ -48,37 +48,57 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (13 15 14 12)
-    )
-    wall bottom
-    (
-        (0 1 5 4)
-        (1 8 10 5)
-    )
-    wall walls
-    (
-        (8 9 11 10)
-        (9 2 6 11)
-        (2 12 14 6)
-    )
-    symmetryPlane symmetry
-    (
-        (4 7 3 0)
-        (7 15 13 3)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (3 13 12 2)
-        (1 2 9 8)
-        (5 6 7 4)
-        (6 14 15 7)
-        (10 11 6 5)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+            (13 15 14 12)
+        );
+    }
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (0 1 5 4)
+            (1 8 10 5)
+        );
+    }
+    walls
+    {
+        type wall;
+        faces
+        (
+            (8 9 11 10)
+            (9 2 6 11)
+            (2 12 14 6)
+        );
+    }
+    symmetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (4 7 3 0)
+            (7 15 13 3)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (3 13 12 2)
+            (1 2 9 8)
+            (5 6 7 4)
+            (6 14 15 7)
+            (10 11 6 5)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/blockMeshDict
index 8d91733b0..8a8dd7ba5 100644
--- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/blockMeshDict
@@ -37,26 +37,42 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall topAndBottom
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
-    patch in
-    (
-        (0 4 7 3)
-    )
-    patch out
-    (
-        (2 6 5 1)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    topAndBottom
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+        );
+    }
+    in
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    out
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
index 2adbd67dd..ef113a5f6 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
@@ -61,51 +61,73 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall walls
-    (
-        ( 0  1 13 12)
-        ( 1  2 14 13)
-        ( 2  3 15 14)
-        ( 3  4 16 15)
-        ( 4  5 17 16)
-        ( 6  7 19 18)
-        ( 7  8 20 19)
-        ( 8  9 21 20)
-        ( 9 10 22 21)
-        (10 11 23 22)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            ( 0  1 13 12)
+            ( 1  2 14 13)
+            ( 2  3 15 14)
+            ( 3  4 16 15)
+            ( 4  5 17 16)
+            ( 6  7 19 18)
+            ( 7  8 20 19)
+            ( 8  9 21 20)
+            ( 9 10 22 21)
+            (10 11 23 22)
+        );
+    }
 
-    patch inlet
-    (
-        (11  0 12 23)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (11  0 12 23)
+        );
+    }
 
-    patch outlet
-    (
-        ( 5  6 18 17)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            ( 5  6 18 17)
+        );
+    }
 
-    cyclic cycLeft
-    ()
+    cycLeft
+    {
+        type cyclic;
+        faces ();
+    }
 
-    cyclic cycRight
-    ()
+    cycRight
+    {
+        type cyclic;
+        faces ();
+    }
 
-    empty frontAndBack
-    (
-        ( 0 11 10  1)
-        ( 1 10  9  2)
-        ( 2  9  8  3)
-        ( 3  8  7  4)
-        ( 4  7  6  5)
-        (12 13 22 23)
-        (13 14 21 22)
-        (14 15 20 21)
-        (15 16 19 20)
-        (16 17 18 19)
-    )
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            ( 0 11 10  1)
+            ( 1 10  9  2)
+            ( 2  9  8  3)
+            ( 3  8  7  4)
+            ( 4  7  6  5)
+            (12 13 22 23)
+            (13 14 21 22)
+            (14 15 20 21)
+            (15 16 19 20)
+            (16 17 18 19)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/porousPlug/constant/polyMesh/boundary b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/boundary
similarity index 66%
rename from tutorials/incompressible/porousSimpleFoam/porousPlug/constant/polyMesh/boundary
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/boundary
index 6a6d8ca90..7a7daaff8 100644
--- a/tutorials/incompressible/porousSimpleFoam/porousPlug/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
+|  \\    /   O peration     | Version:  3.0                                   |
 |   \\  /    A nd           | Web:         http://www.extend-project.de       |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -15,37 +15,45 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-5
+6
 (
+    walls
+    {
+        type            wall;
+        nFaces          172;
+        startFace       3334;
+    }
     inlet
     {
         type            patch;
         nFaces          20;
-        startFace       6220;
+        startFace       3506;
     }
     outlet
     {
         type            patch;
         nFaces          20;
-        startFace       6240;
+        startFace       3526;
     }
-    upperWall
+    cycLeft
     {
-        type            wall;
-        nFaces          160;
-        startFace       6260;
+        type            cyclic;
+        nFaces          0;
+        startFace       3546;
+        featureCos      0.9;
     }
-    lowerWall
+    cycRight
     {
-        type            wall;
-        nFaces          160;
-        startFace       6420;
+        type            cyclic;
+        nFaces          0;
+        startFace       3546;
+        featureCos      0.9;
     }
-    defaultFaces
+    frontAndBack
     {
         type            empty;
-        nFaces          6400;
-        startFace       6580;
+        nFaces          3440;
+        startFace       3546;
     }
 )
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict
index e5f0f6da2..62f564484 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict
@@ -37,29 +37,41 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall outlet
-    (
-        (3 7 6 2)
-    )
-    wall inlet
-    (
-        (1 5 4 0)
-    )
-    wall walls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-    )
-    symmetryPlane back
-    (
-        (0 3 2 1)
-    )
-    symmetryPlane front
-    (
-        (4 5 6 7)
-    )
+    outlet
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    walls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+        );
+    }
+    back
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+    front
+    {
+        type symmetryPlane;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/boundary b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/boundary
similarity index 70%
rename from tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/boundary
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/boundary
index 6be098ccb..b700fad8a 100644
--- a/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
+|  \\    /   O peration     | Version:  3.0                                   |
 |   \\  /    A nd           | Web:         http://www.extend-project.de       |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,35 +17,35 @@ FoamFile
 
 5
 (
-    in
-    {
-        type            patch;
-        nFaces          50;
-        startFace       5830;
-    }
-    out
-    {
-        type            patch;
-        nFaces          50;
-        startFace       5880;
-    }
-    bottom
-    {
-        type            symmetryPlane;
-        nFaces          90;
-        startFace       5930;
-    }
-    topWall
+    outlet
     {
         type            wall;
-        nFaces          150;
-        startFace       6020;
+        nFaces          25;
+        startFace       300;
+    }
+    walls
+    {
+        type            wall;
+        nFaces          50;
+        startFace       325;
+    }
+    back
+    {
+        type            symmetryPlane;
+        nFaces          25;
+        startFace       375;
+    }
+    front
+    {
+        type            symmetryPlane;
+        nFaces          25;
+        startFace       400;
     }
     defaultFaces
     {
         type            empty;
-        nFaces          6000;
-        startFace       6170;
+        nFaces          25;
+        startFace       425;
     }
 )
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
index 58ef06670..e086ec0c0 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
@@ -155,49 +155,69 @@ defaultPatch
     type wall;
 }
 
-patches
+boundary
 (
-    symmetryPlane back
-    (
-        (0 1 16 17)
-        (1 2 15 16)
-        (2 3 4 15)
-        (14 15 12 13)
-        (15 4 5 12)
-        (10 11 8 9)
-        (11 12 7 8)
-        (12 5 6 7)
-    )
+    back
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 16 17)
+            (1 2 15 16)
+            (2 3 4 15)
+            (14 15 12 13)
+            (15 4 5 12)
+            (10 11 8 9)
+            (11 12 7 8)
+            (12 5 6 7)
+        );
+    }
 
-    symmetryPlane front
-    (
-        (18 19 34 35)
-        (19 20 33 34)
-        (20 21 22 33)
-        (32 33 30 31)
-        (33 22 23 30)
-        (28 29 26 27)
-        (29 30 25 26)
-        (30 23 24 25)
-    )
+    front
+    {
+        type symmetryPlane;
+        faces
+        (
+            (18 19 34 35)
+            (19 20 33 34)
+            (20 21 22 33)
+            (32 33 30 31)
+            (33 22 23 30)
+            (28 29 26 27)
+            (29 30 25 26)
+            (30 23 24 25)
+        );
+    }
 
-    patch inletCentral
-    (
-        (13 14 32 31)
-    )
+    inletCentral
+    {
+        type patch;
+        faces
+        (
+            (13 14 32 31)
+        );
+    }
 
-    patch inletSides
-    (
-        (17 0 18 35)
-        (9 10 28 27)
-    )
+    inletSides
+    {
+        type patch;
+        faces
+        (
+            (17 0 18 35)
+            (9 10 28 27)
+        );
+    }
 
-    patch outlet
-    (
-        (3 4 22 21)
-        (4 5 23 22)
-        (5 6 24 23)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 4 22 21)
+            (4 5 23 22)
+            (5 6 24 23)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
index c5417934c..09a4c48a9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
@@ -38,20 +38,28 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall walls
-    (
-        (3 7 6 2)
-        (0 4 7 3)
-        (2 6 5 1)
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
index 34c7bbc7a..9d4d235bf 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
@@ -47,37 +47,57 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall top
-    (
-        (13 15 14 12)
-    )
-    wall bottom
-    (
-        (0 1 5 4)
-        (1 8 10 5)
-    )
-    wall walls
-    (
-        (8 9 11 10)
-        (9 2 6 11)
-        (2 12 14 6)
-    )
-    symmetryPlane symmetry
-    (
-        (4 7 3 0)
-        (7 15 13 3)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (3 13 12 2)
-        (1 2 9 8)
-        (5 6 7 4)
-        (6 14 15 7)
-        (10 11 6 5)
-    )
+    top
+    {
+        type wall;
+        faces
+        (
+            (13 15 14 12)
+        );
+    }
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (0 1 5 4)
+            (1 8 10 5)
+        );
+    }
+    walls
+    {
+        type wall;
+        faces
+        (
+            (8 9 11 10)
+            (9 2 6 11)
+            (2 12 14 6)
+        );
+    }
+    symmetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (4 7 3 0)
+            (7 15 13 3)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (3 13 12 2)
+            (1 2 9 8)
+            (5 6 7 4)
+            (6 14 15 7)
+            (10 11 6 5)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/constant/polyMesh/blockMeshDict b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/constant/polyMesh/blockMeshDict
index e33a200ae..974d88369 100644
--- a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/constant/polyMesh/blockMeshDict
@@ -54,33 +54,53 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall steetWalls
-    (
-        (1 0 10 11)
-        (4 1 11 14)
-        (5 4 14 15)
-        (2 3 13 12)
-        (6 7 17 16)
-    )
-    wall branchWalls
-    (
-        (8 2 12 18)
-        (7 9 19 17)
-    )
-    patch westStreet
-    (
-        (3 0 10 13)
-    )
-    patch eastStreet
-    (
-        (5 6 16 15)
-    )
-    patch northBranch
-    (
-        (9 8 18 19)
-    )
+    steetWalls
+    {
+        type wall;
+        faces
+        (
+            (1 0 10 11)
+            (4 1 11 14)
+            (5 4 14 15)
+            (2 3 13 12)
+            (6 7 17 16)
+        )
+    }
+    branchWalls
+    {
+        type wall;
+        faces
+        (
+            (8 2 12 18)
+            (7 9 19 17)
+        );
+    }
+    westStreet
+    {
+        type patch;
+        faces
+        (
+            (3 0 10 13)
+        );
+    }
+    eastStreet
+    {
+        type patch;
+        faces
+        (
+            (5 6 16 15)
+        );
+    }
+    northBranch
+    {
+        type patch;
+        faces
+        (
+            (9 8 18 19)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/blockMeshDict b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/blockMeshDict
index e33a200ae..974d88369 100644
--- a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/blockMeshDict
@@ -54,33 +54,53 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall steetWalls
-    (
-        (1 0 10 11)
-        (4 1 11 14)
-        (5 4 14 15)
-        (2 3 13 12)
-        (6 7 17 16)
-    )
-    wall branchWalls
-    (
-        (8 2 12 18)
-        (7 9 19 17)
-    )
-    patch westStreet
-    (
-        (3 0 10 13)
-    )
-    patch eastStreet
-    (
-        (5 6 16 15)
-    )
-    patch northBranch
-    (
-        (9 8 18 19)
-    )
+    steetWalls
+    {
+        type wall;
+        faces
+        (
+            (1 0 10 11)
+            (4 1 11 14)
+            (5 4 14 15)
+            (2 3 13 12)
+            (6 7 17 16)
+        )
+    }
+    branchWalls
+    {
+        type wall;
+        faces
+        (
+            (8 2 12 18)
+            (7 9 19 17)
+        );
+    }
+    westStreet
+    {
+        type patch;
+        faces
+        (
+            (3 0 10 13)
+        );
+    }
+    eastStreet
+    {
+        type patch;
+        faces
+        (
+            (5 6 16 15)
+        );
+    }
+    northBranch
+    {
+        type patch;
+        faces
+        (
+            (9 8 18 19)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/faces b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/faces
new file mode 100644
index 000000000..c55890b71
--- /dev/null
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/faces
@@ -0,0 +1,6524 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | foam-extend: Open Source CFD                    |
+|  \\    /   O peration     | Version:  3.0                                   |
+|   \\  /    A nd           | Web:         http://www.extend-project.de       |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       faceList;
+    location    "constant/polyMesh";
+    object      faces;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+6500
+(
+4(1 22 463 442)
+4(21 462 463 22)
+4(2 23 464 443)
+4(22 463 464 23)
+4(3 24 465 444)
+4(23 464 465 24)
+4(4 25 466 445)
+4(24 465 466 25)
+4(5 26 467 446)
+4(25 466 467 26)
+4(6 27 468 447)
+4(26 467 468 27)
+4(7 28 469 448)
+4(27 468 469 28)
+4(8 29 470 449)
+4(28 469 470 29)
+4(9 30 471 450)
+4(29 470 471 30)
+4(10 31 472 451)
+4(30 471 472 31)
+4(11 32 473 452)
+4(31 472 473 32)
+4(12 33 474 453)
+4(32 473 474 33)
+4(13 34 475 454)
+4(33 474 475 34)
+4(14 35 476 455)
+4(34 475 476 35)
+4(15 36 477 456)
+4(35 476 477 36)
+4(16 37 478 457)
+4(36 477 478 37)
+4(17 38 479 458)
+4(37 478 479 38)
+4(18 39 480 459)
+4(38 479 480 39)
+4(19 40 481 460)
+4(39 480 481 40)
+4(40 481 482 41)
+4(20 41 482 461)
+4(22 43 484 463)
+4(42 483 484 43)
+4(23 44 485 464)
+4(43 484 485 44)
+4(24 45 486 465)
+4(44 485 486 45)
+4(25 46 487 466)
+4(45 486 487 46)
+4(26 47 488 467)
+4(46 487 488 47)
+4(27 48 489 468)
+4(47 488 489 48)
+4(28 49 490 469)
+4(48 489 490 49)
+4(29 50 491 470)
+4(49 490 491 50)
+4(30 51 492 471)
+4(50 491 492 51)
+4(31 52 493 472)
+4(51 492 493 52)
+4(32 53 494 473)
+4(52 493 494 53)
+4(33 54 495 474)
+4(53 494 495 54)
+4(34 55 496 475)
+4(54 495 496 55)
+4(35 56 497 476)
+4(55 496 497 56)
+4(36 57 498 477)
+4(56 497 498 57)
+4(37 58 499 478)
+4(57 498 499 58)
+4(38 59 500 479)
+4(58 499 500 59)
+4(39 60 501 480)
+4(59 500 501 60)
+4(40 61 502 481)
+4(60 501 502 61)
+4(61 502 503 62)
+4(41 62 503 482)
+4(43 64 505 484)
+4(63 504 505 64)
+4(44 65 506 485)
+4(64 505 506 65)
+4(45 66 507 486)
+4(65 506 507 66)
+4(46 67 508 487)
+4(66 507 508 67)
+4(47 68 509 488)
+4(67 508 509 68)
+4(48 69 510 489)
+4(68 509 510 69)
+4(49 70 511 490)
+4(69 510 511 70)
+4(50 71 512 491)
+4(70 511 512 71)
+4(51 72 513 492)
+4(71 512 513 72)
+4(52 73 514 493)
+4(72 513 514 73)
+4(53 74 515 494)
+4(73 514 515 74)
+4(54 75 516 495)
+4(74 515 516 75)
+4(55 76 517 496)
+4(75 516 517 76)
+4(56 77 518 497)
+4(76 517 518 77)
+4(57 78 519 498)
+4(77 518 519 78)
+4(58 79 520 499)
+4(78 519 520 79)
+4(59 80 521 500)
+4(79 520 521 80)
+4(60 81 522 501)
+4(80 521 522 81)
+4(61 82 523 502)
+4(81 522 523 82)
+4(82 523 524 83)
+4(62 83 524 503)
+4(64 85 526 505)
+4(84 525 526 85)
+4(65 86 527 506)
+4(85 526 527 86)
+4(66 87 528 507)
+4(86 527 528 87)
+4(67 88 529 508)
+4(87 528 529 88)
+4(68 89 530 509)
+4(88 529 530 89)
+4(69 90 531 510)
+4(89 530 531 90)
+4(70 91 532 511)
+4(90 531 532 91)
+4(71 92 533 512)
+4(91 532 533 92)
+4(72 93 534 513)
+4(92 533 534 93)
+4(73 94 535 514)
+4(93 534 535 94)
+4(74 95 536 515)
+4(94 535 536 95)
+4(75 96 537 516)
+4(95 536 537 96)
+4(76 97 538 517)
+4(96 537 538 97)
+4(77 98 539 518)
+4(97 538 539 98)
+4(78 99 540 519)
+4(98 539 540 99)
+4(79 100 541 520)
+4(99 540 541 100)
+4(80 101 542 521)
+4(100 541 542 101)
+4(81 102 543 522)
+4(101 542 543 102)
+4(82 103 544 523)
+4(102 543 544 103)
+4(103 544 545 104)
+4(83 104 545 524)
+4(85 106 547 526)
+4(105 546 547 106)
+4(86 107 548 527)
+4(106 547 548 107)
+4(87 108 549 528)
+4(107 548 549 108)
+4(88 109 550 529)
+4(108 549 550 109)
+4(89 110 551 530)
+4(109 550 551 110)
+4(90 111 552 531)
+4(110 551 552 111)
+4(91 112 553 532)
+4(111 552 553 112)
+4(92 113 554 533)
+4(112 553 554 113)
+4(93 114 555 534)
+4(113 554 555 114)
+4(94 115 556 535)
+4(114 555 556 115)
+4(95 116 557 536)
+4(115 556 557 116)
+4(96 117 558 537)
+4(116 557 558 117)
+4(97 118 559 538)
+4(117 558 559 118)
+4(98 119 560 539)
+4(118 559 560 119)
+4(99 120 561 540)
+4(119 560 561 120)
+4(100 121 562 541)
+4(120 561 562 121)
+4(101 122 563 542)
+4(121 562 563 122)
+4(102 123 564 543)
+4(122 563 564 123)
+4(103 124 565 544)
+4(123 564 565 124)
+4(124 565 566 125)
+4(104 125 566 545)
+4(106 127 568 547)
+4(126 567 568 127)
+4(107 128 569 548)
+4(127 568 569 128)
+4(108 129 570 549)
+4(128 569 570 129)
+4(109 130 571 550)
+4(129 570 571 130)
+4(110 131 572 551)
+4(130 571 572 131)
+4(111 132 573 552)
+4(131 572 573 132)
+4(112 133 574 553)
+4(132 573 574 133)
+4(113 134 575 554)
+4(133 574 575 134)
+4(114 135 576 555)
+4(134 575 576 135)
+4(115 136 577 556)
+4(135 576 577 136)
+4(116 137 578 557)
+4(136 577 578 137)
+4(117 138 579 558)
+4(137 578 579 138)
+4(118 139 580 559)
+4(138 579 580 139)
+4(119 140 581 560)
+4(139 580 581 140)
+4(120 141 582 561)
+4(140 581 582 141)
+4(121 142 583 562)
+4(141 582 583 142)
+4(122 143 584 563)
+4(142 583 584 143)
+4(123 144 585 564)
+4(143 584 585 144)
+4(124 145 586 565)
+4(144 585 586 145)
+4(145 586 587 146)
+4(125 146 587 566)
+4(127 148 589 568)
+4(147 588 589 148)
+4(128 149 590 569)
+4(148 589 590 149)
+4(129 150 591 570)
+4(149 590 591 150)
+4(130 151 592 571)
+4(150 591 592 151)
+4(131 152 593 572)
+4(151 592 593 152)
+4(132 153 594 573)
+4(152 593 594 153)
+4(133 154 595 574)
+4(153 594 595 154)
+4(134 155 596 575)
+4(154 595 596 155)
+4(135 156 597 576)
+4(155 596 597 156)
+4(136 157 598 577)
+4(156 597 598 157)
+4(137 158 599 578)
+4(157 598 599 158)
+4(138 159 600 579)
+4(158 599 600 159)
+4(139 160 601 580)
+4(159 600 601 160)
+4(140 161 602 581)
+4(160 601 602 161)
+4(141 162 603 582)
+4(161 602 603 162)
+4(142 163 604 583)
+4(162 603 604 163)
+4(143 164 605 584)
+4(163 604 605 164)
+4(144 165 606 585)
+4(164 605 606 165)
+4(145 166 607 586)
+4(165 606 607 166)
+4(166 607 608 167)
+4(146 167 608 587)
+4(148 169 610 589)
+4(168 609 610 169)
+4(149 170 611 590)
+4(169 610 611 170)
+4(150 171 612 591)
+4(170 611 612 171)
+4(151 172 613 592)
+4(171 612 613 172)
+4(152 173 614 593)
+4(172 613 614 173)
+4(153 174 615 594)
+4(173 614 615 174)
+4(154 175 616 595)
+4(174 615 616 175)
+4(155 176 617 596)
+4(175 616 617 176)
+4(156 177 618 597)
+4(176 617 618 177)
+4(157 178 619 598)
+4(177 618 619 178)
+4(158 179 620 599)
+4(178 619 620 179)
+4(159 180 621 600)
+4(179 620 621 180)
+4(160 181 622 601)
+4(180 621 622 181)
+4(161 182 623 602)
+4(181 622 623 182)
+4(162 183 624 603)
+4(182 623 624 183)
+4(163 184 625 604)
+4(183 624 625 184)
+4(164 185 626 605)
+4(184 625 626 185)
+4(165 186 627 606)
+4(185 626 627 186)
+4(166 187 628 607)
+4(186 627 628 187)
+4(187 628 629 188)
+4(167 188 629 608)
+4(169 190 631 610)
+4(189 630 631 190)
+4(170 191 632 611)
+4(190 631 632 191)
+4(171 192 633 612)
+4(191 632 633 192)
+4(172 193 634 613)
+4(192 633 634 193)
+4(173 194 635 614)
+4(193 634 635 194)
+4(174 195 636 615)
+4(194 635 636 195)
+4(175 196 637 616)
+4(195 636 637 196)
+4(176 197 638 617)
+4(196 637 638 197)
+4(177 198 639 618)
+4(197 638 639 198)
+4(178 199 640 619)
+4(198 639 640 199)
+4(179 200 641 620)
+4(199 640 641 200)
+4(180 201 642 621)
+4(200 641 642 201)
+4(181 202 643 622)
+4(201 642 643 202)
+4(182 203 644 623)
+4(202 643 644 203)
+4(183 204 645 624)
+4(203 644 645 204)
+4(184 205 646 625)
+4(204 645 646 205)
+4(185 206 647 626)
+4(205 646 647 206)
+4(186 207 648 627)
+4(206 647 648 207)
+4(187 208 649 628)
+4(207 648 649 208)
+4(208 649 650 209)
+4(188 209 650 629)
+4(190 211 652 631)
+4(210 651 652 211)
+4(191 212 653 632)
+4(211 652 653 212)
+4(192 213 654 633)
+4(212 653 654 213)
+4(193 214 655 634)
+4(213 654 655 214)
+4(194 215 656 635)
+4(214 655 656 215)
+4(195 216 657 636)
+4(215 656 657 216)
+4(196 217 658 637)
+4(216 657 658 217)
+4(197 218 659 638)
+4(217 658 659 218)
+4(198 219 660 639)
+4(218 659 660 219)
+4(199 220 661 640)
+4(219 660 661 220)
+4(200 221 662 641)
+4(220 661 662 221)
+4(201 222 663 642)
+4(221 662 663 222)
+4(202 223 664 643)
+4(222 663 664 223)
+4(203 224 665 644)
+4(223 664 665 224)
+4(204 225 666 645)
+4(224 665 666 225)
+4(205 226 667 646)
+4(225 666 667 226)
+4(206 227 668 647)
+4(226 667 668 227)
+4(207 228 669 648)
+4(227 668 669 228)
+4(208 229 670 649)
+4(228 669 670 229)
+4(229 670 671 230)
+4(209 230 671 650)
+4(211 232 673 652)
+4(231 672 673 232)
+4(212 233 674 653)
+4(232 673 674 233)
+4(213 234 675 654)
+4(233 674 675 234)
+4(214 235 676 655)
+4(234 675 676 235)
+4(215 236 677 656)
+4(235 676 677 236)
+4(216 237 678 657)
+4(236 677 678 237)
+4(217 238 679 658)
+4(237 678 679 238)
+4(218 239 680 659)
+4(238 679 680 239)
+4(219 240 681 660)
+4(239 680 681 240)
+4(220 241 682 661)
+4(240 681 682 241)
+4(221 242 683 662)
+4(241 682 683 242)
+4(222 243 684 663)
+4(242 683 684 243)
+4(223 244 685 664)
+4(243 684 685 244)
+4(224 245 686 665)
+4(244 685 686 245)
+4(225 246 687 666)
+4(245 686 687 246)
+4(226 247 688 667)
+4(246 687 688 247)
+4(227 248 689 668)
+4(247 688 689 248)
+4(228 249 690 669)
+4(248 689 690 249)
+4(229 250 691 670)
+4(249 690 691 250)
+4(250 691 692 251)
+4(230 251 692 671)
+4(232 253 694 673)
+4(252 693 694 253)
+4(233 254 695 674)
+4(253 694 695 254)
+4(234 255 696 675)
+4(254 695 696 255)
+4(235 256 697 676)
+4(255 696 697 256)
+4(236 257 698 677)
+4(256 697 698 257)
+4(237 258 699 678)
+4(257 698 699 258)
+4(238 259 700 679)
+4(258 699 700 259)
+4(239 260 701 680)
+4(259 700 701 260)
+4(240 261 702 681)
+4(260 701 702 261)
+4(241 262 703 682)
+4(261 702 703 262)
+4(242 263 704 683)
+4(262 703 704 263)
+4(243 264 705 684)
+4(263 704 705 264)
+4(244 265 706 685)
+4(264 705 706 265)
+4(245 266 707 686)
+4(265 706 707 266)
+4(246 267 708 687)
+4(266 707 708 267)
+4(247 268 709 688)
+4(267 708 709 268)
+4(248 269 710 689)
+4(268 709 710 269)
+4(249 270 711 690)
+4(269 710 711 270)
+4(250 271 712 691)
+4(270 711 712 271)
+4(271 712 713 272)
+4(251 272 713 692)
+4(253 274 715 694)
+4(273 714 715 274)
+4(254 275 716 695)
+4(274 715 716 275)
+4(255 276 717 696)
+4(275 716 717 276)
+4(256 277 718 697)
+4(276 717 718 277)
+4(257 278 719 698)
+4(277 718 719 278)
+4(258 279 720 699)
+4(278 719 720 279)
+4(259 280 721 700)
+4(279 720 721 280)
+4(260 281 722 701)
+4(280 721 722 281)
+4(261 282 723 702)
+4(281 722 723 282)
+4(262 283 724 703)
+4(282 723 724 283)
+4(263 284 725 704)
+4(283 724 725 284)
+4(264 285 726 705)
+4(284 725 726 285)
+4(265 286 727 706)
+4(285 726 727 286)
+4(266 287 728 707)
+4(286 727 728 287)
+4(267 288 729 708)
+4(287 728 729 288)
+4(268 289 730 709)
+4(288 729 730 289)
+4(269 290 731 710)
+4(289 730 731 290)
+4(270 291 732 711)
+4(290 731 732 291)
+4(271 292 733 712)
+4(291 732 733 292)
+4(292 733 734 293)
+4(272 293 734 713)
+4(274 295 736 715)
+4(294 735 736 295)
+4(275 296 737 716)
+4(295 736 737 296)
+4(276 297 738 717)
+4(296 737 738 297)
+4(277 298 739 718)
+4(297 738 739 298)
+4(278 299 740 719)
+4(298 739 740 299)
+4(279 300 741 720)
+4(299 740 741 300)
+4(280 301 742 721)
+4(300 741 742 301)
+4(281 302 743 722)
+4(301 742 743 302)
+4(282 303 744 723)
+4(302 743 744 303)
+4(283 304 745 724)
+4(303 744 745 304)
+4(284 305 746 725)
+4(304 745 746 305)
+4(285 306 747 726)
+4(305 746 747 306)
+4(286 307 748 727)
+4(306 747 748 307)
+4(287 308 749 728)
+4(307 748 749 308)
+4(288 309 750 729)
+4(308 749 750 309)
+4(289 310 751 730)
+4(309 750 751 310)
+4(290 311 752 731)
+4(310 751 752 311)
+4(291 312 753 732)
+4(311 752 753 312)
+4(292 313 754 733)
+4(312 753 754 313)
+4(313 754 755 314)
+4(293 314 755 734)
+4(295 316 757 736)
+4(315 756 757 316)
+4(296 317 758 737)
+4(316 757 758 317)
+4(297 318 759 738)
+4(317 758 759 318)
+4(298 319 760 739)
+4(318 759 760 319)
+4(299 320 761 740)
+4(319 760 761 320)
+4(300 321 762 741)
+4(320 761 762 321)
+4(301 322 763 742)
+4(321 762 763 322)
+4(302 323 764 743)
+4(322 763 764 323)
+4(303 324 765 744)
+4(323 764 765 324)
+4(304 325 766 745)
+4(324 765 766 325)
+4(305 326 767 746)
+4(325 766 767 326)
+4(306 327 768 747)
+4(326 767 768 327)
+4(307 328 769 748)
+4(327 768 769 328)
+4(308 329 770 749)
+4(328 769 770 329)
+4(309 330 771 750)
+4(329 770 771 330)
+4(310 331 772 751)
+4(330 771 772 331)
+4(311 332 773 752)
+4(331 772 773 332)
+4(312 333 774 753)
+4(332 773 774 333)
+4(313 334 775 754)
+4(333 774 775 334)
+4(334 775 776 335)
+4(314 335 776 755)
+4(316 337 778 757)
+4(336 777 778 337)
+4(317 338 779 758)
+4(337 778 779 338)
+4(318 339 780 759)
+4(338 779 780 339)
+4(319 340 781 760)
+4(339 780 781 340)
+4(320 341 782 761)
+4(340 781 782 341)
+4(321 342 783 762)
+4(341 782 783 342)
+4(322 343 784 763)
+4(342 783 784 343)
+4(323 344 785 764)
+4(343 784 785 344)
+4(324 345 786 765)
+4(344 785 786 345)
+4(325 346 787 766)
+4(345 786 787 346)
+4(326 347 788 767)
+4(346 787 788 347)
+4(327 348 789 768)
+4(347 788 789 348)
+4(328 349 790 769)
+4(348 789 790 349)
+4(329 350 791 770)
+4(349 790 791 350)
+4(330 351 792 771)
+4(350 791 792 351)
+4(331 352 793 772)
+4(351 792 793 352)
+4(332 353 794 773)
+4(352 793 794 353)
+4(333 354 795 774)
+4(353 794 795 354)
+4(334 355 796 775)
+4(354 795 796 355)
+4(355 796 797 356)
+4(335 356 797 776)
+4(337 358 799 778)
+4(357 798 799 358)
+4(338 359 800 779)
+4(358 799 800 359)
+4(339 360 801 780)
+4(359 800 801 360)
+4(340 361 802 781)
+4(360 801 802 361)
+4(341 362 803 782)
+4(361 802 803 362)
+4(342 363 804 783)
+4(362 803 804 363)
+4(343 364 805 784)
+4(363 804 805 364)
+4(344 365 806 785)
+4(364 805 806 365)
+4(345 366 807 786)
+4(365 806 807 366)
+4(346 367 808 787)
+4(366 807 808 367)
+4(347 368 809 788)
+4(367 808 809 368)
+4(348 369 810 789)
+4(368 809 810 369)
+4(349 370 811 790)
+4(369 810 811 370)
+4(350 371 812 791)
+4(370 811 812 371)
+4(351 372 813 792)
+4(371 812 813 372)
+4(352 373 814 793)
+4(372 813 814 373)
+4(353 374 815 794)
+4(373 814 815 374)
+4(354 375 816 795)
+4(374 815 816 375)
+4(355 376 817 796)
+4(375 816 817 376)
+4(376 817 818 377)
+4(356 377 818 797)
+4(358 379 820 799)
+4(378 819 820 379)
+4(359 380 821 800)
+4(379 820 821 380)
+4(360 381 822 801)
+4(380 821 822 381)
+4(361 382 823 802)
+4(381 822 823 382)
+4(362 383 824 803)
+4(382 823 824 383)
+4(363 384 825 804)
+4(383 824 825 384)
+4(364 385 826 805)
+4(384 825 826 385)
+4(365 386 827 806)
+4(385 826 827 386)
+4(366 387 828 807)
+4(386 827 828 387)
+4(367 388 829 808)
+4(387 828 829 388)
+4(368 389 830 809)
+4(388 829 830 389)
+4(369 390 831 810)
+4(389 830 831 390)
+4(370 391 832 811)
+4(390 831 832 391)
+4(371 392 833 812)
+4(391 832 833 392)
+4(372 393 834 813)
+4(392 833 834 393)
+4(373 394 835 814)
+4(393 834 835 394)
+4(374 395 836 815)
+4(394 835 836 395)
+4(375 396 837 816)
+4(395 836 837 396)
+4(376 397 838 817)
+4(396 837 838 397)
+4(397 838 839 398)
+4(377 398 839 818)
+4(379 400 841 820)
+4(399 840 841 400)
+4(380 401 842 821)
+4(400 841 842 401)
+4(381 402 843 822)
+4(401 842 843 402)
+4(382 403 844 823)
+4(402 843 844 403)
+4(383 404 845 824)
+4(403 844 845 404)
+4(384 405 846 825)
+4(404 845 846 405)
+4(385 406 847 826)
+4(405 846 847 406)
+4(386 407 848 827)
+4(406 847 848 407)
+4(387 408 849 828)
+4(407 848 849 408)
+4(388 409 850 829)
+4(408 849 850 409)
+4(389 410 851 830)
+4(409 850 851 410)
+4(390 411 852 831)
+4(410 851 852 411)
+4(391 412 853 832)
+4(411 852 853 412)
+4(392 413 854 833)
+4(412 853 854 413)
+4(393 414 855 834)
+4(413 854 855 414)
+4(394 415 856 835)
+4(414 855 856 415)
+4(395 416 857 836)
+4(415 856 857 416)
+4(396 417 858 837)
+4(416 857 858 417)
+4(397 418 859 838)
+4(417 858 859 418)
+4(418 859 860 419)
+4(398 419 860 839)
+4(400 421 862 841)
+4(401 422 863 842)
+4(402 423 864 843)
+4(403 424 865 844)
+4(404 425 866 845)
+4(405 426 867 846)
+4(406 427 868 847)
+4(407 428 869 848)
+4(408 429 870 849)
+4(409 430 871 850)
+4(410 431 872 851)
+4(411 432 873 852)
+4(412 433 874 853)
+4(413 434 875 854)
+4(414 435 876 855)
+4(415 436 877 856)
+4(416 437 878 857)
+4(417 438 879 858)
+4(418 439 880 859)
+4(419 440 881 860)
+4(882 902 1322 1302)
+4(41 482 1322 902)
+4(883 903 1323 1303)
+4(902 1322 1323 903)
+4(884 904 1324 1304)
+4(903 1323 1324 904)
+4(885 905 1325 1305)
+4(904 1324 1325 905)
+4(886 906 1326 1306)
+4(905 1325 1326 906)
+4(887 907 1327 1307)
+4(906 1326 1327 907)
+4(888 908 1328 1308)
+4(907 1327 1328 908)
+4(889 909 1329 1309)
+4(908 1328 1329 909)
+4(890 910 1330 1310)
+4(909 1329 1330 910)
+4(891 911 1331 1311)
+4(910 1330 1331 911)
+4(892 912 1332 1312)
+4(911 1331 1332 912)
+4(893 913 1333 1313)
+4(912 1332 1333 913)
+4(894 914 1334 1314)
+4(913 1333 1334 914)
+4(895 915 1335 1315)
+4(914 1334 1335 915)
+4(896 916 1336 1316)
+4(915 1335 1336 916)
+4(897 917 1337 1317)
+4(916 1336 1337 917)
+4(898 918 1338 1318)
+4(917 1337 1338 918)
+4(899 919 1339 1319)
+4(918 1338 1339 919)
+4(900 920 1340 1320)
+4(919 1339 1340 920)
+4(920 1340 1341 921)
+4(901 921 1341 1321)
+4(902 922 1342 1322)
+4(62 503 1342 922)
+4(903 923 1343 1323)
+4(922 1342 1343 923)
+4(904 924 1344 1324)
+4(923 1343 1344 924)
+4(905 925 1345 1325)
+4(924 1344 1345 925)
+4(906 926 1346 1326)
+4(925 1345 1346 926)
+4(907 927 1347 1327)
+4(926 1346 1347 927)
+4(908 928 1348 1328)
+4(927 1347 1348 928)
+4(909 929 1349 1329)
+4(928 1348 1349 929)
+4(910 930 1350 1330)
+4(929 1349 1350 930)
+4(911 931 1351 1331)
+4(930 1350 1351 931)
+4(912 932 1352 1332)
+4(931 1351 1352 932)
+4(913 933 1353 1333)
+4(932 1352 1353 933)
+4(914 934 1354 1334)
+4(933 1353 1354 934)
+4(915 935 1355 1335)
+4(934 1354 1355 935)
+4(916 936 1356 1336)
+4(935 1355 1356 936)
+4(917 937 1357 1337)
+4(936 1356 1357 937)
+4(918 938 1358 1338)
+4(937 1357 1358 938)
+4(919 939 1359 1339)
+4(938 1358 1359 939)
+4(920 940 1360 1340)
+4(939 1359 1360 940)
+4(940 1360 1361 941)
+4(921 941 1361 1341)
+4(922 942 1362 1342)
+4(83 524 1362 942)
+4(923 943 1363 1343)
+4(942 1362 1363 943)
+4(924 944 1364 1344)
+4(943 1363 1364 944)
+4(925 945 1365 1345)
+4(944 1364 1365 945)
+4(926 946 1366 1346)
+4(945 1365 1366 946)
+4(927 947 1367 1347)
+4(946 1366 1367 947)
+4(928 948 1368 1348)
+4(947 1367 1368 948)
+4(929 949 1369 1349)
+4(948 1368 1369 949)
+4(930 950 1370 1350)
+4(949 1369 1370 950)
+4(931 951 1371 1351)
+4(950 1370 1371 951)
+4(932 952 1372 1352)
+4(951 1371 1372 952)
+4(933 953 1373 1353)
+4(952 1372 1373 953)
+4(934 954 1374 1354)
+4(953 1373 1374 954)
+4(935 955 1375 1355)
+4(954 1374 1375 955)
+4(936 956 1376 1356)
+4(955 1375 1376 956)
+4(937 957 1377 1357)
+4(956 1376 1377 957)
+4(938 958 1378 1358)
+4(957 1377 1378 958)
+4(939 959 1379 1359)
+4(958 1378 1379 959)
+4(940 960 1380 1360)
+4(959 1379 1380 960)
+4(960 1380 1381 961)
+4(941 961 1381 1361)
+4(942 962 1382 1362)
+4(104 545 1382 962)
+4(943 963 1383 1363)
+4(962 1382 1383 963)
+4(944 964 1384 1364)
+4(963 1383 1384 964)
+4(945 965 1385 1365)
+4(964 1384 1385 965)
+4(946 966 1386 1366)
+4(965 1385 1386 966)
+4(947 967 1387 1367)
+4(966 1386 1387 967)
+4(948 968 1388 1368)
+4(967 1387 1388 968)
+4(949 969 1389 1369)
+4(968 1388 1389 969)
+4(950 970 1390 1370)
+4(969 1389 1390 970)
+4(951 971 1391 1371)
+4(970 1390 1391 971)
+4(952 972 1392 1372)
+4(971 1391 1392 972)
+4(953 973 1393 1373)
+4(972 1392 1393 973)
+4(954 974 1394 1374)
+4(973 1393 1394 974)
+4(955 975 1395 1375)
+4(974 1394 1395 975)
+4(956 976 1396 1376)
+4(975 1395 1396 976)
+4(957 977 1397 1377)
+4(976 1396 1397 977)
+4(958 978 1398 1378)
+4(977 1397 1398 978)
+4(959 979 1399 1379)
+4(978 1398 1399 979)
+4(960 980 1400 1380)
+4(979 1399 1400 980)
+4(980 1400 1401 981)
+4(961 981 1401 1381)
+4(962 982 1402 1382)
+4(125 566 1402 982)
+4(963 983 1403 1383)
+4(982 1402 1403 983)
+4(964 984 1404 1384)
+4(983 1403 1404 984)
+4(965 985 1405 1385)
+4(984 1404 1405 985)
+4(966 986 1406 1386)
+4(985 1405 1406 986)
+4(967 987 1407 1387)
+4(986 1406 1407 987)
+4(968 988 1408 1388)
+4(987 1407 1408 988)
+4(969 989 1409 1389)
+4(988 1408 1409 989)
+4(970 990 1410 1390)
+4(989 1409 1410 990)
+4(971 991 1411 1391)
+4(990 1410 1411 991)
+4(972 992 1412 1392)
+4(991 1411 1412 992)
+4(973 993 1413 1393)
+4(992 1412 1413 993)
+4(974 994 1414 1394)
+4(993 1413 1414 994)
+4(975 995 1415 1395)
+4(994 1414 1415 995)
+4(976 996 1416 1396)
+4(995 1415 1416 996)
+4(977 997 1417 1397)
+4(996 1416 1417 997)
+4(978 998 1418 1398)
+4(997 1417 1418 998)
+4(979 999 1419 1399)
+4(998 1418 1419 999)
+4(980 1000 1420 1400)
+4(999 1419 1420 1000)
+4(1000 1420 1421 1001)
+4(981 1001 1421 1401)
+4(982 1002 1422 1402)
+4(146 587 1422 1002)
+4(983 1003 1423 1403)
+4(1002 1422 1423 1003)
+4(984 1004 1424 1404)
+4(1003 1423 1424 1004)
+4(985 1005 1425 1405)
+4(1004 1424 1425 1005)
+4(986 1006 1426 1406)
+4(1005 1425 1426 1006)
+4(987 1007 1427 1407)
+4(1006 1426 1427 1007)
+4(988 1008 1428 1408)
+4(1007 1427 1428 1008)
+4(989 1009 1429 1409)
+4(1008 1428 1429 1009)
+4(990 1010 1430 1410)
+4(1009 1429 1430 1010)
+4(991 1011 1431 1411)
+4(1010 1430 1431 1011)
+4(992 1012 1432 1412)
+4(1011 1431 1432 1012)
+4(993 1013 1433 1413)
+4(1012 1432 1433 1013)
+4(994 1014 1434 1414)
+4(1013 1433 1434 1014)
+4(995 1015 1435 1415)
+4(1014 1434 1435 1015)
+4(996 1016 1436 1416)
+4(1015 1435 1436 1016)
+4(997 1017 1437 1417)
+4(1016 1436 1437 1017)
+4(998 1018 1438 1418)
+4(1017 1437 1438 1018)
+4(999 1019 1439 1419)
+4(1018 1438 1439 1019)
+4(1000 1020 1440 1420)
+4(1019 1439 1440 1020)
+4(1020 1440 1441 1021)
+4(1001 1021 1441 1421)
+4(1002 1022 1442 1422)
+4(167 608 1442 1022)
+4(1003 1023 1443 1423)
+4(1022 1442 1443 1023)
+4(1004 1024 1444 1424)
+4(1023 1443 1444 1024)
+4(1005 1025 1445 1425)
+4(1024 1444 1445 1025)
+4(1006 1026 1446 1426)
+4(1025 1445 1446 1026)
+4(1007 1027 1447 1427)
+4(1026 1446 1447 1027)
+4(1008 1028 1448 1428)
+4(1027 1447 1448 1028)
+4(1009 1029 1449 1429)
+4(1028 1448 1449 1029)
+4(1010 1030 1450 1430)
+4(1029 1449 1450 1030)
+4(1011 1031 1451 1431)
+4(1030 1450 1451 1031)
+4(1012 1032 1452 1432)
+4(1031 1451 1452 1032)
+4(1013 1033 1453 1433)
+4(1032 1452 1453 1033)
+4(1014 1034 1454 1434)
+4(1033 1453 1454 1034)
+4(1015 1035 1455 1435)
+4(1034 1454 1455 1035)
+4(1016 1036 1456 1436)
+4(1035 1455 1456 1036)
+4(1017 1037 1457 1437)
+4(1036 1456 1457 1037)
+4(1018 1038 1458 1438)
+4(1037 1457 1458 1038)
+4(1019 1039 1459 1439)
+4(1038 1458 1459 1039)
+4(1020 1040 1460 1440)
+4(1039 1459 1460 1040)
+4(1040 1460 1461 1041)
+4(1021 1041 1461 1441)
+4(1022 1042 1462 1442)
+4(188 629 1462 1042)
+4(1023 1043 1463 1443)
+4(1042 1462 1463 1043)
+4(1024 1044 1464 1444)
+4(1043 1463 1464 1044)
+4(1025 1045 1465 1445)
+4(1044 1464 1465 1045)
+4(1026 1046 1466 1446)
+4(1045 1465 1466 1046)
+4(1027 1047 1467 1447)
+4(1046 1466 1467 1047)
+4(1028 1048 1468 1448)
+4(1047 1467 1468 1048)
+4(1029 1049 1469 1449)
+4(1048 1468 1469 1049)
+4(1030 1050 1470 1450)
+4(1049 1469 1470 1050)
+4(1031 1051 1471 1451)
+4(1050 1470 1471 1051)
+4(1032 1052 1472 1452)
+4(1051 1471 1472 1052)
+4(1033 1053 1473 1453)
+4(1052 1472 1473 1053)
+4(1034 1054 1474 1454)
+4(1053 1473 1474 1054)
+4(1035 1055 1475 1455)
+4(1054 1474 1475 1055)
+4(1036 1056 1476 1456)
+4(1055 1475 1476 1056)
+4(1037 1057 1477 1457)
+4(1056 1476 1477 1057)
+4(1038 1058 1478 1458)
+4(1057 1477 1478 1058)
+4(1039 1059 1479 1459)
+4(1058 1478 1479 1059)
+4(1040 1060 1480 1460)
+4(1059 1479 1480 1060)
+4(1060 1480 1481 1061)
+4(1041 1061 1481 1461)
+4(1042 1062 1482 1462)
+4(209 650 1482 1062)
+4(1043 1063 1483 1463)
+4(1062 1482 1483 1063)
+4(1044 1064 1484 1464)
+4(1063 1483 1484 1064)
+4(1045 1065 1485 1465)
+4(1064 1484 1485 1065)
+4(1046 1066 1486 1466)
+4(1065 1485 1486 1066)
+4(1047 1067 1487 1467)
+4(1066 1486 1487 1067)
+4(1048 1068 1488 1468)
+4(1067 1487 1488 1068)
+4(1049 1069 1489 1469)
+4(1068 1488 1489 1069)
+4(1050 1070 1490 1470)
+4(1069 1489 1490 1070)
+4(1051 1071 1491 1471)
+4(1070 1490 1491 1071)
+4(1052 1072 1492 1472)
+4(1071 1491 1492 1072)
+4(1053 1073 1493 1473)
+4(1072 1492 1493 1073)
+4(1054 1074 1494 1474)
+4(1073 1493 1494 1074)
+4(1055 1075 1495 1475)
+4(1074 1494 1495 1075)
+4(1056 1076 1496 1476)
+4(1075 1495 1496 1076)
+4(1057 1077 1497 1477)
+4(1076 1496 1497 1077)
+4(1058 1078 1498 1478)
+4(1077 1497 1498 1078)
+4(1059 1079 1499 1479)
+4(1078 1498 1499 1079)
+4(1060 1080 1500 1480)
+4(1079 1499 1500 1080)
+4(1080 1500 1501 1081)
+4(1061 1081 1501 1481)
+4(1062 1082 1502 1482)
+4(230 671 1502 1082)
+4(1063 1083 1503 1483)
+4(1082 1502 1503 1083)
+4(1064 1084 1504 1484)
+4(1083 1503 1504 1084)
+4(1065 1085 1505 1485)
+4(1084 1504 1505 1085)
+4(1066 1086 1506 1486)
+4(1085 1505 1506 1086)
+4(1067 1087 1507 1487)
+4(1086 1506 1507 1087)
+4(1068 1088 1508 1488)
+4(1087 1507 1508 1088)
+4(1069 1089 1509 1489)
+4(1088 1508 1509 1089)
+4(1070 1090 1510 1490)
+4(1089 1509 1510 1090)
+4(1071 1091 1511 1491)
+4(1090 1510 1511 1091)
+4(1072 1092 1512 1492)
+4(1091 1511 1512 1092)
+4(1073 1093 1513 1493)
+4(1092 1512 1513 1093)
+4(1074 1094 1514 1494)
+4(1093 1513 1514 1094)
+4(1075 1095 1515 1495)
+4(1094 1514 1515 1095)
+4(1076 1096 1516 1496)
+4(1095 1515 1516 1096)
+4(1077 1097 1517 1497)
+4(1096 1516 1517 1097)
+4(1078 1098 1518 1498)
+4(1097 1517 1518 1098)
+4(1079 1099 1519 1499)
+4(1098 1518 1519 1099)
+4(1080 1100 1520 1500)
+4(1099 1519 1520 1100)
+4(1100 1520 1521 1101)
+4(1081 1101 1521 1501)
+4(1082 1102 1522 1502)
+4(251 692 1522 1102)
+4(1083 1103 1523 1503)
+4(1102 1522 1523 1103)
+4(1084 1104 1524 1504)
+4(1103 1523 1524 1104)
+4(1085 1105 1525 1505)
+4(1104 1524 1525 1105)
+4(1086 1106 1526 1506)
+4(1105 1525 1526 1106)
+4(1087 1107 1527 1507)
+4(1106 1526 1527 1107)
+4(1088 1108 1528 1508)
+4(1107 1527 1528 1108)
+4(1089 1109 1529 1509)
+4(1108 1528 1529 1109)
+4(1090 1110 1530 1510)
+4(1109 1529 1530 1110)
+4(1091 1111 1531 1511)
+4(1110 1530 1531 1111)
+4(1092 1112 1532 1512)
+4(1111 1531 1532 1112)
+4(1093 1113 1533 1513)
+4(1112 1532 1533 1113)
+4(1094 1114 1534 1514)
+4(1113 1533 1534 1114)
+4(1095 1115 1535 1515)
+4(1114 1534 1535 1115)
+4(1096 1116 1536 1516)
+4(1115 1535 1536 1116)
+4(1097 1117 1537 1517)
+4(1116 1536 1537 1117)
+4(1098 1118 1538 1518)
+4(1117 1537 1538 1118)
+4(1099 1119 1539 1519)
+4(1118 1538 1539 1119)
+4(1100 1120 1540 1520)
+4(1119 1539 1540 1120)
+4(1120 1540 1541 1121)
+4(1101 1121 1541 1521)
+4(1102 1122 1542 1522)
+4(272 713 1542 1122)
+4(1103 1123 1543 1523)
+4(1122 1542 1543 1123)
+4(1104 1124 1544 1524)
+4(1123 1543 1544 1124)
+4(1105 1125 1545 1525)
+4(1124 1544 1545 1125)
+4(1106 1126 1546 1526)
+4(1125 1545 1546 1126)
+4(1107 1127 1547 1527)
+4(1126 1546 1547 1127)
+4(1108 1128 1548 1528)
+4(1127 1547 1548 1128)
+4(1109 1129 1549 1529)
+4(1128 1548 1549 1129)
+4(1110 1130 1550 1530)
+4(1129 1549 1550 1130)
+4(1111 1131 1551 1531)
+4(1130 1550 1551 1131)
+4(1112 1132 1552 1532)
+4(1131 1551 1552 1132)
+4(1113 1133 1553 1533)
+4(1132 1552 1553 1133)
+4(1114 1134 1554 1534)
+4(1133 1553 1554 1134)
+4(1115 1135 1555 1535)
+4(1134 1554 1555 1135)
+4(1116 1136 1556 1536)
+4(1135 1555 1556 1136)
+4(1117 1137 1557 1537)
+4(1136 1556 1557 1137)
+4(1118 1138 1558 1538)
+4(1137 1557 1558 1138)
+4(1119 1139 1559 1539)
+4(1138 1558 1559 1139)
+4(1120 1140 1560 1540)
+4(1139 1559 1560 1140)
+4(1140 1560 1561 1141)
+4(1121 1141 1561 1541)
+4(1122 1142 1562 1542)
+4(293 734 1562 1142)
+4(1123 1143 1563 1543)
+4(1142 1562 1563 1143)
+4(1124 1144 1564 1544)
+4(1143 1563 1564 1144)
+4(1125 1145 1565 1545)
+4(1144 1564 1565 1145)
+4(1126 1146 1566 1546)
+4(1145 1565 1566 1146)
+4(1127 1147 1567 1547)
+4(1146 1566 1567 1147)
+4(1128 1148 1568 1548)
+4(1147 1567 1568 1148)
+4(1129 1149 1569 1549)
+4(1148 1568 1569 1149)
+4(1130 1150 1570 1550)
+4(1149 1569 1570 1150)
+4(1131 1151 1571 1551)
+4(1150 1570 1571 1151)
+4(1132 1152 1572 1552)
+4(1151 1571 1572 1152)
+4(1133 1153 1573 1553)
+4(1152 1572 1573 1153)
+4(1134 1154 1574 1554)
+4(1153 1573 1574 1154)
+4(1135 1155 1575 1555)
+4(1154 1574 1575 1155)
+4(1136 1156 1576 1556)
+4(1155 1575 1576 1156)
+4(1137 1157 1577 1557)
+4(1156 1576 1577 1157)
+4(1138 1158 1578 1558)
+4(1157 1577 1578 1158)
+4(1139 1159 1579 1559)
+4(1158 1578 1579 1159)
+4(1140 1160 1580 1560)
+4(1159 1579 1580 1160)
+4(1160 1580 1581 1161)
+4(1141 1161 1581 1561)
+4(1142 1162 1582 1562)
+4(314 755 1582 1162)
+4(1143 1163 1583 1563)
+4(1162 1582 1583 1163)
+4(1144 1164 1584 1564)
+4(1163 1583 1584 1164)
+4(1145 1165 1585 1565)
+4(1164 1584 1585 1165)
+4(1146 1166 1586 1566)
+4(1165 1585 1586 1166)
+4(1147 1167 1587 1567)
+4(1166 1586 1587 1167)
+4(1148 1168 1588 1568)
+4(1167 1587 1588 1168)
+4(1149 1169 1589 1569)
+4(1168 1588 1589 1169)
+4(1150 1170 1590 1570)
+4(1169 1589 1590 1170)
+4(1151 1171 1591 1571)
+4(1170 1590 1591 1171)
+4(1152 1172 1592 1572)
+4(1171 1591 1592 1172)
+4(1153 1173 1593 1573)
+4(1172 1592 1593 1173)
+4(1154 1174 1594 1574)
+4(1173 1593 1594 1174)
+4(1155 1175 1595 1575)
+4(1174 1594 1595 1175)
+4(1156 1176 1596 1576)
+4(1175 1595 1596 1176)
+4(1157 1177 1597 1577)
+4(1176 1596 1597 1177)
+4(1158 1178 1598 1578)
+4(1177 1597 1598 1178)
+4(1159 1179 1599 1579)
+4(1178 1598 1599 1179)
+4(1160 1180 1600 1580)
+4(1179 1599 1600 1180)
+4(1180 1600 1601 1181)
+4(1161 1181 1601 1581)
+4(1162 1182 1602 1582)
+4(335 776 1602 1182)
+4(1163 1183 1603 1583)
+4(1182 1602 1603 1183)
+4(1164 1184 1604 1584)
+4(1183 1603 1604 1184)
+4(1165 1185 1605 1585)
+4(1184 1604 1605 1185)
+4(1166 1186 1606 1586)
+4(1185 1605 1606 1186)
+4(1167 1187 1607 1587)
+4(1186 1606 1607 1187)
+4(1168 1188 1608 1588)
+4(1187 1607 1608 1188)
+4(1169 1189 1609 1589)
+4(1188 1608 1609 1189)
+4(1170 1190 1610 1590)
+4(1189 1609 1610 1190)
+4(1171 1191 1611 1591)
+4(1190 1610 1611 1191)
+4(1172 1192 1612 1592)
+4(1191 1611 1612 1192)
+4(1173 1193 1613 1593)
+4(1192 1612 1613 1193)
+4(1174 1194 1614 1594)
+4(1193 1613 1614 1194)
+4(1175 1195 1615 1595)
+4(1194 1614 1615 1195)
+4(1176 1196 1616 1596)
+4(1195 1615 1616 1196)
+4(1177 1197 1617 1597)
+4(1196 1616 1617 1197)
+4(1178 1198 1618 1598)
+4(1197 1617 1618 1198)
+4(1179 1199 1619 1599)
+4(1198 1618 1619 1199)
+4(1180 1200 1620 1600)
+4(1199 1619 1620 1200)
+4(1200 1620 1621 1201)
+4(1181 1201 1621 1601)
+4(1182 1202 1622 1602)
+4(356 797 1622 1202)
+4(1183 1203 1623 1603)
+4(1202 1622 1623 1203)
+4(1184 1204 1624 1604)
+4(1203 1623 1624 1204)
+4(1185 1205 1625 1605)
+4(1204 1624 1625 1205)
+4(1186 1206 1626 1606)
+4(1205 1625 1626 1206)
+4(1187 1207 1627 1607)
+4(1206 1626 1627 1207)
+4(1188 1208 1628 1608)
+4(1207 1627 1628 1208)
+4(1189 1209 1629 1609)
+4(1208 1628 1629 1209)
+4(1190 1210 1630 1610)
+4(1209 1629 1630 1210)
+4(1191 1211 1631 1611)
+4(1210 1630 1631 1211)
+4(1192 1212 1632 1612)
+4(1211 1631 1632 1212)
+4(1193 1213 1633 1613)
+4(1212 1632 1633 1213)
+4(1194 1214 1634 1614)
+4(1213 1633 1634 1214)
+4(1195 1215 1635 1615)
+4(1214 1634 1635 1215)
+4(1196 1216 1636 1616)
+4(1215 1635 1636 1216)
+4(1197 1217 1637 1617)
+4(1216 1636 1637 1217)
+4(1198 1218 1638 1618)
+4(1217 1637 1638 1218)
+4(1199 1219 1639 1619)
+4(1218 1638 1639 1219)
+4(1200 1220 1640 1620)
+4(1219 1639 1640 1220)
+4(1220 1640 1641 1221)
+4(1201 1221 1641 1621)
+4(1202 1222 1642 1622)
+4(377 818 1642 1222)
+4(1203 1223 1643 1623)
+4(1222 1642 1643 1223)
+4(1204 1224 1644 1624)
+4(1223 1643 1644 1224)
+4(1205 1225 1645 1625)
+4(1224 1644 1645 1225)
+4(1206 1226 1646 1626)
+4(1225 1645 1646 1226)
+4(1207 1227 1647 1627)
+4(1226 1646 1647 1227)
+4(1208 1228 1648 1628)
+4(1227 1647 1648 1228)
+4(1209 1229 1649 1629)
+4(1228 1648 1649 1229)
+4(1210 1230 1650 1630)
+4(1229 1649 1650 1230)
+4(1211 1231 1651 1631)
+4(1230 1650 1651 1231)
+4(1212 1232 1652 1632)
+4(1231 1651 1652 1232)
+4(1213 1233 1653 1633)
+4(1232 1652 1653 1233)
+4(1214 1234 1654 1634)
+4(1233 1653 1654 1234)
+4(1215 1235 1655 1635)
+4(1234 1654 1655 1235)
+4(1216 1236 1656 1636)
+4(1235 1655 1656 1236)
+4(1217 1237 1657 1637)
+4(1236 1656 1657 1237)
+4(1218 1238 1658 1638)
+4(1237 1657 1658 1238)
+4(1219 1239 1659 1639)
+4(1238 1658 1659 1239)
+4(1220 1240 1660 1640)
+4(1239 1659 1660 1240)
+4(1240 1660 1661 1241)
+4(1221 1241 1661 1641)
+4(1222 1242 1662 1642)
+4(398 839 1662 1242)
+4(1223 1243 1663 1643)
+4(1242 1662 1663 1243)
+4(1224 1244 1664 1644)
+4(1243 1663 1664 1244)
+4(1225 1245 1665 1645)
+4(1244 1664 1665 1245)
+4(1226 1246 1666 1646)
+4(1245 1665 1666 1246)
+4(1227 1247 1667 1647)
+4(1246 1666 1667 1247)
+4(1228 1248 1668 1648)
+4(1247 1667 1668 1248)
+4(1229 1249 1669 1649)
+4(1248 1668 1669 1249)
+4(1230 1250 1670 1650)
+4(1249 1669 1670 1250)
+4(1231 1251 1671 1651)
+4(1250 1670 1671 1251)
+4(1232 1252 1672 1652)
+4(1251 1671 1672 1252)
+4(1233 1253 1673 1653)
+4(1252 1672 1673 1253)
+4(1234 1254 1674 1654)
+4(1253 1673 1674 1254)
+4(1235 1255 1675 1655)
+4(1254 1674 1675 1255)
+4(1236 1256 1676 1656)
+4(1255 1675 1676 1256)
+4(1237 1257 1677 1657)
+4(1256 1676 1677 1257)
+4(1238 1258 1678 1658)
+4(1257 1677 1678 1258)
+4(1239 1259 1679 1659)
+4(1258 1678 1679 1259)
+4(1240 1260 1680 1660)
+4(1259 1679 1680 1260)
+4(1260 1680 1681 1261)
+4(1241 1261 1681 1661)
+4(1242 1262 1682 1662)
+4(419 860 1682 1262)
+4(1243 1263 1683 1663)
+4(1262 1682 1683 1263)
+4(1244 1264 1684 1664)
+4(1263 1683 1684 1264)
+4(1245 1265 1685 1665)
+4(1264 1684 1685 1265)
+4(1246 1266 1686 1666)
+4(1265 1685 1686 1266)
+4(1247 1267 1687 1667)
+4(1266 1686 1687 1267)
+4(1248 1268 1688 1668)
+4(1267 1687 1688 1268)
+4(1249 1269 1689 1669)
+4(1268 1688 1689 1269)
+4(1250 1270 1690 1670)
+4(1269 1689 1690 1270)
+4(1251 1271 1691 1671)
+4(1270 1690 1691 1271)
+4(1252 1272 1692 1672)
+4(1271 1691 1692 1272)
+4(1253 1273 1693 1673)
+4(1272 1692 1693 1273)
+4(1254 1274 1694 1674)
+4(1273 1693 1694 1274)
+4(1255 1275 1695 1675)
+4(1274 1694 1695 1275)
+4(1256 1276 1696 1676)
+4(1275 1695 1696 1276)
+4(1257 1277 1697 1677)
+4(1276 1696 1697 1277)
+4(1258 1278 1698 1678)
+4(1277 1697 1698 1278)
+4(1259 1279 1699 1679)
+4(1278 1698 1699 1279)
+4(1260 1280 1700 1680)
+4(1279 1699 1700 1280)
+4(1280 1700 1701 1281)
+4(1261 1281 1701 1681)
+4(1262 1282 1702 1682)
+4(440 881 1702 1282)
+4(1263 1283 1703 1683)
+4(1282 1702 1703 1283)
+4(1264 1284 1704 1684)
+4(1283 1703 1704 1284)
+4(1265 1285 1705 1685)
+4(1284 1704 1705 1285)
+4(1266 1286 1706 1686)
+4(1285 1705 1706 1286)
+4(1267 1287 1707 1687)
+4(1286 1706 1707 1287)
+4(1268 1288 1708 1688)
+4(1287 1707 1708 1288)
+4(1269 1289 1709 1689)
+4(1288 1708 1709 1289)
+4(1270 1290 1710 1690)
+4(1289 1709 1710 1290)
+4(1271 1291 1711 1691)
+4(1290 1710 1711 1291)
+4(1272 1292 1712 1692)
+4(1291 1711 1712 1292)
+4(1273 1293 1713 1693)
+4(1292 1712 1713 1293)
+4(1274 1294 1714 1694)
+4(1293 1713 1714 1294)
+4(1275 1295 1715 1695)
+4(1294 1714 1715 1295)
+4(1276 1296 1716 1696)
+4(1295 1715 1716 1296)
+4(1277 1297 1717 1697)
+4(1296 1716 1717 1297)
+4(1278 1298 1718 1698)
+4(1297 1717 1718 1298)
+4(1279 1299 1719 1699)
+4(1298 1718 1719 1299)
+4(1280 1300 1720 1700)
+4(1299 1719 1720 1300)
+4(1281 1301 1721 1701)
+4(1300 1720 1721 1301)
+4(1722 1742 2162 2142)
+4(921 1341 2162 1742)
+4(1723 1743 2163 2143)
+4(1742 2162 2163 1743)
+4(1724 1744 2164 2144)
+4(1743 2163 2164 1744)
+4(1725 1745 2165 2145)
+4(1744 2164 2165 1745)
+4(1726 1746 2166 2146)
+4(1745 2165 2166 1746)
+4(1727 1747 2167 2147)
+4(1746 2166 2167 1747)
+4(1728 1748 2168 2148)
+4(1747 2167 2168 1748)
+4(1729 1749 2169 2149)
+4(1748 2168 2169 1749)
+4(1730 1750 2170 2150)
+4(1749 2169 2170 1750)
+4(1731 1751 2171 2151)
+4(1750 2170 2171 1751)
+4(1732 1752 2172 2152)
+4(1751 2171 2172 1752)
+4(1733 1753 2173 2153)
+4(1752 2172 2173 1753)
+4(1734 1754 2174 2154)
+4(1753 2173 2174 1754)
+4(1735 1755 2175 2155)
+4(1754 2174 2175 1755)
+4(1736 1756 2176 2156)
+4(1755 2175 2176 1756)
+4(1737 1757 2177 2157)
+4(1756 2176 2177 1757)
+4(1738 1758 2178 2158)
+4(1757 2177 2178 1758)
+4(1739 1759 2179 2159)
+4(1758 2178 2179 1759)
+4(1740 1760 2180 2160)
+4(1759 2179 2180 1760)
+4(1760 2180 2181 1761)
+4(1742 1762 2182 2162)
+4(941 1361 2182 1762)
+4(1743 1763 2183 2163)
+4(1762 2182 2183 1763)
+4(1744 1764 2184 2164)
+4(1763 2183 2184 1764)
+4(1745 1765 2185 2165)
+4(1764 2184 2185 1765)
+4(1746 1766 2186 2166)
+4(1765 2185 2186 1766)
+4(1747 1767 2187 2167)
+4(1766 2186 2187 1767)
+4(1748 1768 2188 2168)
+4(1767 2187 2188 1768)
+4(1749 1769 2189 2169)
+4(1768 2188 2189 1769)
+4(1750 1770 2190 2170)
+4(1769 2189 2190 1770)
+4(1751 1771 2191 2171)
+4(1770 2190 2191 1771)
+4(1752 1772 2192 2172)
+4(1771 2191 2192 1772)
+4(1753 1773 2193 2173)
+4(1772 2192 2193 1773)
+4(1754 1774 2194 2174)
+4(1773 2193 2194 1774)
+4(1755 1775 2195 2175)
+4(1774 2194 2195 1775)
+4(1756 1776 2196 2176)
+4(1775 2195 2196 1776)
+4(1757 1777 2197 2177)
+4(1776 2196 2197 1777)
+4(1758 1778 2198 2178)
+4(1777 2197 2198 1778)
+4(1759 1779 2199 2179)
+4(1778 2198 2199 1779)
+4(1760 1780 2200 2180)
+4(1779 2199 2200 1780)
+4(1780 2200 2201 1781)
+4(1762 1782 2202 2182)
+4(961 1381 2202 1782)
+4(1763 1783 2203 2183)
+4(1782 2202 2203 1783)
+4(1764 1784 2204 2184)
+4(1783 2203 2204 1784)
+4(1765 1785 2205 2185)
+4(1784 2204 2205 1785)
+4(1766 1786 2206 2186)
+4(1785 2205 2206 1786)
+4(1767 1787 2207 2187)
+4(1786 2206 2207 1787)
+4(1768 1788 2208 2188)
+4(1787 2207 2208 1788)
+4(1769 1789 2209 2189)
+4(1788 2208 2209 1789)
+4(1770 1790 2210 2190)
+4(1789 2209 2210 1790)
+4(1771 1791 2211 2191)
+4(1790 2210 2211 1791)
+4(1772 1792 2212 2192)
+4(1791 2211 2212 1792)
+4(1773 1793 2213 2193)
+4(1792 2212 2213 1793)
+4(1774 1794 2214 2194)
+4(1793 2213 2214 1794)
+4(1775 1795 2215 2195)
+4(1794 2214 2215 1795)
+4(1776 1796 2216 2196)
+4(1795 2215 2216 1796)
+4(1777 1797 2217 2197)
+4(1796 2216 2217 1797)
+4(1778 1798 2218 2198)
+4(1797 2217 2218 1798)
+4(1779 1799 2219 2199)
+4(1798 2218 2219 1799)
+4(1780 1800 2220 2200)
+4(1799 2219 2220 1800)
+4(1800 2220 2221 1801)
+4(1782 1802 2222 2202)
+4(981 1401 2222 1802)
+4(1783 1803 2223 2203)
+4(1802 2222 2223 1803)
+4(1784 1804 2224 2204)
+4(1803 2223 2224 1804)
+4(1785 1805 2225 2205)
+4(1804 2224 2225 1805)
+4(1786 1806 2226 2206)
+4(1805 2225 2226 1806)
+4(1787 1807 2227 2207)
+4(1806 2226 2227 1807)
+4(1788 1808 2228 2208)
+4(1807 2227 2228 1808)
+4(1789 1809 2229 2209)
+4(1808 2228 2229 1809)
+4(1790 1810 2230 2210)
+4(1809 2229 2230 1810)
+4(1791 1811 2231 2211)
+4(1810 2230 2231 1811)
+4(1792 1812 2232 2212)
+4(1811 2231 2232 1812)
+4(1793 1813 2233 2213)
+4(1812 2232 2233 1813)
+4(1794 1814 2234 2214)
+4(1813 2233 2234 1814)
+4(1795 1815 2235 2215)
+4(1814 2234 2235 1815)
+4(1796 1816 2236 2216)
+4(1815 2235 2236 1816)
+4(1797 1817 2237 2217)
+4(1816 2236 2237 1817)
+4(1798 1818 2238 2218)
+4(1817 2237 2238 1818)
+4(1799 1819 2239 2219)
+4(1818 2238 2239 1819)
+4(1800 1820 2240 2220)
+4(1819 2239 2240 1820)
+4(1820 2240 2241 1821)
+4(1802 1822 2242 2222)
+4(1001 1421 2242 1822)
+4(1803 1823 2243 2223)
+4(1822 2242 2243 1823)
+4(1804 1824 2244 2224)
+4(1823 2243 2244 1824)
+4(1805 1825 2245 2225)
+4(1824 2244 2245 1825)
+4(1806 1826 2246 2226)
+4(1825 2245 2246 1826)
+4(1807 1827 2247 2227)
+4(1826 2246 2247 1827)
+4(1808 1828 2248 2228)
+4(1827 2247 2248 1828)
+4(1809 1829 2249 2229)
+4(1828 2248 2249 1829)
+4(1810 1830 2250 2230)
+4(1829 2249 2250 1830)
+4(1811 1831 2251 2231)
+4(1830 2250 2251 1831)
+4(1812 1832 2252 2232)
+4(1831 2251 2252 1832)
+4(1813 1833 2253 2233)
+4(1832 2252 2253 1833)
+4(1814 1834 2254 2234)
+4(1833 2253 2254 1834)
+4(1815 1835 2255 2235)
+4(1834 2254 2255 1835)
+4(1816 1836 2256 2236)
+4(1835 2255 2256 1836)
+4(1817 1837 2257 2237)
+4(1836 2256 2257 1837)
+4(1818 1838 2258 2238)
+4(1837 2257 2258 1838)
+4(1819 1839 2259 2239)
+4(1838 2258 2259 1839)
+4(1820 1840 2260 2240)
+4(1839 2259 2260 1840)
+4(1840 2260 2261 1841)
+4(1822 1842 2262 2242)
+4(1021 1441 2262 1842)
+4(1823 1843 2263 2243)
+4(1842 2262 2263 1843)
+4(1824 1844 2264 2244)
+4(1843 2263 2264 1844)
+4(1825 1845 2265 2245)
+4(1844 2264 2265 1845)
+4(1826 1846 2266 2246)
+4(1845 2265 2266 1846)
+4(1827 1847 2267 2247)
+4(1846 2266 2267 1847)
+4(1828 1848 2268 2248)
+4(1847 2267 2268 1848)
+4(1829 1849 2269 2249)
+4(1848 2268 2269 1849)
+4(1830 1850 2270 2250)
+4(1849 2269 2270 1850)
+4(1831 1851 2271 2251)
+4(1850 2270 2271 1851)
+4(1832 1852 2272 2252)
+4(1851 2271 2272 1852)
+4(1833 1853 2273 2253)
+4(1852 2272 2273 1853)
+4(1834 1854 2274 2254)
+4(1853 2273 2274 1854)
+4(1835 1855 2275 2255)
+4(1854 2274 2275 1855)
+4(1836 1856 2276 2256)
+4(1855 2275 2276 1856)
+4(1837 1857 2277 2257)
+4(1856 2276 2277 1857)
+4(1838 1858 2278 2258)
+4(1857 2277 2278 1858)
+4(1839 1859 2279 2259)
+4(1858 2278 2279 1859)
+4(1840 1860 2280 2260)
+4(1859 2279 2280 1860)
+4(1860 2280 2281 1861)
+4(1842 1862 2282 2262)
+4(1041 1461 2282 1862)
+4(1843 1863 2283 2263)
+4(1862 2282 2283 1863)
+4(1844 1864 2284 2264)
+4(1863 2283 2284 1864)
+4(1845 1865 2285 2265)
+4(1864 2284 2285 1865)
+4(1846 1866 2286 2266)
+4(1865 2285 2286 1866)
+4(1847 1867 2287 2267)
+4(1866 2286 2287 1867)
+4(1848 1868 2288 2268)
+4(1867 2287 2288 1868)
+4(1849 1869 2289 2269)
+4(1868 2288 2289 1869)
+4(1850 1870 2290 2270)
+4(1869 2289 2290 1870)
+4(1851 1871 2291 2271)
+4(1870 2290 2291 1871)
+4(1852 1872 2292 2272)
+4(1871 2291 2292 1872)
+4(1853 1873 2293 2273)
+4(1872 2292 2293 1873)
+4(1854 1874 2294 2274)
+4(1873 2293 2294 1874)
+4(1855 1875 2295 2275)
+4(1874 2294 2295 1875)
+4(1856 1876 2296 2276)
+4(1875 2295 2296 1876)
+4(1857 1877 2297 2277)
+4(1876 2296 2297 1877)
+4(1858 1878 2298 2278)
+4(1877 2297 2298 1878)
+4(1859 1879 2299 2279)
+4(1878 2298 2299 1879)
+4(1860 1880 2300 2280)
+4(1879 2299 2300 1880)
+4(1880 2300 2301 1881)
+4(1862 1882 2302 2282)
+4(1061 1481 2302 1882)
+4(1863 1883 2303 2283)
+4(1882 2302 2303 1883)
+4(1864 1884 2304 2284)
+4(1883 2303 2304 1884)
+4(1865 1885 2305 2285)
+4(1884 2304 2305 1885)
+4(1866 1886 2306 2286)
+4(1885 2305 2306 1886)
+4(1867 1887 2307 2287)
+4(1886 2306 2307 1887)
+4(1868 1888 2308 2288)
+4(1887 2307 2308 1888)
+4(1869 1889 2309 2289)
+4(1888 2308 2309 1889)
+4(1870 1890 2310 2290)
+4(1889 2309 2310 1890)
+4(1871 1891 2311 2291)
+4(1890 2310 2311 1891)
+4(1872 1892 2312 2292)
+4(1891 2311 2312 1892)
+4(1873 1893 2313 2293)
+4(1892 2312 2313 1893)
+4(1874 1894 2314 2294)
+4(1893 2313 2314 1894)
+4(1875 1895 2315 2295)
+4(1894 2314 2315 1895)
+4(1876 1896 2316 2296)
+4(1895 2315 2316 1896)
+4(1877 1897 2317 2297)
+4(1896 2316 2317 1897)
+4(1878 1898 2318 2298)
+4(1897 2317 2318 1898)
+4(1879 1899 2319 2299)
+4(1898 2318 2319 1899)
+4(1880 1900 2320 2300)
+4(1899 2319 2320 1900)
+4(1900 2320 2321 1901)
+4(1882 1902 2322 2302)
+4(1081 1501 2322 1902)
+4(1883 1903 2323 2303)
+4(1902 2322 2323 1903)
+4(1884 1904 2324 2304)
+4(1903 2323 2324 1904)
+4(1885 1905 2325 2305)
+4(1904 2324 2325 1905)
+4(1886 1906 2326 2306)
+4(1905 2325 2326 1906)
+4(1887 1907 2327 2307)
+4(1906 2326 2327 1907)
+4(1888 1908 2328 2308)
+4(1907 2327 2328 1908)
+4(1889 1909 2329 2309)
+4(1908 2328 2329 1909)
+4(1890 1910 2330 2310)
+4(1909 2329 2330 1910)
+4(1891 1911 2331 2311)
+4(1910 2330 2331 1911)
+4(1892 1912 2332 2312)
+4(1911 2331 2332 1912)
+4(1893 1913 2333 2313)
+4(1912 2332 2333 1913)
+4(1894 1914 2334 2314)
+4(1913 2333 2334 1914)
+4(1895 1915 2335 2315)
+4(1914 2334 2335 1915)
+4(1896 1916 2336 2316)
+4(1915 2335 2336 1916)
+4(1897 1917 2337 2317)
+4(1916 2336 2337 1917)
+4(1898 1918 2338 2318)
+4(1917 2337 2338 1918)
+4(1899 1919 2339 2319)
+4(1918 2338 2339 1919)
+4(1900 1920 2340 2320)
+4(1919 2339 2340 1920)
+4(1920 2340 2341 1921)
+4(1902 1922 2342 2322)
+4(1101 1521 2342 1922)
+4(1903 1923 2343 2323)
+4(1922 2342 2343 1923)
+4(1904 1924 2344 2324)
+4(1923 2343 2344 1924)
+4(1905 1925 2345 2325)
+4(1924 2344 2345 1925)
+4(1906 1926 2346 2326)
+4(1925 2345 2346 1926)
+4(1907 1927 2347 2327)
+4(1926 2346 2347 1927)
+4(1908 1928 2348 2328)
+4(1927 2347 2348 1928)
+4(1909 1929 2349 2329)
+4(1928 2348 2349 1929)
+4(1910 1930 2350 2330)
+4(1929 2349 2350 1930)
+4(1911 1931 2351 2331)
+4(1930 2350 2351 1931)
+4(1912 1932 2352 2332)
+4(1931 2351 2352 1932)
+4(1913 1933 2353 2333)
+4(1932 2352 2353 1933)
+4(1914 1934 2354 2334)
+4(1933 2353 2354 1934)
+4(1915 1935 2355 2335)
+4(1934 2354 2355 1935)
+4(1916 1936 2356 2336)
+4(1935 2355 2356 1936)
+4(1917 1937 2357 2337)
+4(1936 2356 2357 1937)
+4(1918 1938 2358 2338)
+4(1937 2357 2358 1938)
+4(1919 1939 2359 2339)
+4(1938 2358 2359 1939)
+4(1920 1940 2360 2340)
+4(1939 2359 2360 1940)
+4(1940 2360 2361 1941)
+4(1922 1942 2362 2342)
+4(1121 1541 2362 1942)
+4(1923 1943 2363 2343)
+4(1942 2362 2363 1943)
+4(1924 1944 2364 2344)
+4(1943 2363 2364 1944)
+4(1925 1945 2365 2345)
+4(1944 2364 2365 1945)
+4(1926 1946 2366 2346)
+4(1945 2365 2366 1946)
+4(1927 1947 2367 2347)
+4(1946 2366 2367 1947)
+4(1928 1948 2368 2348)
+4(1947 2367 2368 1948)
+4(1929 1949 2369 2349)
+4(1948 2368 2369 1949)
+4(1930 1950 2370 2350)
+4(1949 2369 2370 1950)
+4(1931 1951 2371 2351)
+4(1950 2370 2371 1951)
+4(1932 1952 2372 2352)
+4(1951 2371 2372 1952)
+4(1933 1953 2373 2353)
+4(1952 2372 2373 1953)
+4(1934 1954 2374 2354)
+4(1953 2373 2374 1954)
+4(1935 1955 2375 2355)
+4(1954 2374 2375 1955)
+4(1936 1956 2376 2356)
+4(1955 2375 2376 1956)
+4(1937 1957 2377 2357)
+4(1956 2376 2377 1957)
+4(1938 1958 2378 2358)
+4(1957 2377 2378 1958)
+4(1939 1959 2379 2359)
+4(1958 2378 2379 1959)
+4(1940 1960 2380 2360)
+4(1959 2379 2380 1960)
+4(1960 2380 2381 1961)
+4(1942 1962 2382 2362)
+4(1141 1561 2382 1962)
+4(1943 1963 2383 2363)
+4(1962 2382 2383 1963)
+4(1944 1964 2384 2364)
+4(1963 2383 2384 1964)
+4(1945 1965 2385 2365)
+4(1964 2384 2385 1965)
+4(1946 1966 2386 2366)
+4(1965 2385 2386 1966)
+4(1947 1967 2387 2367)
+4(1966 2386 2387 1967)
+4(1948 1968 2388 2368)
+4(1967 2387 2388 1968)
+4(1949 1969 2389 2369)
+4(1968 2388 2389 1969)
+4(1950 1970 2390 2370)
+4(1969 2389 2390 1970)
+4(1951 1971 2391 2371)
+4(1970 2390 2391 1971)
+4(1952 1972 2392 2372)
+4(1971 2391 2392 1972)
+4(1953 1973 2393 2373)
+4(1972 2392 2393 1973)
+4(1954 1974 2394 2374)
+4(1973 2393 2394 1974)
+4(1955 1975 2395 2375)
+4(1974 2394 2395 1975)
+4(1956 1976 2396 2376)
+4(1975 2395 2396 1976)
+4(1957 1977 2397 2377)
+4(1976 2396 2397 1977)
+4(1958 1978 2398 2378)
+4(1977 2397 2398 1978)
+4(1959 1979 2399 2379)
+4(1978 2398 2399 1979)
+4(1960 1980 2400 2380)
+4(1979 2399 2400 1980)
+4(1980 2400 2401 1981)
+4(1962 1982 2402 2382)
+4(1161 1581 2402 1982)
+4(1963 1983 2403 2383)
+4(1982 2402 2403 1983)
+4(1964 1984 2404 2384)
+4(1983 2403 2404 1984)
+4(1965 1985 2405 2385)
+4(1984 2404 2405 1985)
+4(1966 1986 2406 2386)
+4(1985 2405 2406 1986)
+4(1967 1987 2407 2387)
+4(1986 2406 2407 1987)
+4(1968 1988 2408 2388)
+4(1987 2407 2408 1988)
+4(1969 1989 2409 2389)
+4(1988 2408 2409 1989)
+4(1970 1990 2410 2390)
+4(1989 2409 2410 1990)
+4(1971 1991 2411 2391)
+4(1990 2410 2411 1991)
+4(1972 1992 2412 2392)
+4(1991 2411 2412 1992)
+4(1973 1993 2413 2393)
+4(1992 2412 2413 1993)
+4(1974 1994 2414 2394)
+4(1993 2413 2414 1994)
+4(1975 1995 2415 2395)
+4(1994 2414 2415 1995)
+4(1976 1996 2416 2396)
+4(1995 2415 2416 1996)
+4(1977 1997 2417 2397)
+4(1996 2416 2417 1997)
+4(1978 1998 2418 2398)
+4(1997 2417 2418 1998)
+4(1979 1999 2419 2399)
+4(1998 2418 2419 1999)
+4(1980 2000 2420 2400)
+4(1999 2419 2420 2000)
+4(2000 2420 2421 2001)
+4(1982 2002 2422 2402)
+4(1181 1601 2422 2002)
+4(1983 2003 2423 2403)
+4(2002 2422 2423 2003)
+4(1984 2004 2424 2404)
+4(2003 2423 2424 2004)
+4(1985 2005 2425 2405)
+4(2004 2424 2425 2005)
+4(1986 2006 2426 2406)
+4(2005 2425 2426 2006)
+4(1987 2007 2427 2407)
+4(2006 2426 2427 2007)
+4(1988 2008 2428 2408)
+4(2007 2427 2428 2008)
+4(1989 2009 2429 2409)
+4(2008 2428 2429 2009)
+4(1990 2010 2430 2410)
+4(2009 2429 2430 2010)
+4(1991 2011 2431 2411)
+4(2010 2430 2431 2011)
+4(1992 2012 2432 2412)
+4(2011 2431 2432 2012)
+4(1993 2013 2433 2413)
+4(2012 2432 2433 2013)
+4(1994 2014 2434 2414)
+4(2013 2433 2434 2014)
+4(1995 2015 2435 2415)
+4(2014 2434 2435 2015)
+4(1996 2016 2436 2416)
+4(2015 2435 2436 2016)
+4(1997 2017 2437 2417)
+4(2016 2436 2437 2017)
+4(1998 2018 2438 2418)
+4(2017 2437 2438 2018)
+4(1999 2019 2439 2419)
+4(2018 2438 2439 2019)
+4(2000 2020 2440 2420)
+4(2019 2439 2440 2020)
+4(2020 2440 2441 2021)
+4(2002 2022 2442 2422)
+4(1201 1621 2442 2022)
+4(2003 2023 2443 2423)
+4(2022 2442 2443 2023)
+4(2004 2024 2444 2424)
+4(2023 2443 2444 2024)
+4(2005 2025 2445 2425)
+4(2024 2444 2445 2025)
+4(2006 2026 2446 2426)
+4(2025 2445 2446 2026)
+4(2007 2027 2447 2427)
+4(2026 2446 2447 2027)
+4(2008 2028 2448 2428)
+4(2027 2447 2448 2028)
+4(2009 2029 2449 2429)
+4(2028 2448 2449 2029)
+4(2010 2030 2450 2430)
+4(2029 2449 2450 2030)
+4(2011 2031 2451 2431)
+4(2030 2450 2451 2031)
+4(2012 2032 2452 2432)
+4(2031 2451 2452 2032)
+4(2013 2033 2453 2433)
+4(2032 2452 2453 2033)
+4(2014 2034 2454 2434)
+4(2033 2453 2454 2034)
+4(2015 2035 2455 2435)
+4(2034 2454 2455 2035)
+4(2016 2036 2456 2436)
+4(2035 2455 2456 2036)
+4(2017 2037 2457 2437)
+4(2036 2456 2457 2037)
+4(2018 2038 2458 2438)
+4(2037 2457 2458 2038)
+4(2019 2039 2459 2439)
+4(2038 2458 2459 2039)
+4(2020 2040 2460 2440)
+4(2039 2459 2460 2040)
+4(2040 2460 2461 2041)
+4(2022 2042 2462 2442)
+4(1221 1641 2462 2042)
+4(2023 2043 2463 2443)
+4(2042 2462 2463 2043)
+4(2024 2044 2464 2444)
+4(2043 2463 2464 2044)
+4(2025 2045 2465 2445)
+4(2044 2464 2465 2045)
+4(2026 2046 2466 2446)
+4(2045 2465 2466 2046)
+4(2027 2047 2467 2447)
+4(2046 2466 2467 2047)
+4(2028 2048 2468 2448)
+4(2047 2467 2468 2048)
+4(2029 2049 2469 2449)
+4(2048 2468 2469 2049)
+4(2030 2050 2470 2450)
+4(2049 2469 2470 2050)
+4(2031 2051 2471 2451)
+4(2050 2470 2471 2051)
+4(2032 2052 2472 2452)
+4(2051 2471 2472 2052)
+4(2033 2053 2473 2453)
+4(2052 2472 2473 2053)
+4(2034 2054 2474 2454)
+4(2053 2473 2474 2054)
+4(2035 2055 2475 2455)
+4(2054 2474 2475 2055)
+4(2036 2056 2476 2456)
+4(2055 2475 2476 2056)
+4(2037 2057 2477 2457)
+4(2056 2476 2477 2057)
+4(2038 2058 2478 2458)
+4(2057 2477 2478 2058)
+4(2039 2059 2479 2459)
+4(2058 2478 2479 2059)
+4(2040 2060 2480 2460)
+4(2059 2479 2480 2060)
+4(2060 2480 2481 2061)
+4(2042 2062 2482 2462)
+4(1241 1661 2482 2062)
+4(2043 2063 2483 2463)
+4(2062 2482 2483 2063)
+4(2044 2064 2484 2464)
+4(2063 2483 2484 2064)
+4(2045 2065 2485 2465)
+4(2064 2484 2485 2065)
+4(2046 2066 2486 2466)
+4(2065 2485 2486 2066)
+4(2047 2067 2487 2467)
+4(2066 2486 2487 2067)
+4(2048 2068 2488 2468)
+4(2067 2487 2488 2068)
+4(2049 2069 2489 2469)
+4(2068 2488 2489 2069)
+4(2050 2070 2490 2470)
+4(2069 2489 2490 2070)
+4(2051 2071 2491 2471)
+4(2070 2490 2491 2071)
+4(2052 2072 2492 2472)
+4(2071 2491 2492 2072)
+4(2053 2073 2493 2473)
+4(2072 2492 2493 2073)
+4(2054 2074 2494 2474)
+4(2073 2493 2494 2074)
+4(2055 2075 2495 2475)
+4(2074 2494 2495 2075)
+4(2056 2076 2496 2476)
+4(2075 2495 2496 2076)
+4(2057 2077 2497 2477)
+4(2076 2496 2497 2077)
+4(2058 2078 2498 2478)
+4(2077 2497 2498 2078)
+4(2059 2079 2499 2479)
+4(2078 2498 2499 2079)
+4(2060 2080 2500 2480)
+4(2079 2499 2500 2080)
+4(2080 2500 2501 2081)
+4(2062 2082 2502 2482)
+4(1261 1681 2502 2082)
+4(2063 2083 2503 2483)
+4(2082 2502 2503 2083)
+4(2064 2084 2504 2484)
+4(2083 2503 2504 2084)
+4(2065 2085 2505 2485)
+4(2084 2504 2505 2085)
+4(2066 2086 2506 2486)
+4(2085 2505 2506 2086)
+4(2067 2087 2507 2487)
+4(2086 2506 2507 2087)
+4(2068 2088 2508 2488)
+4(2087 2507 2508 2088)
+4(2069 2089 2509 2489)
+4(2088 2508 2509 2089)
+4(2070 2090 2510 2490)
+4(2089 2509 2510 2090)
+4(2071 2091 2511 2491)
+4(2090 2510 2511 2091)
+4(2072 2092 2512 2492)
+4(2091 2511 2512 2092)
+4(2073 2093 2513 2493)
+4(2092 2512 2513 2093)
+4(2074 2094 2514 2494)
+4(2093 2513 2514 2094)
+4(2075 2095 2515 2495)
+4(2094 2514 2515 2095)
+4(2076 2096 2516 2496)
+4(2095 2515 2516 2096)
+4(2077 2097 2517 2497)
+4(2096 2516 2517 2097)
+4(2078 2098 2518 2498)
+4(2097 2517 2518 2098)
+4(2079 2099 2519 2499)
+4(2098 2518 2519 2099)
+4(2080 2100 2520 2500)
+4(2099 2519 2520 2100)
+4(2100 2520 2521 2101)
+4(2082 2102 2522 2502)
+4(1281 1701 2522 2102)
+4(2083 2103 2523 2503)
+4(2102 2522 2523 2103)
+4(2084 2104 2524 2504)
+4(2103 2523 2524 2104)
+4(2085 2105 2525 2505)
+4(2104 2524 2525 2105)
+4(2086 2106 2526 2506)
+4(2105 2525 2526 2106)
+4(2087 2107 2527 2507)
+4(2106 2526 2527 2107)
+4(2088 2108 2528 2508)
+4(2107 2527 2528 2108)
+4(2089 2109 2529 2509)
+4(2108 2528 2529 2109)
+4(2090 2110 2530 2510)
+4(2109 2529 2530 2110)
+4(2091 2111 2531 2511)
+4(2110 2530 2531 2111)
+4(2092 2112 2532 2512)
+4(2111 2531 2532 2112)
+4(2093 2113 2533 2513)
+4(2112 2532 2533 2113)
+4(2094 2114 2534 2514)
+4(2113 2533 2534 2114)
+4(2095 2115 2535 2515)
+4(2114 2534 2535 2115)
+4(2096 2116 2536 2516)
+4(2115 2535 2536 2116)
+4(2097 2117 2537 2517)
+4(2116 2536 2537 2117)
+4(2098 2118 2538 2518)
+4(2117 2537 2538 2118)
+4(2099 2119 2539 2519)
+4(2118 2538 2539 2119)
+4(2100 2120 2540 2520)
+4(2119 2539 2540 2120)
+4(2120 2540 2541 2121)
+4(2102 2122 2542 2522)
+4(2103 2123 2543 2523)
+4(2104 2124 2544 2524)
+4(2105 2125 2545 2525)
+4(2106 2126 2546 2526)
+4(2107 2127 2547 2527)
+4(2108 2128 2548 2528)
+4(2109 2129 2549 2529)
+4(2110 2130 2550 2530)
+4(2111 2131 2551 2531)
+4(2112 2132 2552 2532)
+4(2113 2133 2553 2533)
+4(2114 2134 2554 2534)
+4(2115 2135 2555 2535)
+4(2116 2136 2556 2536)
+4(2117 2137 2557 2537)
+4(2118 2138 2558 2538)
+4(2119 2139 2559 2539)
+4(2120 2140 2560 2540)
+4(1282 2563 2983 1702)
+4(2562 2982 2983 2563)
+4(1283 2564 2984 1703)
+4(2563 2983 2984 2564)
+4(1284 2565 2985 1704)
+4(2564 2984 2985 2565)
+4(1285 2566 2986 1705)
+4(2565 2985 2986 2566)
+4(1286 2567 2987 1706)
+4(2566 2986 2987 2567)
+4(1287 2568 2988 1707)
+4(2567 2987 2988 2568)
+4(1288 2569 2989 1708)
+4(2568 2988 2989 2569)
+4(1289 2570 2990 1709)
+4(2569 2989 2990 2570)
+4(1290 2571 2991 1710)
+4(2570 2990 2991 2571)
+4(1291 2572 2992 1711)
+4(2571 2991 2992 2572)
+4(1292 2573 2993 1712)
+4(2572 2992 2993 2573)
+4(1293 2574 2994 1713)
+4(2573 2993 2994 2574)
+4(1294 2575 2995 1714)
+4(2574 2994 2995 2575)
+4(1295 2576 2996 1715)
+4(2575 2995 2996 2576)
+4(1296 2577 2997 1716)
+4(2576 2996 2997 2577)
+4(1297 2578 2998 1717)
+4(2577 2997 2998 2578)
+4(1298 2579 2999 1718)
+4(2578 2998 2999 2579)
+4(1299 2580 3000 1719)
+4(2579 2999 3000 2580)
+4(1300 2581 3001 1720)
+4(2580 3000 3001 2581)
+4(2581 3001 3002 2582)
+4(2563 2584 3004 2983)
+4(2583 3003 3004 2584)
+4(2564 2585 3005 2984)
+4(2584 3004 3005 2585)
+4(2565 2586 3006 2985)
+4(2585 3005 3006 2586)
+4(2566 2587 3007 2986)
+4(2586 3006 3007 2587)
+4(2567 2588 3008 2987)
+4(2587 3007 3008 2588)
+4(2568 2589 3009 2988)
+4(2588 3008 3009 2589)
+4(2569 2590 3010 2989)
+4(2589 3009 3010 2590)
+4(2570 2591 3011 2990)
+4(2590 3010 3011 2591)
+4(2571 2592 3012 2991)
+4(2591 3011 3012 2592)
+4(2572 2593 3013 2992)
+4(2592 3012 3013 2593)
+4(2573 2594 3014 2993)
+4(2593 3013 3014 2594)
+4(2574 2595 3015 2994)
+4(2594 3014 3015 2595)
+4(2575 2596 3016 2995)
+4(2595 3015 3016 2596)
+4(2576 2597 3017 2996)
+4(2596 3016 3017 2597)
+4(2577 2598 3018 2997)
+4(2597 3017 3018 2598)
+4(2578 2599 3019 2998)
+4(2598 3018 3019 2599)
+4(2579 2600 3020 2999)
+4(2599 3019 3020 2600)
+4(2580 2601 3021 3000)
+4(2600 3020 3021 2601)
+4(2581 2602 3022 3001)
+4(2601 3021 3022 2602)
+4(2602 3022 3023 2603)
+4(2584 2605 3025 3004)
+4(2604 3024 3025 2605)
+4(2585 2606 3026 3005)
+4(2605 3025 3026 2606)
+4(2586 2607 3027 3006)
+4(2606 3026 3027 2607)
+4(2587 2608 3028 3007)
+4(2607 3027 3028 2608)
+4(2588 2609 3029 3008)
+4(2608 3028 3029 2609)
+4(2589 2610 3030 3009)
+4(2609 3029 3030 2610)
+4(2590 2611 3031 3010)
+4(2610 3030 3031 2611)
+4(2591 2612 3032 3011)
+4(2611 3031 3032 2612)
+4(2592 2613 3033 3012)
+4(2612 3032 3033 2613)
+4(2593 2614 3034 3013)
+4(2613 3033 3034 2614)
+4(2594 2615 3035 3014)
+4(2614 3034 3035 2615)
+4(2595 2616 3036 3015)
+4(2615 3035 3036 2616)
+4(2596 2617 3037 3016)
+4(2616 3036 3037 2617)
+4(2597 2618 3038 3017)
+4(2617 3037 3038 2618)
+4(2598 2619 3039 3018)
+4(2618 3038 3039 2619)
+4(2599 2620 3040 3019)
+4(2619 3039 3040 2620)
+4(2600 2621 3041 3020)
+4(2620 3040 3041 2621)
+4(2601 2622 3042 3021)
+4(2621 3041 3042 2622)
+4(2602 2623 3043 3022)
+4(2622 3042 3043 2623)
+4(2623 3043 3044 2624)
+4(2605 2626 3046 3025)
+4(2625 3045 3046 2626)
+4(2606 2627 3047 3026)
+4(2626 3046 3047 2627)
+4(2607 2628 3048 3027)
+4(2627 3047 3048 2628)
+4(2608 2629 3049 3028)
+4(2628 3048 3049 2629)
+4(2609 2630 3050 3029)
+4(2629 3049 3050 2630)
+4(2610 2631 3051 3030)
+4(2630 3050 3051 2631)
+4(2611 2632 3052 3031)
+4(2631 3051 3052 2632)
+4(2612 2633 3053 3032)
+4(2632 3052 3053 2633)
+4(2613 2634 3054 3033)
+4(2633 3053 3054 2634)
+4(2614 2635 3055 3034)
+4(2634 3054 3055 2635)
+4(2615 2636 3056 3035)
+4(2635 3055 3056 2636)
+4(2616 2637 3057 3036)
+4(2636 3056 3057 2637)
+4(2617 2638 3058 3037)
+4(2637 3057 3058 2638)
+4(2618 2639 3059 3038)
+4(2638 3058 3059 2639)
+4(2619 2640 3060 3039)
+4(2639 3059 3060 2640)
+4(2620 2641 3061 3040)
+4(2640 3060 3061 2641)
+4(2621 2642 3062 3041)
+4(2641 3061 3062 2642)
+4(2622 2643 3063 3042)
+4(2642 3062 3063 2643)
+4(2623 2644 3064 3043)
+4(2643 3063 3064 2644)
+4(2644 3064 3065 2645)
+4(2626 2647 3067 3046)
+4(2646 3066 3067 2647)
+4(2627 2648 3068 3047)
+4(2647 3067 3068 2648)
+4(2628 2649 3069 3048)
+4(2648 3068 3069 2649)
+4(2629 2650 3070 3049)
+4(2649 3069 3070 2650)
+4(2630 2651 3071 3050)
+4(2650 3070 3071 2651)
+4(2631 2652 3072 3051)
+4(2651 3071 3072 2652)
+4(2632 2653 3073 3052)
+4(2652 3072 3073 2653)
+4(2633 2654 3074 3053)
+4(2653 3073 3074 2654)
+4(2634 2655 3075 3054)
+4(2654 3074 3075 2655)
+4(2635 2656 3076 3055)
+4(2655 3075 3076 2656)
+4(2636 2657 3077 3056)
+4(2656 3076 3077 2657)
+4(2637 2658 3078 3057)
+4(2657 3077 3078 2658)
+4(2638 2659 3079 3058)
+4(2658 3078 3079 2659)
+4(2639 2660 3080 3059)
+4(2659 3079 3080 2660)
+4(2640 2661 3081 3060)
+4(2660 3080 3081 2661)
+4(2641 2662 3082 3061)
+4(2661 3081 3082 2662)
+4(2642 2663 3083 3062)
+4(2662 3082 3083 2663)
+4(2643 2664 3084 3063)
+4(2663 3083 3084 2664)
+4(2644 2665 3085 3064)
+4(2664 3084 3085 2665)
+4(2665 3085 3086 2666)
+4(2647 2668 3088 3067)
+4(2667 3087 3088 2668)
+4(2648 2669 3089 3068)
+4(2668 3088 3089 2669)
+4(2649 2670 3090 3069)
+4(2669 3089 3090 2670)
+4(2650 2671 3091 3070)
+4(2670 3090 3091 2671)
+4(2651 2672 3092 3071)
+4(2671 3091 3092 2672)
+4(2652 2673 3093 3072)
+4(2672 3092 3093 2673)
+4(2653 2674 3094 3073)
+4(2673 3093 3094 2674)
+4(2654 2675 3095 3074)
+4(2674 3094 3095 2675)
+4(2655 2676 3096 3075)
+4(2675 3095 3096 2676)
+4(2656 2677 3097 3076)
+4(2676 3096 3097 2677)
+4(2657 2678 3098 3077)
+4(2677 3097 3098 2678)
+4(2658 2679 3099 3078)
+4(2678 3098 3099 2679)
+4(2659 2680 3100 3079)
+4(2679 3099 3100 2680)
+4(2660 2681 3101 3080)
+4(2680 3100 3101 2681)
+4(2661 2682 3102 3081)
+4(2681 3101 3102 2682)
+4(2662 2683 3103 3082)
+4(2682 3102 3103 2683)
+4(2663 2684 3104 3083)
+4(2683 3103 3104 2684)
+4(2664 2685 3105 3084)
+4(2684 3104 3105 2685)
+4(2665 2686 3106 3085)
+4(2685 3105 3106 2686)
+4(2686 3106 3107 2687)
+4(2668 2689 3109 3088)
+4(2688 3108 3109 2689)
+4(2669 2690 3110 3089)
+4(2689 3109 3110 2690)
+4(2670 2691 3111 3090)
+4(2690 3110 3111 2691)
+4(2671 2692 3112 3091)
+4(2691 3111 3112 2692)
+4(2672 2693 3113 3092)
+4(2692 3112 3113 2693)
+4(2673 2694 3114 3093)
+4(2693 3113 3114 2694)
+4(2674 2695 3115 3094)
+4(2694 3114 3115 2695)
+4(2675 2696 3116 3095)
+4(2695 3115 3116 2696)
+4(2676 2697 3117 3096)
+4(2696 3116 3117 2697)
+4(2677 2698 3118 3097)
+4(2697 3117 3118 2698)
+4(2678 2699 3119 3098)
+4(2698 3118 3119 2699)
+4(2679 2700 3120 3099)
+4(2699 3119 3120 2700)
+4(2680 2701 3121 3100)
+4(2700 3120 3121 2701)
+4(2681 2702 3122 3101)
+4(2701 3121 3122 2702)
+4(2682 2703 3123 3102)
+4(2702 3122 3123 2703)
+4(2683 2704 3124 3103)
+4(2703 3123 3124 2704)
+4(2684 2705 3125 3104)
+4(2704 3124 3125 2705)
+4(2685 2706 3126 3105)
+4(2705 3125 3126 2706)
+4(2686 2707 3127 3106)
+4(2706 3126 3127 2707)
+4(2707 3127 3128 2708)
+4(2689 2710 3130 3109)
+4(2709 3129 3130 2710)
+4(2690 2711 3131 3110)
+4(2710 3130 3131 2711)
+4(2691 2712 3132 3111)
+4(2711 3131 3132 2712)
+4(2692 2713 3133 3112)
+4(2712 3132 3133 2713)
+4(2693 2714 3134 3113)
+4(2713 3133 3134 2714)
+4(2694 2715 3135 3114)
+4(2714 3134 3135 2715)
+4(2695 2716 3136 3115)
+4(2715 3135 3136 2716)
+4(2696 2717 3137 3116)
+4(2716 3136 3137 2717)
+4(2697 2718 3138 3117)
+4(2717 3137 3138 2718)
+4(2698 2719 3139 3118)
+4(2718 3138 3139 2719)
+4(2699 2720 3140 3119)
+4(2719 3139 3140 2720)
+4(2700 2721 3141 3120)
+4(2720 3140 3141 2721)
+4(2701 2722 3142 3121)
+4(2721 3141 3142 2722)
+4(2702 2723 3143 3122)
+4(2722 3142 3143 2723)
+4(2703 2724 3144 3123)
+4(2723 3143 3144 2724)
+4(2704 2725 3145 3124)
+4(2724 3144 3145 2725)
+4(2705 2726 3146 3125)
+4(2725 3145 3146 2726)
+4(2706 2727 3147 3126)
+4(2726 3146 3147 2727)
+4(2707 2728 3148 3127)
+4(2727 3147 3148 2728)
+4(2728 3148 3149 2729)
+4(2710 2731 3151 3130)
+4(2730 3150 3151 2731)
+4(2711 2732 3152 3131)
+4(2731 3151 3152 2732)
+4(2712 2733 3153 3132)
+4(2732 3152 3153 2733)
+4(2713 2734 3154 3133)
+4(2733 3153 3154 2734)
+4(2714 2735 3155 3134)
+4(2734 3154 3155 2735)
+4(2715 2736 3156 3135)
+4(2735 3155 3156 2736)
+4(2716 2737 3157 3136)
+4(2736 3156 3157 2737)
+4(2717 2738 3158 3137)
+4(2737 3157 3158 2738)
+4(2718 2739 3159 3138)
+4(2738 3158 3159 2739)
+4(2719 2740 3160 3139)
+4(2739 3159 3160 2740)
+4(2720 2741 3161 3140)
+4(2740 3160 3161 2741)
+4(2721 2742 3162 3141)
+4(2741 3161 3162 2742)
+4(2722 2743 3163 3142)
+4(2742 3162 3163 2743)
+4(2723 2744 3164 3143)
+4(2743 3163 3164 2744)
+4(2724 2745 3165 3144)
+4(2744 3164 3165 2745)
+4(2725 2746 3166 3145)
+4(2745 3165 3166 2746)
+4(2726 2747 3167 3146)
+4(2746 3166 3167 2747)
+4(2727 2748 3168 3147)
+4(2747 3167 3168 2748)
+4(2728 2749 3169 3148)
+4(2748 3168 3169 2749)
+4(2749 3169 3170 2750)
+4(2731 2752 3172 3151)
+4(2751 3171 3172 2752)
+4(2732 2753 3173 3152)
+4(2752 3172 3173 2753)
+4(2733 2754 3174 3153)
+4(2753 3173 3174 2754)
+4(2734 2755 3175 3154)
+4(2754 3174 3175 2755)
+4(2735 2756 3176 3155)
+4(2755 3175 3176 2756)
+4(2736 2757 3177 3156)
+4(2756 3176 3177 2757)
+4(2737 2758 3178 3157)
+4(2757 3177 3178 2758)
+4(2738 2759 3179 3158)
+4(2758 3178 3179 2759)
+4(2739 2760 3180 3159)
+4(2759 3179 3180 2760)
+4(2740 2761 3181 3160)
+4(2760 3180 3181 2761)
+4(2741 2762 3182 3161)
+4(2761 3181 3182 2762)
+4(2742 2763 3183 3162)
+4(2762 3182 3183 2763)
+4(2743 2764 3184 3163)
+4(2763 3183 3184 2764)
+4(2744 2765 3185 3164)
+4(2764 3184 3185 2765)
+4(2745 2766 3186 3165)
+4(2765 3185 3186 2766)
+4(2746 2767 3187 3166)
+4(2766 3186 3187 2767)
+4(2747 2768 3188 3167)
+4(2767 3187 3188 2768)
+4(2748 2769 3189 3168)
+4(2768 3188 3189 2769)
+4(2749 2770 3190 3169)
+4(2769 3189 3190 2770)
+4(2770 3190 3191 2771)
+4(2752 2773 3193 3172)
+4(2772 3192 3193 2773)
+4(2753 2774 3194 3173)
+4(2773 3193 3194 2774)
+4(2754 2775 3195 3174)
+4(2774 3194 3195 2775)
+4(2755 2776 3196 3175)
+4(2775 3195 3196 2776)
+4(2756 2777 3197 3176)
+4(2776 3196 3197 2777)
+4(2757 2778 3198 3177)
+4(2777 3197 3198 2778)
+4(2758 2779 3199 3178)
+4(2778 3198 3199 2779)
+4(2759 2780 3200 3179)
+4(2779 3199 3200 2780)
+4(2760 2781 3201 3180)
+4(2780 3200 3201 2781)
+4(2761 2782 3202 3181)
+4(2781 3201 3202 2782)
+4(2762 2783 3203 3182)
+4(2782 3202 3203 2783)
+4(2763 2784 3204 3183)
+4(2783 3203 3204 2784)
+4(2764 2785 3205 3184)
+4(2784 3204 3205 2785)
+4(2765 2786 3206 3185)
+4(2785 3205 3206 2786)
+4(2766 2787 3207 3186)
+4(2786 3206 3207 2787)
+4(2767 2788 3208 3187)
+4(2787 3207 3208 2788)
+4(2768 2789 3209 3188)
+4(2788 3208 3209 2789)
+4(2769 2790 3210 3189)
+4(2789 3209 3210 2790)
+4(2770 2791 3211 3190)
+4(2790 3210 3211 2791)
+4(2791 3211 3212 2792)
+4(2773 2794 3214 3193)
+4(2793 3213 3214 2794)
+4(2774 2795 3215 3194)
+4(2794 3214 3215 2795)
+4(2775 2796 3216 3195)
+4(2795 3215 3216 2796)
+4(2776 2797 3217 3196)
+4(2796 3216 3217 2797)
+4(2777 2798 3218 3197)
+4(2797 3217 3218 2798)
+4(2778 2799 3219 3198)
+4(2798 3218 3219 2799)
+4(2779 2800 3220 3199)
+4(2799 3219 3220 2800)
+4(2780 2801 3221 3200)
+4(2800 3220 3221 2801)
+4(2781 2802 3222 3201)
+4(2801 3221 3222 2802)
+4(2782 2803 3223 3202)
+4(2802 3222 3223 2803)
+4(2783 2804 3224 3203)
+4(2803 3223 3224 2804)
+4(2784 2805 3225 3204)
+4(2804 3224 3225 2805)
+4(2785 2806 3226 3205)
+4(2805 3225 3226 2806)
+4(2786 2807 3227 3206)
+4(2806 3226 3227 2807)
+4(2787 2808 3228 3207)
+4(2807 3227 3228 2808)
+4(2788 2809 3229 3208)
+4(2808 3228 3229 2809)
+4(2789 2810 3230 3209)
+4(2809 3229 3230 2810)
+4(2790 2811 3231 3210)
+4(2810 3230 3231 2811)
+4(2791 2812 3232 3211)
+4(2811 3231 3232 2812)
+4(2812 3232 3233 2813)
+4(2794 2815 3235 3214)
+4(2814 3234 3235 2815)
+4(2795 2816 3236 3215)
+4(2815 3235 3236 2816)
+4(2796 2817 3237 3216)
+4(2816 3236 3237 2817)
+4(2797 2818 3238 3217)
+4(2817 3237 3238 2818)
+4(2798 2819 3239 3218)
+4(2818 3238 3239 2819)
+4(2799 2820 3240 3219)
+4(2819 3239 3240 2820)
+4(2800 2821 3241 3220)
+4(2820 3240 3241 2821)
+4(2801 2822 3242 3221)
+4(2821 3241 3242 2822)
+4(2802 2823 3243 3222)
+4(2822 3242 3243 2823)
+4(2803 2824 3244 3223)
+4(2823 3243 3244 2824)
+4(2804 2825 3245 3224)
+4(2824 3244 3245 2825)
+4(2805 2826 3246 3225)
+4(2825 3245 3246 2826)
+4(2806 2827 3247 3226)
+4(2826 3246 3247 2827)
+4(2807 2828 3248 3227)
+4(2827 3247 3248 2828)
+4(2808 2829 3249 3228)
+4(2828 3248 3249 2829)
+4(2809 2830 3250 3229)
+4(2829 3249 3250 2830)
+4(2810 2831 3251 3230)
+4(2830 3250 3251 2831)
+4(2811 2832 3252 3231)
+4(2831 3251 3252 2832)
+4(2812 2833 3253 3232)
+4(2832 3252 3253 2833)
+4(2833 3253 3254 2834)
+4(2815 2836 3256 3235)
+4(2835 3255 3256 2836)
+4(2816 2837 3257 3236)
+4(2836 3256 3257 2837)
+4(2817 2838 3258 3237)
+4(2837 3257 3258 2838)
+4(2818 2839 3259 3238)
+4(2838 3258 3259 2839)
+4(2819 2840 3260 3239)
+4(2839 3259 3260 2840)
+4(2820 2841 3261 3240)
+4(2840 3260 3261 2841)
+4(2821 2842 3262 3241)
+4(2841 3261 3262 2842)
+4(2822 2843 3263 3242)
+4(2842 3262 3263 2843)
+4(2823 2844 3264 3243)
+4(2843 3263 3264 2844)
+4(2824 2845 3265 3244)
+4(2844 3264 3265 2845)
+4(2825 2846 3266 3245)
+4(2845 3265 3266 2846)
+4(2826 2847 3267 3246)
+4(2846 3266 3267 2847)
+4(2827 2848 3268 3247)
+4(2847 3267 3268 2848)
+4(2828 2849 3269 3248)
+4(2848 3268 3269 2849)
+4(2829 2850 3270 3249)
+4(2849 3269 3270 2850)
+4(2830 2851 3271 3250)
+4(2850 3270 3271 2851)
+4(2831 2852 3272 3251)
+4(2851 3271 3272 2852)
+4(2832 2853 3273 3252)
+4(2852 3272 3273 2853)
+4(2833 2854 3274 3253)
+4(2853 3273 3274 2854)
+4(2854 3274 3275 2855)
+4(2836 2857 3277 3256)
+4(2856 3276 3277 2857)
+4(2837 2858 3278 3257)
+4(2857 3277 3278 2858)
+4(2838 2859 3279 3258)
+4(2858 3278 3279 2859)
+4(2839 2860 3280 3259)
+4(2859 3279 3280 2860)
+4(2840 2861 3281 3260)
+4(2860 3280 3281 2861)
+4(2841 2862 3282 3261)
+4(2861 3281 3282 2862)
+4(2842 2863 3283 3262)
+4(2862 3282 3283 2863)
+4(2843 2864 3284 3263)
+4(2863 3283 3284 2864)
+4(2844 2865 3285 3264)
+4(2864 3284 3285 2865)
+4(2845 2866 3286 3265)
+4(2865 3285 3286 2866)
+4(2846 2867 3287 3266)
+4(2866 3286 3287 2867)
+4(2847 2868 3288 3267)
+4(2867 3287 3288 2868)
+4(2848 2869 3289 3268)
+4(2868 3288 3289 2869)
+4(2849 2870 3290 3269)
+4(2869 3289 3290 2870)
+4(2850 2871 3291 3270)
+4(2870 3290 3291 2871)
+4(2851 2872 3292 3271)
+4(2871 3291 3292 2872)
+4(2852 2873 3293 3272)
+4(2872 3292 3293 2873)
+4(2853 2874 3294 3273)
+4(2873 3293 3294 2874)
+4(2854 2875 3295 3274)
+4(2874 3294 3295 2875)
+4(2875 3295 3296 2876)
+4(2857 2878 3298 3277)
+4(2877 3297 3298 2878)
+4(2858 2879 3299 3278)
+4(2878 3298 3299 2879)
+4(2859 2880 3300 3279)
+4(2879 3299 3300 2880)
+4(2860 2881 3301 3280)
+4(2880 3300 3301 2881)
+4(2861 2882 3302 3281)
+4(2881 3301 3302 2882)
+4(2862 2883 3303 3282)
+4(2882 3302 3303 2883)
+4(2863 2884 3304 3283)
+4(2883 3303 3304 2884)
+4(2864 2885 3305 3284)
+4(2884 3304 3305 2885)
+4(2865 2886 3306 3285)
+4(2885 3305 3306 2886)
+4(2866 2887 3307 3286)
+4(2886 3306 3307 2887)
+4(2867 2888 3308 3287)
+4(2887 3307 3308 2888)
+4(2868 2889 3309 3288)
+4(2888 3308 3309 2889)
+4(2869 2890 3310 3289)
+4(2889 3309 3310 2890)
+4(2870 2891 3311 3290)
+4(2890 3310 3311 2891)
+4(2871 2892 3312 3291)
+4(2891 3311 3312 2892)
+4(2872 2893 3313 3292)
+4(2892 3312 3313 2893)
+4(2873 2894 3314 3293)
+4(2893 3313 3314 2894)
+4(2874 2895 3315 3294)
+4(2894 3314 3315 2895)
+4(2875 2896 3316 3295)
+4(2895 3315 3316 2896)
+4(2896 3316 3317 2897)
+4(2878 2899 3319 3298)
+4(2898 3318 3319 2899)
+4(2879 2900 3320 3299)
+4(2899 3319 3320 2900)
+4(2880 2901 3321 3300)
+4(2900 3320 3321 2901)
+4(2881 2902 3322 3301)
+4(2901 3321 3322 2902)
+4(2882 2903 3323 3302)
+4(2902 3322 3323 2903)
+4(2883 2904 3324 3303)
+4(2903 3323 3324 2904)
+4(2884 2905 3325 3304)
+4(2904 3324 3325 2905)
+4(2885 2906 3326 3305)
+4(2905 3325 3326 2906)
+4(2886 2907 3327 3306)
+4(2906 3326 3327 2907)
+4(2887 2908 3328 3307)
+4(2907 3327 3328 2908)
+4(2888 2909 3329 3308)
+4(2908 3328 3329 2909)
+4(2889 2910 3330 3309)
+4(2909 3329 3330 2910)
+4(2890 2911 3331 3310)
+4(2910 3330 3331 2911)
+4(2891 2912 3332 3311)
+4(2911 3331 3332 2912)
+4(2892 2913 3333 3312)
+4(2912 3332 3333 2913)
+4(2893 2914 3334 3313)
+4(2913 3333 3334 2914)
+4(2894 2915 3335 3314)
+4(2914 3334 3335 2915)
+4(2895 2916 3336 3315)
+4(2915 3335 3336 2916)
+4(2896 2917 3337 3316)
+4(2916 3336 3337 2917)
+4(2917 3337 3338 2918)
+4(2899 2920 3340 3319)
+4(2919 3339 3340 2920)
+4(2900 2921 3341 3320)
+4(2920 3340 3341 2921)
+4(2901 2922 3342 3321)
+4(2921 3341 3342 2922)
+4(2902 2923 3343 3322)
+4(2922 3342 3343 2923)
+4(2903 2924 3344 3323)
+4(2923 3343 3344 2924)
+4(2904 2925 3345 3324)
+4(2924 3344 3345 2925)
+4(2905 2926 3346 3325)
+4(2925 3345 3346 2926)
+4(2906 2927 3347 3326)
+4(2926 3346 3347 2927)
+4(2907 2928 3348 3327)
+4(2927 3347 3348 2928)
+4(2908 2929 3349 3328)
+4(2928 3348 3349 2929)
+4(2909 2930 3350 3329)
+4(2929 3349 3350 2930)
+4(2910 2931 3351 3330)
+4(2930 3350 3351 2931)
+4(2911 2932 3352 3331)
+4(2931 3351 3352 2932)
+4(2912 2933 3353 3332)
+4(2932 3352 3353 2933)
+4(2913 2934 3354 3333)
+4(2933 3353 3354 2934)
+4(2914 2935 3355 3334)
+4(2934 3354 3355 2935)
+4(2915 2936 3356 3335)
+4(2935 3355 3356 2936)
+4(2916 2937 3357 3336)
+4(2936 3356 3357 2937)
+4(2917 2938 3358 3337)
+4(2937 3357 3358 2938)
+4(2938 3358 3359 2939)
+4(2920 2941 3361 3340)
+4(2940 3360 3361 2941)
+4(2921 2942 3362 3341)
+4(2941 3361 3362 2942)
+4(2922 2943 3363 3342)
+4(2942 3362 3363 2943)
+4(2923 2944 3364 3343)
+4(2943 3363 3364 2944)
+4(2924 2945 3365 3344)
+4(2944 3364 3365 2945)
+4(2925 2946 3366 3345)
+4(2945 3365 3366 2946)
+4(2926 2947 3367 3346)
+4(2946 3366 3367 2947)
+4(2927 2948 3368 3347)
+4(2947 3367 3368 2948)
+4(2928 2949 3369 3348)
+4(2948 3368 3369 2949)
+4(2929 2950 3370 3349)
+4(2949 3369 3370 2950)
+4(2930 2951 3371 3350)
+4(2950 3370 3371 2951)
+4(2931 2952 3372 3351)
+4(2951 3371 3372 2952)
+4(2932 2953 3373 3352)
+4(2952 3372 3373 2953)
+4(2933 2954 3374 3353)
+4(2953 3373 3374 2954)
+4(2934 2955 3375 3354)
+4(2954 3374 3375 2955)
+4(2935 2956 3376 3355)
+4(2955 3375 3376 2956)
+4(2936 2957 3377 3356)
+4(2956 3376 3377 2957)
+4(2937 2958 3378 3357)
+4(2957 3377 3378 2958)
+4(2938 2959 3379 3358)
+4(2958 3378 3379 2959)
+4(2959 3379 3380 2960)
+4(2941 2962 3382 3361)
+4(2942 2963 3383 3362)
+4(2943 2964 3384 3363)
+4(2944 2965 3385 3364)
+4(2945 2966 3386 3365)
+4(2946 2967 3387 3366)
+4(2947 2968 3388 3367)
+4(2948 2969 3389 3368)
+4(2949 2970 3390 3369)
+4(2950 2971 3391 3370)
+4(2951 2972 3392 3371)
+4(2952 2973 3393 3372)
+4(2953 2974 3394 3373)
+4(2954 2975 3395 3374)
+4(2955 2976 3396 3375)
+4(2956 2977 3397 3376)
+4(2957 2978 3398 3377)
+4(2958 2979 3399 3378)
+4(2959 2980 3400 3379)
+4(440 881 2982 2562)
+4(2562 2982 3003 2583)
+4(2583 3003 3024 2604)
+4(2604 3024 3045 2625)
+4(2625 3045 3066 2646)
+4(2646 3066 3087 2667)
+4(2667 3087 3108 2688)
+4(2688 3108 3129 2709)
+4(2709 3129 3150 2730)
+4(2730 3150 3171 2751)
+4(2751 3171 3192 2772)
+4(2772 3192 3213 2793)
+4(2793 3213 3234 2814)
+4(2814 3234 3255 2835)
+4(2835 3255 3276 2856)
+4(2856 3276 3297 2877)
+4(2877 3297 3318 2898)
+4(2898 3318 3339 2919)
+4(2919 3339 3360 2940)
+4(2940 3360 3381 2961)
+4(1301 2582 3002 1721)
+4(2582 2603 3023 3002)
+4(2603 2624 3044 3023)
+4(2624 2645 3065 3044)
+4(2645 2666 3086 3065)
+4(2666 2687 3107 3086)
+4(2687 2708 3128 3107)
+4(2708 2729 3149 3128)
+4(2729 2750 3170 3149)
+4(2750 2771 3191 3170)
+4(2771 2792 3212 3191)
+4(2792 2813 3233 3212)
+4(2813 2834 3254 3233)
+4(2834 2855 3275 3254)
+4(2855 2876 3296 3275)
+4(2876 2897 3317 3296)
+4(2897 2918 3338 3317)
+4(2918 2939 3359 3338)
+4(2939 2960 3380 3359)
+4(2960 2981 3401 3380)
+4(0 441 462 21)
+4(21 462 483 42)
+4(42 483 504 63)
+4(63 504 525 84)
+4(84 525 546 105)
+4(105 546 567 126)
+4(126 567 588 147)
+4(147 588 609 168)
+4(168 609 630 189)
+4(189 630 651 210)
+4(210 651 672 231)
+4(231 672 693 252)
+4(252 693 714 273)
+4(273 714 735 294)
+4(294 735 756 315)
+4(315 756 777 336)
+4(336 777 798 357)
+4(357 798 819 378)
+4(378 819 840 399)
+4(399 840 861 420)
+4(1741 1761 2181 2161)
+4(1761 1781 2201 2181)
+4(1781 1801 2221 2201)
+4(1801 1821 2241 2221)
+4(1821 1841 2261 2241)
+4(1841 1861 2281 2261)
+4(1861 1881 2301 2281)
+4(1881 1901 2321 2301)
+4(1901 1921 2341 2321)
+4(1921 1941 2361 2341)
+4(1941 1961 2381 2361)
+4(1961 1981 2401 2381)
+4(1981 2001 2421 2401)
+4(2001 2021 2441 2421)
+4(2021 2041 2461 2441)
+4(2041 2061 2481 2461)
+4(2061 2081 2501 2481)
+4(2081 2101 2521 2501)
+4(2101 2121 2541 2521)
+4(2121 2141 2561 2541)
+4(2961 3381 3382 2962)
+4(2962 3382 3383 2963)
+4(2963 3383 3384 2964)
+4(2964 3384 3385 2965)
+4(2965 3385 3386 2966)
+4(2966 3386 3387 2967)
+4(2967 3387 3388 2968)
+4(2968 3388 3389 2969)
+4(2969 3389 3390 2970)
+4(2970 3390 3391 2971)
+4(2971 3391 3392 2972)
+4(2972 3392 3393 2973)
+4(2973 3393 3394 2974)
+4(2974 3394 3395 2975)
+4(2975 3395 3396 2976)
+4(2976 3396 3397 2977)
+4(2977 3397 3398 2978)
+4(2978 3398 3399 2979)
+4(2979 3399 3400 2980)
+4(2980 3400 3401 2981)
+4(0 1 442 441)
+4(1 2 443 442)
+4(2 3 444 443)
+4(3 4 445 444)
+4(4 5 446 445)
+4(5 6 447 446)
+4(6 7 448 447)
+4(7 8 449 448)
+4(8 9 450 449)
+4(9 10 451 450)
+4(10 11 452 451)
+4(11 12 453 452)
+4(12 13 454 453)
+4(13 14 455 454)
+4(14 15 456 455)
+4(15 16 457 456)
+4(16 17 458 457)
+4(17 18 459 458)
+4(18 19 460 459)
+4(19 20 461 460)
+4(420 861 862 421)
+4(421 862 863 422)
+4(422 863 864 423)
+4(423 864 865 424)
+4(424 865 866 425)
+4(425 866 867 426)
+4(426 867 868 427)
+4(427 868 869 428)
+4(428 869 870 429)
+4(429 870 871 430)
+4(430 871 872 431)
+4(431 872 873 432)
+4(432 873 874 433)
+4(433 874 875 434)
+4(434 875 876 435)
+4(435 876 877 436)
+4(436 877 878 437)
+4(437 878 879 438)
+4(438 879 880 439)
+4(439 880 881 440)
+4(0 21 22 1)
+4(21 42 43 22)
+4(42 63 64 43)
+4(63 84 85 64)
+4(84 105 106 85)
+4(105 126 127 106)
+4(126 147 148 127)
+4(147 168 169 148)
+4(168 189 190 169)
+4(189 210 211 190)
+4(210 231 232 211)
+4(231 252 253 232)
+4(252 273 274 253)
+4(273 294 295 274)
+4(294 315 316 295)
+4(315 336 337 316)
+4(336 357 358 337)
+4(357 378 379 358)
+4(378 399 400 379)
+4(399 420 421 400)
+4(1 22 23 2)
+4(22 43 44 23)
+4(43 64 65 44)
+4(64 85 86 65)
+4(85 106 107 86)
+4(106 127 128 107)
+4(127 148 149 128)
+4(148 169 170 149)
+4(169 190 191 170)
+4(190 211 212 191)
+4(211 232 233 212)
+4(232 253 254 233)
+4(253 274 275 254)
+4(274 295 296 275)
+4(295 316 317 296)
+4(316 337 338 317)
+4(337 358 359 338)
+4(358 379 380 359)
+4(379 400 401 380)
+4(400 421 422 401)
+4(2 23 24 3)
+4(23 44 45 24)
+4(44 65 66 45)
+4(65 86 87 66)
+4(86 107 108 87)
+4(107 128 129 108)
+4(128 149 150 129)
+4(149 170 171 150)
+4(170 191 192 171)
+4(191 212 213 192)
+4(212 233 234 213)
+4(233 254 255 234)
+4(254 275 276 255)
+4(275 296 297 276)
+4(296 317 318 297)
+4(317 338 339 318)
+4(338 359 360 339)
+4(359 380 381 360)
+4(380 401 402 381)
+4(401 422 423 402)
+4(3 24 25 4)
+4(24 45 46 25)
+4(45 66 67 46)
+4(66 87 88 67)
+4(87 108 109 88)
+4(108 129 130 109)
+4(129 150 151 130)
+4(150 171 172 151)
+4(171 192 193 172)
+4(192 213 214 193)
+4(213 234 235 214)
+4(234 255 256 235)
+4(255 276 277 256)
+4(276 297 298 277)
+4(297 318 319 298)
+4(318 339 340 319)
+4(339 360 361 340)
+4(360 381 382 361)
+4(381 402 403 382)
+4(402 423 424 403)
+4(4 25 26 5)
+4(25 46 47 26)
+4(46 67 68 47)
+4(67 88 89 68)
+4(88 109 110 89)
+4(109 130 131 110)
+4(130 151 152 131)
+4(151 172 173 152)
+4(172 193 194 173)
+4(193 214 215 194)
+4(214 235 236 215)
+4(235 256 257 236)
+4(256 277 278 257)
+4(277 298 299 278)
+4(298 319 320 299)
+4(319 340 341 320)
+4(340 361 362 341)
+4(361 382 383 362)
+4(382 403 404 383)
+4(403 424 425 404)
+4(5 26 27 6)
+4(26 47 48 27)
+4(47 68 69 48)
+4(68 89 90 69)
+4(89 110 111 90)
+4(110 131 132 111)
+4(131 152 153 132)
+4(152 173 174 153)
+4(173 194 195 174)
+4(194 215 216 195)
+4(215 236 237 216)
+4(236 257 258 237)
+4(257 278 279 258)
+4(278 299 300 279)
+4(299 320 321 300)
+4(320 341 342 321)
+4(341 362 363 342)
+4(362 383 384 363)
+4(383 404 405 384)
+4(404 425 426 405)
+4(6 27 28 7)
+4(27 48 49 28)
+4(48 69 70 49)
+4(69 90 91 70)
+4(90 111 112 91)
+4(111 132 133 112)
+4(132 153 154 133)
+4(153 174 175 154)
+4(174 195 196 175)
+4(195 216 217 196)
+4(216 237 238 217)
+4(237 258 259 238)
+4(258 279 280 259)
+4(279 300 301 280)
+4(300 321 322 301)
+4(321 342 343 322)
+4(342 363 364 343)
+4(363 384 385 364)
+4(384 405 406 385)
+4(405 426 427 406)
+4(7 28 29 8)
+4(28 49 50 29)
+4(49 70 71 50)
+4(70 91 92 71)
+4(91 112 113 92)
+4(112 133 134 113)
+4(133 154 155 134)
+4(154 175 176 155)
+4(175 196 197 176)
+4(196 217 218 197)
+4(217 238 239 218)
+4(238 259 260 239)
+4(259 280 281 260)
+4(280 301 302 281)
+4(301 322 323 302)
+4(322 343 344 323)
+4(343 364 365 344)
+4(364 385 386 365)
+4(385 406 407 386)
+4(406 427 428 407)
+4(8 29 30 9)
+4(29 50 51 30)
+4(50 71 72 51)
+4(71 92 93 72)
+4(92 113 114 93)
+4(113 134 135 114)
+4(134 155 156 135)
+4(155 176 177 156)
+4(176 197 198 177)
+4(197 218 219 198)
+4(218 239 240 219)
+4(239 260 261 240)
+4(260 281 282 261)
+4(281 302 303 282)
+4(302 323 324 303)
+4(323 344 345 324)
+4(344 365 366 345)
+4(365 386 387 366)
+4(386 407 408 387)
+4(407 428 429 408)
+4(9 30 31 10)
+4(30 51 52 31)
+4(51 72 73 52)
+4(72 93 94 73)
+4(93 114 115 94)
+4(114 135 136 115)
+4(135 156 157 136)
+4(156 177 178 157)
+4(177 198 199 178)
+4(198 219 220 199)
+4(219 240 241 220)
+4(240 261 262 241)
+4(261 282 283 262)
+4(282 303 304 283)
+4(303 324 325 304)
+4(324 345 346 325)
+4(345 366 367 346)
+4(366 387 388 367)
+4(387 408 409 388)
+4(408 429 430 409)
+4(10 31 32 11)
+4(31 52 53 32)
+4(52 73 74 53)
+4(73 94 95 74)
+4(94 115 116 95)
+4(115 136 137 116)
+4(136 157 158 137)
+4(157 178 179 158)
+4(178 199 200 179)
+4(199 220 221 200)
+4(220 241 242 221)
+4(241 262 263 242)
+4(262 283 284 263)
+4(283 304 305 284)
+4(304 325 326 305)
+4(325 346 347 326)
+4(346 367 368 347)
+4(367 388 389 368)
+4(388 409 410 389)
+4(409 430 431 410)
+4(11 32 33 12)
+4(32 53 54 33)
+4(53 74 75 54)
+4(74 95 96 75)
+4(95 116 117 96)
+4(116 137 138 117)
+4(137 158 159 138)
+4(158 179 180 159)
+4(179 200 201 180)
+4(200 221 222 201)
+4(221 242 243 222)
+4(242 263 264 243)
+4(263 284 285 264)
+4(284 305 306 285)
+4(305 326 327 306)
+4(326 347 348 327)
+4(347 368 369 348)
+4(368 389 390 369)
+4(389 410 411 390)
+4(410 431 432 411)
+4(12 33 34 13)
+4(33 54 55 34)
+4(54 75 76 55)
+4(75 96 97 76)
+4(96 117 118 97)
+4(117 138 139 118)
+4(138 159 160 139)
+4(159 180 181 160)
+4(180 201 202 181)
+4(201 222 223 202)
+4(222 243 244 223)
+4(243 264 265 244)
+4(264 285 286 265)
+4(285 306 307 286)
+4(306 327 328 307)
+4(327 348 349 328)
+4(348 369 370 349)
+4(369 390 391 370)
+4(390 411 412 391)
+4(411 432 433 412)
+4(13 34 35 14)
+4(34 55 56 35)
+4(55 76 77 56)
+4(76 97 98 77)
+4(97 118 119 98)
+4(118 139 140 119)
+4(139 160 161 140)
+4(160 181 182 161)
+4(181 202 203 182)
+4(202 223 224 203)
+4(223 244 245 224)
+4(244 265 266 245)
+4(265 286 287 266)
+4(286 307 308 287)
+4(307 328 329 308)
+4(328 349 350 329)
+4(349 370 371 350)
+4(370 391 392 371)
+4(391 412 413 392)
+4(412 433 434 413)
+4(14 35 36 15)
+4(35 56 57 36)
+4(56 77 78 57)
+4(77 98 99 78)
+4(98 119 120 99)
+4(119 140 141 120)
+4(140 161 162 141)
+4(161 182 183 162)
+4(182 203 204 183)
+4(203 224 225 204)
+4(224 245 246 225)
+4(245 266 267 246)
+4(266 287 288 267)
+4(287 308 309 288)
+4(308 329 330 309)
+4(329 350 351 330)
+4(350 371 372 351)
+4(371 392 393 372)
+4(392 413 414 393)
+4(413 434 435 414)
+4(15 36 37 16)
+4(36 57 58 37)
+4(57 78 79 58)
+4(78 99 100 79)
+4(99 120 121 100)
+4(120 141 142 121)
+4(141 162 163 142)
+4(162 183 184 163)
+4(183 204 205 184)
+4(204 225 226 205)
+4(225 246 247 226)
+4(246 267 268 247)
+4(267 288 289 268)
+4(288 309 310 289)
+4(309 330 331 310)
+4(330 351 352 331)
+4(351 372 373 352)
+4(372 393 394 373)
+4(393 414 415 394)
+4(414 435 436 415)
+4(16 37 38 17)
+4(37 58 59 38)
+4(58 79 80 59)
+4(79 100 101 80)
+4(100 121 122 101)
+4(121 142 143 122)
+4(142 163 164 143)
+4(163 184 185 164)
+4(184 205 206 185)
+4(205 226 227 206)
+4(226 247 248 227)
+4(247 268 269 248)
+4(268 289 290 269)
+4(289 310 311 290)
+4(310 331 332 311)
+4(331 352 353 332)
+4(352 373 374 353)
+4(373 394 395 374)
+4(394 415 416 395)
+4(415 436 437 416)
+4(17 38 39 18)
+4(38 59 60 39)
+4(59 80 81 60)
+4(80 101 102 81)
+4(101 122 123 102)
+4(122 143 144 123)
+4(143 164 165 144)
+4(164 185 186 165)
+4(185 206 207 186)
+4(206 227 228 207)
+4(227 248 249 228)
+4(248 269 270 249)
+4(269 290 291 270)
+4(290 311 312 291)
+4(311 332 333 312)
+4(332 353 354 333)
+4(353 374 375 354)
+4(374 395 396 375)
+4(395 416 417 396)
+4(416 437 438 417)
+4(18 39 40 19)
+4(39 60 61 40)
+4(60 81 82 61)
+4(81 102 103 82)
+4(102 123 124 103)
+4(123 144 145 124)
+4(144 165 166 145)
+4(165 186 187 166)
+4(186 207 208 187)
+4(207 228 229 208)
+4(228 249 250 229)
+4(249 270 271 250)
+4(270 291 292 271)
+4(291 312 313 292)
+4(312 333 334 313)
+4(333 354 355 334)
+4(354 375 376 355)
+4(375 396 397 376)
+4(396 417 418 397)
+4(417 438 439 418)
+4(19 40 41 20)
+4(40 61 62 41)
+4(61 82 83 62)
+4(82 103 104 83)
+4(103 124 125 104)
+4(124 145 146 125)
+4(145 166 167 146)
+4(166 187 188 167)
+4(187 208 209 188)
+4(208 229 230 209)
+4(229 250 251 230)
+4(250 271 272 251)
+4(271 292 293 272)
+4(292 313 314 293)
+4(313 334 335 314)
+4(334 355 356 335)
+4(355 376 377 356)
+4(376 397 398 377)
+4(397 418 419 398)
+4(418 439 440 419)
+4(441 442 463 462)
+4(462 463 484 483)
+4(483 484 505 504)
+4(504 505 526 525)
+4(525 526 547 546)
+4(546 547 568 567)
+4(567 568 589 588)
+4(588 589 610 609)
+4(609 610 631 630)
+4(630 631 652 651)
+4(651 652 673 672)
+4(672 673 694 693)
+4(693 694 715 714)
+4(714 715 736 735)
+4(735 736 757 756)
+4(756 757 778 777)
+4(777 778 799 798)
+4(798 799 820 819)
+4(819 820 841 840)
+4(840 841 862 861)
+4(442 443 464 463)
+4(463 464 485 484)
+4(484 485 506 505)
+4(505 506 527 526)
+4(526 527 548 547)
+4(547 548 569 568)
+4(568 569 590 589)
+4(589 590 611 610)
+4(610 611 632 631)
+4(631 632 653 652)
+4(652 653 674 673)
+4(673 674 695 694)
+4(694 695 716 715)
+4(715 716 737 736)
+4(736 737 758 757)
+4(757 758 779 778)
+4(778 779 800 799)
+4(799 800 821 820)
+4(820 821 842 841)
+4(841 842 863 862)
+4(443 444 465 464)
+4(464 465 486 485)
+4(485 486 507 506)
+4(506 507 528 527)
+4(527 528 549 548)
+4(548 549 570 569)
+4(569 570 591 590)
+4(590 591 612 611)
+4(611 612 633 632)
+4(632 633 654 653)
+4(653 654 675 674)
+4(674 675 696 695)
+4(695 696 717 716)
+4(716 717 738 737)
+4(737 738 759 758)
+4(758 759 780 779)
+4(779 780 801 800)
+4(800 801 822 821)
+4(821 822 843 842)
+4(842 843 864 863)
+4(444 445 466 465)
+4(465 466 487 486)
+4(486 487 508 507)
+4(507 508 529 528)
+4(528 529 550 549)
+4(549 550 571 570)
+4(570 571 592 591)
+4(591 592 613 612)
+4(612 613 634 633)
+4(633 634 655 654)
+4(654 655 676 675)
+4(675 676 697 696)
+4(696 697 718 717)
+4(717 718 739 738)
+4(738 739 760 759)
+4(759 760 781 780)
+4(780 781 802 801)
+4(801 802 823 822)
+4(822 823 844 843)
+4(843 844 865 864)
+4(445 446 467 466)
+4(466 467 488 487)
+4(487 488 509 508)
+4(508 509 530 529)
+4(529 530 551 550)
+4(550 551 572 571)
+4(571 572 593 592)
+4(592 593 614 613)
+4(613 614 635 634)
+4(634 635 656 655)
+4(655 656 677 676)
+4(676 677 698 697)
+4(697 698 719 718)
+4(718 719 740 739)
+4(739 740 761 760)
+4(760 761 782 781)
+4(781 782 803 802)
+4(802 803 824 823)
+4(823 824 845 844)
+4(844 845 866 865)
+4(446 447 468 467)
+4(467 468 489 488)
+4(488 489 510 509)
+4(509 510 531 530)
+4(530 531 552 551)
+4(551 552 573 572)
+4(572 573 594 593)
+4(593 594 615 614)
+4(614 615 636 635)
+4(635 636 657 656)
+4(656 657 678 677)
+4(677 678 699 698)
+4(698 699 720 719)
+4(719 720 741 740)
+4(740 741 762 761)
+4(761 762 783 782)
+4(782 783 804 803)
+4(803 804 825 824)
+4(824 825 846 845)
+4(845 846 867 866)
+4(447 448 469 468)
+4(468 469 490 489)
+4(489 490 511 510)
+4(510 511 532 531)
+4(531 532 553 552)
+4(552 553 574 573)
+4(573 574 595 594)
+4(594 595 616 615)
+4(615 616 637 636)
+4(636 637 658 657)
+4(657 658 679 678)
+4(678 679 700 699)
+4(699 700 721 720)
+4(720 721 742 741)
+4(741 742 763 762)
+4(762 763 784 783)
+4(783 784 805 804)
+4(804 805 826 825)
+4(825 826 847 846)
+4(846 847 868 867)
+4(448 449 470 469)
+4(469 470 491 490)
+4(490 491 512 511)
+4(511 512 533 532)
+4(532 533 554 553)
+4(553 554 575 574)
+4(574 575 596 595)
+4(595 596 617 616)
+4(616 617 638 637)
+4(637 638 659 658)
+4(658 659 680 679)
+4(679 680 701 700)
+4(700 701 722 721)
+4(721 722 743 742)
+4(742 743 764 763)
+4(763 764 785 784)
+4(784 785 806 805)
+4(805 806 827 826)
+4(826 827 848 847)
+4(847 848 869 868)
+4(449 450 471 470)
+4(470 471 492 491)
+4(491 492 513 512)
+4(512 513 534 533)
+4(533 534 555 554)
+4(554 555 576 575)
+4(575 576 597 596)
+4(596 597 618 617)
+4(617 618 639 638)
+4(638 639 660 659)
+4(659 660 681 680)
+4(680 681 702 701)
+4(701 702 723 722)
+4(722 723 744 743)
+4(743 744 765 764)
+4(764 765 786 785)
+4(785 786 807 806)
+4(806 807 828 827)
+4(827 828 849 848)
+4(848 849 870 869)
+4(450 451 472 471)
+4(471 472 493 492)
+4(492 493 514 513)
+4(513 514 535 534)
+4(534 535 556 555)
+4(555 556 577 576)
+4(576 577 598 597)
+4(597 598 619 618)
+4(618 619 640 639)
+4(639 640 661 660)
+4(660 661 682 681)
+4(681 682 703 702)
+4(702 703 724 723)
+4(723 724 745 744)
+4(744 745 766 765)
+4(765 766 787 786)
+4(786 787 808 807)
+4(807 808 829 828)
+4(828 829 850 849)
+4(849 850 871 870)
+4(451 452 473 472)
+4(472 473 494 493)
+4(493 494 515 514)
+4(514 515 536 535)
+4(535 536 557 556)
+4(556 557 578 577)
+4(577 578 599 598)
+4(598 599 620 619)
+4(619 620 641 640)
+4(640 641 662 661)
+4(661 662 683 682)
+4(682 683 704 703)
+4(703 704 725 724)
+4(724 725 746 745)
+4(745 746 767 766)
+4(766 767 788 787)
+4(787 788 809 808)
+4(808 809 830 829)
+4(829 830 851 850)
+4(850 851 872 871)
+4(452 453 474 473)
+4(473 474 495 494)
+4(494 495 516 515)
+4(515 516 537 536)
+4(536 537 558 557)
+4(557 558 579 578)
+4(578 579 600 599)
+4(599 600 621 620)
+4(620 621 642 641)
+4(641 642 663 662)
+4(662 663 684 683)
+4(683 684 705 704)
+4(704 705 726 725)
+4(725 726 747 746)
+4(746 747 768 767)
+4(767 768 789 788)
+4(788 789 810 809)
+4(809 810 831 830)
+4(830 831 852 851)
+4(851 852 873 872)
+4(453 454 475 474)
+4(474 475 496 495)
+4(495 496 517 516)
+4(516 517 538 537)
+4(537 538 559 558)
+4(558 559 580 579)
+4(579 580 601 600)
+4(600 601 622 621)
+4(621 622 643 642)
+4(642 643 664 663)
+4(663 664 685 684)
+4(684 685 706 705)
+4(705 706 727 726)
+4(726 727 748 747)
+4(747 748 769 768)
+4(768 769 790 789)
+4(789 790 811 810)
+4(810 811 832 831)
+4(831 832 853 852)
+4(852 853 874 873)
+4(454 455 476 475)
+4(475 476 497 496)
+4(496 497 518 517)
+4(517 518 539 538)
+4(538 539 560 559)
+4(559 560 581 580)
+4(580 581 602 601)
+4(601 602 623 622)
+4(622 623 644 643)
+4(643 644 665 664)
+4(664 665 686 685)
+4(685 686 707 706)
+4(706 707 728 727)
+4(727 728 749 748)
+4(748 749 770 769)
+4(769 770 791 790)
+4(790 791 812 811)
+4(811 812 833 832)
+4(832 833 854 853)
+4(853 854 875 874)
+4(455 456 477 476)
+4(476 477 498 497)
+4(497 498 519 518)
+4(518 519 540 539)
+4(539 540 561 560)
+4(560 561 582 581)
+4(581 582 603 602)
+4(602 603 624 623)
+4(623 624 645 644)
+4(644 645 666 665)
+4(665 666 687 686)
+4(686 687 708 707)
+4(707 708 729 728)
+4(728 729 750 749)
+4(749 750 771 770)
+4(770 771 792 791)
+4(791 792 813 812)
+4(812 813 834 833)
+4(833 834 855 854)
+4(854 855 876 875)
+4(456 457 478 477)
+4(477 478 499 498)
+4(498 499 520 519)
+4(519 520 541 540)
+4(540 541 562 561)
+4(561 562 583 582)
+4(582 583 604 603)
+4(603 604 625 624)
+4(624 625 646 645)
+4(645 646 667 666)
+4(666 667 688 687)
+4(687 688 709 708)
+4(708 709 730 729)
+4(729 730 751 750)
+4(750 751 772 771)
+4(771 772 793 792)
+4(792 793 814 813)
+4(813 814 835 834)
+4(834 835 856 855)
+4(855 856 877 876)
+4(457 458 479 478)
+4(478 479 500 499)
+4(499 500 521 520)
+4(520 521 542 541)
+4(541 542 563 562)
+4(562 563 584 583)
+4(583 584 605 604)
+4(604 605 626 625)
+4(625 626 647 646)
+4(646 647 668 667)
+4(667 668 689 688)
+4(688 689 710 709)
+4(709 710 731 730)
+4(730 731 752 751)
+4(751 752 773 772)
+4(772 773 794 793)
+4(793 794 815 814)
+4(814 815 836 835)
+4(835 836 857 856)
+4(856 857 878 877)
+4(458 459 480 479)
+4(479 480 501 500)
+4(500 501 522 521)
+4(521 522 543 542)
+4(542 543 564 563)
+4(563 564 585 584)
+4(584 585 606 605)
+4(605 606 627 626)
+4(626 627 648 647)
+4(647 648 669 668)
+4(668 669 690 689)
+4(689 690 711 710)
+4(710 711 732 731)
+4(731 732 753 752)
+4(752 753 774 773)
+4(773 774 795 794)
+4(794 795 816 815)
+4(815 816 837 836)
+4(836 837 858 857)
+4(857 858 879 878)
+4(459 460 481 480)
+4(480 481 502 501)
+4(501 502 523 522)
+4(522 523 544 543)
+4(543 544 565 564)
+4(564 565 586 585)
+4(585 586 607 606)
+4(606 607 628 627)
+4(627 628 649 648)
+4(648 649 670 669)
+4(669 670 691 690)
+4(690 691 712 711)
+4(711 712 733 732)
+4(732 733 754 753)
+4(753 754 775 774)
+4(774 775 796 795)
+4(795 796 817 816)
+4(816 817 838 837)
+4(837 838 859 858)
+4(858 859 880 879)
+4(460 461 482 481)
+4(481 482 503 502)
+4(502 503 524 523)
+4(523 524 545 544)
+4(544 545 566 565)
+4(565 566 587 586)
+4(586 587 608 607)
+4(607 608 629 628)
+4(628 629 650 649)
+4(649 650 671 670)
+4(670 671 692 691)
+4(691 692 713 712)
+4(712 713 734 733)
+4(733 734 755 754)
+4(754 755 776 775)
+4(775 776 797 796)
+4(796 797 818 817)
+4(817 818 839 838)
+4(838 839 860 859)
+4(859 860 881 880)
+4(20 882 1302 461)
+4(882 883 1303 1302)
+4(883 884 1304 1303)
+4(884 885 1305 1304)
+4(885 886 1306 1305)
+4(886 887 1307 1306)
+4(887 888 1308 1307)
+4(888 889 1309 1308)
+4(889 890 1310 1309)
+4(890 891 1311 1310)
+4(891 892 1312 1311)
+4(892 893 1313 1312)
+4(893 894 1314 1313)
+4(894 895 1315 1314)
+4(895 896 1316 1315)
+4(896 897 1317 1316)
+4(897 898 1318 1317)
+4(898 899 1319 1318)
+4(899 900 1320 1319)
+4(900 901 1321 1320)
+4(20 41 902 882)
+4(41 62 922 902)
+4(62 83 942 922)
+4(83 104 962 942)
+4(104 125 982 962)
+4(125 146 1002 982)
+4(146 167 1022 1002)
+4(167 188 1042 1022)
+4(188 209 1062 1042)
+4(209 230 1082 1062)
+4(230 251 1102 1082)
+4(251 272 1122 1102)
+4(272 293 1142 1122)
+4(293 314 1162 1142)
+4(314 335 1182 1162)
+4(335 356 1202 1182)
+4(356 377 1222 1202)
+4(377 398 1242 1222)
+4(398 419 1262 1242)
+4(419 440 1282 1262)
+4(882 902 903 883)
+4(902 922 923 903)
+4(922 942 943 923)
+4(942 962 963 943)
+4(962 982 983 963)
+4(982 1002 1003 983)
+4(1002 1022 1023 1003)
+4(1022 1042 1043 1023)
+4(1042 1062 1063 1043)
+4(1062 1082 1083 1063)
+4(1082 1102 1103 1083)
+4(1102 1122 1123 1103)
+4(1122 1142 1143 1123)
+4(1142 1162 1163 1143)
+4(1162 1182 1183 1163)
+4(1182 1202 1203 1183)
+4(1202 1222 1223 1203)
+4(1222 1242 1243 1223)
+4(1242 1262 1263 1243)
+4(1262 1282 1283 1263)
+4(883 903 904 884)
+4(903 923 924 904)
+4(923 943 944 924)
+4(943 963 964 944)
+4(963 983 984 964)
+4(983 1003 1004 984)
+4(1003 1023 1024 1004)
+4(1023 1043 1044 1024)
+4(1043 1063 1064 1044)
+4(1063 1083 1084 1064)
+4(1083 1103 1104 1084)
+4(1103 1123 1124 1104)
+4(1123 1143 1144 1124)
+4(1143 1163 1164 1144)
+4(1163 1183 1184 1164)
+4(1183 1203 1204 1184)
+4(1203 1223 1224 1204)
+4(1223 1243 1244 1224)
+4(1243 1263 1264 1244)
+4(1263 1283 1284 1264)
+4(884 904 905 885)
+4(904 924 925 905)
+4(924 944 945 925)
+4(944 964 965 945)
+4(964 984 985 965)
+4(984 1004 1005 985)
+4(1004 1024 1025 1005)
+4(1024 1044 1045 1025)
+4(1044 1064 1065 1045)
+4(1064 1084 1085 1065)
+4(1084 1104 1105 1085)
+4(1104 1124 1125 1105)
+4(1124 1144 1145 1125)
+4(1144 1164 1165 1145)
+4(1164 1184 1185 1165)
+4(1184 1204 1205 1185)
+4(1204 1224 1225 1205)
+4(1224 1244 1245 1225)
+4(1244 1264 1265 1245)
+4(1264 1284 1285 1265)
+4(885 905 906 886)
+4(905 925 926 906)
+4(925 945 946 926)
+4(945 965 966 946)
+4(965 985 986 966)
+4(985 1005 1006 986)
+4(1005 1025 1026 1006)
+4(1025 1045 1046 1026)
+4(1045 1065 1066 1046)
+4(1065 1085 1086 1066)
+4(1085 1105 1106 1086)
+4(1105 1125 1126 1106)
+4(1125 1145 1146 1126)
+4(1145 1165 1166 1146)
+4(1165 1185 1186 1166)
+4(1185 1205 1206 1186)
+4(1205 1225 1226 1206)
+4(1225 1245 1246 1226)
+4(1245 1265 1266 1246)
+4(1265 1285 1286 1266)
+4(886 906 907 887)
+4(906 926 927 907)
+4(926 946 947 927)
+4(946 966 967 947)
+4(966 986 987 967)
+4(986 1006 1007 987)
+4(1006 1026 1027 1007)
+4(1026 1046 1047 1027)
+4(1046 1066 1067 1047)
+4(1066 1086 1087 1067)
+4(1086 1106 1107 1087)
+4(1106 1126 1127 1107)
+4(1126 1146 1147 1127)
+4(1146 1166 1167 1147)
+4(1166 1186 1187 1167)
+4(1186 1206 1207 1187)
+4(1206 1226 1227 1207)
+4(1226 1246 1247 1227)
+4(1246 1266 1267 1247)
+4(1266 1286 1287 1267)
+4(887 907 908 888)
+4(907 927 928 908)
+4(927 947 948 928)
+4(947 967 968 948)
+4(967 987 988 968)
+4(987 1007 1008 988)
+4(1007 1027 1028 1008)
+4(1027 1047 1048 1028)
+4(1047 1067 1068 1048)
+4(1067 1087 1088 1068)
+4(1087 1107 1108 1088)
+4(1107 1127 1128 1108)
+4(1127 1147 1148 1128)
+4(1147 1167 1168 1148)
+4(1167 1187 1188 1168)
+4(1187 1207 1208 1188)
+4(1207 1227 1228 1208)
+4(1227 1247 1248 1228)
+4(1247 1267 1268 1248)
+4(1267 1287 1288 1268)
+4(888 908 909 889)
+4(908 928 929 909)
+4(928 948 949 929)
+4(948 968 969 949)
+4(968 988 989 969)
+4(988 1008 1009 989)
+4(1008 1028 1029 1009)
+4(1028 1048 1049 1029)
+4(1048 1068 1069 1049)
+4(1068 1088 1089 1069)
+4(1088 1108 1109 1089)
+4(1108 1128 1129 1109)
+4(1128 1148 1149 1129)
+4(1148 1168 1169 1149)
+4(1168 1188 1189 1169)
+4(1188 1208 1209 1189)
+4(1208 1228 1229 1209)
+4(1228 1248 1249 1229)
+4(1248 1268 1269 1249)
+4(1268 1288 1289 1269)
+4(889 909 910 890)
+4(909 929 930 910)
+4(929 949 950 930)
+4(949 969 970 950)
+4(969 989 990 970)
+4(989 1009 1010 990)
+4(1009 1029 1030 1010)
+4(1029 1049 1050 1030)
+4(1049 1069 1070 1050)
+4(1069 1089 1090 1070)
+4(1089 1109 1110 1090)
+4(1109 1129 1130 1110)
+4(1129 1149 1150 1130)
+4(1149 1169 1170 1150)
+4(1169 1189 1190 1170)
+4(1189 1209 1210 1190)
+4(1209 1229 1230 1210)
+4(1229 1249 1250 1230)
+4(1249 1269 1270 1250)
+4(1269 1289 1290 1270)
+4(890 910 911 891)
+4(910 930 931 911)
+4(930 950 951 931)
+4(950 970 971 951)
+4(970 990 991 971)
+4(990 1010 1011 991)
+4(1010 1030 1031 1011)
+4(1030 1050 1051 1031)
+4(1050 1070 1071 1051)
+4(1070 1090 1091 1071)
+4(1090 1110 1111 1091)
+4(1110 1130 1131 1111)
+4(1130 1150 1151 1131)
+4(1150 1170 1171 1151)
+4(1170 1190 1191 1171)
+4(1190 1210 1211 1191)
+4(1210 1230 1231 1211)
+4(1230 1250 1251 1231)
+4(1250 1270 1271 1251)
+4(1270 1290 1291 1271)
+4(891 911 912 892)
+4(911 931 932 912)
+4(931 951 952 932)
+4(951 971 972 952)
+4(971 991 992 972)
+4(991 1011 1012 992)
+4(1011 1031 1032 1012)
+4(1031 1051 1052 1032)
+4(1051 1071 1072 1052)
+4(1071 1091 1092 1072)
+4(1091 1111 1112 1092)
+4(1111 1131 1132 1112)
+4(1131 1151 1152 1132)
+4(1151 1171 1172 1152)
+4(1171 1191 1192 1172)
+4(1191 1211 1212 1192)
+4(1211 1231 1232 1212)
+4(1231 1251 1252 1232)
+4(1251 1271 1272 1252)
+4(1271 1291 1292 1272)
+4(892 912 913 893)
+4(912 932 933 913)
+4(932 952 953 933)
+4(952 972 973 953)
+4(972 992 993 973)
+4(992 1012 1013 993)
+4(1012 1032 1033 1013)
+4(1032 1052 1053 1033)
+4(1052 1072 1073 1053)
+4(1072 1092 1093 1073)
+4(1092 1112 1113 1093)
+4(1112 1132 1133 1113)
+4(1132 1152 1153 1133)
+4(1152 1172 1173 1153)
+4(1172 1192 1193 1173)
+4(1192 1212 1213 1193)
+4(1212 1232 1233 1213)
+4(1232 1252 1253 1233)
+4(1252 1272 1273 1253)
+4(1272 1292 1293 1273)
+4(893 913 914 894)
+4(913 933 934 914)
+4(933 953 954 934)
+4(953 973 974 954)
+4(973 993 994 974)
+4(993 1013 1014 994)
+4(1013 1033 1034 1014)
+4(1033 1053 1054 1034)
+4(1053 1073 1074 1054)
+4(1073 1093 1094 1074)
+4(1093 1113 1114 1094)
+4(1113 1133 1134 1114)
+4(1133 1153 1154 1134)
+4(1153 1173 1174 1154)
+4(1173 1193 1194 1174)
+4(1193 1213 1214 1194)
+4(1213 1233 1234 1214)
+4(1233 1253 1254 1234)
+4(1253 1273 1274 1254)
+4(1273 1293 1294 1274)
+4(894 914 915 895)
+4(914 934 935 915)
+4(934 954 955 935)
+4(954 974 975 955)
+4(974 994 995 975)
+4(994 1014 1015 995)
+4(1014 1034 1035 1015)
+4(1034 1054 1055 1035)
+4(1054 1074 1075 1055)
+4(1074 1094 1095 1075)
+4(1094 1114 1115 1095)
+4(1114 1134 1135 1115)
+4(1134 1154 1155 1135)
+4(1154 1174 1175 1155)
+4(1174 1194 1195 1175)
+4(1194 1214 1215 1195)
+4(1214 1234 1235 1215)
+4(1234 1254 1255 1235)
+4(1254 1274 1275 1255)
+4(1274 1294 1295 1275)
+4(895 915 916 896)
+4(915 935 936 916)
+4(935 955 956 936)
+4(955 975 976 956)
+4(975 995 996 976)
+4(995 1015 1016 996)
+4(1015 1035 1036 1016)
+4(1035 1055 1056 1036)
+4(1055 1075 1076 1056)
+4(1075 1095 1096 1076)
+4(1095 1115 1116 1096)
+4(1115 1135 1136 1116)
+4(1135 1155 1156 1136)
+4(1155 1175 1176 1156)
+4(1175 1195 1196 1176)
+4(1195 1215 1216 1196)
+4(1215 1235 1236 1216)
+4(1235 1255 1256 1236)
+4(1255 1275 1276 1256)
+4(1275 1295 1296 1276)
+4(896 916 917 897)
+4(916 936 937 917)
+4(936 956 957 937)
+4(956 976 977 957)
+4(976 996 997 977)
+4(996 1016 1017 997)
+4(1016 1036 1037 1017)
+4(1036 1056 1057 1037)
+4(1056 1076 1077 1057)
+4(1076 1096 1097 1077)
+4(1096 1116 1117 1097)
+4(1116 1136 1137 1117)
+4(1136 1156 1157 1137)
+4(1156 1176 1177 1157)
+4(1176 1196 1197 1177)
+4(1196 1216 1217 1197)
+4(1216 1236 1237 1217)
+4(1236 1256 1257 1237)
+4(1256 1276 1277 1257)
+4(1276 1296 1297 1277)
+4(897 917 918 898)
+4(917 937 938 918)
+4(937 957 958 938)
+4(957 977 978 958)
+4(977 997 998 978)
+4(997 1017 1018 998)
+4(1017 1037 1038 1018)
+4(1037 1057 1058 1038)
+4(1057 1077 1078 1058)
+4(1077 1097 1098 1078)
+4(1097 1117 1118 1098)
+4(1117 1137 1138 1118)
+4(1137 1157 1158 1138)
+4(1157 1177 1178 1158)
+4(1177 1197 1198 1178)
+4(1197 1217 1218 1198)
+4(1217 1237 1238 1218)
+4(1237 1257 1258 1238)
+4(1257 1277 1278 1258)
+4(1277 1297 1298 1278)
+4(898 918 919 899)
+4(918 938 939 919)
+4(938 958 959 939)
+4(958 978 979 959)
+4(978 998 999 979)
+4(998 1018 1019 999)
+4(1018 1038 1039 1019)
+4(1038 1058 1059 1039)
+4(1058 1078 1079 1059)
+4(1078 1098 1099 1079)
+4(1098 1118 1119 1099)
+4(1118 1138 1139 1119)
+4(1138 1158 1159 1139)
+4(1158 1178 1179 1159)
+4(1178 1198 1199 1179)
+4(1198 1218 1219 1199)
+4(1218 1238 1239 1219)
+4(1238 1258 1259 1239)
+4(1258 1278 1279 1259)
+4(1278 1298 1299 1279)
+4(899 919 920 900)
+4(919 939 940 920)
+4(939 959 960 940)
+4(959 979 980 960)
+4(979 999 1000 980)
+4(999 1019 1020 1000)
+4(1019 1039 1040 1020)
+4(1039 1059 1060 1040)
+4(1059 1079 1080 1060)
+4(1079 1099 1100 1080)
+4(1099 1119 1120 1100)
+4(1119 1139 1140 1120)
+4(1139 1159 1160 1140)
+4(1159 1179 1180 1160)
+4(1179 1199 1200 1180)
+4(1199 1219 1220 1200)
+4(1219 1239 1240 1220)
+4(1239 1259 1260 1240)
+4(1259 1279 1280 1260)
+4(1279 1299 1300 1280)
+4(900 920 921 901)
+4(920 940 941 921)
+4(940 960 961 941)
+4(960 980 981 961)
+4(980 1000 1001 981)
+4(1000 1020 1021 1001)
+4(1020 1040 1041 1021)
+4(1040 1060 1061 1041)
+4(1060 1080 1081 1061)
+4(1080 1100 1101 1081)
+4(1100 1120 1121 1101)
+4(1120 1140 1141 1121)
+4(1140 1160 1161 1141)
+4(1160 1180 1181 1161)
+4(1180 1200 1201 1181)
+4(1200 1220 1221 1201)
+4(1220 1240 1241 1221)
+4(1240 1260 1261 1241)
+4(1260 1280 1281 1261)
+4(1280 1300 1301 1281)
+4(461 1302 1322 482)
+4(482 1322 1342 503)
+4(503 1342 1362 524)
+4(524 1362 1382 545)
+4(545 1382 1402 566)
+4(566 1402 1422 587)
+4(587 1422 1442 608)
+4(608 1442 1462 629)
+4(629 1462 1482 650)
+4(650 1482 1502 671)
+4(671 1502 1522 692)
+4(692 1522 1542 713)
+4(713 1542 1562 734)
+4(734 1562 1582 755)
+4(755 1582 1602 776)
+4(776 1602 1622 797)
+4(797 1622 1642 818)
+4(818 1642 1662 839)
+4(839 1662 1682 860)
+4(860 1682 1702 881)
+4(1302 1303 1323 1322)
+4(1322 1323 1343 1342)
+4(1342 1343 1363 1362)
+4(1362 1363 1383 1382)
+4(1382 1383 1403 1402)
+4(1402 1403 1423 1422)
+4(1422 1423 1443 1442)
+4(1442 1443 1463 1462)
+4(1462 1463 1483 1482)
+4(1482 1483 1503 1502)
+4(1502 1503 1523 1522)
+4(1522 1523 1543 1542)
+4(1542 1543 1563 1562)
+4(1562 1563 1583 1582)
+4(1582 1583 1603 1602)
+4(1602 1603 1623 1622)
+4(1622 1623 1643 1642)
+4(1642 1643 1663 1662)
+4(1662 1663 1683 1682)
+4(1682 1683 1703 1702)
+4(1303 1304 1324 1323)
+4(1323 1324 1344 1343)
+4(1343 1344 1364 1363)
+4(1363 1364 1384 1383)
+4(1383 1384 1404 1403)
+4(1403 1404 1424 1423)
+4(1423 1424 1444 1443)
+4(1443 1444 1464 1463)
+4(1463 1464 1484 1483)
+4(1483 1484 1504 1503)
+4(1503 1504 1524 1523)
+4(1523 1524 1544 1543)
+4(1543 1544 1564 1563)
+4(1563 1564 1584 1583)
+4(1583 1584 1604 1603)
+4(1603 1604 1624 1623)
+4(1623 1624 1644 1643)
+4(1643 1644 1664 1663)
+4(1663 1664 1684 1683)
+4(1683 1684 1704 1703)
+4(1304 1305 1325 1324)
+4(1324 1325 1345 1344)
+4(1344 1345 1365 1364)
+4(1364 1365 1385 1384)
+4(1384 1385 1405 1404)
+4(1404 1405 1425 1424)
+4(1424 1425 1445 1444)
+4(1444 1445 1465 1464)
+4(1464 1465 1485 1484)
+4(1484 1485 1505 1504)
+4(1504 1505 1525 1524)
+4(1524 1525 1545 1544)
+4(1544 1545 1565 1564)
+4(1564 1565 1585 1584)
+4(1584 1585 1605 1604)
+4(1604 1605 1625 1624)
+4(1624 1625 1645 1644)
+4(1644 1645 1665 1664)
+4(1664 1665 1685 1684)
+4(1684 1685 1705 1704)
+4(1305 1306 1326 1325)
+4(1325 1326 1346 1345)
+4(1345 1346 1366 1365)
+4(1365 1366 1386 1385)
+4(1385 1386 1406 1405)
+4(1405 1406 1426 1425)
+4(1425 1426 1446 1445)
+4(1445 1446 1466 1465)
+4(1465 1466 1486 1485)
+4(1485 1486 1506 1505)
+4(1505 1506 1526 1525)
+4(1525 1526 1546 1545)
+4(1545 1546 1566 1565)
+4(1565 1566 1586 1585)
+4(1585 1586 1606 1605)
+4(1605 1606 1626 1625)
+4(1625 1626 1646 1645)
+4(1645 1646 1666 1665)
+4(1665 1666 1686 1685)
+4(1685 1686 1706 1705)
+4(1306 1307 1327 1326)
+4(1326 1327 1347 1346)
+4(1346 1347 1367 1366)
+4(1366 1367 1387 1386)
+4(1386 1387 1407 1406)
+4(1406 1407 1427 1426)
+4(1426 1427 1447 1446)
+4(1446 1447 1467 1466)
+4(1466 1467 1487 1486)
+4(1486 1487 1507 1506)
+4(1506 1507 1527 1526)
+4(1526 1527 1547 1546)
+4(1546 1547 1567 1566)
+4(1566 1567 1587 1586)
+4(1586 1587 1607 1606)
+4(1606 1607 1627 1626)
+4(1626 1627 1647 1646)
+4(1646 1647 1667 1666)
+4(1666 1667 1687 1686)
+4(1686 1687 1707 1706)
+4(1307 1308 1328 1327)
+4(1327 1328 1348 1347)
+4(1347 1348 1368 1367)
+4(1367 1368 1388 1387)
+4(1387 1388 1408 1407)
+4(1407 1408 1428 1427)
+4(1427 1428 1448 1447)
+4(1447 1448 1468 1467)
+4(1467 1468 1488 1487)
+4(1487 1488 1508 1507)
+4(1507 1508 1528 1527)
+4(1527 1528 1548 1547)
+4(1547 1548 1568 1567)
+4(1567 1568 1588 1587)
+4(1587 1588 1608 1607)
+4(1607 1608 1628 1627)
+4(1627 1628 1648 1647)
+4(1647 1648 1668 1667)
+4(1667 1668 1688 1687)
+4(1687 1688 1708 1707)
+4(1308 1309 1329 1328)
+4(1328 1329 1349 1348)
+4(1348 1349 1369 1368)
+4(1368 1369 1389 1388)
+4(1388 1389 1409 1408)
+4(1408 1409 1429 1428)
+4(1428 1429 1449 1448)
+4(1448 1449 1469 1468)
+4(1468 1469 1489 1488)
+4(1488 1489 1509 1508)
+4(1508 1509 1529 1528)
+4(1528 1529 1549 1548)
+4(1548 1549 1569 1568)
+4(1568 1569 1589 1588)
+4(1588 1589 1609 1608)
+4(1608 1609 1629 1628)
+4(1628 1629 1649 1648)
+4(1648 1649 1669 1668)
+4(1668 1669 1689 1688)
+4(1688 1689 1709 1708)
+4(1309 1310 1330 1329)
+4(1329 1330 1350 1349)
+4(1349 1350 1370 1369)
+4(1369 1370 1390 1389)
+4(1389 1390 1410 1409)
+4(1409 1410 1430 1429)
+4(1429 1430 1450 1449)
+4(1449 1450 1470 1469)
+4(1469 1470 1490 1489)
+4(1489 1490 1510 1509)
+4(1509 1510 1530 1529)
+4(1529 1530 1550 1549)
+4(1549 1550 1570 1569)
+4(1569 1570 1590 1589)
+4(1589 1590 1610 1609)
+4(1609 1610 1630 1629)
+4(1629 1630 1650 1649)
+4(1649 1650 1670 1669)
+4(1669 1670 1690 1689)
+4(1689 1690 1710 1709)
+4(1310 1311 1331 1330)
+4(1330 1331 1351 1350)
+4(1350 1351 1371 1370)
+4(1370 1371 1391 1390)
+4(1390 1391 1411 1410)
+4(1410 1411 1431 1430)
+4(1430 1431 1451 1450)
+4(1450 1451 1471 1470)
+4(1470 1471 1491 1490)
+4(1490 1491 1511 1510)
+4(1510 1511 1531 1530)
+4(1530 1531 1551 1550)
+4(1550 1551 1571 1570)
+4(1570 1571 1591 1590)
+4(1590 1591 1611 1610)
+4(1610 1611 1631 1630)
+4(1630 1631 1651 1650)
+4(1650 1651 1671 1670)
+4(1670 1671 1691 1690)
+4(1690 1691 1711 1710)
+4(1311 1312 1332 1331)
+4(1331 1332 1352 1351)
+4(1351 1352 1372 1371)
+4(1371 1372 1392 1391)
+4(1391 1392 1412 1411)
+4(1411 1412 1432 1431)
+4(1431 1432 1452 1451)
+4(1451 1452 1472 1471)
+4(1471 1472 1492 1491)
+4(1491 1492 1512 1511)
+4(1511 1512 1532 1531)
+4(1531 1532 1552 1551)
+4(1551 1552 1572 1571)
+4(1571 1572 1592 1591)
+4(1591 1592 1612 1611)
+4(1611 1612 1632 1631)
+4(1631 1632 1652 1651)
+4(1651 1652 1672 1671)
+4(1671 1672 1692 1691)
+4(1691 1692 1712 1711)
+4(1312 1313 1333 1332)
+4(1332 1333 1353 1352)
+4(1352 1353 1373 1372)
+4(1372 1373 1393 1392)
+4(1392 1393 1413 1412)
+4(1412 1413 1433 1432)
+4(1432 1433 1453 1452)
+4(1452 1453 1473 1472)
+4(1472 1473 1493 1492)
+4(1492 1493 1513 1512)
+4(1512 1513 1533 1532)
+4(1532 1533 1553 1552)
+4(1552 1553 1573 1572)
+4(1572 1573 1593 1592)
+4(1592 1593 1613 1612)
+4(1612 1613 1633 1632)
+4(1632 1633 1653 1652)
+4(1652 1653 1673 1672)
+4(1672 1673 1693 1692)
+4(1692 1693 1713 1712)
+4(1313 1314 1334 1333)
+4(1333 1334 1354 1353)
+4(1353 1354 1374 1373)
+4(1373 1374 1394 1393)
+4(1393 1394 1414 1413)
+4(1413 1414 1434 1433)
+4(1433 1434 1454 1453)
+4(1453 1454 1474 1473)
+4(1473 1474 1494 1493)
+4(1493 1494 1514 1513)
+4(1513 1514 1534 1533)
+4(1533 1534 1554 1553)
+4(1553 1554 1574 1573)
+4(1573 1574 1594 1593)
+4(1593 1594 1614 1613)
+4(1613 1614 1634 1633)
+4(1633 1634 1654 1653)
+4(1653 1654 1674 1673)
+4(1673 1674 1694 1693)
+4(1693 1694 1714 1713)
+4(1314 1315 1335 1334)
+4(1334 1335 1355 1354)
+4(1354 1355 1375 1374)
+4(1374 1375 1395 1394)
+4(1394 1395 1415 1414)
+4(1414 1415 1435 1434)
+4(1434 1435 1455 1454)
+4(1454 1455 1475 1474)
+4(1474 1475 1495 1494)
+4(1494 1495 1515 1514)
+4(1514 1515 1535 1534)
+4(1534 1535 1555 1554)
+4(1554 1555 1575 1574)
+4(1574 1575 1595 1594)
+4(1594 1595 1615 1614)
+4(1614 1615 1635 1634)
+4(1634 1635 1655 1654)
+4(1654 1655 1675 1674)
+4(1674 1675 1695 1694)
+4(1694 1695 1715 1714)
+4(1315 1316 1336 1335)
+4(1335 1336 1356 1355)
+4(1355 1356 1376 1375)
+4(1375 1376 1396 1395)
+4(1395 1396 1416 1415)
+4(1415 1416 1436 1435)
+4(1435 1436 1456 1455)
+4(1455 1456 1476 1475)
+4(1475 1476 1496 1495)
+4(1495 1496 1516 1515)
+4(1515 1516 1536 1535)
+4(1535 1536 1556 1555)
+4(1555 1556 1576 1575)
+4(1575 1576 1596 1595)
+4(1595 1596 1616 1615)
+4(1615 1616 1636 1635)
+4(1635 1636 1656 1655)
+4(1655 1656 1676 1675)
+4(1675 1676 1696 1695)
+4(1695 1696 1716 1715)
+4(1316 1317 1337 1336)
+4(1336 1337 1357 1356)
+4(1356 1357 1377 1376)
+4(1376 1377 1397 1396)
+4(1396 1397 1417 1416)
+4(1416 1417 1437 1436)
+4(1436 1437 1457 1456)
+4(1456 1457 1477 1476)
+4(1476 1477 1497 1496)
+4(1496 1497 1517 1516)
+4(1516 1517 1537 1536)
+4(1536 1537 1557 1556)
+4(1556 1557 1577 1576)
+4(1576 1577 1597 1596)
+4(1596 1597 1617 1616)
+4(1616 1617 1637 1636)
+4(1636 1637 1657 1656)
+4(1656 1657 1677 1676)
+4(1676 1677 1697 1696)
+4(1696 1697 1717 1716)
+4(1317 1318 1338 1337)
+4(1337 1338 1358 1357)
+4(1357 1358 1378 1377)
+4(1377 1378 1398 1397)
+4(1397 1398 1418 1417)
+4(1417 1418 1438 1437)
+4(1437 1438 1458 1457)
+4(1457 1458 1478 1477)
+4(1477 1478 1498 1497)
+4(1497 1498 1518 1517)
+4(1517 1518 1538 1537)
+4(1537 1538 1558 1557)
+4(1557 1558 1578 1577)
+4(1577 1578 1598 1597)
+4(1597 1598 1618 1617)
+4(1617 1618 1638 1637)
+4(1637 1638 1658 1657)
+4(1657 1658 1678 1677)
+4(1677 1678 1698 1697)
+4(1697 1698 1718 1717)
+4(1318 1319 1339 1338)
+4(1338 1339 1359 1358)
+4(1358 1359 1379 1378)
+4(1378 1379 1399 1398)
+4(1398 1399 1419 1418)
+4(1418 1419 1439 1438)
+4(1438 1439 1459 1458)
+4(1458 1459 1479 1478)
+4(1478 1479 1499 1498)
+4(1498 1499 1519 1518)
+4(1518 1519 1539 1538)
+4(1538 1539 1559 1558)
+4(1558 1559 1579 1578)
+4(1578 1579 1599 1598)
+4(1598 1599 1619 1618)
+4(1618 1619 1639 1638)
+4(1638 1639 1659 1658)
+4(1658 1659 1679 1678)
+4(1678 1679 1699 1698)
+4(1698 1699 1719 1718)
+4(1319 1320 1340 1339)
+4(1339 1340 1360 1359)
+4(1359 1360 1380 1379)
+4(1379 1380 1400 1399)
+4(1399 1400 1420 1419)
+4(1419 1420 1440 1439)
+4(1439 1440 1460 1459)
+4(1459 1460 1480 1479)
+4(1479 1480 1500 1499)
+4(1499 1500 1520 1519)
+4(1519 1520 1540 1539)
+4(1539 1540 1560 1559)
+4(1559 1560 1580 1579)
+4(1579 1580 1600 1599)
+4(1599 1600 1620 1619)
+4(1619 1620 1640 1639)
+4(1639 1640 1660 1659)
+4(1659 1660 1680 1679)
+4(1679 1680 1700 1699)
+4(1699 1700 1720 1719)
+4(1320 1321 1341 1340)
+4(1340 1341 1361 1360)
+4(1360 1361 1381 1380)
+4(1380 1381 1401 1400)
+4(1400 1401 1421 1420)
+4(1420 1421 1441 1440)
+4(1440 1441 1461 1460)
+4(1460 1461 1481 1480)
+4(1480 1481 1501 1500)
+4(1500 1501 1521 1520)
+4(1520 1521 1541 1540)
+4(1540 1541 1561 1560)
+4(1560 1561 1581 1580)
+4(1580 1581 1601 1600)
+4(1600 1601 1621 1620)
+4(1620 1621 1641 1640)
+4(1640 1641 1661 1660)
+4(1660 1661 1681 1680)
+4(1680 1681 1701 1700)
+4(1700 1701 1721 1720)
+4(901 1722 2142 1321)
+4(1722 1723 2143 2142)
+4(1723 1724 2144 2143)
+4(1724 1725 2145 2144)
+4(1725 1726 2146 2145)
+4(1726 1727 2147 2146)
+4(1727 1728 2148 2147)
+4(1728 1729 2149 2148)
+4(1729 1730 2150 2149)
+4(1730 1731 2151 2150)
+4(1731 1732 2152 2151)
+4(1732 1733 2153 2152)
+4(1733 1734 2154 2153)
+4(1734 1735 2155 2154)
+4(1735 1736 2156 2155)
+4(1736 1737 2157 2156)
+4(1737 1738 2158 2157)
+4(1738 1739 2159 2158)
+4(1739 1740 2160 2159)
+4(1740 1741 2161 2160)
+4(1301 1721 2542 2122)
+4(2122 2542 2543 2123)
+4(2123 2543 2544 2124)
+4(2124 2544 2545 2125)
+4(2125 2545 2546 2126)
+4(2126 2546 2547 2127)
+4(2127 2547 2548 2128)
+4(2128 2548 2549 2129)
+4(2129 2549 2550 2130)
+4(2130 2550 2551 2131)
+4(2131 2551 2552 2132)
+4(2132 2552 2553 2133)
+4(2133 2553 2554 2134)
+4(2134 2554 2555 2135)
+4(2135 2555 2556 2136)
+4(2136 2556 2557 2137)
+4(2137 2557 2558 2138)
+4(2138 2558 2559 2139)
+4(2139 2559 2560 2140)
+4(2140 2560 2561 2141)
+4(901 921 1742 1722)
+4(921 941 1762 1742)
+4(941 961 1782 1762)
+4(961 981 1802 1782)
+4(981 1001 1822 1802)
+4(1001 1021 1842 1822)
+4(1021 1041 1862 1842)
+4(1041 1061 1882 1862)
+4(1061 1081 1902 1882)
+4(1081 1101 1922 1902)
+4(1101 1121 1942 1922)
+4(1121 1141 1962 1942)
+4(1141 1161 1982 1962)
+4(1161 1181 2002 1982)
+4(1181 1201 2022 2002)
+4(1201 1221 2042 2022)
+4(1221 1241 2062 2042)
+4(1241 1261 2082 2062)
+4(1261 1281 2102 2082)
+4(1281 1301 2122 2102)
+4(1722 1742 1743 1723)
+4(1742 1762 1763 1743)
+4(1762 1782 1783 1763)
+4(1782 1802 1803 1783)
+4(1802 1822 1823 1803)
+4(1822 1842 1843 1823)
+4(1842 1862 1863 1843)
+4(1862 1882 1883 1863)
+4(1882 1902 1903 1883)
+4(1902 1922 1923 1903)
+4(1922 1942 1943 1923)
+4(1942 1962 1963 1943)
+4(1962 1982 1983 1963)
+4(1982 2002 2003 1983)
+4(2002 2022 2023 2003)
+4(2022 2042 2043 2023)
+4(2042 2062 2063 2043)
+4(2062 2082 2083 2063)
+4(2082 2102 2103 2083)
+4(2102 2122 2123 2103)
+4(1723 1743 1744 1724)
+4(1743 1763 1764 1744)
+4(1763 1783 1784 1764)
+4(1783 1803 1804 1784)
+4(1803 1823 1824 1804)
+4(1823 1843 1844 1824)
+4(1843 1863 1864 1844)
+4(1863 1883 1884 1864)
+4(1883 1903 1904 1884)
+4(1903 1923 1924 1904)
+4(1923 1943 1944 1924)
+4(1943 1963 1964 1944)
+4(1963 1983 1984 1964)
+4(1983 2003 2004 1984)
+4(2003 2023 2024 2004)
+4(2023 2043 2044 2024)
+4(2043 2063 2064 2044)
+4(2063 2083 2084 2064)
+4(2083 2103 2104 2084)
+4(2103 2123 2124 2104)
+4(1724 1744 1745 1725)
+4(1744 1764 1765 1745)
+4(1764 1784 1785 1765)
+4(1784 1804 1805 1785)
+4(1804 1824 1825 1805)
+4(1824 1844 1845 1825)
+4(1844 1864 1865 1845)
+4(1864 1884 1885 1865)
+4(1884 1904 1905 1885)
+4(1904 1924 1925 1905)
+4(1924 1944 1945 1925)
+4(1944 1964 1965 1945)
+4(1964 1984 1985 1965)
+4(1984 2004 2005 1985)
+4(2004 2024 2025 2005)
+4(2024 2044 2045 2025)
+4(2044 2064 2065 2045)
+4(2064 2084 2085 2065)
+4(2084 2104 2105 2085)
+4(2104 2124 2125 2105)
+4(1725 1745 1746 1726)
+4(1745 1765 1766 1746)
+4(1765 1785 1786 1766)
+4(1785 1805 1806 1786)
+4(1805 1825 1826 1806)
+4(1825 1845 1846 1826)
+4(1845 1865 1866 1846)
+4(1865 1885 1886 1866)
+4(1885 1905 1906 1886)
+4(1905 1925 1926 1906)
+4(1925 1945 1946 1926)
+4(1945 1965 1966 1946)
+4(1965 1985 1986 1966)
+4(1985 2005 2006 1986)
+4(2005 2025 2026 2006)
+4(2025 2045 2046 2026)
+4(2045 2065 2066 2046)
+4(2065 2085 2086 2066)
+4(2085 2105 2106 2086)
+4(2105 2125 2126 2106)
+4(1726 1746 1747 1727)
+4(1746 1766 1767 1747)
+4(1766 1786 1787 1767)
+4(1786 1806 1807 1787)
+4(1806 1826 1827 1807)
+4(1826 1846 1847 1827)
+4(1846 1866 1867 1847)
+4(1866 1886 1887 1867)
+4(1886 1906 1907 1887)
+4(1906 1926 1927 1907)
+4(1926 1946 1947 1927)
+4(1946 1966 1967 1947)
+4(1966 1986 1987 1967)
+4(1986 2006 2007 1987)
+4(2006 2026 2027 2007)
+4(2026 2046 2047 2027)
+4(2046 2066 2067 2047)
+4(2066 2086 2087 2067)
+4(2086 2106 2107 2087)
+4(2106 2126 2127 2107)
+4(1727 1747 1748 1728)
+4(1747 1767 1768 1748)
+4(1767 1787 1788 1768)
+4(1787 1807 1808 1788)
+4(1807 1827 1828 1808)
+4(1827 1847 1848 1828)
+4(1847 1867 1868 1848)
+4(1867 1887 1888 1868)
+4(1887 1907 1908 1888)
+4(1907 1927 1928 1908)
+4(1927 1947 1948 1928)
+4(1947 1967 1968 1948)
+4(1967 1987 1988 1968)
+4(1987 2007 2008 1988)
+4(2007 2027 2028 2008)
+4(2027 2047 2048 2028)
+4(2047 2067 2068 2048)
+4(2067 2087 2088 2068)
+4(2087 2107 2108 2088)
+4(2107 2127 2128 2108)
+4(1728 1748 1749 1729)
+4(1748 1768 1769 1749)
+4(1768 1788 1789 1769)
+4(1788 1808 1809 1789)
+4(1808 1828 1829 1809)
+4(1828 1848 1849 1829)
+4(1848 1868 1869 1849)
+4(1868 1888 1889 1869)
+4(1888 1908 1909 1889)
+4(1908 1928 1929 1909)
+4(1928 1948 1949 1929)
+4(1948 1968 1969 1949)
+4(1968 1988 1989 1969)
+4(1988 2008 2009 1989)
+4(2008 2028 2029 2009)
+4(2028 2048 2049 2029)
+4(2048 2068 2069 2049)
+4(2068 2088 2089 2069)
+4(2088 2108 2109 2089)
+4(2108 2128 2129 2109)
+4(1729 1749 1750 1730)
+4(1749 1769 1770 1750)
+4(1769 1789 1790 1770)
+4(1789 1809 1810 1790)
+4(1809 1829 1830 1810)
+4(1829 1849 1850 1830)
+4(1849 1869 1870 1850)
+4(1869 1889 1890 1870)
+4(1889 1909 1910 1890)
+4(1909 1929 1930 1910)
+4(1929 1949 1950 1930)
+4(1949 1969 1970 1950)
+4(1969 1989 1990 1970)
+4(1989 2009 2010 1990)
+4(2009 2029 2030 2010)
+4(2029 2049 2050 2030)
+4(2049 2069 2070 2050)
+4(2069 2089 2090 2070)
+4(2089 2109 2110 2090)
+4(2109 2129 2130 2110)
+4(1730 1750 1751 1731)
+4(1750 1770 1771 1751)
+4(1770 1790 1791 1771)
+4(1790 1810 1811 1791)
+4(1810 1830 1831 1811)
+4(1830 1850 1851 1831)
+4(1850 1870 1871 1851)
+4(1870 1890 1891 1871)
+4(1890 1910 1911 1891)
+4(1910 1930 1931 1911)
+4(1930 1950 1951 1931)
+4(1950 1970 1971 1951)
+4(1970 1990 1991 1971)
+4(1990 2010 2011 1991)
+4(2010 2030 2031 2011)
+4(2030 2050 2051 2031)
+4(2050 2070 2071 2051)
+4(2070 2090 2091 2071)
+4(2090 2110 2111 2091)
+4(2110 2130 2131 2111)
+4(1731 1751 1752 1732)
+4(1751 1771 1772 1752)
+4(1771 1791 1792 1772)
+4(1791 1811 1812 1792)
+4(1811 1831 1832 1812)
+4(1831 1851 1852 1832)
+4(1851 1871 1872 1852)
+4(1871 1891 1892 1872)
+4(1891 1911 1912 1892)
+4(1911 1931 1932 1912)
+4(1931 1951 1952 1932)
+4(1951 1971 1972 1952)
+4(1971 1991 1992 1972)
+4(1991 2011 2012 1992)
+4(2011 2031 2032 2012)
+4(2031 2051 2052 2032)
+4(2051 2071 2072 2052)
+4(2071 2091 2092 2072)
+4(2091 2111 2112 2092)
+4(2111 2131 2132 2112)
+4(1732 1752 1753 1733)
+4(1752 1772 1773 1753)
+4(1772 1792 1793 1773)
+4(1792 1812 1813 1793)
+4(1812 1832 1833 1813)
+4(1832 1852 1853 1833)
+4(1852 1872 1873 1853)
+4(1872 1892 1893 1873)
+4(1892 1912 1913 1893)
+4(1912 1932 1933 1913)
+4(1932 1952 1953 1933)
+4(1952 1972 1973 1953)
+4(1972 1992 1993 1973)
+4(1992 2012 2013 1993)
+4(2012 2032 2033 2013)
+4(2032 2052 2053 2033)
+4(2052 2072 2073 2053)
+4(2072 2092 2093 2073)
+4(2092 2112 2113 2093)
+4(2112 2132 2133 2113)
+4(1733 1753 1754 1734)
+4(1753 1773 1774 1754)
+4(1773 1793 1794 1774)
+4(1793 1813 1814 1794)
+4(1813 1833 1834 1814)
+4(1833 1853 1854 1834)
+4(1853 1873 1874 1854)
+4(1873 1893 1894 1874)
+4(1893 1913 1914 1894)
+4(1913 1933 1934 1914)
+4(1933 1953 1954 1934)
+4(1953 1973 1974 1954)
+4(1973 1993 1994 1974)
+4(1993 2013 2014 1994)
+4(2013 2033 2034 2014)
+4(2033 2053 2054 2034)
+4(2053 2073 2074 2054)
+4(2073 2093 2094 2074)
+4(2093 2113 2114 2094)
+4(2113 2133 2134 2114)
+4(1734 1754 1755 1735)
+4(1754 1774 1775 1755)
+4(1774 1794 1795 1775)
+4(1794 1814 1815 1795)
+4(1814 1834 1835 1815)
+4(1834 1854 1855 1835)
+4(1854 1874 1875 1855)
+4(1874 1894 1895 1875)
+4(1894 1914 1915 1895)
+4(1914 1934 1935 1915)
+4(1934 1954 1955 1935)
+4(1954 1974 1975 1955)
+4(1974 1994 1995 1975)
+4(1994 2014 2015 1995)
+4(2014 2034 2035 2015)
+4(2034 2054 2055 2035)
+4(2054 2074 2075 2055)
+4(2074 2094 2095 2075)
+4(2094 2114 2115 2095)
+4(2114 2134 2135 2115)
+4(1735 1755 1756 1736)
+4(1755 1775 1776 1756)
+4(1775 1795 1796 1776)
+4(1795 1815 1816 1796)
+4(1815 1835 1836 1816)
+4(1835 1855 1856 1836)
+4(1855 1875 1876 1856)
+4(1875 1895 1896 1876)
+4(1895 1915 1916 1896)
+4(1915 1935 1936 1916)
+4(1935 1955 1956 1936)
+4(1955 1975 1976 1956)
+4(1975 1995 1996 1976)
+4(1995 2015 2016 1996)
+4(2015 2035 2036 2016)
+4(2035 2055 2056 2036)
+4(2055 2075 2076 2056)
+4(2075 2095 2096 2076)
+4(2095 2115 2116 2096)
+4(2115 2135 2136 2116)
+4(1736 1756 1757 1737)
+4(1756 1776 1777 1757)
+4(1776 1796 1797 1777)
+4(1796 1816 1817 1797)
+4(1816 1836 1837 1817)
+4(1836 1856 1857 1837)
+4(1856 1876 1877 1857)
+4(1876 1896 1897 1877)
+4(1896 1916 1917 1897)
+4(1916 1936 1937 1917)
+4(1936 1956 1957 1937)
+4(1956 1976 1977 1957)
+4(1976 1996 1997 1977)
+4(1996 2016 2017 1997)
+4(2016 2036 2037 2017)
+4(2036 2056 2057 2037)
+4(2056 2076 2077 2057)
+4(2076 2096 2097 2077)
+4(2096 2116 2117 2097)
+4(2116 2136 2137 2117)
+4(1737 1757 1758 1738)
+4(1757 1777 1778 1758)
+4(1777 1797 1798 1778)
+4(1797 1817 1818 1798)
+4(1817 1837 1838 1818)
+4(1837 1857 1858 1838)
+4(1857 1877 1878 1858)
+4(1877 1897 1898 1878)
+4(1897 1917 1918 1898)
+4(1917 1937 1938 1918)
+4(1937 1957 1958 1938)
+4(1957 1977 1978 1958)
+4(1977 1997 1998 1978)
+4(1997 2017 2018 1998)
+4(2017 2037 2038 2018)
+4(2037 2057 2058 2038)
+4(2057 2077 2078 2058)
+4(2077 2097 2098 2078)
+4(2097 2117 2118 2098)
+4(2117 2137 2138 2118)
+4(1738 1758 1759 1739)
+4(1758 1778 1779 1759)
+4(1778 1798 1799 1779)
+4(1798 1818 1819 1799)
+4(1818 1838 1839 1819)
+4(1838 1858 1859 1839)
+4(1858 1878 1879 1859)
+4(1878 1898 1899 1879)
+4(1898 1918 1919 1899)
+4(1918 1938 1939 1919)
+4(1938 1958 1959 1939)
+4(1958 1978 1979 1959)
+4(1978 1998 1999 1979)
+4(1998 2018 2019 1999)
+4(2018 2038 2039 2019)
+4(2038 2058 2059 2039)
+4(2058 2078 2079 2059)
+4(2078 2098 2099 2079)
+4(2098 2118 2119 2099)
+4(2118 2138 2139 2119)
+4(1739 1759 1760 1740)
+4(1759 1779 1780 1760)
+4(1779 1799 1800 1780)
+4(1799 1819 1820 1800)
+4(1819 1839 1840 1820)
+4(1839 1859 1860 1840)
+4(1859 1879 1880 1860)
+4(1879 1899 1900 1880)
+4(1899 1919 1920 1900)
+4(1919 1939 1940 1920)
+4(1939 1959 1960 1940)
+4(1959 1979 1980 1960)
+4(1979 1999 2000 1980)
+4(1999 2019 2020 2000)
+4(2019 2039 2040 2020)
+4(2039 2059 2060 2040)
+4(2059 2079 2080 2060)
+4(2079 2099 2100 2080)
+4(2099 2119 2120 2100)
+4(2119 2139 2140 2120)
+4(1740 1760 1761 1741)
+4(1760 1780 1781 1761)
+4(1780 1800 1801 1781)
+4(1800 1820 1821 1801)
+4(1820 1840 1841 1821)
+4(1840 1860 1861 1841)
+4(1860 1880 1881 1861)
+4(1880 1900 1901 1881)
+4(1900 1920 1921 1901)
+4(1920 1940 1941 1921)
+4(1940 1960 1961 1941)
+4(1960 1980 1981 1961)
+4(1980 2000 2001 1981)
+4(2000 2020 2021 2001)
+4(2020 2040 2041 2021)
+4(2040 2060 2061 2041)
+4(2060 2080 2081 2061)
+4(2080 2100 2101 2081)
+4(2100 2120 2121 2101)
+4(2120 2140 2141 2121)
+4(1321 2142 2162 1341)
+4(1341 2162 2182 1361)
+4(1361 2182 2202 1381)
+4(1381 2202 2222 1401)
+4(1401 2222 2242 1421)
+4(1421 2242 2262 1441)
+4(1441 2262 2282 1461)
+4(1461 2282 2302 1481)
+4(1481 2302 2322 1501)
+4(1501 2322 2342 1521)
+4(1521 2342 2362 1541)
+4(1541 2362 2382 1561)
+4(1561 2382 2402 1581)
+4(1581 2402 2422 1601)
+4(1601 2422 2442 1621)
+4(1621 2442 2462 1641)
+4(1641 2462 2482 1661)
+4(1661 2482 2502 1681)
+4(1681 2502 2522 1701)
+4(1701 2522 2542 1721)
+4(2142 2143 2163 2162)
+4(2162 2163 2183 2182)
+4(2182 2183 2203 2202)
+4(2202 2203 2223 2222)
+4(2222 2223 2243 2242)
+4(2242 2243 2263 2262)
+4(2262 2263 2283 2282)
+4(2282 2283 2303 2302)
+4(2302 2303 2323 2322)
+4(2322 2323 2343 2342)
+4(2342 2343 2363 2362)
+4(2362 2363 2383 2382)
+4(2382 2383 2403 2402)
+4(2402 2403 2423 2422)
+4(2422 2423 2443 2442)
+4(2442 2443 2463 2462)
+4(2462 2463 2483 2482)
+4(2482 2483 2503 2502)
+4(2502 2503 2523 2522)
+4(2522 2523 2543 2542)
+4(2143 2144 2164 2163)
+4(2163 2164 2184 2183)
+4(2183 2184 2204 2203)
+4(2203 2204 2224 2223)
+4(2223 2224 2244 2243)
+4(2243 2244 2264 2263)
+4(2263 2264 2284 2283)
+4(2283 2284 2304 2303)
+4(2303 2304 2324 2323)
+4(2323 2324 2344 2343)
+4(2343 2344 2364 2363)
+4(2363 2364 2384 2383)
+4(2383 2384 2404 2403)
+4(2403 2404 2424 2423)
+4(2423 2424 2444 2443)
+4(2443 2444 2464 2463)
+4(2463 2464 2484 2483)
+4(2483 2484 2504 2503)
+4(2503 2504 2524 2523)
+4(2523 2524 2544 2543)
+4(2144 2145 2165 2164)
+4(2164 2165 2185 2184)
+4(2184 2185 2205 2204)
+4(2204 2205 2225 2224)
+4(2224 2225 2245 2244)
+4(2244 2245 2265 2264)
+4(2264 2265 2285 2284)
+4(2284 2285 2305 2304)
+4(2304 2305 2325 2324)
+4(2324 2325 2345 2344)
+4(2344 2345 2365 2364)
+4(2364 2365 2385 2384)
+4(2384 2385 2405 2404)
+4(2404 2405 2425 2424)
+4(2424 2425 2445 2444)
+4(2444 2445 2465 2464)
+4(2464 2465 2485 2484)
+4(2484 2485 2505 2504)
+4(2504 2505 2525 2524)
+4(2524 2525 2545 2544)
+4(2145 2146 2166 2165)
+4(2165 2166 2186 2185)
+4(2185 2186 2206 2205)
+4(2205 2206 2226 2225)
+4(2225 2226 2246 2245)
+4(2245 2246 2266 2265)
+4(2265 2266 2286 2285)
+4(2285 2286 2306 2305)
+4(2305 2306 2326 2325)
+4(2325 2326 2346 2345)
+4(2345 2346 2366 2365)
+4(2365 2366 2386 2385)
+4(2385 2386 2406 2405)
+4(2405 2406 2426 2425)
+4(2425 2426 2446 2445)
+4(2445 2446 2466 2465)
+4(2465 2466 2486 2485)
+4(2485 2486 2506 2505)
+4(2505 2506 2526 2525)
+4(2525 2526 2546 2545)
+4(2146 2147 2167 2166)
+4(2166 2167 2187 2186)
+4(2186 2187 2207 2206)
+4(2206 2207 2227 2226)
+4(2226 2227 2247 2246)
+4(2246 2247 2267 2266)
+4(2266 2267 2287 2286)
+4(2286 2287 2307 2306)
+4(2306 2307 2327 2326)
+4(2326 2327 2347 2346)
+4(2346 2347 2367 2366)
+4(2366 2367 2387 2386)
+4(2386 2387 2407 2406)
+4(2406 2407 2427 2426)
+4(2426 2427 2447 2446)
+4(2446 2447 2467 2466)
+4(2466 2467 2487 2486)
+4(2486 2487 2507 2506)
+4(2506 2507 2527 2526)
+4(2526 2527 2547 2546)
+4(2147 2148 2168 2167)
+4(2167 2168 2188 2187)
+4(2187 2188 2208 2207)
+4(2207 2208 2228 2227)
+4(2227 2228 2248 2247)
+4(2247 2248 2268 2267)
+4(2267 2268 2288 2287)
+4(2287 2288 2308 2307)
+4(2307 2308 2328 2327)
+4(2327 2328 2348 2347)
+4(2347 2348 2368 2367)
+4(2367 2368 2388 2387)
+4(2387 2388 2408 2407)
+4(2407 2408 2428 2427)
+4(2427 2428 2448 2447)
+4(2447 2448 2468 2467)
+4(2467 2468 2488 2487)
+4(2487 2488 2508 2507)
+4(2507 2508 2528 2527)
+4(2527 2528 2548 2547)
+4(2148 2149 2169 2168)
+4(2168 2169 2189 2188)
+4(2188 2189 2209 2208)
+4(2208 2209 2229 2228)
+4(2228 2229 2249 2248)
+4(2248 2249 2269 2268)
+4(2268 2269 2289 2288)
+4(2288 2289 2309 2308)
+4(2308 2309 2329 2328)
+4(2328 2329 2349 2348)
+4(2348 2349 2369 2368)
+4(2368 2369 2389 2388)
+4(2388 2389 2409 2408)
+4(2408 2409 2429 2428)
+4(2428 2429 2449 2448)
+4(2448 2449 2469 2468)
+4(2468 2469 2489 2488)
+4(2488 2489 2509 2508)
+4(2508 2509 2529 2528)
+4(2528 2529 2549 2548)
+4(2149 2150 2170 2169)
+4(2169 2170 2190 2189)
+4(2189 2190 2210 2209)
+4(2209 2210 2230 2229)
+4(2229 2230 2250 2249)
+4(2249 2250 2270 2269)
+4(2269 2270 2290 2289)
+4(2289 2290 2310 2309)
+4(2309 2310 2330 2329)
+4(2329 2330 2350 2349)
+4(2349 2350 2370 2369)
+4(2369 2370 2390 2389)
+4(2389 2390 2410 2409)
+4(2409 2410 2430 2429)
+4(2429 2430 2450 2449)
+4(2449 2450 2470 2469)
+4(2469 2470 2490 2489)
+4(2489 2490 2510 2509)
+4(2509 2510 2530 2529)
+4(2529 2530 2550 2549)
+4(2150 2151 2171 2170)
+4(2170 2171 2191 2190)
+4(2190 2191 2211 2210)
+4(2210 2211 2231 2230)
+4(2230 2231 2251 2250)
+4(2250 2251 2271 2270)
+4(2270 2271 2291 2290)
+4(2290 2291 2311 2310)
+4(2310 2311 2331 2330)
+4(2330 2331 2351 2350)
+4(2350 2351 2371 2370)
+4(2370 2371 2391 2390)
+4(2390 2391 2411 2410)
+4(2410 2411 2431 2430)
+4(2430 2431 2451 2450)
+4(2450 2451 2471 2470)
+4(2470 2471 2491 2490)
+4(2490 2491 2511 2510)
+4(2510 2511 2531 2530)
+4(2530 2531 2551 2550)
+4(2151 2152 2172 2171)
+4(2171 2172 2192 2191)
+4(2191 2192 2212 2211)
+4(2211 2212 2232 2231)
+4(2231 2232 2252 2251)
+4(2251 2252 2272 2271)
+4(2271 2272 2292 2291)
+4(2291 2292 2312 2311)
+4(2311 2312 2332 2331)
+4(2331 2332 2352 2351)
+4(2351 2352 2372 2371)
+4(2371 2372 2392 2391)
+4(2391 2392 2412 2411)
+4(2411 2412 2432 2431)
+4(2431 2432 2452 2451)
+4(2451 2452 2472 2471)
+4(2471 2472 2492 2491)
+4(2491 2492 2512 2511)
+4(2511 2512 2532 2531)
+4(2531 2532 2552 2551)
+4(2152 2153 2173 2172)
+4(2172 2173 2193 2192)
+4(2192 2193 2213 2212)
+4(2212 2213 2233 2232)
+4(2232 2233 2253 2252)
+4(2252 2253 2273 2272)
+4(2272 2273 2293 2292)
+4(2292 2293 2313 2312)
+4(2312 2313 2333 2332)
+4(2332 2333 2353 2352)
+4(2352 2353 2373 2372)
+4(2372 2373 2393 2392)
+4(2392 2393 2413 2412)
+4(2412 2413 2433 2432)
+4(2432 2433 2453 2452)
+4(2452 2453 2473 2472)
+4(2472 2473 2493 2492)
+4(2492 2493 2513 2512)
+4(2512 2513 2533 2532)
+4(2532 2533 2553 2552)
+4(2153 2154 2174 2173)
+4(2173 2174 2194 2193)
+4(2193 2194 2214 2213)
+4(2213 2214 2234 2233)
+4(2233 2234 2254 2253)
+4(2253 2254 2274 2273)
+4(2273 2274 2294 2293)
+4(2293 2294 2314 2313)
+4(2313 2314 2334 2333)
+4(2333 2334 2354 2353)
+4(2353 2354 2374 2373)
+4(2373 2374 2394 2393)
+4(2393 2394 2414 2413)
+4(2413 2414 2434 2433)
+4(2433 2434 2454 2453)
+4(2453 2454 2474 2473)
+4(2473 2474 2494 2493)
+4(2493 2494 2514 2513)
+4(2513 2514 2534 2533)
+4(2533 2534 2554 2553)
+4(2154 2155 2175 2174)
+4(2174 2175 2195 2194)
+4(2194 2195 2215 2214)
+4(2214 2215 2235 2234)
+4(2234 2235 2255 2254)
+4(2254 2255 2275 2274)
+4(2274 2275 2295 2294)
+4(2294 2295 2315 2314)
+4(2314 2315 2335 2334)
+4(2334 2335 2355 2354)
+4(2354 2355 2375 2374)
+4(2374 2375 2395 2394)
+4(2394 2395 2415 2414)
+4(2414 2415 2435 2434)
+4(2434 2435 2455 2454)
+4(2454 2455 2475 2474)
+4(2474 2475 2495 2494)
+4(2494 2495 2515 2514)
+4(2514 2515 2535 2534)
+4(2534 2535 2555 2554)
+4(2155 2156 2176 2175)
+4(2175 2176 2196 2195)
+4(2195 2196 2216 2215)
+4(2215 2216 2236 2235)
+4(2235 2236 2256 2255)
+4(2255 2256 2276 2275)
+4(2275 2276 2296 2295)
+4(2295 2296 2316 2315)
+4(2315 2316 2336 2335)
+4(2335 2336 2356 2355)
+4(2355 2356 2376 2375)
+4(2375 2376 2396 2395)
+4(2395 2396 2416 2415)
+4(2415 2416 2436 2435)
+4(2435 2436 2456 2455)
+4(2455 2456 2476 2475)
+4(2475 2476 2496 2495)
+4(2495 2496 2516 2515)
+4(2515 2516 2536 2535)
+4(2535 2536 2556 2555)
+4(2156 2157 2177 2176)
+4(2176 2177 2197 2196)
+4(2196 2197 2217 2216)
+4(2216 2217 2237 2236)
+4(2236 2237 2257 2256)
+4(2256 2257 2277 2276)
+4(2276 2277 2297 2296)
+4(2296 2297 2317 2316)
+4(2316 2317 2337 2336)
+4(2336 2337 2357 2356)
+4(2356 2357 2377 2376)
+4(2376 2377 2397 2396)
+4(2396 2397 2417 2416)
+4(2416 2417 2437 2436)
+4(2436 2437 2457 2456)
+4(2456 2457 2477 2476)
+4(2476 2477 2497 2496)
+4(2496 2497 2517 2516)
+4(2516 2517 2537 2536)
+4(2536 2537 2557 2556)
+4(2157 2158 2178 2177)
+4(2177 2178 2198 2197)
+4(2197 2198 2218 2217)
+4(2217 2218 2238 2237)
+4(2237 2238 2258 2257)
+4(2257 2258 2278 2277)
+4(2277 2278 2298 2297)
+4(2297 2298 2318 2317)
+4(2317 2318 2338 2337)
+4(2337 2338 2358 2357)
+4(2357 2358 2378 2377)
+4(2377 2378 2398 2397)
+4(2397 2398 2418 2417)
+4(2417 2418 2438 2437)
+4(2437 2438 2458 2457)
+4(2457 2458 2478 2477)
+4(2477 2478 2498 2497)
+4(2497 2498 2518 2517)
+4(2517 2518 2538 2537)
+4(2537 2538 2558 2557)
+4(2158 2159 2179 2178)
+4(2178 2179 2199 2198)
+4(2198 2199 2219 2218)
+4(2218 2219 2239 2238)
+4(2238 2239 2259 2258)
+4(2258 2259 2279 2278)
+4(2278 2279 2299 2298)
+4(2298 2299 2319 2318)
+4(2318 2319 2339 2338)
+4(2338 2339 2359 2358)
+4(2358 2359 2379 2378)
+4(2378 2379 2399 2398)
+4(2398 2399 2419 2418)
+4(2418 2419 2439 2438)
+4(2438 2439 2459 2458)
+4(2458 2459 2479 2478)
+4(2478 2479 2499 2498)
+4(2498 2499 2519 2518)
+4(2518 2519 2539 2538)
+4(2538 2539 2559 2558)
+4(2159 2160 2180 2179)
+4(2179 2180 2200 2199)
+4(2199 2200 2220 2219)
+4(2219 2220 2240 2239)
+4(2239 2240 2260 2259)
+4(2259 2260 2280 2279)
+4(2279 2280 2300 2299)
+4(2299 2300 2320 2319)
+4(2319 2320 2340 2339)
+4(2339 2340 2360 2359)
+4(2359 2360 2380 2379)
+4(2379 2380 2400 2399)
+4(2399 2400 2420 2419)
+4(2419 2420 2440 2439)
+4(2439 2440 2460 2459)
+4(2459 2460 2480 2479)
+4(2479 2480 2500 2499)
+4(2499 2500 2520 2519)
+4(2519 2520 2540 2539)
+4(2539 2540 2560 2559)
+4(2160 2161 2181 2180)
+4(2180 2181 2201 2200)
+4(2200 2201 2221 2220)
+4(2220 2221 2241 2240)
+4(2240 2241 2261 2260)
+4(2260 2261 2281 2280)
+4(2280 2281 2301 2300)
+4(2300 2301 2321 2320)
+4(2320 2321 2341 2340)
+4(2340 2341 2361 2360)
+4(2360 2361 2381 2380)
+4(2380 2381 2401 2400)
+4(2400 2401 2421 2420)
+4(2420 2421 2441 2440)
+4(2440 2441 2461 2460)
+4(2460 2461 2481 2480)
+4(2480 2481 2501 2500)
+4(2500 2501 2521 2520)
+4(2520 2521 2541 2540)
+4(2540 2541 2561 2560)
+4(440 2562 2563 1282)
+4(2562 2583 2584 2563)
+4(2583 2604 2605 2584)
+4(2604 2625 2626 2605)
+4(2625 2646 2647 2626)
+4(2646 2667 2668 2647)
+4(2667 2688 2689 2668)
+4(2688 2709 2710 2689)
+4(2709 2730 2731 2710)
+4(2730 2751 2752 2731)
+4(2751 2772 2773 2752)
+4(2772 2793 2794 2773)
+4(2793 2814 2815 2794)
+4(2814 2835 2836 2815)
+4(2835 2856 2857 2836)
+4(2856 2877 2878 2857)
+4(2877 2898 2899 2878)
+4(2898 2919 2920 2899)
+4(2919 2940 2941 2920)
+4(2940 2961 2962 2941)
+4(1282 2563 2564 1283)
+4(2563 2584 2585 2564)
+4(2584 2605 2606 2585)
+4(2605 2626 2627 2606)
+4(2626 2647 2648 2627)
+4(2647 2668 2669 2648)
+4(2668 2689 2690 2669)
+4(2689 2710 2711 2690)
+4(2710 2731 2732 2711)
+4(2731 2752 2753 2732)
+4(2752 2773 2774 2753)
+4(2773 2794 2795 2774)
+4(2794 2815 2816 2795)
+4(2815 2836 2837 2816)
+4(2836 2857 2858 2837)
+4(2857 2878 2879 2858)
+4(2878 2899 2900 2879)
+4(2899 2920 2921 2900)
+4(2920 2941 2942 2921)
+4(2941 2962 2963 2942)
+4(1283 2564 2565 1284)
+4(2564 2585 2586 2565)
+4(2585 2606 2607 2586)
+4(2606 2627 2628 2607)
+4(2627 2648 2649 2628)
+4(2648 2669 2670 2649)
+4(2669 2690 2691 2670)
+4(2690 2711 2712 2691)
+4(2711 2732 2733 2712)
+4(2732 2753 2754 2733)
+4(2753 2774 2775 2754)
+4(2774 2795 2796 2775)
+4(2795 2816 2817 2796)
+4(2816 2837 2838 2817)
+4(2837 2858 2859 2838)
+4(2858 2879 2880 2859)
+4(2879 2900 2901 2880)
+4(2900 2921 2922 2901)
+4(2921 2942 2943 2922)
+4(2942 2963 2964 2943)
+4(1284 2565 2566 1285)
+4(2565 2586 2587 2566)
+4(2586 2607 2608 2587)
+4(2607 2628 2629 2608)
+4(2628 2649 2650 2629)
+4(2649 2670 2671 2650)
+4(2670 2691 2692 2671)
+4(2691 2712 2713 2692)
+4(2712 2733 2734 2713)
+4(2733 2754 2755 2734)
+4(2754 2775 2776 2755)
+4(2775 2796 2797 2776)
+4(2796 2817 2818 2797)
+4(2817 2838 2839 2818)
+4(2838 2859 2860 2839)
+4(2859 2880 2881 2860)
+4(2880 2901 2902 2881)
+4(2901 2922 2923 2902)
+4(2922 2943 2944 2923)
+4(2943 2964 2965 2944)
+4(1285 2566 2567 1286)
+4(2566 2587 2588 2567)
+4(2587 2608 2609 2588)
+4(2608 2629 2630 2609)
+4(2629 2650 2651 2630)
+4(2650 2671 2672 2651)
+4(2671 2692 2693 2672)
+4(2692 2713 2714 2693)
+4(2713 2734 2735 2714)
+4(2734 2755 2756 2735)
+4(2755 2776 2777 2756)
+4(2776 2797 2798 2777)
+4(2797 2818 2819 2798)
+4(2818 2839 2840 2819)
+4(2839 2860 2861 2840)
+4(2860 2881 2882 2861)
+4(2881 2902 2903 2882)
+4(2902 2923 2924 2903)
+4(2923 2944 2945 2924)
+4(2944 2965 2966 2945)
+4(1286 2567 2568 1287)
+4(2567 2588 2589 2568)
+4(2588 2609 2610 2589)
+4(2609 2630 2631 2610)
+4(2630 2651 2652 2631)
+4(2651 2672 2673 2652)
+4(2672 2693 2694 2673)
+4(2693 2714 2715 2694)
+4(2714 2735 2736 2715)
+4(2735 2756 2757 2736)
+4(2756 2777 2778 2757)
+4(2777 2798 2799 2778)
+4(2798 2819 2820 2799)
+4(2819 2840 2841 2820)
+4(2840 2861 2862 2841)
+4(2861 2882 2883 2862)
+4(2882 2903 2904 2883)
+4(2903 2924 2925 2904)
+4(2924 2945 2946 2925)
+4(2945 2966 2967 2946)
+4(1287 2568 2569 1288)
+4(2568 2589 2590 2569)
+4(2589 2610 2611 2590)
+4(2610 2631 2632 2611)
+4(2631 2652 2653 2632)
+4(2652 2673 2674 2653)
+4(2673 2694 2695 2674)
+4(2694 2715 2716 2695)
+4(2715 2736 2737 2716)
+4(2736 2757 2758 2737)
+4(2757 2778 2779 2758)
+4(2778 2799 2800 2779)
+4(2799 2820 2821 2800)
+4(2820 2841 2842 2821)
+4(2841 2862 2863 2842)
+4(2862 2883 2884 2863)
+4(2883 2904 2905 2884)
+4(2904 2925 2926 2905)
+4(2925 2946 2947 2926)
+4(2946 2967 2968 2947)
+4(1288 2569 2570 1289)
+4(2569 2590 2591 2570)
+4(2590 2611 2612 2591)
+4(2611 2632 2633 2612)
+4(2632 2653 2654 2633)
+4(2653 2674 2675 2654)
+4(2674 2695 2696 2675)
+4(2695 2716 2717 2696)
+4(2716 2737 2738 2717)
+4(2737 2758 2759 2738)
+4(2758 2779 2780 2759)
+4(2779 2800 2801 2780)
+4(2800 2821 2822 2801)
+4(2821 2842 2843 2822)
+4(2842 2863 2864 2843)
+4(2863 2884 2885 2864)
+4(2884 2905 2906 2885)
+4(2905 2926 2927 2906)
+4(2926 2947 2948 2927)
+4(2947 2968 2969 2948)
+4(1289 2570 2571 1290)
+4(2570 2591 2592 2571)
+4(2591 2612 2613 2592)
+4(2612 2633 2634 2613)
+4(2633 2654 2655 2634)
+4(2654 2675 2676 2655)
+4(2675 2696 2697 2676)
+4(2696 2717 2718 2697)
+4(2717 2738 2739 2718)
+4(2738 2759 2760 2739)
+4(2759 2780 2781 2760)
+4(2780 2801 2802 2781)
+4(2801 2822 2823 2802)
+4(2822 2843 2844 2823)
+4(2843 2864 2865 2844)
+4(2864 2885 2886 2865)
+4(2885 2906 2907 2886)
+4(2906 2927 2928 2907)
+4(2927 2948 2949 2928)
+4(2948 2969 2970 2949)
+4(1290 2571 2572 1291)
+4(2571 2592 2593 2572)
+4(2592 2613 2614 2593)
+4(2613 2634 2635 2614)
+4(2634 2655 2656 2635)
+4(2655 2676 2677 2656)
+4(2676 2697 2698 2677)
+4(2697 2718 2719 2698)
+4(2718 2739 2740 2719)
+4(2739 2760 2761 2740)
+4(2760 2781 2782 2761)
+4(2781 2802 2803 2782)
+4(2802 2823 2824 2803)
+4(2823 2844 2845 2824)
+4(2844 2865 2866 2845)
+4(2865 2886 2887 2866)
+4(2886 2907 2908 2887)
+4(2907 2928 2929 2908)
+4(2928 2949 2950 2929)
+4(2949 2970 2971 2950)
+4(1291 2572 2573 1292)
+4(2572 2593 2594 2573)
+4(2593 2614 2615 2594)
+4(2614 2635 2636 2615)
+4(2635 2656 2657 2636)
+4(2656 2677 2678 2657)
+4(2677 2698 2699 2678)
+4(2698 2719 2720 2699)
+4(2719 2740 2741 2720)
+4(2740 2761 2762 2741)
+4(2761 2782 2783 2762)
+4(2782 2803 2804 2783)
+4(2803 2824 2825 2804)
+4(2824 2845 2846 2825)
+4(2845 2866 2867 2846)
+4(2866 2887 2888 2867)
+4(2887 2908 2909 2888)
+4(2908 2929 2930 2909)
+4(2929 2950 2951 2930)
+4(2950 2971 2972 2951)
+4(1292 2573 2574 1293)
+4(2573 2594 2595 2574)
+4(2594 2615 2616 2595)
+4(2615 2636 2637 2616)
+4(2636 2657 2658 2637)
+4(2657 2678 2679 2658)
+4(2678 2699 2700 2679)
+4(2699 2720 2721 2700)
+4(2720 2741 2742 2721)
+4(2741 2762 2763 2742)
+4(2762 2783 2784 2763)
+4(2783 2804 2805 2784)
+4(2804 2825 2826 2805)
+4(2825 2846 2847 2826)
+4(2846 2867 2868 2847)
+4(2867 2888 2889 2868)
+4(2888 2909 2910 2889)
+4(2909 2930 2931 2910)
+4(2930 2951 2952 2931)
+4(2951 2972 2973 2952)
+4(1293 2574 2575 1294)
+4(2574 2595 2596 2575)
+4(2595 2616 2617 2596)
+4(2616 2637 2638 2617)
+4(2637 2658 2659 2638)
+4(2658 2679 2680 2659)
+4(2679 2700 2701 2680)
+4(2700 2721 2722 2701)
+4(2721 2742 2743 2722)
+4(2742 2763 2764 2743)
+4(2763 2784 2785 2764)
+4(2784 2805 2806 2785)
+4(2805 2826 2827 2806)
+4(2826 2847 2848 2827)
+4(2847 2868 2869 2848)
+4(2868 2889 2890 2869)
+4(2889 2910 2911 2890)
+4(2910 2931 2932 2911)
+4(2931 2952 2953 2932)
+4(2952 2973 2974 2953)
+4(1294 2575 2576 1295)
+4(2575 2596 2597 2576)
+4(2596 2617 2618 2597)
+4(2617 2638 2639 2618)
+4(2638 2659 2660 2639)
+4(2659 2680 2681 2660)
+4(2680 2701 2702 2681)
+4(2701 2722 2723 2702)
+4(2722 2743 2744 2723)
+4(2743 2764 2765 2744)
+4(2764 2785 2786 2765)
+4(2785 2806 2807 2786)
+4(2806 2827 2828 2807)
+4(2827 2848 2849 2828)
+4(2848 2869 2870 2849)
+4(2869 2890 2891 2870)
+4(2890 2911 2912 2891)
+4(2911 2932 2933 2912)
+4(2932 2953 2954 2933)
+4(2953 2974 2975 2954)
+4(1295 2576 2577 1296)
+4(2576 2597 2598 2577)
+4(2597 2618 2619 2598)
+4(2618 2639 2640 2619)
+4(2639 2660 2661 2640)
+4(2660 2681 2682 2661)
+4(2681 2702 2703 2682)
+4(2702 2723 2724 2703)
+4(2723 2744 2745 2724)
+4(2744 2765 2766 2745)
+4(2765 2786 2787 2766)
+4(2786 2807 2808 2787)
+4(2807 2828 2829 2808)
+4(2828 2849 2850 2829)
+4(2849 2870 2871 2850)
+4(2870 2891 2892 2871)
+4(2891 2912 2913 2892)
+4(2912 2933 2934 2913)
+4(2933 2954 2955 2934)
+4(2954 2975 2976 2955)
+4(1296 2577 2578 1297)
+4(2577 2598 2599 2578)
+4(2598 2619 2620 2599)
+4(2619 2640 2641 2620)
+4(2640 2661 2662 2641)
+4(2661 2682 2683 2662)
+4(2682 2703 2704 2683)
+4(2703 2724 2725 2704)
+4(2724 2745 2746 2725)
+4(2745 2766 2767 2746)
+4(2766 2787 2788 2767)
+4(2787 2808 2809 2788)
+4(2808 2829 2830 2809)
+4(2829 2850 2851 2830)
+4(2850 2871 2872 2851)
+4(2871 2892 2893 2872)
+4(2892 2913 2914 2893)
+4(2913 2934 2935 2914)
+4(2934 2955 2956 2935)
+4(2955 2976 2977 2956)
+4(1297 2578 2579 1298)
+4(2578 2599 2600 2579)
+4(2599 2620 2621 2600)
+4(2620 2641 2642 2621)
+4(2641 2662 2663 2642)
+4(2662 2683 2684 2663)
+4(2683 2704 2705 2684)
+4(2704 2725 2726 2705)
+4(2725 2746 2747 2726)
+4(2746 2767 2768 2747)
+4(2767 2788 2789 2768)
+4(2788 2809 2810 2789)
+4(2809 2830 2831 2810)
+4(2830 2851 2852 2831)
+4(2851 2872 2873 2852)
+4(2872 2893 2894 2873)
+4(2893 2914 2915 2894)
+4(2914 2935 2936 2915)
+4(2935 2956 2957 2936)
+4(2956 2977 2978 2957)
+4(1298 2579 2580 1299)
+4(2579 2600 2601 2580)
+4(2600 2621 2622 2601)
+4(2621 2642 2643 2622)
+4(2642 2663 2664 2643)
+4(2663 2684 2685 2664)
+4(2684 2705 2706 2685)
+4(2705 2726 2727 2706)
+4(2726 2747 2748 2727)
+4(2747 2768 2769 2748)
+4(2768 2789 2790 2769)
+4(2789 2810 2811 2790)
+4(2810 2831 2832 2811)
+4(2831 2852 2853 2832)
+4(2852 2873 2874 2853)
+4(2873 2894 2895 2874)
+4(2894 2915 2916 2895)
+4(2915 2936 2937 2916)
+4(2936 2957 2958 2937)
+4(2957 2978 2979 2958)
+4(1299 2580 2581 1300)
+4(2580 2601 2602 2581)
+4(2601 2622 2623 2602)
+4(2622 2643 2644 2623)
+4(2643 2664 2665 2644)
+4(2664 2685 2686 2665)
+4(2685 2706 2707 2686)
+4(2706 2727 2728 2707)
+4(2727 2748 2749 2728)
+4(2748 2769 2770 2749)
+4(2769 2790 2791 2770)
+4(2790 2811 2812 2791)
+4(2811 2832 2833 2812)
+4(2832 2853 2854 2833)
+4(2853 2874 2875 2854)
+4(2874 2895 2896 2875)
+4(2895 2916 2917 2896)
+4(2916 2937 2938 2917)
+4(2937 2958 2959 2938)
+4(2958 2979 2980 2959)
+4(1300 2581 2582 1301)
+4(2581 2602 2603 2582)
+4(2602 2623 2624 2603)
+4(2623 2644 2645 2624)
+4(2644 2665 2666 2645)
+4(2665 2686 2687 2666)
+4(2686 2707 2708 2687)
+4(2707 2728 2729 2708)
+4(2728 2749 2750 2729)
+4(2749 2770 2771 2750)
+4(2770 2791 2792 2771)
+4(2791 2812 2813 2792)
+4(2812 2833 2834 2813)
+4(2833 2854 2855 2834)
+4(2854 2875 2876 2855)
+4(2875 2896 2897 2876)
+4(2896 2917 2918 2897)
+4(2917 2938 2939 2918)
+4(2938 2959 2960 2939)
+4(2959 2980 2981 2960)
+4(881 1702 2983 2982)
+4(2982 2983 3004 3003)
+4(3003 3004 3025 3024)
+4(3024 3025 3046 3045)
+4(3045 3046 3067 3066)
+4(3066 3067 3088 3087)
+4(3087 3088 3109 3108)
+4(3108 3109 3130 3129)
+4(3129 3130 3151 3150)
+4(3150 3151 3172 3171)
+4(3171 3172 3193 3192)
+4(3192 3193 3214 3213)
+4(3213 3214 3235 3234)
+4(3234 3235 3256 3255)
+4(3255 3256 3277 3276)
+4(3276 3277 3298 3297)
+4(3297 3298 3319 3318)
+4(3318 3319 3340 3339)
+4(3339 3340 3361 3360)
+4(3360 3361 3382 3381)
+4(1702 1703 2984 2983)
+4(2983 2984 3005 3004)
+4(3004 3005 3026 3025)
+4(3025 3026 3047 3046)
+4(3046 3047 3068 3067)
+4(3067 3068 3089 3088)
+4(3088 3089 3110 3109)
+4(3109 3110 3131 3130)
+4(3130 3131 3152 3151)
+4(3151 3152 3173 3172)
+4(3172 3173 3194 3193)
+4(3193 3194 3215 3214)
+4(3214 3215 3236 3235)
+4(3235 3236 3257 3256)
+4(3256 3257 3278 3277)
+4(3277 3278 3299 3298)
+4(3298 3299 3320 3319)
+4(3319 3320 3341 3340)
+4(3340 3341 3362 3361)
+4(3361 3362 3383 3382)
+4(1703 1704 2985 2984)
+4(2984 2985 3006 3005)
+4(3005 3006 3027 3026)
+4(3026 3027 3048 3047)
+4(3047 3048 3069 3068)
+4(3068 3069 3090 3089)
+4(3089 3090 3111 3110)
+4(3110 3111 3132 3131)
+4(3131 3132 3153 3152)
+4(3152 3153 3174 3173)
+4(3173 3174 3195 3194)
+4(3194 3195 3216 3215)
+4(3215 3216 3237 3236)
+4(3236 3237 3258 3257)
+4(3257 3258 3279 3278)
+4(3278 3279 3300 3299)
+4(3299 3300 3321 3320)
+4(3320 3321 3342 3341)
+4(3341 3342 3363 3362)
+4(3362 3363 3384 3383)
+4(1704 1705 2986 2985)
+4(2985 2986 3007 3006)
+4(3006 3007 3028 3027)
+4(3027 3028 3049 3048)
+4(3048 3049 3070 3069)
+4(3069 3070 3091 3090)
+4(3090 3091 3112 3111)
+4(3111 3112 3133 3132)
+4(3132 3133 3154 3153)
+4(3153 3154 3175 3174)
+4(3174 3175 3196 3195)
+4(3195 3196 3217 3216)
+4(3216 3217 3238 3237)
+4(3237 3238 3259 3258)
+4(3258 3259 3280 3279)
+4(3279 3280 3301 3300)
+4(3300 3301 3322 3321)
+4(3321 3322 3343 3342)
+4(3342 3343 3364 3363)
+4(3363 3364 3385 3384)
+4(1705 1706 2987 2986)
+4(2986 2987 3008 3007)
+4(3007 3008 3029 3028)
+4(3028 3029 3050 3049)
+4(3049 3050 3071 3070)
+4(3070 3071 3092 3091)
+4(3091 3092 3113 3112)
+4(3112 3113 3134 3133)
+4(3133 3134 3155 3154)
+4(3154 3155 3176 3175)
+4(3175 3176 3197 3196)
+4(3196 3197 3218 3217)
+4(3217 3218 3239 3238)
+4(3238 3239 3260 3259)
+4(3259 3260 3281 3280)
+4(3280 3281 3302 3301)
+4(3301 3302 3323 3322)
+4(3322 3323 3344 3343)
+4(3343 3344 3365 3364)
+4(3364 3365 3386 3385)
+4(1706 1707 2988 2987)
+4(2987 2988 3009 3008)
+4(3008 3009 3030 3029)
+4(3029 3030 3051 3050)
+4(3050 3051 3072 3071)
+4(3071 3072 3093 3092)
+4(3092 3093 3114 3113)
+4(3113 3114 3135 3134)
+4(3134 3135 3156 3155)
+4(3155 3156 3177 3176)
+4(3176 3177 3198 3197)
+4(3197 3198 3219 3218)
+4(3218 3219 3240 3239)
+4(3239 3240 3261 3260)
+4(3260 3261 3282 3281)
+4(3281 3282 3303 3302)
+4(3302 3303 3324 3323)
+4(3323 3324 3345 3344)
+4(3344 3345 3366 3365)
+4(3365 3366 3387 3386)
+4(1707 1708 2989 2988)
+4(2988 2989 3010 3009)
+4(3009 3010 3031 3030)
+4(3030 3031 3052 3051)
+4(3051 3052 3073 3072)
+4(3072 3073 3094 3093)
+4(3093 3094 3115 3114)
+4(3114 3115 3136 3135)
+4(3135 3136 3157 3156)
+4(3156 3157 3178 3177)
+4(3177 3178 3199 3198)
+4(3198 3199 3220 3219)
+4(3219 3220 3241 3240)
+4(3240 3241 3262 3261)
+4(3261 3262 3283 3282)
+4(3282 3283 3304 3303)
+4(3303 3304 3325 3324)
+4(3324 3325 3346 3345)
+4(3345 3346 3367 3366)
+4(3366 3367 3388 3387)
+4(1708 1709 2990 2989)
+4(2989 2990 3011 3010)
+4(3010 3011 3032 3031)
+4(3031 3032 3053 3052)
+4(3052 3053 3074 3073)
+4(3073 3074 3095 3094)
+4(3094 3095 3116 3115)
+4(3115 3116 3137 3136)
+4(3136 3137 3158 3157)
+4(3157 3158 3179 3178)
+4(3178 3179 3200 3199)
+4(3199 3200 3221 3220)
+4(3220 3221 3242 3241)
+4(3241 3242 3263 3262)
+4(3262 3263 3284 3283)
+4(3283 3284 3305 3304)
+4(3304 3305 3326 3325)
+4(3325 3326 3347 3346)
+4(3346 3347 3368 3367)
+4(3367 3368 3389 3388)
+4(1709 1710 2991 2990)
+4(2990 2991 3012 3011)
+4(3011 3012 3033 3032)
+4(3032 3033 3054 3053)
+4(3053 3054 3075 3074)
+4(3074 3075 3096 3095)
+4(3095 3096 3117 3116)
+4(3116 3117 3138 3137)
+4(3137 3138 3159 3158)
+4(3158 3159 3180 3179)
+4(3179 3180 3201 3200)
+4(3200 3201 3222 3221)
+4(3221 3222 3243 3242)
+4(3242 3243 3264 3263)
+4(3263 3264 3285 3284)
+4(3284 3285 3306 3305)
+4(3305 3306 3327 3326)
+4(3326 3327 3348 3347)
+4(3347 3348 3369 3368)
+4(3368 3369 3390 3389)
+4(1710 1711 2992 2991)
+4(2991 2992 3013 3012)
+4(3012 3013 3034 3033)
+4(3033 3034 3055 3054)
+4(3054 3055 3076 3075)
+4(3075 3076 3097 3096)
+4(3096 3097 3118 3117)
+4(3117 3118 3139 3138)
+4(3138 3139 3160 3159)
+4(3159 3160 3181 3180)
+4(3180 3181 3202 3201)
+4(3201 3202 3223 3222)
+4(3222 3223 3244 3243)
+4(3243 3244 3265 3264)
+4(3264 3265 3286 3285)
+4(3285 3286 3307 3306)
+4(3306 3307 3328 3327)
+4(3327 3328 3349 3348)
+4(3348 3349 3370 3369)
+4(3369 3370 3391 3390)
+4(1711 1712 2993 2992)
+4(2992 2993 3014 3013)
+4(3013 3014 3035 3034)
+4(3034 3035 3056 3055)
+4(3055 3056 3077 3076)
+4(3076 3077 3098 3097)
+4(3097 3098 3119 3118)
+4(3118 3119 3140 3139)
+4(3139 3140 3161 3160)
+4(3160 3161 3182 3181)
+4(3181 3182 3203 3202)
+4(3202 3203 3224 3223)
+4(3223 3224 3245 3244)
+4(3244 3245 3266 3265)
+4(3265 3266 3287 3286)
+4(3286 3287 3308 3307)
+4(3307 3308 3329 3328)
+4(3328 3329 3350 3349)
+4(3349 3350 3371 3370)
+4(3370 3371 3392 3391)
+4(1712 1713 2994 2993)
+4(2993 2994 3015 3014)
+4(3014 3015 3036 3035)
+4(3035 3036 3057 3056)
+4(3056 3057 3078 3077)
+4(3077 3078 3099 3098)
+4(3098 3099 3120 3119)
+4(3119 3120 3141 3140)
+4(3140 3141 3162 3161)
+4(3161 3162 3183 3182)
+4(3182 3183 3204 3203)
+4(3203 3204 3225 3224)
+4(3224 3225 3246 3245)
+4(3245 3246 3267 3266)
+4(3266 3267 3288 3287)
+4(3287 3288 3309 3308)
+4(3308 3309 3330 3329)
+4(3329 3330 3351 3350)
+4(3350 3351 3372 3371)
+4(3371 3372 3393 3392)
+4(1713 1714 2995 2994)
+4(2994 2995 3016 3015)
+4(3015 3016 3037 3036)
+4(3036 3037 3058 3057)
+4(3057 3058 3079 3078)
+4(3078 3079 3100 3099)
+4(3099 3100 3121 3120)
+4(3120 3121 3142 3141)
+4(3141 3142 3163 3162)
+4(3162 3163 3184 3183)
+4(3183 3184 3205 3204)
+4(3204 3205 3226 3225)
+4(3225 3226 3247 3246)
+4(3246 3247 3268 3267)
+4(3267 3268 3289 3288)
+4(3288 3289 3310 3309)
+4(3309 3310 3331 3330)
+4(3330 3331 3352 3351)
+4(3351 3352 3373 3372)
+4(3372 3373 3394 3393)
+4(1714 1715 2996 2995)
+4(2995 2996 3017 3016)
+4(3016 3017 3038 3037)
+4(3037 3038 3059 3058)
+4(3058 3059 3080 3079)
+4(3079 3080 3101 3100)
+4(3100 3101 3122 3121)
+4(3121 3122 3143 3142)
+4(3142 3143 3164 3163)
+4(3163 3164 3185 3184)
+4(3184 3185 3206 3205)
+4(3205 3206 3227 3226)
+4(3226 3227 3248 3247)
+4(3247 3248 3269 3268)
+4(3268 3269 3290 3289)
+4(3289 3290 3311 3310)
+4(3310 3311 3332 3331)
+4(3331 3332 3353 3352)
+4(3352 3353 3374 3373)
+4(3373 3374 3395 3394)
+4(1715 1716 2997 2996)
+4(2996 2997 3018 3017)
+4(3017 3018 3039 3038)
+4(3038 3039 3060 3059)
+4(3059 3060 3081 3080)
+4(3080 3081 3102 3101)
+4(3101 3102 3123 3122)
+4(3122 3123 3144 3143)
+4(3143 3144 3165 3164)
+4(3164 3165 3186 3185)
+4(3185 3186 3207 3206)
+4(3206 3207 3228 3227)
+4(3227 3228 3249 3248)
+4(3248 3249 3270 3269)
+4(3269 3270 3291 3290)
+4(3290 3291 3312 3311)
+4(3311 3312 3333 3332)
+4(3332 3333 3354 3353)
+4(3353 3354 3375 3374)
+4(3374 3375 3396 3395)
+4(1716 1717 2998 2997)
+4(2997 2998 3019 3018)
+4(3018 3019 3040 3039)
+4(3039 3040 3061 3060)
+4(3060 3061 3082 3081)
+4(3081 3082 3103 3102)
+4(3102 3103 3124 3123)
+4(3123 3124 3145 3144)
+4(3144 3145 3166 3165)
+4(3165 3166 3187 3186)
+4(3186 3187 3208 3207)
+4(3207 3208 3229 3228)
+4(3228 3229 3250 3249)
+4(3249 3250 3271 3270)
+4(3270 3271 3292 3291)
+4(3291 3292 3313 3312)
+4(3312 3313 3334 3333)
+4(3333 3334 3355 3354)
+4(3354 3355 3376 3375)
+4(3375 3376 3397 3396)
+4(1717 1718 2999 2998)
+4(2998 2999 3020 3019)
+4(3019 3020 3041 3040)
+4(3040 3041 3062 3061)
+4(3061 3062 3083 3082)
+4(3082 3083 3104 3103)
+4(3103 3104 3125 3124)
+4(3124 3125 3146 3145)
+4(3145 3146 3167 3166)
+4(3166 3167 3188 3187)
+4(3187 3188 3209 3208)
+4(3208 3209 3230 3229)
+4(3229 3230 3251 3250)
+4(3250 3251 3272 3271)
+4(3271 3272 3293 3292)
+4(3292 3293 3314 3313)
+4(3313 3314 3335 3334)
+4(3334 3335 3356 3355)
+4(3355 3356 3377 3376)
+4(3376 3377 3398 3397)
+4(1718 1719 3000 2999)
+4(2999 3000 3021 3020)
+4(3020 3021 3042 3041)
+4(3041 3042 3063 3062)
+4(3062 3063 3084 3083)
+4(3083 3084 3105 3104)
+4(3104 3105 3126 3125)
+4(3125 3126 3147 3146)
+4(3146 3147 3168 3167)
+4(3167 3168 3189 3188)
+4(3188 3189 3210 3209)
+4(3209 3210 3231 3230)
+4(3230 3231 3252 3251)
+4(3251 3252 3273 3272)
+4(3272 3273 3294 3293)
+4(3293 3294 3315 3314)
+4(3314 3315 3336 3335)
+4(3335 3336 3357 3356)
+4(3356 3357 3378 3377)
+4(3377 3378 3399 3398)
+4(1719 1720 3001 3000)
+4(3000 3001 3022 3021)
+4(3021 3022 3043 3042)
+4(3042 3043 3064 3063)
+4(3063 3064 3085 3084)
+4(3084 3085 3106 3105)
+4(3105 3106 3127 3126)
+4(3126 3127 3148 3147)
+4(3147 3148 3169 3168)
+4(3168 3169 3190 3189)
+4(3189 3190 3211 3210)
+4(3210 3211 3232 3231)
+4(3231 3232 3253 3252)
+4(3252 3253 3274 3273)
+4(3273 3274 3295 3294)
+4(3294 3295 3316 3315)
+4(3315 3316 3337 3336)
+4(3336 3337 3358 3357)
+4(3357 3358 3379 3378)
+4(3378 3379 3400 3399)
+4(1720 1721 3002 3001)
+4(3001 3002 3023 3022)
+4(3022 3023 3044 3043)
+4(3043 3044 3065 3064)
+4(3064 3065 3086 3085)
+4(3085 3086 3107 3106)
+4(3106 3107 3128 3127)
+4(3127 3128 3149 3148)
+4(3148 3149 3170 3169)
+4(3169 3170 3191 3190)
+4(3190 3191 3212 3211)
+4(3211 3212 3233 3232)
+4(3232 3233 3254 3253)
+4(3253 3254 3275 3274)
+4(3274 3275 3296 3295)
+4(3295 3296 3317 3316)
+4(3316 3317 3338 3337)
+4(3337 3338 3359 3358)
+4(3358 3359 3380 3379)
+4(3379 3380 3401 3400)
+)
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/neighbour b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/neighbour
new file mode 100644
index 000000000..04ecd91c9
--- /dev/null
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/neighbour
@@ -0,0 +1,3125 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | foam-extend: Open Source CFD                    |
+|  \\    /   O peration     | Version:  3.0                                   |
+|   \\  /    A nd           | Web:         http://www.extend-project.de       |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       labelList;
+    note        "nPoints: 3402 nCells: 1600 nFaces: 6500 nInternalFaces: 3100";
+    location    "constant/polyMesh";
+    object      neighbour;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+3100
+(
+1
+20
+2
+21
+3
+22
+4
+23
+5
+24
+6
+25
+7
+26
+8
+27
+9
+28
+10
+29
+11
+30
+12
+31
+13
+32
+14
+33
+15
+34
+16
+35
+17
+36
+18
+37
+19
+38
+39
+400
+21
+40
+22
+41
+23
+42
+24
+43
+25
+44
+26
+45
+27
+46
+28
+47
+29
+48
+30
+49
+31
+50
+32
+51
+33
+52
+34
+53
+35
+54
+36
+55
+37
+56
+38
+57
+39
+58
+59
+420
+41
+60
+42
+61
+43
+62
+44
+63
+45
+64
+46
+65
+47
+66
+48
+67
+49
+68
+50
+69
+51
+70
+52
+71
+53
+72
+54
+73
+55
+74
+56
+75
+57
+76
+58
+77
+59
+78
+79
+440
+61
+80
+62
+81
+63
+82
+64
+83
+65
+84
+66
+85
+67
+86
+68
+87
+69
+88
+70
+89
+71
+90
+72
+91
+73
+92
+74
+93
+75
+94
+76
+95
+77
+96
+78
+97
+79
+98
+99
+460
+81
+100
+82
+101
+83
+102
+84
+103
+85
+104
+86
+105
+87
+106
+88
+107
+89
+108
+90
+109
+91
+110
+92
+111
+93
+112
+94
+113
+95
+114
+96
+115
+97
+116
+98
+117
+99
+118
+119
+480
+101
+120
+102
+121
+103
+122
+104
+123
+105
+124
+106
+125
+107
+126
+108
+127
+109
+128
+110
+129
+111
+130
+112
+131
+113
+132
+114
+133
+115
+134
+116
+135
+117
+136
+118
+137
+119
+138
+139
+500
+121
+140
+122
+141
+123
+142
+124
+143
+125
+144
+126
+145
+127
+146
+128
+147
+129
+148
+130
+149
+131
+150
+132
+151
+133
+152
+134
+153
+135
+154
+136
+155
+137
+156
+138
+157
+139
+158
+159
+520
+141
+160
+142
+161
+143
+162
+144
+163
+145
+164
+146
+165
+147
+166
+148
+167
+149
+168
+150
+169
+151
+170
+152
+171
+153
+172
+154
+173
+155
+174
+156
+175
+157
+176
+158
+177
+159
+178
+179
+540
+161
+180
+162
+181
+163
+182
+164
+183
+165
+184
+166
+185
+167
+186
+168
+187
+169
+188
+170
+189
+171
+190
+172
+191
+173
+192
+174
+193
+175
+194
+176
+195
+177
+196
+178
+197
+179
+198
+199
+560
+181
+200
+182
+201
+183
+202
+184
+203
+185
+204
+186
+205
+187
+206
+188
+207
+189
+208
+190
+209
+191
+210
+192
+211
+193
+212
+194
+213
+195
+214
+196
+215
+197
+216
+198
+217
+199
+218
+219
+580
+201
+220
+202
+221
+203
+222
+204
+223
+205
+224
+206
+225
+207
+226
+208
+227
+209
+228
+210
+229
+211
+230
+212
+231
+213
+232
+214
+233
+215
+234
+216
+235
+217
+236
+218
+237
+219
+238
+239
+600
+221
+240
+222
+241
+223
+242
+224
+243
+225
+244
+226
+245
+227
+246
+228
+247
+229
+248
+230
+249
+231
+250
+232
+251
+233
+252
+234
+253
+235
+254
+236
+255
+237
+256
+238
+257
+239
+258
+259
+620
+241
+260
+242
+261
+243
+262
+244
+263
+245
+264
+246
+265
+247
+266
+248
+267
+249
+268
+250
+269
+251
+270
+252
+271
+253
+272
+254
+273
+255
+274
+256
+275
+257
+276
+258
+277
+259
+278
+279
+640
+261
+280
+262
+281
+263
+282
+264
+283
+265
+284
+266
+285
+267
+286
+268
+287
+269
+288
+270
+289
+271
+290
+272
+291
+273
+292
+274
+293
+275
+294
+276
+295
+277
+296
+278
+297
+279
+298
+299
+660
+281
+300
+282
+301
+283
+302
+284
+303
+285
+304
+286
+305
+287
+306
+288
+307
+289
+308
+290
+309
+291
+310
+292
+311
+293
+312
+294
+313
+295
+314
+296
+315
+297
+316
+298
+317
+299
+318
+319
+680
+301
+320
+302
+321
+303
+322
+304
+323
+305
+324
+306
+325
+307
+326
+308
+327
+309
+328
+310
+329
+311
+330
+312
+331
+313
+332
+314
+333
+315
+334
+316
+335
+317
+336
+318
+337
+319
+338
+339
+700
+321
+340
+322
+341
+323
+342
+324
+343
+325
+344
+326
+345
+327
+346
+328
+347
+329
+348
+330
+349
+331
+350
+332
+351
+333
+352
+334
+353
+335
+354
+336
+355
+337
+356
+338
+357
+339
+358
+359
+720
+341
+360
+342
+361
+343
+362
+344
+363
+345
+364
+346
+365
+347
+366
+348
+367
+349
+368
+350
+369
+351
+370
+352
+371
+353
+372
+354
+373
+355
+374
+356
+375
+357
+376
+358
+377
+359
+378
+379
+740
+361
+380
+362
+381
+363
+382
+364
+383
+365
+384
+366
+385
+367
+386
+368
+387
+369
+388
+370
+389
+371
+390
+372
+391
+373
+392
+374
+393
+375
+394
+376
+395
+377
+396
+378
+397
+379
+398
+399
+760
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+780
+401
+420
+402
+421
+403
+422
+404
+423
+405
+424
+406
+425
+407
+426
+408
+427
+409
+428
+410
+429
+411
+430
+412
+431
+413
+432
+414
+433
+415
+434
+416
+435
+417
+436
+418
+437
+419
+438
+439
+800
+421
+440
+422
+441
+423
+442
+424
+443
+425
+444
+426
+445
+427
+446
+428
+447
+429
+448
+430
+449
+431
+450
+432
+451
+433
+452
+434
+453
+435
+454
+436
+455
+437
+456
+438
+457
+439
+458
+459
+820
+441
+460
+442
+461
+443
+462
+444
+463
+445
+464
+446
+465
+447
+466
+448
+467
+449
+468
+450
+469
+451
+470
+452
+471
+453
+472
+454
+473
+455
+474
+456
+475
+457
+476
+458
+477
+459
+478
+479
+840
+461
+480
+462
+481
+463
+482
+464
+483
+465
+484
+466
+485
+467
+486
+468
+487
+469
+488
+470
+489
+471
+490
+472
+491
+473
+492
+474
+493
+475
+494
+476
+495
+477
+496
+478
+497
+479
+498
+499
+860
+481
+500
+482
+501
+483
+502
+484
+503
+485
+504
+486
+505
+487
+506
+488
+507
+489
+508
+490
+509
+491
+510
+492
+511
+493
+512
+494
+513
+495
+514
+496
+515
+497
+516
+498
+517
+499
+518
+519
+880
+501
+520
+502
+521
+503
+522
+504
+523
+505
+524
+506
+525
+507
+526
+508
+527
+509
+528
+510
+529
+511
+530
+512
+531
+513
+532
+514
+533
+515
+534
+516
+535
+517
+536
+518
+537
+519
+538
+539
+900
+521
+540
+522
+541
+523
+542
+524
+543
+525
+544
+526
+545
+527
+546
+528
+547
+529
+548
+530
+549
+531
+550
+532
+551
+533
+552
+534
+553
+535
+554
+536
+555
+537
+556
+538
+557
+539
+558
+559
+920
+541
+560
+542
+561
+543
+562
+544
+563
+545
+564
+546
+565
+547
+566
+548
+567
+549
+568
+550
+569
+551
+570
+552
+571
+553
+572
+554
+573
+555
+574
+556
+575
+557
+576
+558
+577
+559
+578
+579
+940
+561
+580
+562
+581
+563
+582
+564
+583
+565
+584
+566
+585
+567
+586
+568
+587
+569
+588
+570
+589
+571
+590
+572
+591
+573
+592
+574
+593
+575
+594
+576
+595
+577
+596
+578
+597
+579
+598
+599
+960
+581
+600
+582
+601
+583
+602
+584
+603
+585
+604
+586
+605
+587
+606
+588
+607
+589
+608
+590
+609
+591
+610
+592
+611
+593
+612
+594
+613
+595
+614
+596
+615
+597
+616
+598
+617
+599
+618
+619
+980
+601
+620
+602
+621
+603
+622
+604
+623
+605
+624
+606
+625
+607
+626
+608
+627
+609
+628
+610
+629
+611
+630
+612
+631
+613
+632
+614
+633
+615
+634
+616
+635
+617
+636
+618
+637
+619
+638
+639
+1000
+621
+640
+622
+641
+623
+642
+624
+643
+625
+644
+626
+645
+627
+646
+628
+647
+629
+648
+630
+649
+631
+650
+632
+651
+633
+652
+634
+653
+635
+654
+636
+655
+637
+656
+638
+657
+639
+658
+659
+1020
+641
+660
+642
+661
+643
+662
+644
+663
+645
+664
+646
+665
+647
+666
+648
+667
+649
+668
+650
+669
+651
+670
+652
+671
+653
+672
+654
+673
+655
+674
+656
+675
+657
+676
+658
+677
+659
+678
+679
+1040
+661
+680
+662
+681
+663
+682
+664
+683
+665
+684
+666
+685
+667
+686
+668
+687
+669
+688
+670
+689
+671
+690
+672
+691
+673
+692
+674
+693
+675
+694
+676
+695
+677
+696
+678
+697
+679
+698
+699
+1060
+681
+700
+682
+701
+683
+702
+684
+703
+685
+704
+686
+705
+687
+706
+688
+707
+689
+708
+690
+709
+691
+710
+692
+711
+693
+712
+694
+713
+695
+714
+696
+715
+697
+716
+698
+717
+699
+718
+719
+1080
+701
+720
+702
+721
+703
+722
+704
+723
+705
+724
+706
+725
+707
+726
+708
+727
+709
+728
+710
+729
+711
+730
+712
+731
+713
+732
+714
+733
+715
+734
+716
+735
+717
+736
+718
+737
+719
+738
+739
+1100
+721
+740
+722
+741
+723
+742
+724
+743
+725
+744
+726
+745
+727
+746
+728
+747
+729
+748
+730
+749
+731
+750
+732
+751
+733
+752
+734
+753
+735
+754
+736
+755
+737
+756
+738
+757
+739
+758
+759
+1120
+741
+760
+742
+761
+743
+762
+744
+763
+745
+764
+746
+765
+747
+766
+748
+767
+749
+768
+750
+769
+751
+770
+752
+771
+753
+772
+754
+773
+755
+774
+756
+775
+757
+776
+758
+777
+759
+778
+779
+1140
+761
+780
+762
+781
+763
+782
+764
+783
+765
+784
+766
+785
+767
+786
+768
+787
+769
+788
+770
+789
+771
+790
+772
+791
+773
+792
+774
+793
+775
+794
+776
+795
+777
+796
+778
+797
+779
+798
+799
+1160
+781
+1200
+782
+1201
+783
+1202
+784
+1203
+785
+1204
+786
+1205
+787
+1206
+788
+1207
+789
+1208
+790
+1209
+791
+1210
+792
+1211
+793
+1212
+794
+1213
+795
+1214
+796
+1215
+797
+1216
+798
+1217
+799
+1218
+1180
+1219
+801
+820
+802
+821
+803
+822
+804
+823
+805
+824
+806
+825
+807
+826
+808
+827
+809
+828
+810
+829
+811
+830
+812
+831
+813
+832
+814
+833
+815
+834
+816
+835
+817
+836
+818
+837
+819
+838
+839
+821
+840
+822
+841
+823
+842
+824
+843
+825
+844
+826
+845
+827
+846
+828
+847
+829
+848
+830
+849
+831
+850
+832
+851
+833
+852
+834
+853
+835
+854
+836
+855
+837
+856
+838
+857
+839
+858
+859
+841
+860
+842
+861
+843
+862
+844
+863
+845
+864
+846
+865
+847
+866
+848
+867
+849
+868
+850
+869
+851
+870
+852
+871
+853
+872
+854
+873
+855
+874
+856
+875
+857
+876
+858
+877
+859
+878
+879
+861
+880
+862
+881
+863
+882
+864
+883
+865
+884
+866
+885
+867
+886
+868
+887
+869
+888
+870
+889
+871
+890
+872
+891
+873
+892
+874
+893
+875
+894
+876
+895
+877
+896
+878
+897
+879
+898
+899
+881
+900
+882
+901
+883
+902
+884
+903
+885
+904
+886
+905
+887
+906
+888
+907
+889
+908
+890
+909
+891
+910
+892
+911
+893
+912
+894
+913
+895
+914
+896
+915
+897
+916
+898
+917
+899
+918
+919
+901
+920
+902
+921
+903
+922
+904
+923
+905
+924
+906
+925
+907
+926
+908
+927
+909
+928
+910
+929
+911
+930
+912
+931
+913
+932
+914
+933
+915
+934
+916
+935
+917
+936
+918
+937
+919
+938
+939
+921
+940
+922
+941
+923
+942
+924
+943
+925
+944
+926
+945
+927
+946
+928
+947
+929
+948
+930
+949
+931
+950
+932
+951
+933
+952
+934
+953
+935
+954
+936
+955
+937
+956
+938
+957
+939
+958
+959
+941
+960
+942
+961
+943
+962
+944
+963
+945
+964
+946
+965
+947
+966
+948
+967
+949
+968
+950
+969
+951
+970
+952
+971
+953
+972
+954
+973
+955
+974
+956
+975
+957
+976
+958
+977
+959
+978
+979
+961
+980
+962
+981
+963
+982
+964
+983
+965
+984
+966
+985
+967
+986
+968
+987
+969
+988
+970
+989
+971
+990
+972
+991
+973
+992
+974
+993
+975
+994
+976
+995
+977
+996
+978
+997
+979
+998
+999
+981
+1000
+982
+1001
+983
+1002
+984
+1003
+985
+1004
+986
+1005
+987
+1006
+988
+1007
+989
+1008
+990
+1009
+991
+1010
+992
+1011
+993
+1012
+994
+1013
+995
+1014
+996
+1015
+997
+1016
+998
+1017
+999
+1018
+1019
+1001
+1020
+1002
+1021
+1003
+1022
+1004
+1023
+1005
+1024
+1006
+1025
+1007
+1026
+1008
+1027
+1009
+1028
+1010
+1029
+1011
+1030
+1012
+1031
+1013
+1032
+1014
+1033
+1015
+1034
+1016
+1035
+1017
+1036
+1018
+1037
+1019
+1038
+1039
+1021
+1040
+1022
+1041
+1023
+1042
+1024
+1043
+1025
+1044
+1026
+1045
+1027
+1046
+1028
+1047
+1029
+1048
+1030
+1049
+1031
+1050
+1032
+1051
+1033
+1052
+1034
+1053
+1035
+1054
+1036
+1055
+1037
+1056
+1038
+1057
+1039
+1058
+1059
+1041
+1060
+1042
+1061
+1043
+1062
+1044
+1063
+1045
+1064
+1046
+1065
+1047
+1066
+1048
+1067
+1049
+1068
+1050
+1069
+1051
+1070
+1052
+1071
+1053
+1072
+1054
+1073
+1055
+1074
+1056
+1075
+1057
+1076
+1058
+1077
+1059
+1078
+1079
+1061
+1080
+1062
+1081
+1063
+1082
+1064
+1083
+1065
+1084
+1066
+1085
+1067
+1086
+1068
+1087
+1069
+1088
+1070
+1089
+1071
+1090
+1072
+1091
+1073
+1092
+1074
+1093
+1075
+1094
+1076
+1095
+1077
+1096
+1078
+1097
+1079
+1098
+1099
+1081
+1100
+1082
+1101
+1083
+1102
+1084
+1103
+1085
+1104
+1086
+1105
+1087
+1106
+1088
+1107
+1089
+1108
+1090
+1109
+1091
+1110
+1092
+1111
+1093
+1112
+1094
+1113
+1095
+1114
+1096
+1115
+1097
+1116
+1098
+1117
+1099
+1118
+1119
+1101
+1120
+1102
+1121
+1103
+1122
+1104
+1123
+1105
+1124
+1106
+1125
+1107
+1126
+1108
+1127
+1109
+1128
+1110
+1129
+1111
+1130
+1112
+1131
+1113
+1132
+1114
+1133
+1115
+1134
+1116
+1135
+1117
+1136
+1118
+1137
+1119
+1138
+1139
+1121
+1140
+1122
+1141
+1123
+1142
+1124
+1143
+1125
+1144
+1126
+1145
+1127
+1146
+1128
+1147
+1129
+1148
+1130
+1149
+1131
+1150
+1132
+1151
+1133
+1152
+1134
+1153
+1135
+1154
+1136
+1155
+1137
+1156
+1138
+1157
+1139
+1158
+1159
+1141
+1160
+1142
+1161
+1143
+1162
+1144
+1163
+1145
+1164
+1146
+1165
+1147
+1166
+1148
+1167
+1149
+1168
+1150
+1169
+1151
+1170
+1152
+1171
+1153
+1172
+1154
+1173
+1155
+1174
+1156
+1175
+1157
+1176
+1158
+1177
+1159
+1178
+1179
+1161
+1180
+1162
+1181
+1163
+1182
+1164
+1183
+1165
+1184
+1166
+1185
+1167
+1186
+1168
+1187
+1169
+1188
+1170
+1189
+1171
+1190
+1172
+1191
+1173
+1192
+1174
+1193
+1175
+1194
+1176
+1195
+1177
+1196
+1178
+1197
+1179
+1198
+1199
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1199
+1201
+1220
+1202
+1221
+1203
+1222
+1204
+1223
+1205
+1224
+1206
+1225
+1207
+1226
+1208
+1227
+1209
+1228
+1210
+1229
+1211
+1230
+1212
+1231
+1213
+1232
+1214
+1233
+1215
+1234
+1216
+1235
+1217
+1236
+1218
+1237
+1219
+1238
+1239
+1221
+1240
+1222
+1241
+1223
+1242
+1224
+1243
+1225
+1244
+1226
+1245
+1227
+1246
+1228
+1247
+1229
+1248
+1230
+1249
+1231
+1250
+1232
+1251
+1233
+1252
+1234
+1253
+1235
+1254
+1236
+1255
+1237
+1256
+1238
+1257
+1239
+1258
+1259
+1241
+1260
+1242
+1261
+1243
+1262
+1244
+1263
+1245
+1264
+1246
+1265
+1247
+1266
+1248
+1267
+1249
+1268
+1250
+1269
+1251
+1270
+1252
+1271
+1253
+1272
+1254
+1273
+1255
+1274
+1256
+1275
+1257
+1276
+1258
+1277
+1259
+1278
+1279
+1261
+1280
+1262
+1281
+1263
+1282
+1264
+1283
+1265
+1284
+1266
+1285
+1267
+1286
+1268
+1287
+1269
+1288
+1270
+1289
+1271
+1290
+1272
+1291
+1273
+1292
+1274
+1293
+1275
+1294
+1276
+1295
+1277
+1296
+1278
+1297
+1279
+1298
+1299
+1281
+1300
+1282
+1301
+1283
+1302
+1284
+1303
+1285
+1304
+1286
+1305
+1287
+1306
+1288
+1307
+1289
+1308
+1290
+1309
+1291
+1310
+1292
+1311
+1293
+1312
+1294
+1313
+1295
+1314
+1296
+1315
+1297
+1316
+1298
+1317
+1299
+1318
+1319
+1301
+1320
+1302
+1321
+1303
+1322
+1304
+1323
+1305
+1324
+1306
+1325
+1307
+1326
+1308
+1327
+1309
+1328
+1310
+1329
+1311
+1330
+1312
+1331
+1313
+1332
+1314
+1333
+1315
+1334
+1316
+1335
+1317
+1336
+1318
+1337
+1319
+1338
+1339
+1321
+1340
+1322
+1341
+1323
+1342
+1324
+1343
+1325
+1344
+1326
+1345
+1327
+1346
+1328
+1347
+1329
+1348
+1330
+1349
+1331
+1350
+1332
+1351
+1333
+1352
+1334
+1353
+1335
+1354
+1336
+1355
+1337
+1356
+1338
+1357
+1339
+1358
+1359
+1341
+1360
+1342
+1361
+1343
+1362
+1344
+1363
+1345
+1364
+1346
+1365
+1347
+1366
+1348
+1367
+1349
+1368
+1350
+1369
+1351
+1370
+1352
+1371
+1353
+1372
+1354
+1373
+1355
+1374
+1356
+1375
+1357
+1376
+1358
+1377
+1359
+1378
+1379
+1361
+1380
+1362
+1381
+1363
+1382
+1364
+1383
+1365
+1384
+1366
+1385
+1367
+1386
+1368
+1387
+1369
+1388
+1370
+1389
+1371
+1390
+1372
+1391
+1373
+1392
+1374
+1393
+1375
+1394
+1376
+1395
+1377
+1396
+1378
+1397
+1379
+1398
+1399
+1381
+1400
+1382
+1401
+1383
+1402
+1384
+1403
+1385
+1404
+1386
+1405
+1387
+1406
+1388
+1407
+1389
+1408
+1390
+1409
+1391
+1410
+1392
+1411
+1393
+1412
+1394
+1413
+1395
+1414
+1396
+1415
+1397
+1416
+1398
+1417
+1399
+1418
+1419
+1401
+1420
+1402
+1421
+1403
+1422
+1404
+1423
+1405
+1424
+1406
+1425
+1407
+1426
+1408
+1427
+1409
+1428
+1410
+1429
+1411
+1430
+1412
+1431
+1413
+1432
+1414
+1433
+1415
+1434
+1416
+1435
+1417
+1436
+1418
+1437
+1419
+1438
+1439
+1421
+1440
+1422
+1441
+1423
+1442
+1424
+1443
+1425
+1444
+1426
+1445
+1427
+1446
+1428
+1447
+1429
+1448
+1430
+1449
+1431
+1450
+1432
+1451
+1433
+1452
+1434
+1453
+1435
+1454
+1436
+1455
+1437
+1456
+1438
+1457
+1439
+1458
+1459
+1441
+1460
+1442
+1461
+1443
+1462
+1444
+1463
+1445
+1464
+1446
+1465
+1447
+1466
+1448
+1467
+1449
+1468
+1450
+1469
+1451
+1470
+1452
+1471
+1453
+1472
+1454
+1473
+1455
+1474
+1456
+1475
+1457
+1476
+1458
+1477
+1459
+1478
+1479
+1461
+1480
+1462
+1481
+1463
+1482
+1464
+1483
+1465
+1484
+1466
+1485
+1467
+1486
+1468
+1487
+1469
+1488
+1470
+1489
+1471
+1490
+1472
+1491
+1473
+1492
+1474
+1493
+1475
+1494
+1476
+1495
+1477
+1496
+1478
+1497
+1479
+1498
+1499
+1481
+1500
+1482
+1501
+1483
+1502
+1484
+1503
+1485
+1504
+1486
+1505
+1487
+1506
+1488
+1507
+1489
+1508
+1490
+1509
+1491
+1510
+1492
+1511
+1493
+1512
+1494
+1513
+1495
+1514
+1496
+1515
+1497
+1516
+1498
+1517
+1499
+1518
+1519
+1501
+1520
+1502
+1521
+1503
+1522
+1504
+1523
+1505
+1524
+1506
+1525
+1507
+1526
+1508
+1527
+1509
+1528
+1510
+1529
+1511
+1530
+1512
+1531
+1513
+1532
+1514
+1533
+1515
+1534
+1516
+1535
+1517
+1536
+1518
+1537
+1519
+1538
+1539
+1521
+1540
+1522
+1541
+1523
+1542
+1524
+1543
+1525
+1544
+1526
+1545
+1527
+1546
+1528
+1547
+1529
+1548
+1530
+1549
+1531
+1550
+1532
+1551
+1533
+1552
+1534
+1553
+1535
+1554
+1536
+1555
+1537
+1556
+1538
+1557
+1539
+1558
+1559
+1541
+1560
+1542
+1561
+1543
+1562
+1544
+1563
+1545
+1564
+1546
+1565
+1547
+1566
+1548
+1567
+1549
+1568
+1550
+1569
+1551
+1570
+1552
+1571
+1553
+1572
+1554
+1573
+1555
+1574
+1556
+1575
+1557
+1576
+1558
+1577
+1559
+1578
+1579
+1561
+1580
+1562
+1581
+1563
+1582
+1564
+1583
+1565
+1584
+1566
+1585
+1567
+1586
+1568
+1587
+1569
+1588
+1570
+1589
+1571
+1590
+1572
+1591
+1573
+1592
+1574
+1593
+1575
+1594
+1576
+1595
+1577
+1596
+1578
+1597
+1579
+1598
+1599
+1581
+1582
+1583
+1584
+1585
+1586
+1587
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1599
+)
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/owner b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/owner
new file mode 100644
index 000000000..d1037e06e
--- /dev/null
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/owner
@@ -0,0 +1,6525 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | foam-extend: Open Source CFD                    |
+|  \\    /   O peration     | Version:  3.0                                   |
+|   \\  /    A nd           | Web:         http://www.extend-project.de       |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       labelList;
+    note        "nPoints: 3402 nCells: 1600 nFaces: 6500 nInternalFaces: 3100";
+    location    "constant/polyMesh";
+    object      owner;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+6500
+(
+0
+0
+1
+1
+2
+2
+3
+3
+4
+4
+5
+5
+6
+6
+7
+7
+8
+8
+9
+9
+10
+10
+11
+11
+12
+12
+13
+13
+14
+14
+15
+15
+16
+16
+17
+17
+18
+18
+19
+19
+20
+20
+21
+21
+22
+22
+23
+23
+24
+24
+25
+25
+26
+26
+27
+27
+28
+28
+29
+29
+30
+30
+31
+31
+32
+32
+33
+33
+34
+34
+35
+35
+36
+36
+37
+37
+38
+38
+39
+39
+40
+40
+41
+41
+42
+42
+43
+43
+44
+44
+45
+45
+46
+46
+47
+47
+48
+48
+49
+49
+50
+50
+51
+51
+52
+52
+53
+53
+54
+54
+55
+55
+56
+56
+57
+57
+58
+58
+59
+59
+60
+60
+61
+61
+62
+62
+63
+63
+64
+64
+65
+65
+66
+66
+67
+67
+68
+68
+69
+69
+70
+70
+71
+71
+72
+72
+73
+73
+74
+74
+75
+75
+76
+76
+77
+77
+78
+78
+79
+79
+80
+80
+81
+81
+82
+82
+83
+83
+84
+84
+85
+85
+86
+86
+87
+87
+88
+88
+89
+89
+90
+90
+91
+91
+92
+92
+93
+93
+94
+94
+95
+95
+96
+96
+97
+97
+98
+98
+99
+99
+100
+100
+101
+101
+102
+102
+103
+103
+104
+104
+105
+105
+106
+106
+107
+107
+108
+108
+109
+109
+110
+110
+111
+111
+112
+112
+113
+113
+114
+114
+115
+115
+116
+116
+117
+117
+118
+118
+119
+119
+120
+120
+121
+121
+122
+122
+123
+123
+124
+124
+125
+125
+126
+126
+127
+127
+128
+128
+129
+129
+130
+130
+131
+131
+132
+132
+133
+133
+134
+134
+135
+135
+136
+136
+137
+137
+138
+138
+139
+139
+140
+140
+141
+141
+142
+142
+143
+143
+144
+144
+145
+145
+146
+146
+147
+147
+148
+148
+149
+149
+150
+150
+151
+151
+152
+152
+153
+153
+154
+154
+155
+155
+156
+156
+157
+157
+158
+158
+159
+159
+160
+160
+161
+161
+162
+162
+163
+163
+164
+164
+165
+165
+166
+166
+167
+167
+168
+168
+169
+169
+170
+170
+171
+171
+172
+172
+173
+173
+174
+174
+175
+175
+176
+176
+177
+177
+178
+178
+179
+179
+180
+180
+181
+181
+182
+182
+183
+183
+184
+184
+185
+185
+186
+186
+187
+187
+188
+188
+189
+189
+190
+190
+191
+191
+192
+192
+193
+193
+194
+194
+195
+195
+196
+196
+197
+197
+198
+198
+199
+199
+200
+200
+201
+201
+202
+202
+203
+203
+204
+204
+205
+205
+206
+206
+207
+207
+208
+208
+209
+209
+210
+210
+211
+211
+212
+212
+213
+213
+214
+214
+215
+215
+216
+216
+217
+217
+218
+218
+219
+219
+220
+220
+221
+221
+222
+222
+223
+223
+224
+224
+225
+225
+226
+226
+227
+227
+228
+228
+229
+229
+230
+230
+231
+231
+232
+232
+233
+233
+234
+234
+235
+235
+236
+236
+237
+237
+238
+238
+239
+239
+240
+240
+241
+241
+242
+242
+243
+243
+244
+244
+245
+245
+246
+246
+247
+247
+248
+248
+249
+249
+250
+250
+251
+251
+252
+252
+253
+253
+254
+254
+255
+255
+256
+256
+257
+257
+258
+258
+259
+259
+260
+260
+261
+261
+262
+262
+263
+263
+264
+264
+265
+265
+266
+266
+267
+267
+268
+268
+269
+269
+270
+270
+271
+271
+272
+272
+273
+273
+274
+274
+275
+275
+276
+276
+277
+277
+278
+278
+279
+279
+280
+280
+281
+281
+282
+282
+283
+283
+284
+284
+285
+285
+286
+286
+287
+287
+288
+288
+289
+289
+290
+290
+291
+291
+292
+292
+293
+293
+294
+294
+295
+295
+296
+296
+297
+297
+298
+298
+299
+299
+300
+300
+301
+301
+302
+302
+303
+303
+304
+304
+305
+305
+306
+306
+307
+307
+308
+308
+309
+309
+310
+310
+311
+311
+312
+312
+313
+313
+314
+314
+315
+315
+316
+316
+317
+317
+318
+318
+319
+319
+320
+320
+321
+321
+322
+322
+323
+323
+324
+324
+325
+325
+326
+326
+327
+327
+328
+328
+329
+329
+330
+330
+331
+331
+332
+332
+333
+333
+334
+334
+335
+335
+336
+336
+337
+337
+338
+338
+339
+339
+340
+340
+341
+341
+342
+342
+343
+343
+344
+344
+345
+345
+346
+346
+347
+347
+348
+348
+349
+349
+350
+350
+351
+351
+352
+352
+353
+353
+354
+354
+355
+355
+356
+356
+357
+357
+358
+358
+359
+359
+360
+360
+361
+361
+362
+362
+363
+363
+364
+364
+365
+365
+366
+366
+367
+367
+368
+368
+369
+369
+370
+370
+371
+371
+372
+372
+373
+373
+374
+374
+375
+375
+376
+376
+377
+377
+378
+378
+379
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+400
+401
+401
+402
+402
+403
+403
+404
+404
+405
+405
+406
+406
+407
+407
+408
+408
+409
+409
+410
+410
+411
+411
+412
+412
+413
+413
+414
+414
+415
+415
+416
+416
+417
+417
+418
+418
+419
+419
+420
+420
+421
+421
+422
+422
+423
+423
+424
+424
+425
+425
+426
+426
+427
+427
+428
+428
+429
+429
+430
+430
+431
+431
+432
+432
+433
+433
+434
+434
+435
+435
+436
+436
+437
+437
+438
+438
+439
+439
+440
+440
+441
+441
+442
+442
+443
+443
+444
+444
+445
+445
+446
+446
+447
+447
+448
+448
+449
+449
+450
+450
+451
+451
+452
+452
+453
+453
+454
+454
+455
+455
+456
+456
+457
+457
+458
+458
+459
+459
+460
+460
+461
+461
+462
+462
+463
+463
+464
+464
+465
+465
+466
+466
+467
+467
+468
+468
+469
+469
+470
+470
+471
+471
+472
+472
+473
+473
+474
+474
+475
+475
+476
+476
+477
+477
+478
+478
+479
+479
+480
+480
+481
+481
+482
+482
+483
+483
+484
+484
+485
+485
+486
+486
+487
+487
+488
+488
+489
+489
+490
+490
+491
+491
+492
+492
+493
+493
+494
+494
+495
+495
+496
+496
+497
+497
+498
+498
+499
+499
+500
+500
+501
+501
+502
+502
+503
+503
+504
+504
+505
+505
+506
+506
+507
+507
+508
+508
+509
+509
+510
+510
+511
+511
+512
+512
+513
+513
+514
+514
+515
+515
+516
+516
+517
+517
+518
+518
+519
+519
+520
+520
+521
+521
+522
+522
+523
+523
+524
+524
+525
+525
+526
+526
+527
+527
+528
+528
+529
+529
+530
+530
+531
+531
+532
+532
+533
+533
+534
+534
+535
+535
+536
+536
+537
+537
+538
+538
+539
+539
+540
+540
+541
+541
+542
+542
+543
+543
+544
+544
+545
+545
+546
+546
+547
+547
+548
+548
+549
+549
+550
+550
+551
+551
+552
+552
+553
+553
+554
+554
+555
+555
+556
+556
+557
+557
+558
+558
+559
+559
+560
+560
+561
+561
+562
+562
+563
+563
+564
+564
+565
+565
+566
+566
+567
+567
+568
+568
+569
+569
+570
+570
+571
+571
+572
+572
+573
+573
+574
+574
+575
+575
+576
+576
+577
+577
+578
+578
+579
+579
+580
+580
+581
+581
+582
+582
+583
+583
+584
+584
+585
+585
+586
+586
+587
+587
+588
+588
+589
+589
+590
+590
+591
+591
+592
+592
+593
+593
+594
+594
+595
+595
+596
+596
+597
+597
+598
+598
+599
+599
+600
+600
+601
+601
+602
+602
+603
+603
+604
+604
+605
+605
+606
+606
+607
+607
+608
+608
+609
+609
+610
+610
+611
+611
+612
+612
+613
+613
+614
+614
+615
+615
+616
+616
+617
+617
+618
+618
+619
+619
+620
+620
+621
+621
+622
+622
+623
+623
+624
+624
+625
+625
+626
+626
+627
+627
+628
+628
+629
+629
+630
+630
+631
+631
+632
+632
+633
+633
+634
+634
+635
+635
+636
+636
+637
+637
+638
+638
+639
+639
+640
+640
+641
+641
+642
+642
+643
+643
+644
+644
+645
+645
+646
+646
+647
+647
+648
+648
+649
+649
+650
+650
+651
+651
+652
+652
+653
+653
+654
+654
+655
+655
+656
+656
+657
+657
+658
+658
+659
+659
+660
+660
+661
+661
+662
+662
+663
+663
+664
+664
+665
+665
+666
+666
+667
+667
+668
+668
+669
+669
+670
+670
+671
+671
+672
+672
+673
+673
+674
+674
+675
+675
+676
+676
+677
+677
+678
+678
+679
+679
+680
+680
+681
+681
+682
+682
+683
+683
+684
+684
+685
+685
+686
+686
+687
+687
+688
+688
+689
+689
+690
+690
+691
+691
+692
+692
+693
+693
+694
+694
+695
+695
+696
+696
+697
+697
+698
+698
+699
+699
+700
+700
+701
+701
+702
+702
+703
+703
+704
+704
+705
+705
+706
+706
+707
+707
+708
+708
+709
+709
+710
+710
+711
+711
+712
+712
+713
+713
+714
+714
+715
+715
+716
+716
+717
+717
+718
+718
+719
+719
+720
+720
+721
+721
+722
+722
+723
+723
+724
+724
+725
+725
+726
+726
+727
+727
+728
+728
+729
+729
+730
+730
+731
+731
+732
+732
+733
+733
+734
+734
+735
+735
+736
+736
+737
+737
+738
+738
+739
+739
+740
+740
+741
+741
+742
+742
+743
+743
+744
+744
+745
+745
+746
+746
+747
+747
+748
+748
+749
+749
+750
+750
+751
+751
+752
+752
+753
+753
+754
+754
+755
+755
+756
+756
+757
+757
+758
+758
+759
+759
+760
+760
+761
+761
+762
+762
+763
+763
+764
+764
+765
+765
+766
+766
+767
+767
+768
+768
+769
+769
+770
+770
+771
+771
+772
+772
+773
+773
+774
+774
+775
+775
+776
+776
+777
+777
+778
+778
+779
+779
+780
+780
+781
+781
+782
+782
+783
+783
+784
+784
+785
+785
+786
+786
+787
+787
+788
+788
+789
+789
+790
+790
+791
+791
+792
+792
+793
+793
+794
+794
+795
+795
+796
+796
+797
+797
+798
+798
+799
+799
+800
+800
+801
+801
+802
+802
+803
+803
+804
+804
+805
+805
+806
+806
+807
+807
+808
+808
+809
+809
+810
+810
+811
+811
+812
+812
+813
+813
+814
+814
+815
+815
+816
+816
+817
+817
+818
+818
+819
+820
+820
+821
+821
+822
+822
+823
+823
+824
+824
+825
+825
+826
+826
+827
+827
+828
+828
+829
+829
+830
+830
+831
+831
+832
+832
+833
+833
+834
+834
+835
+835
+836
+836
+837
+837
+838
+838
+839
+840
+840
+841
+841
+842
+842
+843
+843
+844
+844
+845
+845
+846
+846
+847
+847
+848
+848
+849
+849
+850
+850
+851
+851
+852
+852
+853
+853
+854
+854
+855
+855
+856
+856
+857
+857
+858
+858
+859
+860
+860
+861
+861
+862
+862
+863
+863
+864
+864
+865
+865
+866
+866
+867
+867
+868
+868
+869
+869
+870
+870
+871
+871
+872
+872
+873
+873
+874
+874
+875
+875
+876
+876
+877
+877
+878
+878
+879
+880
+880
+881
+881
+882
+882
+883
+883
+884
+884
+885
+885
+886
+886
+887
+887
+888
+888
+889
+889
+890
+890
+891
+891
+892
+892
+893
+893
+894
+894
+895
+895
+896
+896
+897
+897
+898
+898
+899
+900
+900
+901
+901
+902
+902
+903
+903
+904
+904
+905
+905
+906
+906
+907
+907
+908
+908
+909
+909
+910
+910
+911
+911
+912
+912
+913
+913
+914
+914
+915
+915
+916
+916
+917
+917
+918
+918
+919
+920
+920
+921
+921
+922
+922
+923
+923
+924
+924
+925
+925
+926
+926
+927
+927
+928
+928
+929
+929
+930
+930
+931
+931
+932
+932
+933
+933
+934
+934
+935
+935
+936
+936
+937
+937
+938
+938
+939
+940
+940
+941
+941
+942
+942
+943
+943
+944
+944
+945
+945
+946
+946
+947
+947
+948
+948
+949
+949
+950
+950
+951
+951
+952
+952
+953
+953
+954
+954
+955
+955
+956
+956
+957
+957
+958
+958
+959
+960
+960
+961
+961
+962
+962
+963
+963
+964
+964
+965
+965
+966
+966
+967
+967
+968
+968
+969
+969
+970
+970
+971
+971
+972
+972
+973
+973
+974
+974
+975
+975
+976
+976
+977
+977
+978
+978
+979
+980
+980
+981
+981
+982
+982
+983
+983
+984
+984
+985
+985
+986
+986
+987
+987
+988
+988
+989
+989
+990
+990
+991
+991
+992
+992
+993
+993
+994
+994
+995
+995
+996
+996
+997
+997
+998
+998
+999
+1000
+1000
+1001
+1001
+1002
+1002
+1003
+1003
+1004
+1004
+1005
+1005
+1006
+1006
+1007
+1007
+1008
+1008
+1009
+1009
+1010
+1010
+1011
+1011
+1012
+1012
+1013
+1013
+1014
+1014
+1015
+1015
+1016
+1016
+1017
+1017
+1018
+1018
+1019
+1020
+1020
+1021
+1021
+1022
+1022
+1023
+1023
+1024
+1024
+1025
+1025
+1026
+1026
+1027
+1027
+1028
+1028
+1029
+1029
+1030
+1030
+1031
+1031
+1032
+1032
+1033
+1033
+1034
+1034
+1035
+1035
+1036
+1036
+1037
+1037
+1038
+1038
+1039
+1040
+1040
+1041
+1041
+1042
+1042
+1043
+1043
+1044
+1044
+1045
+1045
+1046
+1046
+1047
+1047
+1048
+1048
+1049
+1049
+1050
+1050
+1051
+1051
+1052
+1052
+1053
+1053
+1054
+1054
+1055
+1055
+1056
+1056
+1057
+1057
+1058
+1058
+1059
+1060
+1060
+1061
+1061
+1062
+1062
+1063
+1063
+1064
+1064
+1065
+1065
+1066
+1066
+1067
+1067
+1068
+1068
+1069
+1069
+1070
+1070
+1071
+1071
+1072
+1072
+1073
+1073
+1074
+1074
+1075
+1075
+1076
+1076
+1077
+1077
+1078
+1078
+1079
+1080
+1080
+1081
+1081
+1082
+1082
+1083
+1083
+1084
+1084
+1085
+1085
+1086
+1086
+1087
+1087
+1088
+1088
+1089
+1089
+1090
+1090
+1091
+1091
+1092
+1092
+1093
+1093
+1094
+1094
+1095
+1095
+1096
+1096
+1097
+1097
+1098
+1098
+1099
+1100
+1100
+1101
+1101
+1102
+1102
+1103
+1103
+1104
+1104
+1105
+1105
+1106
+1106
+1107
+1107
+1108
+1108
+1109
+1109
+1110
+1110
+1111
+1111
+1112
+1112
+1113
+1113
+1114
+1114
+1115
+1115
+1116
+1116
+1117
+1117
+1118
+1118
+1119
+1120
+1120
+1121
+1121
+1122
+1122
+1123
+1123
+1124
+1124
+1125
+1125
+1126
+1126
+1127
+1127
+1128
+1128
+1129
+1129
+1130
+1130
+1131
+1131
+1132
+1132
+1133
+1133
+1134
+1134
+1135
+1135
+1136
+1136
+1137
+1137
+1138
+1138
+1139
+1140
+1140
+1141
+1141
+1142
+1142
+1143
+1143
+1144
+1144
+1145
+1145
+1146
+1146
+1147
+1147
+1148
+1148
+1149
+1149
+1150
+1150
+1151
+1151
+1152
+1152
+1153
+1153
+1154
+1154
+1155
+1155
+1156
+1156
+1157
+1157
+1158
+1158
+1159
+1160
+1160
+1161
+1161
+1162
+1162
+1163
+1163
+1164
+1164
+1165
+1165
+1166
+1166
+1167
+1167
+1168
+1168
+1169
+1169
+1170
+1170
+1171
+1171
+1172
+1172
+1173
+1173
+1174
+1174
+1175
+1175
+1176
+1176
+1177
+1177
+1178
+1178
+1179
+1180
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1200
+1200
+1201
+1201
+1202
+1202
+1203
+1203
+1204
+1204
+1205
+1205
+1206
+1206
+1207
+1207
+1208
+1208
+1209
+1209
+1210
+1210
+1211
+1211
+1212
+1212
+1213
+1213
+1214
+1214
+1215
+1215
+1216
+1216
+1217
+1217
+1218
+1218
+1219
+1220
+1220
+1221
+1221
+1222
+1222
+1223
+1223
+1224
+1224
+1225
+1225
+1226
+1226
+1227
+1227
+1228
+1228
+1229
+1229
+1230
+1230
+1231
+1231
+1232
+1232
+1233
+1233
+1234
+1234
+1235
+1235
+1236
+1236
+1237
+1237
+1238
+1238
+1239
+1240
+1240
+1241
+1241
+1242
+1242
+1243
+1243
+1244
+1244
+1245
+1245
+1246
+1246
+1247
+1247
+1248
+1248
+1249
+1249
+1250
+1250
+1251
+1251
+1252
+1252
+1253
+1253
+1254
+1254
+1255
+1255
+1256
+1256
+1257
+1257
+1258
+1258
+1259
+1260
+1260
+1261
+1261
+1262
+1262
+1263
+1263
+1264
+1264
+1265
+1265
+1266
+1266
+1267
+1267
+1268
+1268
+1269
+1269
+1270
+1270
+1271
+1271
+1272
+1272
+1273
+1273
+1274
+1274
+1275
+1275
+1276
+1276
+1277
+1277
+1278
+1278
+1279
+1280
+1280
+1281
+1281
+1282
+1282
+1283
+1283
+1284
+1284
+1285
+1285
+1286
+1286
+1287
+1287
+1288
+1288
+1289
+1289
+1290
+1290
+1291
+1291
+1292
+1292
+1293
+1293
+1294
+1294
+1295
+1295
+1296
+1296
+1297
+1297
+1298
+1298
+1299
+1300
+1300
+1301
+1301
+1302
+1302
+1303
+1303
+1304
+1304
+1305
+1305
+1306
+1306
+1307
+1307
+1308
+1308
+1309
+1309
+1310
+1310
+1311
+1311
+1312
+1312
+1313
+1313
+1314
+1314
+1315
+1315
+1316
+1316
+1317
+1317
+1318
+1318
+1319
+1320
+1320
+1321
+1321
+1322
+1322
+1323
+1323
+1324
+1324
+1325
+1325
+1326
+1326
+1327
+1327
+1328
+1328
+1329
+1329
+1330
+1330
+1331
+1331
+1332
+1332
+1333
+1333
+1334
+1334
+1335
+1335
+1336
+1336
+1337
+1337
+1338
+1338
+1339
+1340
+1340
+1341
+1341
+1342
+1342
+1343
+1343
+1344
+1344
+1345
+1345
+1346
+1346
+1347
+1347
+1348
+1348
+1349
+1349
+1350
+1350
+1351
+1351
+1352
+1352
+1353
+1353
+1354
+1354
+1355
+1355
+1356
+1356
+1357
+1357
+1358
+1358
+1359
+1360
+1360
+1361
+1361
+1362
+1362
+1363
+1363
+1364
+1364
+1365
+1365
+1366
+1366
+1367
+1367
+1368
+1368
+1369
+1369
+1370
+1370
+1371
+1371
+1372
+1372
+1373
+1373
+1374
+1374
+1375
+1375
+1376
+1376
+1377
+1377
+1378
+1378
+1379
+1380
+1380
+1381
+1381
+1382
+1382
+1383
+1383
+1384
+1384
+1385
+1385
+1386
+1386
+1387
+1387
+1388
+1388
+1389
+1389
+1390
+1390
+1391
+1391
+1392
+1392
+1393
+1393
+1394
+1394
+1395
+1395
+1396
+1396
+1397
+1397
+1398
+1398
+1399
+1400
+1400
+1401
+1401
+1402
+1402
+1403
+1403
+1404
+1404
+1405
+1405
+1406
+1406
+1407
+1407
+1408
+1408
+1409
+1409
+1410
+1410
+1411
+1411
+1412
+1412
+1413
+1413
+1414
+1414
+1415
+1415
+1416
+1416
+1417
+1417
+1418
+1418
+1419
+1420
+1420
+1421
+1421
+1422
+1422
+1423
+1423
+1424
+1424
+1425
+1425
+1426
+1426
+1427
+1427
+1428
+1428
+1429
+1429
+1430
+1430
+1431
+1431
+1432
+1432
+1433
+1433
+1434
+1434
+1435
+1435
+1436
+1436
+1437
+1437
+1438
+1438
+1439
+1440
+1440
+1441
+1441
+1442
+1442
+1443
+1443
+1444
+1444
+1445
+1445
+1446
+1446
+1447
+1447
+1448
+1448
+1449
+1449
+1450
+1450
+1451
+1451
+1452
+1452
+1453
+1453
+1454
+1454
+1455
+1455
+1456
+1456
+1457
+1457
+1458
+1458
+1459
+1460
+1460
+1461
+1461
+1462
+1462
+1463
+1463
+1464
+1464
+1465
+1465
+1466
+1466
+1467
+1467
+1468
+1468
+1469
+1469
+1470
+1470
+1471
+1471
+1472
+1472
+1473
+1473
+1474
+1474
+1475
+1475
+1476
+1476
+1477
+1477
+1478
+1478
+1479
+1480
+1480
+1481
+1481
+1482
+1482
+1483
+1483
+1484
+1484
+1485
+1485
+1486
+1486
+1487
+1487
+1488
+1488
+1489
+1489
+1490
+1490
+1491
+1491
+1492
+1492
+1493
+1493
+1494
+1494
+1495
+1495
+1496
+1496
+1497
+1497
+1498
+1498
+1499
+1500
+1500
+1501
+1501
+1502
+1502
+1503
+1503
+1504
+1504
+1505
+1505
+1506
+1506
+1507
+1507
+1508
+1508
+1509
+1509
+1510
+1510
+1511
+1511
+1512
+1512
+1513
+1513
+1514
+1514
+1515
+1515
+1516
+1516
+1517
+1517
+1518
+1518
+1519
+1520
+1520
+1521
+1521
+1522
+1522
+1523
+1523
+1524
+1524
+1525
+1525
+1526
+1526
+1527
+1527
+1528
+1528
+1529
+1529
+1530
+1530
+1531
+1531
+1532
+1532
+1533
+1533
+1534
+1534
+1535
+1535
+1536
+1536
+1537
+1537
+1538
+1538
+1539
+1540
+1540
+1541
+1541
+1542
+1542
+1543
+1543
+1544
+1544
+1545
+1545
+1546
+1546
+1547
+1547
+1548
+1548
+1549
+1549
+1550
+1550
+1551
+1551
+1552
+1552
+1553
+1553
+1554
+1554
+1555
+1555
+1556
+1556
+1557
+1557
+1558
+1558
+1559
+1560
+1560
+1561
+1561
+1562
+1562
+1563
+1563
+1564
+1564
+1565
+1565
+1566
+1566
+1567
+1567
+1568
+1568
+1569
+1569
+1570
+1570
+1571
+1571
+1572
+1572
+1573
+1573
+1574
+1574
+1575
+1575
+1576
+1576
+1577
+1577
+1578
+1578
+1579
+1580
+1581
+1582
+1583
+1584
+1585
+1586
+1587
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1200
+1220
+1240
+1260
+1280
+1300
+1320
+1340
+1360
+1380
+1400
+1420
+1440
+1460
+1480
+1500
+1520
+1540
+1560
+1580
+1219
+1239
+1259
+1279
+1299
+1319
+1339
+1359
+1379
+1399
+1419
+1439
+1459
+1479
+1499
+1519
+1539
+1559
+1579
+1599
+0
+20
+40
+60
+80
+100
+120
+140
+160
+180
+200
+220
+240
+260
+280
+300
+320
+340
+360
+380
+819
+839
+859
+879
+899
+919
+939
+959
+979
+999
+1019
+1039
+1059
+1079
+1099
+1119
+1139
+1159
+1179
+1199
+1580
+1581
+1582
+1583
+1584
+1585
+1586
+1587
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1599
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+0
+20
+40
+60
+80
+100
+120
+140
+160
+180
+200
+220
+240
+260
+280
+300
+320
+340
+360
+380
+1
+21
+41
+61
+81
+101
+121
+141
+161
+181
+201
+221
+241
+261
+281
+301
+321
+341
+361
+381
+2
+22
+42
+62
+82
+102
+122
+142
+162
+182
+202
+222
+242
+262
+282
+302
+322
+342
+362
+382
+3
+23
+43
+63
+83
+103
+123
+143
+163
+183
+203
+223
+243
+263
+283
+303
+323
+343
+363
+383
+4
+24
+44
+64
+84
+104
+124
+144
+164
+184
+204
+224
+244
+264
+284
+304
+324
+344
+364
+384
+5
+25
+45
+65
+85
+105
+125
+145
+165
+185
+205
+225
+245
+265
+285
+305
+325
+345
+365
+385
+6
+26
+46
+66
+86
+106
+126
+146
+166
+186
+206
+226
+246
+266
+286
+306
+326
+346
+366
+386
+7
+27
+47
+67
+87
+107
+127
+147
+167
+187
+207
+227
+247
+267
+287
+307
+327
+347
+367
+387
+8
+28
+48
+68
+88
+108
+128
+148
+168
+188
+208
+228
+248
+268
+288
+308
+328
+348
+368
+388
+9
+29
+49
+69
+89
+109
+129
+149
+169
+189
+209
+229
+249
+269
+289
+309
+329
+349
+369
+389
+10
+30
+50
+70
+90
+110
+130
+150
+170
+190
+210
+230
+250
+270
+290
+310
+330
+350
+370
+390
+11
+31
+51
+71
+91
+111
+131
+151
+171
+191
+211
+231
+251
+271
+291
+311
+331
+351
+371
+391
+12
+32
+52
+72
+92
+112
+132
+152
+172
+192
+212
+232
+252
+272
+292
+312
+332
+352
+372
+392
+13
+33
+53
+73
+93
+113
+133
+153
+173
+193
+213
+233
+253
+273
+293
+313
+333
+353
+373
+393
+14
+34
+54
+74
+94
+114
+134
+154
+174
+194
+214
+234
+254
+274
+294
+314
+334
+354
+374
+394
+15
+35
+55
+75
+95
+115
+135
+155
+175
+195
+215
+235
+255
+275
+295
+315
+335
+355
+375
+395
+16
+36
+56
+76
+96
+116
+136
+156
+176
+196
+216
+236
+256
+276
+296
+316
+336
+356
+376
+396
+17
+37
+57
+77
+97
+117
+137
+157
+177
+197
+217
+237
+257
+277
+297
+317
+337
+357
+377
+397
+18
+38
+58
+78
+98
+118
+138
+158
+178
+198
+218
+238
+258
+278
+298
+318
+338
+358
+378
+398
+19
+39
+59
+79
+99
+119
+139
+159
+179
+199
+219
+239
+259
+279
+299
+319
+339
+359
+379
+399
+0
+20
+40
+60
+80
+100
+120
+140
+160
+180
+200
+220
+240
+260
+280
+300
+320
+340
+360
+380
+1
+21
+41
+61
+81
+101
+121
+141
+161
+181
+201
+221
+241
+261
+281
+301
+321
+341
+361
+381
+2
+22
+42
+62
+82
+102
+122
+142
+162
+182
+202
+222
+242
+262
+282
+302
+322
+342
+362
+382
+3
+23
+43
+63
+83
+103
+123
+143
+163
+183
+203
+223
+243
+263
+283
+303
+323
+343
+363
+383
+4
+24
+44
+64
+84
+104
+124
+144
+164
+184
+204
+224
+244
+264
+284
+304
+324
+344
+364
+384
+5
+25
+45
+65
+85
+105
+125
+145
+165
+185
+205
+225
+245
+265
+285
+305
+325
+345
+365
+385
+6
+26
+46
+66
+86
+106
+126
+146
+166
+186
+206
+226
+246
+266
+286
+306
+326
+346
+366
+386
+7
+27
+47
+67
+87
+107
+127
+147
+167
+187
+207
+227
+247
+267
+287
+307
+327
+347
+367
+387
+8
+28
+48
+68
+88
+108
+128
+148
+168
+188
+208
+228
+248
+268
+288
+308
+328
+348
+368
+388
+9
+29
+49
+69
+89
+109
+129
+149
+169
+189
+209
+229
+249
+269
+289
+309
+329
+349
+369
+389
+10
+30
+50
+70
+90
+110
+130
+150
+170
+190
+210
+230
+250
+270
+290
+310
+330
+350
+370
+390
+11
+31
+51
+71
+91
+111
+131
+151
+171
+191
+211
+231
+251
+271
+291
+311
+331
+351
+371
+391
+12
+32
+52
+72
+92
+112
+132
+152
+172
+192
+212
+232
+252
+272
+292
+312
+332
+352
+372
+392
+13
+33
+53
+73
+93
+113
+133
+153
+173
+193
+213
+233
+253
+273
+293
+313
+333
+353
+373
+393
+14
+34
+54
+74
+94
+114
+134
+154
+174
+194
+214
+234
+254
+274
+294
+314
+334
+354
+374
+394
+15
+35
+55
+75
+95
+115
+135
+155
+175
+195
+215
+235
+255
+275
+295
+315
+335
+355
+375
+395
+16
+36
+56
+76
+96
+116
+136
+156
+176
+196
+216
+236
+256
+276
+296
+316
+336
+356
+376
+396
+17
+37
+57
+77
+97
+117
+137
+157
+177
+197
+217
+237
+257
+277
+297
+317
+337
+357
+377
+397
+18
+38
+58
+78
+98
+118
+138
+158
+178
+198
+218
+238
+258
+278
+298
+318
+338
+358
+378
+398
+19
+39
+59
+79
+99
+119
+139
+159
+179
+199
+219
+239
+259
+279
+299
+319
+339
+359
+379
+399
+400
+401
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415
+416
+417
+418
+419
+400
+420
+440
+460
+480
+500
+520
+540
+560
+580
+600
+620
+640
+660
+680
+700
+720
+740
+760
+780
+401
+421
+441
+461
+481
+501
+521
+541
+561
+581
+601
+621
+641
+661
+681
+701
+721
+741
+761
+781
+402
+422
+442
+462
+482
+502
+522
+542
+562
+582
+602
+622
+642
+662
+682
+702
+722
+742
+762
+782
+403
+423
+443
+463
+483
+503
+523
+543
+563
+583
+603
+623
+643
+663
+683
+703
+723
+743
+763
+783
+404
+424
+444
+464
+484
+504
+524
+544
+564
+584
+604
+624
+644
+664
+684
+704
+724
+744
+764
+784
+405
+425
+445
+465
+485
+505
+525
+545
+565
+585
+605
+625
+645
+665
+685
+705
+725
+745
+765
+785
+406
+426
+446
+466
+486
+506
+526
+546
+566
+586
+606
+626
+646
+666
+686
+706
+726
+746
+766
+786
+407
+427
+447
+467
+487
+507
+527
+547
+567
+587
+607
+627
+647
+667
+687
+707
+727
+747
+767
+787
+408
+428
+448
+468
+488
+508
+528
+548
+568
+588
+608
+628
+648
+668
+688
+708
+728
+748
+768
+788
+409
+429
+449
+469
+489
+509
+529
+549
+569
+589
+609
+629
+649
+669
+689
+709
+729
+749
+769
+789
+410
+430
+450
+470
+490
+510
+530
+550
+570
+590
+610
+630
+650
+670
+690
+710
+730
+750
+770
+790
+411
+431
+451
+471
+491
+511
+531
+551
+571
+591
+611
+631
+651
+671
+691
+711
+731
+751
+771
+791
+412
+432
+452
+472
+492
+512
+532
+552
+572
+592
+612
+632
+652
+672
+692
+712
+732
+752
+772
+792
+413
+433
+453
+473
+493
+513
+533
+553
+573
+593
+613
+633
+653
+673
+693
+713
+733
+753
+773
+793
+414
+434
+454
+474
+494
+514
+534
+554
+574
+594
+614
+634
+654
+674
+694
+714
+734
+754
+774
+794
+415
+435
+455
+475
+495
+515
+535
+555
+575
+595
+615
+635
+655
+675
+695
+715
+735
+755
+775
+795
+416
+436
+456
+476
+496
+516
+536
+556
+576
+596
+616
+636
+656
+676
+696
+716
+736
+756
+776
+796
+417
+437
+457
+477
+497
+517
+537
+557
+577
+597
+617
+637
+657
+677
+697
+717
+737
+757
+777
+797
+418
+438
+458
+478
+498
+518
+538
+558
+578
+598
+618
+638
+658
+678
+698
+718
+738
+758
+778
+798
+419
+439
+459
+479
+499
+519
+539
+559
+579
+599
+619
+639
+659
+679
+699
+719
+739
+759
+779
+799
+400
+420
+440
+460
+480
+500
+520
+540
+560
+580
+600
+620
+640
+660
+680
+700
+720
+740
+760
+780
+401
+421
+441
+461
+481
+501
+521
+541
+561
+581
+601
+621
+641
+661
+681
+701
+721
+741
+761
+781
+402
+422
+442
+462
+482
+502
+522
+542
+562
+582
+602
+622
+642
+662
+682
+702
+722
+742
+762
+782
+403
+423
+443
+463
+483
+503
+523
+543
+563
+583
+603
+623
+643
+663
+683
+703
+723
+743
+763
+783
+404
+424
+444
+464
+484
+504
+524
+544
+564
+584
+604
+624
+644
+664
+684
+704
+724
+744
+764
+784
+405
+425
+445
+465
+485
+505
+525
+545
+565
+585
+605
+625
+645
+665
+685
+705
+725
+745
+765
+785
+406
+426
+446
+466
+486
+506
+526
+546
+566
+586
+606
+626
+646
+666
+686
+706
+726
+746
+766
+786
+407
+427
+447
+467
+487
+507
+527
+547
+567
+587
+607
+627
+647
+667
+687
+707
+727
+747
+767
+787
+408
+428
+448
+468
+488
+508
+528
+548
+568
+588
+608
+628
+648
+668
+688
+708
+728
+748
+768
+788
+409
+429
+449
+469
+489
+509
+529
+549
+569
+589
+609
+629
+649
+669
+689
+709
+729
+749
+769
+789
+410
+430
+450
+470
+490
+510
+530
+550
+570
+590
+610
+630
+650
+670
+690
+710
+730
+750
+770
+790
+411
+431
+451
+471
+491
+511
+531
+551
+571
+591
+611
+631
+651
+671
+691
+711
+731
+751
+771
+791
+412
+432
+452
+472
+492
+512
+532
+552
+572
+592
+612
+632
+652
+672
+692
+712
+732
+752
+772
+792
+413
+433
+453
+473
+493
+513
+533
+553
+573
+593
+613
+633
+653
+673
+693
+713
+733
+753
+773
+793
+414
+434
+454
+474
+494
+514
+534
+554
+574
+594
+614
+634
+654
+674
+694
+714
+734
+754
+774
+794
+415
+435
+455
+475
+495
+515
+535
+555
+575
+595
+615
+635
+655
+675
+695
+715
+735
+755
+775
+795
+416
+436
+456
+476
+496
+516
+536
+556
+576
+596
+616
+636
+656
+676
+696
+716
+736
+756
+776
+796
+417
+437
+457
+477
+497
+517
+537
+557
+577
+597
+617
+637
+657
+677
+697
+717
+737
+757
+777
+797
+418
+438
+458
+478
+498
+518
+538
+558
+578
+598
+618
+638
+658
+678
+698
+718
+738
+758
+778
+798
+419
+439
+459
+479
+499
+519
+539
+559
+579
+599
+619
+639
+659
+679
+699
+719
+739
+759
+779
+799
+800
+801
+802
+803
+804
+805
+806
+807
+808
+809
+810
+811
+812
+813
+814
+815
+816
+817
+818
+819
+1180
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1199
+800
+820
+840
+860
+880
+900
+920
+940
+960
+980
+1000
+1020
+1040
+1060
+1080
+1100
+1120
+1140
+1160
+1180
+801
+821
+841
+861
+881
+901
+921
+941
+961
+981
+1001
+1021
+1041
+1061
+1081
+1101
+1121
+1141
+1161
+1181
+802
+822
+842
+862
+882
+902
+922
+942
+962
+982
+1002
+1022
+1042
+1062
+1082
+1102
+1122
+1142
+1162
+1182
+803
+823
+843
+863
+883
+903
+923
+943
+963
+983
+1003
+1023
+1043
+1063
+1083
+1103
+1123
+1143
+1163
+1183
+804
+824
+844
+864
+884
+904
+924
+944
+964
+984
+1004
+1024
+1044
+1064
+1084
+1104
+1124
+1144
+1164
+1184
+805
+825
+845
+865
+885
+905
+925
+945
+965
+985
+1005
+1025
+1045
+1065
+1085
+1105
+1125
+1145
+1165
+1185
+806
+826
+846
+866
+886
+906
+926
+946
+966
+986
+1006
+1026
+1046
+1066
+1086
+1106
+1126
+1146
+1166
+1186
+807
+827
+847
+867
+887
+907
+927
+947
+967
+987
+1007
+1027
+1047
+1067
+1087
+1107
+1127
+1147
+1167
+1187
+808
+828
+848
+868
+888
+908
+928
+948
+968
+988
+1008
+1028
+1048
+1068
+1088
+1108
+1128
+1148
+1168
+1188
+809
+829
+849
+869
+889
+909
+929
+949
+969
+989
+1009
+1029
+1049
+1069
+1089
+1109
+1129
+1149
+1169
+1189
+810
+830
+850
+870
+890
+910
+930
+950
+970
+990
+1010
+1030
+1050
+1070
+1090
+1110
+1130
+1150
+1170
+1190
+811
+831
+851
+871
+891
+911
+931
+951
+971
+991
+1011
+1031
+1051
+1071
+1091
+1111
+1131
+1151
+1171
+1191
+812
+832
+852
+872
+892
+912
+932
+952
+972
+992
+1012
+1032
+1052
+1072
+1092
+1112
+1132
+1152
+1172
+1192
+813
+833
+853
+873
+893
+913
+933
+953
+973
+993
+1013
+1033
+1053
+1073
+1093
+1113
+1133
+1153
+1173
+1193
+814
+834
+854
+874
+894
+914
+934
+954
+974
+994
+1014
+1034
+1054
+1074
+1094
+1114
+1134
+1154
+1174
+1194
+815
+835
+855
+875
+895
+915
+935
+955
+975
+995
+1015
+1035
+1055
+1075
+1095
+1115
+1135
+1155
+1175
+1195
+816
+836
+856
+876
+896
+916
+936
+956
+976
+996
+1016
+1036
+1056
+1076
+1096
+1116
+1136
+1156
+1176
+1196
+817
+837
+857
+877
+897
+917
+937
+957
+977
+997
+1017
+1037
+1057
+1077
+1097
+1117
+1137
+1157
+1177
+1197
+818
+838
+858
+878
+898
+918
+938
+958
+978
+998
+1018
+1038
+1058
+1078
+1098
+1118
+1138
+1158
+1178
+1198
+819
+839
+859
+879
+899
+919
+939
+959
+979
+999
+1019
+1039
+1059
+1079
+1099
+1119
+1139
+1159
+1179
+1199
+800
+820
+840
+860
+880
+900
+920
+940
+960
+980
+1000
+1020
+1040
+1060
+1080
+1100
+1120
+1140
+1160
+1180
+801
+821
+841
+861
+881
+901
+921
+941
+961
+981
+1001
+1021
+1041
+1061
+1081
+1101
+1121
+1141
+1161
+1181
+802
+822
+842
+862
+882
+902
+922
+942
+962
+982
+1002
+1022
+1042
+1062
+1082
+1102
+1122
+1142
+1162
+1182
+803
+823
+843
+863
+883
+903
+923
+943
+963
+983
+1003
+1023
+1043
+1063
+1083
+1103
+1123
+1143
+1163
+1183
+804
+824
+844
+864
+884
+904
+924
+944
+964
+984
+1004
+1024
+1044
+1064
+1084
+1104
+1124
+1144
+1164
+1184
+805
+825
+845
+865
+885
+905
+925
+945
+965
+985
+1005
+1025
+1045
+1065
+1085
+1105
+1125
+1145
+1165
+1185
+806
+826
+846
+866
+886
+906
+926
+946
+966
+986
+1006
+1026
+1046
+1066
+1086
+1106
+1126
+1146
+1166
+1186
+807
+827
+847
+867
+887
+907
+927
+947
+967
+987
+1007
+1027
+1047
+1067
+1087
+1107
+1127
+1147
+1167
+1187
+808
+828
+848
+868
+888
+908
+928
+948
+968
+988
+1008
+1028
+1048
+1068
+1088
+1108
+1128
+1148
+1168
+1188
+809
+829
+849
+869
+889
+909
+929
+949
+969
+989
+1009
+1029
+1049
+1069
+1089
+1109
+1129
+1149
+1169
+1189
+810
+830
+850
+870
+890
+910
+930
+950
+970
+990
+1010
+1030
+1050
+1070
+1090
+1110
+1130
+1150
+1170
+1190
+811
+831
+851
+871
+891
+911
+931
+951
+971
+991
+1011
+1031
+1051
+1071
+1091
+1111
+1131
+1151
+1171
+1191
+812
+832
+852
+872
+892
+912
+932
+952
+972
+992
+1012
+1032
+1052
+1072
+1092
+1112
+1132
+1152
+1172
+1192
+813
+833
+853
+873
+893
+913
+933
+953
+973
+993
+1013
+1033
+1053
+1073
+1093
+1113
+1133
+1153
+1173
+1193
+814
+834
+854
+874
+894
+914
+934
+954
+974
+994
+1014
+1034
+1054
+1074
+1094
+1114
+1134
+1154
+1174
+1194
+815
+835
+855
+875
+895
+915
+935
+955
+975
+995
+1015
+1035
+1055
+1075
+1095
+1115
+1135
+1155
+1175
+1195
+816
+836
+856
+876
+896
+916
+936
+956
+976
+996
+1016
+1036
+1056
+1076
+1096
+1116
+1136
+1156
+1176
+1196
+817
+837
+857
+877
+897
+917
+937
+957
+977
+997
+1017
+1037
+1057
+1077
+1097
+1117
+1137
+1157
+1177
+1197
+818
+838
+858
+878
+898
+918
+938
+958
+978
+998
+1018
+1038
+1058
+1078
+1098
+1118
+1138
+1158
+1178
+1198
+819
+839
+859
+879
+899
+919
+939
+959
+979
+999
+1019
+1039
+1059
+1079
+1099
+1119
+1139
+1159
+1179
+1199
+1200
+1220
+1240
+1260
+1280
+1300
+1320
+1340
+1360
+1380
+1400
+1420
+1440
+1460
+1480
+1500
+1520
+1540
+1560
+1580
+1201
+1221
+1241
+1261
+1281
+1301
+1321
+1341
+1361
+1381
+1401
+1421
+1441
+1461
+1481
+1501
+1521
+1541
+1561
+1581
+1202
+1222
+1242
+1262
+1282
+1302
+1322
+1342
+1362
+1382
+1402
+1422
+1442
+1462
+1482
+1502
+1522
+1542
+1562
+1582
+1203
+1223
+1243
+1263
+1283
+1303
+1323
+1343
+1363
+1383
+1403
+1423
+1443
+1463
+1483
+1503
+1523
+1543
+1563
+1583
+1204
+1224
+1244
+1264
+1284
+1304
+1324
+1344
+1364
+1384
+1404
+1424
+1444
+1464
+1484
+1504
+1524
+1544
+1564
+1584
+1205
+1225
+1245
+1265
+1285
+1305
+1325
+1345
+1365
+1385
+1405
+1425
+1445
+1465
+1485
+1505
+1525
+1545
+1565
+1585
+1206
+1226
+1246
+1266
+1286
+1306
+1326
+1346
+1366
+1386
+1406
+1426
+1446
+1466
+1486
+1506
+1526
+1546
+1566
+1586
+1207
+1227
+1247
+1267
+1287
+1307
+1327
+1347
+1367
+1387
+1407
+1427
+1447
+1467
+1487
+1507
+1527
+1547
+1567
+1587
+1208
+1228
+1248
+1268
+1288
+1308
+1328
+1348
+1368
+1388
+1408
+1428
+1448
+1468
+1488
+1508
+1528
+1548
+1568
+1588
+1209
+1229
+1249
+1269
+1289
+1309
+1329
+1349
+1369
+1389
+1409
+1429
+1449
+1469
+1489
+1509
+1529
+1549
+1569
+1589
+1210
+1230
+1250
+1270
+1290
+1310
+1330
+1350
+1370
+1390
+1410
+1430
+1450
+1470
+1490
+1510
+1530
+1550
+1570
+1590
+1211
+1231
+1251
+1271
+1291
+1311
+1331
+1351
+1371
+1391
+1411
+1431
+1451
+1471
+1491
+1511
+1531
+1551
+1571
+1591
+1212
+1232
+1252
+1272
+1292
+1312
+1332
+1352
+1372
+1392
+1412
+1432
+1452
+1472
+1492
+1512
+1532
+1552
+1572
+1592
+1213
+1233
+1253
+1273
+1293
+1313
+1333
+1353
+1373
+1393
+1413
+1433
+1453
+1473
+1493
+1513
+1533
+1553
+1573
+1593
+1214
+1234
+1254
+1274
+1294
+1314
+1334
+1354
+1374
+1394
+1414
+1434
+1454
+1474
+1494
+1514
+1534
+1554
+1574
+1594
+1215
+1235
+1255
+1275
+1295
+1315
+1335
+1355
+1375
+1395
+1415
+1435
+1455
+1475
+1495
+1515
+1535
+1555
+1575
+1595
+1216
+1236
+1256
+1276
+1296
+1316
+1336
+1356
+1376
+1396
+1416
+1436
+1456
+1476
+1496
+1516
+1536
+1556
+1576
+1596
+1217
+1237
+1257
+1277
+1297
+1317
+1337
+1357
+1377
+1397
+1417
+1437
+1457
+1477
+1497
+1517
+1537
+1557
+1577
+1597
+1218
+1238
+1258
+1278
+1298
+1318
+1338
+1358
+1378
+1398
+1418
+1438
+1458
+1478
+1498
+1518
+1538
+1558
+1578
+1598
+1219
+1239
+1259
+1279
+1299
+1319
+1339
+1359
+1379
+1399
+1419
+1439
+1459
+1479
+1499
+1519
+1539
+1559
+1579
+1599
+1200
+1220
+1240
+1260
+1280
+1300
+1320
+1340
+1360
+1380
+1400
+1420
+1440
+1460
+1480
+1500
+1520
+1540
+1560
+1580
+1201
+1221
+1241
+1261
+1281
+1301
+1321
+1341
+1361
+1381
+1401
+1421
+1441
+1461
+1481
+1501
+1521
+1541
+1561
+1581
+1202
+1222
+1242
+1262
+1282
+1302
+1322
+1342
+1362
+1382
+1402
+1422
+1442
+1462
+1482
+1502
+1522
+1542
+1562
+1582
+1203
+1223
+1243
+1263
+1283
+1303
+1323
+1343
+1363
+1383
+1403
+1423
+1443
+1463
+1483
+1503
+1523
+1543
+1563
+1583
+1204
+1224
+1244
+1264
+1284
+1304
+1324
+1344
+1364
+1384
+1404
+1424
+1444
+1464
+1484
+1504
+1524
+1544
+1564
+1584
+1205
+1225
+1245
+1265
+1285
+1305
+1325
+1345
+1365
+1385
+1405
+1425
+1445
+1465
+1485
+1505
+1525
+1545
+1565
+1585
+1206
+1226
+1246
+1266
+1286
+1306
+1326
+1346
+1366
+1386
+1406
+1426
+1446
+1466
+1486
+1506
+1526
+1546
+1566
+1586
+1207
+1227
+1247
+1267
+1287
+1307
+1327
+1347
+1367
+1387
+1407
+1427
+1447
+1467
+1487
+1507
+1527
+1547
+1567
+1587
+1208
+1228
+1248
+1268
+1288
+1308
+1328
+1348
+1368
+1388
+1408
+1428
+1448
+1468
+1488
+1508
+1528
+1548
+1568
+1588
+1209
+1229
+1249
+1269
+1289
+1309
+1329
+1349
+1369
+1389
+1409
+1429
+1449
+1469
+1489
+1509
+1529
+1549
+1569
+1589
+1210
+1230
+1250
+1270
+1290
+1310
+1330
+1350
+1370
+1390
+1410
+1430
+1450
+1470
+1490
+1510
+1530
+1550
+1570
+1590
+1211
+1231
+1251
+1271
+1291
+1311
+1331
+1351
+1371
+1391
+1411
+1431
+1451
+1471
+1491
+1511
+1531
+1551
+1571
+1591
+1212
+1232
+1252
+1272
+1292
+1312
+1332
+1352
+1372
+1392
+1412
+1432
+1452
+1472
+1492
+1512
+1532
+1552
+1572
+1592
+1213
+1233
+1253
+1273
+1293
+1313
+1333
+1353
+1373
+1393
+1413
+1433
+1453
+1473
+1493
+1513
+1533
+1553
+1573
+1593
+1214
+1234
+1254
+1274
+1294
+1314
+1334
+1354
+1374
+1394
+1414
+1434
+1454
+1474
+1494
+1514
+1534
+1554
+1574
+1594
+1215
+1235
+1255
+1275
+1295
+1315
+1335
+1355
+1375
+1395
+1415
+1435
+1455
+1475
+1495
+1515
+1535
+1555
+1575
+1595
+1216
+1236
+1256
+1276
+1296
+1316
+1336
+1356
+1376
+1396
+1416
+1436
+1456
+1476
+1496
+1516
+1536
+1556
+1576
+1596
+1217
+1237
+1257
+1277
+1297
+1317
+1337
+1357
+1377
+1397
+1417
+1437
+1457
+1477
+1497
+1517
+1537
+1557
+1577
+1597
+1218
+1238
+1258
+1278
+1298
+1318
+1338
+1358
+1378
+1398
+1418
+1438
+1458
+1478
+1498
+1518
+1538
+1558
+1578
+1598
+1219
+1239
+1259
+1279
+1299
+1319
+1339
+1359
+1379
+1399
+1419
+1439
+1459
+1479
+1499
+1519
+1539
+1559
+1579
+1599
+)
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/points b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/points
new file mode 100644
index 000000000..aa423e989
--- /dev/null
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/parTeeFitting2d/constant/polyMesh/points
@@ -0,0 +1,3426 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | foam-extend: Open Source CFD                    |
+|  \\    /   O peration     | Version:  3.0                                   |
+|   \\  /    A nd           | Web:         http://www.extend-project.de       |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       vectorField;
+    location    "constant/polyMesh";
+    object      points;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+3402
+(
+(0 0 0)
+(0.0075 0 0)
+(0.015 0 0)
+(0.0225 0 0)
+(0.03 0 0)
+(0.0375 0 0)
+(0.045 0 0)
+(0.0525 0 0)
+(0.06 0 0)
+(0.0675 0 0)
+(0.075 0 0)
+(0.0825 0 0)
+(0.09 0 0)
+(0.0975 0 0)
+(0.105 0 0)
+(0.1125 0 0)
+(0.12 0 0)
+(0.1275 0 0)
+(0.135 0 0)
+(0.1425 0 0)
+(0.15 0 0)
+(0 0.005 0)
+(0.0075 0.005 0)
+(0.015 0.005 0)
+(0.0225 0.005 0)
+(0.03 0.005 0)
+(0.0375 0.005 0)
+(0.045 0.005 0)
+(0.0525 0.005 0)
+(0.06 0.005 0)
+(0.0675 0.005 0)
+(0.075 0.005 0)
+(0.0825 0.005 0)
+(0.09 0.005 0)
+(0.0975 0.005 0)
+(0.105 0.005 0)
+(0.1125 0.005 0)
+(0.12 0.005 0)
+(0.1275 0.005 0)
+(0.135 0.005 0)
+(0.1425 0.005 0)
+(0.15 0.005 0)
+(0 0.01 0)
+(0.0075 0.01 0)
+(0.015 0.01 0)
+(0.0225 0.01 0)
+(0.03 0.01 0)
+(0.0375 0.01 0)
+(0.045 0.01 0)
+(0.0525 0.01 0)
+(0.06 0.01 0)
+(0.0675 0.01 0)
+(0.075 0.01 0)
+(0.0825 0.01 0)
+(0.09 0.01 0)
+(0.0975 0.01 0)
+(0.105 0.01 0)
+(0.1125 0.01 0)
+(0.12 0.01 0)
+(0.1275 0.01 0)
+(0.135 0.01 0)
+(0.1425 0.01 0)
+(0.15 0.01 0)
+(0 0.015 0)
+(0.0075 0.015 0)
+(0.015 0.015 0)
+(0.0225 0.015 0)
+(0.03 0.015 0)
+(0.0375 0.015 0)
+(0.045 0.015 0)
+(0.0525 0.015 0)
+(0.06 0.015 0)
+(0.0675 0.015 0)
+(0.075 0.015 0)
+(0.0825 0.015 0)
+(0.09 0.015 0)
+(0.0975 0.015 0)
+(0.105 0.015 0)
+(0.1125 0.015 0)
+(0.12 0.015 0)
+(0.1275 0.015 0)
+(0.135 0.015 0)
+(0.1425 0.015 0)
+(0.15 0.015 0)
+(0 0.02 0)
+(0.0075 0.02 0)
+(0.015 0.02 0)
+(0.0225 0.02 0)
+(0.03 0.02 0)
+(0.0375 0.02 0)
+(0.045 0.02 0)
+(0.0525 0.02 0)
+(0.06 0.02 0)
+(0.0675 0.02 0)
+(0.075 0.02 0)
+(0.0825 0.02 0)
+(0.09 0.02 0)
+(0.0975 0.02 0)
+(0.105 0.02 0)
+(0.1125 0.02 0)
+(0.12 0.02 0)
+(0.1275 0.02 0)
+(0.135 0.02 0)
+(0.1425 0.02 0)
+(0.15 0.02 0)
+(0 0.025 0)
+(0.0075 0.025 0)
+(0.015 0.025 0)
+(0.0225 0.025 0)
+(0.03 0.025 0)
+(0.0375 0.025 0)
+(0.045 0.025 0)
+(0.0525 0.025 0)
+(0.06 0.025 0)
+(0.0675 0.025 0)
+(0.075 0.025 0)
+(0.0825 0.025 0)
+(0.09 0.025 0)
+(0.0975 0.025 0)
+(0.105 0.025 0)
+(0.1125 0.025 0)
+(0.12 0.025 0)
+(0.1275 0.025 0)
+(0.135 0.025 0)
+(0.1425 0.025 0)
+(0.15 0.025 0)
+(0 0.03 0)
+(0.0075 0.03 0)
+(0.015 0.03 0)
+(0.0225 0.03 0)
+(0.03 0.03 0)
+(0.0375 0.03 0)
+(0.045 0.03 0)
+(0.0525 0.03 0)
+(0.06 0.03 0)
+(0.0675 0.03 0)
+(0.075 0.03 0)
+(0.0825 0.03 0)
+(0.09 0.03 0)
+(0.0975 0.03 0)
+(0.105 0.03 0)
+(0.1125 0.03 0)
+(0.12 0.03 0)
+(0.1275 0.03 0)
+(0.135 0.03 0)
+(0.1425 0.03 0)
+(0.15 0.03 0)
+(0 0.035 0)
+(0.0075 0.035 0)
+(0.015 0.035 0)
+(0.0225 0.035 0)
+(0.03 0.035 0)
+(0.0375 0.035 0)
+(0.045 0.035 0)
+(0.0525 0.035 0)
+(0.06 0.035 0)
+(0.0675 0.035 0)
+(0.075 0.035 0)
+(0.0825 0.035 0)
+(0.09 0.035 0)
+(0.0975 0.035 0)
+(0.105 0.035 0)
+(0.1125 0.035 0)
+(0.12 0.035 0)
+(0.1275 0.035 0)
+(0.135 0.035 0)
+(0.1425 0.035 0)
+(0.15 0.035 0)
+(0 0.04 0)
+(0.0075 0.04 0)
+(0.015 0.04 0)
+(0.0225 0.04 0)
+(0.03 0.04 0)
+(0.0375 0.04 0)
+(0.045 0.04 0)
+(0.0525 0.04 0)
+(0.06 0.04 0)
+(0.0675 0.04 0)
+(0.075 0.04 0)
+(0.0825 0.04 0)
+(0.09 0.04 0)
+(0.0975 0.04 0)
+(0.105 0.04 0)
+(0.1125 0.04 0)
+(0.12 0.04 0)
+(0.1275 0.04 0)
+(0.135 0.04 0)
+(0.1425 0.04 0)
+(0.15 0.04 0)
+(0 0.045 0)
+(0.0075 0.045 0)
+(0.015 0.045 0)
+(0.0225 0.045 0)
+(0.03 0.045 0)
+(0.0375 0.045 0)
+(0.045 0.045 0)
+(0.0525 0.045 0)
+(0.06 0.045 0)
+(0.0675 0.045 0)
+(0.075 0.045 0)
+(0.0825 0.045 0)
+(0.09 0.045 0)
+(0.0975 0.045 0)
+(0.105 0.045 0)
+(0.1125 0.045 0)
+(0.12 0.045 0)
+(0.1275 0.045 0)
+(0.135 0.045 0)
+(0.1425 0.045 0)
+(0.15 0.045 0)
+(0 0.05 0)
+(0.0075 0.05 0)
+(0.015 0.05 0)
+(0.0225 0.05 0)
+(0.03 0.05 0)
+(0.0375 0.05 0)
+(0.045 0.05 0)
+(0.0525 0.05 0)
+(0.06 0.05 0)
+(0.0675 0.05 0)
+(0.075 0.05 0)
+(0.0825 0.05 0)
+(0.09 0.05 0)
+(0.0975 0.05 0)
+(0.105 0.05 0)
+(0.1125 0.05 0)
+(0.12 0.05 0)
+(0.1275 0.05 0)
+(0.135 0.05 0)
+(0.1425 0.05 0)
+(0.15 0.05 0)
+(0 0.055 0)
+(0.0075 0.055 0)
+(0.015 0.055 0)
+(0.0225 0.055 0)
+(0.03 0.055 0)
+(0.0375 0.055 0)
+(0.045 0.055 0)
+(0.0525 0.055 0)
+(0.06 0.055 0)
+(0.0675 0.055 0)
+(0.075 0.055 0)
+(0.0825 0.055 0)
+(0.09 0.055 0)
+(0.0975 0.055 0)
+(0.105 0.055 0)
+(0.1125 0.055 0)
+(0.12 0.055 0)
+(0.1275 0.055 0)
+(0.135 0.055 0)
+(0.1425 0.055 0)
+(0.15 0.055 0)
+(0 0.06 0)
+(0.0075 0.06 0)
+(0.015 0.06 0)
+(0.0225 0.06 0)
+(0.03 0.06 0)
+(0.0375 0.06 0)
+(0.045 0.06 0)
+(0.0525 0.06 0)
+(0.06 0.06 0)
+(0.0675 0.06 0)
+(0.075 0.06 0)
+(0.0825 0.06 0)
+(0.09 0.06 0)
+(0.0975 0.06 0)
+(0.105 0.06 0)
+(0.1125 0.06 0)
+(0.12 0.06 0)
+(0.1275 0.06 0)
+(0.135 0.06 0)
+(0.1425 0.06 0)
+(0.15 0.06 0)
+(0 0.065 0)
+(0.0075 0.065 0)
+(0.015 0.065 0)
+(0.0225 0.065 0)
+(0.03 0.065 0)
+(0.0375 0.065 0)
+(0.045 0.065 0)
+(0.0525 0.065 0)
+(0.06 0.065 0)
+(0.0675 0.065 0)
+(0.075 0.065 0)
+(0.0825 0.065 0)
+(0.09 0.065 0)
+(0.0975 0.065 0)
+(0.105 0.065 0)
+(0.1125 0.065 0)
+(0.12 0.065 0)
+(0.1275 0.065 0)
+(0.135 0.065 0)
+(0.1425 0.065 0)
+(0.15 0.065 0)
+(0 0.07 0)
+(0.0075 0.07 0)
+(0.015 0.07 0)
+(0.0225 0.07 0)
+(0.03 0.07 0)
+(0.0375 0.07 0)
+(0.045 0.07 0)
+(0.0525 0.07 0)
+(0.06 0.07 0)
+(0.0675 0.07 0)
+(0.075 0.07 0)
+(0.0825 0.07 0)
+(0.09 0.07 0)
+(0.0975 0.07 0)
+(0.105 0.07 0)
+(0.1125 0.07 0)
+(0.12 0.07 0)
+(0.1275 0.07 0)
+(0.135 0.07 0)
+(0.1425 0.07 0)
+(0.15 0.07 0)
+(0 0.075 0)
+(0.0075 0.075 0)
+(0.015 0.075 0)
+(0.0225 0.075 0)
+(0.03 0.075 0)
+(0.0375 0.075 0)
+(0.045 0.075 0)
+(0.0525 0.075 0)
+(0.06 0.075 0)
+(0.0675 0.075 0)
+(0.075 0.075 0)
+(0.0825 0.075 0)
+(0.09 0.075 0)
+(0.0975 0.075 0)
+(0.105 0.075 0)
+(0.1125 0.075 0)
+(0.12 0.075 0)
+(0.1275 0.075 0)
+(0.135 0.075 0)
+(0.1425 0.075 0)
+(0.15 0.075 0)
+(0 0.08 0)
+(0.0075 0.08 0)
+(0.015 0.08 0)
+(0.0225 0.08 0)
+(0.03 0.08 0)
+(0.0375 0.08 0)
+(0.045 0.08 0)
+(0.0525 0.08 0)
+(0.06 0.08 0)
+(0.0675 0.08 0)
+(0.075 0.08 0)
+(0.0825 0.08 0)
+(0.09 0.08 0)
+(0.0975 0.08 0)
+(0.105 0.08 0)
+(0.1125 0.08 0)
+(0.12 0.08 0)
+(0.1275 0.08 0)
+(0.135 0.08 0)
+(0.1425 0.08 0)
+(0.15 0.08 0)
+(0 0.085 0)
+(0.0075 0.085 0)
+(0.015 0.085 0)
+(0.0225 0.085 0)
+(0.03 0.085 0)
+(0.0375 0.085 0)
+(0.045 0.085 0)
+(0.0525 0.085 0)
+(0.06 0.085 0)
+(0.0675 0.085 0)
+(0.075 0.085 0)
+(0.0825 0.085 0)
+(0.09 0.085 0)
+(0.0975 0.085 0)
+(0.105 0.085 0)
+(0.1125 0.085 0)
+(0.12 0.085 0)
+(0.1275 0.085 0)
+(0.135 0.085 0)
+(0.1425 0.085 0)
+(0.15 0.085 0)
+(0 0.09 0)
+(0.0075 0.09 0)
+(0.015 0.09 0)
+(0.0225 0.09 0)
+(0.03 0.09 0)
+(0.0375 0.09 0)
+(0.045 0.09 0)
+(0.0525 0.09 0)
+(0.06 0.09 0)
+(0.0675 0.09 0)
+(0.075 0.09 0)
+(0.0825 0.09 0)
+(0.09 0.09 0)
+(0.0975 0.09 0)
+(0.105 0.09 0)
+(0.1125 0.09 0)
+(0.12 0.09 0)
+(0.1275 0.09 0)
+(0.135 0.09 0)
+(0.1425 0.09 0)
+(0.15 0.09 0)
+(0 0.095 0)
+(0.0075 0.095 0)
+(0.015 0.095 0)
+(0.0225 0.095 0)
+(0.03 0.095 0)
+(0.0375 0.095 0)
+(0.045 0.095 0)
+(0.0525 0.095 0)
+(0.06 0.095 0)
+(0.0675 0.095 0)
+(0.075 0.095 0)
+(0.0825 0.095 0)
+(0.09 0.095 0)
+(0.0975 0.095 0)
+(0.105 0.095 0)
+(0.1125 0.095 0)
+(0.12 0.095 0)
+(0.1275 0.095 0)
+(0.135 0.095 0)
+(0.1425 0.095 0)
+(0.15 0.095 0)
+(0 0.1 0)
+(0.0075 0.1 0)
+(0.015 0.1 0)
+(0.0225 0.1 0)
+(0.03 0.1 0)
+(0.0375 0.1 0)
+(0.045 0.1 0)
+(0.0525 0.1 0)
+(0.06 0.1 0)
+(0.0675 0.1 0)
+(0.075 0.1 0)
+(0.0825 0.1 0)
+(0.09 0.1 0)
+(0.0975 0.1 0)
+(0.105 0.1 0)
+(0.1125 0.1 0)
+(0.12 0.1 0)
+(0.1275 0.1 0)
+(0.135 0.1 0)
+(0.1425 0.1 0)
+(0.15 0.1 0)
+(0 0 0.01)
+(0.0075 0 0.01)
+(0.015 0 0.01)
+(0.0225 0 0.01)
+(0.03 0 0.01)
+(0.0375 0 0.01)
+(0.045 0 0.01)
+(0.0525 0 0.01)
+(0.06 0 0.01)
+(0.0675 0 0.01)
+(0.075 0 0.01)
+(0.0825 0 0.01)
+(0.09 0 0.01)
+(0.0975 0 0.01)
+(0.105 0 0.01)
+(0.1125 0 0.01)
+(0.12 0 0.01)
+(0.1275 0 0.01)
+(0.135 0 0.01)
+(0.1425 0 0.01)
+(0.15 0 0.01)
+(0 0.005 0.01)
+(0.0075 0.005 0.01)
+(0.015 0.005 0.01)
+(0.0225 0.005 0.01)
+(0.03 0.005 0.01)
+(0.0375 0.005 0.01)
+(0.045 0.005 0.01)
+(0.0525 0.005 0.01)
+(0.06 0.005 0.01)
+(0.0675 0.005 0.01)
+(0.075 0.005 0.01)
+(0.0825 0.005 0.01)
+(0.09 0.005 0.01)
+(0.0975 0.005 0.01)
+(0.105 0.005 0.01)
+(0.1125 0.005 0.01)
+(0.12 0.005 0.01)
+(0.1275 0.005 0.01)
+(0.135 0.005 0.01)
+(0.1425 0.005 0.01)
+(0.15 0.005 0.01)
+(0 0.01 0.01)
+(0.0075 0.01 0.01)
+(0.015 0.01 0.01)
+(0.0225 0.01 0.01)
+(0.03 0.01 0.01)
+(0.0375 0.01 0.01)
+(0.045 0.01 0.01)
+(0.0525 0.01 0.01)
+(0.06 0.01 0.01)
+(0.0675 0.01 0.01)
+(0.075 0.01 0.01)
+(0.0825 0.01 0.01)
+(0.09 0.01 0.01)
+(0.0975 0.01 0.01)
+(0.105 0.01 0.01)
+(0.1125 0.01 0.01)
+(0.12 0.01 0.01)
+(0.1275 0.01 0.01)
+(0.135 0.01 0.01)
+(0.1425 0.01 0.01)
+(0.15 0.01 0.01)
+(0 0.015 0.01)
+(0.0075 0.015 0.01)
+(0.015 0.015 0.01)
+(0.0225 0.015 0.01)
+(0.03 0.015 0.01)
+(0.0375 0.015 0.01)
+(0.045 0.015 0.01)
+(0.0525 0.015 0.01)
+(0.06 0.015 0.01)
+(0.0675 0.015 0.01)
+(0.075 0.015 0.01)
+(0.0825 0.015 0.01)
+(0.09 0.015 0.01)
+(0.0975 0.015 0.01)
+(0.105 0.015 0.01)
+(0.1125 0.015 0.01)
+(0.12 0.015 0.01)
+(0.1275 0.015 0.01)
+(0.135 0.015 0.01)
+(0.1425 0.015 0.01)
+(0.15 0.015 0.01)
+(0 0.02 0.01)
+(0.0075 0.02 0.01)
+(0.015 0.02 0.01)
+(0.0225 0.02 0.01)
+(0.03 0.02 0.01)
+(0.0375 0.02 0.01)
+(0.045 0.02 0.01)
+(0.0525 0.02 0.01)
+(0.06 0.02 0.01)
+(0.0675 0.02 0.01)
+(0.075 0.02 0.01)
+(0.0825 0.02 0.01)
+(0.09 0.02 0.01)
+(0.0975 0.02 0.01)
+(0.105 0.02 0.01)
+(0.1125 0.02 0.01)
+(0.12 0.02 0.01)
+(0.1275 0.02 0.01)
+(0.135 0.02 0.01)
+(0.1425 0.02 0.01)
+(0.15 0.02 0.01)
+(0 0.025 0.01)
+(0.0075 0.025 0.01)
+(0.015 0.025 0.01)
+(0.0225 0.025 0.01)
+(0.03 0.025 0.01)
+(0.0375 0.025 0.01)
+(0.045 0.025 0.01)
+(0.0525 0.025 0.01)
+(0.06 0.025 0.01)
+(0.0675 0.025 0.01)
+(0.075 0.025 0.01)
+(0.0825 0.025 0.01)
+(0.09 0.025 0.01)
+(0.0975 0.025 0.01)
+(0.105 0.025 0.01)
+(0.1125 0.025 0.01)
+(0.12 0.025 0.01)
+(0.1275 0.025 0.01)
+(0.135 0.025 0.01)
+(0.1425 0.025 0.01)
+(0.15 0.025 0.01)
+(0 0.03 0.01)
+(0.0075 0.03 0.01)
+(0.015 0.03 0.01)
+(0.0225 0.03 0.01)
+(0.03 0.03 0.01)
+(0.0375 0.03 0.01)
+(0.045 0.03 0.01)
+(0.0525 0.03 0.01)
+(0.06 0.03 0.01)
+(0.0675 0.03 0.01)
+(0.075 0.03 0.01)
+(0.0825 0.03 0.01)
+(0.09 0.03 0.01)
+(0.0975 0.03 0.01)
+(0.105 0.03 0.01)
+(0.1125 0.03 0.01)
+(0.12 0.03 0.01)
+(0.1275 0.03 0.01)
+(0.135 0.03 0.01)
+(0.1425 0.03 0.01)
+(0.15 0.03 0.01)
+(0 0.035 0.01)
+(0.0075 0.035 0.01)
+(0.015 0.035 0.01)
+(0.0225 0.035 0.01)
+(0.03 0.035 0.01)
+(0.0375 0.035 0.01)
+(0.045 0.035 0.01)
+(0.0525 0.035 0.01)
+(0.06 0.035 0.01)
+(0.0675 0.035 0.01)
+(0.075 0.035 0.01)
+(0.0825 0.035 0.01)
+(0.09 0.035 0.01)
+(0.0975 0.035 0.01)
+(0.105 0.035 0.01)
+(0.1125 0.035 0.01)
+(0.12 0.035 0.01)
+(0.1275 0.035 0.01)
+(0.135 0.035 0.01)
+(0.1425 0.035 0.01)
+(0.15 0.035 0.01)
+(0 0.04 0.01)
+(0.0075 0.04 0.01)
+(0.015 0.04 0.01)
+(0.0225 0.04 0.01)
+(0.03 0.04 0.01)
+(0.0375 0.04 0.01)
+(0.045 0.04 0.01)
+(0.0525 0.04 0.01)
+(0.06 0.04 0.01)
+(0.0675 0.04 0.01)
+(0.075 0.04 0.01)
+(0.0825 0.04 0.01)
+(0.09 0.04 0.01)
+(0.0975 0.04 0.01)
+(0.105 0.04 0.01)
+(0.1125 0.04 0.01)
+(0.12 0.04 0.01)
+(0.1275 0.04 0.01)
+(0.135 0.04 0.01)
+(0.1425 0.04 0.01)
+(0.15 0.04 0.01)
+(0 0.045 0.01)
+(0.0075 0.045 0.01)
+(0.015 0.045 0.01)
+(0.0225 0.045 0.01)
+(0.03 0.045 0.01)
+(0.0375 0.045 0.01)
+(0.045 0.045 0.01)
+(0.0525 0.045 0.01)
+(0.06 0.045 0.01)
+(0.0675 0.045 0.01)
+(0.075 0.045 0.01)
+(0.0825 0.045 0.01)
+(0.09 0.045 0.01)
+(0.0975 0.045 0.01)
+(0.105 0.045 0.01)
+(0.1125 0.045 0.01)
+(0.12 0.045 0.01)
+(0.1275 0.045 0.01)
+(0.135 0.045 0.01)
+(0.1425 0.045 0.01)
+(0.15 0.045 0.01)
+(0 0.05 0.01)
+(0.0075 0.05 0.01)
+(0.015 0.05 0.01)
+(0.0225 0.05 0.01)
+(0.03 0.05 0.01)
+(0.0375 0.05 0.01)
+(0.045 0.05 0.01)
+(0.0525 0.05 0.01)
+(0.06 0.05 0.01)
+(0.0675 0.05 0.01)
+(0.075 0.05 0.01)
+(0.0825 0.05 0.01)
+(0.09 0.05 0.01)
+(0.0975 0.05 0.01)
+(0.105 0.05 0.01)
+(0.1125 0.05 0.01)
+(0.12 0.05 0.01)
+(0.1275 0.05 0.01)
+(0.135 0.05 0.01)
+(0.1425 0.05 0.01)
+(0.15 0.05 0.01)
+(0 0.055 0.01)
+(0.0075 0.055 0.01)
+(0.015 0.055 0.01)
+(0.0225 0.055 0.01)
+(0.03 0.055 0.01)
+(0.0375 0.055 0.01)
+(0.045 0.055 0.01)
+(0.0525 0.055 0.01)
+(0.06 0.055 0.01)
+(0.0675 0.055 0.01)
+(0.075 0.055 0.01)
+(0.0825 0.055 0.01)
+(0.09 0.055 0.01)
+(0.0975 0.055 0.01)
+(0.105 0.055 0.01)
+(0.1125 0.055 0.01)
+(0.12 0.055 0.01)
+(0.1275 0.055 0.01)
+(0.135 0.055 0.01)
+(0.1425 0.055 0.01)
+(0.15 0.055 0.01)
+(0 0.06 0.01)
+(0.0075 0.06 0.01)
+(0.015 0.06 0.01)
+(0.0225 0.06 0.01)
+(0.03 0.06 0.01)
+(0.0375 0.06 0.01)
+(0.045 0.06 0.01)
+(0.0525 0.06 0.01)
+(0.06 0.06 0.01)
+(0.0675 0.06 0.01)
+(0.075 0.06 0.01)
+(0.0825 0.06 0.01)
+(0.09 0.06 0.01)
+(0.0975 0.06 0.01)
+(0.105 0.06 0.01)
+(0.1125 0.06 0.01)
+(0.12 0.06 0.01)
+(0.1275 0.06 0.01)
+(0.135 0.06 0.01)
+(0.1425 0.06 0.01)
+(0.15 0.06 0.01)
+(0 0.065 0.01)
+(0.0075 0.065 0.01)
+(0.015 0.065 0.01)
+(0.0225 0.065 0.01)
+(0.03 0.065 0.01)
+(0.0375 0.065 0.01)
+(0.045 0.065 0.01)
+(0.0525 0.065 0.01)
+(0.06 0.065 0.01)
+(0.0675 0.065 0.01)
+(0.075 0.065 0.01)
+(0.0825 0.065 0.01)
+(0.09 0.065 0.01)
+(0.0975 0.065 0.01)
+(0.105 0.065 0.01)
+(0.1125 0.065 0.01)
+(0.12 0.065 0.01)
+(0.1275 0.065 0.01)
+(0.135 0.065 0.01)
+(0.1425 0.065 0.01)
+(0.15 0.065 0.01)
+(0 0.07 0.01)
+(0.0075 0.07 0.01)
+(0.015 0.07 0.01)
+(0.0225 0.07 0.01)
+(0.03 0.07 0.01)
+(0.0375 0.07 0.01)
+(0.045 0.07 0.01)
+(0.0525 0.07 0.01)
+(0.06 0.07 0.01)
+(0.0675 0.07 0.01)
+(0.075 0.07 0.01)
+(0.0825 0.07 0.01)
+(0.09 0.07 0.01)
+(0.0975 0.07 0.01)
+(0.105 0.07 0.01)
+(0.1125 0.07 0.01)
+(0.12 0.07 0.01)
+(0.1275 0.07 0.01)
+(0.135 0.07 0.01)
+(0.1425 0.07 0.01)
+(0.15 0.07 0.01)
+(0 0.075 0.01)
+(0.0075 0.075 0.01)
+(0.015 0.075 0.01)
+(0.0225 0.075 0.01)
+(0.03 0.075 0.01)
+(0.0375 0.075 0.01)
+(0.045 0.075 0.01)
+(0.0525 0.075 0.01)
+(0.06 0.075 0.01)
+(0.0675 0.075 0.01)
+(0.075 0.075 0.01)
+(0.0825 0.075 0.01)
+(0.09 0.075 0.01)
+(0.0975 0.075 0.01)
+(0.105 0.075 0.01)
+(0.1125 0.075 0.01)
+(0.12 0.075 0.01)
+(0.1275 0.075 0.01)
+(0.135 0.075 0.01)
+(0.1425 0.075 0.01)
+(0.15 0.075 0.01)
+(0 0.08 0.01)
+(0.0075 0.08 0.01)
+(0.015 0.08 0.01)
+(0.0225 0.08 0.01)
+(0.03 0.08 0.01)
+(0.0375 0.08 0.01)
+(0.045 0.08 0.01)
+(0.0525 0.08 0.01)
+(0.06 0.08 0.01)
+(0.0675 0.08 0.01)
+(0.075 0.08 0.01)
+(0.0825 0.08 0.01)
+(0.09 0.08 0.01)
+(0.0975 0.08 0.01)
+(0.105 0.08 0.01)
+(0.1125 0.08 0.01)
+(0.12 0.08 0.01)
+(0.1275 0.08 0.01)
+(0.135 0.08 0.01)
+(0.1425 0.08 0.01)
+(0.15 0.08 0.01)
+(0 0.085 0.01)
+(0.0075 0.085 0.01)
+(0.015 0.085 0.01)
+(0.0225 0.085 0.01)
+(0.03 0.085 0.01)
+(0.0375 0.085 0.01)
+(0.045 0.085 0.01)
+(0.0525 0.085 0.01)
+(0.06 0.085 0.01)
+(0.0675 0.085 0.01)
+(0.075 0.085 0.01)
+(0.0825 0.085 0.01)
+(0.09 0.085 0.01)
+(0.0975 0.085 0.01)
+(0.105 0.085 0.01)
+(0.1125 0.085 0.01)
+(0.12 0.085 0.01)
+(0.1275 0.085 0.01)
+(0.135 0.085 0.01)
+(0.1425 0.085 0.01)
+(0.15 0.085 0.01)
+(0 0.09 0.01)
+(0.0075 0.09 0.01)
+(0.015 0.09 0.01)
+(0.0225 0.09 0.01)
+(0.03 0.09 0.01)
+(0.0375 0.09 0.01)
+(0.045 0.09 0.01)
+(0.0525 0.09 0.01)
+(0.06 0.09 0.01)
+(0.0675 0.09 0.01)
+(0.075 0.09 0.01)
+(0.0825 0.09 0.01)
+(0.09 0.09 0.01)
+(0.0975 0.09 0.01)
+(0.105 0.09 0.01)
+(0.1125 0.09 0.01)
+(0.12 0.09 0.01)
+(0.1275 0.09 0.01)
+(0.135 0.09 0.01)
+(0.1425 0.09 0.01)
+(0.15 0.09 0.01)
+(0 0.095 0.01)
+(0.0075 0.095 0.01)
+(0.015 0.095 0.01)
+(0.0225 0.095 0.01)
+(0.03 0.095 0.01)
+(0.0375 0.095 0.01)
+(0.045 0.095 0.01)
+(0.0525 0.095 0.01)
+(0.06 0.095 0.01)
+(0.0675 0.095 0.01)
+(0.075 0.095 0.01)
+(0.0825 0.095 0.01)
+(0.09 0.095 0.01)
+(0.0975 0.095 0.01)
+(0.105 0.095 0.01)
+(0.1125 0.095 0.01)
+(0.12 0.095 0.01)
+(0.1275 0.095 0.01)
+(0.135 0.095 0.01)
+(0.1425 0.095 0.01)
+(0.15 0.095 0.01)
+(0 0.1 0.01)
+(0.0075 0.1 0.01)
+(0.015 0.1 0.01)
+(0.0225 0.1 0.01)
+(0.03 0.1 0.01)
+(0.0375 0.1 0.01)
+(0.045 0.1 0.01)
+(0.0525 0.1 0.01)
+(0.06 0.1 0.01)
+(0.0675 0.1 0.01)
+(0.075 0.1 0.01)
+(0.0825 0.1 0.01)
+(0.09 0.1 0.01)
+(0.0975 0.1 0.01)
+(0.105 0.1 0.01)
+(0.1125 0.1 0.01)
+(0.12 0.1 0.01)
+(0.1275 0.1 0.01)
+(0.135 0.1 0.01)
+(0.1425 0.1 0.01)
+(0.15 0.1 0.01)
+(0.155 0 0)
+(0.16 0 0)
+(0.165 0 0)
+(0.17 0 0)
+(0.175 0 0)
+(0.18 0 0)
+(0.185 0 0)
+(0.19 0 0)
+(0.195 0 0)
+(0.2 0 0)
+(0.205 0 0)
+(0.21 0 0)
+(0.215 0 0)
+(0.22 0 0)
+(0.225 0 0)
+(0.23 0 0)
+(0.235 0 0)
+(0.24 0 0)
+(0.245 0 0)
+(0.25 0 0)
+(0.155 0.005 0)
+(0.16 0.005 0)
+(0.165 0.005 0)
+(0.17 0.005 0)
+(0.175 0.005 0)
+(0.18 0.005 0)
+(0.185 0.005 0)
+(0.19 0.005 0)
+(0.195 0.005 0)
+(0.2 0.005 0)
+(0.205 0.005 0)
+(0.21 0.005 0)
+(0.215 0.005 0)
+(0.22 0.005 0)
+(0.225 0.005 0)
+(0.23 0.005 0)
+(0.235 0.005 0)
+(0.24 0.005 0)
+(0.245 0.005 0)
+(0.25 0.005 0)
+(0.155 0.01 0)
+(0.16 0.01 0)
+(0.165 0.01 0)
+(0.17 0.01 0)
+(0.175 0.01 0)
+(0.18 0.01 0)
+(0.185 0.01 0)
+(0.19 0.01 0)
+(0.195 0.01 0)
+(0.2 0.01 0)
+(0.205 0.01 0)
+(0.21 0.01 0)
+(0.215 0.01 0)
+(0.22 0.01 0)
+(0.225 0.01 0)
+(0.23 0.01 0)
+(0.235 0.01 0)
+(0.24 0.01 0)
+(0.245 0.01 0)
+(0.25 0.01 0)
+(0.155 0.015 0)
+(0.16 0.015 0)
+(0.165 0.015 0)
+(0.17 0.015 0)
+(0.175 0.015 0)
+(0.18 0.015 0)
+(0.185 0.015 0)
+(0.19 0.015 0)
+(0.195 0.015 0)
+(0.2 0.015 0)
+(0.205 0.015 0)
+(0.21 0.015 0)
+(0.215 0.015 0)
+(0.22 0.015 0)
+(0.225 0.015 0)
+(0.23 0.015 0)
+(0.235 0.015 0)
+(0.24 0.015 0)
+(0.245 0.015 0)
+(0.25 0.015 0)
+(0.155 0.02 0)
+(0.16 0.02 0)
+(0.165 0.02 0)
+(0.17 0.02 0)
+(0.175 0.02 0)
+(0.18 0.02 0)
+(0.185 0.02 0)
+(0.19 0.02 0)
+(0.195 0.02 0)
+(0.2 0.02 0)
+(0.205 0.02 0)
+(0.21 0.02 0)
+(0.215 0.02 0)
+(0.22 0.02 0)
+(0.225 0.02 0)
+(0.23 0.02 0)
+(0.235 0.02 0)
+(0.24 0.02 0)
+(0.245 0.02 0)
+(0.25 0.02 0)
+(0.155 0.025 0)
+(0.16 0.025 0)
+(0.165 0.025 0)
+(0.17 0.025 0)
+(0.175 0.025 0)
+(0.18 0.025 0)
+(0.185 0.025 0)
+(0.19 0.025 0)
+(0.195 0.025 0)
+(0.2 0.025 0)
+(0.205 0.025 0)
+(0.21 0.025 0)
+(0.215 0.025 0)
+(0.22 0.025 0)
+(0.225 0.025 0)
+(0.23 0.025 0)
+(0.235 0.025 0)
+(0.24 0.025 0)
+(0.245 0.025 0)
+(0.25 0.025 0)
+(0.155 0.03 0)
+(0.16 0.03 0)
+(0.165 0.03 0)
+(0.17 0.03 0)
+(0.175 0.03 0)
+(0.18 0.03 0)
+(0.185 0.03 0)
+(0.19 0.03 0)
+(0.195 0.03 0)
+(0.2 0.03 0)
+(0.205 0.03 0)
+(0.21 0.03 0)
+(0.215 0.03 0)
+(0.22 0.03 0)
+(0.225 0.03 0)
+(0.23 0.03 0)
+(0.235 0.03 0)
+(0.24 0.03 0)
+(0.245 0.03 0)
+(0.25 0.03 0)
+(0.155 0.035 0)
+(0.16 0.035 0)
+(0.165 0.035 0)
+(0.17 0.035 0)
+(0.175 0.035 0)
+(0.18 0.035 0)
+(0.185 0.035 0)
+(0.19 0.035 0)
+(0.195 0.035 0)
+(0.2 0.035 0)
+(0.205 0.035 0)
+(0.21 0.035 0)
+(0.215 0.035 0)
+(0.22 0.035 0)
+(0.225 0.035 0)
+(0.23 0.035 0)
+(0.235 0.035 0)
+(0.24 0.035 0)
+(0.245 0.035 0)
+(0.25 0.035 0)
+(0.155 0.04 0)
+(0.16 0.04 0)
+(0.165 0.04 0)
+(0.17 0.04 0)
+(0.175 0.04 0)
+(0.18 0.04 0)
+(0.185 0.04 0)
+(0.19 0.04 0)
+(0.195 0.04 0)
+(0.2 0.04 0)
+(0.205 0.04 0)
+(0.21 0.04 0)
+(0.215 0.04 0)
+(0.22 0.04 0)
+(0.225 0.04 0)
+(0.23 0.04 0)
+(0.235 0.04 0)
+(0.24 0.04 0)
+(0.245 0.04 0)
+(0.25 0.04 0)
+(0.155 0.045 0)
+(0.16 0.045 0)
+(0.165 0.045 0)
+(0.17 0.045 0)
+(0.175 0.045 0)
+(0.18 0.045 0)
+(0.185 0.045 0)
+(0.19 0.045 0)
+(0.195 0.045 0)
+(0.2 0.045 0)
+(0.205 0.045 0)
+(0.21 0.045 0)
+(0.215 0.045 0)
+(0.22 0.045 0)
+(0.225 0.045 0)
+(0.23 0.045 0)
+(0.235 0.045 0)
+(0.24 0.045 0)
+(0.245 0.045 0)
+(0.25 0.045 0)
+(0.155 0.05 0)
+(0.16 0.05 0)
+(0.165 0.05 0)
+(0.17 0.05 0)
+(0.175 0.05 0)
+(0.18 0.05 0)
+(0.185 0.05 0)
+(0.19 0.05 0)
+(0.195 0.05 0)
+(0.2 0.05 0)
+(0.205 0.05 0)
+(0.21 0.05 0)
+(0.215 0.05 0)
+(0.22 0.05 0)
+(0.225 0.05 0)
+(0.23 0.05 0)
+(0.235 0.05 0)
+(0.24 0.05 0)
+(0.245 0.05 0)
+(0.25 0.05 0)
+(0.155 0.055 0)
+(0.16 0.055 0)
+(0.165 0.055 0)
+(0.17 0.055 0)
+(0.175 0.055 0)
+(0.18 0.055 0)
+(0.185 0.055 0)
+(0.19 0.055 0)
+(0.195 0.055 0)
+(0.2 0.055 0)
+(0.205 0.055 0)
+(0.21 0.055 0)
+(0.215 0.055 0)
+(0.22 0.055 0)
+(0.225 0.055 0)
+(0.23 0.055 0)
+(0.235 0.055 0)
+(0.24 0.055 0)
+(0.245 0.055 0)
+(0.25 0.055 0)
+(0.155 0.06 0)
+(0.16 0.06 0)
+(0.165 0.06 0)
+(0.17 0.06 0)
+(0.175 0.06 0)
+(0.18 0.06 0)
+(0.185 0.06 0)
+(0.19 0.06 0)
+(0.195 0.06 0)
+(0.2 0.06 0)
+(0.205 0.06 0)
+(0.21 0.06 0)
+(0.215 0.06 0)
+(0.22 0.06 0)
+(0.225 0.06 0)
+(0.23 0.06 0)
+(0.235 0.06 0)
+(0.24 0.06 0)
+(0.245 0.06 0)
+(0.25 0.06 0)
+(0.155 0.065 0)
+(0.16 0.065 0)
+(0.165 0.065 0)
+(0.17 0.065 0)
+(0.175 0.065 0)
+(0.18 0.065 0)
+(0.185 0.065 0)
+(0.19 0.065 0)
+(0.195 0.065 0)
+(0.2 0.065 0)
+(0.205 0.065 0)
+(0.21 0.065 0)
+(0.215 0.065 0)
+(0.22 0.065 0)
+(0.225 0.065 0)
+(0.23 0.065 0)
+(0.235 0.065 0)
+(0.24 0.065 0)
+(0.245 0.065 0)
+(0.25 0.065 0)
+(0.155 0.07 0)
+(0.16 0.07 0)
+(0.165 0.07 0)
+(0.17 0.07 0)
+(0.175 0.07 0)
+(0.18 0.07 0)
+(0.185 0.07 0)
+(0.19 0.07 0)
+(0.195 0.07 0)
+(0.2 0.07 0)
+(0.205 0.07 0)
+(0.21 0.07 0)
+(0.215 0.07 0)
+(0.22 0.07 0)
+(0.225 0.07 0)
+(0.23 0.07 0)
+(0.235 0.07 0)
+(0.24 0.07 0)
+(0.245 0.07 0)
+(0.25 0.07 0)
+(0.155 0.075 0)
+(0.16 0.075 0)
+(0.165 0.075 0)
+(0.17 0.075 0)
+(0.175 0.075 0)
+(0.18 0.075 0)
+(0.185 0.075 0)
+(0.19 0.075 0)
+(0.195 0.075 0)
+(0.2 0.075 0)
+(0.205 0.075 0)
+(0.21 0.075 0)
+(0.215 0.075 0)
+(0.22 0.075 0)
+(0.225 0.075 0)
+(0.23 0.075 0)
+(0.235 0.075 0)
+(0.24 0.075 0)
+(0.245 0.075 0)
+(0.25 0.075 0)
+(0.155 0.08 0)
+(0.16 0.08 0)
+(0.165 0.08 0)
+(0.17 0.08 0)
+(0.175 0.08 0)
+(0.18 0.08 0)
+(0.185 0.08 0)
+(0.19 0.08 0)
+(0.195 0.08 0)
+(0.2 0.08 0)
+(0.205 0.08 0)
+(0.21 0.08 0)
+(0.215 0.08 0)
+(0.22 0.08 0)
+(0.225 0.08 0)
+(0.23 0.08 0)
+(0.235 0.08 0)
+(0.24 0.08 0)
+(0.245 0.08 0)
+(0.25 0.08 0)
+(0.155 0.085 0)
+(0.16 0.085 0)
+(0.165 0.085 0)
+(0.17 0.085 0)
+(0.175 0.085 0)
+(0.18 0.085 0)
+(0.185 0.085 0)
+(0.19 0.085 0)
+(0.195 0.085 0)
+(0.2 0.085 0)
+(0.205 0.085 0)
+(0.21 0.085 0)
+(0.215 0.085 0)
+(0.22 0.085 0)
+(0.225 0.085 0)
+(0.23 0.085 0)
+(0.235 0.085 0)
+(0.24 0.085 0)
+(0.245 0.085 0)
+(0.25 0.085 0)
+(0.155 0.09 0)
+(0.16 0.09 0)
+(0.165 0.09 0)
+(0.17 0.09 0)
+(0.175 0.09 0)
+(0.18 0.09 0)
+(0.185 0.09 0)
+(0.19 0.09 0)
+(0.195 0.09 0)
+(0.2 0.09 0)
+(0.205 0.09 0)
+(0.21 0.09 0)
+(0.215 0.09 0)
+(0.22 0.09 0)
+(0.225 0.09 0)
+(0.23 0.09 0)
+(0.235 0.09 0)
+(0.24 0.09 0)
+(0.245 0.09 0)
+(0.25 0.09 0)
+(0.155 0.095 0)
+(0.16 0.095 0)
+(0.165 0.095 0)
+(0.17 0.095 0)
+(0.175 0.095 0)
+(0.18 0.095 0)
+(0.185 0.095 0)
+(0.19 0.095 0)
+(0.195 0.095 0)
+(0.2 0.095 0)
+(0.205 0.095 0)
+(0.21 0.095 0)
+(0.215 0.095 0)
+(0.22 0.095 0)
+(0.225 0.095 0)
+(0.23 0.095 0)
+(0.235 0.095 0)
+(0.24 0.095 0)
+(0.245 0.095 0)
+(0.25 0.095 0)
+(0.155 0.1 0)
+(0.16 0.1 0)
+(0.165 0.1 0)
+(0.17 0.1 0)
+(0.175 0.1 0)
+(0.18 0.1 0)
+(0.185 0.1 0)
+(0.19 0.1 0)
+(0.195 0.1 0)
+(0.2 0.1 0)
+(0.205 0.1 0)
+(0.21 0.1 0)
+(0.215 0.1 0)
+(0.22 0.1 0)
+(0.225 0.1 0)
+(0.23 0.1 0)
+(0.235 0.1 0)
+(0.24 0.1 0)
+(0.245 0.1 0)
+(0.25 0.1 0)
+(0.155 0 0.01)
+(0.16 0 0.01)
+(0.165 0 0.01)
+(0.17 0 0.01)
+(0.175 0 0.01)
+(0.18 0 0.01)
+(0.185 0 0.01)
+(0.19 0 0.01)
+(0.195 0 0.01)
+(0.2 0 0.01)
+(0.205 0 0.01)
+(0.21 0 0.01)
+(0.215 0 0.01)
+(0.22 0 0.01)
+(0.225 0 0.01)
+(0.23 0 0.01)
+(0.235 0 0.01)
+(0.24 0 0.01)
+(0.245 0 0.01)
+(0.25 0 0.01)
+(0.155 0.005 0.01)
+(0.16 0.005 0.01)
+(0.165 0.005 0.01)
+(0.17 0.005 0.01)
+(0.175 0.005 0.01)
+(0.18 0.005 0.01)
+(0.185 0.005 0.01)
+(0.19 0.005 0.01)
+(0.195 0.005 0.01)
+(0.2 0.005 0.01)
+(0.205 0.005 0.01)
+(0.21 0.005 0.01)
+(0.215 0.005 0.01)
+(0.22 0.005 0.01)
+(0.225 0.005 0.01)
+(0.23 0.005 0.01)
+(0.235 0.005 0.01)
+(0.24 0.005 0.01)
+(0.245 0.005 0.01)
+(0.25 0.005 0.01)
+(0.155 0.01 0.01)
+(0.16 0.01 0.01)
+(0.165 0.01 0.01)
+(0.17 0.01 0.01)
+(0.175 0.01 0.01)
+(0.18 0.01 0.01)
+(0.185 0.01 0.01)
+(0.19 0.01 0.01)
+(0.195 0.01 0.01)
+(0.2 0.01 0.01)
+(0.205 0.01 0.01)
+(0.21 0.01 0.01)
+(0.215 0.01 0.01)
+(0.22 0.01 0.01)
+(0.225 0.01 0.01)
+(0.23 0.01 0.01)
+(0.235 0.01 0.01)
+(0.24 0.01 0.01)
+(0.245 0.01 0.01)
+(0.25 0.01 0.01)
+(0.155 0.015 0.01)
+(0.16 0.015 0.01)
+(0.165 0.015 0.01)
+(0.17 0.015 0.01)
+(0.175 0.015 0.01)
+(0.18 0.015 0.01)
+(0.185 0.015 0.01)
+(0.19 0.015 0.01)
+(0.195 0.015 0.01)
+(0.2 0.015 0.01)
+(0.205 0.015 0.01)
+(0.21 0.015 0.01)
+(0.215 0.015 0.01)
+(0.22 0.015 0.01)
+(0.225 0.015 0.01)
+(0.23 0.015 0.01)
+(0.235 0.015 0.01)
+(0.24 0.015 0.01)
+(0.245 0.015 0.01)
+(0.25 0.015 0.01)
+(0.155 0.02 0.01)
+(0.16 0.02 0.01)
+(0.165 0.02 0.01)
+(0.17 0.02 0.01)
+(0.175 0.02 0.01)
+(0.18 0.02 0.01)
+(0.185 0.02 0.01)
+(0.19 0.02 0.01)
+(0.195 0.02 0.01)
+(0.2 0.02 0.01)
+(0.205 0.02 0.01)
+(0.21 0.02 0.01)
+(0.215 0.02 0.01)
+(0.22 0.02 0.01)
+(0.225 0.02 0.01)
+(0.23 0.02 0.01)
+(0.235 0.02 0.01)
+(0.24 0.02 0.01)
+(0.245 0.02 0.01)
+(0.25 0.02 0.01)
+(0.155 0.025 0.01)
+(0.16 0.025 0.01)
+(0.165 0.025 0.01)
+(0.17 0.025 0.01)
+(0.175 0.025 0.01)
+(0.18 0.025 0.01)
+(0.185 0.025 0.01)
+(0.19 0.025 0.01)
+(0.195 0.025 0.01)
+(0.2 0.025 0.01)
+(0.205 0.025 0.01)
+(0.21 0.025 0.01)
+(0.215 0.025 0.01)
+(0.22 0.025 0.01)
+(0.225 0.025 0.01)
+(0.23 0.025 0.01)
+(0.235 0.025 0.01)
+(0.24 0.025 0.01)
+(0.245 0.025 0.01)
+(0.25 0.025 0.01)
+(0.155 0.03 0.01)
+(0.16 0.03 0.01)
+(0.165 0.03 0.01)
+(0.17 0.03 0.01)
+(0.175 0.03 0.01)
+(0.18 0.03 0.01)
+(0.185 0.03 0.01)
+(0.19 0.03 0.01)
+(0.195 0.03 0.01)
+(0.2 0.03 0.01)
+(0.205 0.03 0.01)
+(0.21 0.03 0.01)
+(0.215 0.03 0.01)
+(0.22 0.03 0.01)
+(0.225 0.03 0.01)
+(0.23 0.03 0.01)
+(0.235 0.03 0.01)
+(0.24 0.03 0.01)
+(0.245 0.03 0.01)
+(0.25 0.03 0.01)
+(0.155 0.035 0.01)
+(0.16 0.035 0.01)
+(0.165 0.035 0.01)
+(0.17 0.035 0.01)
+(0.175 0.035 0.01)
+(0.18 0.035 0.01)
+(0.185 0.035 0.01)
+(0.19 0.035 0.01)
+(0.195 0.035 0.01)
+(0.2 0.035 0.01)
+(0.205 0.035 0.01)
+(0.21 0.035 0.01)
+(0.215 0.035 0.01)
+(0.22 0.035 0.01)
+(0.225 0.035 0.01)
+(0.23 0.035 0.01)
+(0.235 0.035 0.01)
+(0.24 0.035 0.01)
+(0.245 0.035 0.01)
+(0.25 0.035 0.01)
+(0.155 0.04 0.01)
+(0.16 0.04 0.01)
+(0.165 0.04 0.01)
+(0.17 0.04 0.01)
+(0.175 0.04 0.01)
+(0.18 0.04 0.01)
+(0.185 0.04 0.01)
+(0.19 0.04 0.01)
+(0.195 0.04 0.01)
+(0.2 0.04 0.01)
+(0.205 0.04 0.01)
+(0.21 0.04 0.01)
+(0.215 0.04 0.01)
+(0.22 0.04 0.01)
+(0.225 0.04 0.01)
+(0.23 0.04 0.01)
+(0.235 0.04 0.01)
+(0.24 0.04 0.01)
+(0.245 0.04 0.01)
+(0.25 0.04 0.01)
+(0.155 0.045 0.01)
+(0.16 0.045 0.01)
+(0.165 0.045 0.01)
+(0.17 0.045 0.01)
+(0.175 0.045 0.01)
+(0.18 0.045 0.01)
+(0.185 0.045 0.01)
+(0.19 0.045 0.01)
+(0.195 0.045 0.01)
+(0.2 0.045 0.01)
+(0.205 0.045 0.01)
+(0.21 0.045 0.01)
+(0.215 0.045 0.01)
+(0.22 0.045 0.01)
+(0.225 0.045 0.01)
+(0.23 0.045 0.01)
+(0.235 0.045 0.01)
+(0.24 0.045 0.01)
+(0.245 0.045 0.01)
+(0.25 0.045 0.01)
+(0.155 0.05 0.01)
+(0.16 0.05 0.01)
+(0.165 0.05 0.01)
+(0.17 0.05 0.01)
+(0.175 0.05 0.01)
+(0.18 0.05 0.01)
+(0.185 0.05 0.01)
+(0.19 0.05 0.01)
+(0.195 0.05 0.01)
+(0.2 0.05 0.01)
+(0.205 0.05 0.01)
+(0.21 0.05 0.01)
+(0.215 0.05 0.01)
+(0.22 0.05 0.01)
+(0.225 0.05 0.01)
+(0.23 0.05 0.01)
+(0.235 0.05 0.01)
+(0.24 0.05 0.01)
+(0.245 0.05 0.01)
+(0.25 0.05 0.01)
+(0.155 0.055 0.01)
+(0.16 0.055 0.01)
+(0.165 0.055 0.01)
+(0.17 0.055 0.01)
+(0.175 0.055 0.01)
+(0.18 0.055 0.01)
+(0.185 0.055 0.01)
+(0.19 0.055 0.01)
+(0.195 0.055 0.01)
+(0.2 0.055 0.01)
+(0.205 0.055 0.01)
+(0.21 0.055 0.01)
+(0.215 0.055 0.01)
+(0.22 0.055 0.01)
+(0.225 0.055 0.01)
+(0.23 0.055 0.01)
+(0.235 0.055 0.01)
+(0.24 0.055 0.01)
+(0.245 0.055 0.01)
+(0.25 0.055 0.01)
+(0.155 0.06 0.01)
+(0.16 0.06 0.01)
+(0.165 0.06 0.01)
+(0.17 0.06 0.01)
+(0.175 0.06 0.01)
+(0.18 0.06 0.01)
+(0.185 0.06 0.01)
+(0.19 0.06 0.01)
+(0.195 0.06 0.01)
+(0.2 0.06 0.01)
+(0.205 0.06 0.01)
+(0.21 0.06 0.01)
+(0.215 0.06 0.01)
+(0.22 0.06 0.01)
+(0.225 0.06 0.01)
+(0.23 0.06 0.01)
+(0.235 0.06 0.01)
+(0.24 0.06 0.01)
+(0.245 0.06 0.01)
+(0.25 0.06 0.01)
+(0.155 0.065 0.01)
+(0.16 0.065 0.01)
+(0.165 0.065 0.01)
+(0.17 0.065 0.01)
+(0.175 0.065 0.01)
+(0.18 0.065 0.01)
+(0.185 0.065 0.01)
+(0.19 0.065 0.01)
+(0.195 0.065 0.01)
+(0.2 0.065 0.01)
+(0.205 0.065 0.01)
+(0.21 0.065 0.01)
+(0.215 0.065 0.01)
+(0.22 0.065 0.01)
+(0.225 0.065 0.01)
+(0.23 0.065 0.01)
+(0.235 0.065 0.01)
+(0.24 0.065 0.01)
+(0.245 0.065 0.01)
+(0.25 0.065 0.01)
+(0.155 0.07 0.01)
+(0.16 0.07 0.01)
+(0.165 0.07 0.01)
+(0.17 0.07 0.01)
+(0.175 0.07 0.01)
+(0.18 0.07 0.01)
+(0.185 0.07 0.01)
+(0.19 0.07 0.01)
+(0.195 0.07 0.01)
+(0.2 0.07 0.01)
+(0.205 0.07 0.01)
+(0.21 0.07 0.01)
+(0.215 0.07 0.01)
+(0.22 0.07 0.01)
+(0.225 0.07 0.01)
+(0.23 0.07 0.01)
+(0.235 0.07 0.01)
+(0.24 0.07 0.01)
+(0.245 0.07 0.01)
+(0.25 0.07 0.01)
+(0.155 0.075 0.01)
+(0.16 0.075 0.01)
+(0.165 0.075 0.01)
+(0.17 0.075 0.01)
+(0.175 0.075 0.01)
+(0.18 0.075 0.01)
+(0.185 0.075 0.01)
+(0.19 0.075 0.01)
+(0.195 0.075 0.01)
+(0.2 0.075 0.01)
+(0.205 0.075 0.01)
+(0.21 0.075 0.01)
+(0.215 0.075 0.01)
+(0.22 0.075 0.01)
+(0.225 0.075 0.01)
+(0.23 0.075 0.01)
+(0.235 0.075 0.01)
+(0.24 0.075 0.01)
+(0.245 0.075 0.01)
+(0.25 0.075 0.01)
+(0.155 0.08 0.01)
+(0.16 0.08 0.01)
+(0.165 0.08 0.01)
+(0.17 0.08 0.01)
+(0.175 0.08 0.01)
+(0.18 0.08 0.01)
+(0.185 0.08 0.01)
+(0.19 0.08 0.01)
+(0.195 0.08 0.01)
+(0.2 0.08 0.01)
+(0.205 0.08 0.01)
+(0.21 0.08 0.01)
+(0.215 0.08 0.01)
+(0.22 0.08 0.01)
+(0.225 0.08 0.01)
+(0.23 0.08 0.01)
+(0.235 0.08 0.01)
+(0.24 0.08 0.01)
+(0.245 0.08 0.01)
+(0.25 0.08 0.01)
+(0.155 0.085 0.01)
+(0.16 0.085 0.01)
+(0.165 0.085 0.01)
+(0.17 0.085 0.01)
+(0.175 0.085 0.01)
+(0.18 0.085 0.01)
+(0.185 0.085 0.01)
+(0.19 0.085 0.01)
+(0.195 0.085 0.01)
+(0.2 0.085 0.01)
+(0.205 0.085 0.01)
+(0.21 0.085 0.01)
+(0.215 0.085 0.01)
+(0.22 0.085 0.01)
+(0.225 0.085 0.01)
+(0.23 0.085 0.01)
+(0.235 0.085 0.01)
+(0.24 0.085 0.01)
+(0.245 0.085 0.01)
+(0.25 0.085 0.01)
+(0.155 0.09 0.01)
+(0.16 0.09 0.01)
+(0.165 0.09 0.01)
+(0.17 0.09 0.01)
+(0.175 0.09 0.01)
+(0.18 0.09 0.01)
+(0.185 0.09 0.01)
+(0.19 0.09 0.01)
+(0.195 0.09 0.01)
+(0.2 0.09 0.01)
+(0.205 0.09 0.01)
+(0.21 0.09 0.01)
+(0.215 0.09 0.01)
+(0.22 0.09 0.01)
+(0.225 0.09 0.01)
+(0.23 0.09 0.01)
+(0.235 0.09 0.01)
+(0.24 0.09 0.01)
+(0.245 0.09 0.01)
+(0.25 0.09 0.01)
+(0.155 0.095 0.01)
+(0.16 0.095 0.01)
+(0.165 0.095 0.01)
+(0.17 0.095 0.01)
+(0.175 0.095 0.01)
+(0.18 0.095 0.01)
+(0.185 0.095 0.01)
+(0.19 0.095 0.01)
+(0.195 0.095 0.01)
+(0.2 0.095 0.01)
+(0.205 0.095 0.01)
+(0.21 0.095 0.01)
+(0.215 0.095 0.01)
+(0.22 0.095 0.01)
+(0.225 0.095 0.01)
+(0.23 0.095 0.01)
+(0.235 0.095 0.01)
+(0.24 0.095 0.01)
+(0.245 0.095 0.01)
+(0.25 0.095 0.01)
+(0.155 0.1 0.01)
+(0.16 0.1 0.01)
+(0.165 0.1 0.01)
+(0.17 0.1 0.01)
+(0.175 0.1 0.01)
+(0.18 0.1 0.01)
+(0.185 0.1 0.01)
+(0.19 0.1 0.01)
+(0.195 0.1 0.01)
+(0.2 0.1 0.01)
+(0.205 0.1 0.01)
+(0.21 0.1 0.01)
+(0.215 0.1 0.01)
+(0.22 0.1 0.01)
+(0.225 0.1 0.01)
+(0.23 0.1 0.01)
+(0.235 0.1 0.01)
+(0.24 0.1 0.01)
+(0.245 0.1 0.01)
+(0.25 0.1 0.01)
+(0.2575 0 0)
+(0.265 0 0)
+(0.2725 0 0)
+(0.28 0 0)
+(0.2875 0 0)
+(0.295 0 0)
+(0.3025 0 0)
+(0.31 0 0)
+(0.3175 0 0)
+(0.325 0 0)
+(0.3325 0 0)
+(0.34 0 0)
+(0.3475 0 0)
+(0.355 0 0)
+(0.3625 0 0)
+(0.37 0 0)
+(0.3775 0 0)
+(0.385 0 0)
+(0.3925 0 0)
+(0.4 0 0)
+(0.2575 0.005 0)
+(0.265 0.005 0)
+(0.2725 0.005 0)
+(0.28 0.005 0)
+(0.2875 0.005 0)
+(0.295 0.005 0)
+(0.3025 0.005 0)
+(0.31 0.005 0)
+(0.3175 0.005 0)
+(0.325 0.005 0)
+(0.3325 0.005 0)
+(0.34 0.005 0)
+(0.3475 0.005 0)
+(0.355 0.005 0)
+(0.3625 0.005 0)
+(0.37 0.005 0)
+(0.3775 0.005 0)
+(0.385 0.005 0)
+(0.3925 0.005 0)
+(0.4 0.005 0)
+(0.2575 0.01 0)
+(0.265 0.01 0)
+(0.2725 0.01 0)
+(0.28 0.01 0)
+(0.2875 0.01 0)
+(0.295 0.01 0)
+(0.3025 0.01 0)
+(0.31 0.01 0)
+(0.3175 0.01 0)
+(0.325 0.01 0)
+(0.3325 0.01 0)
+(0.34 0.01 0)
+(0.3475 0.01 0)
+(0.355 0.01 0)
+(0.3625 0.01 0)
+(0.37 0.01 0)
+(0.3775 0.01 0)
+(0.385 0.01 0)
+(0.3925 0.01 0)
+(0.4 0.01 0)
+(0.2575 0.015 0)
+(0.265 0.015 0)
+(0.2725 0.015 0)
+(0.28 0.015 0)
+(0.2875 0.015 0)
+(0.295 0.015 0)
+(0.3025 0.015 0)
+(0.31 0.015 0)
+(0.3175 0.015 0)
+(0.325 0.015 0)
+(0.3325 0.015 0)
+(0.34 0.015 0)
+(0.3475 0.015 0)
+(0.355 0.015 0)
+(0.3625 0.015 0)
+(0.37 0.015 0)
+(0.3775 0.015 0)
+(0.385 0.015 0)
+(0.3925 0.015 0)
+(0.4 0.015 0)
+(0.2575 0.02 0)
+(0.265 0.02 0)
+(0.2725 0.02 0)
+(0.28 0.02 0)
+(0.2875 0.02 0)
+(0.295 0.02 0)
+(0.3025 0.02 0)
+(0.31 0.02 0)
+(0.3175 0.02 0)
+(0.325 0.02 0)
+(0.3325 0.02 0)
+(0.34 0.02 0)
+(0.3475 0.02 0)
+(0.355 0.02 0)
+(0.3625 0.02 0)
+(0.37 0.02 0)
+(0.3775 0.02 0)
+(0.385 0.02 0)
+(0.3925 0.02 0)
+(0.4 0.02 0)
+(0.2575 0.025 0)
+(0.265 0.025 0)
+(0.2725 0.025 0)
+(0.28 0.025 0)
+(0.2875 0.025 0)
+(0.295 0.025 0)
+(0.3025 0.025 0)
+(0.31 0.025 0)
+(0.3175 0.025 0)
+(0.325 0.025 0)
+(0.3325 0.025 0)
+(0.34 0.025 0)
+(0.3475 0.025 0)
+(0.355 0.025 0)
+(0.3625 0.025 0)
+(0.37 0.025 0)
+(0.3775 0.025 0)
+(0.385 0.025 0)
+(0.3925 0.025 0)
+(0.4 0.025 0)
+(0.2575 0.03 0)
+(0.265 0.03 0)
+(0.2725 0.03 0)
+(0.28 0.03 0)
+(0.2875 0.03 0)
+(0.295 0.03 0)
+(0.3025 0.03 0)
+(0.31 0.03 0)
+(0.3175 0.03 0)
+(0.325 0.03 0)
+(0.3325 0.03 0)
+(0.34 0.03 0)
+(0.3475 0.03 0)
+(0.355 0.03 0)
+(0.3625 0.03 0)
+(0.37 0.03 0)
+(0.3775 0.03 0)
+(0.385 0.03 0)
+(0.3925 0.03 0)
+(0.4 0.03 0)
+(0.2575 0.035 0)
+(0.265 0.035 0)
+(0.2725 0.035 0)
+(0.28 0.035 0)
+(0.2875 0.035 0)
+(0.295 0.035 0)
+(0.3025 0.035 0)
+(0.31 0.035 0)
+(0.3175 0.035 0)
+(0.325 0.035 0)
+(0.3325 0.035 0)
+(0.34 0.035 0)
+(0.3475 0.035 0)
+(0.355 0.035 0)
+(0.3625 0.035 0)
+(0.37 0.035 0)
+(0.3775 0.035 0)
+(0.385 0.035 0)
+(0.3925 0.035 0)
+(0.4 0.035 0)
+(0.2575 0.04 0)
+(0.265 0.04 0)
+(0.2725 0.04 0)
+(0.28 0.04 0)
+(0.2875 0.04 0)
+(0.295 0.04 0)
+(0.3025 0.04 0)
+(0.31 0.04 0)
+(0.3175 0.04 0)
+(0.325 0.04 0)
+(0.3325 0.04 0)
+(0.34 0.04 0)
+(0.3475 0.04 0)
+(0.355 0.04 0)
+(0.3625 0.04 0)
+(0.37 0.04 0)
+(0.3775 0.04 0)
+(0.385 0.04 0)
+(0.3925 0.04 0)
+(0.4 0.04 0)
+(0.2575 0.045 0)
+(0.265 0.045 0)
+(0.2725 0.045 0)
+(0.28 0.045 0)
+(0.2875 0.045 0)
+(0.295 0.045 0)
+(0.3025 0.045 0)
+(0.31 0.045 0)
+(0.3175 0.045 0)
+(0.325 0.045 0)
+(0.3325 0.045 0)
+(0.34 0.045 0)
+(0.3475 0.045 0)
+(0.355 0.045 0)
+(0.3625 0.045 0)
+(0.37 0.045 0)
+(0.3775 0.045 0)
+(0.385 0.045 0)
+(0.3925 0.045 0)
+(0.4 0.045 0)
+(0.2575 0.05 0)
+(0.265 0.05 0)
+(0.2725 0.05 0)
+(0.28 0.05 0)
+(0.2875 0.05 0)
+(0.295 0.05 0)
+(0.3025 0.05 0)
+(0.31 0.05 0)
+(0.3175 0.05 0)
+(0.325 0.05 0)
+(0.3325 0.05 0)
+(0.34 0.05 0)
+(0.3475 0.05 0)
+(0.355 0.05 0)
+(0.3625 0.05 0)
+(0.37 0.05 0)
+(0.3775 0.05 0)
+(0.385 0.05 0)
+(0.3925 0.05 0)
+(0.4 0.05 0)
+(0.2575 0.055 0)
+(0.265 0.055 0)
+(0.2725 0.055 0)
+(0.28 0.055 0)
+(0.2875 0.055 0)
+(0.295 0.055 0)
+(0.3025 0.055 0)
+(0.31 0.055 0)
+(0.3175 0.055 0)
+(0.325 0.055 0)
+(0.3325 0.055 0)
+(0.34 0.055 0)
+(0.3475 0.055 0)
+(0.355 0.055 0)
+(0.3625 0.055 0)
+(0.37 0.055 0)
+(0.3775 0.055 0)
+(0.385 0.055 0)
+(0.3925 0.055 0)
+(0.4 0.055 0)
+(0.2575 0.06 0)
+(0.265 0.06 0)
+(0.2725 0.06 0)
+(0.28 0.06 0)
+(0.2875 0.06 0)
+(0.295 0.06 0)
+(0.3025 0.06 0)
+(0.31 0.06 0)
+(0.3175 0.06 0)
+(0.325 0.06 0)
+(0.3325 0.06 0)
+(0.34 0.06 0)
+(0.3475 0.06 0)
+(0.355 0.06 0)
+(0.3625 0.06 0)
+(0.37 0.06 0)
+(0.3775 0.06 0)
+(0.385 0.06 0)
+(0.3925 0.06 0)
+(0.4 0.06 0)
+(0.2575 0.065 0)
+(0.265 0.065 0)
+(0.2725 0.065 0)
+(0.28 0.065 0)
+(0.2875 0.065 0)
+(0.295 0.065 0)
+(0.3025 0.065 0)
+(0.31 0.065 0)
+(0.3175 0.065 0)
+(0.325 0.065 0)
+(0.3325 0.065 0)
+(0.34 0.065 0)
+(0.3475 0.065 0)
+(0.355 0.065 0)
+(0.3625 0.065 0)
+(0.37 0.065 0)
+(0.3775 0.065 0)
+(0.385 0.065 0)
+(0.3925 0.065 0)
+(0.4 0.065 0)
+(0.2575 0.07 0)
+(0.265 0.07 0)
+(0.2725 0.07 0)
+(0.28 0.07 0)
+(0.2875 0.07 0)
+(0.295 0.07 0)
+(0.3025 0.07 0)
+(0.31 0.07 0)
+(0.3175 0.07 0)
+(0.325 0.07 0)
+(0.3325 0.07 0)
+(0.34 0.07 0)
+(0.3475 0.07 0)
+(0.355 0.07 0)
+(0.3625 0.07 0)
+(0.37 0.07 0)
+(0.3775 0.07 0)
+(0.385 0.07 0)
+(0.3925 0.07 0)
+(0.4 0.07 0)
+(0.2575 0.075 0)
+(0.265 0.075 0)
+(0.2725 0.075 0)
+(0.28 0.075 0)
+(0.2875 0.075 0)
+(0.295 0.075 0)
+(0.3025 0.075 0)
+(0.31 0.075 0)
+(0.3175 0.075 0)
+(0.325 0.075 0)
+(0.3325 0.075 0)
+(0.34 0.075 0)
+(0.3475 0.075 0)
+(0.355 0.075 0)
+(0.3625 0.075 0)
+(0.37 0.075 0)
+(0.3775 0.075 0)
+(0.385 0.075 0)
+(0.3925 0.075 0)
+(0.4 0.075 0)
+(0.2575 0.08 0)
+(0.265 0.08 0)
+(0.2725 0.08 0)
+(0.28 0.08 0)
+(0.2875 0.08 0)
+(0.295 0.08 0)
+(0.3025 0.08 0)
+(0.31 0.08 0)
+(0.3175 0.08 0)
+(0.325 0.08 0)
+(0.3325 0.08 0)
+(0.34 0.08 0)
+(0.3475 0.08 0)
+(0.355 0.08 0)
+(0.3625 0.08 0)
+(0.37 0.08 0)
+(0.3775 0.08 0)
+(0.385 0.08 0)
+(0.3925 0.08 0)
+(0.4 0.08 0)
+(0.2575 0.085 0)
+(0.265 0.085 0)
+(0.2725 0.085 0)
+(0.28 0.085 0)
+(0.2875 0.085 0)
+(0.295 0.085 0)
+(0.3025 0.085 0)
+(0.31 0.085 0)
+(0.3175 0.085 0)
+(0.325 0.085 0)
+(0.3325 0.085 0)
+(0.34 0.085 0)
+(0.3475 0.085 0)
+(0.355 0.085 0)
+(0.3625 0.085 0)
+(0.37 0.085 0)
+(0.3775 0.085 0)
+(0.385 0.085 0)
+(0.3925 0.085 0)
+(0.4 0.085 0)
+(0.2575 0.09 0)
+(0.265 0.09 0)
+(0.2725 0.09 0)
+(0.28 0.09 0)
+(0.2875 0.09 0)
+(0.295 0.09 0)
+(0.3025 0.09 0)
+(0.31 0.09 0)
+(0.3175 0.09 0)
+(0.325 0.09 0)
+(0.3325 0.09 0)
+(0.34 0.09 0)
+(0.3475 0.09 0)
+(0.355 0.09 0)
+(0.3625 0.09 0)
+(0.37 0.09 0)
+(0.3775 0.09 0)
+(0.385 0.09 0)
+(0.3925 0.09 0)
+(0.4 0.09 0)
+(0.2575 0.095 0)
+(0.265 0.095 0)
+(0.2725 0.095 0)
+(0.28 0.095 0)
+(0.2875 0.095 0)
+(0.295 0.095 0)
+(0.3025 0.095 0)
+(0.31 0.095 0)
+(0.3175 0.095 0)
+(0.325 0.095 0)
+(0.3325 0.095 0)
+(0.34 0.095 0)
+(0.3475 0.095 0)
+(0.355 0.095 0)
+(0.3625 0.095 0)
+(0.37 0.095 0)
+(0.3775 0.095 0)
+(0.385 0.095 0)
+(0.3925 0.095 0)
+(0.4 0.095 0)
+(0.2575 0.1 0)
+(0.265 0.1 0)
+(0.2725 0.1 0)
+(0.28 0.1 0)
+(0.2875 0.1 0)
+(0.295 0.1 0)
+(0.3025 0.1 0)
+(0.31 0.1 0)
+(0.3175 0.1 0)
+(0.325 0.1 0)
+(0.3325 0.1 0)
+(0.34 0.1 0)
+(0.3475 0.1 0)
+(0.355 0.1 0)
+(0.3625 0.1 0)
+(0.37 0.1 0)
+(0.3775 0.1 0)
+(0.385 0.1 0)
+(0.3925 0.1 0)
+(0.4 0.1 0)
+(0.2575 0 0.01)
+(0.265 0 0.01)
+(0.2725 0 0.01)
+(0.28 0 0.01)
+(0.2875 0 0.01)
+(0.295 0 0.01)
+(0.3025 0 0.01)
+(0.31 0 0.01)
+(0.3175 0 0.01)
+(0.325 0 0.01)
+(0.3325 0 0.01)
+(0.34 0 0.01)
+(0.3475 0 0.01)
+(0.355 0 0.01)
+(0.3625 0 0.01)
+(0.37 0 0.01)
+(0.3775 0 0.01)
+(0.385 0 0.01)
+(0.3925 0 0.01)
+(0.4 0 0.01)
+(0.2575 0.005 0.01)
+(0.265 0.005 0.01)
+(0.2725 0.005 0.01)
+(0.28 0.005 0.01)
+(0.2875 0.005 0.01)
+(0.295 0.005 0.01)
+(0.3025 0.005 0.01)
+(0.31 0.005 0.01)
+(0.3175 0.005 0.01)
+(0.325 0.005 0.01)
+(0.3325 0.005 0.01)
+(0.34 0.005 0.01)
+(0.3475 0.005 0.01)
+(0.355 0.005 0.01)
+(0.3625 0.005 0.01)
+(0.37 0.005 0.01)
+(0.3775 0.005 0.01)
+(0.385 0.005 0.01)
+(0.3925 0.005 0.01)
+(0.4 0.005 0.01)
+(0.2575 0.01 0.01)
+(0.265 0.01 0.01)
+(0.2725 0.01 0.01)
+(0.28 0.01 0.01)
+(0.2875 0.01 0.01)
+(0.295 0.01 0.01)
+(0.3025 0.01 0.01)
+(0.31 0.01 0.01)
+(0.3175 0.01 0.01)
+(0.325 0.01 0.01)
+(0.3325 0.01 0.01)
+(0.34 0.01 0.01)
+(0.3475 0.01 0.01)
+(0.355 0.01 0.01)
+(0.3625 0.01 0.01)
+(0.37 0.01 0.01)
+(0.3775 0.01 0.01)
+(0.385 0.01 0.01)
+(0.3925 0.01 0.01)
+(0.4 0.01 0.01)
+(0.2575 0.015 0.01)
+(0.265 0.015 0.01)
+(0.2725 0.015 0.01)
+(0.28 0.015 0.01)
+(0.2875 0.015 0.01)
+(0.295 0.015 0.01)
+(0.3025 0.015 0.01)
+(0.31 0.015 0.01)
+(0.3175 0.015 0.01)
+(0.325 0.015 0.01)
+(0.3325 0.015 0.01)
+(0.34 0.015 0.01)
+(0.3475 0.015 0.01)
+(0.355 0.015 0.01)
+(0.3625 0.015 0.01)
+(0.37 0.015 0.01)
+(0.3775 0.015 0.01)
+(0.385 0.015 0.01)
+(0.3925 0.015 0.01)
+(0.4 0.015 0.01)
+(0.2575 0.02 0.01)
+(0.265 0.02 0.01)
+(0.2725 0.02 0.01)
+(0.28 0.02 0.01)
+(0.2875 0.02 0.01)
+(0.295 0.02 0.01)
+(0.3025 0.02 0.01)
+(0.31 0.02 0.01)
+(0.3175 0.02 0.01)
+(0.325 0.02 0.01)
+(0.3325 0.02 0.01)
+(0.34 0.02 0.01)
+(0.3475 0.02 0.01)
+(0.355 0.02 0.01)
+(0.3625 0.02 0.01)
+(0.37 0.02 0.01)
+(0.3775 0.02 0.01)
+(0.385 0.02 0.01)
+(0.3925 0.02 0.01)
+(0.4 0.02 0.01)
+(0.2575 0.025 0.01)
+(0.265 0.025 0.01)
+(0.2725 0.025 0.01)
+(0.28 0.025 0.01)
+(0.2875 0.025 0.01)
+(0.295 0.025 0.01)
+(0.3025 0.025 0.01)
+(0.31 0.025 0.01)
+(0.3175 0.025 0.01)
+(0.325 0.025 0.01)
+(0.3325 0.025 0.01)
+(0.34 0.025 0.01)
+(0.3475 0.025 0.01)
+(0.355 0.025 0.01)
+(0.3625 0.025 0.01)
+(0.37 0.025 0.01)
+(0.3775 0.025 0.01)
+(0.385 0.025 0.01)
+(0.3925 0.025 0.01)
+(0.4 0.025 0.01)
+(0.2575 0.03 0.01)
+(0.265 0.03 0.01)
+(0.2725 0.03 0.01)
+(0.28 0.03 0.01)
+(0.2875 0.03 0.01)
+(0.295 0.03 0.01)
+(0.3025 0.03 0.01)
+(0.31 0.03 0.01)
+(0.3175 0.03 0.01)
+(0.325 0.03 0.01)
+(0.3325 0.03 0.01)
+(0.34 0.03 0.01)
+(0.3475 0.03 0.01)
+(0.355 0.03 0.01)
+(0.3625 0.03 0.01)
+(0.37 0.03 0.01)
+(0.3775 0.03 0.01)
+(0.385 0.03 0.01)
+(0.3925 0.03 0.01)
+(0.4 0.03 0.01)
+(0.2575 0.035 0.01)
+(0.265 0.035 0.01)
+(0.2725 0.035 0.01)
+(0.28 0.035 0.01)
+(0.2875 0.035 0.01)
+(0.295 0.035 0.01)
+(0.3025 0.035 0.01)
+(0.31 0.035 0.01)
+(0.3175 0.035 0.01)
+(0.325 0.035 0.01)
+(0.3325 0.035 0.01)
+(0.34 0.035 0.01)
+(0.3475 0.035 0.01)
+(0.355 0.035 0.01)
+(0.3625 0.035 0.01)
+(0.37 0.035 0.01)
+(0.3775 0.035 0.01)
+(0.385 0.035 0.01)
+(0.3925 0.035 0.01)
+(0.4 0.035 0.01)
+(0.2575 0.04 0.01)
+(0.265 0.04 0.01)
+(0.2725 0.04 0.01)
+(0.28 0.04 0.01)
+(0.2875 0.04 0.01)
+(0.295 0.04 0.01)
+(0.3025 0.04 0.01)
+(0.31 0.04 0.01)
+(0.3175 0.04 0.01)
+(0.325 0.04 0.01)
+(0.3325 0.04 0.01)
+(0.34 0.04 0.01)
+(0.3475 0.04 0.01)
+(0.355 0.04 0.01)
+(0.3625 0.04 0.01)
+(0.37 0.04 0.01)
+(0.3775 0.04 0.01)
+(0.385 0.04 0.01)
+(0.3925 0.04 0.01)
+(0.4 0.04 0.01)
+(0.2575 0.045 0.01)
+(0.265 0.045 0.01)
+(0.2725 0.045 0.01)
+(0.28 0.045 0.01)
+(0.2875 0.045 0.01)
+(0.295 0.045 0.01)
+(0.3025 0.045 0.01)
+(0.31 0.045 0.01)
+(0.3175 0.045 0.01)
+(0.325 0.045 0.01)
+(0.3325 0.045 0.01)
+(0.34 0.045 0.01)
+(0.3475 0.045 0.01)
+(0.355 0.045 0.01)
+(0.3625 0.045 0.01)
+(0.37 0.045 0.01)
+(0.3775 0.045 0.01)
+(0.385 0.045 0.01)
+(0.3925 0.045 0.01)
+(0.4 0.045 0.01)
+(0.2575 0.05 0.01)
+(0.265 0.05 0.01)
+(0.2725 0.05 0.01)
+(0.28 0.05 0.01)
+(0.2875 0.05 0.01)
+(0.295 0.05 0.01)
+(0.3025 0.05 0.01)
+(0.31 0.05 0.01)
+(0.3175 0.05 0.01)
+(0.325 0.05 0.01)
+(0.3325 0.05 0.01)
+(0.34 0.05 0.01)
+(0.3475 0.05 0.01)
+(0.355 0.05 0.01)
+(0.3625 0.05 0.01)
+(0.37 0.05 0.01)
+(0.3775 0.05 0.01)
+(0.385 0.05 0.01)
+(0.3925 0.05 0.01)
+(0.4 0.05 0.01)
+(0.2575 0.055 0.01)
+(0.265 0.055 0.01)
+(0.2725 0.055 0.01)
+(0.28 0.055 0.01)
+(0.2875 0.055 0.01)
+(0.295 0.055 0.01)
+(0.3025 0.055 0.01)
+(0.31 0.055 0.01)
+(0.3175 0.055 0.01)
+(0.325 0.055 0.01)
+(0.3325 0.055 0.01)
+(0.34 0.055 0.01)
+(0.3475 0.055 0.01)
+(0.355 0.055 0.01)
+(0.3625 0.055 0.01)
+(0.37 0.055 0.01)
+(0.3775 0.055 0.01)
+(0.385 0.055 0.01)
+(0.3925 0.055 0.01)
+(0.4 0.055 0.01)
+(0.2575 0.06 0.01)
+(0.265 0.06 0.01)
+(0.2725 0.06 0.01)
+(0.28 0.06 0.01)
+(0.2875 0.06 0.01)
+(0.295 0.06 0.01)
+(0.3025 0.06 0.01)
+(0.31 0.06 0.01)
+(0.3175 0.06 0.01)
+(0.325 0.06 0.01)
+(0.3325 0.06 0.01)
+(0.34 0.06 0.01)
+(0.3475 0.06 0.01)
+(0.355 0.06 0.01)
+(0.3625 0.06 0.01)
+(0.37 0.06 0.01)
+(0.3775 0.06 0.01)
+(0.385 0.06 0.01)
+(0.3925 0.06 0.01)
+(0.4 0.06 0.01)
+(0.2575 0.065 0.01)
+(0.265 0.065 0.01)
+(0.2725 0.065 0.01)
+(0.28 0.065 0.01)
+(0.2875 0.065 0.01)
+(0.295 0.065 0.01)
+(0.3025 0.065 0.01)
+(0.31 0.065 0.01)
+(0.3175 0.065 0.01)
+(0.325 0.065 0.01)
+(0.3325 0.065 0.01)
+(0.34 0.065 0.01)
+(0.3475 0.065 0.01)
+(0.355 0.065 0.01)
+(0.3625 0.065 0.01)
+(0.37 0.065 0.01)
+(0.3775 0.065 0.01)
+(0.385 0.065 0.01)
+(0.3925 0.065 0.01)
+(0.4 0.065 0.01)
+(0.2575 0.07 0.01)
+(0.265 0.07 0.01)
+(0.2725 0.07 0.01)
+(0.28 0.07 0.01)
+(0.2875 0.07 0.01)
+(0.295 0.07 0.01)
+(0.3025 0.07 0.01)
+(0.31 0.07 0.01)
+(0.3175 0.07 0.01)
+(0.325 0.07 0.01)
+(0.3325 0.07 0.01)
+(0.34 0.07 0.01)
+(0.3475 0.07 0.01)
+(0.355 0.07 0.01)
+(0.3625 0.07 0.01)
+(0.37 0.07 0.01)
+(0.3775 0.07 0.01)
+(0.385 0.07 0.01)
+(0.3925 0.07 0.01)
+(0.4 0.07 0.01)
+(0.2575 0.075 0.01)
+(0.265 0.075 0.01)
+(0.2725 0.075 0.01)
+(0.28 0.075 0.01)
+(0.2875 0.075 0.01)
+(0.295 0.075 0.01)
+(0.3025 0.075 0.01)
+(0.31 0.075 0.01)
+(0.3175 0.075 0.01)
+(0.325 0.075 0.01)
+(0.3325 0.075 0.01)
+(0.34 0.075 0.01)
+(0.3475 0.075 0.01)
+(0.355 0.075 0.01)
+(0.3625 0.075 0.01)
+(0.37 0.075 0.01)
+(0.3775 0.075 0.01)
+(0.385 0.075 0.01)
+(0.3925 0.075 0.01)
+(0.4 0.075 0.01)
+(0.2575 0.08 0.01)
+(0.265 0.08 0.01)
+(0.2725 0.08 0.01)
+(0.28 0.08 0.01)
+(0.2875 0.08 0.01)
+(0.295 0.08 0.01)
+(0.3025 0.08 0.01)
+(0.31 0.08 0.01)
+(0.3175 0.08 0.01)
+(0.325 0.08 0.01)
+(0.3325 0.08 0.01)
+(0.34 0.08 0.01)
+(0.3475 0.08 0.01)
+(0.355 0.08 0.01)
+(0.3625 0.08 0.01)
+(0.37 0.08 0.01)
+(0.3775 0.08 0.01)
+(0.385 0.08 0.01)
+(0.3925 0.08 0.01)
+(0.4 0.08 0.01)
+(0.2575 0.085 0.01)
+(0.265 0.085 0.01)
+(0.2725 0.085 0.01)
+(0.28 0.085 0.01)
+(0.2875 0.085 0.01)
+(0.295 0.085 0.01)
+(0.3025 0.085 0.01)
+(0.31 0.085 0.01)
+(0.3175 0.085 0.01)
+(0.325 0.085 0.01)
+(0.3325 0.085 0.01)
+(0.34 0.085 0.01)
+(0.3475 0.085 0.01)
+(0.355 0.085 0.01)
+(0.3625 0.085 0.01)
+(0.37 0.085 0.01)
+(0.3775 0.085 0.01)
+(0.385 0.085 0.01)
+(0.3925 0.085 0.01)
+(0.4 0.085 0.01)
+(0.2575 0.09 0.01)
+(0.265 0.09 0.01)
+(0.2725 0.09 0.01)
+(0.28 0.09 0.01)
+(0.2875 0.09 0.01)
+(0.295 0.09 0.01)
+(0.3025 0.09 0.01)
+(0.31 0.09 0.01)
+(0.3175 0.09 0.01)
+(0.325 0.09 0.01)
+(0.3325 0.09 0.01)
+(0.34 0.09 0.01)
+(0.3475 0.09 0.01)
+(0.355 0.09 0.01)
+(0.3625 0.09 0.01)
+(0.37 0.09 0.01)
+(0.3775 0.09 0.01)
+(0.385 0.09 0.01)
+(0.3925 0.09 0.01)
+(0.4 0.09 0.01)
+(0.2575 0.095 0.01)
+(0.265 0.095 0.01)
+(0.2725 0.095 0.01)
+(0.28 0.095 0.01)
+(0.2875 0.095 0.01)
+(0.295 0.095 0.01)
+(0.3025 0.095 0.01)
+(0.31 0.095 0.01)
+(0.3175 0.095 0.01)
+(0.325 0.095 0.01)
+(0.3325 0.095 0.01)
+(0.34 0.095 0.01)
+(0.3475 0.095 0.01)
+(0.355 0.095 0.01)
+(0.3625 0.095 0.01)
+(0.37 0.095 0.01)
+(0.3775 0.095 0.01)
+(0.385 0.095 0.01)
+(0.3925 0.095 0.01)
+(0.4 0.095 0.01)
+(0.2575 0.1 0.01)
+(0.265 0.1 0.01)
+(0.2725 0.1 0.01)
+(0.28 0.1 0.01)
+(0.2875 0.1 0.01)
+(0.295 0.1 0.01)
+(0.3025 0.1 0.01)
+(0.31 0.1 0.01)
+(0.3175 0.1 0.01)
+(0.325 0.1 0.01)
+(0.3325 0.1 0.01)
+(0.34 0.1 0.01)
+(0.3475 0.1 0.01)
+(0.355 0.1 0.01)
+(0.3625 0.1 0.01)
+(0.37 0.1 0.01)
+(0.3775 0.1 0.01)
+(0.385 0.1 0.01)
+(0.3925 0.1 0.01)
+(0.4 0.1 0.01)
+(0.15 0.1075 0)
+(0.155 0.1075 0)
+(0.16 0.1075 0)
+(0.165 0.1075 0)
+(0.17 0.1075 0)
+(0.175 0.1075 0)
+(0.18 0.1075 0)
+(0.185 0.1075 0)
+(0.19 0.1075 0)
+(0.195 0.1075 0)
+(0.2 0.1075 0)
+(0.205 0.1075 0)
+(0.21 0.1075 0)
+(0.215 0.1075 0)
+(0.22 0.1075 0)
+(0.225 0.1075 0)
+(0.23 0.1075 0)
+(0.235 0.1075 0)
+(0.24 0.1075 0)
+(0.245 0.1075 0)
+(0.25 0.1075 0)
+(0.15 0.115 0)
+(0.155 0.115 0)
+(0.16 0.115 0)
+(0.165 0.115 0)
+(0.17 0.115 0)
+(0.175 0.115 0)
+(0.18 0.115 0)
+(0.185 0.115 0)
+(0.19 0.115 0)
+(0.195 0.115 0)
+(0.2 0.115 0)
+(0.205 0.115 0)
+(0.21 0.115 0)
+(0.215 0.115 0)
+(0.22 0.115 0)
+(0.225 0.115 0)
+(0.23 0.115 0)
+(0.235 0.115 0)
+(0.24 0.115 0)
+(0.245 0.115 0)
+(0.25 0.115 0)
+(0.15 0.1225 0)
+(0.155 0.1225 0)
+(0.16 0.1225 0)
+(0.165 0.1225 0)
+(0.17 0.1225 0)
+(0.175 0.1225 0)
+(0.18 0.1225 0)
+(0.185 0.1225 0)
+(0.19 0.1225 0)
+(0.195 0.1225 0)
+(0.2 0.1225 0)
+(0.205 0.1225 0)
+(0.21 0.1225 0)
+(0.215 0.1225 0)
+(0.22 0.1225 0)
+(0.225 0.1225 0)
+(0.23 0.1225 0)
+(0.235 0.1225 0)
+(0.24 0.1225 0)
+(0.245 0.1225 0)
+(0.25 0.1225 0)
+(0.15 0.13 0)
+(0.155 0.13 0)
+(0.16 0.13 0)
+(0.165 0.13 0)
+(0.17 0.13 0)
+(0.175 0.13 0)
+(0.18 0.13 0)
+(0.185 0.13 0)
+(0.19 0.13 0)
+(0.195 0.13 0)
+(0.2 0.13 0)
+(0.205 0.13 0)
+(0.21 0.13 0)
+(0.215 0.13 0)
+(0.22 0.13 0)
+(0.225 0.13 0)
+(0.23 0.13 0)
+(0.235 0.13 0)
+(0.24 0.13 0)
+(0.245 0.13 0)
+(0.25 0.13 0)
+(0.15 0.1375 0)
+(0.155 0.1375 0)
+(0.16 0.1375 0)
+(0.165 0.1375 0)
+(0.17 0.1375 0)
+(0.175 0.1375 0)
+(0.18 0.1375 0)
+(0.185 0.1375 0)
+(0.19 0.1375 0)
+(0.195 0.1375 0)
+(0.2 0.1375 0)
+(0.205 0.1375 0)
+(0.21 0.1375 0)
+(0.215 0.1375 0)
+(0.22 0.1375 0)
+(0.225 0.1375 0)
+(0.23 0.1375 0)
+(0.235 0.1375 0)
+(0.24 0.1375 0)
+(0.245 0.1375 0)
+(0.25 0.1375 0)
+(0.15 0.145 0)
+(0.155 0.145 0)
+(0.16 0.145 0)
+(0.165 0.145 0)
+(0.17 0.145 0)
+(0.175 0.145 0)
+(0.18 0.145 0)
+(0.185 0.145 0)
+(0.19 0.145 0)
+(0.195 0.145 0)
+(0.2 0.145 0)
+(0.205 0.145 0)
+(0.21 0.145 0)
+(0.215 0.145 0)
+(0.22 0.145 0)
+(0.225 0.145 0)
+(0.23 0.145 0)
+(0.235 0.145 0)
+(0.24 0.145 0)
+(0.245 0.145 0)
+(0.25 0.145 0)
+(0.15 0.1525 0)
+(0.155 0.1525 0)
+(0.16 0.1525 0)
+(0.165 0.1525 0)
+(0.17 0.1525 0)
+(0.175 0.1525 0)
+(0.18 0.1525 0)
+(0.185 0.1525 0)
+(0.19 0.1525 0)
+(0.195 0.1525 0)
+(0.2 0.1525 0)
+(0.205 0.1525 0)
+(0.21 0.1525 0)
+(0.215 0.1525 0)
+(0.22 0.1525 0)
+(0.225 0.1525 0)
+(0.23 0.1525 0)
+(0.235 0.1525 0)
+(0.24 0.1525 0)
+(0.245 0.1525 0)
+(0.25 0.1525 0)
+(0.15 0.16 0)
+(0.155 0.16 0)
+(0.16 0.16 0)
+(0.165 0.16 0)
+(0.17 0.16 0)
+(0.175 0.16 0)
+(0.18 0.16 0)
+(0.185 0.16 0)
+(0.19 0.16 0)
+(0.195 0.16 0)
+(0.2 0.16 0)
+(0.205 0.16 0)
+(0.21 0.16 0)
+(0.215 0.16 0)
+(0.22 0.16 0)
+(0.225 0.16 0)
+(0.23 0.16 0)
+(0.235 0.16 0)
+(0.24 0.16 0)
+(0.245 0.16 0)
+(0.25 0.16 0)
+(0.15 0.1675 0)
+(0.155 0.1675 0)
+(0.16 0.1675 0)
+(0.165 0.1675 0)
+(0.17 0.1675 0)
+(0.175 0.1675 0)
+(0.18 0.1675 0)
+(0.185 0.1675 0)
+(0.19 0.1675 0)
+(0.195 0.1675 0)
+(0.2 0.1675 0)
+(0.205 0.1675 0)
+(0.21 0.1675 0)
+(0.215 0.1675 0)
+(0.22 0.1675 0)
+(0.225 0.1675 0)
+(0.23 0.1675 0)
+(0.235 0.1675 0)
+(0.24 0.1675 0)
+(0.245 0.1675 0)
+(0.25 0.1675 0)
+(0.15 0.175 0)
+(0.155 0.175 0)
+(0.16 0.175 0)
+(0.165 0.175 0)
+(0.17 0.175 0)
+(0.175 0.175 0)
+(0.18 0.175 0)
+(0.185 0.175 0)
+(0.19 0.175 0)
+(0.195 0.175 0)
+(0.2 0.175 0)
+(0.205 0.175 0)
+(0.21 0.175 0)
+(0.215 0.175 0)
+(0.22 0.175 0)
+(0.225 0.175 0)
+(0.23 0.175 0)
+(0.235 0.175 0)
+(0.24 0.175 0)
+(0.245 0.175 0)
+(0.25 0.175 0)
+(0.15 0.1825 0)
+(0.155 0.1825 0)
+(0.16 0.1825 0)
+(0.165 0.1825 0)
+(0.17 0.1825 0)
+(0.175 0.1825 0)
+(0.18 0.1825 0)
+(0.185 0.1825 0)
+(0.19 0.1825 0)
+(0.195 0.1825 0)
+(0.2 0.1825 0)
+(0.205 0.1825 0)
+(0.21 0.1825 0)
+(0.215 0.1825 0)
+(0.22 0.1825 0)
+(0.225 0.1825 0)
+(0.23 0.1825 0)
+(0.235 0.1825 0)
+(0.24 0.1825 0)
+(0.245 0.1825 0)
+(0.25 0.1825 0)
+(0.15 0.19 0)
+(0.155 0.19 0)
+(0.16 0.19 0)
+(0.165 0.19 0)
+(0.17 0.19 0)
+(0.175 0.19 0)
+(0.18 0.19 0)
+(0.185 0.19 0)
+(0.19 0.19 0)
+(0.195 0.19 0)
+(0.2 0.19 0)
+(0.205 0.19 0)
+(0.21 0.19 0)
+(0.215 0.19 0)
+(0.22 0.19 0)
+(0.225 0.19 0)
+(0.23 0.19 0)
+(0.235 0.19 0)
+(0.24 0.19 0)
+(0.245 0.19 0)
+(0.25 0.19 0)
+(0.15 0.1975 0)
+(0.155 0.1975 0)
+(0.16 0.1975 0)
+(0.165 0.1975 0)
+(0.17 0.1975 0)
+(0.175 0.1975 0)
+(0.18 0.1975 0)
+(0.185 0.1975 0)
+(0.19 0.1975 0)
+(0.195 0.1975 0)
+(0.2 0.1975 0)
+(0.205 0.1975 0)
+(0.21 0.1975 0)
+(0.215 0.1975 0)
+(0.22 0.1975 0)
+(0.225 0.1975 0)
+(0.23 0.1975 0)
+(0.235 0.1975 0)
+(0.24 0.1975 0)
+(0.245 0.1975 0)
+(0.25 0.1975 0)
+(0.15 0.205 0)
+(0.155 0.205 0)
+(0.16 0.205 0)
+(0.165 0.205 0)
+(0.17 0.205 0)
+(0.175 0.205 0)
+(0.18 0.205 0)
+(0.185 0.205 0)
+(0.19 0.205 0)
+(0.195 0.205 0)
+(0.2 0.205 0)
+(0.205 0.205 0)
+(0.21 0.205 0)
+(0.215 0.205 0)
+(0.22 0.205 0)
+(0.225 0.205 0)
+(0.23 0.205 0)
+(0.235 0.205 0)
+(0.24 0.205 0)
+(0.245 0.205 0)
+(0.25 0.205 0)
+(0.15 0.2125 0)
+(0.155 0.2125 0)
+(0.16 0.2125 0)
+(0.165 0.2125 0)
+(0.17 0.2125 0)
+(0.175 0.2125 0)
+(0.18 0.2125 0)
+(0.185 0.2125 0)
+(0.19 0.2125 0)
+(0.195 0.2125 0)
+(0.2 0.2125 0)
+(0.205 0.2125 0)
+(0.21 0.2125 0)
+(0.215 0.2125 0)
+(0.22 0.2125 0)
+(0.225 0.2125 0)
+(0.23 0.2125 0)
+(0.235 0.2125 0)
+(0.24 0.2125 0)
+(0.245 0.2125 0)
+(0.25 0.2125 0)
+(0.15 0.22 0)
+(0.155 0.22 0)
+(0.16 0.22 0)
+(0.165 0.22 0)
+(0.17 0.22 0)
+(0.175 0.22 0)
+(0.18 0.22 0)
+(0.185 0.22 0)
+(0.19 0.22 0)
+(0.195 0.22 0)
+(0.2 0.22 0)
+(0.205 0.22 0)
+(0.21 0.22 0)
+(0.215 0.22 0)
+(0.22 0.22 0)
+(0.225 0.22 0)
+(0.23 0.22 0)
+(0.235 0.22 0)
+(0.24 0.22 0)
+(0.245 0.22 0)
+(0.25 0.22 0)
+(0.15 0.2275 0)
+(0.155 0.2275 0)
+(0.16 0.2275 0)
+(0.165 0.2275 0)
+(0.17 0.2275 0)
+(0.175 0.2275 0)
+(0.18 0.2275 0)
+(0.185 0.2275 0)
+(0.19 0.2275 0)
+(0.195 0.2275 0)
+(0.2 0.2275 0)
+(0.205 0.2275 0)
+(0.21 0.2275 0)
+(0.215 0.2275 0)
+(0.22 0.2275 0)
+(0.225 0.2275 0)
+(0.23 0.2275 0)
+(0.235 0.2275 0)
+(0.24 0.2275 0)
+(0.245 0.2275 0)
+(0.25 0.2275 0)
+(0.15 0.235 0)
+(0.155 0.235 0)
+(0.16 0.235 0)
+(0.165 0.235 0)
+(0.17 0.235 0)
+(0.175 0.235 0)
+(0.18 0.235 0)
+(0.185 0.235 0)
+(0.19 0.235 0)
+(0.195 0.235 0)
+(0.2 0.235 0)
+(0.205 0.235 0)
+(0.21 0.235 0)
+(0.215 0.235 0)
+(0.22 0.235 0)
+(0.225 0.235 0)
+(0.23 0.235 0)
+(0.235 0.235 0)
+(0.24 0.235 0)
+(0.245 0.235 0)
+(0.25 0.235 0)
+(0.15 0.2425 0)
+(0.155 0.2425 0)
+(0.16 0.2425 0)
+(0.165 0.2425 0)
+(0.17 0.2425 0)
+(0.175 0.2425 0)
+(0.18 0.2425 0)
+(0.185 0.2425 0)
+(0.19 0.2425 0)
+(0.195 0.2425 0)
+(0.2 0.2425 0)
+(0.205 0.2425 0)
+(0.21 0.2425 0)
+(0.215 0.2425 0)
+(0.22 0.2425 0)
+(0.225 0.2425 0)
+(0.23 0.2425 0)
+(0.235 0.2425 0)
+(0.24 0.2425 0)
+(0.245 0.2425 0)
+(0.25 0.2425 0)
+(0.15 0.25 0)
+(0.155 0.25 0)
+(0.16 0.25 0)
+(0.165 0.25 0)
+(0.17 0.25 0)
+(0.175 0.25 0)
+(0.18 0.25 0)
+(0.185 0.25 0)
+(0.19 0.25 0)
+(0.195 0.25 0)
+(0.2 0.25 0)
+(0.205 0.25 0)
+(0.21 0.25 0)
+(0.215 0.25 0)
+(0.22 0.25 0)
+(0.225 0.25 0)
+(0.23 0.25 0)
+(0.235 0.25 0)
+(0.24 0.25 0)
+(0.245 0.25 0)
+(0.25 0.25 0)
+(0.15 0.1075 0.01)
+(0.155 0.1075 0.01)
+(0.16 0.1075 0.01)
+(0.165 0.1075 0.01)
+(0.17 0.1075 0.01)
+(0.175 0.1075 0.01)
+(0.18 0.1075 0.01)
+(0.185 0.1075 0.01)
+(0.19 0.1075 0.01)
+(0.195 0.1075 0.01)
+(0.2 0.1075 0.01)
+(0.205 0.1075 0.01)
+(0.21 0.1075 0.01)
+(0.215 0.1075 0.01)
+(0.22 0.1075 0.01)
+(0.225 0.1075 0.01)
+(0.23 0.1075 0.01)
+(0.235 0.1075 0.01)
+(0.24 0.1075 0.01)
+(0.245 0.1075 0.01)
+(0.25 0.1075 0.01)
+(0.15 0.115 0.01)
+(0.155 0.115 0.01)
+(0.16 0.115 0.01)
+(0.165 0.115 0.01)
+(0.17 0.115 0.01)
+(0.175 0.115 0.01)
+(0.18 0.115 0.01)
+(0.185 0.115 0.01)
+(0.19 0.115 0.01)
+(0.195 0.115 0.01)
+(0.2 0.115 0.01)
+(0.205 0.115 0.01)
+(0.21 0.115 0.01)
+(0.215 0.115 0.01)
+(0.22 0.115 0.01)
+(0.225 0.115 0.01)
+(0.23 0.115 0.01)
+(0.235 0.115 0.01)
+(0.24 0.115 0.01)
+(0.245 0.115 0.01)
+(0.25 0.115 0.01)
+(0.15 0.1225 0.01)
+(0.155 0.1225 0.01)
+(0.16 0.1225 0.01)
+(0.165 0.1225 0.01)
+(0.17 0.1225 0.01)
+(0.175 0.1225 0.01)
+(0.18 0.1225 0.01)
+(0.185 0.1225 0.01)
+(0.19 0.1225 0.01)
+(0.195 0.1225 0.01)
+(0.2 0.1225 0.01)
+(0.205 0.1225 0.01)
+(0.21 0.1225 0.01)
+(0.215 0.1225 0.01)
+(0.22 0.1225 0.01)
+(0.225 0.1225 0.01)
+(0.23 0.1225 0.01)
+(0.235 0.1225 0.01)
+(0.24 0.1225 0.01)
+(0.245 0.1225 0.01)
+(0.25 0.1225 0.01)
+(0.15 0.13 0.01)
+(0.155 0.13 0.01)
+(0.16 0.13 0.01)
+(0.165 0.13 0.01)
+(0.17 0.13 0.01)
+(0.175 0.13 0.01)
+(0.18 0.13 0.01)
+(0.185 0.13 0.01)
+(0.19 0.13 0.01)
+(0.195 0.13 0.01)
+(0.2 0.13 0.01)
+(0.205 0.13 0.01)
+(0.21 0.13 0.01)
+(0.215 0.13 0.01)
+(0.22 0.13 0.01)
+(0.225 0.13 0.01)
+(0.23 0.13 0.01)
+(0.235 0.13 0.01)
+(0.24 0.13 0.01)
+(0.245 0.13 0.01)
+(0.25 0.13 0.01)
+(0.15 0.1375 0.01)
+(0.155 0.1375 0.01)
+(0.16 0.1375 0.01)
+(0.165 0.1375 0.01)
+(0.17 0.1375 0.01)
+(0.175 0.1375 0.01)
+(0.18 0.1375 0.01)
+(0.185 0.1375 0.01)
+(0.19 0.1375 0.01)
+(0.195 0.1375 0.01)
+(0.2 0.1375 0.01)
+(0.205 0.1375 0.01)
+(0.21 0.1375 0.01)
+(0.215 0.1375 0.01)
+(0.22 0.1375 0.01)
+(0.225 0.1375 0.01)
+(0.23 0.1375 0.01)
+(0.235 0.1375 0.01)
+(0.24 0.1375 0.01)
+(0.245 0.1375 0.01)
+(0.25 0.1375 0.01)
+(0.15 0.145 0.01)
+(0.155 0.145 0.01)
+(0.16 0.145 0.01)
+(0.165 0.145 0.01)
+(0.17 0.145 0.01)
+(0.175 0.145 0.01)
+(0.18 0.145 0.01)
+(0.185 0.145 0.01)
+(0.19 0.145 0.01)
+(0.195 0.145 0.01)
+(0.2 0.145 0.01)
+(0.205 0.145 0.01)
+(0.21 0.145 0.01)
+(0.215 0.145 0.01)
+(0.22 0.145 0.01)
+(0.225 0.145 0.01)
+(0.23 0.145 0.01)
+(0.235 0.145 0.01)
+(0.24 0.145 0.01)
+(0.245 0.145 0.01)
+(0.25 0.145 0.01)
+(0.15 0.1525 0.01)
+(0.155 0.1525 0.01)
+(0.16 0.1525 0.01)
+(0.165 0.1525 0.01)
+(0.17 0.1525 0.01)
+(0.175 0.1525 0.01)
+(0.18 0.1525 0.01)
+(0.185 0.1525 0.01)
+(0.19 0.1525 0.01)
+(0.195 0.1525 0.01)
+(0.2 0.1525 0.01)
+(0.205 0.1525 0.01)
+(0.21 0.1525 0.01)
+(0.215 0.1525 0.01)
+(0.22 0.1525 0.01)
+(0.225 0.1525 0.01)
+(0.23 0.1525 0.01)
+(0.235 0.1525 0.01)
+(0.24 0.1525 0.01)
+(0.245 0.1525 0.01)
+(0.25 0.1525 0.01)
+(0.15 0.16 0.01)
+(0.155 0.16 0.01)
+(0.16 0.16 0.01)
+(0.165 0.16 0.01)
+(0.17 0.16 0.01)
+(0.175 0.16 0.01)
+(0.18 0.16 0.01)
+(0.185 0.16 0.01)
+(0.19 0.16 0.01)
+(0.195 0.16 0.01)
+(0.2 0.16 0.01)
+(0.205 0.16 0.01)
+(0.21 0.16 0.01)
+(0.215 0.16 0.01)
+(0.22 0.16 0.01)
+(0.225 0.16 0.01)
+(0.23 0.16 0.01)
+(0.235 0.16 0.01)
+(0.24 0.16 0.01)
+(0.245 0.16 0.01)
+(0.25 0.16 0.01)
+(0.15 0.1675 0.01)
+(0.155 0.1675 0.01)
+(0.16 0.1675 0.01)
+(0.165 0.1675 0.01)
+(0.17 0.1675 0.01)
+(0.175 0.1675 0.01)
+(0.18 0.1675 0.01)
+(0.185 0.1675 0.01)
+(0.19 0.1675 0.01)
+(0.195 0.1675 0.01)
+(0.2 0.1675 0.01)
+(0.205 0.1675 0.01)
+(0.21 0.1675 0.01)
+(0.215 0.1675 0.01)
+(0.22 0.1675 0.01)
+(0.225 0.1675 0.01)
+(0.23 0.1675 0.01)
+(0.235 0.1675 0.01)
+(0.24 0.1675 0.01)
+(0.245 0.1675 0.01)
+(0.25 0.1675 0.01)
+(0.15 0.175 0.01)
+(0.155 0.175 0.01)
+(0.16 0.175 0.01)
+(0.165 0.175 0.01)
+(0.17 0.175 0.01)
+(0.175 0.175 0.01)
+(0.18 0.175 0.01)
+(0.185 0.175 0.01)
+(0.19 0.175 0.01)
+(0.195 0.175 0.01)
+(0.2 0.175 0.01)
+(0.205 0.175 0.01)
+(0.21 0.175 0.01)
+(0.215 0.175 0.01)
+(0.22 0.175 0.01)
+(0.225 0.175 0.01)
+(0.23 0.175 0.01)
+(0.235 0.175 0.01)
+(0.24 0.175 0.01)
+(0.245 0.175 0.01)
+(0.25 0.175 0.01)
+(0.15 0.1825 0.01)
+(0.155 0.1825 0.01)
+(0.16 0.1825 0.01)
+(0.165 0.1825 0.01)
+(0.17 0.1825 0.01)
+(0.175 0.1825 0.01)
+(0.18 0.1825 0.01)
+(0.185 0.1825 0.01)
+(0.19 0.1825 0.01)
+(0.195 0.1825 0.01)
+(0.2 0.1825 0.01)
+(0.205 0.1825 0.01)
+(0.21 0.1825 0.01)
+(0.215 0.1825 0.01)
+(0.22 0.1825 0.01)
+(0.225 0.1825 0.01)
+(0.23 0.1825 0.01)
+(0.235 0.1825 0.01)
+(0.24 0.1825 0.01)
+(0.245 0.1825 0.01)
+(0.25 0.1825 0.01)
+(0.15 0.19 0.01)
+(0.155 0.19 0.01)
+(0.16 0.19 0.01)
+(0.165 0.19 0.01)
+(0.17 0.19 0.01)
+(0.175 0.19 0.01)
+(0.18 0.19 0.01)
+(0.185 0.19 0.01)
+(0.19 0.19 0.01)
+(0.195 0.19 0.01)
+(0.2 0.19 0.01)
+(0.205 0.19 0.01)
+(0.21 0.19 0.01)
+(0.215 0.19 0.01)
+(0.22 0.19 0.01)
+(0.225 0.19 0.01)
+(0.23 0.19 0.01)
+(0.235 0.19 0.01)
+(0.24 0.19 0.01)
+(0.245 0.19 0.01)
+(0.25 0.19 0.01)
+(0.15 0.1975 0.01)
+(0.155 0.1975 0.01)
+(0.16 0.1975 0.01)
+(0.165 0.1975 0.01)
+(0.17 0.1975 0.01)
+(0.175 0.1975 0.01)
+(0.18 0.1975 0.01)
+(0.185 0.1975 0.01)
+(0.19 0.1975 0.01)
+(0.195 0.1975 0.01)
+(0.2 0.1975 0.01)
+(0.205 0.1975 0.01)
+(0.21 0.1975 0.01)
+(0.215 0.1975 0.01)
+(0.22 0.1975 0.01)
+(0.225 0.1975 0.01)
+(0.23 0.1975 0.01)
+(0.235 0.1975 0.01)
+(0.24 0.1975 0.01)
+(0.245 0.1975 0.01)
+(0.25 0.1975 0.01)
+(0.15 0.205 0.01)
+(0.155 0.205 0.01)
+(0.16 0.205 0.01)
+(0.165 0.205 0.01)
+(0.17 0.205 0.01)
+(0.175 0.205 0.01)
+(0.18 0.205 0.01)
+(0.185 0.205 0.01)
+(0.19 0.205 0.01)
+(0.195 0.205 0.01)
+(0.2 0.205 0.01)
+(0.205 0.205 0.01)
+(0.21 0.205 0.01)
+(0.215 0.205 0.01)
+(0.22 0.205 0.01)
+(0.225 0.205 0.01)
+(0.23 0.205 0.01)
+(0.235 0.205 0.01)
+(0.24 0.205 0.01)
+(0.245 0.205 0.01)
+(0.25 0.205 0.01)
+(0.15 0.2125 0.01)
+(0.155 0.2125 0.01)
+(0.16 0.2125 0.01)
+(0.165 0.2125 0.01)
+(0.17 0.2125 0.01)
+(0.175 0.2125 0.01)
+(0.18 0.2125 0.01)
+(0.185 0.2125 0.01)
+(0.19 0.2125 0.01)
+(0.195 0.2125 0.01)
+(0.2 0.2125 0.01)
+(0.205 0.2125 0.01)
+(0.21 0.2125 0.01)
+(0.215 0.2125 0.01)
+(0.22 0.2125 0.01)
+(0.225 0.2125 0.01)
+(0.23 0.2125 0.01)
+(0.235 0.2125 0.01)
+(0.24 0.2125 0.01)
+(0.245 0.2125 0.01)
+(0.25 0.2125 0.01)
+(0.15 0.22 0.01)
+(0.155 0.22 0.01)
+(0.16 0.22 0.01)
+(0.165 0.22 0.01)
+(0.17 0.22 0.01)
+(0.175 0.22 0.01)
+(0.18 0.22 0.01)
+(0.185 0.22 0.01)
+(0.19 0.22 0.01)
+(0.195 0.22 0.01)
+(0.2 0.22 0.01)
+(0.205 0.22 0.01)
+(0.21 0.22 0.01)
+(0.215 0.22 0.01)
+(0.22 0.22 0.01)
+(0.225 0.22 0.01)
+(0.23 0.22 0.01)
+(0.235 0.22 0.01)
+(0.24 0.22 0.01)
+(0.245 0.22 0.01)
+(0.25 0.22 0.01)
+(0.15 0.2275 0.01)
+(0.155 0.2275 0.01)
+(0.16 0.2275 0.01)
+(0.165 0.2275 0.01)
+(0.17 0.2275 0.01)
+(0.175 0.2275 0.01)
+(0.18 0.2275 0.01)
+(0.185 0.2275 0.01)
+(0.19 0.2275 0.01)
+(0.195 0.2275 0.01)
+(0.2 0.2275 0.01)
+(0.205 0.2275 0.01)
+(0.21 0.2275 0.01)
+(0.215 0.2275 0.01)
+(0.22 0.2275 0.01)
+(0.225 0.2275 0.01)
+(0.23 0.2275 0.01)
+(0.235 0.2275 0.01)
+(0.24 0.2275 0.01)
+(0.245 0.2275 0.01)
+(0.25 0.2275 0.01)
+(0.15 0.235 0.01)
+(0.155 0.235 0.01)
+(0.16 0.235 0.01)
+(0.165 0.235 0.01)
+(0.17 0.235 0.01)
+(0.175 0.235 0.01)
+(0.18 0.235 0.01)
+(0.185 0.235 0.01)
+(0.19 0.235 0.01)
+(0.195 0.235 0.01)
+(0.2 0.235 0.01)
+(0.205 0.235 0.01)
+(0.21 0.235 0.01)
+(0.215 0.235 0.01)
+(0.22 0.235 0.01)
+(0.225 0.235 0.01)
+(0.23 0.235 0.01)
+(0.235 0.235 0.01)
+(0.24 0.235 0.01)
+(0.245 0.235 0.01)
+(0.25 0.235 0.01)
+(0.15 0.2425 0.01)
+(0.155 0.2425 0.01)
+(0.16 0.2425 0.01)
+(0.165 0.2425 0.01)
+(0.17 0.2425 0.01)
+(0.175 0.2425 0.01)
+(0.18 0.2425 0.01)
+(0.185 0.2425 0.01)
+(0.19 0.2425 0.01)
+(0.195 0.2425 0.01)
+(0.2 0.2425 0.01)
+(0.205 0.2425 0.01)
+(0.21 0.2425 0.01)
+(0.215 0.2425 0.01)
+(0.22 0.2425 0.01)
+(0.225 0.2425 0.01)
+(0.23 0.2425 0.01)
+(0.235 0.2425 0.01)
+(0.24 0.2425 0.01)
+(0.245 0.2425 0.01)
+(0.25 0.2425 0.01)
+(0.15 0.25 0.01)
+(0.155 0.25 0.01)
+(0.16 0.25 0.01)
+(0.165 0.25 0.01)
+(0.17 0.25 0.01)
+(0.175 0.25 0.01)
+(0.18 0.25 0.01)
+(0.185 0.25 0.01)
+(0.19 0.25 0.01)
+(0.195 0.25 0.01)
+(0.2 0.25 0.01)
+(0.205 0.25 0.01)
+(0.21 0.25 0.01)
+(0.215 0.25 0.01)
+(0.22 0.25 0.01)
+(0.225 0.25 0.01)
+(0.23 0.25 0.01)
+(0.235 0.25 0.01)
+(0.24 0.25 0.01)
+(0.245 0.25 0.01)
+(0.25 0.25 0.01)
+)
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
index 33b7e3b38..5686f68d1 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
@@ -15,148 +15,409 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General macros to create 2D/extruded-2D meshes
 
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 convertToMeters 0.1;
 
 // Hub radius
 
+
 // Impeller-tip radius
 
+
 // Baffle-tip radius
 
+
 // Tank radius
 
+
 // MRF region radius
 
+
 // Thickness of 2D slab
 
+
 // Base z
 
+
 // Top z
 
+
 // Number of cells radially between hub and impeller tip
 
+
 // Number of cells radially in each of the two regions between
 // impeller and baffle tips
 
+
 // Number of cells radially between baffle tip and tank
 
+
 // Number of cells azimuthally in each of the 8 blocks
 
+
 // Number of cells in the thickness of the slab
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 vertices
 (
-    (0.2 0 0) // Vertex r0b = 0
-    (0.2 0 0) // Vertex r0sb = 1
-    (0.141421356364228 -0.141421356110391 0) // Vertex r1b = 2
-    (3.58979347393082e-10 -0.2 0) // Vertex r2b = 3
-    (3.58979347393082e-10 -0.2 0) // Vertex r2sb = 4
-    (-0.141421355856554 -0.141421356618065 0) // Vertex r3b = 5
-    (-0.2 7.17958694786164e-10 0) // Vertex r4b = 6
-    (-0.2 7.17958694786164e-10 0) // Vertex r4sb = 7
-    (-0.141421355856554 0.141421356618065 0) // Vertex r5b = 8
-    (3.58979347393082e-10 0.2 0) // Vertex r6b = 9
-    (3.58979347393082e-10 0.2 0) // Vertex r6sb = 10
-    (0.141421356364228 0.141421356110391 0) // Vertex r7b = 11
+    (0.2 0 0) // Vertex r0b = 0 
+    (0.2 0 0) // Vertex r0sb = 1 
+    (0.141421356364228 -0.141421356110391 0) // Vertex r1b = 2 
+    (3.58979347393082e-10 -0.2 0) // Vertex r2b = 3 
+    (3.58979347393082e-10 -0.2 0) // Vertex r2sb = 4 
+    (-0.141421355856554 -0.141421356618065 0) // Vertex r3b = 5 
+    (-0.2 7.17958694786164e-10 0) // Vertex r4b = 6 
+    (-0.2 7.17958694786164e-10 0) // Vertex r4sb = 7 
+    (-0.141421355856554 0.141421356618065 0) // Vertex r5b = 8 
+    (3.58979347393082e-10 0.2 0) // Vertex r6b = 9 
+    (3.58979347393082e-10 0.2 0) // Vertex r6sb = 10 
+    (0.141421356364228 0.141421356110391 0) // Vertex r7b = 11 
 
-    (0.5 0 0) // Vertex rb0b = 12
-    (0.353553390910569 -0.353553390275978 0) // Vertex rb1b = 13
-    (8.97448368482705e-10 -0.5 0) // Vertex rb2b = 14
-    (-0.353553389641386 -0.353553391545162 0) // Vertex rb3b = 15
-    (-0.5 1.79489673696541e-09 0) // Vertex rb4b = 16
-    (-0.353553389641386 0.353553391545162 0) // Vertex rb5b = 17
-    (8.97448368482705e-10 0.5 0) // Vertex rb6b = 18
-    (0.353553390910569 0.353553390275978 0) // Vertex rb7b = 19
+    (0.5 0 0) // Vertex rb0b = 12 
+    (0.353553390910569 -0.353553390275978 0) // Vertex rb1b = 13 
+    (8.97448368482705e-10 -0.5 0) // Vertex rb2b = 14 
+    (-0.353553389641386 -0.353553391545162 0) // Vertex rb3b = 15 
+    (-0.5 1.79489673696541e-09 0) // Vertex rb4b = 16 
+    (-0.353553389641386 0.353553391545162 0) // Vertex rb5b = 17 
+    (8.97448368482705e-10 0.5 0) // Vertex rb6b = 18 
+    (0.353553390910569 0.353553390275978 0) // Vertex rb7b = 19 
 
-    (0.6 0 0) // Vertex ri0b = 20
-    (0.424264069092683 -0.424264068331174 0) // Vertex ri1b = 21
-    (1.07693804217925e-09 -0.6 0) // Vertex ri2b = 22
-    (-0.424264067569663 -0.424264069854194 0) // Vertex ri3b = 23
-    (-0.6 2.15387608435849e-09 0) // Vertex ri4b = 24
-    (-0.424264067569663 0.424264069854194 0) // Vertex ri5b = 25
-    (1.07693804217925e-09 0.6 0) // Vertex ri6b = 26
-    (0.424264069092683 0.424264068331174 0) // Vertex ri7b = 27
+    (0.6 0 0) // Vertex ri0b = 20 
+    (0.424264069092683 -0.424264068331174 0) // Vertex ri1b = 21 
+    (1.07693804217925e-09 -0.6 0) // Vertex ri2b = 22 
+    (-0.424264067569663 -0.424264069854194 0) // Vertex ri3b = 23 
+    (-0.6 2.15387608435849e-09 0) // Vertex ri4b = 24 
+    (-0.424264067569663 0.424264069854194 0) // Vertex ri5b = 25 
+    (1.07693804217925e-09 0.6 0) // Vertex ri6b = 26 
+    (0.424264069092683 0.424264068331174 0) // Vertex ri7b = 27 
 
-    (0.7 0 0) // Vertex Rb0b = 28
-    (0.494974747274797 -0.494974746386369 0) // Vertex Rb1b = 29
-    (1.25642771587579e-09 -0.7 0) // Vertex Rb2b = 30
-    (-0.49497474549794 -0.494974748163226 0) // Vertex Rb3b = 31
-    (-0.7 2.51285543175157e-09 0) // Vertex Rb4b = 32
-    (-0.49497474549794 0.494974748163226 0) // Vertex Rb5b = 33
-    (1.25642771587579e-09 0.7 0) // Vertex Rb6b = 34
-    (0.494974747274797 0.494974746386369 0) // Vertex Rb7b = 35
+    (0.7 0 0) // Vertex Rb0b = 28 
+    (0.494974747274797 -0.494974746386369 0) // Vertex Rb1b = 29 
+    (1.25642771587579e-09 -0.7 0) // Vertex Rb2b = 30 
+    (-0.49497474549794 -0.494974748163226 0) // Vertex Rb3b = 31 
+    (-0.7 2.51285543175157e-09 0) // Vertex Rb4b = 32 
+    (-0.49497474549794 0.494974748163226 0) // Vertex Rb5b = 33 
+    (1.25642771587579e-09 0.7 0) // Vertex Rb6b = 34 
+    (0.494974747274797 0.494974746386369 0) // Vertex Rb7b = 35 
 
-    (1 0 0) // Vertex R0b = 36
-    (0.707106781821139 -0.707106780551956 0) // Vertex R1b = 37
-    (0.707106781821139 -0.707106780551956 0) // Vertex R1sb = 38
-    (1.79489673696541e-09 -1 0) // Vertex R2b = 39
-    (-0.707106779282772 -0.707106783090323 0) // Vertex R3b = 40
-    (-0.707106779282772 -0.707106783090323 0) // Vertex R3sb = 41
-    (-1 3.58979347393082e-09 0) // Vertex R4b = 42
-    (-0.707106779282772 0.707106783090323 0) // Vertex R5b = 43
-    (-0.707106779282772 0.707106783090323 0) // Vertex R5sb = 44
-    (1.79489673696541e-09 1 0) // Vertex R6b = 45
-    (0.707106781821139 0.707106780551956 0) // Vertex R7b = 46
-    (0.707106781821139 0.707106780551956 0) // Vertex R7sb = 47
+    (1 0 0) // Vertex R0b = 36 
+    (0.707106781821139 -0.707106780551956 0) // Vertex R1b = 37 
+    (0.707106781821139 -0.707106780551956 0) // Vertex R1sb = 38 
+    (1.79489673696541e-09 -1 0) // Vertex R2b = 39 
+    (-0.707106779282772 -0.707106783090323 0) // Vertex R3b = 40 
+    (-0.707106779282772 -0.707106783090323 0) // Vertex R3sb = 41 
+    (-1 3.58979347393082e-09 0) // Vertex R4b = 42 
+    (-0.707106779282772 0.707106783090323 0) // Vertex R5b = 43 
+    (-0.707106779282772 0.707106783090323 0) // Vertex R5sb = 44 
+    (1.79489673696541e-09 1 0) // Vertex R6b = 45 
+    (0.707106781821139 0.707106780551956 0) // Vertex R7b = 46 
+    (0.707106781821139 0.707106780551956 0) // Vertex R7sb = 47 
 
-    (0.2 0 0.1) // Vertex r0t = 48
-    (0.2 0 0.1) // Vertex r0st = 49
-    (0.141421356364228 -0.141421356110391 0.1) // Vertex r1t = 50
-    (3.58979347393082e-10 -0.2 0.1) // Vertex r2t = 51
-    (3.58979347393082e-10 -0.2 0.1) // Vertex r2st = 52
-    (-0.141421355856554 -0.141421356618065 0.1) // Vertex r3t = 53
-    (-0.2 7.17958694786164e-10 0.1) // Vertex r4t = 54
-    (-0.2 7.17958694786164e-10 0.1) // Vertex r4st = 55
-    (-0.141421355856554 0.141421356618065 0.1) // Vertex r5t = 56
-    (3.58979347393082e-10 0.2 0.1) // Vertex r6t = 57
-    (3.58979347393082e-10 0.2 0.1) // Vertex r6st = 58
-    (0.141421356364228 0.141421356110391 0.1) // Vertex r7t = 59
+    (0.2 0 0.1) // Vertex r0t = 48 
+    (0.2 0 0.1) // Vertex r0st = 49 
+    (0.141421356364228 -0.141421356110391 0.1) // Vertex r1t = 50 
+    (3.58979347393082e-10 -0.2 0.1) // Vertex r2t = 51 
+    (3.58979347393082e-10 -0.2 0.1) // Vertex r2st = 52 
+    (-0.141421355856554 -0.141421356618065 0.1) // Vertex r3t = 53 
+    (-0.2 7.17958694786164e-10 0.1) // Vertex r4t = 54 
+    (-0.2 7.17958694786164e-10 0.1) // Vertex r4st = 55 
+    (-0.141421355856554 0.141421356618065 0.1) // Vertex r5t = 56 
+    (3.58979347393082e-10 0.2 0.1) // Vertex r6t = 57 
+    (3.58979347393082e-10 0.2 0.1) // Vertex r6st = 58 
+    (0.141421356364228 0.141421356110391 0.1) // Vertex r7t = 59 
 
-    (0.5 0 0.1) // Vertex rb0t = 60
-    (0.353553390910569 -0.353553390275978 0.1) // Vertex rb1t = 61
-    (8.97448368482705e-10 -0.5 0.1) // Vertex rb2t = 62
-    (-0.353553389641386 -0.353553391545162 0.1) // Vertex rb3t = 63
-    (-0.5 1.79489673696541e-09 0.1) // Vertex rb4t = 64
-    (-0.353553389641386 0.353553391545162 0.1) // Vertex rb5t = 65
-    (8.97448368482705e-10 0.5 0.1) // Vertex rb6t = 66
-    (0.353553390910569 0.353553390275978 0.1) // Vertex rb7t = 67
+    (0.5 0 0.1) // Vertex rb0t = 60 
+    (0.353553390910569 -0.353553390275978 0.1) // Vertex rb1t = 61 
+    (8.97448368482705e-10 -0.5 0.1) // Vertex rb2t = 62 
+    (-0.353553389641386 -0.353553391545162 0.1) // Vertex rb3t = 63 
+    (-0.5 1.79489673696541e-09 0.1) // Vertex rb4t = 64 
+    (-0.353553389641386 0.353553391545162 0.1) // Vertex rb5t = 65 
+    (8.97448368482705e-10 0.5 0.1) // Vertex rb6t = 66 
+    (0.353553390910569 0.353553390275978 0.1) // Vertex rb7t = 67 
 
-    (0.6 0 0.1) // Vertex ri0t = 68
-    (0.424264069092683 -0.424264068331174 0.1) // Vertex ri1t = 69
-    (1.07693804217925e-09 -0.6 0.1) // Vertex ri2t = 70
-    (-0.424264067569663 -0.424264069854194 0.1) // Vertex ri3t = 71
-    (-0.6 2.15387608435849e-09 0.1) // Vertex ri4t = 72
-    (-0.424264067569663 0.424264069854194 0.1) // Vertex ri5t = 73
-    (1.07693804217925e-09 0.6 0.1) // Vertex ri6t = 74
-    (0.424264069092683 0.424264068331174 0.1) // Vertex ri7t = 75
+    (0.6 0 0.1) // Vertex ri0t = 68 
+    (0.424264069092683 -0.424264068331174 0.1) // Vertex ri1t = 69 
+    (1.07693804217925e-09 -0.6 0.1) // Vertex ri2t = 70 
+    (-0.424264067569663 -0.424264069854194 0.1) // Vertex ri3t = 71 
+    (-0.6 2.15387608435849e-09 0.1) // Vertex ri4t = 72 
+    (-0.424264067569663 0.424264069854194 0.1) // Vertex ri5t = 73 
+    (1.07693804217925e-09 0.6 0.1) // Vertex ri6t = 74 
+    (0.424264069092683 0.424264068331174 0.1) // Vertex ri7t = 75 
 
-    (0.7 0 0.1) // Vertex Rb0t = 76
-    (0.494974747274797 -0.494974746386369 0.1) // Vertex Rb1t = 77
-    (1.25642771587579e-09 -0.7 0.1) // Vertex Rb2t = 78
-    (-0.49497474549794 -0.494974748163226 0.1) // Vertex Rb3t = 79
-    (-0.7 2.51285543175157e-09 0.1) // Vertex Rb4t = 80
-    (-0.49497474549794 0.494974748163226 0.1) // Vertex Rb5t = 81
-    (1.25642771587579e-09 0.7 0.1) // Vertex Rb6t = 82
-    (0.494974747274797 0.494974746386369 0.1) // Vertex Rb7t = 83
+    (0.7 0 0.1) // Vertex Rb0t = 76 
+    (0.494974747274797 -0.494974746386369 0.1) // Vertex Rb1t = 77 
+    (1.25642771587579e-09 -0.7 0.1) // Vertex Rb2t = 78 
+    (-0.49497474549794 -0.494974748163226 0.1) // Vertex Rb3t = 79 
+    (-0.7 2.51285543175157e-09 0.1) // Vertex Rb4t = 80 
+    (-0.49497474549794 0.494974748163226 0.1) // Vertex Rb5t = 81 
+    (1.25642771587579e-09 0.7 0.1) // Vertex Rb6t = 82 
+    (0.494974747274797 0.494974746386369 0.1) // Vertex Rb7t = 83 
 
-    (1 0 0.1) // Vertex R0t = 84
-    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1t = 85
-    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1st = 86
-    (1.79489673696541e-09 -1 0.1) // Vertex R2t = 87
-    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3t = 88
-    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3st = 89
-    (-1 3.58979347393082e-09 0.1) // Vertex R4t = 90
-    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5t = 91
-    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5st = 92
-    (1.79489673696541e-09 1 0.1) // Vertex R6t = 93
-    (0.707106781821139 0.707106780551956 0.1) // Vertex R7t = 94
-    (0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95
+    (1 0 0.1) // Vertex R0t = 84 
+    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1t = 85 
+    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1st = 86 
+    (1.79489673696541e-09 -1 0.1) // Vertex R2t = 87 
+    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3t = 88 
+    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3st = 89 
+    (-1 3.58979347393082e-09 0.1) // Vertex R4t = 90 
+    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5t = 91 
+    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5st = 92 
+    (1.79489673696541e-09 1 0.1) // Vertex R6t = 93 
+    (0.707106781821139 0.707106780551956 0.1) // Vertex R7t = 94 
+    (0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95 
 );
 
 blocks
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c4ad2ef0..000000000
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/blockMeshDict
index a0ef62feb..f20e72e4e 100644
--- a/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/blockMeshDict
@@ -61,35 +61,51 @@ blocks
     hex (6 7 11 10 18 19 23 22) (30 30 1) simpleGrading (5 5 1)
 );
 
-patches
+boundary
 (
-    patch in
-    (
+    in
+    {
+        type patch;
+        faces
+        (
         (0 12 16 4)
         (4 16 20 8)
-    )
+        );
+    }
 
-    patch out
-    (
+    out
+    {
+        type patch;
+        faces
+        (
         (3 7 19 15)
         (7 11 23 19)
-    )
+        );
+    }
 
-    symmetryPlane bottom
-    (
+    bottom
+    {
+        type symmetryPlane;
+        faces
+        (
         (0 1 13 12)
         (1 2 14 13)
         (2 3 15 14)
-    )
+        );
+    }
 
-    wall topWall
-    (
+    topWall
+    {
+        type wall;
+        faces
+        (
         (8 20 21 9)
         (9 21 17 5)
         (5 17 18 6)
         (6 18 22 10)
         (10 22 23 11)
-    )
+        );
+    }
 );
 
 // ************************************************************************* /
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
index 7f5c19790..e817209f1 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
@@ -37,21 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (1 5 4 0)
-    )
-    patch outlet
-    (
-        (3 7 6 2)
-    )
-    wall walls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+
+    walls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
deleted file mode 100644
index ca0dea44c..000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
index 54f69b7c6..7cc0a2751 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
@@ -68,54 +68,70 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (15  0 16 31)
-        (14 15 31 30)
-        (13 14 30 29)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (15  0 16 31)
+            (14 15 31 30)
+            (13 14 30 29)
+        );
+    }
 
-    patch outlet
-    (
-        ( 5  6 22 21)
-        ( 6  7 23 22)
-        ( 7  8 24 23)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            ( 5  6 22 21)
+            ( 6  7 23 22)
+            ( 7  8 24 23)
+        );
+    }
 
-    wall walls
-    (
-        ( 1  0 16 17)
-        ( 2  1 17 18)
-        ( 3  2 18 19)
-        ( 4  3 19 20)
-        ( 5  4 20 21)
-        ( 9  8 24 25)
-        (10  9 25 26)
-        (11 10 26 27)
-        (12 11 27 28)
-        (13 12 28 29)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            ( 1  0 16 17)
+            ( 2  1 17 18)
+            ( 3  2 18 19)
+            ( 4  3 19 20)
+            ( 5  4 20 21)
+            ( 9  8 24 25)
+            (10  9 25 26)
+            (11 10 26 27)
+            (12 11 27 28)
+            (13 12 28 29)
+        );
+    }
 
-    empty frontBack
-    (
-        ( 0 15  2  1)
-        (15 14 11  2)
-        (14 13 12 11)
-        ( 2 11 10  3)
-        ( 4  3  6  5)
-        ( 3 10  7  6)
-        (10  9  8  7)
+    frontBack
+    {
+        type empty;
+        faces
+        (
+            ( 0 15  2  1)
+            (15 14 11  2)
+            (14 13 12 11)
+            ( 2 11 10  3)
+            ( 4  3  6  5)
+            ( 3 10  7  6)
+            (10  9  8  7)
 
-        (16 17 18 31)
-        (31 18 27 30)
-        (30 27 28 29)
-        (18 19 26 27)
-        (20 21 22 19)
-        (19 22 23 26)
-        (26 23 24 25)
-    )
+            (16 17 18 31)
+            (31 18 27 30)
+            (30 27 28 29)
+            (18 19 26 27)
+            (20 21 22 19)
+            (19 22 23 26)
+            (26 23 24 25)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
index 9e081d63c..bf09e9076 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
@@ -68,54 +68,70 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (15  0 16 31)
-        (14 15 31 30)
-        (13 14 30 29)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (15  0 16 31)
+            (14 15 31 30)
+            (13 14 30 29)
+        );
+    }
 
-    patch outlet
-    (
-        ( 5  6 22 21)
-        ( 6  7 23 22)
-        ( 7  8 24 23)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            ( 5  6 22 21)
+            ( 6  7 23 22)
+            ( 7  8 24 23)
+        );
+    }
 
-    wall walls
-    (
-        ( 1  0 16 17)
-        ( 2  1 17 18)
-        ( 3  2 18 19)
-        ( 4  3 19 20)
-        ( 5  4 20 21)
-        ( 9  8 24 25)
-        (10  9 25 26)
-        (11 10 26 27)
-        (12 11 27 28)
-        (13 12 28 29)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            ( 1  0 16 17)
+            ( 2  1 17 18)
+            ( 3  2 18 19)
+            ( 4  3 19 20)
+            ( 5  4 20 21)
+            ( 9  8 24 25)
+            (10  9 25 26)
+            (11 10 26 27)
+            (12 11 27 28)
+            (13 12 28 29)
+        );
+    }
 
-    wall frontBack
-    (
-        ( 0 15  2  1)
-        (15 14 11  2)
-        (14 13 12 11)
-        ( 2 11 10  3)
-        ( 4  3  6  5)
-        ( 3 10  7  6)
-        (10  9  8  7)
+    frontBack
+    {
+        type wall;
+        faces
+        (
+            ( 0 15  2  1)
+            (15 14 11  2)
+            (14 13 12 11)
+            ( 2 11 10  3)
+            ( 4  3  6  5)
+            ( 3 10  7  6)
+            (10  9  8  7)
 
-        (16 17 18 31)
-        (31 18 27 30)
-        (30 27 28 29)
-        (18 19 26 27)
-        (20 21 22 19)
-        (19 22 23 26)
-        (26 23 24 25)
-    )
+            (16 17 18 31)
+            (31 18 27 30)
+            (30 27 28 29)
+            (18 19 26 27)
+            (20 21 22 19)
+            (19 22 23 26)
+            (26 23 24 25)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
index 54f69b7c6..7cc0a2751 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
@@ -68,54 +68,70 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (15  0 16 31)
-        (14 15 31 30)
-        (13 14 30 29)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (15  0 16 31)
+            (14 15 31 30)
+            (13 14 30 29)
+        );
+    }
 
-    patch outlet
-    (
-        ( 5  6 22 21)
-        ( 6  7 23 22)
-        ( 7  8 24 23)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            ( 5  6 22 21)
+            ( 6  7 23 22)
+            ( 7  8 24 23)
+        );
+    }
 
-    wall walls
-    (
-        ( 1  0 16 17)
-        ( 2  1 17 18)
-        ( 3  2 18 19)
-        ( 4  3 19 20)
-        ( 5  4 20 21)
-        ( 9  8 24 25)
-        (10  9 25 26)
-        (11 10 26 27)
-        (12 11 27 28)
-        (13 12 28 29)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            ( 1  0 16 17)
+            ( 2  1 17 18)
+            ( 3  2 18 19)
+            ( 4  3 19 20)
+            ( 5  4 20 21)
+            ( 9  8 24 25)
+            (10  9 25 26)
+            (11 10 26 27)
+            (12 11 27 28)
+            (13 12 28 29)
+        );
+    }
 
-    empty frontBack
-    (
-        ( 0 15  2  1)
-        (15 14 11  2)
-        (14 13 12 11)
-        ( 2 11 10  3)
-        ( 4  3  6  5)
-        ( 3 10  7  6)
-        (10  9  8  7)
+    frontBack
+    {
+        type empty;
+        faces
+        (
+            ( 0 15  2  1)
+            (15 14 11  2)
+            (14 13 12 11)
+            ( 2 11 10  3)
+            ( 4  3  6  5)
+            ( 3 10  7  6)
+            (10  9  8  7)
 
-        (16 17 18 31)
-        (31 18 27 30)
-        (30 27 28 29)
-        (18 19 26 27)
-        (20 21 22 19)
-        (19 22 23 26)
-        (26 23 24 25)
-    )
+            (16 17 18 31)
+            (31 18 27 30)
+            (30 27 28 29)
+            (18 19 26 27)
+            (20 21 22 19)
+            (19 22 23 26)
+            (26 23 24 25)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
index c958da6a6..6f6d2a96e 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
@@ -33,20 +33,29 @@ blocks
     hex (0 1 2 3 4 5 6 7) (80 160 1) simpleGrading (1 1 1)
 );
 
-patches
+boundary
 (
-    wall walls
-    (
-        (3 7 6 2)
-        (0 4 7 3)
-        (2 6 5 1)
-        (1 5 4 0)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary
deleted file mode 100644
index dea5fe90b..000000000
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-2
-(
-    walls
-    {
-        type            wall;
-        nFaces          480;
-        startFace       25360;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          25600;
-        startFace       25840;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict
index ab1ebdc09..2280b2056 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict
@@ -33,17 +33,21 @@ blocks
     hex (0 1 2 3 4 5 6 7) (80 160 80) simpleGrading (1 1 1)
 );
 
-patches
+boundary
 (
-    wall walls
-    (
-        (3 7 6 2)
-        (0 4 7 3)
-        (2 6 5 1)
-        (1 5 4 0)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary
deleted file mode 100644
index 3220ab9e5..000000000
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
-    walls
-    {
-        type            wall;
-        nFaces          64000;
-        startFace       3040000;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict
index 10b07b682..02019638a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict
@@ -37,20 +37,28 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch atmosphere
-    (
-        (3 7 6 2)
-    )
-    wall walls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-        (1 5 4 0)
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    walls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict
index f03e07dad..cf9128d05 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict
@@ -37,22 +37,33 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall stationaryWalls
-    (
-        (0 3 2 1)
-        (2 6 5 1)
-        (1 5 4 0)
-        (3 7 6 2)
-        (0 4 7 3)
-    )
-    patch atmosphere
-    (
-        (4 5 6 7)
-    )
-    wall floatingObject
-    ()
+    stationaryWalls
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+            (2 6 5 1)
+            (1 5 4 0)
+            (3 7 6 2)
+            (0 4 7 3)
+        );
+    }
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+    floatingObject
+    {
+        type wall;
+        faces ();
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
index fb69b1c6a..cf3b563bf 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
@@ -15,6 +15,14 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General m4 macros
 
+  
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // User-defined parameters
 
@@ -45,28 +53,44 @@ convertToMeters 1;
  // Breadth to the top (height) of lower chamfer
  // Breadth of upper chamfer
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Parametric description
 
 vertices
 (
-    (-0.5 -15 -10.0) // Vertex bllcb = 0
-    (-0.5 -20 -5)  // Vertex bllc = 1
-    (-0.5 -20 10)  // Vertex bluc = 2
-    (-0.5 -10 20) // Vertex bluct = 3
-    (-0.5 15 -10.0) // Vertex brlcb = 4
-    (-0.5 20 -5)  // Vertex brlc = 5
-    (-0.5 20 10)  // Vertex bruc = 6
-    (-0.5 10 20) // Vertex bruct = 7
+    (-0.5 -15 -10.0) // Vertex bllcb = 0 
+    (-0.5 -20 -5)  // Vertex bllc = 1 
+    (-0.5 -20 10)  // Vertex bluc = 2 
+    (-0.5 -10 20) // Vertex bluct = 3 
+    (-0.5 15 -10.0) // Vertex brlcb = 4 
+    (-0.5 20 -5)  // Vertex brlc = 5 
+    (-0.5 20 10)  // Vertex bruc = 6 
+    (-0.5 10 20) // Vertex bruct = 7 
 
-    (0.5 -15 -10.0) // Vertex fllcb = 8
-    (0.5 -20 -5)  // Vertex fllc = 9
-    (0.5 -20 10)  // Vertex fluc = 10
-    (0.5 -10 20) // Vertex fluct = 11
-    (0.5 15 -10.0) // Vertex frlcb = 12
-    (0.5 20 -5)  // Vertex frlc = 13
-    (0.5 20 10)  // Vertex fruc = 14
-    (0.5 10 20) // Vertex fruct = 15
+    (0.5 -15 -10.0) // Vertex fllcb = 8 
+    (0.5 -20 -5)  // Vertex fllc = 9 
+    (0.5 -20 10)  // Vertex fluc = 10 
+    (0.5 -10 20) // Vertex fluct = 11 
+    (0.5 15 -10.0) // Vertex frlcb = 12 
+    (0.5 20 -5)  // Vertex frlc = 13 
+    (0.5 20 10)  // Vertex fruc = 14 
+    (0.5 10 20) // Vertex fruct = 15 
 );
 
 blocks
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
deleted file mode 100644
index 565e17774..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    walls
-    {
-        type            patch;
-        nFaces          148;
-        startFace       2646;
-    }
-    front
-    {
-        type            empty;
-        nFaces          1360;
-        startFace       2794;
-    }
-    back
-    {
-        type            empty;
-        nFaces          1360;
-        startFace       4154;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
index fb69b1c6a..cf3b563bf 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
@@ -15,6 +15,14 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General m4 macros
 
+  
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // User-defined parameters
 
@@ -45,28 +53,44 @@ convertToMeters 1;
  // Breadth to the top (height) of lower chamfer
  // Breadth of upper chamfer
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Parametric description
 
 vertices
 (
-    (-0.5 -15 -10.0) // Vertex bllcb = 0
-    (-0.5 -20 -5)  // Vertex bllc = 1
-    (-0.5 -20 10)  // Vertex bluc = 2
-    (-0.5 -10 20) // Vertex bluct = 3
-    (-0.5 15 -10.0) // Vertex brlcb = 4
-    (-0.5 20 -5)  // Vertex brlc = 5
-    (-0.5 20 10)  // Vertex bruc = 6
-    (-0.5 10 20) // Vertex bruct = 7
+    (-0.5 -15 -10.0) // Vertex bllcb = 0 
+    (-0.5 -20 -5)  // Vertex bllc = 1 
+    (-0.5 -20 10)  // Vertex bluc = 2 
+    (-0.5 -10 20) // Vertex bluct = 3 
+    (-0.5 15 -10.0) // Vertex brlcb = 4 
+    (-0.5 20 -5)  // Vertex brlc = 5 
+    (-0.5 20 10)  // Vertex bruc = 6 
+    (-0.5 10 20) // Vertex bruct = 7 
 
-    (0.5 -15 -10.0) // Vertex fllcb = 8
-    (0.5 -20 -5)  // Vertex fllc = 9
-    (0.5 -20 10)  // Vertex fluc = 10
-    (0.5 -10 20) // Vertex fluct = 11
-    (0.5 15 -10.0) // Vertex frlcb = 12
-    (0.5 20 -5)  // Vertex frlc = 13
-    (0.5 20 10)  // Vertex fruc = 14
-    (0.5 10 20) // Vertex fruct = 15
+    (0.5 -15 -10.0) // Vertex fllcb = 8 
+    (0.5 -20 -5)  // Vertex fllc = 9 
+    (0.5 -20 10)  // Vertex fluc = 10 
+    (0.5 -10 20) // Vertex fluct = 11 
+    (0.5 15 -10.0) // Vertex frlcb = 12 
+    (0.5 20 -5)  // Vertex frlc = 13 
+    (0.5 20 10)  // Vertex fruc = 14 
+    (0.5 10 20) // Vertex fruct = 15 
 );
 
 blocks
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
deleted file mode 100644
index 565e17774..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    walls
-    {
-        type            patch;
-        nFaces          148;
-        startFace       2646;
-    }
-    front
-    {
-        type            empty;
-        nFaces          1360;
-        startFace       2794;
-    }
-    back
-    {
-        type            empty;
-        nFaces          1360;
-        startFace       4154;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
index 66e8e3b18..99cc86781 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
@@ -15,6 +15,14 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General m4 macros
 
+  
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // User-defined parameters
 
@@ -45,28 +53,44 @@ convertToMeters 1;
  // Breadth to the top (height) of lower chamfer
  // Breadth of upper chamfer
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Parametric description
 
 vertices
 (
-    (-10 -15 -10.0) // Vertex bllcb = 0
-    (-10 -20 -5)  // Vertex bllc = 1
-    (-10 -20 10)  // Vertex bluc = 2
-    (-10 -10 20) // Vertex bluct = 3
-    (-10 15 -10.0) // Vertex brlcb = 4
-    (-10 20 -5)  // Vertex brlc = 5
-    (-10 20 10)  // Vertex bruc = 6
-    (-10 10 20) // Vertex bruct = 7
+    (-10 -15 -10.0) // Vertex bllcb = 0 
+    (-10 -20 -5)  // Vertex bllc = 1 
+    (-10 -20 10)  // Vertex bluc = 2 
+    (-10 -10 20) // Vertex bluct = 3 
+    (-10 15 -10.0) // Vertex brlcb = 4 
+    (-10 20 -5)  // Vertex brlc = 5 
+    (-10 20 10)  // Vertex bruc = 6 
+    (-10 10 20) // Vertex bruct = 7 
 
-    (10 -15 -10.0) // Vertex fllcb = 8
-    (10 -20 -5)  // Vertex fllc = 9
-    (10 -20 10)  // Vertex fluc = 10
-    (10 -10 20) // Vertex fluct = 11
-    (10 15 -10.0) // Vertex frlcb = 12
-    (10 20 -5)  // Vertex frlc = 13
-    (10 20 10)  // Vertex fruc = 14
-    (10 10 20) // Vertex fruct = 15
+    (10 -15 -10.0) // Vertex fllcb = 8 
+    (10 -20 -5)  // Vertex fllc = 9 
+    (10 -20 10)  // Vertex fluc = 10 
+    (10 -10 20) // Vertex fluct = 11 
+    (10 15 -10.0) // Vertex frlcb = 12 
+    (10 20 -5)  // Vertex frlc = 13 
+    (10 20 10)  // Vertex fruc = 14 
+    (10 10 20) // Vertex fruct = 15 
 );
 
 blocks
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary
deleted file mode 100644
index 31fa93cea..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
-    walls
-    {
-        type            patch;
-        nFaces          5532;
-        startFace       74754;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
index 66e8e3b18..99cc86781 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
@@ -15,6 +15,14 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General m4 macros
 
+  
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // User-defined parameters
 
@@ -45,28 +53,44 @@ convertToMeters 1;
  // Breadth to the top (height) of lower chamfer
  // Breadth of upper chamfer
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Parametric description
 
 vertices
 (
-    (-10 -15 -10.0) // Vertex bllcb = 0
-    (-10 -20 -5)  // Vertex bllc = 1
-    (-10 -20 10)  // Vertex bluc = 2
-    (-10 -10 20) // Vertex bluct = 3
-    (-10 15 -10.0) // Vertex brlcb = 4
-    (-10 20 -5)  // Vertex brlc = 5
-    (-10 20 10)  // Vertex bruc = 6
-    (-10 10 20) // Vertex bruct = 7
+    (-10 -15 -10.0) // Vertex bllcb = 0 
+    (-10 -20 -5)  // Vertex bllc = 1 
+    (-10 -20 10)  // Vertex bluc = 2 
+    (-10 -10 20) // Vertex bluct = 3 
+    (-10 15 -10.0) // Vertex brlcb = 4 
+    (-10 20 -5)  // Vertex brlc = 5 
+    (-10 20 10)  // Vertex bruc = 6 
+    (-10 10 20) // Vertex bruct = 7 
 
-    (10 -15 -10.0) // Vertex fllcb = 8
-    (10 -20 -5)  // Vertex fllc = 9
-    (10 -20 10)  // Vertex fluc = 10
-    (10 -10 20) // Vertex fluct = 11
-    (10 15 -10.0) // Vertex frlcb = 12
-    (10 20 -5)  // Vertex frlc = 13
-    (10 20 10)  // Vertex fruc = 14
-    (10 10 20) // Vertex fruct = 15
+    (10 -15 -10.0) // Vertex fllcb = 8 
+    (10 -20 -5)  // Vertex fllc = 9 
+    (10 -20 10)  // Vertex fluc = 10 
+    (10 -10 20) // Vertex fluct = 11 
+    (10 15 -10.0) // Vertex frlcb = 12 
+    (10 20 -5)  // Vertex frlc = 13 
+    (10 20 10)  // Vertex fruc = 14 
+    (10 10 20) // Vertex fruct = 15 
 );
 
 blocks
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary
deleted file mode 100644
index 31fa93cea..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
-    walls
-    {
-        type            patch;
-        nFaces          5532;
-        startFace       74754;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
index 66e8e3b18..99cc86781 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
@@ -15,6 +15,14 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General m4 macros
 
+  
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // User-defined parameters
 
@@ -45,28 +53,44 @@ convertToMeters 1;
  // Breadth to the top (height) of lower chamfer
  // Breadth of upper chamfer
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Parametric description
 
 vertices
 (
-    (-10 -15 -10.0) // Vertex bllcb = 0
-    (-10 -20 -5)  // Vertex bllc = 1
-    (-10 -20 10)  // Vertex bluc = 2
-    (-10 -10 20) // Vertex bluct = 3
-    (-10 15 -10.0) // Vertex brlcb = 4
-    (-10 20 -5)  // Vertex brlc = 5
-    (-10 20 10)  // Vertex bruc = 6
-    (-10 10 20) // Vertex bruct = 7
+    (-10 -15 -10.0) // Vertex bllcb = 0 
+    (-10 -20 -5)  // Vertex bllc = 1 
+    (-10 -20 10)  // Vertex bluc = 2 
+    (-10 -10 20) // Vertex bluct = 3 
+    (-10 15 -10.0) // Vertex brlcb = 4 
+    (-10 20 -5)  // Vertex brlc = 5 
+    (-10 20 10)  // Vertex bruc = 6 
+    (-10 10 20) // Vertex bruct = 7 
 
-    (10 -15 -10.0) // Vertex fllcb = 8
-    (10 -20 -5)  // Vertex fllc = 9
-    (10 -20 10)  // Vertex fluc = 10
-    (10 -10 20) // Vertex fluct = 11
-    (10 15 -10.0) // Vertex frlcb = 12
-    (10 20 -5)  // Vertex frlc = 13
-    (10 20 10)  // Vertex fruc = 14
-    (10 10 20) // Vertex fruct = 15
+    (10 -15 -10.0) // Vertex fllcb = 8 
+    (10 -20 -5)  // Vertex fllc = 9 
+    (10 -20 10)  // Vertex fluc = 10 
+    (10 -10 20) // Vertex fluct = 11 
+    (10 15 -10.0) // Vertex frlcb = 12 
+    (10 20 -5)  // Vertex frlc = 13 
+    (10 20 10)  // Vertex fruc = 14 
+    (10 10 20) // Vertex fruct = 15 
 );
 
 blocks
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary
deleted file mode 100644
index 31fa93cea..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
-    walls
-    {
-        type            patch;
-        nFaces          5532;
-        startFace       74754;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
index 350e4feaf..c2b4d3e65 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
@@ -57,32 +57,48 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall leftWall
-    (
-        (0 12 16 4)
-        (4 16 20 8)
-    )
-    wall rightWall
-    (
-        (7 19 15 3)
-        (11 23 19 7)
-    )
-    wall lowerWall
-    (
-        (0 1 13 12)
-        (1 5 17 13)
-        (5 6 18 17)
-        (2 14 18 6)
-        (2 3 15 14)
-    )
-    patch atmosphere
-    (
-        (8 20 21 9)
-        (9 21 22 10)
-        (10 22 23 11)
-    )
+    leftWall
+    {
+        type wall;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+    rightWall
+    {
+        type wall;
+        faces
+        (
+            (7 19 15 3)
+            (11 23 19 7)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 13 12)
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+            (2 3 15 14)
+        );
+    }
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (9 21 22 10)
+            (10 22 23 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
index f9be8b463..84c5c5d5a 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
@@ -62,49 +62,73 @@ edges
 (
 );
 
-patches
+boundary
 (
-    empty axis
-    (
-        (0 1 1 0)
-    )
+    axis
+    {
+        type empty;
+        faces
+        (
+            (0 1 1 0)
+        );
+    }
 
-    patch inlet
-    (
-        (0 0 10 2)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 0 10 2)
+        );
+    }
 
-    wall wall
-    (
-        (2 10 12 4)
-        (4 12 14 6)
-        (6 14 16 8)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            (2 10 12 4)
+            (4 12 14 6)
+            (6 14 16 8)
+        );
+    }
 
-    patch atmosphere
-    (
-        (8 16 17 9)
-        (7 9 17 15)
-        (5 7 15 13)
-        (3 5 13 11)
-        (1 3 11 1)
-    )
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 16 17 9)
+            (7 9 17 15)
+            (5 7 15 13)
+            (3 5 13 11)
+            (1 3 11 1)
+        );
+    }
 
-    wedge front
-    (
-        (0 1 11 10)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-    )
+    front
+    {
+        type wedge;
+        faces
+        (
+            (0 1 11 10)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+        );
+    }
 
-    wedge back
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (6 8 9 7)
-    )
+    back
+    {
+        type wedge;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (6 8 9 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
index 350e4feaf..c2b4d3e65 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
@@ -57,32 +57,48 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall leftWall
-    (
-        (0 12 16 4)
-        (4 16 20 8)
-    )
-    wall rightWall
-    (
-        (7 19 15 3)
-        (11 23 19 7)
-    )
-    wall lowerWall
-    (
-        (0 1 13 12)
-        (1 5 17 13)
-        (5 6 18 17)
-        (2 14 18 6)
-        (2 3 15 14)
-    )
-    patch atmosphere
-    (
-        (8 20 21 9)
-        (9 21 22 10)
-        (10 22 23 11)
-    )
+    leftWall
+    {
+        type wall;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+    rightWall
+    {
+        type wall;
+        faces
+        (
+            (7 19 15 3)
+            (11 23 19 7)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 13 12)
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+            (2 3 15 14)
+        );
+    }
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (9 21 22 10)
+            (10 22 23 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
index 350e4feaf..c2b4d3e65 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
@@ -57,32 +57,48 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall leftWall
-    (
-        (0 12 16 4)
-        (4 16 20 8)
-    )
-    wall rightWall
-    (
-        (7 19 15 3)
-        (11 23 19 7)
-    )
-    wall lowerWall
-    (
-        (0 1 13 12)
-        (1 5 17 13)
-        (5 6 18 17)
-        (2 14 18 6)
-        (2 3 15 14)
-    )
-    patch atmosphere
-    (
-        (8 20 21 9)
-        (9 21 22 10)
-        (10 22 23 11)
-    )
+    leftWall
+    {
+        type wall;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+    rightWall
+    {
+        type wall;
+        faces
+        (
+            (7 19 15 3)
+            (11 23 19 7)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 13 12)
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+            (2 3 15 14)
+        );
+    }
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (9 21 22 10)
+            (10 22 23 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
index 350e4feaf..c2b4d3e65 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
@@ -57,32 +57,48 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall leftWall
-    (
-        (0 12 16 4)
-        (4 16 20 8)
-    )
-    wall rightWall
-    (
-        (7 19 15 3)
-        (11 23 19 7)
-    )
-    wall lowerWall
-    (
-        (0 1 13 12)
-        (1 5 17 13)
-        (5 6 18 17)
-        (2 14 18 6)
-        (2 3 15 14)
-    )
-    patch atmosphere
-    (
-        (8 20 21 9)
-        (9 21 22 10)
-        (10 22 23 11)
-    )
+    leftWall
+    {
+        type wall;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+    rightWall
+    {
+        type wall;
+        faces
+        (
+            (7 19 15 3)
+            (11 23 19 7)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 13 12)
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+            (2 3 15 14)
+        );
+    }
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (9 21 22 10)
+            (10 22 23 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict
index 4b8b21796..196baab11 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict
@@ -57,32 +57,48 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall leftWall
-    (
-        (0 12 16 4)
-        (4 16 20 8)
-    )
-    wall rightWall
-    (
-        (7 19 15 3)
-        (11 23 19 7)
-    )
-    wall lowerWall
-    (
-        (0 1 13 12)
-        (1 5 17 13)
-        (5 6 18 17)
-        (2 14 18 6)
-        (2 3 15 14)
-    )
-    patch atmosphere
-    (
-        (8 20 21 9)
-        (9 21 22 10)
-        (10 22 23 11)
-    )
+    leftWall
+    {
+        type wall;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+    rightWall
+    {
+        type wall;
+        faces
+        (
+            (7 19 15 3)
+            (11 23 19 7)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 13 12)
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+            (2 3 15 14)
+        );
+    }
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (9 21 22 10)
+            (10 22 23 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/blockMeshDict b/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/blockMeshDict
index 2c85ff670..207bfeb09 100644
--- a/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/blockMeshDict
@@ -42,36 +42,65 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 6 9 3)
-        (3 9 11 5)
-    )
-    patch outlet
-    (
-        (1 2 8 7)
-    )
-    patch bottomWall
-    (
-        (0 1 7 6)
-    )
-    wall endWall
-    (
-        (2 4 10 8)
-    )
-    symmetryPlane top
-    (
-        (5 11 10 4)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (6 7 8 9)
-        (3 5 4 2)
-        (9 8 10 11)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 6 9 3)
+            (3 9 11 5)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (1 2 8 7)
+        );
+    }
+
+    bottomWall
+    {
+        type patch;
+        faces
+        (
+            (0 1 7 6)
+        );
+    }
+
+    endWall
+    {
+        type wall;
+        faces
+        (
+            (2 4 10 8)
+        );
+    }
+
+    top
+    {
+        type symmetryPlane;
+        faces
+        (
+            (5 11 10 4)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (6 7 8 9)
+            (3 5 4 2)
+            (9 8 10 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/boundary
deleted file mode 100644
index 2c903ea6d..000000000
--- a/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-inlet
-{
-    type patch;
-    nFaces 40;
-    startFace 15760;
-}
-
-outlet
-{
-    type patch;
-    nFaces 4;
-    startFace 15800;
-}
-
-bottomWall
-{
-    type patch;
-    nFaces 200;
-    startFace 15804;
-}
-
-endWall
-{
-    type wall;
-    nFaces 36;
-    startFace 16004;
-}
-
-top
-{
-    type symmetryPlane;
-    nFaces 200;
-    startFace 16040;
-}
-
-frontAndBack
-{
-    type empty;
-    nFaces 16000;
-    startFace 16240;
-}
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
index 431eb6b51..8a578eb91 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
@@ -48,29 +48,45 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch top
-    (
-        (3 2 6 7)
-    )
+    top
+    {
+        type patch;
+        faces
+        (
+            (3 2 6 7)
+        );
+    }
 
-    patch bottom
-    (
-        (1 0 4 5)
-    )
+    bottom
+    {
+        type patch;
+        faces
+        (
+            (1 0 4 5)
+        );
+    }
 
-    wall walls
-    (
-        (2 1 5 6)
-        (0 3 7 4)
-    )
+    walls
+    {
+        type wall;
+        faces
+        (
+            (2 1 5 6)
+            (0 3 7 4)
+        );
+    }
 
-    empty frontBack
-    (
-        (0 1 2 3)
-        (7 6 5 4)
-    )
+    frontBack
+    {
+        type empty;
+        faces
+        (
+            (0 1 2 3)
+            (7 6 5 4)
+        );
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
deleted file mode 100644
index d494df20b..000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    top
-    {
-        type            patch;
-        nFaces          25;
-        startFace       6100;
-    }
-    bottom
-    {
-        type            patch;
-        nFaces          25;
-        startFace       6125;
-    }
-    walls
-    {
-        type            wall;
-        nFaces          250;
-        startFace       6150;
-    }
-    frontBack
-    {
-        type            empty;
-        nFaces          6250;
-        startFace       6400;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
index 060f580f8..1b6cae1e7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
@@ -37,26 +37,45 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (1 5 4 0)
-    )
-    patch outlet
-    (
-        (3 7 6 2)
-    )
-    wall walls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-    )
-    empty frontAndBackPlanes
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+
+    walls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+        );
+    }
+
+    frontAndBackPlanes
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
deleted file mode 100644
index d6d0ceb12..000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11770;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11800;
-    }
-    walls
-    {
-        type            wall;
-        nFaces          400;
-        startFace       11830;
-    }
-    frontAndBackPlanes
-    {
-        type            empty;
-        nFaces          12000;
-        startFace       12230;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
index 7f5c19790..e817209f1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
@@ -37,21 +37,35 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (1 5 4 0)
-    )
-    patch outlet
-    (
-        (3 7 6 2)
-    )
-    wall walls
-    (
-        (0 4 7 3)
-        (2 6 5 1)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+
+    walls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/surfaceTracking/interTrackFoam/ramp/constant/polyMesh/blockMeshDict b/tutorials/surfaceTracking/interTrackFoam/ramp/constant/polyMesh/blockMeshDict
index 7045ef8c0..d8d6c5672 100644
--- a/tutorials/surfaceTracking/interTrackFoam/ramp/constant/polyMesh/blockMeshDict
+++ b/tutorials/surfaceTracking/interTrackFoam/ramp/constant/polyMesh/blockMeshDict
@@ -53,37 +53,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall freeSurface
-    (
-        (3 7 6 2)
-        (2 6 11 9)
-        (9 11 15 13)
-    )
-    wall inlet
-    (
-        (0 4 7 3)
-    )
-    wall outlet
-    (
-        (12 13 15 14)
-    )
-    wall walls
-    (
-        (5 4 0 1)
-        (10 5 1 8)
-        (14 10 8 12)
-    )
-    empty frontAndBack
-    (
-        (0 3 2 1)
-        (4 5 6 7)
-        (1 2 9 8)
-        (5 10 11 6)
-        (8 9 13 12)
-        (10 14 15 11)
-    )
+    freeSurface
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (2 6 11 9)
+            (9 11 15 13)
+        );
+    }
+
+    inlet
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    outlet
+    {
+        type wall;
+        faces
+        (
+            (12 13 15 14)
+        );
+    }
+
+    walls
+    {
+        type wall;
+        faces
+        (
+            (5 4 0 1)
+            (10 5 1 8)
+            (14 10 8 12)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+            (1 2 9 8)
+            (5 10 11 6)
+            (8 9 13 12)
+            (10 14 15 11)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/surfaceTracking/interTrackFoam/ramp/constant/polyMesh/boundary b/tutorials/surfaceTracking/interTrackFoam/ramp/constant/polyMesh/boundary
deleted file mode 100644
index 216dbd062..000000000
--- a/tutorials/surfaceTracking/interTrackFoam/ramp/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    freeSurface
-    {
-        type            wall;
-        nFaces          50;
-        startFace       940;
-    }
-    inlet
-    {
-        type            wall;
-        nFaces          10;
-        startFace       990;
-    }
-    outlet
-    {
-        type            wall;
-        nFaces          10;
-        startFace       1000;
-    }
-    walls
-    {
-        type            wall;
-        nFaces          50;
-        startFace       1010;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          1000;
-        startFace       1060;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/polyMesh/blockMeshDict b/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/polyMesh/blockMeshDict
index 14b3d452d..c64a42b8c 100644
--- a/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/polyMesh/blockMeshDict
@@ -77,69 +77,101 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch freeSurface
-    (
-        (16 17 21 20)
-        (17 18 22 21)
-        (18 19 23 22)
-        (20 21 25 24)
-        (21 22 26 25)
-        (22 23 27 26)
-        (24 25 29 28)
-        (25 26 30 29)
-        (26 27 31 30)
-    )
+    freeSurface
+    {
+        type patch;
+        faces
+        (
+            (16 17 21 20)
+            (17 18 22 21)
+            (18 19 23 22)
+            (20 21 25 24)
+            (21 22 26 25)
+            (22 23 27 26)
+            (24 25 29 28)
+            (25 26 30 29)
+            (26 27 31 30)
+        );
+    }
 
-    patch inlet
-    (
-        (4 5 1 0)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (4 5 1 0)
+        );
+    }
 
-    patch outlet
-    (
-        (14 15 11 10)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (14 15 11 10)
+        );
+    }
 
-    wall bottom
-    (
-        (5 6 2 1)
-        (6 7 3 2)
-        (8 9 5 4)
-        (9 10 6 5)
-        (10 11 7 6)
-        (12 13 9 8)
-        (13 14 10 9)
-    )
+    bottom
+    {
+        type wall;
+        faces
+        (
+            (5 6 2 1)
+            (6 7 3 2)
+            (8 9 5 4)
+            (9 10 6 5)
+            (10 11 7 6)
+            (12 13 9 8)
+            (13 14 10 9)
+        );
+    }
 
-    wall side-1
-    (
-        (3 7 23 19)
-        (7 11 27 23)
-        (11 15 31 27)
-    )
+    side-1
+    {
+        type wall;
+        faces
+        (
+            (3 7 23 19)
+            (7 11 27 23)
+            (11 15 31 27)
+        );
+    }
 
-    wall side-2
-    (
-        (15 14 30 31)
-        (14 13 29 30)
-        (13 12 28 29)
-    )
+    side-2
+    {
+        type wall;
+        faces
+        (
+            (15 14 30 31)
+            (14 13 29 30)
+            (13 12 28 29)
+        );
+    }
 
-    symmetryPlane symm-1
-    (
-        (0 1 17 16)
-        (1 2 18 17)
-        (2 3 19 18)
-    )
+    symm-1
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 17 16)
+            (1 2 18 17)
+            (2 3 19 18)
+        );
+    }
 
-    symmetryPlane symm-2
-    (
-        (12 8 24 28)
-        (8 4 20 24)
-        (4 0 16 20)
-    )
+    symm-2
+    {
+        type symmetryPlane;
+        faces
+        (
+            (12 8 24 28)
+            (8 4 20 24)
+            (4 0 16 20)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/polyMesh/boundary b/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/polyMesh/boundary
deleted file mode 100644
index 724c8916f..000000000
--- a/tutorials/surfaceTracking/interTrackFoam/tank3D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,70 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-8
-(
-    freeSurface
-    {
-        type            patch;
-        nFaces          1600;
-        startFace       111680;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          144;
-        startFace       113280;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          64;
-        startFace       113424;
-    }
-    bottom
-    {
-        type            wall;
-        nFaces          1392;
-        startFace       113488;
-    }
-    side-1
-    {
-        type            wall;
-        nFaces          960;
-        startFace       114880;
-    }
-    side-2
-    {
-        type            wall;
-        nFaces          960;
-        startFace       115840;
-    }
-    symm-1
-    {
-        type            symmetryPlane;
-        nFaces          960;
-        startFace       116800;
-    }
-    symm-2
-    {
-        type            symmetryPlane;
-        nFaces          960;
-        startFace       117760;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/surfaceTracking/surfactantFoam/planeTransport/constant/polyMesh/blockMeshDict b/tutorials/surfaceTracking/surfactantFoam/planeTransport/constant/polyMesh/blockMeshDict
index 6f399e7d6..d25e7c78b 100644
--- a/tutorials/surfaceTracking/surfactantFoam/planeTransport/constant/polyMesh/blockMeshDict
+++ b/tutorials/surfaceTracking/surfactantFoam/planeTransport/constant/polyMesh/blockMeshDict
@@ -37,29 +37,53 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 4 7 3)
-    )
-    wall bound
-    (
-        (3 7 6 2)
-        (1 5 4 0)
-    )
-    patch outlet
-    (
-        (2 6 5 1)
-    )
-    patch bottom
-    (
-        (0 3 2 1)
-    )
-    patch top
-    (
-        (4 5 6 7)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+           (0 4 7 3)
+        );
+    }
+
+    bound
+    {
+        type wall;
+        faces
+        (
+           (3 7 6 2)
+           (1 5 4 0)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    bottom
+    {
+        type patch;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+
+    top
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/surfaceTracking/surfactantFoam/planeTransport/constant/polyMesh/boundary b/tutorials/surfaceTracking/surfactantFoam/planeTransport/constant/polyMesh/boundary
deleted file mode 100644
index 2d294149c..000000000
--- a/tutorials/surfaceTracking/surfactantFoam/planeTransport/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.0                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          20;
-        startFace       2320;
-    }
-    bound
-    {
-        type            wall;
-        nFaces          120;
-        startFace       2340;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          20;
-        startFace       2460;
-    }
-    bottom
-    {
-        type            patch;
-        nFaces          1200;
-        startFace       2480;
-    }
-    top
-    {
-        type            patch;
-        nFaces          1200;
-        startFace       3680;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/constant/polyMesh/blockMeshDict
index 104402dde..08787d320 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/constant/polyMesh/blockMeshDict
index 6324b5b76..e778c093b 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/constant/polyMesh/blockMeshDict
@@ -62,37 +62,53 @@ edges
     arc 15 16 (4.698463 1.7101007 120)
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (10 12 11 10)
-        (12 14 13 11)
-        (14 16 15 13)
-    )
-    wall fixedWalls
-    (
-        (1 4 5 2)
-        (4 6 7 5)
-        (6 8 9 7)
-        (8 15 16 9)
-    )
-    patch outlet
-    (
-        (0 1 2 0)
-    )
-    symmetryPlane simetry
-    (
-        (0 3 4 1)
-        (0 2 5 3)
-        (3 10 11 4)
-        (4 11 13 6)
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (10 12 11 10)
+            (12 14 13 11)
+            (14 16 15 13)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (1 4 5 2)
+            (4 6 7 5)
+            (6 8 9 7)
+            (8 15 16 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (0 1 2 0)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 3 4 1)
+            (0 2 5 3)
+            (3 10 11 4)
+            (4 11 13 6)
 
-        (6 13 15 8)
-        (3 5 12 10)
-        (5 7 14 12)
-        (7 9 16 14)
-    )
+            (6 13 15 8)
+            (3 5 12 10)
+            (5 7 14 12)
+            (7 9 16 14)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/constant/polyMesh/blockMeshDict
index 7a694faeb..7d2eb0fb1 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/constant/polyMesh/blockMeshDict
index 55f0db637..0010bdd07 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/constant/polyMesh/blockMeshDict
@@ -38,24 +38,36 @@ edges
 (
 );
 
-patches
+boundary
 (
-    wall fixedWalls
-    (
-        (3 7 6 2)
-        (0 4 7 3)
-        (2 6 5 1)
-        (1 5 4 0)
-    )
-   patch inlet
-    (
-        (0 3 2 1)
-    )
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
 
-   patch outlet
-    (
-        (4 5 6 7)
-    )
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/constant/polyMesh/blockMeshDict
index 7a694faeb..7d2eb0fb1 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/constant/polyMesh/blockMeshDict
index 7a694faeb..7d2eb0fb1 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/constant/polyMesh/blockMeshDict
index 7a694faeb..7d2eb0fb1 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/constant/polyMesh/blockMeshDict
index 91d7241d7..6e91a7b1a 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/constant/polyMesh/blockMeshDict
@@ -144,47 +144,70 @@ edges
     arc 60 57 (-0.535757 -1.29343 1)
 );
 
-patches
+boundary
 (
-    patch left
-    (
-        (17 14 46 49)
-        (14 13 45 46)
-        (13 27 59 45)
-        (27 30 62 59)
-    )
-    patch right
-    (
-        (22 19 51 54)
-        (19 2 34 51)
-        (2 3 35 34)
-        (3 6 38 35)
-    )
-    wall down
-    (
-        (30 31 63 62)
-        (31 24 56 63)
-        (24 23 55 56)
-        (23 22 54 55)
-    )
-    wall up
-    (
-        (6 7 39 38)
-        (7 8 40 39)
-        (8 18 50 40)
-        (18 17 49 50)
-    )
-    wall cylinder
-    (
-        (0 5 37 32)
-        (5 10 42 37)
-        (10 16 48 42)
-        (16 11 43 48)
-        (11 29 61 43)
-        (29 26 58 61)
-        (26 21 53 58)
-        (21 0 32 53)
-    )
+    left
+    {
+        type patch;
+        faces
+        (
+            (17 14 46 49)
+            (14 13 45 46)
+            (13 27 59 45)
+            (27 30 62 59)
+        );
+    }
+    right
+    {
+        type patch;
+        faces
+        (
+            (22 19 51 54)
+            (19 2 34 51)
+            (2 3 35 34)
+            (3 6 38 35)
+        );
+
+    }
+    down
+    {
+        type wall;
+        faces
+        (
+            (30 31 63 62)
+            (31 24 56 63)
+            (24 23 55 56)
+            (23 22 54 55)
+        );
+
+    }
+    up
+    {
+        type wall;
+        faces
+        (
+            (6 7 39 38)
+            (7 8 40 39)
+            (8 18 50 40)
+            (18 17 49 50)
+        );
+
+    }
+    cylinder
+    {
+        type wall;
+        faces
+        (
+            (0 5 37 32)
+            (5 10 42 37)
+            (10 16 48 42)
+            (16 11 43 48)
+            (11 29 61 43)
+            (29 26 58 61)
+            (26 21 53 58)
+            (21 0 32 53)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/constant/polyMesh/blockMeshDict
index 7a694faeb..7d2eb0fb1 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/constant/polyMesh/blockMeshDict
index 104402dde..08787d320 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/constant/polyMesh/blockMeshDict
index 7a694faeb..7d2eb0fb1 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/constant/polyMesh/blockMeshDict
index 104402dde..08787d320 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/constant/polyMesh/blockMeshDict b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/constant/polyMesh/blockMeshDict
index 104402dde..08787d320 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/constant/polyMesh/blockMeshDict
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/constant/polyMesh/blockMeshDict
@@ -54,41 +54,61 @@ edges
 (
 );
 
-patches
+boundary
 (
-    patch inlet
-    (
-        (0 10  12 2)
-        (2 12 14 4)
-        (4 14 16 6)
-    )
-    wall fixedWalls
-    (
-        (6 16 17 7)
-        (5 7 17 15)
-        (3 5 15 13)
-        (3 13 19 9)
-    )
-    patch outlet
-    (
-        (8 9 19 18)
-    )
-    symmetryPlane simetry
-    (
-        (0 1 11 10)
-        (1 8 18 11)
-    )
-    empty frontAndBack
-    (
-        (0 2 3 1)
-        (2 4 5 3)
-        (4 6 7 5)
-        (1 3 9 8)
-        (10 11 13 12)
-        (12 13 15 14)
-        (14 15 17 16)
-        (11 18 19 13)
-    )
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 10 12 2)
+            (2 12 14 4)
+            (4 14 16 6)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (6 16 17 7)
+            (5 7 17 15)
+            (3 5 15 13)
+            (3 13 19 9)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (8 9 19 18)
+        );
+    }
+    simetry
+    {
+        type symmetryPlane;
+        faces
+        (
+            (0 1 11 10)
+            (1 8 18 11)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 2 3 1)
+            (2 4 5 3)
+            (4 6 7 5)
+            (1 3 9 8)
+            (10 11 13 12)
+            (12 13 15 14)
+            (14 15 17 16)
+            (11 18 19 13)
+        );
+    }
 );
 
 mergePatchPairs