diff --git a/applications/test/primitivePatch/testPrimitivePatch.C b/applications/test/primitivePatch/testPrimitivePatch.C
index f85b65435b..7a98cf9af2 100644
--- a/applications/test/primitivePatch/testPrimitivePatch.C
+++ b/applications/test/primitivePatch/testPrimitivePatch.C
@@ -30,7 +30,6 @@ Description
 #include "Time.H"
 #include "polyMesh.H"
 #include "primitivePatch.H"
-#include "faceIOList.H"
 #include "IFstream.H"
 #include "OFstream.H"
 
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index c48abfbc39..71af306d33 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -293,11 +293,13 @@ int main(int argc, char *argv[])
         // From global region number to mesh patch.
         globalToPatch.setSize(surfaces.nRegions(), -1);
 
-        Info<< "Patch\tRegion" << nl
-            << "-----\t------"
+        Info<< "Patch\tType\tRegion" << nl
+            << "-----\t----\t------"
             << endl;
 
         const labelList& surfaceGeometry = surfaces.surfaces();
+        const PtrList<dictionary>& surfacePatchInfo = surfaces.patchInfo();
+
         forAll(surfaceGeometry, surfI)
         {
             label geomI = surfaceGeometry[surfI];
@@ -308,15 +310,34 @@ int main(int argc, char *argv[])
 
             forAll(regNames, i)
             {
-                label patchI = meshRefiner.addMeshedPatch
-                (
-                    regNames[i],
-                    wallPolyPatch::typeName
-                );
+                label globalRegionI = surfaces.globalRegion(surfI, i);
 
-                Info<< patchI << '\t' << regNames[i] << nl;
+                label patchI;
 
-                globalToPatch[surfaces.globalRegion(surfI, i)] = patchI;
+                if (surfacePatchInfo.set(globalRegionI))
+                {
+                    patchI = meshRefiner.addMeshedPatch
+                    (
+                        regNames[i],
+                        surfacePatchInfo[globalRegionI]
+                    );
+                }
+                else
+                {
+                    dictionary patchInfo;
+                    patchInfo.set("type", wallPolyPatch::typeName);
+
+                    patchI = meshRefiner.addMeshedPatch
+                    (
+                        regNames[i],
+                        patchInfo
+                    );
+                }
+
+                Info<< patchI << '\t' << mesh.boundaryMesh()[patchI].type()
+                    << '\t' << regNames[i] << nl;
+
+                globalToPatch[globalRegionI] = patchI;
             }
 
             Info<< nl;
@@ -431,7 +452,7 @@ int main(int argc, char *argv[])
     {
         cpuTime timer;
 
-        autoLayerDriver layerDriver(meshRefiner);
+        autoLayerDriver layerDriver(meshRefiner, globalToPatch);
 
         // Layer addition parameters
         layerParameters layerParams(layerDict, mesh.boundaryMesh());
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index a15aa483c4..dbfcbd12d5 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -343,7 +343,8 @@ meshQualityControls
 
     //- Minimum quality of the tet formed by the face-centre
     //  and variable base point minimum decomposition triangles and
-    //  the cell centre.  Set to very negative number (e.g. -1E30) to
+    //  the cell centre. This has to be a positive number for tracking
+    //  to work. Set to very negative number (e.g. -1E30) to
     //  disable.
     //     <0 = inside out tet,
     //      0 = flat tet
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index 2649cc1e4e..c340aedb17 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -166,10 +166,10 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << endl;
 
         // Convert all the standard mesh files
-        writeMeshObject<cellIOList>("cells", meshDir, runTime);
+        writeMeshObject<cellCompactIOList>("cells", meshDir, runTime);
         writeMeshObject<labelIOList>("owner", meshDir, runTime);
         writeMeshObject<labelIOList>("neighbour", meshDir, runTime);
-        writeMeshObject<faceIOList>("faces", meshDir, runTime);
+        writeMeshObject<faceCompactIOList>("faces", meshDir, runTime);
         writeMeshObject<pointIOField>("points", meshDir, runTime);
         writeMeshObject<labelIOList>("pointProcAddressing", meshDir, runTime);
         writeMeshObject<labelIOList>("faceProcAddressing", meshDir, runTime);
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index e615ebe210..89cf00cd1b 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -311,7 +311,7 @@ void rewriteField
             {
                 IOWarningIn("rewriteField(..)", patchDict)
                     << "Cyclic patch " << patchName
-                    << " has value entry. Please removed this and rerun."
+                    << " has value entry. Please remove this and rerun."
                     << endl;
             }
 
diff --git a/etc/bashrc b/etc/bashrc
index e5c050b44f..e194bba3d0 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -131,7 +131,8 @@ unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 : ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
 
-# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
+# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA
+#                          | MPI | QSMPI
 : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
 
 
@@ -241,7 +242,8 @@ foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
 cleaned=`$foamClean "$PATH" "$foamOldDirs"` && PATH="$cleaned"
 
 #- Clean LD_LIBRARY_PATH
-cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleaned"
+cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` \
+    && LD_LIBRARY_PATH="$cleaned"
 
 #- Clean MANPATH
 cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` && MANPATH="$cleaned"
@@ -257,8 +259,13 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
-_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
+paraview3=`$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc` \
+    && _foamSource $paraview3
+unset paraview3
+
+ensight=`$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc` \
+    && _foamSource $ensight
+unset ensight
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/etc/cshrc b/etc/cshrc
index 7ceff2ff58..807d38f042 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -255,8 +255,17 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
-# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
+set paraview3=`$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/cshrc`
+if ( $status == 0 ) then
+    _foamSource $paraview3
+endif
+unset paraview3
+
+set ensight=`$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/cshrc`
+if ( $status == 0 ) then
+    _foamSource $ensight
+endif
+unset ensight
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/src/OpenFOAM/db/IOobjects/IOListList/IOListList.C b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
similarity index 87%
rename from src/OpenFOAM/db/IOobjects/IOListList/IOListList.C
rename to src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
index 0f1b320195..ac21a5e4c5 100644
--- a/src/OpenFOAM/db/IOobjects/IOListList/IOListList.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
@@ -23,13 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "IOListList.H"
+#include "CompactIOList.H"
 #include "labelList.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class T, class BaseType>
-void Foam::IOListList<T, BaseType>::readFromStream()
+void Foam::CompactIOList<T, BaseType>::readFromStream()
 {
     Istream& is = readStream(word::null);
 
@@ -47,7 +47,7 @@ void Foam::IOListList<T, BaseType>::readFromStream()
     {
         FatalIOErrorIn
         (
-            "IOListList<T, BaseType>::readFromStream()",
+            "CompactIOList<T, BaseType>::readFromStream()",
             is
         )   << "unexpected class name " << headerClassName()
             << " expected " << typeName << " or " << IOList<T>::typeName
@@ -61,7 +61,7 @@ void Foam::IOListList<T, BaseType>::readFromStream()
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
-Foam::IOListList<T, BaseType>::IOListList(const IOobject& io)
+Foam::CompactIOList<T, BaseType>::CompactIOList(const IOobject& io)
 :
     regIOobject(io)
 {
@@ -77,7 +77,11 @@ Foam::IOListList<T, BaseType>::IOListList(const IOobject& io)
 
 
 template<class T, class BaseType>
-Foam::IOListList<T, BaseType>::IOListList(const IOobject& io, const label size)
+Foam::CompactIOList<T, BaseType>::CompactIOList
+(
+    const IOobject& io,
+    const label size
+)
 :
     regIOobject(io)
 {
@@ -97,7 +101,7 @@ Foam::IOListList<T, BaseType>::IOListList(const IOobject& io, const label size)
 
 
 template<class T, class BaseType>
-Foam::IOListList<T, BaseType>::IOListList
+Foam::CompactIOList<T, BaseType>::CompactIOList
 (
     const IOobject& io,
     const List<T>& list
@@ -121,7 +125,7 @@ Foam::IOListList<T, BaseType>::IOListList
 
 
 template<class T, class BaseType>
-Foam::IOListList<T, BaseType>::IOListList
+Foam::CompactIOList<T, BaseType>::CompactIOList
 (
     const IOobject& io,
     const Xfer<List<T> >& list
@@ -145,7 +149,7 @@ Foam::IOListList<T, BaseType>::IOListList
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
-Foam::IOListList<T, BaseType>::~IOListList()
+Foam::CompactIOList<T, BaseType>::~CompactIOList()
 {}
 
 
@@ -153,7 +157,7 @@ Foam::IOListList<T, BaseType>::~IOListList()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
-bool Foam::IOListList<T, BaseType>::writeObject
+bool Foam::CompactIOList<T, BaseType>::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
@@ -182,7 +186,7 @@ bool Foam::IOListList<T, BaseType>::writeObject
 
 
 template<class T, class BaseType>
-bool Foam::IOListList<T, BaseType>::writeData(Ostream& os) const
+bool Foam::CompactIOList<T, BaseType>::writeData(Ostream& os) const
 {
     return (os << *this).good();
 }
@@ -191,9 +195,9 @@ bool Foam::IOListList<T, BaseType>::writeData(Ostream& os) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
-void Foam::IOListList<T, BaseType>::operator=
+void Foam::CompactIOList<T, BaseType>::operator=
 (
-    const IOListList<T, BaseType>& rhs
+    const CompactIOList<T, BaseType>& rhs
 )
 {
     List<T>::operator=(rhs);
@@ -201,7 +205,7 @@ void Foam::IOListList<T, BaseType>::operator=
 
 
 template<class T, class BaseType>
-void Foam::IOListList<T, BaseType>::operator=(const List<T>& rhs)
+void Foam::CompactIOList<T, BaseType>::operator=(const List<T>& rhs)
 {
     List<T>::operator=(rhs);
 }
@@ -213,7 +217,7 @@ template<class T, class BaseType>
 Foam::Istream& Foam::operator>>
 (
     Foam::Istream& is,
-    Foam::IOListList<T, BaseType>& L
+    Foam::CompactIOList<T, BaseType>& L
 )
 {
     // Read compact
@@ -244,7 +248,7 @@ template<class T, class BaseType>
 Foam::Ostream& Foam::operator<<
 (
     Foam::Ostream& os,
-    const Foam::IOListList<T, BaseType>& L
+    const Foam::CompactIOList<T, BaseType>& L
 )
 {
     // Keep ascii writing same.
diff --git a/src/OpenFOAM/db/IOobjects/IOListList/IOListList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
similarity index 76%
rename from src/OpenFOAM/db/IOobjects/IOListList/IOListList.H
rename to src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index b5bd103183..e4a85ef118 100644
--- a/src/OpenFOAM/db/IOobjects/IOListList/IOListList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
@@ -22,18 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::IOListList
+    Foam::CompactIOList
 
 Description
-    A List of objects of type \<T\> with automated input and output.
+    A List of objects of type \<T\> with automated input and output using
+    a compact storage. Behaves like IOList except when binary output in
+    case it writes a CompactListList.
+
+    Useful for lists of small sublists e.g. faceList, cellList.
 
 SourceFiles
-    IOListList.C
+    CompactIOList.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOListList_H
-#define IOListList_H
+#ifndef CompactIOList_H
+#define CompactIOList_H
 
 #include "IOList.H"
 #include "regIOobject.H"
@@ -47,25 +51,25 @@ class Istream;
 class Ostream;
 
 // Forward declaration of friend functions and operators
-template<class T, class BaseType> class IOListList;
+template<class T, class BaseType> class CompactIOList;
 
 template<class T, class BaseType> Istream& operator>>
 (
     Istream&,
-    IOListList<T, BaseType>&
+    CompactIOList<T, BaseType>&
 );
 template<class T, class BaseType> Ostream& operator<<
 (
     Ostream&,
-    const IOListList<T, BaseType>&
+    const CompactIOList<T, BaseType>&
 );
 
 /*---------------------------------------------------------------------------*\
-                           Class IOListList Declaration
+                           Class CompactIOList Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class T, class BaseType>
-class IOListList
+class CompactIOList
 :
     public regIOobject,
     public List<T>
@@ -78,27 +82,27 @@ class IOListList
 public:
 
     //- Runtime type information
-    TypeName("ListList");
+    TypeName("CompactList");
 
 
     // Constructors
 
         //- Construct from IOobject
-        IOListList(const IOobject&);
+        CompactIOList(const IOobject&);
 
-        //- Construct from IOobject and size of IOListList
-        IOListList(const IOobject&, const label);
+        //- Construct from IOobject and size of CompactIOList
+        CompactIOList(const IOobject&, const label);
 
         //- Construct from IOobject and a List
-        IOListList(const IOobject&, const List<T>&);
+        CompactIOList(const IOobject&, const List<T>&);
 
         //- Construct by transferring the List contents
-        IOListList(const IOobject&, const Xfer<List<T> >&);
+        CompactIOList(const IOobject&, const Xfer<List<T> >&);
 
 
     // Destructor
 
-        virtual ~IOListList();
+        virtual ~CompactIOList();
 
 
     // Member functions
@@ -115,7 +119,7 @@ public:
 
     // Member operators
 
-        void operator=(const IOListList<T, BaseType>&);
+        void operator=(const CompactIOList<T, BaseType>&);
 
         void operator=(const List<T>&);
 
@@ -126,14 +130,14 @@ public:
         friend Istream& operator>> <T, BaseType>
         (
             Istream&,
-            IOListList<T, BaseType>&
+            CompactIOList<T, BaseType>&
         );
 
         // Write List to Ostream.
         friend Ostream& operator<< <T, BaseType>
         (
             Ostream&,
-            const IOListList<T, BaseType>&
+            const CompactIOList<T, BaseType>&
         );
 };
 
@@ -145,7 +149,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IOListList.C"
+#   include "CompactIOList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.C b/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.C
index 6a6aa29de2..46203004a6 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.C
@@ -35,7 +35,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-    defineTemplateTypeNameAndDebugWithName(cellIOList, "cellList", 0);
+defineTemplateTypeNameAndDebugWithName(cellIOList, "cellList", 0);
+defineTemplateTypeNameAndDebugWithName(cellCompactIOList, "cellCompactList", 0);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.H b/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.H
index 194c682482..9db59238d2 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.H
@@ -33,13 +33,14 @@ Description
 #define cellIOList_H
 
 #include "cell.H"
-#include "IOList.H"
+#include "CompactIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
     typedef IOList<cell> cellIOList;
+    typedef CompactIOList<cell, label> cellCompactIOList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.C b/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.C
index 4dd508f0ee..a4fc4e91fc 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.C
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.C
@@ -33,10 +33,14 @@ Description
 
 namespace Foam
 {
-    defineCompoundTypeName(List<edge>, edgeList);
-    addCompoundToRunTimeSelectionTable(List<edge>, edgeList);
 
-    defineTemplateTypeNameAndDebugWithName(edgeIOList, "edgeList", 0);
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineCompoundTypeName(List<edge>, edgeList);
+addCompoundToRunTimeSelectionTable(List<edge>, edgeList);
+
+defineTemplateTypeNameAndDebugWithName(edgeIOList, "edgeList", 0);
+defineTemplateTypeNameAndDebugWithName(edgeCompactIOList, "edgeCompactList", 0);
 }
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.H
index 6c4d1f9287..fa3659913f 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.H
@@ -33,13 +33,14 @@ Description
 #define edgeIOList_H
 
 #include "edge.H"
-#include "IOList.H"
+#include "CompactIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
     typedef IOList<edge> edgeIOList;
+    typedef CompactIOList<edge, label> edgeCompactIOList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIOList.C b/src/OpenFOAM/meshes/meshShapes/face/faceIOList.C
index 5ce764bd14..212ac9ca17 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIOList.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIOList.C
@@ -36,6 +36,12 @@ namespace Foam
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTemplateTypeNameAndDebugWithName(faceIOList, "faceList", 0);
+defineTemplateTypeNameAndDebugWithName
+(
+    faceCompactIOList,
+    "faceCompactList",
+    0
+);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIOList.H b/src/OpenFOAM/meshes/meshShapes/face/faceIOList.H
index 58874198a0..0422f52470 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIOList.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIOList.H
@@ -33,13 +33,14 @@ Description
 #define faceIOList_H
 
 #include "face.H"
-#include "IOList.H"
+#include "CompactIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
     typedef IOList<face> faceIOList;
+    typedef CompactIOList<face, label> faceCompactIOList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 668320e1d6..ab72d6d446 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -272,7 +272,7 @@ Foam::polyMesh::polyMesh(const IOobject& io)
     }
     else
     {
-        cellIOList cLst
+        cellCompactIOList cLst
         (
             IOobject
             (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index a100a358e1..62df97511c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -101,7 +101,7 @@ private:
             pointIOField points_;
 
             //- Faces
-            faceIOList faces_;
+            faceCompactIOList faces_;
 
             //- Face owner
             labelIOList owner_;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 757f174588..8e50f8033e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -112,7 +112,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             )
         );
 
-        faces_ = faceIOList
+        faces_ = faceCompactIOList
         (
             IOobject
             (
@@ -238,7 +238,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         }
         else
         {
-            cellIOList cells
+            cellCompactIOList cells
             (
                 IOobject
                 (
diff --git a/src/OpenFOAM/primitives/Lists/labelListIOList.C b/src/OpenFOAM/primitives/Lists/labelListIOList.C
index 72ebc51588..0e131a3b0a 100644
--- a/src/OpenFOAM/primitives/Lists/labelListIOList.C
+++ b/src/OpenFOAM/primitives/Lists/labelListIOList.C
@@ -21,10 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Declaration of IOList and IOListList ClassNames for IOListLists that
-    do not have .C files.
-
 \*---------------------------------------------------------------------------*/
 
 #include "labelListIOList.H"
@@ -38,8 +34,8 @@ namespace Foam
 
     defineTemplateTypeNameAndDebugWithName
     (
-        labelIOListList,
-        "labelCompactListList",
+        labelListCompactIOList,
+        "labelListCompactList",
         0
     );
 }
diff --git a/src/OpenFOAM/primitives/Lists/labelListIOList.H b/src/OpenFOAM/primitives/Lists/labelListIOList.H
index aebd4fc4aa..90cd61e238 100644
--- a/src/OpenFOAM/primitives/Lists/labelListIOList.H
+++ b/src/OpenFOAM/primitives/Lists/labelListIOList.H
@@ -33,15 +33,14 @@ Description
 #define labelListIOList_H
 
 #include "labelList.H"
-#include "IOList.H"
-#include "IOListList.H"
+#include "CompactIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
     typedef IOList<labelList> labelListIOList;
-    typedef IOListList<labelList, label> labelIOListList;
+    typedef CompactIOList<labelList, label> labelListCompactIOList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Lists/scalarListIOList.C b/src/OpenFOAM/primitives/Lists/scalarListIOList.C
index effb61127e..84df4520cc 100644
--- a/src/OpenFOAM/primitives/Lists/scalarListIOList.C
+++ b/src/OpenFOAM/primitives/Lists/scalarListIOList.C
@@ -21,10 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Declaration of IOList and IOListList ClassNames for IOListLists that
-    do not have .C files.
-
 \*---------------------------------------------------------------------------*/
 
 #include "scalarListIOList.H"
@@ -43,8 +39,8 @@ namespace Foam
 
     defineTemplateTypeNameAndDebugWithName
     (
-        scalarIOListList,
-        "scalarCompactListList",
+        scalarListCompactIOList,
+        "scalarListCompactList",
         0
     );
 }
diff --git a/src/OpenFOAM/primitives/Lists/scalarListIOList.H b/src/OpenFOAM/primitives/Lists/scalarListIOList.H
index 24dc8e13fb..99e2fdf69a 100644
--- a/src/OpenFOAM/primitives/Lists/scalarListIOList.H
+++ b/src/OpenFOAM/primitives/Lists/scalarListIOList.H
@@ -33,15 +33,14 @@ Description
 #define scalarListIOList_H
 
 #include "scalarList.H"
-#include "IOList.H"
-#include "IOListList.H"
+#include "CompactIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
     typedef IOList<scalarList> scalarListIOList;
-    typedef IOListList<scalarList, scalar> scalarIOListList;
+    typedef CompactIOList<scalarList, scalar> scalarListCompactIOList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Lists/vectorListIOList.C b/src/OpenFOAM/primitives/Lists/vectorListIOList.C
index 661f729410..fa73bde4d5 100644
--- a/src/OpenFOAM/primitives/Lists/vectorListIOList.C
+++ b/src/OpenFOAM/primitives/Lists/vectorListIOList.C
@@ -21,10 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Declaration of IOList and IOListList ClassNames for IOListLists that
-    do not have .C files.
-
 \*---------------------------------------------------------------------------*/
 
 #include "vectorListIOList.H"
@@ -43,8 +39,8 @@ namespace Foam
 
     defineTemplateTypeNameAndDebugWithName
     (
-        vectorIOListList,
-        "vectorCompactListList",
+        vectorListCompactIOList,
+        "vectorListCompactList",
         0
     );
 }
diff --git a/src/OpenFOAM/primitives/Lists/vectorListIOList.H b/src/OpenFOAM/primitives/Lists/vectorListIOList.H
index 53acf8afb0..299882f5b5 100644
--- a/src/OpenFOAM/primitives/Lists/vectorListIOList.H
+++ b/src/OpenFOAM/primitives/Lists/vectorListIOList.H
@@ -25,7 +25,7 @@ Typedef
     Foam::vectorListIOList
 
 Description
-    Scalar container classes
+    Lists of vectors container class
 
 \*---------------------------------------------------------------------------*/
 
@@ -33,15 +33,14 @@ Description
 #define vectorListIOList_H
 
 #include "vectorList.H"
-#include "IOList.H"
-#include "IOListList.H"
+#include "CompactIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
     typedef IOList<vectorList> vectorListIOList;
-    typedef IOListList<vectorList, vector> vectorIOListList;
+    typedef CompactIOList<vectorList, vector> vectorListCompactIOList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.C b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.C
index 3bcd500d04..e132849598 100644
--- a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.C
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.C
@@ -34,15 +34,16 @@ const Foam::label Foam::globalIndexAndTransform::base_ = 32;
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-bool Foam::globalIndexAndTransform::matchTransform
+Foam::label Foam::globalIndexAndTransform::matchTransform
 (
     const List<vectorTensorTransform>& refTransforms,
+    label& matchedRefTransformI,
     const vectorTensorTransform& testTransform,
     scalar tolerance,
-    bool bothSigns
+    bool checkBothSigns
 ) const
 {
-    // return min(mag(transforms_ - sepVec)) > tol
+    matchedRefTransformI = -1;
 
     forAll(refTransforms, i)
     {
@@ -82,10 +83,12 @@ bool Foam::globalIndexAndTransform::matchTransform
 
         if (vectorDiff < 1 && tensorDiff < 1)
         {
-            return true;
+            matchedRefTransformI = i;
+
+            return +1;
         }
 
-        if (bothSigns)
+        if (checkBothSigns)
         {
             // Test the inverse transform differences too
 
@@ -106,12 +109,14 @@ bool Foam::globalIndexAndTransform::matchTransform
 
             if (vectorDiff < 1 && tensorDiff < 1)
             {
-                return true;
+                matchedRefTransformI = i;
+
+                return -1;
             }
         }
     }
 
-    return false;
+    return 0;
 }
 
 
@@ -123,6 +128,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
     label nextTrans = 0;
 
+    label dummyMatch = -1;
+
     forAll(patches, patchI)
     {
         const polyPatch& pp = patches[patchI];
@@ -145,7 +152,17 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
                         vectorTensorTransform transform(sepVec);
 
-                        if (!matchTransform(transforms_, transform, tol, false))
+                        if
+                        (
+                            matchTransform
+                            (
+                                transforms_,
+                                dummyMatch,
+                                transform,
+                                tol,
+                                false
+                            ) == 0
+                        )
                         {
                             transforms_[nextTrans++] = transform;
                         }
@@ -166,7 +183,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
             }
             else if (!cpp.parallel())
             {
-                const tensorField& transTensors = cpp.forwardT();
+                const tensorField& transTensors = cpp.reverseT();
 
                 forAll(transTensors, tTI)
                 {
@@ -178,7 +195,17 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
                         vectorTensorTransform transform(transT);
 
-                        if (!matchTransform(transforms_, transform, tol, false))
+                        if
+                        (
+                            matchTransform
+                            (
+                                transforms_,
+                                dummyMatch,
+                                transform,
+                                tol,
+                                false
+                            ) == 0
+                        )
                         {
                             transforms_[nextTrans++] = transform;
                         }
@@ -225,7 +252,17 @@ void Foam::globalIndexAndTransform::determineTransforms()
                 {
                     scalar tol = coupledPolyPatch::matchTol;
 
-                    if (!matchTransform(transforms_, transform, tol, true))
+                    if
+                    (
+                        matchTransform
+                        (
+                            transforms_,
+                            dummyMatch,
+                            transform,
+                            tol,
+                            true
+                        ) ==  0
+                    )
                     {
                         transforms_[nextTrans++] = transform;
                     }
@@ -290,6 +327,123 @@ void Foam::globalIndexAndTransform::determineTransformPermutations()
 }
 
 
+void Foam::globalIndexAndTransform::determinePatchTransformSign()
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    patchTransformSign_.setSize(patches.size(), Pair<label>(-1, 0));
+
+    label matchTransI = -1;
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        // Pout<< nl << patchI << " " << pp.name() << endl;
+
+        if (isA<coupledPolyPatch>(pp))
+        {
+            const coupledPolyPatch& cpp =
+            refCast<const coupledPolyPatch>(pp);
+
+            if (cpp.separated())
+            {
+                const vectorField& sepVecs = cpp.separation();
+
+                // Pout<< "sepVecs " << sepVecs << endl;
+
+                // This loop is implicitly expecting only a single
+                // value for separation()
+                forAll(sepVecs, sVI)
+                {
+                    const vector& sepVec = sepVecs[sVI];
+
+                    if (mag(sepVec) > SMALL)
+                    {
+                        scalar tol = coupledPolyPatch::matchTol;
+
+                        vectorTensorTransform t(sepVec);
+
+                        label sign = matchTransform
+                        (
+                            transforms_,
+                            matchTransI,
+                            t,
+                            tol,
+                            true
+                        );
+
+                        // Pout<< sign << " " << matchTransI << endl;
+
+                        // List<label> permutation(transforms_.size(), 0);
+
+                        // permutation[matchTransI] = sign;
+
+                        // Pout<< encodeTransformIndex(permutation) << nl
+                        //     << transformPermutations_
+                        //        [
+                        //            encodeTransformIndex(permutation)
+                        //        ]
+                        //     << endl;
+
+                        patchTransformSign_[patchI] =
+                            Pair<label>(matchTransI, sign);
+                    }
+                }
+
+            }
+            else if (!cpp.parallel())
+            {
+                const tensorField& transTensors = cpp.reverseT();
+
+                // Pout<< "transTensors " << transTensors << endl;
+
+                // This loop is implicitly expecting only a single
+                // value for reverseT()
+                forAll(transTensors, tTI)
+                {
+                    const tensor& transT = transTensors[tTI];
+
+                    if (mag(transT - I) > SMALL)
+                    {
+                        scalar tol = coupledPolyPatch::matchTol;
+
+                        vectorTensorTransform t(transT);
+
+                        label sign = matchTransform
+                        (
+                            transforms_,
+                            matchTransI,
+                            t,
+                            tol,
+                            true
+                        );
+
+                        // Pout<< sign << " " << matchTransI << endl;
+
+                        // List<label> permutation(transforms_.size(), 0);
+
+                        // permutation[matchTransI] = sign;
+
+                        // Pout<< encodeTransformIndex(permutation) << nl
+                        //     << transformPermutations_
+                        //        [
+                        //            encodeTransformIndex(permutation)
+                        //        ]
+                        //     << endl;
+
+                        patchTransformSign_[patchI] =
+                            Pair<label>(matchTransI, sign);
+                    }
+                }
+            }
+        }
+    }
+
+    // Pout<< patchTransformSign_ << endl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::globalIndexAndTransform::globalIndexAndTransform
@@ -297,11 +451,16 @@ Foam::globalIndexAndTransform::globalIndexAndTransform
     const polyMesh& mesh
 )
 :
-    mesh_(mesh)
+    mesh_(mesh),
+    transforms_(),
+    transformPermutations_(),
+    patchTransformSign_()
 {
     determineTransforms();
 
     determineTransformPermutations();
+
+    determinePatchTransformSign();
 }
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H
index 4983fb4c16..cba4bc59eb 100644
--- a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H
@@ -82,6 +82,11 @@ class globalIndexAndTransform
         //  transform.
         List<vectorTensorTransform> transformPermutations_;
 
+        //- Mapping from patch index to which transform it matches (or
+        //  -1 for none) (.first()) and what sign to us for it,
+        //  i.e. +/- 1 (.second()).
+        List<Pair<label> > patchTransformSign_;
+
 
     // Private static data
 
@@ -97,13 +102,20 @@ class globalIndexAndTransform
         //- Generate all of the transformation permutations
         void determineTransformPermutations();
 
-        //- Test a list of reference transforms to see if the test transform
-        bool matchTransform
+        //- Determine which patch uses which transform (if any) and which
+        //- sign to use
+        void determinePatchTransformSign();
+
+        //- Test a list of reference transforms to see if the test
+        //  transform matches one.  Return +1 or -1 depending on the
+        //  sign of the match, or 0 if none matches.
+        label matchTransform
         (
             const List<vectorTensorTransform>& refTransforms,
+            label& matchedRefTransformI,
             const vectorTensorTransform& testTransform,
             scalar tolerance,
-            bool bothSigns
+            bool checkBothSigns
         ) const;
 
         //- Disallow default bitwise copy construct
@@ -171,12 +183,33 @@ public:
             inline const List<vectorTensorTransform>&
             transformPermutations() const;
 
+            //- Return access to the per-patch transform-sign pairs
+            inline const List<Pair<label> >& patchTransformSign() const;
+
             //- Access the overall (permuted) transform corresponding
             //  to the transformIndex
             inline const vectorTensorTransform& transform
             (
                 label transformIndex
             ) const;
+
+            //- Access the all of the indices of the transform
+            //  permutations corresponding the transforms of the
+            //  listed patch indices
+            inline labelList transformIndicesForPatches
+            (
+                const labelHashSet& patchIs
+            ) const;
+
+            //- Apply all of the transform permutations
+            //  corresponding the transforms of the listed patch
+            //  indices to the supplied point
+            inline pointField transformPatches
+            (
+                const labelHashSet& patchIs,
+                const point& pt
+            ) const;
+
 };
 
 
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransformI.H b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransformI.H
index fe2a6034a7..f2928899f2 100644
--- a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransformI.H
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransformI.H
@@ -180,6 +180,13 @@ Foam::globalIndexAndTransform::transformPermutations() const
 }
 
 
+const Foam::List<Foam::Pair<Foam::label> >&
+Foam::globalIndexAndTransform::patchTransformSign() const
+{
+    return patchTransformSign_;
+}
+
+
 const Foam::vectorTensorTransform& Foam::globalIndexAndTransform::transform
 (
     label transformIndex
@@ -189,4 +196,214 @@ const Foam::vectorTensorTransform& Foam::globalIndexAndTransform::transform
 }
 
 
+Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
+(
+    const labelHashSet& patchIs
+) const
+{
+    List<label> permutation(transforms_.size(), 0);
+
+    labelList selectedTransformIs(0);
+
+    if (patchIs.empty() || transforms_.empty())
+    {
+        return selectedTransformIs;
+    }
+
+    forAllConstIter(labelHashSet, patchIs, iter)
+    {
+        label patchI = iter.key();
+
+        const Pair<label>& transSign = patchTransformSign_[patchI];
+
+        label matchTransI = transSign.first();
+
+        if (matchTransI > -1)
+        {
+            label sign = transSign.second();
+
+            // If this transform been found already by a patch?
+            if (permutation[matchTransI] != 0)
+            {
+                // If so, if they have opposite signs, then this is
+                // considered an error.  They are allowed to be the
+                // same sign, but this only results in a single
+                // transform.
+                if (permutation[matchTransI] != sign)
+                {
+                    FatalErrorIn
+                    (
+                        "const Foam::List<Foam::vectorTensorTransform>& "
+                        "Foam::globalIndexAndTransform::transformsForPatches"
+                        "("
+                            "const labelList& patchIs"
+                        ") const"
+                    )
+                        << "More than one patch accessing the same transform "
+                        << "but not of the same sign."
+                        << exit(FatalError);
+                }
+            }
+            else
+            {
+                permutation[matchTransI] = sign;
+            }
+        }
+    }
+
+    label nUsedTrans = sum(mag(permutation));
+
+    if (nUsedTrans == 0)
+    {
+        return selectedTransformIs;
+    }
+
+    // Number of selected transformations
+    label nSelTrans = pow(2, nUsedTrans) - 1;
+
+    // Pout<< nl << permutation << nl << endl;
+
+    selectedTransformIs.setSize(nSelTrans);
+
+    switch (nUsedTrans)
+    {
+        case 1:
+        {
+            selectedTransformIs[0] = encodeTransformIndex(permutation);
+
+            break;
+        }
+        case 2:
+        {
+            List<label> tempPermutation = permutation;
+
+            label a = 0;
+            label b = 1;
+
+            // When there are two selected transforms out of three, we
+            // need to choose which of them are being permuted
+            if (transforms_.size() > nUsedTrans)
+            {
+                if (permutation[0] == 0)
+                {
+                    a = 1;
+                    b = 2;
+                }
+                else if (permutation[1] == 0)
+                {
+                    a = 0;
+                    b = 2;
+                }
+                else if (permutation[2] == 0)
+                {
+                    a = 0;
+                    b = 1;
+                }
+            }
+
+            tempPermutation[a] = a;
+            tempPermutation[b] = permutation[b];
+
+            selectedTransformIs[0] = encodeTransformIndex(tempPermutation);
+
+            tempPermutation[a] = permutation[a];
+            tempPermutation[b] = a;
+
+            selectedTransformIs[1] = encodeTransformIndex(tempPermutation);
+
+            tempPermutation[a] = permutation[a];
+            tempPermutation[b] = permutation[b];
+
+            selectedTransformIs[2] = encodeTransformIndex(tempPermutation);
+
+            break;
+        }
+        case 3:
+        {
+            List<label> tempPermutation = permutation;
+
+            tempPermutation[0] = 0;
+            tempPermutation[1] = 0;
+            tempPermutation[2] = permutation[2];
+
+            selectedTransformIs[0] = encodeTransformIndex(tempPermutation);
+
+            tempPermutation[0] = 0;
+            tempPermutation[1] = permutation[1];
+            tempPermutation[2] = 0;
+
+            selectedTransformIs[1] = encodeTransformIndex(tempPermutation);
+
+            tempPermutation[0] = 0;
+            tempPermutation[1] = permutation[1];
+            tempPermutation[2] = permutation[2];
+
+            selectedTransformIs[2] = encodeTransformIndex(tempPermutation);
+
+            tempPermutation[0] = permutation[0];
+            tempPermutation[1] = 0;
+            tempPermutation[2] = 0;
+
+            selectedTransformIs[3] = encodeTransformIndex(tempPermutation);
+
+            tempPermutation[0] = permutation[0];
+            tempPermutation[1] = 0;
+            tempPermutation[2] = permutation[2];
+
+            selectedTransformIs[4] = encodeTransformIndex(tempPermutation);
+
+            tempPermutation[0] = permutation[0];
+            tempPermutation[1] = permutation[1];
+            tempPermutation[2] = 0;
+
+            selectedTransformIs[5] = encodeTransformIndex(tempPermutation);
+
+            tempPermutation[0] = permutation[0];
+            tempPermutation[1] = permutation[1];
+            tempPermutation[2] = permutation[2];
+
+            selectedTransformIs[6] = encodeTransformIndex(tempPermutation);
+
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "const Foam::List<Foam::vectorTensorTransform>& "
+                "Foam::globalIndexAndTransform::transformsForPatches"
+                "("
+                    "const labelList& patchIs"
+                ") const"
+            )
+                << "Only 1-3 transforms are possible."
+                << exit(FatalError);
+        }
+    }
+
+    return selectedTransformIs;
+}
+
+
+Foam::pointField Foam::globalIndexAndTransform::transformPatches
+(
+    const labelHashSet& patchIs,
+    const point& pt
+) const
+{
+    labelList transIs = transformIndicesForPatches(patchIs);
+
+    // Pout<< patchIs << nl << transIs << endl;
+
+    pointField transPts(transIs.size());
+
+    forAll(transIs, tII)
+    {
+        transPts[tII] = transformPermutations_[transIs[tII]].transform(pt);
+    }
+
+    return transPts;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index df22357873..c46d5efc77 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
index 53f90b45b3..45a54774d3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/Make/files b/src/mesh/autoMesh/Make/files
index fecec5db5d..ec877c5f94 100644
--- a/src/mesh/autoMesh/Make/files
+++ b/src/mesh/autoMesh/Make/files
@@ -5,7 +5,6 @@ $(autoHexMeshDriver)/autoLayerDriver.C
 $(autoHexMeshDriver)/autoLayerDriverShrink.C
 $(autoHexMeshDriver)/autoSnapDriver.C
 $(autoHexMeshDriver)/autoRefineDriver.C
-$(autoHexMeshDriver)/autoHexMeshDriver.C
 
 $(autoHexMeshDriver)/layerParameters/layerParameters.C
 $(autoHexMeshDriver)/refinementParameters/refinementParameters.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
deleted file mode 100644
index 2d12064c97..0000000000
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
+++ /dev/null
@@ -1,548 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*----------------------------------------------------------------------------*/
-
-#include "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);
-        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 (hierarchical, ptscotch)"
-                << 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<< "Wrote mesh in = "
-        << mesh_.time().cpuTimeIncrement() << " s." << endl;
-}
-
-
-void Foam::autoHexMeshDriver::doMesh()
-{
-    const Switch wantRefine(dict_.lookup("doRefine"));
-    const Switch wantSnap(dict_.lookup("doSnap"));
-    const 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
deleted file mode 100644
index 5637fe966b..0000000000
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
+++ /dev/null
@@ -1,232 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::autoHexMeshDriver
-
-Description
-    main meshing driver.
-
-SourceFiles
-    autoHexMeshDriver.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef autoHexMeshDriver_H
-#define autoHexMeshDriver_H
-
-#include "autoPtr.H"
-#include "dictionary.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 != point::max)
-                {
-                    if (x == point::max)
-                    {
-                        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
index be138e9d90..8f7ada0487 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -193,13 +193,13 @@ Foam::label Foam::autoLayerDriver::mergePatchFacesUndo
                 errorFaces
             );
 
-            // if (checkEdgeConnectivity)
-            // {
+            //if (checkEdgeConnectivity)
+            //{
             //    Info<< "Checking edge-face connectivity (duplicate faces"
             //        << " or non-consecutive shared vertices)" << endl;
-
+            //
             //    label nOldSize = errorFaces.size();
-
+            //
             //    hasErrors =
             //        mesh.checkFaceFaces
             //        (
@@ -207,7 +207,7 @@ Foam::label Foam::autoLayerDriver::mergePatchFacesUndo
             //            &errorFaces
             //        )
             //     || hasErrors;
-
+            //
             //    Info<< "Detected additional "
             //        <<  returnReduce
             //            (
@@ -216,7 +216,7 @@ Foam::label Foam::autoLayerDriver::mergePatchFacesUndo
             //            )
             //        << " faces with illegal face-face connectivity"
             //        << endl;
-            // }
+            //}
 
             if (!hasErrors)
             {
@@ -2344,6 +2344,7 @@ Foam::label Foam::autoLayerDriver::checkAndUnmark
 (
     const addPatchCellLayer& addLayer,
     const dictionary& meshQualityDict,
+    const List<labelPair>& baffles,
     const indirectPrimitivePatch& pp,
     const fvMesh& newMesh,
 
@@ -2355,7 +2356,15 @@ Foam::label Foam::autoLayerDriver::checkAndUnmark
     // 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);
+    motionSmoother::checkMesh
+    (
+        false,
+        newMesh,
+        meshQualityDict,
+        identity(newMesh.nFaces()),
+        baffles,
+        wrongFaces
+    );
     Info<< "Detected " << returnReduce(wrongFaces.size(), sumOp<label>())
         << " illegal faces"
         << " (concave, zero area or negative cell pyramid volume)"
@@ -2484,9 +2493,14 @@ void Foam::autoLayerDriver::getLayerCellsFaces
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoLayerDriver::autoLayerDriver(meshRefinement& meshRefiner)
+Foam::autoLayerDriver::autoLayerDriver
+(
+    meshRefinement& meshRefiner,
+    const labelList& globalToPatch
+)
 :
-    meshRefiner_(meshRefiner)
+    meshRefiner_(meshRefiner),
+    globalToPatch_(globalToPatch)
 {}
 
 
@@ -2536,6 +2550,20 @@ void Foam::autoLayerDriver::addLayers
 {
     fvMesh& mesh = meshRefiner_.mesh();
 
+    // Create baffles (pairs of faces that share the same points)
+    // Baffles stored as owner and neighbour face that have been created.
+    List<labelPair> baffles;
+    meshRefiner_.createZoneBaffles(globalToPatch_, baffles);
+
+
+    if (debug)
+    {
+        const_cast<Time&>(mesh.time())++;
+        Info<< "Writing baffled mesh to " << meshRefiner_.timeName() << endl;
+        mesh.write();
+    }
+
+
     autoPtr<indirectPrimitivePatch> pp
     (
         meshRefinement::makePatch
@@ -2920,6 +2948,7 @@ void Foam::autoLayerDriver::addLayers
             (
                 meshMover(),
                 meshQualityDict,
+                baffles,
 
                 layerParams.nSmoothThickness(),
                 layerParams.maxThicknessToMedialRatio(),
@@ -3086,6 +3115,14 @@ void Foam::autoLayerDriver::addLayers
             identity(pp().nPoints())
         );
 
+        // Update numbering of baffles
+        forAll(baffles, i)
+        {
+            labelPair& p = baffles[i];
+            p[0] = map().reverseFaceMap()[p[0]];
+            p[1] = map().reverseFaceMap()[p[1]];
+        }
+
         // Collect layer faces and cells for outside loop.
         getLayerCellsFaces
         (
@@ -3130,6 +3167,7 @@ void Foam::autoLayerDriver::addLayers
         (
             addLayer,
             meshQualityDict,
+            baffles,
             pp(),
             newMesh,
 
@@ -3197,6 +3235,24 @@ void Foam::autoLayerDriver::addLayers
 
     meshRefiner_.updateMesh(map, labelList(0));
 
+    label nBaffles = returnReduce(baffles.size(), sumOp<label>());
+    if (nBaffles > 0)
+    {
+        // Merge any baffles
+        Info<< "Converting " << nBaffles
+            << " baffles back into zoned faces ..."
+            << endl;
+
+        autoPtr<mapPolyMesh> map = meshRefiner_.mergeBaffles(baffles);
+
+        inplaceReorder(map().reverseCellMap(), flaggedCells);
+        inplaceReorder(map().reverseFaceMap(), flaggedFaces);
+
+        Info<< "Converted baffles in = "
+            << meshRefiner_.mesh().time().cpuTimeIncrement()
+            << " s\n" << nl << endl;
+    }
+
 
     // Do final balancing
     // ~~~~~~~~~~~~~~~~~~
@@ -3280,8 +3336,19 @@ void Foam::autoLayerDriver::doLayers
     {
         if (numLayers[patchI] > 0)
         {
-            patchIDs.append(patchI);
-            nFacesWithLayers += mesh.boundaryMesh()[patchI].size();
+            const polyPatch& pp = mesh.boundaryMesh()[patchI];
+
+            if (!polyPatch::constraintType(pp.type()))
+            {
+                patchIDs.append(patchI);
+                nFacesWithLayers += mesh.boundaryMesh()[patchI].size();
+            }
+            else
+            {
+                WarningIn("autoLayerDriver::doLayers(..)")
+                    << "Ignoring layers on constraint patch " << pp.name()
+                    << endl;
+            }
         }
     }
     patchIDs.shrink();
@@ -3331,28 +3398,17 @@ void Foam::autoLayerDriver::doLayers
                 }
             }
 
-            // Balance mesh (and meshRefinement). No restriction on face zones
-            // and baffles.
+            // Balance mesh (and meshRefinement). Restrict faceZones to
+            // be on internal faces only since they will be converted into
+            // baffles.
             autoPtr<mapDistributePolyMesh> map = meshRefiner_.balance
             (
-                false,
+                true,   //false,    // keepZoneFaces
                 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;
-            //}
         }
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index 64268bd69e..969868e056 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -98,6 +98,9 @@ class autoLayerDriver
         //- Mesh+surface
         meshRefinement& meshRefiner_;
 
+        //- From surface region to patch
+        const labelList globalToPatch_;
+
 
 
     // Private Member Functions
@@ -333,6 +336,7 @@ class autoLayerDriver
                 (
                     const addPatchCellLayer& addLayer,
                     const dictionary& motionDict,
+                    const List<labelPair>& baffles,
                     const indirectPrimitivePatch& pp,
                     const fvMesh&,
 
@@ -468,6 +472,7 @@ class autoLayerDriver
                 (
                     motionSmoother& meshMover,
                     const dictionary& meshQualityDict,
+                    const List<labelPair>& baffles,
                     const label nSmoothThickness,
                     const scalar maxThicknessToMedialRatio,
                     const label nAllowableErrors,
@@ -503,7 +508,11 @@ public:
     // Constructors
 
         //- Construct from components
-        autoLayerDriver(meshRefinement& meshRefiner);
+        autoLayerDriver
+        (
+            meshRefinement& meshRefiner,
+            const labelList& globalToPatch
+        );
 
 
     // Member Functions
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index d8eb6832ac..292ec5d142 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -945,6 +945,7 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
 (
     motionSmoother& meshMover,
     const dictionary& meshQualityDict,
+    const List<labelPair>& baffles,
     const label nSmoothThickness,
     const scalar maxThicknessToMedialRatio,
     const label nAllowableErrors,
@@ -1135,7 +1136,7 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
             meshMover.scaleMesh
             (
                 checkFaces,
-                List<labelPair>(0),
+                baffles,
                 meshMover.paramDict(),
                 meshQualityDict,
                 true,
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
index 1808db7f45..0ab7e65c4f 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -844,10 +844,10 @@ void Foam::autoRefineDriver::doRefine
             << "---------------------" << nl
             << endl;
 
-        if (debug)
-        {
-            const_cast<Time&>(mesh.time())++;
-        }
+        //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
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index b41c1b631d..c1c19fa173 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -46,75 +46,16 @@ Description
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::autoSnapDriver, 0);
+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
-            const faceZone& fZone = fZones[faceZoneNames[surfI]];
-
-            //// 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
@@ -647,91 +588,6 @@ Foam::autoSnapDriver::autoSnapDriver
 
 // * * * * * * * * * * * * * * * 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
@@ -1419,7 +1275,7 @@ void Foam::autoSnapDriver::doSnap
     // 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);
+    meshRefiner_.createZoneBaffles(globalToPatch_, baffles);
 
     {
         autoPtr<indirectPrimitivePatch> ppPtr
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index 5e103b8192..b57c465bb9 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -83,9 +83,6 @@ class autoSnapDriver
 
         // 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
             (
@@ -155,10 +152,6 @@ public:
 
         // Snapping
 
-            //- Create baffles for faces straddling zoned surfaces. Return
-            //  baffles.
-            autoPtr<mapPolyMesh> createZoneBaffles(List<labelPair>&);
-
             //- Merge baffles.
             autoPtr<mapPolyMesh> mergeZoneBaffles(const List<labelPair>&);
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
index 5da9e316e1..6470e7fec6 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
@@ -364,7 +364,8 @@ Foam::layerParameters::layerParameters
         {
             IOWarningIn("layerParameters::layerParameters(..)", layersDict)
                 << "Wildcard layer specification for " << wildCards[i]
-                << " does not match any patch." << endl;
+                << " does not match any patch." << endl
+                << "Valid patches are " << boundaryMesh.names() << endl;
         }
     }
 
@@ -376,7 +377,8 @@ Foam::layerParameters::layerParameters
         {
             IOWarningIn("layerParameters::layerParameters(..)", layersDict)
                 << "Layer specification for " << nonWildCards[i]
-                << " does not match any patch." << endl;
+                << " does not match any patch." << endl
+                << "Valid patches are " << boundaryMesh.names() << endl;
         }
     }
 }
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index d43beaa856..3c124b59f3 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -1127,6 +1127,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
 
                 const wordList& fzNames = surfaces().faceZoneNames();
                 const faceZoneMesh& fZones = mesh_.faceZones();
+                const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
                 // Get faces whose owner and neighbour should stay together,
                 // i.e. they are not 'blocked'.
@@ -1140,10 +1141,18 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
 
                         forAll(fZone, i)
                         {
-                            if (blockedFace[fZone[i]])
+                            label faceI = fZone[i];
+                            if (blockedFace[faceI])
                             {
-                                blockedFace[fZone[i]] = false;
-                                nUnblocked++;
+                                if
+                                (
+                                    mesh_.isInternalFace(faceI)
+                                 || pbm[pbm.whichPatch(faceI)].coupled()
+                                )
+                                {
+                                    blockedFace[faceI] = false;
+                                    nUnblocked++;
+                                }
                             }
                         }
                     }
@@ -1550,7 +1559,7 @@ Foam::label Foam::meshRefinement::addPatch
 (
     fvMesh& mesh,
     const word& patchName,
-    const word& patchType
+    const dictionary& patchInfo
 )
 {
     polyBoundaryMesh& polyPatches =
@@ -1559,21 +1568,8 @@ Foam::label Foam::meshRefinement::addPatch
     const 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);
-        //}
+        // Already there
+        return patchI;
     }
 
 
@@ -1603,6 +1599,10 @@ Foam::label Foam::meshRefinement::addPatch
 
     fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh.boundary());
 
+    dictionary patchDict(patchInfo);
+    patchDict.set("nFaces", 0);
+    patchDict.set("startFace", startFaceI);
+
     // Add polyPatch at the end
     polyPatches.setSize(sz+1);
     polyPatches.set
@@ -1610,10 +1610,8 @@ Foam::label Foam::meshRefinement::addPatch
         sz,
         polyPatch::New
         (
-            patchType,
             patchName,
-            0,              // size
-            startFaceI,
+            patchDict,
             insertPatchI,
             polyPatches
         )
@@ -1720,7 +1718,7 @@ Foam::label Foam::meshRefinement::addPatch
 Foam::label Foam::meshRefinement::addMeshedPatch
 (
     const word& name,
-    const word& type
+    const dictionary& patchInfo
 )
 {
     label meshedI = findIndex(meshedPatches_, name);
@@ -1733,7 +1731,7 @@ Foam::label Foam::meshRefinement::addMeshedPatch
     else
     {
         // Add patch
-        label patchI = addPatch(mesh_, name, type);
+        label patchI = addPatch(mesh_, name, patchInfo);
 
         // Store
         label sz = meshedPatches_.size();
@@ -1747,17 +1745,24 @@ Foam::label Foam::meshRefinement::addMeshedPatch
 
 Foam::labelList Foam::meshRefinement::meshedPatches() const
 {
-    labelList patchIDs(meshedPatches_.size());
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    DynamicList<label> patchIDs(meshedPatches_.size());
     forAll(meshedPatches_, i)
     {
-        patchIDs[i] = mesh_.boundaryMesh().findPatchID(meshedPatches_[i]);
+        label patchI = patches.findPatchID(meshedPatches_[i]);
 
-        if (patchIDs[i] == -1)
+        if (patchI == -1)
         {
             FatalErrorIn("meshRefinement::meshedPatches() const")
                 << "Problem : did not find patch " << meshedPatches_[i]
+                << endl << "Valid patches are " << patches.names()
                 << abort(FatalError);
         }
+        if (!polyPatch::constraintType(patches[patchI].type()))
+        {
+            patchIDs.append(patchI);
+        }
     }
 
     return patchIDs;
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
index 29b0f43bb0..2d8362d413 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -325,6 +325,13 @@ private:
 
         // Baffle handling
 
+            //- Get faces to repatch. Returns map from face to patch.
+            Map<label> getZoneBafflePatches
+            (
+                const bool allowBoundary,
+                const labelList& globalToPatch
+            ) const;
+
             //- Determine patches for baffles
             void getBafflePatches
             (
@@ -713,6 +720,14 @@ public:
                 const labelList& neiPatch
             );
 
+            //- Create baffles for faces straddling zoned surfaces. Return
+            //  baffles.
+            autoPtr<mapPolyMesh> createZoneBaffles
+            (
+                const labelList& globalToPatch,
+                List<labelPair>&
+            );
+
             //- Return a list of coupled face pairs, i.e. faces that
             //  use the same vertices.
             List<labelPair> getDuplicateFaces(const labelList& testFaces) const;
@@ -734,10 +749,10 @@ public:
 
             //- 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);
+            static label addPatch(fvMesh&, const word& name, const dictionary&);
 
             //- Add patch originating from meshing. Update meshedPatches_.
-            label addMeshedPatch(const word& name, const word& type);
+            label addMeshedPatch(const word& name, const dictionary&);
 
             //- Get patchIDs for patches added in addMeshedPatch.
             labelList meshedPatches() const;
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 6c78a67f0d..a445ebf699 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -216,7 +216,7 @@ Foam::label Foam::meshRefinement::getBafflePatch
 }
 
 
-// Determine patches for baffles.
+// Determine patches for baffles on all intersected unnamed faces
 void Foam::meshRefinement::getBafflePatches
 (
     const labelList& globalToPatch,
@@ -359,6 +359,70 @@ void Foam::meshRefinement::getBafflePatches
 }
 
 
+// Get faces to repatch. Returns map from face to patch.
+Foam::Map<Foam::label> Foam::meshRefinement::getZoneBafflePatches
+(
+    const bool allowBoundary,
+    const labelList& globalToPatch
+) const
+{
+    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;
+}
+
+
 // Create baffle for every face where ownPatch != -1
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
 (
@@ -586,6 +650,90 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::getDuplicateFaces
 }
 
 
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createZoneBaffles
+(
+    const labelList& globalToPatch,
+    List<labelPair>& baffles
+)
+{
+    labelList zonedSurfaces = surfaces_.getNamedSurfaces();
+
+    autoPtr<mapPolyMesh> map;
+
+    // No need to sync; all processors will have all same zonedSurfaces.
+    if (zonedSurfaces.size())
+    {
+        // 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, globalToPatch));
+
+        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 = 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("meshRefinement::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 "
+                    << mesh_.time().timeName() << endl;
+                mesh_.write();
+            }
+        }
+        Info<< "Created " << nZoneFaces << " baffles in = "
+            << mesh_.time().cpuTimeIncrement() << " s\n" << nl << endl;
+    }
+    return map;
+}
+
+
 // Extract those baffles (duplicate) faces that are on the edge of a baffle
 // region. These are candidates for merging.
 // Done by counting the number of baffles faces per mesh edge. If edge
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index 8bbc0bd52e..ecb0542578 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -50,268 +50,6 @@ const Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>
 
 // * * * * * * * * * * * * * * * * 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(), NONE),
-    zoneInsidePoints_(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.readIfPresent("faceZone", faceZoneNames_[surfI]))
-        {
-            // Read optional entry to determine inside of faceZone
-
-            word method;
-            bool hasSide = dict.readIfPresent("cellZoneInside", method);
-            if (hasSide)
-            {
-                zoneInside_[surfI] = areaSelectionAlgoNames[method];
-                if (zoneInside_[surfI] == INSIDEPOINT)
-                {
-                    dict.lookup("insidePoint") >> zoneInsidePoints_[surfI];
-                }
-            }
-            else
-            {
-                // Check old syntax
-                bool inside;
-                if (dict.readIfPresent("zoneInside", inside))
-                {
-                    hasSide = true;
-                    zoneInside_[surfI] = (inside ? INSIDE : OUTSIDE);
-                }
-            }
-
-            // Read optional cellZone name
-
-            if (dict.readIfPresent("cellZone", cellZoneNames_[surfI]))
-            {
-                if
-                (
-                    (
-                        zoneInside_[surfI] == INSIDE
-                     || zoneInside_[surfI] == OUTSIDE
-                    )
-                 && !allGeometry_[surfaces_[surfI]].hasVolumeType()
-                )
-                {
-                    IOWarningIn
-                    (
-                        "refinementSurfaces::refinementSurfaces(..)",
-                        dict
-                    )   << "Illegal entry zoneInside "
-                        << areaSelectionAlgoNames[zoneInside_[surfI]]
-                        << " for faceZone "
-                        << faceZoneNames_[surfI]
-                        << " since surface " << names_[surfI]
-                        << " is not closed." << endl;
-                }
-            }
-            else if (hasSide)
-            {
-                IOWarningIn("refinementSurfaces::refinementSurfaces(..)", dict)
-                    << "Unused entry zoneInside for faceZone "
-                    << faceZoneNames_[surfI]
-                    << " since no cellZone specified."
-                    << endl;
-            }
-        }
-
-        // Global perpendicular angle
-        dict.readIfPresent("perpendicularAngle", globalAngle[surfI]);
-
-        //// Global patch name per surface
-        //dict.readIfPresent("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,
@@ -353,9 +91,11 @@ Foam::refinementSurfaces::refinementSurfaces
     labelList globalMinLevel(surfI, 0);
     labelList globalMaxLevel(surfI, 0);
     scalarField globalAngle(surfI, -GREAT);
+    PtrList<dictionary> globalPatchInfo(surfI);
     List<Map<label> > regionMinLevel(surfI);
     List<Map<label> > regionMaxLevel(surfI);
     List<Map<scalar> > regionAngle(surfI);
+    List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
 
     surfI = 0;
     forAll(allGeometry.names(), geomI)
@@ -439,6 +179,14 @@ Foam::refinementSurfaces::refinementSurfaces
             }
 
             // Global perpendicular angle
+            if (dict.found("patchInfo"))
+            {
+                globalPatchInfo.set
+                (
+                    surfI,
+                    dict.subDict("patchInfo").clone()
+                );
+            }
             dict.readIfPresent("perpendicularAngle", globalAngle[surfI]);
 
             if (dict.found("regions"))
@@ -473,6 +221,15 @@ Foam::refinementSurfaces::refinementSurfaces
                                 )
                             );
                         }
+
+                        if (regionDict.found("patchInfo"))
+                        {
+                            regionPatchInfo[surfI].insert
+                            (
+                                regionI,
+                                regionDict.subDict("patchInfo").clone()
+                            );
+                        }
                     }
                 }
             }
@@ -496,6 +253,7 @@ Foam::refinementSurfaces::refinementSurfaces
     maxLevel_ = 0;
     perpendicularAngle_.setSize(nRegions);
     perpendicularAngle_ = -GREAT;
+    patchInfo_.setSize(nRegions);
 
 
     forAll(globalMinLevel, surfI)
@@ -505,9 +263,18 @@ Foam::refinementSurfaces::refinementSurfaces
         // 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];
+            label globalRegionI = regionOffset_[surfI] + i;
+            minLevel_[globalRegionI] = globalMinLevel[surfI];
+            maxLevel_[globalRegionI] = globalMaxLevel[surfI];
+            perpendicularAngle_[globalRegionI] = globalAngle[surfI];
+            if (globalPatchInfo.set(surfI))
+            {
+                patchInfo_.set
+                (
+                    globalRegionI,
+                    globalPatchInfo[surfI].clone()
+                );
+            }
         }
 
         // Overwrite with region specific information
@@ -542,6 +309,14 @@ Foam::refinementSurfaces::refinementSurfaces
 
             perpendicularAngle_[globalRegionI] = regionAngle[surfI][iter.key()];
         }
+
+        const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
+        forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
+        {
+            label globalRegionI = regionOffset_[surfI] + iter.key();
+
+            patchInfo_.set(globalRegionI, iter()().clone());
+        }
     }
 }
 
@@ -1166,7 +941,7 @@ void Foam::refinementSurfaces::findNearestRegion
 (
     const labelList& surfacesToTest,
     const pointField& samples,
-    const  scalarField& nearestDistSqr,
+    const scalarField& nearestDistSqr,
     labelList& hitSurface,
     labelList& hitRegion
 ) const
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
index 8191f8cc42..ad854da16f 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -109,6 +109,9 @@ private:
         //- From global region number to perpendicular angle
         scalarField perpendicularAngle_;
 
+        //- From global region number to patchType
+        PtrList<dictionary> patchInfo_;
+
 
     // Private Member Functions
 
@@ -123,13 +126,6 @@ public:
 
     // Constructors
 
-        //- Construct from surfaces and dictionaries
-        refinementSurfaces
-        (
-            const searchableSurfaces& allGeometry,
-            const PtrList<dictionary>&
-        );
-
         //- Construct from surfaces and dictionary
         refinementSurfaces
         (
@@ -215,6 +211,12 @@ public:
                 return perpendicularAngle_;
             }
 
+            //- From global region number to patch type
+            const PtrList<dictionary>& patchInfo() const
+            {
+                return patchInfo_;
+            }
+
 
         // Helper
 
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index b2b76fce05..488f5ef3bb 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -8,4 +8,4 @@ EXE_INC = \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(FOAM_MPI_LIBBIN) -lptscotch -lptscotcherrexit
+    -L$(FOAM_MPI_LIBBIN) -lptscotch -lptscotcherrexit -lrt
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index 96b64b8fdd..2f01188ac6 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -4,4 +4,4 @@ EXE_INC = \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -lscotch -lscotcherrexit
+    -lscotch -lscotcherrexit -lrt
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index 78478222cb..ce90b7a55d 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -157,7 +157,9 @@ bool Foam::streamLineParticle::move(streamLineParticle::trackData& td)
     td.switchProcessor = false;
     td.keepParticle = true;
 
-    scalar deltaT = GREAT;  //cloud().pMesh().time().deltaTValue();
+    // Set very large dt. Note: cannot use GREAT since 1/GREAT is SMALL
+    // which is a trigger value for the tracking...
+    scalar deltaT = Foam::sqrt(GREAT);  //cloud().pMesh().time().deltaTValue();
     scalar tEnd = (1.0 - stepFraction())*deltaT;
     scalar dtMax = tEnd;
 
@@ -169,6 +171,9 @@ bool Foam::streamLineParticle::move(streamLineParticle::trackData& td)
     && tEnd > ROOTVSMALL
     )
     {
+        // TBD: implement subcycling so step through cells in more than
+        //      one step.
+
         // set the lagrangian time-step
         scalar dt = min(dtMax, tEnd);
 
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
index bf97ae0501..716d0c88e7 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
@@ -56,7 +56,7 @@ class MeshedSurfaceIOAllocator
         pointIOField points_;
 
         //- Faces
-        faceIOList faces_;
+        faceCompactIOList faces_;
 
         //- Surface zones
         surfZoneIOList zones_;
@@ -117,7 +117,7 @@ public:
             }
 
             //- Non-const access to the faces
-            faceIOList& storedIOFaces()
+            faceCompactIOList& storedIOFaces()
             {
                 return faces_;
             }
@@ -135,7 +135,7 @@ public:
             }
 
             //- Const access to the faces
-            const faceIOList& storedIOFaces() const
+            const faceCompactIOList& storedIOFaces() const
             {
                 return faces_;
             }
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index efe336e792..b2cf9e26cd 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -150,7 +150,7 @@ void Foam::MeshedSurfaceProxy<Face>::write
 
     // write surfMesh/faces
     {
-        faceIOList io
+        faceCompactIOList io
         (
             IOobject
             (
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index bd2f355c2f..b07673305c 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -27,8 +27,6 @@ License
 #include "MeshedSurfaceProxy.H"
 
 #include "Time.H"
-#include "cellIOList.H"
-#include "SubList.H"
 #include "OSspecific.H"
 #include "MeshedSurface.H"
 #include "demandDrivenData.H"
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index e0581d52d3..b581951beb 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -98,7 +98,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
             )
         );
 
-        storedFaces() = faceIOList
+        storedFaces() = faceCompactIOList
         (
             IOobject
             (