diff --git a/.gitignore b/.gitignore
index f567511db3..3cc18eb468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,10 @@ doc/[Dd]oxygen/man
 /*.html
 /doc/*.html
 
+# untracked configuration files
+/etc/prefs.csh
+/etc/prefs.sh
+
 # source packages - anywhere
 *.tar.bz2
 *.tar.gz
diff --git a/README b/README
index df56c9c9a4..52fba8b216 100644
--- a/README
+++ b/README
@@ -112,7 +112,7 @@
   which may be obtained from http://gcc.gnu.org/.
 
   Install the compiler in
-  $WM_THIRD_PARTY_DIR/gcc-<GCC_VERSION>/platforms/$WM_ARCH$WM_COMPILER_ARCH/
+  $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-<GCC_VERSION>
   and change the gcc version number in $WM_PROJECT_DIR/etc/settings.sh and
   $WM_PROJECT_DIR/etc/settings.csh appropriately and finally update the
   environment variables as in section 3.
@@ -166,6 +166,7 @@
   gcc-4.3.3.  Execute the following:
   + cd $WM_THIRD_PARTY_DIR
   + rm -rf paraview-3.6.1/platforms
+  + rm -rf platforms/*/paraview-3.6.1
   + ./makeParaView
 
   The PV3blockMeshReader and the PV3FoamReader ParaView plugins are compiled
diff --git a/applications/test/nearWallDist-wave/testWallDistData.C b/applications/test/nearWallDist-wave/testWallDistData.C
index cb742f435f..0b94dfa216 100644
--- a/applications/test/nearWallDist-wave/testWallDistData.C
+++ b/applications/test/nearWallDist-wave/testWallDistData.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
             mesh
         ),
         mesh,
-        dimensionedVector("n", dimLength, wallPoint::greatPoint)
+        dimensionedVector("n", dimLength, point::max)
     );
 
     // Fill wall patches with unit normal
diff --git a/applications/test/syncTools/syncToolsTest.C b/applications/test/syncTools/syncToolsTest.C
index 320b4e6f61..fb225ac397 100644
--- a/applications/test/syncTools/syncToolsTest.C
+++ b/applications/test/syncTools/syncToolsTest.C
@@ -187,8 +187,6 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
     );
     const pointField& localPoints = allBoundary.localPoints();
 
-    const point greatPoint(GREAT, GREAT, GREAT);
-
 
     // Point data
     // ~~~~~~~~~~
@@ -196,7 +194,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
     {
         // Create some data. Use slightly perturbed positions.
         Map<vector> sparseData;
-        pointField fullData(mesh.nPoints(), greatPoint);
+        pointField fullData(mesh.nPoints(), point::max);
 
         forAll(localPoints, i)
         {
@@ -222,7 +220,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
             mesh,
             fullData,
             minEqOp<vector>(),
-            greatPoint,
+            point::max,
             true                    // apply separation
         );
 
@@ -232,7 +230,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
         {
             const point& fullPt = fullData[meshPointI];
 
-            if (fullPt != greatPoint)
+            if (fullPt != point::max)
             {
                 const point& sparsePt = sparseData[meshPointI];
 
@@ -272,7 +270,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
     {
         // Create some data. Use slightly perturbed positions.
         EdgeMap<vector> sparseData;
-        pointField fullData(mesh.nEdges(), greatPoint);
+        pointField fullData(mesh.nEdges(), point::max);
 
         const edgeList& edges = allBoundary.edges();
         const labelList meshEdges = allBoundary.meshEdges
@@ -307,7 +305,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
             mesh,
             fullData,
             minEqOp<vector>(),
-            greatPoint,
+            point::max,
             true
         );
 
@@ -317,7 +315,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
         {
             const point& fullPt = fullData[meshEdgeI];
 
-            if (fullPt != greatPoint)
+            if (fullPt != point::max)
             {
                 const point& sparsePt = sparseData[mesh.edges()[meshEdgeI]];
 
@@ -364,8 +362,6 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
 {
     Info<< nl << "Testing point-wise data synchronisation." << endl;
 
-    const point greatPoint(GREAT, GREAT, GREAT);
-
     // Test position.
 
     {
@@ -379,7 +375,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
             mesh,
             syncedPoints,
             minEqOp<point>(),
-            greatPoint,
+            point::max,
             true
         );
 
@@ -444,8 +440,6 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
 
     const edgeList& edges = mesh.edges();
 
-    const point greatPoint(GREAT, GREAT, GREAT);
-
     // Test position.
 
     {
@@ -463,7 +457,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
             mesh,
             syncedMids,
             minEqOp<point>(),
-            greatPoint,
+            point::max,
             true
         );
 
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/files b/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/files
new file mode 100644
index 0000000000..62431e23d4
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/files
@@ -0,0 +1,7 @@
+patchPointEdgeCirculator.C
+createShellMesh.C
+extrudeToRegionMesh.C
+
+EXE = $(FOAM_APPBIN)/extrudeToRegionMesh
+
+
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
new file mode 100644
index 0000000000..dbf50a9b09
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
@@ -0,0 +1,14 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    /* -I$(LIB_SRC)/surfMesh/lnInclude */ \
+    /* -I$(LIB_SRC)/lagrangian/basic/lnInclude */ \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume \
+    /* -lsurfMesh */ \
+    /* -llagrangian */ \
+    -lmeshTools \
+    -ldynamicMesh
+
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
new file mode 100644
index 0000000000..df998941ef
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
@@ -0,0 +1,588 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "createShellMesh.H"
+#include "polyTopoChange.H"
+#include "meshTools.H"
+#include "mapPolyMesh.H"
+#include "polyAddPoint.H"
+#include "polyAddFace.H"
+#include "polyModifyFace.H"
+#include "polyAddCell.H"
+#include "patchPointEdgeCirculator.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(Foam::createShellMesh, 0);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::createShellMesh::calcPointRegions
+(
+    const primitiveFacePatch& patch,
+    const PackedBoolList& nonManifoldEdge,
+    faceList& pointRegions,
+    labelList& regionPoints
+)
+{
+    pointRegions.setSize(patch.size());
+    forAll(pointRegions, faceI)
+    {
+        const face& f = patch.localFaces()[faceI];
+        pointRegions[faceI].setSize(f.size(), -1);
+    }
+
+    label nRegions = 0;
+
+    forAll(pointRegions, faceI)
+    {
+        const face& f = patch.localFaces()[faceI];
+
+        forAll(f, fp)
+        {
+            if (pointRegions[faceI][fp] == -1)
+            {
+                // Found unassigned point. Distribute current region.
+                label pointI = f[fp];
+                label edgeI = patch.faceEdges()[faceI][fp];
+
+                patchPointEdgeCirculator circ
+                (
+                    patch,
+                    nonManifoldEdge,
+                    edgeI,
+                    findIndex(patch.edgeFaces()[edgeI], faceI),
+                    pointI
+                );
+
+                for
+                (
+                    patchPointEdgeCirculator iter = circ.begin();
+                    iter != circ.end();
+                    ++iter
+                )
+                {
+                    label face2 = iter.faceID();
+
+                    if (face2 != -1)
+                    {
+                        const face& f2 = patch.localFaces()[face2];
+                        label fp2 = findIndex(f2, pointI);
+                        label& region = pointRegions[face2][fp2];
+                        if (region != -1)
+                        {   
+                            FatalErrorIn
+                            (
+                                "createShellMesh::calcPointRegions(..)"
+                            )   << "On point " << pointI
+                                << " at:" << patch.localPoints()[pointI]
+                                << " found region:" << region
+                                << abort(FatalError);
+                        }
+                        region = nRegions;
+                    }
+                }
+
+                nRegions++;
+            }
+        }
+    }
+
+
+    // From region back to originating point (many to one, a point might
+    // have multiple regions though)
+    regionPoints.setSize(nRegions);
+    forAll(pointRegions, faceI)
+    {
+        const face& f = patch.localFaces()[faceI];
+
+        forAll(f, fp)
+        {
+            regionPoints[pointRegions[faceI][fp]] = f[fp];
+        }
+    }
+
+
+    if (debug)
+    {
+        const labelListList& pointFaces = patch.pointFaces();
+        forAll(pointFaces, pointI)
+        {
+            label region = -1;
+            const labelList& pFaces = pointFaces[pointI];
+            forAll(pFaces, i)
+            {
+                label faceI = pFaces[i];
+                const face& f = patch.localFaces()[faceI];
+                label fp = findIndex(f, pointI);
+
+                if (region == -1)
+                {
+                    region = pointRegions[faceI][fp];
+                }
+                else if (region != pointRegions[faceI][fp])
+                {
+                    Pout<< "Non-manifold point:" << pointI
+                        << " at " << patch.localPoints()[pointI]
+                        << " region:" << region
+                        << " otherRegion:" << pointRegions[faceI][fp]
+                        << endl;
+
+                }
+            }
+        }
+    }
+}
+
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::createShellMesh::createShellMesh
+(
+    const primitiveFacePatch& patch,
+    const faceList& pointRegions,
+    const labelList& regionPoints
+)
+:
+    patch_(patch),
+    pointRegions_(pointRegions),
+    regionPoints_(regionPoints)
+{
+    if (pointRegions_.size() != patch_.size())
+    {
+        FatalErrorIn("createShellMesh::createShellMesh(..)")
+            << "nFaces:" << patch_.size()
+            << " pointRegions:" << pointRegions.size()
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+void Foam::createShellMesh::setRefinement
+(
+    const pointField& thickness,
+    const labelList& topPatchID,
+    const labelList& bottomPatchID,
+    const labelListList& extrudeEdgePatches,
+    polyTopoChange& meshMod
+)
+{
+    if (thickness.size() != regionPoints_.size())
+    {
+        FatalErrorIn("createShellMesh::setRefinement(..)")
+            << "nRegions:" << regionPoints_.size()
+            << " thickness:" << thickness.size()
+            << exit(FatalError);
+    }
+
+    if
+    (
+        topPatchID.size() != patch_.size()
+     && bottomPatchID.size() != patch_.size()
+    )
+    {
+        FatalErrorIn("createShellMesh::setRefinement(..)")
+            << "nFaces:" << patch_.size()
+            << " topPatchID:" << topPatchID.size()
+            << " bottomPatchID:" << bottomPatchID.size()
+            << exit(FatalError);
+    }
+
+    if (extrudeEdgePatches.size() != patch_.nEdges())
+    {
+        FatalErrorIn("createShellMesh::setRefinement(..)")
+            << "nEdges:" << patch_.nEdges()
+            << " extrudeEdgePatches:" << extrudeEdgePatches.size()
+            << exit(FatalError);
+    }
+
+
+
+    // From cell to patch (trivial)
+    DynamicList<label> cellToFaceMap(patch_.size());
+    // From face to patch+turning index
+    DynamicList<label> faceToFaceMap(2*patch_.size()+patch_.nEdges());
+    // From face to patch edge index
+    DynamicList<label> faceToEdgeMap(patch_.nEdges()+patch_.nEdges());
+    // From point to patch point index
+    DynamicList<label> pointToPointMap(2*patch_.nPoints());
+
+
+    // Introduce new cell for every face
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList addedCells(patch_.size());
+    forAll(patch_, faceI)
+    {
+        addedCells[faceI] = meshMod.addCell
+        (
+            -1,                     // masterPointID
+            -1,                     // masterEdgeID
+            -1,                     // masterFaceID
+            cellToFaceMap.size(),   // masterCellID
+            -1                      // zoneID
+        );
+        cellToFaceMap.append(faceI);
+    }
+
+
+    // Introduce original points
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Original point numbers in local point ordering so no need to store.
+    forAll(patch_.localPoints(), pointI)
+    {
+        //label addedPointI =
+        meshMod.addPoint
+        (
+            patch_.localPoints()[pointI],   // point
+            pointToPointMap.size(),         // masterPointID 
+            -1,                             // zoneID
+            true                            // inCell
+        );
+        pointToPointMap.append(pointI);
+
+        //Pout<< "Added bottom point " << addedPointI
+        //    << " at " << patch_.localPoints()[pointI]
+        //    << "  from point " << pointI
+        //    << endl;
+    }
+
+
+    // Introduce new points (one for every region)
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList addedPoints(regionPoints_.size());
+    forAll(regionPoints_, regionI)
+    {
+        label pointI = regionPoints_[regionI];
+        point extrudedPt = patch_.localPoints()[pointI] + thickness[regionI];
+
+        addedPoints[regionI] = meshMod.addPoint
+        (
+            extrudedPt,             // point
+            pointToPointMap.size(), // masterPointID - used only addressing
+            -1,                     // zoneID
+            true                    // inCell
+        );
+        pointToPointMap.append(pointI);
+
+        //Pout<< "Added top point " << addedPoints[regionI]
+        //    << " at " << extrudedPt
+        //    << "  from point " << pointI
+        //    << endl;
+    }
+
+
+    // Add face on bottom side
+    forAll(patch_.localFaces(), faceI)
+    {
+        meshMod.addFace
+        (
+            patch_.localFaces()[faceI].reverseFace(),// vertices
+            addedCells[faceI],          // own
+            -1,                         // nei
+            -1,                         // masterPointID
+            -1,                         // masterEdgeID
+            faceToFaceMap.size(),       // masterFaceID : current faceI
+            true,                       // flipFaceFlux
+            bottomPatchID[faceI],// patchID
+            -1,                         // zoneID
+            false                       // zoneFlip
+        );
+        faceToFaceMap.append(-faceI-1); // points to flipped original face
+        faceToEdgeMap.append(-1);
+
+        //Pout<< "Added bottom face "
+        //    << patch_.localFaces()[faceI].reverseFace()
+        //    << " own " << addedCells[faceI]
+        //    << "  at " << patch_.faceCentres()[faceI]
+        //    << endl;
+
+    }
+
+    // Add face on top
+    forAll(patch_.localFaces(), faceI)
+    {
+        // Get face in original ordering
+        const face& f = patch_.localFaces()[faceI];
+
+        // Pick up point based on region
+        face newF(f.size());
+        forAll(f, fp)
+        {
+            label region = pointRegions_[faceI][fp];
+            newF[fp] = addedPoints[region];
+        }
+
+        meshMod.addFace
+        (
+            newF,                       // vertices
+            addedCells[faceI],          // own
+            -1,                         // nei
+            -1,                         // masterPointID
+            -1,                         // masterEdgeID
+            faceToFaceMap.size(),       // masterFaceID : current faceI
+            false,                      // flipFaceFlux
+            topPatchID[faceI],          // patchID
+            -1,                         // zoneID
+            false                       // zoneFlip
+        );
+        faceToFaceMap.append(faceI+1);  // unflipped
+        faceToEdgeMap.append(-1);
+
+        //Pout<< "Added top face " << newF
+        //    << " own " << addedCells[faceI]
+        //    << "  at " << patch_.faceCentres()[faceI]
+        //    << endl;
+    }
+
+
+    // Add side faces
+    // ~~~~~~~~~~~~~~
+    // Note that we loop over edges multiple times so for edges with
+    // two cyclic faces they get added in two passes (for correct ordering)
+
+    // Pass1. Internal edges and first face of other edges
+    forAll(extrudeEdgePatches, edgeI)
+    {
+        const labelList& eFaces = patch_.edgeFaces()[edgeI];
+        const labelList& ePatches = extrudeEdgePatches[edgeI];
+
+        if (ePatches.size() == 0)
+        {
+            // internal face.
+
+            if (eFaces.size() != 2)
+            {
+                FatalErrorIn("createShellMesh::setRefinement(..)")
+                    << "edge:" << edgeI
+                    << " not internal but does not have side-patches defined."
+                    << exit(FatalError);
+            }
+
+            // Extrude
+
+            // Make face pointing in to eFaces[0] so out of new master face
+            const face& f = patch_.localFaces()[eFaces[0]];
+            const edge& e = patch_.edges()[edgeI];
+
+            label fp0 = findIndex(f, e[0]);
+            label fp1 = f.fcIndex(fp0);
+
+            if (f[fp1] != e[1])
+            {
+                fp1 = fp0;
+                fp0 = f.rcIndex(fp1);
+            }
+
+            face newF(4);
+            newF[0] = f[fp0];
+            newF[1] = f[fp1];
+            newF[2] = addedPoints[pointRegions_[eFaces[0]][fp1]];
+            newF[3] = addedPoints[pointRegions_[eFaces[0]][fp0]];
+
+            label minCellI = addedCells[eFaces[0]];
+            label maxCellI = addedCells[eFaces[1]];
+
+            if (minCellI > maxCellI)
+            {
+                // Swap
+                Swap(minCellI, maxCellI);
+                newF = newF.reverseFace();
+            }
+
+            //Pout<< "for internal edge:" << e
+            //    << " at:" << patch_.localPoints()[e[0]]
+            //    << patch_.localPoints()[e[1]]
+            //    << " adding face:" << newF
+            //    << " from f:" << f
+            //    << " inbetween " << minCellI << " and " << maxCellI << endl;
+
+            // newF already outwards pointing.
+            meshMod.addFace
+            (
+                newF,       // vertices
+                minCellI,   // own
+                maxCellI,   // nei
+                -1,         // masterPointID
+                -1,         // masterEdgeID
+                faceToFaceMap.size(),   // masterFaceID
+                false,      // flipFaceFlux
+                -1,         // patchID
+                -1,         // zoneID
+                false       // zoneFlip
+            );
+            faceToFaceMap.append(0);
+            faceToEdgeMap.append(edgeI);
+        }
+        else
+        {
+            if (eFaces.size() != ePatches.size())
+            {
+                FatalErrorIn("createShellMesh::setRefinement(..)")
+                    << "external/feature edge:" << edgeI
+                    << " has " << eFaces.size() << " connected extruded faces "
+                    << " but only " << ePatches.size()
+                    << " boundary faces defined." << exit(FatalError);
+            }
+
+
+            // Extrude eFaces[0]
+            label minFaceI = eFaces[0];
+
+            // Make face pointing in to eFaces[0] so out of new master face
+            const face& f = patch_.localFaces()[minFaceI];
+
+            const edge& e = patch_.edges()[edgeI];
+            label fp0 = findIndex(f, e[0]);
+            label fp1 = f.fcIndex(fp0);
+
+            if (f[fp1] != e[1])
+            {
+                fp1 = fp0;
+                fp0 = f.rcIndex(fp1);
+            }
+
+            face newF(4);
+            newF[0] = f[fp0];
+            newF[1] = f[fp1];
+            newF[2] = addedPoints[pointRegions_[minFaceI][fp1]];
+            newF[3] = addedPoints[pointRegions_[minFaceI][fp0]];
+
+
+            //Pout<< "for external edge:" << e
+            //    << " at:" << patch_.localPoints()[e[0]]
+            //    << patch_.localPoints()[e[1]]
+            //    << " adding first patch face:" << newF
+            //    << " from:" << f
+            //    << " into patch:" << ePatches[0]
+            //    << " own:" << addedCells[minFaceI]
+            //    << endl;
+
+
+            // newF already outwards pointing.
+            meshMod.addFace
+            (
+                newF,                   // vertices
+                addedCells[minFaceI],   // own
+                -1,                     // nei
+                -1,                     // masterPointID
+                -1,                     // masterEdgeID
+                faceToFaceMap.size(),   // masterFaceID
+                false,                  // flipFaceFlux
+                ePatches[0],            // patchID
+                -1,                     // zoneID
+                false                   // zoneFlip
+            );
+            faceToFaceMap.append(0);
+            faceToEdgeMap.append(edgeI);
+        }
+    }
+
+    // Pass2. Other faces of boundary edges
+    forAll(extrudeEdgePatches, edgeI)
+    {
+        const labelList& eFaces = patch_.edgeFaces()[edgeI];
+        const labelList& ePatches = extrudeEdgePatches[edgeI];
+
+        if (ePatches.size() >= 2)
+        {
+            for (label i = 1; i < ePatches.size(); i++)
+            {
+                // Extrude eFaces[i]
+                label minFaceI = eFaces[i];
+
+                // Make face pointing in to eFaces[0] so out of new master face
+                const face& f = patch_.localFaces()[minFaceI];
+
+                const edge& e = patch_.edges()[edgeI];
+                label fp0 = findIndex(f, e[0]);
+                label fp1 = f.fcIndex(fp0);
+
+                if (f[fp1] != e[1])
+                {
+                    fp1 = fp0;
+                    fp0 = f.rcIndex(fp1);
+                }
+
+                face newF(4);
+                newF[0] = f[fp0];
+                newF[1] = f[fp1];
+                newF[2] = addedPoints[pointRegions_[minFaceI][fp1]];
+                newF[3] = addedPoints[pointRegions_[minFaceI][fp0]];
+
+                //Pout<< "for external edge:" << e
+                //    << " at:" << patch_.localPoints()[e[0]]
+                //    << patch_.localPoints()[e[1]]
+                //    << " adding patch face:" << newF
+                //    << " from:" << f
+                //    << " into patch:" << ePatches[i]
+                //    << endl;
+
+                // newF already outwards pointing.
+                meshMod.addFace
+                (
+                    newF,                   // vertices
+                    addedCells[minFaceI],   // own
+                    -1,                     // nei
+                    -1,                     // masterPointID
+                    -1,                     // masterEdgeID
+                    faceToFaceMap.size(),   // masterFaceID
+                    false,                  // flipFaceFlux
+                    ePatches[i],            // patchID
+                    -1,                     // zoneID
+                    false                   // zoneFlip
+                );
+                faceToFaceMap.append(0);
+                faceToEdgeMap.append(edgeI);
+            }
+        }
+    }
+
+
+    cellToFaceMap_.transfer(cellToFaceMap);
+    faceToFaceMap_.transfer(faceToFaceMap);
+    faceToEdgeMap_.transfer(faceToEdgeMap);
+    pointToPointMap_.transfer(pointToPointMap);
+}
+
+
+void Foam::createShellMesh::updateMesh(const mapPolyMesh& map)
+{
+    inplaceReorder(map.reverseCellMap(), cellToFaceMap_);
+    inplaceReorder(map.reverseFaceMap(), faceToFaceMap_);
+    inplaceReorder(map.reverseFaceMap(), faceToEdgeMap_);
+    inplaceReorder(map.reversePointMap(), pointToPointMap_);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H
new file mode 100644
index 0000000000..1f9187fe4d
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::createShellMesh
+
+Description
+    Creates mesh by extruding a patch.
+
+SourceFiles
+    createShellMesh.C
+
+    Extrudes into thickness direction.
+    - bottom faces originate from reversed original faces (have turning index)
+    - top faces originate from original faces (no turning index)
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef createShellMesh_H
+#define createShellMesh_H
+
+#include "primitiveFacePatch.H"
+#include "PackedBoolList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class mapPolyMesh;
+class polyTopoChange;
+
+/*---------------------------------------------------------------------------*\
+                           Class createShellMesh Declaration
+\*---------------------------------------------------------------------------*/
+
+class createShellMesh
+{
+    // Private data
+
+        //- Reference to patch to extrude
+        const primitiveFacePatch& patch_;
+
+        //- Per point on face the region
+        const faceList& pointRegions_;
+
+        //- From region to original patch point
+        const labelList& regionPoints_;
+
+
+        labelList cellToFaceMap_;
+
+        labelList faceToFaceMap_;
+
+        labelList faceToEdgeMap_;
+
+        labelList pointToPointMap_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        createShellMesh(const createShellMesh&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const createShellMesh&);
+
+
+public:
+
+    //- Runtime type information
+    ClassName("createShellMesh");
+
+
+    // Constructors
+
+        //- Construct from mesh.
+        createShellMesh
+        (
+            const primitiveFacePatch& patch,
+            const faceList& pointRegions,
+            const labelList& regionPoints
+        );
+
+
+    // Member Functions
+
+
+        // Access
+
+            //- From region cell to patch face
+            const labelList& cellToFaceMap() const
+            {
+                return cellToFaceMap_;
+            }
+
+            //- From region face to patch face. Contains turning index:
+            //      > 0 : face in same orientation as patch face. face will
+            //            be in top patch
+            //      < 0 : face in opposite orientation as patch face. face will
+            //            be in bottom patch
+            //      = 0 : for all side faces
+            const labelList& faceToFaceMap() const
+            {
+                return faceToFaceMap_;
+            }
+
+            //- From region side-face to patch edge. -1 for non-edge faces.
+            const labelList& faceToEdgeMap() const
+            {
+                return faceToEdgeMap_;
+            }
+
+            //- From region point to patch point.
+            const labelList& pointToPointMap() const
+            {
+                return pointToPointMap_;
+            }
+
+
+        // Other
+
+            //- Helper: calculate point regions
+            static void calcPointRegions
+            (
+                const primitiveFacePatch& patch,
+                const PackedBoolList& nonManifoldEdge,
+                faceList& pointRegions,
+                labelList& regionPoints
+            );
+
+            //- Play commands into polyTopoChange to create layer mesh.
+            void setRefinement
+            (
+                const pointField& thickness,
+                const labelList& topPatchID,
+                const labelList& bottomPatchID,
+                const labelListList& extrudeEdgePatches,
+                polyTopoChange& meshMod
+            );
+
+            //- Update any locally stored mesh information.
+            void updateMesh(const mapPolyMesh&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
new file mode 100644
index 0000000000..f6949fda61
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -0,0 +1,1555 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Description
+    Extrude faceZones into separate mesh (as a different region).
+
+    - used to e.g. extrude baffles (extrude internal faces) or create
+    liquid film regions.
+    - if extruding internal faces:
+        - create baffles in original mesh with directMappedWall patches
+    - if extruding boundary faces:
+        - convert boundary faces to directMappedWall patches
+    - extrude edges of faceZone as a <zone>_sidePatch
+    - extrude edges inbetween different faceZones as a cyclic <zoneA>_<zoneB>
+    - extrudes into master direction (i.e. away from the owner cell
+      if flipMap is false)
+    - not parallel
+
+
+Internal face extrusion
+-----------------------
+
+    +-------------+
+    |             |
+    |             |
+    +---AAAAAAA---+
+    |             |
+    |             |
+    +-------------+
+
+    AAA=faceZone to extrude.
+
+
+For the case of no flipMap the extrusion starts at owner and extrudes
+into the space of the neighbour:
+
+      +CCCCCCC+
+      |       |         <= extruded mesh
+      +BBBBBBB+
+
+    +-------------+
+    |             |
+    | (neighbour) |
+    |___CCCCCCC___|       <= original mesh (with 'baffles' added)
+    |   BBBBBBB   |
+    |(owner side) |
+    |             |
+    +-------------+
+
+    BBB=directMapped between owner on original mesh and new extrusion.
+        (zero offset)
+    CCC=directMapped between neighbour on original mesh and new extrusion
+        (offset due to the thickness of the extruded mesh)
+
+For the case of flipMap the extrusion is the other way around: from the
+neighbour side into the owner side.
+
+
+Boundary face extrusion
+-----------------------
+
+    +--AAAAAAA--+
+    |           |
+    |           |
+    +-----------+
+
+    AAA=faceZone to extrude. E.g. slave side is owner side (no flipmap)
+
+becomes
+
+      +CCCCCCC+
+      |       |         <= extruded mesh
+      +BBBBBBB+
+
+    +--BBBBBBB--+
+    |           |       <= original mesh
+    |           |
+    +-----------+
+
+    BBB=directMapped between original mesh and new extrusion
+    CCC=polypatch
+
+
+
+
+Usage
+
+    - extrudeToRegionMesh <regionName> <faceZones> <thickness>
+
+    @param \<regionName\> \n
+    Name of mesh to create.
+
+    @param \<faceZones\> \n
+    List of faceZones to extrude
+
+    @param \<thickness\> \n
+    Thickness of extruded mesh.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "fvMesh.H"
+#include "polyTopoChange.H"
+#include "patchPointEdgeCirculator.H"
+#include "OFstream.H"
+#include "meshTools.H"
+#include "directMappedWallPolyPatch.H"
+#include "createShellMesh.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "cyclicPolyPatch.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class GeoField>
+void addPatchFields(fvMesh& mesh, const word& patchFieldType)
+{
+    HashTable<const GeoField*> flds
+    (
+        mesh.objectRegistry::lookupClass<GeoField>()
+    );
+
+    for
+    (
+        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
+        iter != flds.end();
+        ++iter
+    )
+    {
+        const GeoField& fld = *iter();
+
+        typename GeoField::GeometricBoundaryField& bfld =
+            const_cast<typename GeoField::GeometricBoundaryField&>
+            (
+                fld.boundaryField()
+            );
+
+        label sz = bfld.size();
+        bfld.setSize(sz+1);
+        bfld.set
+        (
+            sz,
+            GeoField::PatchFieldType::New
+            (
+                patchFieldType,
+                mesh.boundary()[sz],
+                fld.dimensionedInternalField()
+            )
+        );
+    }
+}
+
+
+// Remove last patch field
+template<class GeoField>
+void trimPatchFields(fvMesh& mesh, const label nPatches)
+{
+    HashTable<const GeoField*> flds
+    (
+        mesh.objectRegistry::lookupClass<GeoField>()
+    );
+
+    for
+    (
+        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
+        iter != flds.end();
+        ++iter
+    )
+    {
+        const GeoField& fld = *iter();
+
+        const_cast<typename GeoField::GeometricBoundaryField&>
+        (
+            fld.boundaryField()
+        ).setSize(nPatches);
+    }
+}
+
+
+// Reorder patch field
+template<class GeoField>
+void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
+{
+    HashTable<const GeoField*> flds
+    (
+        mesh.objectRegistry::lookupClass<GeoField>()
+    );
+
+    for
+    (
+        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
+        iter != flds.end();
+        ++iter
+    )
+    {
+        const GeoField& fld = *iter();
+
+        typename GeoField::GeometricBoundaryField& bfld =
+            const_cast<typename GeoField::GeometricBoundaryField&>
+            (
+                fld.boundaryField()
+            );
+
+        bfld.reorder(oldToNew);
+    }
+}
+
+
+void addAllPatchFields(fvMesh& mesh, const label insertPatchI)
+{
+    polyBoundaryMesh& polyPatches =
+        const_cast<polyBoundaryMesh&>(mesh.boundaryMesh());
+    fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh.boundary());
+
+    label sz = polyPatches.size();
+
+    addPatchFields<volScalarField>
+    (
+        mesh,
+        calculatedFvPatchField<scalar>::typeName
+    );
+    addPatchFields<volVectorField>
+    (
+        mesh,
+        calculatedFvPatchField<vector>::typeName
+    );
+    addPatchFields<volSphericalTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<sphericalTensor>::typeName
+    );
+    addPatchFields<volSymmTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<symmTensor>::typeName
+    );
+    addPatchFields<volTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<tensor>::typeName
+    );
+
+    // Surface fields
+
+    addPatchFields<surfaceScalarField>
+    (
+        mesh,
+        calculatedFvPatchField<scalar>::typeName
+    );
+    addPatchFields<surfaceVectorField>
+    (
+        mesh,
+        calculatedFvPatchField<vector>::typeName
+    );
+    addPatchFields<surfaceSphericalTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<sphericalTensor>::typeName
+    );
+    addPatchFields<surfaceSymmTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<symmTensor>::typeName
+    );
+    addPatchFields<surfaceTensorField>
+    (
+        mesh,
+        calculatedFvPatchField<tensor>::typeName
+    );
+
+    // Create reordering list
+    // patches before insert position stay as is
+    labelList oldToNew(sz);
+    for (label i = 0; i < insertPatchI; i++)
+    {
+        oldToNew[i] = i;
+    }
+    // patches after insert position move one up
+    for (label i = insertPatchI; i < sz-1; i++)
+    {
+        oldToNew[i] = i+1;
+    }
+    // appended patch gets moved to insert position
+    oldToNew[sz-1] = insertPatchI;
+
+    // Shuffle into place
+    polyPatches.reorder(oldToNew);
+    fvPatches.reorder(oldToNew);
+
+    reorderPatchFields<volScalarField>(mesh, oldToNew);
+    reorderPatchFields<volVectorField>(mesh, oldToNew);
+    reorderPatchFields<volSphericalTensorField>(mesh, oldToNew);
+    reorderPatchFields<volSymmTensorField>(mesh, oldToNew);
+    reorderPatchFields<volTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceScalarField>(mesh, oldToNew);
+    reorderPatchFields<surfaceVectorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceSphericalTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceSymmTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceTensorField>(mesh, oldToNew);
+}
+
+
+// Adds patch if not yet there. Returns patchID.
+template<class PatchType>
+label addPatch(fvMesh& mesh, const word& patchName, const dictionary& dict)
+{
+    polyBoundaryMesh& polyPatches =
+        const_cast<polyBoundaryMesh&>(mesh.boundaryMesh());
+
+    label patchI = polyPatches.findPatchID(patchName);
+    if (patchI != -1)
+    {
+        if (isA<PatchType>(polyPatches[patchI]))
+        {
+            // Already there
+            return patchI;
+        }
+        else
+        {
+            FatalErrorIn("addPatch<PatchType>(fvMesh&, const word&)")
+                << "Already have patch " << patchName
+                << " but of type " << PatchType::typeName
+                << exit(FatalError);
+        }
+    }
+
+
+    label insertPatchI = polyPatches.size();
+    label startFaceI = mesh.nFaces();
+
+    forAll(polyPatches, patchI)
+    {
+        const polyPatch& pp = polyPatches[patchI];
+
+        if (isA<processorPolyPatch>(pp))
+        {
+            insertPatchI = patchI;
+            startFaceI = pp.start();
+            break;
+        }
+    }
+
+    dictionary patchDict(dict);
+    patchDict.set("type", PatchType::typeName);
+    patchDict.set("nFaces", 0);
+    patchDict.set("startFace", startFaceI);
+
+
+    // Below is all quite a hack. Feel free to change once there is a better
+    // mechanism to insert and reorder patches.
+
+    // Clear local fields and e.g. polyMesh parallelInfo.
+    mesh.clearOut();
+
+    label sz = polyPatches.size();
+
+    fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh.boundary());
+
+    // Add polyPatch at the end
+    polyPatches.setSize(sz+1);
+    polyPatches.set
+    (
+        sz,
+        polyPatch::New
+        (
+            patchName,
+            patchDict,
+            insertPatchI,
+            polyPatches
+        )
+    );
+    fvPatches.setSize(sz+1);
+    fvPatches.set
+    (
+        sz,
+        fvPatch::New
+        (
+            polyPatches[sz],  // point to newly added polyPatch
+            mesh.boundary()
+        )
+    );
+
+    addAllPatchFields(mesh, insertPatchI);
+
+    return insertPatchI;
+}
+
+
+template<class PatchType>
+label addPatch(fvMesh& mesh, const word& patchName)
+{
+    polyBoundaryMesh& polyPatches =
+        const_cast<polyBoundaryMesh&>(mesh.boundaryMesh());
+
+    label patchI = polyPatches.findPatchID(patchName);
+    if (patchI != -1)
+    {
+        if (isA<PatchType>(polyPatches[patchI]))
+        {
+            // Already there
+            return patchI;
+        }
+        else
+        {
+            FatalErrorIn("addPatch<PatchType>(fvMesh&, const word&)")
+                << "Already have patch " << patchName
+                << " but of type " << PatchType::typeName
+                << exit(FatalError);
+        }
+    }
+
+
+    label insertPatchI = polyPatches.size();
+    label startFaceI = mesh.nFaces();
+
+    forAll(polyPatches, patchI)
+    {
+        const polyPatch& pp = polyPatches[patchI];
+
+        if (isA<processorPolyPatch>(pp))
+        {
+            insertPatchI = patchI;
+            startFaceI = pp.start();
+            break;
+        }
+    }
+
+    // Below is all quite a hack. Feel free to change once there is a better
+    // mechanism to insert and reorder patches.
+
+    // Clear local fields and e.g. polyMesh parallelInfo.
+    mesh.clearOut();
+
+    label sz = polyPatches.size();
+
+    fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh.boundary());
+
+    // Add polyPatch at the end
+    polyPatches.setSize(sz+1);
+    polyPatches.set
+    (
+        sz,
+        polyPatch::New
+        (
+            PatchType::typeName,
+            patchName,
+            0,              // size
+            startFaceI,
+            insertPatchI,
+            polyPatches
+        )
+    );
+    fvPatches.setSize(sz+1);
+    fvPatches.set
+    (
+        sz,
+        fvPatch::New
+        (
+            polyPatches[sz],  // point to newly added polyPatch
+            mesh.boundary()
+        )
+    );
+
+    addAllPatchFields(mesh, insertPatchI);
+
+    return insertPatchI;
+}
+
+
+// Reorder and delete patches.
+void reorderPatches
+(
+    fvMesh& mesh,
+    const labelList& oldToNew,
+    const label nNewPatches
+)
+{
+    polyBoundaryMesh& polyPatches =
+        const_cast<polyBoundaryMesh&>(mesh.boundaryMesh());
+    fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh.boundary());
+
+    // Shuffle into place
+    polyPatches.reorder(oldToNew);
+    fvPatches.reorder(oldToNew);
+
+    reorderPatchFields<volScalarField>(mesh, oldToNew);
+    reorderPatchFields<volVectorField>(mesh, oldToNew);
+    reorderPatchFields<volSphericalTensorField>(mesh, oldToNew);
+    reorderPatchFields<volSymmTensorField>(mesh, oldToNew);
+    reorderPatchFields<volTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceScalarField>(mesh, oldToNew);
+    reorderPatchFields<surfaceVectorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceSphericalTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceSymmTensorField>(mesh, oldToNew);
+    reorderPatchFields<surfaceTensorField>(mesh, oldToNew);
+
+    // Remove last.
+    polyPatches.setSize(nNewPatches);
+    fvPatches.setSize(nNewPatches);
+    trimPatchFields<volScalarField>(mesh, nNewPatches);
+    trimPatchFields<volVectorField>(mesh, nNewPatches);
+    trimPatchFields<volSphericalTensorField>(mesh, nNewPatches);
+    trimPatchFields<volSymmTensorField>(mesh, nNewPatches);
+    trimPatchFields<volTensorField>(mesh, nNewPatches);
+    trimPatchFields<surfaceScalarField>(mesh, nNewPatches);
+    trimPatchFields<surfaceVectorField>(mesh, nNewPatches);
+    trimPatchFields<surfaceSphericalTensorField>(mesh, nNewPatches);
+    trimPatchFields<surfaceSymmTensorField>(mesh, nNewPatches);
+    trimPatchFields<surfaceTensorField>(mesh, nNewPatches);
+}
+
+
+// Remove zero-sized patches
+void deleteEmptyPatches(fvMesh& mesh)
+{
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    labelList oldToNew(patches.size());
+    label usedI = 0;
+    label notUsedI = patches.size();
+    forAll(patches, patchI)
+    {
+        if (returnReduce(patches[patchI].size(), sumOp<label>()) == 0)
+        {
+            oldToNew[patchI] = --notUsedI;
+        }
+        else
+        {
+            oldToNew[patchI] = usedI++;
+        }
+    }
+
+    reorderPatches(mesh, oldToNew, usedI);
+}
+
+
+void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
+{
+    // Create dummy system/fv*
+    {
+        IOobject io
+        (
+            "fvSchemes",
+            mesh.time().system(),
+            regionName,
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        );
+
+        Info<< "Testing:" << io.objectPath() << endl;
+
+        if (!io.headerOk())
+        {
+            Info<< "Writing dummy " << regionName/io.name() << endl;
+            dictionary dummyDict;
+            dictionary divDict;
+            dummyDict.add("divSchemes", divDict);
+            dictionary gradDict;
+            dummyDict.add("gradSchemes", gradDict);
+            dictionary laplDict;
+            dummyDict.add("laplacianSchemes", laplDict);
+
+            IOdictionary(io, dummyDict).regIOobject::write();
+        }
+    }
+    {
+        IOobject io
+        (
+            "fvSolution",
+            mesh.time().system(),
+            regionName,
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        );
+
+        if (!io.headerOk())
+        {
+            Info<< "Writing dummy " << regionName/io.name() << endl;
+            dictionary dummyDict;
+            IOdictionary(io, dummyDict).regIOobject::write();
+        }
+    }
+}
+
+
+tmp<pointField> calcOffset
+(
+    const primitiveFacePatch& extrudePatch,
+    const createShellMesh& extruder,
+    const polyPatch& pp
+)
+{
+    vectorField::subField fc = pp.faceCentres();
+
+    tmp<pointField> toffsets(new pointField(fc.size()));
+    pointField& offsets = toffsets();
+
+    forAll(fc, i)
+    {
+        label meshFaceI = pp.start()+i;
+        label patchFaceI = mag(extruder.faceToFaceMap()[meshFaceI])-1;
+        point patchFc = extrudePatch[patchFaceI].centre
+        (
+            extrudePatch.points()
+        );
+        offsets[i] = patchFc - fc[i];
+    }
+    return toffsets;
+}
+
+
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::validArgs.append("shellRegion");
+    argList::validArgs.append("faceZones");
+    argList::validArgs.append("thickness");
+
+    #include "addRegionOption.H"
+    argList::validOptions.insert("overwrite", "");
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createNamedMesh.H"
+    const word oldInstance = mesh.pointsInstance();
+
+    word shellRegionName = args.additionalArgs()[0];
+    const wordList zoneNames(IStringStream(args.additionalArgs()[1])());
+    scalar thickness = readScalar(IStringStream(args.additionalArgs()[2])());
+    bool overwrite = args.optionFound("overwrite");
+
+
+    Info<< "Extruding zones " << zoneNames
+        << " on mesh " << regionName
+        << " into shell mesh " << shellRegionName
+        << " of thickness " << thickness << nl
+        << endl;
+
+    if (shellRegionName == regionName)
+    {
+        FatalErrorIn(args.executable())
+            << "Cannot extrude into same region as mesh." << endl
+            << "Mesh region : " << regionName << endl
+            << "Shell region : " << shellRegionName
+            << exit(FatalError);
+    }
+
+
+
+    // Create dummy fv* files
+    createDummyFvMeshFiles(mesh, shellRegionName);
+
+
+    word meshInstance;
+    if (!overwrite)
+    {
+        runTime++;
+        meshInstance = runTime.timeName();
+    }
+    else
+    {
+        meshInstance = oldInstance;
+    }
+    Info<< "Writing meshes to " << meshInstance << nl << endl;
+
+
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+    const faceZoneMesh& faceZones = mesh.faceZones();
+
+
+    // Check zones
+    // ~~~~~~~~~~~
+
+    labelList zoneIDs(zoneNames.size());
+    forAll(zoneNames, i)
+    {
+        zoneIDs[i] = faceZones.findZoneID(zoneNames[i]);
+        if (zoneIDs[i] == -1)
+        {
+            FatalErrorIn(args.executable())
+                << "Cannot find zone " << zoneNames[i] << endl
+                << "Valid zones are " << faceZones.names()
+                << exit(FatalError);
+        }
+    }
+
+
+    // Collect faces to extrude and per-face information
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    label nExtrudeFaces = 0;
+    forAll(zoneIDs, i)
+    {
+        nExtrudeFaces += faceZones[zoneIDs[i]].size();
+    }
+    labelList extrudeMeshFaces(nExtrudeFaces);
+    faceList zoneFaces(nExtrudeFaces);
+    labelList zoneID(nExtrudeFaces);
+    boolList zoneFlipMap(nExtrudeFaces);
+    nExtrudeFaces = 0;
+    forAll(zoneIDs, i)
+    {
+        const faceZone& fz = faceZones[zoneIDs[i]];
+        const primitiveFacePatch& fzp = fz();
+        forAll(fz, j)
+        {
+            extrudeMeshFaces[nExtrudeFaces] = fz[j];
+            zoneFaces[nExtrudeFaces] = fzp[j];
+            zoneID[nExtrudeFaces] = zoneIDs[i];
+            zoneFlipMap[nExtrudeFaces] = fz.flipMap()[j];
+            nExtrudeFaces++;
+        }
+    }
+    primitiveFacePatch extrudePatch(zoneFaces.xfer(), mesh.points());
+    const pointField& extrudePoints = extrudePatch.localPoints();
+    const faceList& extrudeFaces = extrudePatch.localFaces();
+    const labelListList& edgeFaces = extrudePatch.edgeFaces();
+
+
+    Info<< "extrudePatch :"
+        << " faces:" << extrudePatch.size()
+        << " points:" << extrudePatch.nPoints()
+        << " edges:" << extrudePatch.nEdges()
+        << nl
+        << endl;
+
+
+
+
+    // Check whether the zone is internal or external faces to determine
+    // what patch type to insert. Cannot be mixed
+    // since then how to couple? - directMapped only valid for a whole patch.
+    boolList isInternal(zoneIDs.size(), false);
+    forAll(zoneIDs, i)
+    {
+        const faceZone& fz = faceZones[zoneIDs[i]];
+        forAll(fz, j)
+        {
+            if (mesh.isInternalFace(fz[j]))
+            {
+                isInternal[i] = true;
+                break;
+            }
+        }
+    }
+    Pstream::listCombineGather(isInternal, orEqOp<bool>());
+    Pstream::listCombineScatter(isInternal);
+
+    forAll(zoneIDs, i)
+    {
+        const faceZone& fz = faceZones[zoneIDs[i]];
+        if (isInternal[i])
+        {
+            Info<< "FaceZone " << fz.name() << " has internal faces" << endl;
+        }
+        else
+        {
+            Info<< "FaceZone " << fz.name() << " has boundary faces" << endl;
+        }
+    }
+
+
+
+
+    // Add interface patches
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    Info<< "Adding coupling patches:" << nl << nl
+        << "patchID\tpatch\ttype" << nl
+        << "-------\t-----\t----"
+        << endl;
+    labelList interRegionTopPatch(zoneNames.size());
+    labelList interRegionBottomPatch(zoneNames.size());
+    label nCoupled = 0;
+    forAll(zoneIDs, i)
+    {
+        word interName(regionName+"_to_"+shellRegionName+'_'+zoneNames[i]);
+
+        if (isInternal[i])
+        {
+            interRegionTopPatch[i] = addPatch<directMappedWallPolyPatch>
+            (
+                mesh,
+                interName + "_top"
+            );
+            nCoupled++;
+            Info<< interRegionTopPatch[i]
+                << '\t' << patches[interRegionTopPatch[i]].name()
+                << '\t' << patches[interRegionTopPatch[i]].type()
+                << nl;
+
+            interRegionBottomPatch[i] = addPatch<directMappedWallPolyPatch>
+            (
+                mesh,
+                interName + "_bottom"
+            );
+            nCoupled++;
+            Info<< interRegionBottomPatch[i]
+                << '\t' << patches[interRegionBottomPatch[i]].name()
+                << '\t' << patches[interRegionBottomPatch[i]].type()
+                << nl;
+        }
+        else
+        {
+            interRegionTopPatch[i] = addPatch<polyPatch>
+            (
+                mesh,
+                zoneNames[i] + "_top"
+            );
+            nCoupled++;
+            Info<< interRegionTopPatch[i]
+                << '\t' << patches[interRegionTopPatch[i]].name()
+                << '\t' << patches[interRegionTopPatch[i]].type()
+                << nl;
+
+            interRegionBottomPatch[i] = addPatch<directMappedWallPolyPatch>
+            (
+                mesh,
+                interName
+            );
+            nCoupled++;
+            Info<< interRegionBottomPatch[i]
+                << '\t' << patches[interRegionBottomPatch[i]].name()
+                << '\t' << patches[interRegionBottomPatch[i]].type()
+                << nl;
+        }
+    }
+    Info<< "Added " << nCoupled << " inter-region patches." << nl
+        << endl;
+
+
+    labelList extrudeTopPatchID(extrudePatch.size());
+    labelList extrudeBottomPatchID(extrudePatch.size());
+
+    nExtrudeFaces = 0;
+    forAll(zoneNames, i)
+    {
+        label zoneI = faceZones.findZoneID(zoneNames[i]);
+        const faceZone& fz = faceZones[zoneI];
+        forAll(fz, j)
+        {
+            extrudeTopPatchID[nExtrudeFaces] = interRegionTopPatch[i];
+            extrudeBottomPatchID[nExtrudeFaces] = interRegionBottomPatch[i];
+            nExtrudeFaces++;
+        }
+    }
+
+
+
+    // Count how many patches on special edges of extrudePatch are necessary
+    // - zoneXXX_sides
+    // - zoneXXX_zoneYYY
+    labelList zoneSidePatch(faceZones.size(), 0);
+    labelList zoneZonePatch(faceZones.size()*faceZones.size(), 0);
+
+    forAll(edgeFaces, edgeI)
+    {
+        const labelList& eFaces = edgeFaces[edgeI];
+        if (eFaces.size() == 2)
+        {
+            label zone0 = zoneID[eFaces[0]];
+            label zone1 = zoneID[eFaces[1]];
+
+            if (zone0 != zone1)
+            {
+                label minZone = min(zone0,zone1);
+                label maxZone = max(zone0,zone1);
+                zoneZonePatch[minZone*faceZones.size()+maxZone]++;
+            }
+        }
+        else
+        {
+            // Determine the min zone of all connected zones.
+            label minZone = zoneID[eFaces[0]];
+            for (label i = 1; i < eFaces.size(); i++)
+            {
+                minZone = min(minZone, zoneID[eFaces[i]]);
+            }
+            zoneSidePatch[minZone]++;
+        }
+    }
+    Pstream::listCombineGather(zoneSidePatch, plusEqOp<label>());
+    Pstream::listCombineScatter(zoneSidePatch);
+    Pstream::listCombineGather(zoneZonePatch, plusEqOp<label>());
+    Pstream::listCombineScatter(zoneZonePatch);
+
+    // Now check which patches to add.
+    Info<< "Adding patches for edges on zones:" << nl << nl
+        << "patchID\tpatch" << nl
+        << "-------\t-----"
+        << endl;
+
+    label nSide = 0;
+    forAll(zoneSidePatch, zoneI)
+    {
+        if (zoneSidePatch[zoneI] > 0)
+        {
+            word patchName = faceZones[zoneI].name() + "_" + "side";
+            zoneSidePatch[zoneI] = addPatch<polyPatch>
+            (
+                mesh,
+                patchName
+            );
+
+            Info<< zoneSidePatch[zoneI] << '\t' << patchName << nl;
+
+            nSide++;
+        }
+    }
+    Info<< "Added " << nSide << " zone-edge patches." << nl
+        << endl;
+
+
+
+    Info<< "Adding inter-zone patches:" << nl << nl
+        << "patchID\tpatch" << nl
+        << "-------\t-----"
+        << endl;
+
+    dictionary transformDict;
+    transformDict.add
+    (
+        "transform",
+        cyclicPolyPatch::transformTypeNames[cyclicPolyPatch::NOORDERING]
+    );
+
+    label nInter = 0;
+    forAll(zoneZonePatch, minZone)
+    {
+        for (label maxZone = minZone; maxZone < faceZones.size(); maxZone++)
+        {
+            label index = minZone*faceZones.size()+maxZone;
+
+            if (zoneZonePatch[index] > 0)
+            {
+                word patchName =
+                    faceZones[minZone].name()
+                  + "_"
+                  + faceZones[maxZone].name();
+
+                zoneZonePatch[index] = addPatch<cyclicPolyPatch>
+                (
+                    mesh,
+                    patchName,
+                    transformDict
+                );
+
+                Info<< zoneZonePatch[index]
+                    << '\t' << patchName << nl;
+
+                nInter++;
+            }
+        }
+    }
+    Info<< "Added " << nInter << " inter-zone patches." << nl
+        << endl;
+
+
+
+    // Set patches to use for edges to be extruded into boundary faces
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // In order of edgeFaces: per edge, per originating face the
+    // patch to use for the side face (from the extruded edge).
+    // If empty size create an internal face.
+    labelListList extrudeEdgePatches(extrudePatch.nEdges());
+
+    // Is edge an non-manifold edge
+    PackedBoolList nonManifoldEdge(extrudePatch.nEdges());
+
+    forAll(edgeFaces, edgeI)
+    {
+        const labelList& eFaces = edgeFaces[edgeI];
+
+        labelList& ePatches = extrudeEdgePatches[edgeI];
+
+        if (eFaces.size() == 2)
+        {
+            label zone0 = zoneID[eFaces[0]];
+            label zone1 = zoneID[eFaces[1]];
+
+            if (zone0 != zone1) // || (cos(angle) > blabla))
+            {
+                label minZone = min(zone0,zone1);
+                label maxZone = max(zone0,zone1);
+                label patchI = zoneZonePatch[minZone*faceZones.size()+maxZone];
+                ePatches.setSize(eFaces.size());
+                ePatches = patchI;
+
+                nonManifoldEdge[edgeI] = 1;
+            }
+        }
+        else
+        {
+            ePatches.setSize(eFaces.size());
+            forAll(eFaces, i)
+            {
+                ePatches[i] = zoneSidePatch[zoneID[eFaces[i]]];
+            }
+            nonManifoldEdge[edgeI] = 1;
+        }
+    }
+
+    // Override constraint types
+    {
+        const edgeList& extrudeEdges = extrudePatch.edges();
+        const labelList& extrudeMeshPts = extrudePatch.meshPoints();
+
+        // Map from mesh edge to local patch edge index
+        EdgeMap<label> extrudeMeshEdges(extrudePatch.nEdges());
+
+        forAll(extrudeEdges, edgeI)
+        {
+            if (edgeFaces[edgeI].size() == 1)
+            {
+                const edge& e = extrudeEdges[edgeI];
+                const edge meshE(extrudeMeshPts[e[0]], extrudeMeshPts[e[1]]);
+                extrudeMeshEdges.insert(meshE, edgeI);
+            }
+        }
+        forAll(patches, patchI)
+        {
+            const polyPatch& pp = patches[patchI];
+
+            if (polyPatch::constraintType(pp.type()))
+            {
+                const edgeList& edges = pp.edges();
+
+                forAll(edges, ppEdgeI)
+                {
+                    const edge& e = edges[ppEdgeI];
+                    edge meshE(pp.meshPoints()[e[0]], pp.meshPoints()[e[1]]);
+                    EdgeMap<label>::const_iterator iter = extrudeMeshEdges.find
+                    (
+                        meshE
+                    );
+                    if (iter != extrudeMeshEdges.end())
+                    {
+                        label extrudeEdgeI = iter();
+                        extrudeEdgePatches[extrudeEdgeI] = labelList
+                        (
+                            edgeFaces[extrudeEdgeI].size(),
+                            patchI
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+
+
+
+    // Assign point regions
+    // ~~~~~~~~~~~~~~~~~~~~
+
+    // Per face, per point the region number.
+    faceList pointRegions(extrudePatch.size());
+    // Per region the originating point
+    labelList regionPoints;
+
+    createShellMesh::calcPointRegions
+    (
+        extrudePatch,
+        nonManifoldEdge,
+        pointRegions,
+        regionPoints
+    );
+
+
+    // Calculate a normal per region
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    vectorField regionNormals(regionPoints.size(), vector::zero);
+
+    forAll(pointRegions, faceI)
+    {
+        const face& f = extrudeFaces[faceI];
+
+        forAll(f, fp)
+        {
+            label region = pointRegions[faceI][fp];
+            regionNormals[region] += extrudePatch.faceNormals()[faceI];
+        }
+    }
+    regionNormals /= mag(regionNormals);
+
+    // For debugging: dump hedgehog plot of normals
+    {
+        OFstream str(runTime.path()/"regionNormals.obj");
+        label vertI = 0;
+
+        forAll(pointRegions, faceI)
+        {
+            const face& f = extrudeFaces[faceI];
+
+            forAll(f, fp)
+            {
+                label region = pointRegions[faceI][fp];
+                const point& pt = extrudePoints[f[fp]];
+
+                meshTools::writeOBJ(str, pt);
+                vertI++;
+                meshTools::writeOBJ(str, pt+0.01*regionNormals[region]);
+                vertI++;
+                str << "l " << vertI-1 << ' ' << vertI << nl;
+            }
+        }
+    }
+
+
+
+    // Create a new mesh
+    // ~~~~~~~~~~~~~~~~~
+
+    createShellMesh extruder(extrudePatch, pointRegions, regionPoints);
+
+
+    autoPtr<fvMesh> regionMeshPtr;
+    autoPtr<mapPolyMesh> shellMap;
+    {
+        polyTopoChange meshMod(mesh.boundaryMesh().size());
+
+        extruder.setRefinement
+        (
+            thickness*regionNormals,
+            extrudeTopPatchID,
+            extrudeBottomPatchID,
+            extrudeEdgePatches,
+            meshMod
+        );
+
+        shellMap = meshMod.makeMesh
+        (
+            regionMeshPtr,     // mesh to create
+            IOobject
+            (
+                shellRegionName,
+                meshInstance,
+                runTime,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            mesh            // mesh to get original patch info from
+        );
+    }
+    fvMesh& regionMesh = regionMeshPtr();
+
+    // Necessary?
+    regionMesh.setInstance(meshInstance);
+
+
+    // Update numbering on extruder.
+    extruder.updateMesh(shellMap);
+
+
+    // Change top and bottom boundary conditions on regionMesh
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Save offsets from shell mesh back to original mesh
+    List<pointField> topOffsets(zoneIDs.size());
+    List<pointField> bottomOffsets(zoneIDs.size());
+
+    {
+        const polyBoundaryMesh& regionPatches = regionMesh.boundaryMesh();
+        List<polyPatch*> newPatches(regionPatches.size());
+        forAll(regionPatches, patchI)
+        {
+            const polyPatch& pp = regionPatches[patchI];
+
+            if
+            (
+                isA<directMappedWallPolyPatch>(pp)
+             && (findIndex(interRegionTopPatch, patchI) != -1)
+            )
+            {
+                label index = findIndex(interRegionTopPatch, patchI);
+
+                topOffsets[index] = calcOffset(extrudePatch, extruder, pp);
+
+                newPatches[patchI] = new directMappedWallPolyPatch
+                (
+                    pp.name(),
+                    pp.size(),
+                    pp.start(),
+                    patchI,
+                    regionName,                             // sampleRegion
+                    directMappedPatchBase::NEARESTPATCHFACE,// sampleMode
+                    pp.name(),                              // samplePatch
+                    topOffsets[index],                      // offset
+                    patches
+                );
+            }
+            else if
+            (
+                isA<directMappedWallPolyPatch>(pp)
+             && (findIndex(interRegionBottomPatch, patchI) != -1)
+            )
+            {
+                label index = findIndex(interRegionBottomPatch, patchI);
+
+                bottomOffsets[index] = calcOffset(extrudePatch, extruder, pp);
+
+                newPatches[patchI] = new directMappedWallPolyPatch
+                (
+                    pp.name(),
+                    pp.size(),
+                    pp.start(),
+                    patchI,
+                    regionName,                             // sampleRegion
+                    directMappedPatchBase::NEARESTPATCHFACE,// sampleMode
+                    pp.name(),                              // samplePatch
+                    bottomOffsets[index],                   // offset
+                    patches
+                );
+            }
+            else
+            {
+                newPatches[patchI] = pp.clone
+                (
+                    regionPatches,
+                    patchI,
+                    pp.size(),
+                    pp.start()
+                ).ptr();
+            }
+        }
+        regionMesh.removeFvBoundary();
+        regionMesh.addFvPatches(newPatches, true);
+        deleteEmptyPatches(regionMesh);
+    }
+
+
+
+    // Write addressing from region mesh back to originating patch
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelIOList cellToPatchFaceAddressing
+    (
+        IOobject
+        (
+            "cellToPatchFaceAddressing",
+            regionMesh.facesInstance(),
+            regionMesh.meshSubDir,
+            regionMesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        extruder.cellToFaceMap()
+    );
+    cellToPatchFaceAddressing.note() = "cell to patch face addressing";
+
+    labelIOList faceToPatchFaceAddressing
+    (
+        IOobject
+        (
+            "faceToPatchFaceAddressing",
+            regionMesh.facesInstance(),
+            regionMesh.meshSubDir,
+            regionMesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        extruder.faceToFaceMap()
+    );
+    faceToPatchFaceAddressing.note() =
+        "front/back face + turning index to patch face addressing";
+
+    labelIOList faceToPatchEdgeAddressing
+    (
+        IOobject
+        (
+            "faceToPatchEdgeAddressing",
+            regionMesh.facesInstance(),
+            regionMesh.meshSubDir,
+            regionMesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        extruder.faceToEdgeMap()
+    );
+    faceToPatchEdgeAddressing.note() =
+        "side face to patch edge addressing";
+
+    labelIOList pointToPatchPointAddressing
+    (
+        IOobject
+        (
+            "pointToPatchPointAddressing",
+            regionMesh.facesInstance(),
+            regionMesh.meshSubDir,
+            regionMesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        extruder.pointToPointMap()
+    );
+    pointToPatchPointAddressing.note() =
+        "point to patch point addressing";
+
+
+    Info<< "Writing mesh " << regionMesh.name()
+        << " to " << regionMesh.facesInstance() << nl
+        << endl;
+
+    bool ok =
+        regionMesh.write()
+     && cellToPatchFaceAddressing.write()
+     && faceToPatchFaceAddressing.write()
+     && faceToPatchEdgeAddressing.write()
+     && pointToPatchPointAddressing.write();
+
+    if (!ok)
+    {
+        FatalErrorIn(args.executable())
+            << "Failed writing mesh " << regionMesh.name()
+            << " at location " << regionMesh.facesInstance()
+            << exit(FatalError);
+    }
+
+
+
+
+    // Insert baffles into original mesh
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    autoPtr<mapPolyMesh> addBafflesMap;
+    {
+        polyTopoChange meshMod(mesh);
+
+        // Modify faces to be in bottom (= always coupled) patch
+        forAll(extrudeMeshFaces, zoneFaceI)
+        {
+            label meshFaceI = extrudeMeshFaces[zoneFaceI];
+            label zoneI = zoneID[zoneFaceI];
+            bool flip = zoneFlipMap[zoneFaceI];
+            const face& f = mesh.faces()[meshFaceI];
+
+            if (!flip)
+            {
+                meshMod.modifyFace
+                (
+                    f,                          // modified face
+                    meshFaceI,                  // label of face being modified
+                    mesh.faceOwner()[meshFaceI],// owner
+                    -1,                         // neighbour
+                    false,                      // face flip
+                    extrudeBottomPatchID[zoneFaceI],// patch for face
+                    zoneI,                      // zone for face
+                    flip                        // face flip in zone
+                );
+            }
+            else if (mesh.isInternalFace(meshFaceI))
+            {
+                meshMod.modifyFace
+                (
+                    f.reverseFace(),                // modified face
+                    meshFaceI,                      // label of modified face
+                    mesh.faceNeighbour()[meshFaceI],// owner
+                    -1,                             // neighbour
+                    true,                           // face flip
+                    extrudeBottomPatchID[zoneFaceI],// patch for face
+                    zoneI,                          // zone for face
+                    !flip                           // face flip in zone
+                );
+            }
+        }
+
+        // Add faces (using same points) to be in top patch
+        forAll(extrudeMeshFaces, zoneFaceI)
+        {
+            label meshFaceI = extrudeMeshFaces[zoneFaceI];
+            bool flip = zoneFlipMap[zoneFaceI];
+            const face& f = mesh.faces()[meshFaceI];
+
+            if (!flip)
+            {
+                if (mesh.isInternalFace(meshFaceI))
+                {
+                    meshMod.addFace
+                    (
+                        f.reverseFace(),                // modified face
+                        mesh.faceNeighbour()[meshFaceI],// owner
+                        -1,                             // neighbour
+                        -1,                             // master point
+                        -1,                             // master edge
+                        meshFaceI,                      // master face
+                        true,                           // flip flux
+                        extrudeTopPatchID[zoneFaceI],   // patch for face
+                        -1,                             // zone for face
+                        false                           // face flip in zone
+                    );
+                }
+            }
+            else
+            {
+                meshMod.addFace
+                (
+                    f,                              // face
+                    mesh.faceOwner()[meshFaceI],    // owner
+                    -1,                             // neighbour
+                    -1,                             // master point
+                    -1,                             // master edge
+                    meshFaceI,                      // master face
+                    false,                          // flip flux
+                    extrudeTopPatchID[zoneFaceI],   // patch for face
+                    -1,                             // zone for face
+                    false                           // zone flip
+                );
+            }
+        }
+
+        // Change the mesh. Change points directly (no inflation).
+        addBafflesMap = meshMod.changeMesh(mesh, false);
+
+        // Update fields
+        mesh.updateMesh(addBafflesMap);
+
+
+//XXXXXX
+// Update maps! e.g. faceToPatchFaceAddressing
+//XXXXXX
+
+        // Move mesh (since morphing might not do this)
+        if (addBafflesMap().hasMotionPoints())
+        {
+            mesh.movePoints(addBafflesMap().preMotionPoints());
+        }
+
+        mesh.setInstance(meshInstance);
+    }
+    
+
+
+    // Change master and slave boundary conditions on originating mesh
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    {
+        const polyBoundaryMesh& patches = mesh.boundaryMesh();
+        List<polyPatch*> newPatches(patches.size());
+        forAll(patches, patchI)
+        {
+            const polyPatch& pp = patches[patchI];
+
+            if
+            (
+                isA<directMappedWallPolyPatch>(pp)
+             && (findIndex(interRegionTopPatch, patchI) != -1)
+            )
+            {
+                label index = findIndex(interRegionTopPatch, patchI);
+                newPatches[patchI] = new directMappedWallPolyPatch
+                (
+                    pp.name(),
+                    pp.size(),
+                    pp.start(),
+                    patchI,
+                    shellRegionName,                        // sampleRegion
+                    directMappedPatchBase::NEARESTPATCHFACE,// sampleMode
+                    pp.name(),                              // samplePatch
+                    -topOffsets[index],                     // offset
+                    patches
+                );
+            }
+            else if
+            (
+                isA<directMappedWallPolyPatch>(pp)
+             && (findIndex(interRegionBottomPatch, patchI) != -1)
+            )
+            {
+                label index = findIndex(interRegionBottomPatch, patchI);
+
+                newPatches[patchI] = new directMappedWallPolyPatch
+                (
+                    pp.name(),
+                    pp.size(),
+                    pp.start(),
+                    patchI,
+                    shellRegionName,                        // sampleRegion
+                    directMappedPatchBase::NEARESTPATCHFACE,// sampleMode
+                    pp.name(),                              // samplePatch
+                    -bottomOffsets[index],                  // offset
+                    patches
+                );
+            }
+            else
+            {
+                newPatches[patchI] = pp.clone
+                (
+                    patches,
+                    patchI,
+                    pp.size(),
+                    pp.start()
+                ).ptr();
+            }
+        }
+        mesh.removeFvBoundary();
+        mesh.addFvPatches(newPatches, true);
+        deleteEmptyPatches(mesh);
+    }
+
+
+    Info<< "Writing mesh " << mesh.name()
+        << " to " << mesh.facesInstance() << nl
+        << endl;
+
+    if (!mesh.write())
+    {
+        FatalErrorIn(args.executable())
+            << "Failed writing mesh " << mesh.name()
+            << " at location " << mesh.facesInstance()
+            << exit(FatalError);
+    }
+
+
+    Info << "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.C
new file mode 100644
index 0000000000..12d5744a91
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.C
@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "patchPointEdgeCirculator.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const Foam::patchPointEdgeCirculator
+Foam::patchPointEdgeCirculator::endConstIter
+(
+    *reinterpret_cast<primitiveFacePatch*>(0),  // primitiveFacePatch
+    *reinterpret_cast<PackedBoolList*>(0),      // PackedBoolList
+    -1,                                         // edgeID
+    -1,                                         // index
+    -1                                          // pointID
+);
+
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<patchPointEdgeCirculator>& ip
+)
+{
+    const patchPointEdgeCirculator& c = ip.t_;
+
+    const pointField& pts = c.patch_.localPoints();
+    const edge& e = c.patch_.edges()[c.edgeID_];
+    label faceI = c.faceID();
+
+    os  << "around point:" << c.pointID_
+        << " coord:" << pts[c.pointID_]
+        << " at edge:" << c.edgeID_
+        << " coord:" << pts[e.otherVertex(c.pointID_)]
+        << " in direction of face:" << faceI;
+
+    if (faceI != -1)
+    {
+        os<< " fc:" << c.patch_.localFaces()[faceI].centre(pts);
+    }
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.H
new file mode 100644
index 0000000000..9cfcdbda5e
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.H
@@ -0,0 +1,206 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::patchPointEdgeCirculator
+
+Description
+    Walks from starting edge/face around point on patch.
+
+    -# Use in-place: \n
+        @code
+            patchPointEdgeCirculator circ(..);
+
+            // Walk
+            do
+            {
+                Info<< "edge:" << circ.edgeID() << endl;
+                ++circ;
+            }
+            while (circ != circ.end());
+        @endcode
+
+    -# Use like STL iterator: \n
+        @code
+            patchPointEdgeCirculator circ(..);
+            for
+            (
+                patchPointEdgeCirculator iter = circ.begin();
+                iter != circ.end();
+                ++iter
+            )
+            {
+                Info<< "edge:" << iter.edgeID() << endl;
+            }
+        @endcode
+
+
+SourceFiles
+    patchPointEdgeCirculator.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef patchPointEdgeCirculator_H
+#define patchPointEdgeCirculator_H
+
+#include "face.H"
+#include "ListOps.H"
+#include "primitiveFacePatch.H"
+#include "PackedBoolList.H"
+#include "InfoProxy.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+/*---------------------------------------------------------------------------*\
+                           Class patchPointEdgeCirculator Declaration
+\*---------------------------------------------------------------------------*/
+
+class patchPointEdgeCirculator
+{
+    // Static data members
+
+        //- end iterator
+        static const patchPointEdgeCirculator endConstIter;
+
+
+    // Private data
+
+        //- Patch
+        const primitiveFacePatch& patch_;
+
+        const PackedBoolList& nonManifoldEdge_;
+
+        //- Current edge
+        label edgeID_;
+
+        //- Current direction (face, expressed as index into edgeFaces()[edgeID]
+        label index_;
+
+        //- Point
+        label pointID_;
+
+        //- Starting edge so we know when to stop.
+        label startEdgeID_;
+
+
+    // Private Member Functions
+
+        //- Set to end() iterator
+        inline void setEnd();
+
+        //- Set edgeID_ to be the other edge on the face that uses the
+        //  point.
+        inline void otherEdge(const label cellI);
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        inline patchPointEdgeCirculator
+        (
+            const primitiveFacePatch&,
+            const PackedBoolList& nonManifoldEdge,
+            const label edgeID,
+            const label index,
+            const label pointID
+        );
+
+        //- Construct as copy
+        inline patchPointEdgeCirculator(const patchPointEdgeCirculator&);
+
+
+    // Member Functions
+
+        inline label edgeID() const;
+
+        inline label index() const;
+
+        inline label pointID() const;
+
+        //- Helper: get face according to the index.
+        //  Returns -1 if on end.
+        inline label faceID() const;
+
+        //- Walk back until non-manifold edge (if any) or minimum edge.
+        inline void setCanonical();
+
+
+    // Member Operators
+
+        inline void operator=(const patchPointEdgeCirculator& iter);
+
+        inline bool operator==(const patchPointEdgeCirculator& iter) const;
+
+        inline bool operator!=(const patchPointEdgeCirculator& iter) const;
+
+        //- Step to next face.
+        inline patchPointEdgeCirculator& operator++();
+
+        //- iterator set to the beginning face. For internal edges this is
+        //  the current face. For boundary edges this is the first boundary face
+        //  reached from walking back (i.e. in opposite direction to ++)
+        inline patchPointEdgeCirculator begin() const;
+        inline patchPointEdgeCirculator cbegin() const;
+
+        //- iterator set to beyond the end of the walk.
+        inline const patchPointEdgeCirculator& end() const;
+        inline const patchPointEdgeCirculator& cend() const;
+
+    // Info
+
+        //- Return info proxy.
+        //  Used to print token information to a stream
+        InfoProxy<patchPointEdgeCirculator> info() const
+        {
+            return *this;
+        }
+
+        friend Ostream& operator<<
+        (
+            Ostream&,
+            const InfoProxy<patchPointEdgeCirculator>&
+        );
+};
+
+Ostream& operator<<(Ostream&, const InfoProxy<patchPointEdgeCirculator>&);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "patchPointEdgeCirculatorI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
new file mode 100644
index 0000000000..7ea7abc1a9
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
@@ -0,0 +1,309 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::patchPointEdgeCirculator::setEnd()
+{
+    edgeID_ = -1;
+    pointID_ = -1;
+}
+
+
+// Cross face to other edge on point
+void Foam::patchPointEdgeCirculator::otherEdge(const label faceI)
+{
+    const labelList& fEdges = patch_.faceEdges()[faceI];
+    const face& f = patch_.localFaces()[faceI];
+    label fp = findIndex(f, pointID_);
+
+    if (fEdges[fp] == edgeID_)
+    {
+        edgeID_ = fEdges[f.rcIndex(fp)];
+    }
+    else
+    {
+        // Check for now
+        if (fEdges[f.rcIndex(fp)] != edgeID_)
+        {
+            FatalErrorIn("patchPointEdgeCirculator::otherEdge(const label)")
+                << "face:" << faceI
+                << " verts:" << f
+                << " edges:" << fEdges
+                << " looking for other edge than " << edgeID_
+                << abort(FatalError);
+        }
+        edgeID_ = fEdges[fp];
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+//- Construct from components
+Foam::patchPointEdgeCirculator::patchPointEdgeCirculator
+(
+    const primitiveFacePatch& patch,
+    const PackedBoolList& nonManifoldEdge,
+    const label edgeID,
+    const label index,
+
+    const label pointID
+)
+:
+    patch_(patch),
+    nonManifoldEdge_(nonManifoldEdge),
+    edgeID_(edgeID),
+    index_(index),
+    pointID_(pointID),
+    startEdgeID_(edgeID_)
+{
+    if (edgeID_ != -1)
+    {
+        const edge& e = patch_.edges()[edgeID_];
+
+        if (pointID_ != e[0] && pointID_ != e[1])
+        {
+            FatalErrorIn
+            (
+                "patchPointEdgeCirculator::patchPointEdgeCirculator(..)"
+            )   << "edge " << edgeID_ << " verts " << e
+                << " does not contain point " << pointID_ << abort(FatalError);
+        }
+    }
+}
+
+
+//- Construct copy
+Foam::patchPointEdgeCirculator::patchPointEdgeCirculator
+(
+    const patchPointEdgeCirculator& circ
+)
+:
+    patch_(circ.patch_),
+    nonManifoldEdge_(circ.nonManifoldEdge_),
+    edgeID_(circ.edgeID_),
+    index_(circ.index_),
+    pointID_(circ.pointID_),
+    startEdgeID_(circ.startEdgeID_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::patchPointEdgeCirculator::edgeID() const
+{
+    return edgeID_;
+}
+
+
+Foam::label Foam::patchPointEdgeCirculator::index() const
+{
+    return index_;
+}
+
+
+Foam::label Foam::patchPointEdgeCirculator::pointID() const
+{
+    return pointID_;
+}
+
+
+Foam::label Foam::patchPointEdgeCirculator::faceID() const
+{
+    if (edgeID_ != -1 && index_ != -1)
+    {
+        return patch_.edgeFaces()[edgeID_][index_];
+    }
+    else
+    {
+        return -1;
+    }
+}
+
+
+void Foam::patchPointEdgeCirculator::operator=
+(
+    const patchPointEdgeCirculator& circ
+)
+{
+    edgeID_ = circ.edgeID_;
+    index_ = circ.index_;
+    pointID_ = circ.pointID_;
+    startEdgeID_ = circ.startEdgeID_;
+}
+
+
+bool Foam::patchPointEdgeCirculator::operator==
+(
+    const patchPointEdgeCirculator& circ
+) const
+{
+    // Do just enough to have setEnd() produce an iterator equal to end().
+    // Could include the direction(i.e. index_) to make sure that two
+    // circulators around same point but in different direction are not equal.
+    return edgeID_ == circ.edgeID_ && pointID_ == circ.pointID_;
+}
+
+
+bool Foam::patchPointEdgeCirculator::operator!=
+(
+    const patchPointEdgeCirculator& circ
+) const
+{
+    return !(*this == circ);
+}
+
+
+void Foam::patchPointEdgeCirculator::setCanonical()
+{
+    if (edgeID_ == -1)
+    {
+        FatalErrorIn("patchPointEdgeCirculator::setCanonical()")
+            << "Already reached end(). Cannot walk any further."
+            << abort(FatalError);
+    }
+
+    label minEdgeID = edgeID_;
+    label minIndex = index_;
+
+    while (true)
+    {
+        if (nonManifoldEdge_[edgeID_])
+        {
+            break;
+        }
+
+        // Step back
+        const labelList& eFaces = patch_.edgeFaces()[edgeID_];
+
+        if (eFaces.size() != 2)
+        {
+            FatalErrorIn("patchPointEdgeCirculator::setCanonical()")
+                << "problem eFaces:" << eFaces << abort(FatalError);
+        }
+
+        label faceI = (index_ == 0 ? eFaces[1] : eFaces[0]);
+
+        // Step to other edge on face
+        otherEdge(faceI);
+
+        // Update index
+        index_ = findIndex(patch_.edgeFaces()[edgeID_], faceI);
+
+        if (edgeID_ < minEdgeID)
+        {
+            minEdgeID = edgeID_;
+            minIndex = index_;
+        }
+
+        if (edgeID_ == startEdgeID_)
+        {
+            edgeID_ = minEdgeID;
+            index_ = minIndex;
+            break;
+        }
+    }
+
+    startEdgeID_ = edgeID_;
+}
+
+
+//- Step to next edge.
+Foam::patchPointEdgeCirculator::patchPointEdgeCirculator&
+Foam::patchPointEdgeCirculator::operator++()
+{
+    if (index_ == -1)
+    {
+        setEnd();
+    }
+    else
+    {
+        // Step to other edge on face
+        label faceI = patch_.edgeFaces()[edgeID_][index_];
+        otherEdge(faceI);
+
+        if (edgeID_ == startEdgeID_)
+        {
+            setEnd();
+        }
+        else if (nonManifoldEdge_[edgeID_])
+        {
+            // Reached non-manifold edge. Cannot walk further.
+            // Mark so it gets set to end next time.
+            index_ = -1;
+        }
+        else
+        {
+            const labelList& eFaces = patch_.edgeFaces()[edgeID_];
+
+            if (eFaces.size() != 2)
+            {
+                FatalErrorIn("patchPointEdgeCirculator:::operator++()")
+                    << "problem eFaces:" << eFaces << abort(FatalError);
+            }
+            // Point to the face that is not faceI
+            index_ = (eFaces[0] != faceI ? 0 : 1);
+        }
+    }
+
+    return *this;
+}
+
+
+Foam::patchPointEdgeCirculator Foam::patchPointEdgeCirculator::begin() const
+{
+    patchPointEdgeCirculator iter(*this);
+    iter.setCanonical();
+
+    return iter;
+}
+
+
+Foam::patchPointEdgeCirculator Foam::patchPointEdgeCirculator::cbegin() const
+{
+    patchPointEdgeCirculator iter(*this);
+    iter.setCanonical();
+
+    return iter;
+}
+
+
+const Foam::patchPointEdgeCirculator& Foam::patchPointEdgeCirculator::end()
+ const
+{
+    return endConstIter;
+}
+
+const Foam::patchPointEdgeCirculator& Foam::patchPointEdgeCirculator::cend()
+ const
+{
+    return endConstIter;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index d2ae5219d3..77932a8cdc 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     /* -g -DFULLDEBUG -O0 */ \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 90f6377b6d..7b3ebac43b 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -569,7 +569,7 @@ int main(int argc, char *argv[])
     dumpCyclicMatch("initial_", mesh);
 
     // Read patch construct info from dictionary
-    PtrList<dictionary> patchSources(dict.lookup("patchInfo"));
+    PtrList<dictionary> patchSources(dict.lookup("patches"));
 
 
 
@@ -614,7 +614,7 @@ int main(int argc, char *argv[])
 
             if (destPatchI == -1)
             {
-                dictionary patchDict(dict.subDict("dictionary"));
+                dictionary patchDict(dict.subDict("patchInfo"));
 
                 destPatchI = allPatches.size();
 
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
index 2d4046d456..10fd55e5a1 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
@@ -48,14 +48,14 @@ matchTolerance 1E-3;
 pointSync true;
 
 // Patches to create.
-patchInfo
+patches
 (
     {
         // Name of new patch
         name sidePatches;
 
         // Type of new patch
-        dictionary
+        patchInfo
         {
             type cyclic;
 
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
index 3b3b8ad48f..b5e293282a 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index b3d98d40ef..69bf75fdde 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -960,7 +960,14 @@ int main(int argc, char *argv[])
 #               endif
             }
 
-            if (rawLine.empty() || rawLine[0] == '#')
+            // Strip off anything after #
+            string::size_type i = rawLine.find_first_of("#");
+            if (i != string::npos)
+            {
+                rawLine = rawLine(0, i);
+            }
+
+            if (rawLine.empty())
             {
                 continue;
             }
diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options
index 58cb426daf..b79ab555e8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/options
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
index d6e68ea880..1521784089 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
@@ -162,15 +162,13 @@ void Foam::domainDecomposition::distributeCells()
         // somewhere in the middle of the domain which might not be anywhere
         // near any of the cells.
 
-        const point greatPoint(GREAT, GREAT, GREAT);
-
-        pointField regionCentres(globalRegion.nRegions(), greatPoint);
+        pointField regionCentres(globalRegion.nRegions(), point::max);
 
         forAll(globalRegion, cellI)
         {
             label regionI = globalRegion[cellI];
 
-            if (regionCentres[regionI] == greatPoint)
+            if (regionCentres[regionI] == point::max)
             {
                 regionCentres[regionI] = cellCentres()[cellI];
             }
diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options
index cfa9eb8dfc..fcfc86483d 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructPar/Make/options
@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/lnInclude
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
index 8f8010fff7..b691383cf6 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index daece0473b..99b51abbb1 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -87,16 +87,26 @@ Foam::ensightMesh::ensightMesh
 
         if (args.optionFound("patches"))
         {
-            wordList patchNameList(args.optionLookup("patches")());
+            wordReList patterns(args.optionLookup("patches")());
 
-            if (patchNameList.empty())
+            if (patterns.empty())
             {
-                patchNameList = allPatchNames_;
+                forAll(allPatchNames_, nameI)
+                {
+                    patchNames_.insert(allPatchNames_[nameI]);
+                }
             }
-
-            forAll(patchNameList, i)
+            else
             {
-                patchNames_.insert(patchNameList[i]);
+                // Find patch names which match that requested at command-line
+                forAll(allPatchNames_, nameI)
+                {
+                    const word& patchName = allPatchNames_[nameI];
+                    if (findStrings(patterns, patchName))
+                    {
+                        patchNames_.insert(patchName);
+                    }
+                }
             }
         }
     }
@@ -247,19 +257,17 @@ Foam::ensightMesh::ensightMesh
     // faceZones
     if (args.optionFound("faceZones"))
     {
-        wordList patchNameList(args.optionLookup("faceZones")());
+        wordReList patterns(args.optionLookup("faceZones")());
 
         const wordList faceZoneNamesAll = mesh_.faceZones().names();
 
-        // Find out faceZone names that match with what requested at command
-        // line
-        forAll(patchNameList, i)
+        // Find faceZone names which match that requested at command-line
+        forAll(faceZoneNamesAll, nameI)
         {
-            labelList matches = findStrings(patchNameList[i], faceZoneNamesAll);
-
-            forAll(matches, matchI)
+            const word& zoneName = faceZoneNamesAll[nameI];
+            if (findStrings(patterns, zoneName))
             {
-                faceZoneNames_.insert(faceZoneNamesAll[matches[matchI]]);
+                faceZoneNames_.insert(zoneName);
             }
         }
 
@@ -353,8 +361,8 @@ Foam::ensightMesh::ensightMesh
                 if
                 (
                     faceZoneFaceSets_[zoneI].tris.size()
-                 || faceZoneFaceSets_[zoneI].quads.size() ||
-                    faceZoneFaceSets_[zoneI].polys.size()
+                 || faceZoneFaceSets_[zoneI].quads.size()
+                 || faceZoneFaceSets_[zoneI].polys.size()
                 )
                 {
                     nfp.nTris   = faceZoneFaceSets_[zoneI].tris.size();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 6d2f56f3b8..fb8e48a67d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,21 +112,21 @@ int main(int argc, char *argv[])
     argList::addOption
     (
         "patches",
-        "wordList",
-        "specify particular patches to write - eg '(inlet outlet)'. "
+        "wordReList",
+        "specify particular patches to write - eg '(outlet \"inlet.*\")'. "
         "An empty list suppresses writing the internalMesh."
     );
     argList::addOption
     (
         "faceZones",
-        "wordList",
-        "specify faceZones to write, with wildcards - eg '(mfp-.*)'. "
+        "wordReList",
+        "specify faceZones to write - eg '( slice \"mfp-.*\" )'."
     );
 
 #   include "setRootCase.H"
 
     // Check options
-    bool binary = !args.optionFound("ascii");
+    const bool binary = !args.optionFound("ascii");
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 6855685414..872f639510 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -159,13 +159,6 @@ Note
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-static const label VTK_TETRA      = 10;
-static const label VTK_PYRAMID    = 14;
-static const label VTK_WEDGE      = 13;
-static const label VTK_HEXAHEDRON = 12;
-
-
 template<class GeoField>
 void print(const char* msg, Ostream& os, const PtrList<GeoField>& flds)
 {
@@ -229,10 +222,7 @@ labelList getSelectedPatches
 }
 
 
-
-
-
-
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
 int main(int argc, char *argv[])
@@ -285,11 +275,11 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    bool doWriteInternal = !args.optionFound("noInternal");
-    bool doFaceZones     = !args.optionFound("noFaceZones");
-    bool doLinks         = !args.optionFound("noLinks");
-    bool binary          = !args.optionFound("ascii");
-    bool useTimeName     = args.optionFound("useTimeName");
+    const bool doWriteInternal = !args.optionFound("noInternal");
+    const bool doFaceZones     = !args.optionFound("noFaceZones");
+    const bool doLinks         = !args.optionFound("noLinks");
+    const bool binary          = !args.optionFound("ascii");
+    const bool useTimeName     = args.optionFound("useTimeName");
 
     if (binary && (sizeof(floatScalar) != 4 || sizeof(label) != 4))
     {
@@ -299,7 +289,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    bool nearCellValue = args.optionFound("nearCellValue");
+    const bool nearCellValue = args.optionFound("nearCellValue");
 
     if (nearCellValue)
     {
@@ -308,7 +298,7 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
-    bool noPointValues = args.optionFound("noPointValues");
+    const bool noPointValues = args.optionFound("noPointValues");
 
     if (noPointValues)
     {
@@ -316,7 +306,7 @@ int main(int argc, char *argv[])
             << "Outputting cell values only" << nl << endl;
     }
 
-    bool allPatches = args.optionFound("allPatches");
+    const bool allPatches = args.optionFound("allPatches");
 
     List<wordRe> excludePatches;
     if (args.optionFound("excludePatches"))
@@ -392,15 +382,8 @@ int main(int argc, char *argv[])
 
         Info<< "Time: " << runTime.timeName() << endl;
 
-        word timeDesc = "";
-        if (useTimeName)
-        {
-            timeDesc = runTime.timeName();
-        }
-        else
-        {
-            timeDesc = name(runTime.timeIndex());
-        }
+        word timeDesc =
+            useTimeName ? runTime.timeName() : Foam::name(runTime.timeIndex());
 
         // Check for new polyMesh/ and update mesh, fvMeshSubset and cell
         // decomposition.
@@ -470,10 +453,7 @@ int main(int argc, char *argv[])
         IOobjectList objects(mesh, runTime.timeName());
 
         HashSet<word> selectedFields;
-        if (args.optionFound("fields"))
-        {
-            args.optionLookup("fields")() >> selectedFields;
-        }
+        args.optionReadIfPresent("fields", selectedFields);
 
         // Construct the vol fields (on the original mesh if subsetted)
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C
index e44dec894c..ac0c7420be 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
index 64c53721c8..0a7446d178 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
index 3a0843771d..5f772eb05d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C
index 7ea7629bd4..75733f3340 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H
index 8c4f23a2e5..292228a98b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriterTemplates.C
index 0407a58841..a08217fbab 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
index b012e4baf6..9b332d8636 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
index 410be952b8..d824fc5e60 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
index 2d1fba9883..ad811071bc 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
index 838d5e2971..100ce05519 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
index ad847dc358..5ef4f6ce8f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
index e5e607d677..bd80793291 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
index d2b1e9f0e3..5070dc3d20 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.C
index d403aca363..42f2335847 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,10 +33,10 @@ Description
 #include "polyMesh.H"
 #include "cellShape.H"
 #include "cellModeller.H"
+#include "Swap.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
 :
     mesh_(mesh),
@@ -61,6 +61,9 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
     // Number of additional cells generated by the decomposition of polyhedra
     label nAddCells = 0;
 
+    // face owner is needed to determine the face orientation
+    const labelList& owner = mesh.faceOwner();
+
     // Scan for cells which need to be decomposed and count additional points
     // and cells
 
@@ -71,7 +74,7 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
         if
         (
             model != hex
-//         && model != wedge            // See above.
+            // && model != wedge    // See above.
          && model != prism
          && model != pyr
          && model != tet
@@ -111,7 +114,7 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
     cellTypes_.setSize(cellShapes.size() + nAddCells);
 
     // Set counters for additional points and additional cells
-    label api = 0, aci = 0;
+    label addPointI = 0, addCellI = 0;
 
     forAll(cellShapes, cellI)
     {
@@ -134,15 +137,13 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
         }
         else if (cellModel == prism)
         {
-            vtkVerts.setSize(6);
-            vtkVerts[0] = cellShape[0];
-            vtkVerts[1] = cellShape[2];
-            vtkVerts[2] = cellShape[1];
-            vtkVerts[3] = cellShape[3];
-            vtkVerts[4] = cellShape[5];
-            vtkVerts[5] = cellShape[4];
+            // VTK has a different node order for VTK_WEDGE
+            // their triangles point outwards!
+            vtkVerts = cellShape;
+
+            Foam::Swap(vtkVerts[1], vtkVerts[2]);
+            Foam::Swap(vtkVerts[4], vtkVerts[5]);
 
-            // VTK calls this a wedge.
             cellTypes_[cellI] = VTK_WEDGE;
         }
         else if (cellModel == tetWedge)
@@ -175,34 +176,28 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
 //        }
         else if (cellModel == hex)
         {
-            vtkVerts.setSize(8);
-            vtkVerts[0] = cellShape[0];
-            vtkVerts[1] = cellShape[1];
-            vtkVerts[2] = cellShape[2];
-            vtkVerts[3] = cellShape[3];
-            vtkVerts[4] = cellShape[4];
-            vtkVerts[5] = cellShape[5];
-            vtkVerts[6] = cellShape[6];
-            vtkVerts[7] = cellShape[7];
+            vtkVerts = cellShape;
 
             cellTypes_[cellI] = VTK_HEXAHEDRON;
         }
         else
         {
             // Polyhedral cell. Decompose into tets + prisms.
-            // (see dxFoamExec/createDxConnections.C)
 
             // Mapping from additional point to cell
-            addPointCellLabels_[api] = cellI;
+            addPointCellLabels_[addPointI] = cellI;
+
+            // The new vertex from the cell-centre
+            const label newVertexLabel = mesh_.nPoints() + addPointI;
 
             // Whether to insert cell in place of original or not.
             bool substituteCell = true;
 
             const labelList& cFaces = mesh_.cells()[cellI];
-
             forAll(cFaces, cFaceI)
             {
                 const face& f = mesh_.faces()[cFaces[cFaceI]];
+                const bool isOwner = (owner[cFaces[cFaceI]] == cellI);
 
                 // Number of triangles and quads in decomposition
                 label nTris = 0;
@@ -216,75 +211,95 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
                 label quadi = 0;
                 f.trianglesQuads(mesh_.points(), trii, quadi, triFcs, quadFcs);
 
-                forAll(quadFcs, quadi)
+                forAll(quadFcs, quadI)
                 {
-                    label thisCellI = -1;
+                    label thisCellI;
 
                     if (substituteCell)
                     {
                         thisCellI = cellI;
-
                         substituteCell = false;
                     }
                     else
                     {
-                        thisCellI = mesh_.nCells() + aci;
-
-                        superCells_[aci] = cellI;
-
-                        aci++;
+                        thisCellI = mesh_.nCells() + addCellI;
+                        superCells_[addCellI++] = cellI;
                     }
 
                     labelList& addVtkVerts = vertLabels_[thisCellI];
 
                     addVtkVerts.setSize(5);
 
-                    const face& quad = quadFcs[quadi];
+                    const face& quad = quadFcs[quadI];
 
-                    addVtkVerts[0] = quad[0];
-                    addVtkVerts[1] = quad[1];
-                    addVtkVerts[2] = quad[2];
-                    addVtkVerts[3] = quad[3];
-                    addVtkVerts[4] = mesh_.nPoints() + api;
+                    // Ensure we have the correct orientation for the
+                    // base of the primitive cell shape.
+                    // If the cell is face owner, the orientation needs to be
+                    // flipped.
+                    // At the moment, VTK doesn't actually seem to care if
+                    // negative cells are defined, but we'll do it anyhow
+                    // (for safety).
+                    if (isOwner)
+                    {
+                        addVtkVerts[0] = quad[3];
+                        addVtkVerts[1] = quad[2];
+                        addVtkVerts[2] = quad[1];
+                        addVtkVerts[3] = quad[0];
+                    }
+                    else
+                    {
+                        addVtkVerts[0] = quad[0];
+                        addVtkVerts[1] = quad[1];
+                        addVtkVerts[2] = quad[2];
+                        addVtkVerts[3] = quad[3];
+                    }
+                    addVtkVerts[4] = newVertexLabel;
 
                     cellTypes_[thisCellI] = VTK_PYRAMID;
                 }
 
-                forAll(triFcs, trii)
+                forAll(triFcs, triI)
                 {
-                    label thisCellI = -1;
+                    label thisCellI;
 
                     if (substituteCell)
                     {
                         thisCellI = cellI;
-
                         substituteCell = false;
                     }
                     else
                     {
-                        thisCellI = mesh_.nCells() + aci;
-
-                        superCells_[aci] = cellI;
-
-                        aci++;
+                        thisCellI = mesh_.nCells() + addCellI;
+                        superCells_[addCellI++] = cellI;
                     }
 
 
                     labelList& addVtkVerts = vertLabels_[thisCellI];
 
-                    const face& tri = triFcs[trii];
+                    const face& tri = triFcs[triI];
 
                     addVtkVerts.setSize(4);
-                    addVtkVerts[0] = tri[0];
-                    addVtkVerts[1] = tri[1];
-                    addVtkVerts[2] = tri[2];
-                    addVtkVerts[3] = mesh_.nPoints() + api;
+
+                    // See note above about the orientation.
+                    if (isOwner)
+                    {
+                        addVtkVerts[0] = tri[2];
+                        addVtkVerts[1] = tri[1];
+                        addVtkVerts[2] = tri[0];
+                    }
+                    else
+                    {
+                        addVtkVerts[0] = tri[0];
+                        addVtkVerts[1] = tri[1];
+                        addVtkVerts[2] = tri[2];
+                    }
+                    addVtkVerts[3] = newVertexLabel;
 
                     cellTypes_[thisCellI] = VTK_TETRA;
                 }
             }
 
-            api++;
+            addPointI++;
         }
     }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.H
index bc11ef4071..8d5c5c66eb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ public:
 
    // Public static data
 
-        // this must be consistent with the enumeration in "vtkCell.H"
+        //- equivalent to enumeration in "vtkCellType.h"
         enum vtkTypes
         {
             VTK_TRIANGLE   = 5,
@@ -88,9 +88,10 @@ public:
             VTK_QUAD       = 9,
 
             VTK_TETRA      = 10,
-            VTK_PYRAMID    = 14,
-            VTK_WEDGE      = 13,
             VTK_HEXAHEDRON = 12,
+            VTK_WEDGE      = 13,
+            VTK_PYRAMID    = 14,
+            VTK_POLYHEDRON = 42
         };
 
     // Constructors
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
index 4d6afaadad..6bc43cbc00 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.H
index 2df3632e67..aa2ef52111 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
index 82a8df0cca..6fc82f6201 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
index c38bbda669..4dff5df591 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
index e9202450bb..ca11a055cf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C
index e420148275..ce4ab7746f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.H
index 9cbae04b6c..058b625e9a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.C
index 904b96c5c6..5310efbb29 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.H
index d464f56c21..b3a366b908 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.C
index ceb4725b78..8c422f56d7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.H
index b496a6ea05..e2dae1c043 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwclean b/applications/utilities/postProcessing/graphics/PV3Readers/Allwclean
new file mode 100755
index 0000000000..b867e563ff
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wclean libso vtkPV3Readers
+PV3blockMeshReader/Allwclean
+PV3FoamReader/Allwclean
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
index 41aa21e674..6e7a78ffe2 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
@@ -91,7 +91,8 @@
       animateable="0">
       <BooleanDomain name="bool"/>
       <Documentation>
-        Use vtkPolyhedron instead of decomposing polyhedra
+        Use vtkPolyhedron instead of decomposing polyhedra.
+        !!Actually uses vtkConvexPointSet until this is properly supported in VTK!!
       </Documentation>
     </IntVectorProperty>
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx
index 7755a75d0f..d05c998aed 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h
index 71f9faafdd..a311cef43f 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
index d58afde30b..48e0c4a9a3 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
@@ -2,12 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(ParaView_DIR)/VTK \
-    -I$(ParaView_INST_DIR) \
-    -I$(ParaView_INST_DIR)/VTK \
-    -I$(ParaView_INST_DIR)/VTK/Common \
-    -I$(ParaView_INST_DIR)/VTK/Filtering \
-    -I$(ParaView_INST_DIR)/VTK/Rendering \
+    -I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) \
     -I../../vtkPV3Readers/lnInclude \
     -I../PV3FoamReader
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
index 8cba50347a..1336da5082 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
@@ -31,6 +31,7 @@ License
 #include "fvMesh.H"
 #include "cellModeller.H"
 #include "vtkOpenFOAMPoints.H"
+#include "Swap.H"
 
 // VTK includes
 #include "vtkCellArray.h"
@@ -45,6 +46,13 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
     polyDecomp& decompInfo
 )
 {
+    const cellModel& tet = *(cellModeller::lookup("tet"));
+    const cellModel& pyr = *(cellModeller::lookup("pyr"));
+    const cellModel& prism = *(cellModeller::lookup("prism"));
+    const cellModel& wedge = *(cellModeller::lookup("wedge"));
+    const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
+    const cellModel& hex = *(cellModeller::lookup("hex"));
+
     vtkUnstructuredGrid* vtkmesh = vtkUnstructuredGrid::New();
 
     if (debug)
@@ -53,36 +61,27 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
         printMemory();
     }
 
+    const cellShapeList& cellShapes = mesh.cellShapes();
+
     // Number of additional points needed by the decomposition of polyhedra
     label nAddPoints = 0;
 
     // Number of additional cells generated by the decomposition of polyhedra
     label nAddCells = 0;
 
+    // face owner is needed to determine the face orientation
+    const labelList& owner = mesh.faceOwner();
+
     labelList& superCells = decompInfo.superCells();
     labelList& addPointCellLabels = decompInfo.addPointCellLabels();
 
-    const cellModel& tet = *(cellModeller::lookup("tet"));
-    const cellModel& pyr = *(cellModeller::lookup("pyr"));
-    const cellModel& prism = *(cellModeller::lookup("prism"));
-    const cellModel& wedge = *(cellModeller::lookup("wedge"));
-    const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
-    const cellModel& hex = *(cellModeller::lookup("hex"));
-
-    // Scan for cells which need to be decomposed and count additional points
-    // and cells
-    if (debug)
-    {
-        Info<< "... building cell-shapes" << endl;
-    }
-    const cellShapeList& cellShapes = mesh.cellShapes();
-
     if (debug)
     {
         Info<< "... scanning" << endl;
     }
 
-    // count number of cells to decompose
+    // Scan for cells which need to be decomposed and count additional points
+    // and cells
     if (!reader_->GetUseVTKPolyhedron())
     {
         forAll(cellShapes, cellI)
@@ -105,10 +104,10 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
                 {
                     const face& f = mesh.faces()[cFaces[cFaceI]];
 
-                    label nFacePoints = f.size();
+                    label nQuads = 0;
+                    label nTris = 0;
+                    f.nTrianglesQuads(mesh.points(), nTris, nQuads);
 
-                    label nQuads = (nFacePoints - 2)/2;
-                    label nTris = (nFacePoints - 2)%2;
                     nAddCells += nQuads + nTris;
                 }
 
@@ -201,8 +200,8 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
         }
         else if (cellModel == prism)
         {
-            // VTK has a different node order - their triangles point outwards!
-
+            // VTK has a different node order for VTK_WEDGE
+            // their triangles point outwards!
             nodeIds[0] = cellShape[0];
             nodeIds[1] = cellShape[2];
             nodeIds[2] = cellShape[1];
@@ -349,29 +348,34 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
             // Mapping from additional point to cell
             addPointCellLabels[addPointI] = cellI;
 
-            // Insert the new vertex from the cell-centre
-            label newVertexLabel = mesh.nPoints() + addPointI;
+            // The new vertex from the cell-centre
+            const label newVertexLabel = mesh.nPoints() + addPointI;
             vtkInsertNextOpenFOAMPoint(vtkpoints, mesh.C()[cellI]);
 
             // Whether to insert cell in place of original or not.
             bool substituteCell = true;
 
             const labelList& cFaces = mesh.cells()[cellI];
-
             forAll(cFaces, cFaceI)
             {
                 const face& f = mesh.faces()[cFaces[cFaceI]];
+                const bool isOwner = (owner[cFaces[cFaceI]] == cellI);
 
-                label nFacePoints = f.size();
+                // Number of triangles and quads in decomposition
+                label nTris = 0;
+                label nQuads = 0;
+                f.nTrianglesQuads(mesh.points(), nTris, nQuads);
 
-                label nQuads = (nFacePoints - 2)/2;
-                label nTris = (nFacePoints - 2)%2;
+                // Do actual decomposition into triFcs and quadFcs.
+                faceList triFcs(nTris);
+                faceList quadFcs(nQuads);
+                label trii = 0;
+                label quadi = 0;
+                f.trianglesQuads(mesh.points(), trii, quadi, triFcs, quadFcs);
 
-                label qpi = 0;
-
-                for (label quadi=0; quadi<nQuads; quadi++)
+                forAll(quadFcs, quadI)
                 {
-                    label thisCellI = -1;
+                    label thisCellI;
 
                     if (substituteCell)
                     {
@@ -384,10 +388,29 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
                         superCells[addCellI++] = cellI;
                     }
 
-                    nodeIds[0] = f[0];
-                    nodeIds[1] = f[qpi + 1];
-                    nodeIds[2] = f[qpi + 2];
-                    nodeIds[3] = f[qpi + 3];
+                    const face& quad = quadFcs[quadI];
+
+                    // Ensure we have the correct orientation for the
+                    // base of the primitive cell shape.
+                    // If the cell is face owner, the orientation needs to be
+                    // flipped.
+                    // At the moment, VTK doesn't actually seem to care if
+                    // negative cells are defined, but we'll do it anyhow
+                    // (for safety).
+                    if (isOwner)
+                    {
+                        nodeIds[0] = quad[3];
+                        nodeIds[1] = quad[2];
+                        nodeIds[2] = quad[1];
+                        nodeIds[3] = quad[0];
+                    }
+                    else
+                    {
+                        nodeIds[0] = quad[0];
+                        nodeIds[1] = quad[1];
+                        nodeIds[2] = quad[2];
+                        nodeIds[3] = quad[3];
+                    }
                     nodeIds[4] = newVertexLabel;
                     vtkmesh->InsertNextCell
                     (
@@ -395,13 +418,11 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
                         5,
                         nodeIds
                     );
-
-                    qpi += 2;
                 }
 
-                if (nTris)
+                forAll(triFcs, triI)
                 {
-                    label thisCellI = -1;
+                    label thisCellI;
 
                     if (substituteCell)
                     {
@@ -414,10 +435,23 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
                         superCells[addCellI++] = cellI;
                     }
 
-                    nodeIds[0] = f[0];
-                    nodeIds[1] = f[qpi + 1];
-                    nodeIds[2] = f[qpi + 2];
+                    const face& tri = triFcs[triI];
+
+                    // See note above about the orientation.
+                    if (isOwner)
+                    {
+                        nodeIds[0] = tri[2];
+                        nodeIds[1] = tri[1];
+                        nodeIds[2] = tri[0];
+                    }
+                    else
+                    {
+                        nodeIds[0] = tri[0];
+                        nodeIds[1] = tri[1];
+                        nodeIds[2] = tri[2];
+                    }
                     nodeIds[3] = newVertexLabel;
+
                     vtkmesh->InsertNextCell
                     (
                         VTK_TETRA,
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
index 5d19916934..6001799a6c 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
@@ -1,12 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-    -I$(ParaView_DIR)/VTK \
-    -I$(ParaView_INST_DIR) \
-    -I$(ParaView_INST_DIR)/VTK \
-    -I$(ParaView_INST_DIR)/VTK/Common \
-    -I$(ParaView_INST_DIR)/VTK/Filtering \
-    -I$(ParaView_INST_DIR)/VTK/Rendering \
+    -I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) \
     -I../../vtkPV3Readers/lnInclude \
     -I../PV3blockMeshReader
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
index 876a3e334e..55e559dd05 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
@@ -1,10 +1,5 @@
 EXE_INC = \
-    -I$(ParaView_DIR)/VTK \
-    -I$(ParaView_INST_DIR) \
-    -I$(ParaView_INST_DIR)/VTK \
-    -I$(ParaView_INST_DIR)/VTK/Common \
-    -I$(ParaView_INST_DIR)/VTK/Filtering \
-    -I$(ParaView_INST_DIR)/VTK/Rendering
+    -I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
 
 LIB_LIBS = \
     $(GLIBS)
diff --git a/bin/doxyFilt b/bin/doxyFilt
index 40d4fadd11..7bbb5a4ba8 100755
--- a/bin/doxyFilt
+++ b/bin/doxyFilt
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/engridFoam b/bin/engridFoam
index b017d23cb6..b5f8e19242 100755
--- a/bin/engridFoam
+++ b/bin/engridFoam
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -38,7 +38,7 @@ Usage: ${0##*/} [OPTION]
 options:
   -help
 
-* start engrid using the paraview-$ParaView_VERSION libraries
+* start engrid using the paraview-$ParaView_MAJOR libraries
   passes through engrid options unmodified
 
 USAGE
@@ -48,13 +48,8 @@ USAGE
 # report usage
 [ "$1" = "-h" -o "$1" = "-help" ] && usage
 
-# set the major version "<digits>.<digits>"
-ParaView_MAJOR_VERSION=$(echo $ParaView_VERSION | \
-    sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
-
-
-bindir=$WM_THIRD_PARTY_DIR/engrid/platforms/$WM_ARCH
-libdir="$ParaView_DIR/lib/paraview-$ParaView_MAJOR_VERSION"
+bindir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/engrid
+libdir="$ParaView_DIR/lib/paraview-${ParaView_MAJOR:-unknown}"
 
 [ -x $bindir/engrid ] || usage "engrid executable not found in $bindir"
 [ -d $libdir ] || usage "paraview libraries not found"
diff --git a/bin/foamAllHC b/bin/foamAllHC
index 3d68b5467b..bf90df16bd 100755
--- a/bin/foamAllHC
+++ b/bin/foamAllHC
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamCheckJobs b/bin/foamCheckJobs
index 8812c96466..c26befc4c0 100755
--- a/bin/foamCheckJobs
+++ b/bin/foamCheckJobs
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamCleanPath b/bin/foamCleanPath
index fcb5b7068c..0ef171e455 100755
--- a/bin/foamCleanPath
+++ b/bin/foamCleanPath
@@ -41,7 +41,11 @@
 #------------------------------------------------------------------------------
 usage() {
     cat <<USAGE 1>&2
-Usage: ${0##*/} [-strip] path [wildcard] .. [wildcard]
+Usage: ${0##*/} [OPTION] path [wildcard1] .. [wildcardN]
+options:
+  -space            treat 'path' as space-delimited (eg, from C-Shell)
+  -strip            remove inaccessible directories
+  -help             print the usage
 
   Prints its argument (which should be a ':' separated list) cleansed from
     - duplicate elements
@@ -53,7 +57,7 @@ USAGE
 }
 
 
-unset strip
+unset space strip
 # parse options
 while [ "$#" -gt 0 ]
 do
@@ -61,6 +65,10 @@ do
     -h | -help)
         usage
         ;;
+    -space)
+        space=true
+        shift
+        ;;
     -strip)
         strip=true
         shift
@@ -74,7 +82,12 @@ done
 
 [ "$#" -ge 1 ] || usage
 
-dirList="$1"
+if [ "$space" = true ]
+then
+    dirList=$(echo "$1" | sed -e 's/ /:/g')
+else
+    dirList="$1"
+fi
 shift
 
 ##DEBUG echo "input>$dirList<" 1>&2
@@ -123,12 +136,15 @@ do
     fi
 done
 
-# parse on whitespace
+# split on whitespace
 IFS=' '
 set -- $dirList
 
-# join on ':'
-IFS=':'
+# join on ':', unless -space option was specified
+if [ "$space" != true ]
+then
+    IFS=':'
+fi
 dirList="$*"
 
 # restore IFS
diff --git a/bin/foamCleanTutorials b/bin/foamCleanTutorials
index ccc9f320b0..a837be6986 100755
--- a/bin/foamCleanTutorials
+++ b/bin/foamCleanTutorials
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -27,8 +27,8 @@
 #     foamCleanTutorials
 #
 # Description
-#       Run either Allclean or default cleanCase in current directory
-#       and all its subdirectories.
+#     Run either Allwclean, Allclean or default cleanCase in current directory
+#     and all its subdirectories.
 #
 #------------------------------------------------------------------------------
 
@@ -41,24 +41,29 @@ then
     thisScript="$PWD/$thisScript"
 fi
 
-# If an argument is supplied do not execute ./Allclean to avoid recursion
-if [ $# = 0 -a -f Allclean ]
+# If an argument is supplied do not execute ./Allwclean or ./Allclean
+# (to avoid recursion)
+if [ $# -eq 0 -a -f Allwclean ]
 then
-    # Specialised script.
+    # Specialized script
+    ./Allwclean
+elif [ $# -eq 0 -a -f Allclean ]
+then
+    # Specialized script
     ./Allclean
 elif [ -d system ]
 then
-    # Normal case.
+    # Normal case
     cleanCase
 elif [ -d Make ]
 then
-    # Normal application.
+    # Normal application
     cleanApplication
 else
-    # Recurse to subdirectories
-    for caseDir in *
+    # Recurse into subdirectories
+    for caseName in *
     do
-        ( cd $caseDir 2>/dev/null && $thisScript )
+        ( cd $caseName 2>/dev/null && $thisScript )
     done
 fi
 
diff --git a/bin/foamCopySettings b/bin/foamCopySettings
index 1a41a3a59f..9c22cb13d3 100755
--- a/bin/foamCopySettings
+++ b/bin/foamCopySettings
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamDistccd b/bin/foamDistccd
index 2a450a2b17..94a42f6637 100755
--- a/bin/foamDistccd
+++ b/bin/foamDistccd
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -34,31 +34,31 @@
 #
 #------------------------------------------------------------------------------
 
-printUsage()
+usage()
 {
-    echo "Usage : `basename $0` start|stop|list"
+    echo "Usage : ${0##*/} start|stop|list"
     echo ""
+    exit 1
 }
 
 RSH='ssh'
 
-if [ ! "$DISTCC_HOSTS" ]; then
-    echo "`basename $0`: variable DISTCC_HOSTS not set."
-    echo "`basename $0`: please set DISTCC_HOSTS to the list of hosts to use."
-    echo "`basename $0`: the format is host1:port host2:port host3:port etc."
-    echo ""
+if [ ! "$DISTCC_HOSTS" ]
+then
+    echo "${0##*/} Warnings"
+    echo "    variable DISTCC_HOSTS not set."
+    echo "    please set DISTCC_HOSTS to the list of hosts to use."
+    echo "    the format is host1:port host2:port host3:port etc."
+    echo
 
     exit 1
 fi
 
-if [ $# -ne 1 ]; then
-    printUsage
-    exit 1
-fi
+[ $# -eq 1 ] || usage
 
 
-if [ "$1" = 'start' ]; then
-
+case "$1" in
+start)
     grep -v '^#' /etc/hosts | awk '{print $1, $2 " "}' > ~/filteredHosts.txt
 
     allowIPS=''
@@ -66,7 +66,8 @@ if [ "$1" = 'start' ]; then
     do
         machine=`echo "$host" | awk -F: '{print $1}'`
         iptest=`echo "$machine" | sed -e 's/[0-9.]//g'`
-        if [ ! "$iptest" ]; then
+        if [ ! "$iptest" ]
+        then
             # address only contained 0-9 and '.'. Probably ip address.
             ip=$machine
         else
@@ -74,7 +75,8 @@ if [ "$1" = 'start' ]; then
             ip=`egrep " $machine " ~/filteredHosts.txt | awk '{print $1}'`
         fi
 
-        if [ ! "$ip" ]; then
+        if [ ! "$ip" ]
+        then
             echo "$0 : host specifier $host either is not an ip address or cannot be found in /etc/hosts."
             echo "$0 : Exiting."
             exit 1
@@ -92,7 +94,8 @@ if [ "$1" = 'start' ]; then
         machine=`echo "$host" | awk -F: '{print $1}'`
         port=`echo "$host" | awk -F: '{print $2}'`
 
-        if [ "$machine" -a "$port" ]; then
+        if [ "$machine" -a "$port" ]
+        then
             #echo "Machine:$machine  port:$port"
             echo "distccd --daemon $allowIPS --port $port"' --jobs `egrep "^processor" /proc/cpuinfo | wc -l`'
             $RSH $machine "distccd --verbose --daemon $allowIPS --port $port"' --jobs `egrep "^processor" /proc/cpuinfo | wc -l`'
@@ -102,9 +105,9 @@ if [ "$1" = 'start' ]; then
             exit 1
         fi
     done
+    ;;
 
-elif [ "$1" = 'stop' ]; then
-
+stop)
     for host in $DISTCC_HOSTS
     do
         echo ""
@@ -114,10 +117,9 @@ elif [ "$1" = 'stop' ]; then
 
         $RSH $machine killall distccd
     done
+    ;;
 
-
-elif [ "$1" = 'list' ]; then
-
+list)
     for host in $DISTCC_HOSTS
     do
         echo ""
@@ -127,12 +129,11 @@ elif [ "$1" = 'list' ]; then
 
         $RSH $machine "ps -ef | grep distccd | grep -v grep"
     done
+    ;;
 
-else
-
-    printUsage
-    exit 1
-
-fi
+*)
+    usage
+    ;;
+esac
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamEbrowse b/bin/foamEbrowse
index 365d0fa605..9e1cac5827 100755
--- a/bin/foamEbrowse
+++ b/bin/foamEbrowse
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -32,12 +32,13 @@
 #------------------------------------------------------------------------------
 sourcesFile=${TMPDIR:-/tmp}/sourcesFile.$$
 
-if [ $# -ne 0 ]; then
-   echo "Usage : ${0##*/}"
-   echo ""
-   echo "Build the Ebrowse dadbase for all the .H and .C files"
-   echo ""
-   exit 1
+if [ $# -ne 0 ]
+then
+    echo "Usage : ${0##*/}"
+    echo ""
+    echo "Build the Ebrowse database for all the .H and .C files"
+    echo ""
+    exit 1
 fi
 
 # Clean up on termination and on Ctrl-C
diff --git a/bin/foamEndJob b/bin/foamEndJob
index 1964d86100..f82f7409ce 100755
--- a/bin/foamEndJob
+++ b/bin/foamEndJob
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamGraphExecTime b/bin/foamGraphExecTime
index 3dc2fa2c70..82671151ac 100755
--- a/bin/foamGraphExecTime
+++ b/bin/foamGraphExecTime
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamGraphResKE b/bin/foamGraphResKE
index d00798f507..22254fc243 100755
--- a/bin/foamGraphResKE
+++ b/bin/foamGraphResKE
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamGraphResUVWP b/bin/foamGraphResUVWP
index 1b34258fcf..3d9433e17e 100755
--- a/bin/foamGraphResUVWP
+++ b/bin/foamGraphResUVWP
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index eacda19cce..708c638410 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamLog b/bin/foamLog
index 06b2a2c5dc..d33d8e317f 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamNew b/bin/foamNew
index fde1aa1979..a1d66f225e 100755
--- a/bin/foamNew
+++ b/bin/foamNew
@@ -27,7 +27,7 @@
 #     foamNew
 #
 # Description
-#     Create a new standard OpenFOAM source file
+#     Create a new standard OpenFOAM source or template file
 #
 #------------------------------------------------------------------------------
 usage() {
@@ -50,11 +50,11 @@ USAGE
 case "$1" in
 source)
     shift
-    $WM_PROJECT_DIR/bin/templates/source/foamNewSource $*
+    $WM_PROJECT_DIR/etc/codeTemplates/source/foamNewSource $*
     ;;
 template)
     shift
-    $WM_PROJECT_DIR/bin/templates/sourceTemplate/foamNewTemplate $*
+    $WM_PROJECT_DIR/etc/codeTemplates/template/foamNewTemplate $*
     ;;
 *)
     usage "unknown type"
diff --git a/bin/foamNewCase b/bin/foamNewCase
new file mode 100755
index 0000000000..c67511631d
--- /dev/null
+++ b/bin/foamNewCase
@@ -0,0 +1,224 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     foamNewCase
+#
+# Description
+#     Create a new case from a template for particular applications
+#     - requires rsync
+#
+#------------------------------------------------------------------------------
+siteDir=${WM_PROJECT_INST_DIR:-unknown}/site
+userDir=$HOME/.OpenFOAM
+version=${WM_PROJECT_VERSION:-unknown}
+templateDir="appTemplates"
+
+#------------------------------------------------------------------------------
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+Usage: ${0##*/} [OPTION]
+options:
+  -app <name>       specify the application to use
+  -case <dir>       specify alternative case directory, default is the cwd
+  -list             list the applications available
+  -version <ver>    specify an alternative version (default: '$WM_PROJECT_VERSION')
+
+clone initial application settings to the specified case from
+    $userDir/$templateDir/{$version,}/<APP>
+    $siteDir/$templateDir/{$version,}/<APP>
+
+USAGE
+    exit 1
+}
+#------------------------------------------------------------------------------
+
+unset appName caseName listOpt
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -app)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        appName="$2"
+        shift 2
+        ;;
+    -case)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        caseName="$2"
+        shift 2
+        ;;
+    -l | -list)
+        listOpt=true
+        shift
+        ;;
+    -v | -ver | -version)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        version="$2"
+        shift 2
+        ;;
+    *)
+        usage "unknown option/argument: '$*'"
+        ;;
+    esac
+done
+
+#------------------------------------------------------------------------------
+
+[ -n "$version" ] || {
+    echo "Error: no -version specified and \$WM_PROJECT_VERSION is not set"
+    exit 1
+}
+
+#
+# find apps in current directory
+# considered an app if it has constant/ and system/ directories
+#
+findApps()
+{
+    for app in $(/bin/ls -d * 2>/dev/null)
+    do
+        [ -d "$app/constant" -a -d "$app/system" ] && echo $app
+    done
+}
+
+
+appList=$(
+    for dir in $userDir/$templateDir $siteDir/$templateDir
+    do
+        if cd $dir 2>/dev/null
+        then
+            findApps                              ## generic
+            cd $version 2>/dev/null && findApps   ## version-specific
+        fi
+    done | sort | uniq
+)
+
+
+listApps()
+{
+    echo
+    echo "applications available:"
+    for i in $appList
+    do
+        echo "    $i"
+    done
+    echo
+}
+
+
+if [ "$listOpt" = true ]
+then
+    listApps
+    exit 0
+elif [ "$(echo $appList | wc -w)" -eq 0 ]
+then
+    echo "Error: no applications available"
+    exit 1
+elif [ -z "$appName" ]
+then
+    echo "Error: no -app specified"
+    listApps
+    exit 1
+fi
+
+
+# get the corresponding srcDir name
+srcDir=$(
+    for dir in $userDir/$templateDir $siteDir/$templateDir
+    do
+        if [ -d $dir ]
+        then
+            for appDir in $dir/$version/$appName $dir/$appName
+            do
+                if [ -d $appDir -a -d $appDir/constant -a -d $appDir/system ]
+                then
+                    echo "$appDir"
+                    break 2
+                fi
+            done
+        fi
+    done
+)
+
+
+[ -d "$srcDir" ] || {
+    echo "Error: could not find template for $appName"
+    listApps
+    exit 1
+}
+
+
+# adjust for caseName as required
+if [ -n "$caseName" ]
+then
+    [ -d "$caseName" ] || mkdir -p "$caseName"
+    cd "$caseName" 2>/dev/null || usage "directory does not exist:  '$caseName'"
+fi
+newDir=$PWD
+
+
+[ -d "$newDir" -a -w "$newDir" ] || {
+    echo "Error: target directory does not exist or is unwritable"
+    echo "    $newDir"
+    exit 1
+}
+
+# add some useful subdirs:
+mkdir -p $newDir/postPro
+
+
+echo "    application   $appName"
+echo "    source        $srcDir"
+echo "    target        $newDir"
+
+echo "    syncing ..."
+# sync updated files only, itemize changes so we know what is going on
+rsync -aui $srcDir/ $newDir
+
+
+#
+# reuse or create new FOAM_SETTINGS (useful for queuing systems)
+#
+if [ -e "$newDir/FOAM_SETTINGS" ]
+then
+    echo "    retaining     FOAM_SETTINGS"
+else
+    echo "    creating      FOAM_SETTINGS"
+    cat << SETTINGS > "$newDir/FOAM_SETTINGS"
+APPLICATION=$appName
+FOAM_VERSION=OpenFOAM-$version
+SETTINGS
+fi
+
+echo Done
+
+#------------------------------------------------------------------------------
diff --git a/bin/foamNewSource b/bin/foamNewSource
index 1195efa3f3..f0c46dbdcb 120000
--- a/bin/foamNewSource
+++ b/bin/foamNewSource
@@ -1 +1 @@
-templates/source/foamNewSource
\ No newline at end of file
+../etc/codeTemplates/source/foamNewSource
\ No newline at end of file
diff --git a/bin/foamNewTemplate b/bin/foamNewTemplate
index daefeb4929..1dabe11204 120000
--- a/bin/foamNewTemplate
+++ b/bin/foamNewTemplate
@@ -1 +1 @@
-templates/sourceTemplate/foamNewTemplate
\ No newline at end of file
+../etc/codeTemplates/template/foamNewTemplate
\ No newline at end of file
diff --git a/bin/foamPack b/bin/foamPack
index a719f9e23e..26b356b949 100755
--- a/bin/foamPack
+++ b/bin/foamPack
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackBin b/bin/foamPackBin
index 00d60ba5f0..5d8e4a0f24 100755
--- a/bin/foamPackBin
+++ b/bin/foamPackBin
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackBinAll b/bin/foamPackBinAll
index 57673e9803..196d91d0f9 100755
--- a/bin/foamPackBinAll
+++ b/bin/foamPackBinAll
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackDoxygen b/bin/foamPackDoxygen
index 4503470846..9da368b36f 100755
--- a/bin/foamPackDoxygen
+++ b/bin/foamPackDoxygen
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackGeneral b/bin/foamPackGeneral
index e55d834bce..8aa109c15e 100755
--- a/bin/foamPackGeneral
+++ b/bin/foamPackGeneral
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackSource b/bin/foamPackSource
index dbb1860bca..6b474f4e7c 100755
--- a/bin/foamPackSource
+++ b/bin/foamPackSource
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackThirdPartyBin b/bin/foamPackThirdPartyBin
index b9363f6874..12271682e5 100755
--- a/bin/foamPackThirdPartyBin
+++ b/bin/foamPackThirdPartyBin
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPackThirdPartyGeneral b/bin/foamPackThirdPartyGeneral
index a690f7f448..fdc54272f7 100755
--- a/bin/foamPackThirdPartyGeneral
+++ b/bin/foamPackThirdPartyGeneral
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamPrintJobs b/bin/foamPrintJobs
index a2851f2902..57d6ebd5d9 100755
--- a/bin/foamPrintJobs
+++ b/bin/foamPrintJobs
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamProcessInfo b/bin/foamProcessInfo
index dc8a9e650c..7a3577c275 100755
--- a/bin/foamProcessInfo
+++ b/bin/foamProcessInfo
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index 210b1bcc60..7c52b6b9e1 100755
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/bin/foamSolverSweeps b/bin/foamSolverSweeps
index 61f34279c4..29df1dabe4 100755
--- a/bin/foamSolverSweeps
+++ b/bin/foamSolverSweeps
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamSystemCheck b/bin/foamSystemCheck
index 63f0f51e16..0d739d64fa 100755
--- a/bin/foamSystemCheck
+++ b/bin/foamSystemCheck
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/foamTags b/bin/foamTags
index 9c173497f6..18ad697768 100755
--- a/bin/foamTags
+++ b/bin/foamTags
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index a62aa93876..6869e64e30 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rmclassall b/bin/rmclassall
index c4fcc786a7..3edbd1e1b0 100755
--- a/bin/rmclassall
+++ b/bin/rmclassall
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rmcore b/bin/rmcore
index 1ec818057d..24e630dac4 100755
--- a/bin/rmcore
+++ b/bin/rmcore
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rmdepold b/bin/rmdepold
index c633ce04c3..d0aceceae2 100755
--- a/bin/rmdepold
+++ b/bin/rmdepold
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rmoall b/bin/rmoall
index 0cc46f4a94..3221d680cf 100755
--- a/bin/rmoall
+++ b/bin/rmoall
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/rm~all b/bin/rm~all
index df03c3af58..afc658b76b 100755
--- a/bin/rm~all
+++ b/bin/rm~all
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 5e0ea64c5e..096774bc72 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -29,13 +29,14 @@
 #
 #------------------------------------------------------------------------------
 
-#cleanTimeDirectories ()
+#cleanTimeDirectories()
 #{
 #    echo "Cleaning $case case of $application application"
 #    TIME_DIRS=`foamInfoExec . $1 -times | sed '1,/constant/d'`
 #    for T in $TIME_DIRS
 #    do
-#        if [ $T != "0" ] ; then
+#        if [ $T != "0" ]
+#        then
 #            echo "Deleting directory $T"
 #            rm -rf ${T} > /dev/null 2>&1
 #        fi
@@ -43,12 +44,13 @@
 #    rm -rf {log,log.*,log-*,logSummary.*,.fxLock,*.xml,ParaView*,paraFoam*,*.OpenFOAM} > /dev/null 2>&1
 #}
 
-cleanTimeDirectories ()
+cleanTimeDirectories()
 {
     echo "Cleaning $PWD case"
     nZeros=0
     zeros=""
-    while [ $nZeros -lt 8 ] ; do
+    while [ $nZeros -lt 8 ]
+    do
         timeDir="0.${zeros}[1-9]*"
         rm -rf ${timeDir} > /dev/null 2>&1
         rm -rf ./-${timeDir} > /dev/null 2>&1
@@ -58,7 +60,7 @@ cleanTimeDirectories ()
     rm -rf ./{[1-9]*,-[1-9]*,log,log.*,log-*,logSummary.*,.fxLock,*.xml,ParaView*,paraFoam*,*.OpenFOAM} > /dev/null 2>&1
 }
 
-cleanCase ()
+cleanCase()
 {
     cleanTimeDirectories
     rm -rf processor* > /dev/null 2>&1
@@ -82,23 +84,23 @@ cleanCase ()
     done
 }
 
-removeCase ()
+removeCase()
 {
     echo "Removing $case case"
     rm -rf $1
 }
 
-cleanSamples ()
+cleanSamples()
 {
     rm -rf {sets,samples,sampleSurfaces} > /dev/null 2>&1
 }
 
-cleanUcomponents ()
+cleanUcomponents()
 {
     rm -rf 0/{Ux,Uy,Uz} > /dev/null 2>&1
 }
 
-cleanApplication ()
+cleanApplication()
 {
     echo "Cleaning $PWD application"
     wclean
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index e2c335b05b..800c48e4f2 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -29,17 +29,19 @@
 #
 #------------------------------------------------------------------------------
 
-getApplication ()
+getApplication()
 {
     grep application system/controlDict | sed "s/application *\([a-zA-Z]*\);/\1/"
 }
 
-runApplication ()
+runApplication()
 {
-    APP_RUN=$1; shift
+    APP_RUN=$1
+    shift
     APP_NAME=${APP_RUN##*/}
 
-    if [ -f log.$APP_NAME ] ; then
+    if [ -f log.$APP_NAME ]
+    then
         echo "$APP_NAME already run on $PWD: remove log file to run"
     else
         echo "Running $APP_RUN on $PWD"
@@ -47,11 +49,13 @@ runApplication ()
     fi
 }
 
-runParallel ()
+runParallel()
 {
-    APP_RUN=$1; shift
+    APP_RUN=$1
+    shift
 
-    if [ -f $log.$APP_RUN ] ; then
+    if [ -f $log.$APP_RUN ]
+    then
         echo "$APP_RUN already run on $PWD: remove log file to run"
     else
         echo "Running $APP_RUN in parallel on $PWD using $1 processes"
@@ -59,15 +63,16 @@ runParallel ()
     fi
 }
 
-compileApplication ()
+compileApplication()
 {
     echo "Compiling $1 application"
     wmake $1
 }
 
-cloneCase ()
+cloneCase()
 {
-    if [ -d $2 ] ; then
+    if [ -d $2 ]
+    then
         echo "Case already cloned: remove case directory $2 to clone"
     else
         echo "Cloning $2 case from $1"
diff --git a/bin/tools/doxyFilt-ignore.awk b/bin/tools/doxyFilt-ignore.awk
index eda0dc7160..50de7e6742 100644
--- a/bin/tools/doxyFilt-ignore.awk
+++ b/bin/tools/doxyFilt-ignore.awk
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 # -----------------------------------------------------------------------------
 # License
diff --git a/bin/tools/doxyFilt-top.awk b/bin/tools/doxyFilt-top.awk
index 06a5d2ac85..9cb87afd70 100644
--- a/bin/tools/doxyFilt-top.awk
+++ b/bin/tools/doxyFilt-top.awk
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/bin/tools/doxyFilt.awk b/bin/tools/doxyFilt.awk
index a7751f9fb9..8562ee08bd 100644
--- a/bin/tools/doxyFilt.awk
+++ b/bin/tools/doxyFilt.awk
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 # -----------------------------------------------------------------------------
 # License
diff --git a/bin/tools/gtagsrc b/bin/tools/gtagsrc
index ce66e0c084..a5564c6ffd 100644
--- a/bin/tools/gtagsrc
+++ b/bin/tools/gtagsrc
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/tools/inlineReplace b/bin/tools/inlineReplace
index 310787935a..4e502bccb2 100755
--- a/bin/tools/inlineReplace
+++ b/bin/tools/inlineReplace
@@ -2,8 +2,9 @@
 
 # $0 string1 string2 file1 .. filen
 #
-if [ $# -lt 3 ]; then
-    echo "Usage: `basename $0` [-f] <string1> <string2> <file1> .. <filen>"
+if [ $# -lt 3 ]
+then
+    echo "Usage: ${0##*/} [-f] <string1> <string2> <file1> .. <filen>"
     echo ""
     echo "Replaces all occurrences of string1 by string2 in files."
     echo "(replacement of sed -i on those systems that don't support it)"
@@ -26,3 +27,5 @@ do
     #    echo "String $FROMSTRING not present in $f"
     #fi
 done
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/replaceAllShellSun b/bin/tools/replaceAllShellSun
index 6c9fc5b70a..d5a0d8db99 100755
--- a/bin/tools/replaceAllShellSun
+++ b/bin/tools/replaceAllShellSun
@@ -1,8 +1,9 @@
 #!/usr/xpg4/bin/sh
 
 # Replace all shell script headers with 
-if [ $# -ne 1 -o ! -d "$1" ]; then
-    echo "Usage: `basename $0` <dir>"
+if [ $# -ne 1 -o ! -d "$1" ]
+then
+    echo "Usage: ${0##*/} <dir>"
     echo ""
     echo "Replaces all occurrences of #!/bin/sh with #!/usr/xpg4/bin/sh inside a directory tree."
     exit 1
@@ -13,3 +14,4 @@ fi
 
 find $1 -exec $WM_PROJECT_DIR/bin/tools/inlineReplace '^#\!/bin/sh' '#\!/usr/xpg4/bin/sh' {} \; -print
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/bin/touchapp b/bin/touchapp
index a753357566..79ff05885e 100755
--- a/bin/touchapp
+++ b/bin/touchapp
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/touchdep b/bin/touchdep
index 56afff2456..9db4c9f015 100755
--- a/bin/touchdep
+++ b/bin/touchdep
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/touchlib b/bin/touchlib
index 589084d2f1..c98f9afbb0 100755
--- a/bin/touchlib
+++ b/bin/touchlib
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/bin/toucho b/bin/toucho
index 82ef064ac3..feeb4b0cb8 100755
--- a/bin/toucho
+++ b/bin/toucho
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
diff --git a/etc/aliases.csh b/etc/aliases.csh
index 892bfbaabd..892ffc5211 100644
--- a/etc/aliases.csh
+++ b/etc/aliases.csh
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     aliases.csh
 #
 # Description
@@ -44,6 +44,11 @@ alias wmDP 'setenv WM_PRECISION_OPTION DP; source $WM_PROJECT_DIR/etc/cshrc'
 alias wmSchedON 'setenv WM_SCHEDULER $WM_PROJECT_DIR/wmake/wmakeScheduler'
 alias wmSchedOFF 'unsetenv WM_SCHEDULER'
 
+# Change paraview version
+# ~~~~~~~~~~~~~~~~~~~~~~~
+alias foamPV 'setenv ParaView_VERSION \!*; source $WM_PROJECT_DIR/etc/apps/paraview3/cshrc; echo paraview-$ParaView_VERSION'
+
+
 # Change directory aliases
 # ~~~~~~~~~~~~~~~~~~~~~~~~
 alias src 'cd $FOAM_SRC'
diff --git a/etc/aliases.sh b/etc/aliases.sh
index 9135fcad0f..0907e8a9c8 100644
--- a/etc/aliases.sh
+++ b/etc/aliases.sh
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     aliases.sh
 #
 # Description
@@ -44,6 +44,19 @@ alias wmDP='export WM_PRECISION_OPTION=DP; . $WM_PROJECT_DIR/etc/bashrc'
 alias wmSchedON='export WM_SCHEDULER=$WM_PROJECT_DIR/wmake/wmakeScheduler'
 alias wmSchedOFF='unset WM_SCHEDULER'
 
+# Change paraview version
+# ~~~~~~~~~~~~~~~~~~~~~~~
+unset foamPV
+foamPV()
+{
+    export ParaView_VERSION=$1
+    . $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
+    echo "paraview-$ParaView_VERSION  (major: $ParaView_MAJOR)"
+    echo "dir: $ParaView_DIR"
+    [ -d "$ParaView_DIR" ] || echo "WARNING: directory does not exist"
+}
+
+
 # Change directory aliases
 # ~~~~~~~~~~~~~~~~~~~~~~~~
 alias src='cd $FOAM_SRC'
diff --git a/etc/apps/ensight/bashrc b/etc/apps/ensight/bashrc
index f47c0f6ca3..8eec1cddc2 100644
--- a/etc/apps/ensight/bashrc
+++ b/etc/apps/ensight/bashrc
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     ensight/bashrc
 #
 # Description
diff --git a/etc/apps/ensight/cshrc b/etc/apps/ensight/cshrc
index 0126a8ea50..7367af5083 100644
--- a/etc/apps/ensight/cshrc
+++ b/etc/apps/ensight/cshrc
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     ensight/cshrc
 #
 # Description
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index 24bfa9887d..be74f7cb8f 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -22,22 +22,26 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     paraview3/bashrc
 #
 # Description
 #     Setup file for paraview-3.x
-#     Sourced from OpenFOAM-*/etc/bashrc
+#     Sourced from OpenFOAM-*/etc/bashrc or from foamPV alias
 #
 # Note
-#     The env. variable 'ParaView_DIR' is required for building plugins
+#     The env. variables 'ParaView_DIR' and 'ParaView_MAJOR'
+#     are required for building plugins
 #------------------------------------------------------------------------------
 
+# clean the PATH
+cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"` && PATH="$cleaned"
+
 # determine the cmake to be used
 unset CMAKE_HOME
-for cmake in cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
+for cmake in cmake-2.8.1 cmake-2.8.0 cmake-2.6.4
 do
-    cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
+    cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
     if [ -r $cmake ]
     then
         export CMAKE_HOME=$cmake
@@ -48,31 +52,47 @@ done
 
 
 # set VERSION and MAJOR (version) variables if not already set
-# the major version is "<digits>.<digits>"
-[ -z "$ParaView_VERSION" ] && export ParaView_VERSION=3.6.1
-[ -z "$ParaView_MAJOR" ]   && export ParaView_MAJOR=3.6
+[ -n "$ParaView_VERSION" ] || ParaView_VERSION=3.6.1
+[ -n "$ParaView_MAJOR" ]   || ParaView_MAJOR=unknown
 
+# if needed, set MAJOR version to correspond to VERSION
+# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
+case "$ParaView_VERSION" in
+"$ParaView_MAJOR".* )
+    # version and major appear to correspond
+    ;;
 
-export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
-export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
+[0-9]*)
+    # extract major from the version
+    ParaView_MAJOR=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
+    ;;
+esac
+export ParaView_VERSION ParaView_MAJOR
 
-# add in python libraries if required
-ParaView_PYTHON_DIR=$ParaView_DIR/Utilities/VTKPythonWrapping
-if [ -r $ParaView_PYTHON_DIR ]
-then
-    if [ "$PYTHONPATH" ]
-    then
-        export PYTHONPATH=$PYTHONPATH:$ParaView_PYTHON_DIR:$ParaView_DIR/lib/paraview-$ParaView_MAJOR
-    else
-        export PYTHONPATH=$ParaView_PYTHON_DIR:$ParaView_DIR/lib/paraview-$ParaView_MAJOR
-    fi
-fi
+paraviewInstDir=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
+export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-$ParaView_VERSION
 
-if [ -r $ParaView_DIR ]
+# set paths if binaries or source are present
+if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
 then
     export PATH=$ParaView_DIR/bin:$PATH
-    export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview
+    export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR
+
+    # add in python libraries if required
+    paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
+    if [ -r $paraviewPython ]
+    then
+        if [ "$PYTHONPATH" ]
+        then
+            export PYTHONPATH=$PYTHONPATH:$paraviewPython:$ParaView_DIR/lib/paraview-$ParaView_MAJOR
+        else
+            export PYTHONPATH=$paraviewPython:$ParaView_DIR/lib/paraview-$ParaView_MAJOR
+        fi
+    fi
+else
+    unset PV_PLUGIN_PATH
 fi
 
-unset cmake ParaView_PYTHON_DIR
+
+unset cleaned cmake paraviewInstDir paraviewPython
 # -----------------------------------------------------------------------------
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index 2cbfa0e281..4b7f470028 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -22,21 +22,26 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     paraview3/cshrc
 #
 # Description
 #     Setup file for paraview-3.x
-#     Sourced from OpenFOAM-*/etc/cshrc
+#     Sourced from OpenFOAM-*/etc/cshrc or from foamPV alias
 #
 # Note
-#     The env. variable 'ParaView_DIR' is required for building plugins
+#     The env. variables 'ParaView_DIR' and 'ParaView_MAJOR'
+#     are required for building plugins
 #------------------------------------------------------------------------------
 
+# clean the PATH
+set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath -space "$path" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"`
+if ( $status == 0 ) set path=($cleaned)
+
 # determine the cmake to be used
 unsetenv CMAKE_HOME
-foreach cmake ( cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
-    set cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
+foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
+    set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
     if ( -r $cmake ) then
         setenv CMAKE_HOME $cmake
         set path=($CMAKE_HOME/bin $path)
@@ -45,27 +50,45 @@ foreach cmake ( cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
 end
 
 # set VERSION and MAJOR (version) variables if not already set
-# the major version is "<digits>.<digits>"
-if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1
-if ( ! $?ParaView_MAJOR )   setenv ParaView_MAJOR 3.6
+if ( ! $?ParaView_VERSION || "x$ParaView_VERSION" == "x" ) setenv ParaView_VERSION 3.6.1
+if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
 
-setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
-setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
+# if needed, set MAJOR version to correspond to VERSION
+# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
+switch ("$ParaView_VERSION")
+case "$ParaView_MAJOR".*:
+    # version and major appear to correspond
+    breaksw
 
-# add in python libraries if required
-set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
-if ( -r $paraviewPython ) then
-    if ($?PYTHONPATH) then
-        setenv PYTHONPATH ${PYTHONPATH}:${paraviewPython}:$ParaView_DIR/lib/paraview-${ParaView_MAJOR}
-    else
-        setenv PYTHONPATH ${paraviewPython}:$ParaView_DIR/lib/paraview-${ParaView_MAJOR}
-    endif
-endif
+case [0-9]*:
+    # extract major from the version
+    setenv ParaView_MAJOR `echo ${ParaView_VERSION} | \
+        sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
+    breaksw
+endsw
 
-if ( -r $ParaView_INST_DIR ) then
+
+set paraviewInstDir=$WM_THIRD_PARTY_DIR/paraview-${ParaView_VERSION}
+setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-${ParaView_VERSION}
+
+# set paths if binaries or source are present
+if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
     set path=($ParaView_DIR/bin $path)
-    setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview
+    setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-${ParaView_MAJOR}
+
+    # add in python libraries if required
+    set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
+    if ( -r $paraviewPython ) then
+        if ($?PYTHONPATH) then
+            setenv PYTHONPATH ${PYTHONPATH}:${paraviewPython}:$ParaView_DIR/lib/paraview-${ParaView_MAJOR}
+        else
+            setenv PYTHONPATH ${paraviewPython}:$ParaView_DIR/lib/paraview-${ParaView_MAJOR}
+        endif
+    endif
+else
+    unsetenv PV_PLUGIN_PATH
 endif
 
-unset cmake paraviewPython
+
+unset cleaned cmake paraviewInstDir paraviewPython
 # -----------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index 3d5be555f0..d15c5324d5 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     etc/bashrc
 #
 # Description
@@ -36,13 +36,13 @@ export WM_PROJECT=OpenFOAM
 [ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=1.6
 
 ################################################################################
-# USER EDITABLE PART
+# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
 #
 # either set $FOAM_INST_DIR before sourcing this file or set
 #    $foamInstall below to where OpenFOAM is installed
 #
-# Location of FOAM installation
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Location of the OpenFOAM installation
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 foamInstall=$HOME/$WM_PROJECT
 # foamInstall=~$WM_PROJECT
 # foamInstall=/usr/local/$WM_PROJECT
@@ -70,12 +70,28 @@ export WM_PROJECT_INST_DIR=$FOAM_INST_DIR
 export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
 export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 
-
 # Location of third-party software
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
 
 
+# Source files, possibly with some verbosity
+_foamSource()
+{
+   while [ $# -ge 1 ]
+   do
+      [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Sourcing: $1"
+      . $1
+      shift
+   done
+}
+
+
+# Add in preset user or site preferences:
+foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` && _foamSource $foamPrefs
+unset foamPrefs
+
+
 # Operating System/Platform
 # ~~~~~~~~~~~~~~~~~~~~~~~~~
 # WM_OSTYPE = POSIX | ????
@@ -86,8 +102,7 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 : ${WM_COMPILER:=Gcc}; export WM_COMPILER
 
-export WM_COMPILER_ARCH=
-export WM_COMPILER_LIB_ARCH=
+unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 
 
 # Compilation options (architecture, precision, optimised, debug or profiling)
@@ -205,39 +220,28 @@ esac
 
 # Clean standard environment variables (PATH, LD_LIBRARY_PATH, MANPATH)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-cleanProg=$WM_PROJECT_DIR/bin/foamCleanPath
+foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
 
 #- Clean PATH
-cleanEnv=`$cleanProg "$PATH" "$foamOldDirs"` && PATH="$cleanEnv"
+cleaned=`$foamClean "$PATH" "$foamOldDirs"` && PATH="$cleaned"
 
 #- Clean LD_LIBRARY_PATH
-cleanEnv=`$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleanEnv"
+cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleaned"
 
 #- Clean MANPATH
-cleanEnv=`$cleanProg "$MANPATH" "$foamCleanDirs"` && MANPATH="$cleanEnv"
+cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` && MANPATH="$cleaned"
 
 export PATH LD_LIBRARY_PATH MANPATH
 
+
 # Source project setup files
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource()
-{
-   while [ $# -ge 1 ]
-   do
-      [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Sourcing: $1"
-      . $1
-      shift
-   done
-}
-
-
 _foamSource $WM_PROJECT_DIR/etc/settings.sh
 _foamSource $WM_PROJECT_DIR/etc/aliases.sh
 
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
 _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
 _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
 
@@ -245,27 +249,27 @@ _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
 # Clean environment paths again. Only remove duplicates
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #- Clean PATH
-cleanEnv=`$cleanProg "$PATH"` && PATH="$cleanEnv"
+cleaned=`$foamClean "$PATH"` && PATH="$cleaned"
 
 #- Clean LD_LIBRARY_PATH
-cleanEnv=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanEnv"
+cleaned=`$foamClean "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleaned"
 
-#- Clean MANPATH
-cleanEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanEnv:"
+#- Clean MANPATH (trailing ':' to find system pages)
+cleaned=`$foamClean "$MANPATH"`: && MANPATH="$cleaned"
 
 export PATH LD_LIBRARY_PATH MANPATH
 
 #- Clean LD_PRELOAD
-if [ "$LD_PRELOAD" != "" ]
+if [ -n "$LD_PRELOAD" ]
 then
-    cleanEnv=`$cleanProg "$LD_PRELOAD"` && LD_PRELOAD="$cleanEnv"
+    cleaned=`$foamClean "$LD_PRELOAD"` && LD_PRELOAD="$cleaned"
     export LD_PRELOAD
 fi
 
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset cleanEnv cleanProg foamInstall foamOldDirs
+unset cleaned foamClean foamInstall foamOldDirs
 unset _foamSource
 
 # -----------------------------------------------------------------------------
diff --git a/bin/templates/foamCommentStyles b/etc/codeTemplates/foamCommentStyles
similarity index 100%
rename from bin/templates/foamCommentStyles
rename to etc/codeTemplates/foamCommentStyles
diff --git a/bin/templates/foamScript b/etc/codeTemplates/foamScript
similarity index 100%
rename from bin/templates/foamScript
rename to etc/codeTemplates/foamScript
diff --git a/bin/templates/source/_Template.C b/etc/codeTemplates/source/_Template.C
similarity index 100%
rename from bin/templates/source/_Template.C
rename to etc/codeTemplates/source/_Template.C
diff --git a/bin/templates/source/_Template.H b/etc/codeTemplates/source/_Template.H
similarity index 100%
rename from bin/templates/source/_Template.H
rename to etc/codeTemplates/source/_Template.H
diff --git a/bin/templates/source/_TemplateApp.C b/etc/codeTemplates/source/_TemplateApp.C
similarity index 100%
rename from bin/templates/source/_TemplateApp.C
rename to etc/codeTemplates/source/_TemplateApp.C
diff --git a/bin/templates/source/_TemplateI.H b/etc/codeTemplates/source/_TemplateI.H
similarity index 100%
rename from bin/templates/source/_TemplateI.H
rename to etc/codeTemplates/source/_TemplateI.H
diff --git a/bin/templates/source/_TemplateIO.C b/etc/codeTemplates/source/_TemplateIO.C
similarity index 100%
rename from bin/templates/source/_TemplateIO.C
rename to etc/codeTemplates/source/_TemplateIO.C
diff --git a/bin/templates/source/foamNewSource b/etc/codeTemplates/source/foamNewSource
similarity index 96%
rename from bin/templates/source/foamNewSource
rename to etc/codeTemplates/source/foamNewSource
index 8924b09448..ee6483e4e7 100755
--- a/bin/templates/source/foamNewSource
+++ b/etc/codeTemplates/source/foamNewSource
@@ -31,12 +31,12 @@
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
-Template="$WM_PROJECT_DIR/bin/templates/source/_Template"
+Template="$WM_PROJECT_DIR/etc/codeTemplates/source/_Template"
 
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-Usage: $Script <type> <class name>
+Usage: $Script <type> <ClassName>
 
 * create a new standard OpenFOAM source file
 
diff --git a/bin/templates/sourceTemplate/_TemplateTemplate.C b/etc/codeTemplates/template/_TemplateTemplate.C
similarity index 100%
rename from bin/templates/sourceTemplate/_TemplateTemplate.C
rename to etc/codeTemplates/template/_TemplateTemplate.C
diff --git a/bin/templates/sourceTemplate/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H
similarity index 100%
rename from bin/templates/sourceTemplate/_TemplateTemplate.H
rename to etc/codeTemplates/template/_TemplateTemplate.H
diff --git a/bin/templates/sourceTemplate/_TemplateTemplateI.H b/etc/codeTemplates/template/_TemplateTemplateI.H
similarity index 100%
rename from bin/templates/sourceTemplate/_TemplateTemplateI.H
rename to etc/codeTemplates/template/_TemplateTemplateI.H
diff --git a/bin/templates/sourceTemplate/_TemplateTemplateIO.C b/etc/codeTemplates/template/_TemplateTemplateIO.C
similarity index 100%
rename from bin/templates/sourceTemplate/_TemplateTemplateIO.C
rename to etc/codeTemplates/template/_TemplateTemplateIO.C
diff --git a/bin/templates/sourceTemplate/foamNewTemplate b/etc/codeTemplates/template/foamNewTemplate
similarity index 92%
rename from bin/templates/sourceTemplate/foamNewTemplate
rename to etc/codeTemplates/template/foamNewTemplate
index 8045a5cac6..446bc6df65 100755
--- a/bin/templates/sourceTemplate/foamNewTemplate
+++ b/etc/codeTemplates/template/foamNewTemplate
@@ -31,15 +31,15 @@
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
-Template="$WM_PROJECT_DIR/bin/templates/sourceTemplate/_TemplateTemplate"
+Template="$WM_PROJECT_DIR/etc/codeTemplates/template/_TemplateTemplate"
 
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-Usage: $Script <type> <Class name> <Template arguments...>
+Usage: $Script <type> <ClassName> <Template arguments...>
 
-* create a new standard OpenFOAM source file
+* create a new standard OpenFOAM source file for templated classes
 
 type: (C|H|I|IO)
 
diff --git a/etc/cshrc b/etc/cshrc
index 9ef6fb2d06..7b959e8c43 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     etc/cshrc
 #
 # Description
@@ -35,13 +35,13 @@ setenv WM_PROJECT OpenFOAM
 if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION 1.6
 
 ################################################################################
-# USER EDITABLE PART
+# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
 #
 #    either setenv FOAM_INST_DIR before sourcing this file or set
 #    foamInstall below to where OpenFOAM is installed
 #
-# Location of FOAM installation
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Location of the OpenFOAM installation
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 set foamInstall = $HOME/$WM_PROJECT
 # set foamInstall = ~$WM_PROJECT
 # set foamInstall = /usr/local/$WM_PROJECT
@@ -64,12 +64,22 @@ setenv WM_PROJECT_INST_DIR $FOAM_INST_DIR
 setenv WM_PROJECT_DIR $WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
 setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
 
-
 # Location of third-party software
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
 
 
+# Source files, possibly with some verbosity
+alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Sourcing: \!*"; source \!*'
+
+# Add in preset user or site preferences:
+set foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile prefs.csh`
+if ( $status == 0 ) then
+    _foamSource $foamPrefs
+endif
+unset foamPrefs
+
+
 # Operating System/Platform
 # ~~~~~~~~~~~~~~~~~~~~~~~~~
 # WM_OSTYPE = POSIX | ????
@@ -201,39 +211,31 @@ endsw
 
 # Clean standard environment variables (path/PATH, LD_LIBRARY_PATH, MANPATH)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-set cleanProg=$WM_PROJECT_DIR/bin/foamCleanPath
+set foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
 
-if (! $?LD_LIBRARY_PATH ) then
-    setenv LD_LIBRARY_PATH ''
-endif
-if (! $?MANPATH) then
-    setenv MANPATH ''
-endif
+if (! $?LD_LIBRARY_PATH ) setenv LD_LIBRARY_PATH ''
+if (! $?MANPATH) setenv MANPATH ''
 
 #- Clean path/PATH
-set colonPath=`echo "$path" | sed -e 's/ /:/g'`
-set cleanEnv=`$cleanProg "$colonPath" "$foamOldDirs"`
-if ( $status == 0 ) then
-    set path=`echo "$cleanEnv" | sed -e 's/:/ /g'`
-endif
+set cleaned=`$foamClean -space "$path" "$foamOldDirs"`
+if ( $status == 0 ) set path=($cleaned)
 
 #- Clean LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH `$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"`
+set cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"`
+if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
 
 #- Clean MANPATH
-setenv MANPATH `$cleanProg "$MANPATH" "$foamOldDirs"`
+set cleaned=`$foamClean "$MANPATH" "$foamOldDirs"`
+if ( $status == 0 ) setenv MANPATH $cleaned
 
 
 # Source project setup files
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~
-alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!*"; source \!*'
-
 _foamSource $WM_PROJECT_DIR/etc/settings.csh
 _foamSource $WM_PROJECT_DIR/etc/aliases.csh
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
 _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
 # _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
 
@@ -241,26 +243,26 @@ _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
 # Clean environment paths again. Only remove duplicates
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #- Clean path/PATH
-set colonPath=`echo "$path" | sed -e 's/ /:/g'`
-set cleanEnv=`$cleanProg "$colonPath"`
-if ( $status == 0 ) then
-    set path=`echo "$cleanEnv" | sed -e 's/:/ /g'`
-endif
+set cleaned=`$foamClean -space "$path"`
+if ( $status == 0 ) set path=($cleaned)
 
 #- Clean LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH `$cleanProg "$LD_LIBRARY_PATH"`
+set cleaned=`$foamClean "$LD_LIBRARY_PATH"`
+if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
 
-#- Clean MANPATH
-setenv MANPATH `$cleanProg "$MANPATH"`:
+#- Clean MANPATH (trailing ':' to find system pages)
+set cleaned=`$foamClean "$MANPATH"`:
+if ( $status == 0 ) setenv MANPATH "$cleaned"
 
 #- Clean LD_PRELOAD
 if ( $?LD_PRELOAD ) then
-    setenv LD_PRELOAD `$cleanProg "$LD_PRELOAD"`
+    set cleaned=`$foamClean "$LD_PRELOAD"`
+    if ( $status == 0 ) setenv LD_PRELOAD $cleaned
 endif
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset cleanEnv cleanProg colonPath foamInstall foamOldDirs
+unset cleaned foamClean foamInstall foamOldDirs
 unalias _foamSource
 
 # -----------------------------------------------------------------------------
diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE
new file mode 100644
index 0000000000..775747ea66
--- /dev/null
+++ b/etc/prefs.csh-EXAMPLE
@@ -0,0 +1,53 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     etc/prefs.csh
+#
+# Description
+#     Preset variables for the OpenFOAM configuration - C-Shell shell syntax.
+#
+#     The prefs.csh file will be sourced by the OpenFOAM etc/cshrc when it is
+#     found by foamEtcFile.
+#
+# See Also
+#     'foamEtcFile -help' or 'foamEtcFile -list' for information about the
+#     paths searched
+#
+#------------------------------------------------------------------------------
+
+## Specify system compiler
+## ~~~~~~~~~~~~~~~~~~~~~~~
+#set compilerInstall=system
+
+## Specify system openmpi
+## ~~~~~~~~~~~~~~~~~~~~~~
+#setenv WM_MPLIB SYSTEMOPENMPI
+
+# Specify ParaView version
+# ~~~~~~~~~~~~~~~~~~~~~~~~
+setenv ParaView_VERSION git        # eg, cvs/git version
+setenv ParaView_MAJOR 3.7
+
+# -----------------------------------------------------------------------------
diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE
new file mode 100644
index 0000000000..5878e82dbc
--- /dev/null
+++ b/etc/prefs.sh-EXAMPLE
@@ -0,0 +1,52 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     etc/prefs.sh
+#
+# Description
+#     Preset variables for the OpenFOAM configuration - POSIX shell syntax.
+#
+#     The prefs.sh file will be sourced by the OpenFOAM etc/bashrc when it is
+#     found by foamEtcFile.
+#
+# See Also
+#     'foamEtcFile -help' or 'foamEtcFile -list' for information about the
+#     paths searched
+#
+#------------------------------------------------------------------------------
+
+# Specify system compiler
+# ~~~~~~~~~~~~~~~~~~~~~~~
+compilerInstall=system
+
+# Specify system openmpi
+# ~~~~~~~~~~~~~~~~~~~~~~
+export WM_MPLIB=SYSTEMOPENMPI
+
+# Specify ParaView version
+# ~~~~~~~~~~~~~~~~~~~~~~~~
+export ParaView_VERSION=git        # eg, cvs/git version
+export ParaView_MAJOR=3.7
+# -----------------------------------------------------------------------------
diff --git a/etc/settings.csh b/etc/settings.csh
index 78fd05490f..7a0d1f40c8 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     etc/settings.csh
 #
 # Description
@@ -36,7 +36,7 @@ alias _foamAddPath 'set path=(\!* $path)'
 # prefix to LD_LIBRARY_PATH
 alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
 # prefix to MANPATH
-alias _foamAddManPath 'setenv MANPATH \!*\:${MANPATH}'
+alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}'
 
 # location of the jobControl directory
 setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
@@ -80,29 +80,29 @@ _foamAddLib  $FOAM_USER_LIBBIN
 
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# compilerInstall = OpenFOAM | System
-set compilerInstall=OpenFOAM
+# compilerInstall = OpenFOAM | system
+if ( ! $?compilerInstall ) set compilerInstall=OpenFOAM
 
 switch ("$compilerInstall")
 case OpenFOAM:
     switch ("$WM_COMPILER")
     case Gcc:
-        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-5.0.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.3
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.2/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-5.0.1/lib
     breaksw
     case Gcc442:
-        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
     breaksw
     case Gcc43:
-        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.3.3
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
     breaksw
     case Gcc42:
-        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.2.4
     breaksw
     endsw
 
@@ -112,14 +112,14 @@ case OpenFOAM:
         echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
         echo "    Cannot find $WM_COMPILER_DIR installation."
         echo "    Please install this compiler version or if you wish to use the system compiler,"
-        echo "    change the 'compilerInstall' setting to 'System' in this file"
+        echo "    change the 'compilerInstall' setting to 'system' in this file"
         echo
     endif
 
     _foamAddPath    ${WM_COMPILER_DIR}/bin
     _foamAddLib     ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH}
     _foamAddLib     ${WM_COMPILER_DIR}/lib
-    _foamAddManPath ${WM_COMPILER_DIR}/man
+    _foamAddMan     ${WM_COMPILER_DIR}/man
 
     breaksw
 endsw
@@ -134,27 +134,25 @@ switch ("$WM_MPLIB")
 case OPENMPI:
     set mpi_version=openmpi-1.4.1
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
-    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
+    setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mpi_version
 
     # Tell OpenMPI where to find its install directory
     setenv OPAL_PREFIX $MPI_ARCH_PATH
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
-    _foamAddManPath $MPI_ARCH_PATH/man
+    _foamAddMan     $MPI_ARCH_PATH/man
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
     breaksw
 
 case SYSTEMOPENMPI:
-
     # This uses the installed openmpi. It needs mpicc installed!
-
     set mpi_version=openmpi-system
 
     # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
-    setenv PINC `mpicc --showme:compile` 
+    setenv PINC `mpicc --showme:compile`
     setenv PLIBS `mpicc --showme:link`
     set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
 
@@ -174,11 +172,11 @@ case SYSTEMOPENMPI:
 case MPICH:
     set mpi_version=mpich2-1.1.1p1
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
-    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
+    setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mpi_version
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
-    _foamAddManPath $MPI_ARCH_PATH/share/man
+    _foamAddMan     $MPI_ARCH_PATH/share/man
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -287,6 +285,7 @@ endif
 # ~~~~~~~~~~~~~~~~~~~~
 unalias _foamAddPath
 unalias _foamAddLib
+unalias _foamAddMan
 unset minBufferSize
 
 # -----------------------------------------------------------------------------
diff --git a/etc/settings.sh b/etc/settings.sh
index 43fc884346..ca3ab25c2c 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     etc/settings.sh
 #
 # Description
@@ -52,7 +52,7 @@ _foamAddLib()
 }
 
 # prefix to MANPATH
-_foamAddManPath()
+_foamAddMan()
 {
     while [ $# -ge 1 ]
     do
@@ -104,34 +104,34 @@ unset compilerBin compilerLib compilerMan
 
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# compilerInstall = OpenFOAM | System
-compilerInstall=OpenFOAM
+# compilerInstall = OpenFOAM | system
+: ${compilerInstall:=OpenFOAM}
 
 case "${compilerInstall:-OpenFOAM}" in
 OpenFOAM)
     case "$WM_COMPILER" in
     Gcc)
-        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-5.0.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.3
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.2/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-5.0.1/lib
         ;;
     Gcc442)
-        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
         ;;
     Gcc44)
-        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
         ;;
     Gcc43)
-        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.3.3
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
         ;;
     Gcc42)
-        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.2.4
         ;;
     esac
 
@@ -142,7 +142,7 @@ OpenFOAM)
         echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
         echo "    Cannot find $WM_COMPILER_DIR installation."
         echo "    Please install this compiler version or if you wish to use the system compiler,"
-        echo "    change the 'compilerInstall' setting to 'System' in this file"
+        echo "    change the 'compilerInstall' setting to 'system' in this file"
         echo
     fi
 
@@ -156,7 +156,7 @@ if [ -d "$compilerBin" ]
 then
     _foamAddPath    $compilerBin
     _foamAddLib     $compilerLib
-    _foamAddManPath $compilerMan
+    _foamAddMan     $compilerMan
 fi
 
 unset compilerBin compilerLib compilerMan compilerInstall
@@ -170,24 +170,25 @@ case "$WM_MPLIB" in
 OPENMPI)
     mpi_version=openmpi-1.4.1
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
+    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mpi_version
 
     # Tell OpenMPI where to find its install directory
     export OPAL_PREFIX=$MPI_ARCH_PATH
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
-    _foamAddManPath $MPI_ARCH_PATH/man
+    _foamAddMan     $MPI_ARCH_PATH/man
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
     ;;
 
 SYSTEMOPENMPI)
+    # This uses the installed openmpi. It needs mpicc installed!
     mpi_version=openmpi-system
 
     # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
-    export PINC=`mpicc --showme:compile` 
+    export PINC=`mpicc --showme:compile`
     export PLIBS=`mpicc --showme:link`
     libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
 
@@ -208,11 +209,11 @@ SYSTEMOPENMPI)
 MPICH)
     mpi_version=mpich2-1.1.1p1
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
+    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mpi_version
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
-    _foamAddManPath $MPI_ARCH_PATH/share/man
+    _foamAddMan     $MPI_ARCH_PATH/share/man
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -318,6 +319,6 @@ export MPI_BUFFER_SIZE
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset _foamAddPath _foamAddLib minBufferSize
+unset _foamAddPath _foamAddLib _foamAddMan minBufferSize
 
 # -----------------------------------------------------------------------------
diff --git a/src/Allwmake b/src/Allwmake
index 6822aac23b..0801bd4ba7 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -28,16 +28,18 @@ wmake libso surfMesh
 wmake libso triSurface
 
 # Decomposition methods needed by dummyThirdParty
-parallel/AllwmakeLnInclude
+parallel/decompose/AllwmakeLnInclude
 # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
 dummyThirdParty/Allwmake
 
+# Build the proper scotchDecomp, metisDecomp etc.
+parallel/decompose/Allwmake
+
 wmake libso meshTools
 wmake libso finiteVolume
 wmake libso genericPatchFields
 
-# Build the proper scotchDecomp, metisDecomp etc.
-parallel/Allwmake
+parallel/reconstruct/Allwmake
 
 wmake libso sampling
 
@@ -52,7 +54,6 @@ thermophysicalModels/Allwmake
 transportModels/Allwmake
 turbulenceModels/Allwmake
 lagrangian/Allwmake
-parallel/Allwmake
 postProcessing/Allwmake
 conversion/Allwmake
 mesh/Allwmake
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 83beae84fe..e5481abd33 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -181,7 +181,6 @@ inline unsigned Hash<triFace>::operator()(const triFace& t, unsigned seed) const
 
 
 //- Hash specialization for hashing triFace - a commutative hash value.
-//  Hash incrementally.
 template<>
 inline unsigned Hash<triFace>::operator()(const triFace& t) const
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index ba92292d42..608bfaeea2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -300,7 +300,7 @@ void Foam::coupledPolyPatch::calcTransformTensors
         {
             // Rotation, no separation
 
-            // Assume per-face differening transformation, correct later
+            // Assume per-face differing transformation, correct later
 
             separation_.setSize(0);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index fef6c98ec0..8f0fa87822 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -47,14 +47,15 @@ namespace Foam
 
 
 template<>
-const char* NamedEnum<cyclicPolyPatch::transformType, 3>::names[] =
+const char* NamedEnum<cyclicPolyPatch::transformType, 4>::names[] =
 {
     "unknown",
     "rotational",
-    "translational"
+    "translational",
+    "noOrdering"
 };
 
-const NamedEnum<cyclicPolyPatch::transformType, 3>
+const NamedEnum<cyclicPolyPatch::transformType, 4>
     cyclicPolyPatch::transformTypeNames;
 }
 
@@ -1153,6 +1154,16 @@ bool Foam::cyclicPolyPatch::order
             << ". It is " << pp.size() << abort(FatalError);
     }
 
+    if (transform_ == NOORDERING)
+    {
+        if (debug)
+        {
+            Pout<< "cyclicPolyPatch::order : noOrdering mode." << endl;
+        }
+        return false;
+    }
+
+
     label halfSize = pp.size()/2;
 
     // Supplied primitivePatch already with new points.
@@ -1630,7 +1641,7 @@ void Foam::cyclicPolyPatch::write(Ostream& os) const
     {
         case ROTATIONAL:
         {
-            os.writeKeyword("transform") << transformTypeNames[ROTATIONAL]
+            os.writeKeyword("transform") << transformTypeNames[transform_]
                 << token::END_STATEMENT << nl;
             os.writeKeyword("rotationAxis") << rotationAxis_
                 << token::END_STATEMENT << nl;
@@ -1640,12 +1651,18 @@ void Foam::cyclicPolyPatch::write(Ostream& os) const
         }
         case TRANSLATIONAL:
         {
-            os.writeKeyword("transform") << transformTypeNames[TRANSLATIONAL]
+            os.writeKeyword("transform") << transformTypeNames[transform_]
                 << token::END_STATEMENT << nl;
             os.writeKeyword("separationVector") << separationVector_
                 << token::END_STATEMENT << nl;
             break;
         }
+        case NOORDERING:
+        {
+            os.writeKeyword("transform") << transformTypeNames[transform_]
+                << token::END_STATEMENT << nl;
+            break;
+        }
         default:
         {
             // no additional info to write
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index 4f81975e60..3224eef799 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -42,7 +42,6 @@ Description
 
 SourceFiles
     cyclicPolyPatch.C
-    cyclicPolyPatchMorph.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -72,11 +71,12 @@ public:
 
     enum transformType
     {
-        UNKNOWN,
-        ROTATIONAL,
-        TRANSLATIONAL
+        UNKNOWN,            // unspecified; automatic ordering
+        ROTATIONAL,         // rotation along coordinate axis
+        TRANSLATIONAL,      // translation
+        NOORDERING          // unspecified, no automatic ordering
     };
-    static const NamedEnum<transformType, 3> transformTypeNames;
+    static const NamedEnum<transformType, 4> transformTypeNames;
 
 
 private:
@@ -118,8 +118,6 @@ private:
         //- Find amongst selected faces the one with the largest area
         static label findMaxArea(const pointField&, const faceList&);
 
-        void calcTransforms();
-
 
         // Face ordering
 
@@ -175,6 +173,9 @@ protected:
 
     // Protected Member functions
 
+        //- Recalculate the transformation tensors
+        virtual void calcTransforms();
+
         //- Initialise the calculation of the patch geometry
         virtual void initGeometry(PstreamBuffers&);
 
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index a01538cc38..cc3329e384 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -10,7 +10,8 @@ case "$WM_MPLIB" in
     echo
     echo "Note: ignore spurious warnings about missing mpicxx.h headers"
     set -x
-    (WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso mpi)
+    # force compilation into qualified directory
+    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB  wmake libso mpi
     ;;
 
 #GAMMA)
diff --git a/src/dummyThirdParty/metisDecomp/Make/options b/src/dummyThirdParty/metisDecomp/Make/options
index 05ee5feb98..1dc3af297c 100644
--- a/src/dummyThirdParty/metisDecomp/Make/options
+++ b/src/dummyThirdParty/metisDecomp/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/metisDecomp/lnInclude
+    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/decompose/metisDecomp/lnInclude
 
 LIB_LIBS =
diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
index 6167a7aa09..b1ebe1c1ff 100644
--- a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
+++ b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
@@ -34,8 +34,8 @@ static const char* notImplementedMessage =
 "\n"
 "Please install metis and make sure that libmetis.so is in your "
 "LD_LIBRARY_PATH.\n"
-"The metisDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
-"metisDecomp\n";
+"The metisDecomp library can then be built in "
+"$FOAM_SRC/parallel/decompose/decompositionMethods/metisDecomp\n";
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/dummyThirdParty/parMetisDecomp/Make/options b/src/dummyThirdParty/parMetisDecomp/Make/options
index 2267e7a542..2b87d62057 100644
--- a/src/dummyThirdParty/parMetisDecomp/Make/options
+++ b/src/dummyThirdParty/parMetisDecomp/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/parMetisDecomp/lnInclude
+    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/decompose/parMetisDecomp/lnInclude
 
 LIB_LIBS =
diff --git a/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C b/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C
index 7cf3663e6c..2898907047 100644
--- a/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C
+++ b/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C
@@ -50,8 +50,8 @@ static const char* notImplementedMessage =
 "\n"
 "Please install parMetis and make sure that libparMetis.so is in your "
 "LD_LIBRARY_PATH.\n"
-"The parMetisDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
-"parMetisDecomp\n";
+"The parMetisDecomp library can then be built in "
+"$FOAM_SRC/parallel/decompose/decompositionMethods/parMetisDecomp\n";
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dummyThirdParty/scotchDecomp/Make/options b/src/dummyThirdParty/scotchDecomp/Make/options
index e109fb6fce..da7a7df7b6 100644
--- a/src/dummyThirdParty/scotchDecomp/Make/options
+++ b/src/dummyThirdParty/scotchDecomp/Make/options
@@ -1,6 +1,5 @@
-EXE_INC = \ 
-    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/scotchDecomp/lnInclude
+EXE_INC = \
+    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/decompose/scotchDecomp/lnInclude
 
 LIB_LIBS =
- 
diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
index cefc26c582..b9a7ba73e2 100644
--- a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
+++ b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
@@ -115,8 +115,8 @@ static const char* notImplementedMessage =
 "\n"
 "Please install scotch and make sure that libscotch.so is in your "
 "LD_LIBRARY_PATH.\n"
-"The scotchDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
-"scotchDecomp\n";
+"The scotchDecomp library can then be built in "
+"$FOAM_SRC/parallel/decompose/decompositionMethods/scotchDecomp\n";
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index e1b94f504d..afc98d8426 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -34,7 +34,6 @@ License
 #include "polyAddFace.H"
 #include "polyModifyFace.H"
 #include "polyAddCell.H"
-#include "wallPoint.H"
 #include "globalIndex.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -713,14 +712,14 @@ void Foam::addPatchCellLayer::setRefinement
         }
 
         {
-            pointField d(mesh_.nPoints(), wallPoint::greatPoint);
+            pointField d(mesh_.nPoints(), vector::max);
             UIndirectList<point>(d, meshPoints) = firstLayerDisp;
             syncTools::syncPointList
             (
                 mesh_,
                 d,
                 minEqOp<vector>(),
-                wallPoint::greatPoint,
+                vector::max,
                 false
             );
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 3da4d9f514..c8aa31c398 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -49,14 +49,6 @@ namespace Foam
 }
 
 
-const Foam::point Foam::polyTopoChange::greatPoint
-(
-    GREAT,
-    GREAT,
-    GREAT
-);
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Renumber with special handling for merged items (marked with <-1)
@@ -2695,7 +2687,7 @@ void Foam::polyTopoChange::removePoint
             << abort(FatalError);
     }
 
-    points_[pointI] = greatPoint;
+    points_[pointI] = point::max;
     pointMap_[pointI] = -1;
     if (mergePointI >= 0)
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
index a5ffe331d5..a446244d4d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
@@ -45,7 +45,7 @@ Description
         - no item can be removed more than once.
     - removed cell: cell set to 0 faces.
     - removed face: face set to 0 vertices.
-    - removed point: coordinate set to greatPoint (GREAT,GREAT,GREAT).
+    - removed point: coordinate set to vector::max (VGREAT,VGREAT,VGREAT).
     Note that this might give problems if this value is used already.
     To see if point is equal to above value we don't use == (which might give
     problems with roundoff error) but instead compare the individual component
@@ -98,12 +98,6 @@ template<class T, class Container> class CompactListList;
 
 class polyTopoChange
 {
-    // Static data members
-
-        //- Value of deleted point
-        static const point greatPoint;
-
-
     // Private data
 
         //- Whether to allow referencing illegal points/cells/faces
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
index 118733ce42..541f19152c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
@@ -33,9 +33,9 @@ inline bool Foam::polyTopoChange::pointRemoved(const label pointI) const
     const point& pt = points_[pointI];
 
     return
-        pt.x() > 0.5*greatPoint.x()
-     && pt.y() > 0.5*greatPoint.y()
-     && pt.z() > 0.5*greatPoint.z();
+        pt.x() > 0.5*vector::max.x()
+     && pt.y() > 0.5*vector::max.y()
+     && pt.z() > 0.5*vector::max.z();
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index 1227601854..78108a6523 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -33,7 +33,6 @@ License
 #include "polyAddPoint.H"
 #include "polyModifyFace.H"
 #include "syncTools.H"
-#include "wallPoint.H"  // only to use 'greatPoint'
 #include "faceSet.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -570,7 +569,7 @@ void Foam::removePoints::getUnrefimentSet
                     {
                         label savedPointI = -savedFace[fp]-1;
 
-                        if (savedPoints_[savedPointI] == wallPoint::greatPoint)
+                        if (savedPoints_[savedPointI] == vector::max)
                         {
                             FatalErrorIn
                             (
@@ -745,7 +744,7 @@ void Foam::removePoints::setUnrefinement
     {
         label localI = localPoints[i];
 
-        if (savedPoints_[localI] == wallPoint::greatPoint)
+        if (savedPoints_[localI] == vector::max)
         {
             FatalErrorIn
             (
@@ -767,7 +766,7 @@ void Foam::removePoints::setUnrefinement
         );
 
         // Mark the restored points so they are not restored again.
-        savedPoints_[localI] = wallPoint::greatPoint;
+        savedPoints_[localI] = vector::max;
     }
 
     forAll(localFaces, i)
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
index b9df955be1..48cae70939 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
@@ -26,7 +26,6 @@ License
 
 #include "nearWallDistNoSearch.H"
 #include "fvMesh.H"
-#include "wallPoint.H"
 #include "wallFvPatch.H"
 #include "surfaceFields.H"
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C
index f86bd0439e..df314a4338 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C
@@ -51,7 +51,7 @@ namespace Foam
 
 void Foam::displacementLayeredMotionFvMotionSolver::calcZoneMask
 (
-    const label cellZoneI, 
+    const label cellZoneI,
     PackedBoolList& isZonePoint,
     PackedBoolList& isZoneEdge
 ) const
@@ -133,16 +133,14 @@ void Foam::displacementLayeredMotionFvMotionSolver::walkStructured
     vectorField& data
 ) const
 {
-    const pointField& points = mesh().points();
-
     List<pointEdgeStructuredWalk> seedInfo(seedPoints.size());
 
     forAll(seedPoints, i)
     {
         seedInfo[i] = pointEdgeStructuredWalk
         (
-            true,
-            points[seedPoints[i]],
+            points0()[seedPoints[i]],  // location of data
+            points0()[seedPoints[i]],  // previous location
             0.0,
             seedData[i]
         );
@@ -150,23 +148,39 @@ void Foam::displacementLayeredMotionFvMotionSolver::walkStructured
 
     // Current info on points
     List<pointEdgeStructuredWalk> allPointInfo(mesh().nPoints());
-    // Mark points inside cellZone
+
+    // Mark points inside cellZone.
+    // Note that we use points0, not mesh.points()
+    // so as not to accumulate errors.
     forAll(isZonePoint, pointI)
     {
         if (isZonePoint[pointI])
         {
-            allPointInfo[pointI].inZone() = true;
+            allPointInfo[pointI] = pointEdgeStructuredWalk
+            (
+                points0()[pointI],  // location of data
+                vector::max,        // not valid
+                0.0,
+                vector::zero        // passive data
+            );
         }
     }
 
     // Current info on edges
     List<pointEdgeStructuredWalk> allEdgeInfo(mesh().nEdges());
+
     // Mark edges inside cellZone
     forAll(isZoneEdge, edgeI)
     {
         if (isZoneEdge[edgeI])
         {
-            allEdgeInfo[edgeI].inZone() = true;
+            allEdgeInfo[edgeI] = pointEdgeStructuredWalk
+            (
+                mesh().edges()[edgeI].centre(points0()),    // location of data
+                vector::max,                                // not valid
+                0.0,
+                vector::zero
+            );
         }
     }
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
index 96bae2c12f..aba9817680 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
@@ -88,7 +88,7 @@ class displacementLayeredMotionFvMotionSolver
 
         void calcZoneMask
         (
-            const label cellZoneI, 
+            const label cellZoneI,
             PackedBoolList& isZonePoint,
             PackedBoolList& isZoneEdge
         ) const;
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.C
index ec56628f02..83df8ccfa6 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.C
@@ -35,7 +35,7 @@ Foam::Ostream& Foam::operator<<
 )
 {
     return os
-        << wDist.inZone_ << wDist.previousPoint_
+        << wDist.point0_ << wDist.previousPoint_
         << wDist.dist_ << wDist.data_;
 }
 
@@ -46,7 +46,7 @@ Foam::Istream& Foam::operator>>
 )
 {
     return is
-        >> wDist.inZone_ >> wDist.previousPoint_
+        >> wDist.point0_ >> wDist.previousPoint_
         >> wDist.dist_ >> wDist.data_;
 }
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
index 83454236e6..2c62f9ea44 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
@@ -61,10 +61,10 @@ class pointEdgeStructuredWalk
 {
     // Private data
 
-        //- Is this point/edge inside the walk zone
-        bool inZone_;
+        //- Starting location
+        point point0_;
 
-        //- Previuos point
+        //- Previous point
         point previousPoint_;
 
         //- Sum of distance
@@ -77,15 +77,6 @@ class pointEdgeStructuredWalk
 
         //- Evaluate distance to point.
         inline bool update
-        (
-            const point&,
-            const pointEdgeStructuredWalk& w2,
-            const scalar tol
-        );
-
-        //- Combine current with w2. Update distSqr, origin if w2 has smaller
-        //  quantities and returns true.
-        inline bool update
         (
             const pointEdgeStructuredWalk& w2,
             const scalar tol
@@ -101,7 +92,7 @@ public:
         //- Construct from components
         inline pointEdgeStructuredWalk
         (
-            const bool,
+            const point&,
             const point&,
             const scalar,
             const vector&
@@ -114,10 +105,6 @@ public:
 
             inline bool inZone() const;
 
-            inline bool& inZone();
-
-            inline const point& previousPoint() const;
-
             inline scalar dist() const;
 
             inline const vector& data() const;
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
index c6cc23f99f..6381ebfb55 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
@@ -32,16 +32,15 @@ License
 // Update this with w2.
 inline bool Foam::pointEdgeStructuredWalk::update
 (
-    const point& pt,
     const pointEdgeStructuredWalk& w2,
     const scalar tol
 )
 {
     if (!valid())
     {
-        // current not yet set. Walked from w2 to here (=pt)
-        dist_ = w2.dist_ + mag(pt-w2.previousPoint_);
-        previousPoint_ = pt;
+        // current not yet set. Walked from w2 to here (=point0)
+        dist_ = w2.dist_ + mag(point0_-w2.previousPoint_);
+        previousPoint_ = point0_;
         data_ = w2.data_;
 
         return true;
@@ -52,36 +51,13 @@ inline bool Foam::pointEdgeStructuredWalk::update
     }
 }
 
-    
-// Update this with w2 (information on same point)
-inline bool Foam::pointEdgeStructuredWalk::update
-(
-    const pointEdgeStructuredWalk& w2,
-    const scalar tol
-)
-{
-    if (!valid())
-    {
-        // current not yet set so use neighbour
-        dist_ = w2.dist_;
-        previousPoint_ = w2.previousPoint_;
-        data_ = w2.data_;
-
-        return true;
-    }
-    else
-    {
-        // already nearer to pt
-        return false;
-    }
-}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Null constructor
 inline Foam::pointEdgeStructuredWalk::pointEdgeStructuredWalk()
 :
-    inZone_(false),
+    point0_(vector::max),
     previousPoint_(vector::max),
     dist_(0),
     data_(vector::zero)
@@ -91,13 +67,13 @@ inline Foam::pointEdgeStructuredWalk::pointEdgeStructuredWalk()
 // Construct from origin, distance
 inline Foam::pointEdgeStructuredWalk::pointEdgeStructuredWalk
 (
-    const bool inZone,
-    const point& previousPoint, 
+    const point& point0,
+    const point& previousPoint,
     const scalar dist,
     const vector& data
 )
 :
-    inZone_(inZone),
+    point0_(point0),
     previousPoint_(previousPoint),
     dist_(dist),
     data_(data)
@@ -108,20 +84,14 @@ inline Foam::pointEdgeStructuredWalk::pointEdgeStructuredWalk
 
 inline bool Foam::pointEdgeStructuredWalk::inZone() const
 {
-    return inZone_;
+    return point0_ != vector::max;
 }
 
 
-inline bool& Foam::pointEdgeStructuredWalk::inZone()
-{
-    return inZone_;
-}
-
-
-inline const Foam::point& Foam::pointEdgeStructuredWalk::previousPoint() const
-{
-    return previousPoint_;
-}
+//inline const Foam::point& Foam::pointEdgeStructuredWalk::previousPoint() const
+//{
+//    return previousPoint_;
+//}
 
 
 inline Foam::scalar Foam::pointEdgeStructuredWalk::dist() const
@@ -210,15 +180,15 @@ inline bool Foam::pointEdgeStructuredWalk::updatePoint
     const scalar tol
 )
 {
-    if (inZone_)
+    if (inZone())
     {
-        return update(mesh.points()[pointI], edgeInfo, tol);
+        return update(edgeInfo, tol);
     }
     else
     {
         return false;
     }
-}    
+}
 
 
 // Update this with new information on same point
@@ -230,9 +200,9 @@ inline bool Foam::pointEdgeStructuredWalk::updatePoint
     const scalar tol
 )
 {
-    if (inZone_)
+    if (inZone())
     {
-        return update(mesh.points()[pointI], newPointInfo, tol);
+        return update(newPointInfo, tol);
     }
     else
     {
@@ -249,7 +219,7 @@ inline bool Foam::pointEdgeStructuredWalk::updatePoint
 )
 {
     return update(newPointInfo, tol);
-}    
+}
 
 
 // Update this with information from connected point
@@ -262,21 +232,15 @@ inline bool Foam::pointEdgeStructuredWalk::updateEdge
     const scalar tol
 )
 {
-    if (inZone_)
+    if (inZone())
     {
-        const pointField& points = mesh.points();
-
-        const edge& e = mesh.edges()[edgeI];
-
-        const point edgeMid(0.5*(points[e[0]] + points[e[1]]));
-
-        return update(edgeMid, pointInfo, tol);
+        return update(pointInfo, tol);
     }
     else
     {
         return false;
     }
-}    
+}
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
@@ -286,7 +250,7 @@ inline bool Foam::pointEdgeStructuredWalk::operator==
     const Foam::pointEdgeStructuredWalk& rhs
 ) const
 {
-    return previousPoint() == rhs.previousPoint();
+    return previousPoint_ == rhs.previousPoint_;
 }
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
index 50bd207a51..368c5185c8 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -28,6 +28,11 @@ Class
 Description
     Limited to C(s) + O2 -> CO2
 
+    Loosely based on the reference:
+        Murphy, J. J., Shaddix, C. R., Combustion kinetics of coal chars
+        in oxygen-enriched environments, Combustion and Flame 144,
+        pp710-729, 2006
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef COxidationMurphyShaddix_H
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options
index 28c3d5fdf0..cee5c10104 100644
--- a/src/mesh/autoMesh/Make/options
+++ b/src/mesh/autoMesh/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
index 02eba5afbe..ce23fa5601 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
@@ -38,7 +38,6 @@ SourceFiles
 
 #include "autoPtr.H"
 #include "dictionary.H"
-#include "wallPoint.H"
 #include "searchableSurfaces.H"
 #include "refinementSurfaces.H"
 #include "shellSurfaces.H"
@@ -95,9 +94,9 @@ class autoHexMeshDriver
 
             void operator()(vector& x, const vector& y) const
             {
-                if (y != wallPoint::greatPoint)
+                if (y != point::max)
                 {
-                    if (x == wallPoint::greatPoint)
+                    if (x == point::max)
                     {
                         x = y;
                     }
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index d416d11033..021568e461 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -991,7 +991,7 @@ void Foam::autoLayerDriver::handleFeatureAngle
     if (minCos < 1-SMALL)
     {
         // Normal component of normals of connected faces.
-        vectorField edgeNormal(mesh.nEdges(), wallPoint::greatPoint);
+        vectorField edgeNormal(mesh.nEdges(), point::max);
 
         const labelListList& edgeFaces = pp.edgeFaces();
 
@@ -1016,7 +1016,7 @@ void Foam::autoLayerDriver::handleFeatureAngle
             mesh,
             edgeNormal,
             nomalsCombine(),
-            wallPoint::greatPoint,  // null value
+            point::max,  // null value
             false                   // no separation
         );
 
@@ -1040,7 +1040,7 @@ void Foam::autoLayerDriver::handleFeatureAngle
 
             const vector& n = edgeNormal[meshEdgeI];
 
-            if (n != wallPoint::greatPoint)
+            if (n != point::max)
             {
                 scalar cos = n & pp.faceNormals()[eFaces[0]];
 
@@ -1640,7 +1640,7 @@ void Foam::autoLayerDriver::syncPatchDisplacement
             meshPoints,
             patchDisp,
             minEqOp<vector>(),
-            wallPoint::greatPoint,          // null value
+            point::max,          // null value
             false                           // no separation
         );
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index 748f26d85e..8f1e27334b 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -37,7 +37,6 @@ SourceFiles
 #define autoLayerDriver_H
 
 #include "meshRefinement.H"
-#include "wallPoint.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,7 +49,6 @@ class pointSet;
 class motionSmoother;
 class addPatchCellLayer;
 class pointData;
-class wallPoint;
 class faceSet;
 class layerParameters;
 
@@ -81,9 +79,9 @@ class autoLayerDriver
 
             void operator()(vector& x, const vector& y) const
             {
-                if (y != wallPoint::greatPoint)
+                if (y != point::max)
                 {
-                    if (x == wallPoint::greatPoint)
+                    if (x == point::max)
                     {
                         x = y;
                     }
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index 5bfa725225..fd1969e976 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -102,9 +102,10 @@ Foam::Map<Foam::label> Foam::autoSnapDriver::getZoneBafflePatches
                             FatalErrorIn("getZoneBafflePatches(const bool)")
                                 << "Face " << faceI
                                 << " fc:" << mesh.faceCentres()[faceI]
-                                << " is in faceZone "
+                                << " in zone " << fZone.name()
+                                << " is in patch "
                                 << mesh.boundaryMesh()[oldPatchI].name()
-                                << " and in faceZone "
+                                << " and in patch "
                                 << mesh.boundaryMesh()[patchI].name()
                                 << abort(FatalError);
                         }
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
index 9366afbe4a..e17049bf2a 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
@@ -26,7 +26,6 @@ License
 
 #include "polyMesh.H"
 #include "transform.H"
-#include "wallPoint.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -138,10 +137,10 @@ inline bool Foam::pointData::update
 // Null constructor
 inline Foam::pointData::pointData()
 :
-    origin_(wallPoint::greatPoint),
+    origin_(point::max),
     distSqr_(GREAT),
     s_(GREAT),
-    v_(wallPoint::greatPoint)
+    v_(point::max)
 {}
 
 
@@ -199,7 +198,7 @@ inline const Foam::vector& Foam::pointData::v() const
 
 inline bool Foam::pointData::valid() const
 {
-    return origin_ != wallPoint::greatPoint;
+    return origin_ != point::max;
 }
 
 
diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options
index 0ff2202926..c082d2f359 100644
--- a/src/meshTools/Make/options
+++ b/src/meshTools/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 LIB_LIBS = \
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.C b/src/meshTools/PointEdgeWave/pointEdgePoint.C
index ad0fc3869c..c06fbac765 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.C
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.C
@@ -26,10 +26,6 @@ License
 
 #include "pointEdgePoint.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-Foam::point Foam::pointEdgePoint::greatPoint(GREAT, GREAT, GREAT);
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.H b/src/meshTools/PointEdgeWave/pointEdgePoint.H
index 1e83edd1d9..50e58e55f3 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.H
@@ -92,12 +92,6 @@ class pointEdgePoint
 
 public:
 
-    // Static data members
-
-        //- initial point far away.
-        static point greatPoint;
-
-
     // Constructors
 
         //- Construct null
diff --git a/src/meshTools/PointEdgeWave/pointEdgePointI.H b/src/meshTools/PointEdgeWave/pointEdgePointI.H
index 72842946e2..f4af10b8d4 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePointI.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePointI.H
@@ -117,7 +117,7 @@ inline bool Foam::pointEdgePoint::update
 // Null constructor
 inline Foam::pointEdgePoint::pointEdgePoint()
 :
-    origin_(greatPoint),
+    origin_(point::max),
     distSqr_(GREAT)
 {}
 
@@ -158,7 +158,7 @@ inline Foam::scalar Foam::pointEdgePoint::distSqr() const
 
 inline bool Foam::pointEdgePoint::valid() const
 {
-    return origin_ != greatPoint;
+    return origin_ != point::max;
 }
 
 
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.C b/src/meshTools/cellDist/patchWave/patchDataWave.C
index b22a110be6..00d22e1895 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.C
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.C
@@ -106,7 +106,7 @@ Foam::label Foam::patchDataWave<TransferType>::getValues
 
             distance_[cellI] = dist;
 
-            //cellData_[cellI] = wallPoint::greatPoint;
+            //cellData_[cellI] = point::max;
             cellData_[cellI] = cellInfo[cellI].data();
 
             nIllegal++;
@@ -153,7 +153,7 @@ Foam::label Foam::patchDataWave<TransferType>::getValues
 
                 patchField[patchFaceI] = dist;
 
-                //patchDataField[patchFaceI] = wallPoint::greatPoint;
+                //patchDataField[patchFaceI] = point::max;
                 patchDataField[patchFaceI] = faceInfo[meshFaceI].data();
 
                 nIllegal++;
diff --git a/src/meshTools/cellDist/wallPoint/wallPoint.C b/src/meshTools/cellDist/wallPoint/wallPoint.C
index 168a401f30..3b1d1ccc87 100644
--- a/src/meshTools/cellDist/wallPoint/wallPoint.C
+++ b/src/meshTools/cellDist/wallPoint/wallPoint.C
@@ -26,11 +26,6 @@ License
 
 #include "wallPoint.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-Foam::point Foam::wallPoint::greatPoint(GREAT, GREAT, GREAT);
-
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<(Foam::Ostream& os, const Foam::wallPoint& wDist)
diff --git a/src/meshTools/cellDist/wallPoint/wallPoint.H b/src/meshTools/cellDist/wallPoint/wallPoint.H
index 82d6b385af..3d88795392 100644
--- a/src/meshTools/cellDist/wallPoint/wallPoint.H
+++ b/src/meshTools/cellDist/wallPoint/wallPoint.H
@@ -87,12 +87,6 @@ class wallPoint
 
 public:
 
-    // Static data members
-
-        //- initial point far away.
-        static point greatPoint;
-
-
     // Constructors
 
         //- Construct null
diff --git a/src/meshTools/cellDist/wallPoint/wallPointI.H b/src/meshTools/cellDist/wallPoint/wallPointI.H
index abc400db1c..7d1c115679 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointI.H
+++ b/src/meshTools/cellDist/wallPoint/wallPointI.H
@@ -84,7 +84,7 @@ inline bool Foam::wallPoint::update
 // Null constructor
 inline Foam::wallPoint::wallPoint()
 :
-    origin_(greatPoint),
+    origin_(point::max),
     distSqr_(GREAT)
 {}
 
@@ -131,7 +131,7 @@ inline Foam::scalar& Foam::wallPoint::distSqr()
 
 inline bool Foam::wallPoint::valid() const
 {
-    return origin_ != greatPoint;
+    return origin_ != point::max;
 }
 
 
diff --git a/src/parallel/Allwmake b/src/parallel/decompose/Allwmake
similarity index 94%
rename from src/parallel/Allwmake
rename to src/parallel/decompose/Allwmake
index 5309e3481e..2adc739cf1 100755
--- a/src/parallel/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -6,7 +6,6 @@ wmakeLnInclude decompositionMethods
 
 wmake libso scotchDecomp
 wmake libso metisDecomp
-wmake libso reconstruct
 
 if [ -d "$FOAM_MPI_LIBBIN" ]
 then
diff --git a/src/parallel/AllwmakeLnInclude b/src/parallel/decompose/AllwmakeLnInclude
similarity index 70%
rename from src/parallel/AllwmakeLnInclude
rename to src/parallel/decompose/AllwmakeLnInclude
index 0737a7ffd4..6542722030 100755
--- a/src/parallel/AllwmakeLnInclude
+++ b/src/parallel/decompose/AllwmakeLnInclude
@@ -6,3 +6,5 @@ wmakeLnInclude decompositionMethods
 wmakeLnInclude metisDecomp
 wmakeLnInclude parMetisDecomp
 wmakeLnInclude scotchDecomp
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/decompositionMethods/Make/files b/src/parallel/decompose/decompositionMethods/Make/files
similarity index 100%
rename from src/parallel/decompositionMethods/Make/files
rename to src/parallel/decompose/decompositionMethods/Make/files
diff --git a/src/parallel/decompositionMethods/Make/options b/src/parallel/decompose/decompositionMethods/Make/options
similarity index 100%
rename from src/parallel/decompositionMethods/Make/options
rename to src/parallel/decompose/decompositionMethods/Make/options
diff --git a/src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
similarity index 100%
rename from src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.C
rename to src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
diff --git a/src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
similarity index 100%
rename from src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.H
rename to src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
diff --git a/src/parallel/decompositionMethods/geomDecomp/geomDecomp.C b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
similarity index 100%
rename from src/parallel/decompositionMethods/geomDecomp/geomDecomp.C
rename to src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
diff --git a/src/parallel/decompositionMethods/geomDecomp/geomDecomp.H b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H
similarity index 100%
rename from src/parallel/decompositionMethods/geomDecomp/geomDecomp.H
rename to src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H
diff --git a/src/parallel/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
similarity index 100%
rename from src/parallel/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
rename to src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
diff --git a/src/parallel/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
similarity index 100%
rename from src/parallel/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
rename to src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
diff --git a/src/parallel/decompositionMethods/manualDecomp/manualDecomp.C b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
similarity index 100%
rename from src/parallel/decompositionMethods/manualDecomp/manualDecomp.C
rename to src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
diff --git a/src/parallel/decompositionMethods/manualDecomp/manualDecomp.H b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
similarity index 100%
rename from src/parallel/decompositionMethods/manualDecomp/manualDecomp.H
rename to src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
diff --git a/src/parallel/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
similarity index 100%
rename from src/parallel/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
rename to src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
diff --git a/src/parallel/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
similarity index 100%
rename from src/parallel/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
rename to src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
diff --git a/src/parallel/metisDecomp/Make/files b/src/parallel/decompose/metisDecomp/Make/files
similarity index 100%
rename from src/parallel/metisDecomp/Make/files
rename to src/parallel/decompose/metisDecomp/Make/files
diff --git a/src/parallel/metisDecomp/Make/options b/src/parallel/decompose/metisDecomp/Make/options
similarity index 100%
rename from src/parallel/metisDecomp/Make/options
rename to src/parallel/decompose/metisDecomp/Make/options
diff --git a/src/parallel/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
similarity index 100%
rename from src/parallel/metisDecomp/metisDecomp.C
rename to src/parallel/decompose/metisDecomp/metisDecomp.C
diff --git a/src/parallel/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H
similarity index 100%
rename from src/parallel/metisDecomp/metisDecomp.H
rename to src/parallel/decompose/metisDecomp/metisDecomp.H
diff --git a/src/parallel/parMetisDecomp/Make/files b/src/parallel/decompose/parMetisDecomp/Make/files
similarity index 100%
rename from src/parallel/parMetisDecomp/Make/files
rename to src/parallel/decompose/parMetisDecomp/Make/files
diff --git a/src/parallel/parMetisDecomp/Make/options b/src/parallel/decompose/parMetisDecomp/Make/options
similarity index 100%
rename from src/parallel/parMetisDecomp/Make/options
rename to src/parallel/decompose/parMetisDecomp/Make/options
diff --git a/src/parallel/parMetisDecomp/parMetisDecomp.C b/src/parallel/decompose/parMetisDecomp/parMetisDecomp.C
similarity index 100%
rename from src/parallel/parMetisDecomp/parMetisDecomp.C
rename to src/parallel/decompose/parMetisDecomp/parMetisDecomp.C
diff --git a/src/parallel/parMetisDecomp/parMetisDecomp.H b/src/parallel/decompose/parMetisDecomp/parMetisDecomp.H
similarity index 100%
rename from src/parallel/parMetisDecomp/parMetisDecomp.H
rename to src/parallel/decompose/parMetisDecomp/parMetisDecomp.H
diff --git a/src/parallel/parMetisDecomp/parMetisDecompTemplates.C b/src/parallel/decompose/parMetisDecomp/parMetisDecompTemplates.C
similarity index 100%
rename from src/parallel/parMetisDecomp/parMetisDecompTemplates.C
rename to src/parallel/decompose/parMetisDecomp/parMetisDecompTemplates.C
diff --git a/src/parallel/scotchDecomp/Make/files b/src/parallel/decompose/scotchDecomp/Make/files
similarity index 100%
rename from src/parallel/scotchDecomp/Make/files
rename to src/parallel/decompose/scotchDecomp/Make/files
diff --git a/src/parallel/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
similarity index 100%
rename from src/parallel/scotchDecomp/Make/options
rename to src/parallel/decompose/scotchDecomp/Make/options
diff --git a/src/parallel/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
similarity index 100%
rename from src/parallel/scotchDecomp/scotchDecomp.C
rename to src/parallel/decompose/scotchDecomp/scotchDecomp.C
diff --git a/src/parallel/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
similarity index 100%
rename from src/parallel/scotchDecomp/scotchDecomp.H
rename to src/parallel/decompose/scotchDecomp/scotchDecomp.H
diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake
new file mode 100755
index 0000000000..c4badc5067
--- /dev/null
+++ b/src/parallel/reconstruct/Allwmake
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake libso reconstruct
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/reconstruct/Make/files b/src/parallel/reconstruct/reconstruct/Make/files
similarity index 100%
rename from src/parallel/reconstruct/Make/files
rename to src/parallel/reconstruct/reconstruct/Make/files
diff --git a/src/parallel/reconstruct/Make/options b/src/parallel/reconstruct/reconstruct/Make/options
similarity index 100%
rename from src/parallel/reconstruct/Make/options
rename to src/parallel/reconstruct/reconstruct/Make/options
diff --git a/src/parallel/reconstruct/fvFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.C
similarity index 100%
rename from src/parallel/reconstruct/fvFieldReconstructor.C
rename to src/parallel/reconstruct/reconstruct/fvFieldReconstructor.C
diff --git a/src/parallel/reconstruct/fvFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
similarity index 100%
rename from src/parallel/reconstruct/fvFieldReconstructor.H
rename to src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
diff --git a/src/parallel/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
similarity index 100%
rename from src/parallel/reconstruct/fvFieldReconstructorReconstructFields.C
rename to src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
diff --git a/src/parallel/reconstruct/pointFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
similarity index 100%
rename from src/parallel/reconstruct/pointFieldReconstructor.C
rename to src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
diff --git a/src/parallel/reconstruct/pointFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
similarity index 100%
rename from src/parallel/reconstruct/pointFieldReconstructor.H
rename to src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
diff --git a/src/parallel/reconstruct/pointFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
similarity index 100%
rename from src/parallel/reconstruct/pointFieldReconstructorReconstructFields.C
rename to src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
diff --git a/src/parallel/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
similarity index 100%
rename from src/parallel/reconstruct/processorMeshes.C
rename to src/parallel/reconstruct/reconstruct/processorMeshes.C
diff --git a/src/parallel/reconstruct/processorMeshes.H b/src/parallel/reconstruct/reconstruct/processorMeshes.H
similarity index 100%
rename from src/parallel/reconstruct/processorMeshes.H
rename to src/parallel/reconstruct/reconstruct/processorMeshes.H
diff --git a/src/parallel/reconstruct/reconstructLagrangian.H b/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
similarity index 100%
rename from src/parallel/reconstruct/reconstructLagrangian.H
rename to src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
diff --git a/src/parallel/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
similarity index 100%
rename from src/parallel/reconstruct/reconstructLagrangianFields.C
rename to src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
diff --git a/src/parallel/reconstruct/reconstructLagrangianPositions.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
similarity index 100%
rename from src/parallel/reconstruct/reconstructLagrangianPositions.C
rename to src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index a3888f856e..8f1343f4fe 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -800,9 +800,7 @@ void Foam::isoSurface::calcSnappedPoint
     const pointField& pts = mesh_.points();
     const pointField& cc = mesh_.cellCentres();
 
-
-    const point greatPoint(VGREAT, VGREAT, VGREAT);
-    pointField collapsedPoint(mesh_.nPoints(), greatPoint);
+    pointField collapsedPoint(mesh_.nPoints(), point::max);
 
 
     // Work arrays
@@ -966,7 +964,7 @@ void Foam::isoSurface::calcSnappedPoint
 
 
     // Synchronise snap location
-    syncUnseparatedPoints(collapsedPoint, greatPoint);
+    syncUnseparatedPoints(collapsedPoint, point::max);
 
 
     snappedPoint.setSize(mesh_.nPoints());
@@ -974,7 +972,7 @@ void Foam::isoSurface::calcSnappedPoint
 
     forAll(collapsedPoint, pointI)
     {
-        if (collapsedPoint[pointI] != greatPoint)
+        if (collapsedPoint[pointI] != point::max)
         {
             snappedPoint[pointI] = snappedPoints.size();
             snappedPoints.append(collapsedPoint[pointI]);
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index d534603b0f..4a71ac2265 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -630,8 +630,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
     labelList& snappedPoint
 ) const
 {
-    const point greatPoint(VGREAT, VGREAT, VGREAT);
-    pointField collapsedPoint(mesh_.nPoints(), greatPoint);
+    pointField collapsedPoint(mesh_.nPoints(), point::max);
 
 
     // Work arrays
@@ -764,7 +763,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
         mesh_,
         collapsedPoint,
         minEqOp<point>(),
-        greatPoint,
+        point::max,
         true                // are coordinates so separate
     );
 
@@ -773,7 +772,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
 
     forAll(collapsedPoint, pointI)
     {
-        if (collapsedPoint[pointI] != greatPoint)
+        if (collapsedPoint[pointI] != point::max)
         {
             snappedPoint[pointI] = snappedPoints.size();
             snappedPoints.append(collapsedPoint[pointI]);
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index a5155a9f49..75ff31f3b1 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -357,7 +357,7 @@ bool Foam::sampledSurfaces::update()
     if (Pstream::master() && debug)
     {
         Pout<< nl << "Merging all points within "
-            << mergeDim << " meter" << endl;
+            << mergeDim << " metre" << endl;
     }
 
     forAll(*this, surfI)
diff --git a/tutorials/Allclean b/tutorials/Allclean
index 57f63c776c..f63088cbb7 100755
--- a/tutorials/Allclean
+++ b/tutorials/Allclean
@@ -1,35 +1,4 @@
 #!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     Allclean
-#
-# Description
-#
-#------------------------------------------------------------------------------
-
 cd ${0%/*} || exit 1    # run from this directory
 
 echo "--------"
@@ -43,4 +12,5 @@ rm logs testLoopReport > /dev/null 2>&1
 foamCleanTutorials cases
 
 echo "--------"
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/Allrun b/tutorials/Allrun
index bfc2241656..098f2f94f9 100755
--- a/tutorials/Allrun
+++ b/tutorials/Allrun
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -29,7 +29,6 @@
 # Description
 #
 #------------------------------------------------------------------------------
-
 cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
@@ -37,10 +36,11 @@ cd ${0%/*} || exit 1    # run from this directory
 
 # logReport <logfile>
 # Extracts useful info from log file.
-logReport () {
-    case=`dirname $1 | sed s/"\(.*\)\.\/"/""/g`
+logReport()
+{
+    caseName=`dirname $1 | sed s/"\(.*\)\.\/"/""/g`
     app=`echo $1 | sed s/"\(.*\)\."/""/g`
-    appAndCase="Application $app - case $case"
+    appAndCase="Application $app - case $caseName"
 
     fatalError=`grep "FOAM FATAL" $1`
     UxSS=`grep -E "Ux[:| ]*solution singularity" $1`
@@ -51,11 +51,9 @@ logReport () {
     if [ "$fatalError" ]
     then
         echo "$appAndCase: ** FOAM FATAL ERROR **"
-        return
     elif [ "$UxSS" -a "$UySS" -a "$UzSS" ]
     then
         echo "$appAndCase: ** Solution singularity **"
-        return
     elif [ "$completed" ]
     then
         completionTime=`tail -10 $log | grep Execution | cut -d= -f2 | sed 's/^[ \t]*//'`
@@ -64,7 +62,6 @@ logReport () {
             completionTime="in $completionTime"
         fi
         echo "$appAndCase: completed $completionTime"
-        return
     else
         echo "$appAndCase: unconfirmed completion"
     fi
@@ -78,18 +75,18 @@ foamRunTutorials cases
 # Analyse all log files
 rm testLoopReport > /dev/null 2>&1 &
 touch testLoopReport
-for application in *
+
+for appDir in *
 do
-    if [ -d $application ]
-    then
-        cd $application
-        for log in `find . -name "log.*" | xargs ls -rt`
-        do
-            logReport $log >> ../testLoopReport
-        done
-        echo "" >> ../testLoopReport
-        cd ..
-    fi
+(
+    [ -d $appDir ] && cd $appDir || exit
+
+    for log in `find . -name "log.*" | xargs ls -rt`
+    do
+        logReport $log >> ../testLoopReport
+    done
+    echo "" >> ../testLoopReport
+)
 done
 
 find . -name "log.*" -exec cat {} \; >> logs
diff --git a/tutorials/Alltest b/tutorials/Alltest
index 5aaacba2ac..4769e04574 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -30,10 +30,10 @@
 #     quickly tests the tutorials and writes out the scheme/solver information
 #
 #------------------------------------------------------------------------------
-
 cd ${0%/*} || exit 1    # run from this directory
 
-usage() {
+usage()
+{
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
@@ -50,7 +50,8 @@ USAGE
 }
 
 
-setDefaultFvSchemes() {
+setDefaultFvSchemes()
+{
 cat<<EOF
 gradSchemes { default Gauss linear; }
 divSchemes
@@ -127,8 +128,12 @@ eval set -- "$OPTS"
 while [ $1 != -- ]
 do
     case $1 in
-        -d) DEFAULT_SCHEMES=1;;
-        -h) usage;;
+    -d)
+        DEFAULT_SCHEMES=1
+        ;;
+    -h)
+        usage
+        ;;
     esac
     shift
 done
@@ -225,5 +230,4 @@ do
     echo "" >> $SOLVERS_FILE
 done
 
-
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allclean b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
index 2bc9314020..9a9ff03ee1 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allclean
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,3 +7,5 @@
 cleanCase
 rm -rf 0
 cp -r 0.org 0
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
index e005157d09..f0ce8457aa 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -9,3 +11,5 @@ runApplication blockMesh
 runApplication boxTurb
 runApplication $application
 runApplication enstrophy
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/basic/laplacianFoam/flange/Allclean b/tutorials/basic/laplacianFoam/flange/Allclean
index 8e2a2600fe..a2e4493dcc 100755
--- a/tutorials/basic/laplacianFoam/flange/Allclean
+++ b/tutorials/basic/laplacianFoam/flange/Allclean
@@ -1,8 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf Fieldview > /dev/null 2>&1
-rm -rf EnSight > /dev/null 2>&1
+rm -rf EnSight Ensight Fieldview > /dev/null 2>&1
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun
index d6a968af46..db939bed76 100755
--- a/tutorials/basic/laplacianFoam/flange/Allrun
+++ b/tutorials/basic/laplacianFoam/flange/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -20,3 +22,5 @@ runAnsysToFoam flange.ans 0.001
 runApplication $application
 runApplication foamToFieldview9
 runApplication foamToEnsight
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/basic/potentialFoam/Allclean b/tutorials/basic/potentialFoam/Allclean
index 5e0d99b090..b81c740007 100755
--- a/tutorials/basic/potentialFoam/Allclean
+++ b/tutorials/basic/potentialFoam/Allclean
@@ -1,18 +1,25 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cd cylinder
+(
+    cd cylinder || exit
+
     cleanCase
     rm -rf 0 > /dev/null 2>&1
     cp -r 0.org 0
     wclean analyticalCylinder
-cd ..
+)
+
+
+(
+    cd pitzDaily || exit
 
-cd pitzDaily
     cleanCase
     rm -rf 0 > /dev/null 2>&1
     cp -r 0.org 0
-cd ..
+)
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
index 36e2229aa6..269683a112 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allrun
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -9,3 +11,5 @@ runApplication $application
 compileApplication analyticalCylinder
 runApplication analyticalCylinder
 runApplication streamFunction
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
index cadfe86d27..86fa0fdc4d 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,3 +9,5 @@ application=`getApplication`
 runApplication blockMesh
 runApplication $application
 runApplication streamFunction
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/XiFoam/ras/Allclean b/tutorials/combustion/XiFoam/ras/Allclean
index 04676f7732..9768a9af46 100755
--- a/tutorials/combustion/XiFoam/ras/Allclean
+++ b/tutorials/combustion/XiFoam/ras/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,12 +7,18 @@
 keepCases="moriyoshiHomogeneous"
 loseCases="moriyoshiHomogeneousPart2"
 
-for case in $keepCases
+for caseName in $keepCases
 do
-    (cd $case && foamCleanTutorials)
+(
+    cd $caseName || exit
+
+    foamCleanTutorials
+)
 done
 
-for case in $loseCases
+for caseName in $loseCases
 do
-    removeCase $case
+    removeCase $caseName
 done
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun
index 0c311946f1..6cb09e37d9 100755
--- a/tutorials/combustion/XiFoam/ras/Allrun
+++ b/tutorials/combustion/XiFoam/ras/Allrun
@@ -1,12 +1,16 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
 application="XiFoam"
 
-setControlDict () {
+setControlDict()
+{
     controlDict="system/controlDict"
+
     sed \
     -e s/"\(deltaT[ \t]*\) 5e-06;"/"\1 1e-05;"/g \
     -e s/"\(endTime[ \t]*\) 0.005;"/"\1 0.015;"/g \
@@ -15,15 +19,20 @@ setControlDict () {
     mv temp.$$ $controlDict
 }
 
+
 # Do moriyoshiHomogeneous
-(cd moriyoshiHomogeneous && foamRunTutorials)
+( cd moriyoshiHomogeneous && foamRunTutorials )
 
 # Clone case
 cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
 
 # Modify and execute
-cd moriyoshiHomogeneousPart2
+(
+    cd moriyoshiHomogeneousPart2 || exit
+
     cp -r ../moriyoshiHomogeneous/0.005 .
     setControlDict
     runApplication $application
-cd ..
+)
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allclean b/tutorials/combustion/engineFoam/kivaTest/Allclean
index ac75ee5525..77f5d34478 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allclean
+++ b/tutorials/combustion/engineFoam/kivaTest/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -8,3 +9,5 @@ rm -rf 0
 cp system/controlDict.1st system/controlDict
 cleanCase
 mv temp180 ./-180
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
index e8de444229..6c86823f99 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allrun
+++ b/tutorials/combustion/engineFoam/kivaTest/Allrun
@@ -1,32 +1,42 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
 application=`getApplication`
 
-runKivaToFoam ()
+runKivaToFoam()
 {
-    if [ -f $1/log.kivaToFoam ] ; then
-        echo "kivaToFoam already run on $1: remove log file to run"
+    if [ -f log.kivaToFoam ]
+    then
+        echo "kivaToFoam already run: remove log file to run"
     else
         echo "kivaToFoam: converting kiva file"
-        kivaToFoam -case $1 -file $2 > $1/log.kivaToFoam 2>&1
+        kivaToFoam -file $1 > log.kivaToFoam 2>&1
     fi
 }
 
-restartApplication ()
+
+restartApplication()
 {
-    if [ -f $2/log-2.$1 ] ; then
-        echo "$1 already run on $2: remove log file to run"
+    if [ -f log-2.$1 ]
+    then
+        echo "$1 already run: remove log file to run"
     else
-        echo "Running $1 on $2"
-        $1 -case $2 > $2/log-2.$1 2>&1
+        echo "Running $1"
+        $1 > log-2.$1 2>&1
     fi
 }
 
-runKivaToFoam . otape17
+
+runKivaToFoam otape17
+
 cp system/controlDict.1st system/controlDict
 runApplication $application
+
 cp system/controlDict.2nd system/controlDict
-restartApplication $application .
+restartApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
index 4d995124bb..029f052ef4 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -10,4 +12,4 @@ runApplication createPatch -overwrite
 # Run
 runApplication fireFoam
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/rhoCentralFoam/Allclean b/tutorials/compressible/rhoCentralFoam/Allclean
index 4ac5daed06..b26e6cfb8c 100755
--- a/tutorials/compressible/rhoCentralFoam/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -12,19 +13,25 @@ LadenburgJet60psi \
 biconic25-55Run35 \
 "
 
-for case in $cases
+for caseName in $cases
 do
-    if [ "$case" = "shockTube" ]
+(
+    cd $caseName || exit
+
+    if [ "$caseName" = shockTube ]
     then
-        rm -rf $case/0
-        cp -r $case/0.org $case/0
+        rm -rf 0
+        cp -r 0.org 0
     fi
 
-    (cd $case && foamCleanTutorials && cleanSamples)
+    foamCleanTutorials && cleanSamples
 
-    if [ "$case" = "biconic25-55Run35" ]
+    if [ "$caseName" = "biconic25-55Run35" ]
     then
-        rm -rf $case/constant/polyMesh/boundary
-        wclean $case/datToFoam
+        rm -rf constant/polyMesh/boundary
+        wclean datToFoam
     fi
+)
 done
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun
index d20d46fdd9..fb311218eb 100755
--- a/tutorials/compressible/rhoCentralFoam/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -14,26 +16,30 @@ LadenburgJet60psi \
 biconic25-55Run35 \
 "
 
-moveTimeMeshToConstant ()
+moveTimeMeshToConstant()
 {
    DT=`foamInfoExec -times | tail -1`
-   if [ "$DT" != 0 ] ; then
+   if [ "$DT" != 0 ]
+   then
        mv ${DT}/polyMesh/* constant/polyMesh
        rm -rf ${DT}
    fi
 }
 
-for case in $cases
-do
-    (cd $case && runApplication blockMesh)
-#
-    if [ "$case" = "shockTube" ] ; then
-        (cd $case && runApplication setFields)
-    fi
-#
-    if [ "$case" = "biconic25-55Run35" ] ; then
-        cd $case
 
+for caseName in $cases
+do
+(
+    cd $caseName || exit
+
+    runApplication blockMesh
+
+    case "$caseName" in
+    shockTube)
+        runApplication setFields
+        ;;
+
+    biconic25-55Run35)
         wmake datToFoam
         runApplication datToFoam grid256.dat
 
@@ -46,9 +52,11 @@ do
         mv $CONST/polyMesh/boundary $CONST/polyMesh/boundary.bak
         sed -f $CONST/wedgeScr $CONST/polyMesh/boundary.bak > $CONST/polyMesh/boundary
         rm $CONST/polyMesh/boundary.bak
+        ;;
+    esac
 
-        cd ..
-    fi
-#
-    (cd $case && runApplication $application)
+    runApplication $application
+)
 done
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
index 29a4f5a3e2..25ee12e0ac 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
@@ -1,43 +1,54 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 #
 # FUNCTIONS
 #
-printUsage () {
-cat <<EOF
-Usage: $0 [options]
-Runs a set of samples across the cone face and concatenates output files
+usage()
+{
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
 
-Options are:
--l         -latestTime option for sample
--h         help
-EOF
+    cat<<USAGE
+Usage: ${0##*/} [OPTION]
+
+options:
+  -l         -latestTime option for sample
+  -h         help
+
+Runs a set of samples across the cone face and concatenates output files
+USAGE
+    exit 1
 }
 
-LATEST_TIME=""
+
+unset timeOpt
 
 OPTS=`getopt hl $*`
-if [ $? -ne 0 ] ; then
-    echo "Aborting due to invalid option"
-    printUsage
-    exit 1
-fi
+[ $? -eq 0 ] || usage "Aborting due to invalid option"
+
 eval set -- "$OPTS"
-while [ $1 != -- ]; do
+while [ $1 != -- ]
+do
     case $1 in
-        -l) LATEST_TIME="-latestTime";;
-        -h) printUsage; exit 1;;
+    -l)
+        timeOpt="-latestTime"
+        ;;
+    -h)
+        usage
+        ;;
     esac
     shift
 done
 shift
 
-sample ${LATEST_TIME}
+sample $timeOpt
 SDIR="sets"
 LSDIR=`ls $SDIR | head -1`
 EXAMPLE_FILE=`ls -1 $SDIR/${LSDIR}/* | head -1`
 FS=`basename $EXAMPLE_FILE | cut -d_ -f2-`
 for d in $SDIR/*
 do
-   cat ${d}/cone25_${FS} ${d}/cone55_${FS} ${d}/base_${FS} > ${d}/biconic_${FS}
+    cat ${d}/cone25_${FS} ${d}/cone55_${FS} ${d}/base_${FS} > ${d}/biconic_${FS}
 done
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
index 4f0a80edd8..de4d74c9da 100755
--- a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -9,3 +11,5 @@ application=`getApplication`
 runApplication blockMesh
 runApplication setFields
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/Allclean b/tutorials/compressible/rhopSonicFoam/shockTube/Allclean
index 8d3637cf52..5c160040dc 100755
--- a/tutorials/compressible/rhopSonicFoam/shockTube/Allclean
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,3 +7,5 @@
 rm -rf 0
 cp -r 0.org 0
 cleanCase
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
index eede9049d7..7b90a31601 100755
--- a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,3 +9,5 @@ application=`getApplication`
 runApplication blockMesh
 runApplication setFields
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
index c8dbbe4c95..ea6950dbcc 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -7,3 +8,5 @@ cleanCase
 rm -rf 0
 cp -r 0.org 0
 cleanSamples
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
index bb2d19c9ea..05825201e7 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -9,3 +11,5 @@ runApplication setFields
 runApplication $application
 runApplication foamCalc mag U
 runApplication sample
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
index c2ae406306..03afe0bd21 100755
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
@@ -1,11 +1,13 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
 application=`getApplication`
 
-runStarToFoam ()
+runStarToFoam()
 {
     if [ -f log.star3ToFoam -o -f log.starToFoam ]
     then
@@ -24,3 +26,5 @@ rm temp
 runApplication $application
 
 # end-of-file
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/sonicLiquidFoam/Allclean b/tutorials/compressible/sonicLiquidFoam/Allclean
index 50a10d24ff..fe284d4fde 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allclean
+++ b/tutorials/compressible/sonicLiquidFoam/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 removeCase decompressionTankFine
 foamCleanTutorials cases
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
index 6d1d356b34..16f2029d18 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@@ -1,14 +1,17 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
 application="sonicLiquidFoam"
 
-setDecompressionTankFine ()
+setDecompressionTankFine()
 {
-    blockMeshDict="$1/constant/polyMesh/blockMeshDict"
-    controlDict="$1/system/controlDict"
+    blockMeshDict="constant/polyMesh/blockMeshDict"
+    controlDict="system/controlDict"
+
     sed \
     -e s/"30 20"/"120 80"/g \
     -e s/"30 5"/"120 20"/g \
@@ -16,6 +19,7 @@ setDecompressionTankFine ()
     -e s/"30 95"/"120 380"/g \
     $blockMeshDict > temp.$$
     mv temp.$$ $blockMeshDict
+
     sed \
     -e s/"\(deltaT[ \t]*\) 5e-07;"/"\1 1e-07;"/g \
     -e s/"\(endTime[ \t]*\) 0.00025;"/"\1 0.00015;"/g \
@@ -23,16 +27,22 @@ setDecompressionTankFine ()
     mv temp.$$ $controlDict
 }
 
+
 # Do decompressionTank
-(cd decompressionTank && foamRunTutorials)
+( cd decompressionTank && foamRunTutorials )
 
 # Clone case
 cloneCase decompressionTank decompressionTankFine
 
-cd decompressionTankFine
+(
+    cd decompressionTankFine || exit
+
     # Modify case
-    setDecompressionTankFine .
+    setDecompressionTankFine
+
     # And execute
     runApplication blockMesh
     runApplication $application
-cd ..
+)
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean
index 1cc972be26..2bdc236211 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
index 3c61ac798e..09d9f0ea78 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
@@ -1,7 +1,11 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
 runApplication dsmcInitialise
 runApplication dsmcFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean
index 1cc972be26..2bdc236211 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
index 3c61ac798e..09d9f0ea78 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
@@ -1,7 +1,11 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
 runApplication dsmcInitialise
 runApplication dsmcFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
index 1cc972be26..2bdc236211 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
index b369081128..71795a47e0 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ runParallel dsmcInitialise 4
 runParallel dsmcFoam 4
 runApplication reconstructPar -noLagrangian
 
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
index 1cc972be26..2bdc236211 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
index b369081128..71795a47e0 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ runParallel dsmcInitialise 4
 runParallel dsmcFoam 4
 runApplication reconstructPar -noLagrangian
 
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allclean
index d8245cb12b..5af6a2bb22 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allclean
@@ -1,22 +1,30 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cd periodicCubeArgon
+(
+    cd periodicCubeArgon || exit
+
     rm -rf 0/*
     rm -f Ar-Ar
     rm -f electrostatic
     rm -f constant/idList
     rm -rf constant/polyMesh/sets
     cleanCase
-cd ..
+)
+
+
+(
+    cd periodicCubeWater || exit
 
-cd periodicCubeWater
     rm -rf 0/*
     rm -f O-O
     rm -f electrostatic
     rm -f constant/idList
     rm -rf constant/polyMesh/sets
     cleanCase
-cd ..
+)
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun
index 59649516d9..e849cf219a 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun
@@ -1,18 +1,20 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 application="mdEquilibrationFoam"
 
-cd periodicCubeArgon
-    runApplication blockMesh
-    runApplication mdInitialise
-    runApplication $application
-cd ..
+for caseName in periodicCubeArgon periodicCubeWater
+do
+(
+    cd $caseName || exit
 
-cd periodicCubeWater
     runApplication blockMesh
     runApplication mdInitialise
     runApplication $application
-cd ..
\ No newline at end of file
+)
+done
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
index 8b3a55f408..36b77d9ac2 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,3 +7,5 @@
 rm -rf constant/polyMesh/sets
 rm -rf processor[0-9]
 cleanCase
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
index 0e158046d9..d60f30b22a 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -13,3 +15,5 @@ runParallel mdInitialise 4
 runParallel $application 4
 
 runApplication reconstructPar
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/electromagnetics/mhdFoam/Allclean b/tutorials/electromagnetics/mhdFoam/Allclean
index b30c90e13b..f7eb365e0c 100755
--- a/tutorials/electromagnetics/mhdFoam/Allclean
+++ b/tutorials/electromagnetics/mhdFoam/Allclean
@@ -1,7 +1,14 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-(cd hartmann && cleanCase)
-(cd hartmann && cleanSamples)
+(
+    cd hartmann || exit
+
+    cleanCase
+    cleanSamples
+)
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/electromagnetics/mhdFoam/Allrun b/tutorials/electromagnetics/mhdFoam/Allrun
index f664a09698..1b1a18565f 100755
--- a/tutorials/electromagnetics/mhdFoam/Allrun
+++ b/tutorials/electromagnetics/mhdFoam/Allrun
@@ -1,11 +1,19 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
 application="mhdFoam"
 
-(cd hartmann && runApplication blockMesh)
-(cd hartmann && runApplication $application)
-(cd hartmann && runApplication foamCalc components U)
-(cd hartmann && runApplication sample)
+(
+    cd hartmann || exit
+
+    runApplication blockMesh
+    runApplication $application
+    runApplication foamCalc components U
+    runApplication sample
+)
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean
index 83fcec83ec..25243dd42f 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 cp 0/T.org 0/T
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
index c3373651df..814ade458e 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
 runApplication setHotRoom
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
index 83fcec83ec..25243dd42f 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 cp 0/T.org 0/T
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
index c3373651df..814ade458e 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
 runApplication setHotRoom
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
index 79d959124f..6fa85b7103 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -6,3 +8,4 @@ runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 runApplication buoyantBoussinesqSimpleFoam
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allclean
index 4310b6e01a..536b51a14e 100755
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,3 +7,5 @@
 cleanCase
 cp 0/T.org 0/T
 wclean setHotRoom
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
index e9bbb2d0c0..3aafa6fd94 100755
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -9,3 +11,5 @@ compileApplication setHotRoom
 runApplication blockMesh
 runApplication setHotRoom
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
index c5ab4caba9..7f995e0041 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
@@ -1,7 +1,11 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf sets
-(cd validation && rm -f *.eps)
+rm -f validation/*.eps
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
index 5a8beb93c5..66c6a95897 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,4 +10,7 @@ application="buoyantSimpleFoam"
 runApplication blockMesh
 runApplication $application
 runApplication sample -latestTime
-(cd validation && ./createGraphs)
+
+( cd validation && ./createGraphs )
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
index 74eadd7127..0dec7ee1b6 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
@@ -32,7 +32,8 @@
 #
 #------------------------------------------------------------------------------
 
-createEpsT() {
+createEpsT()
+{
     index=$1
     OF=$2
     EXPT=$3
@@ -54,7 +55,8 @@ EOF
 }
 
 
-createEpsU() {
+createEpsU()
+{
     index=$1
     OF=$2
     EXPT=$3
@@ -78,7 +80,8 @@ EOF
 
 # test if gnuplot exists on the system
 type -P gnuplot &>/dev/null || {
-    echo "gnuplot not found - skipping graph creation" >&2; exit 1;
+    echo "gnuplot not found - skipping graph creation" >&2
+    exit 1
 }
 
 # paths to data
@@ -89,7 +92,8 @@ EXPTDATAROOT=./exptData
 
 # generate temperature profiles
 TSets="1 3 4 5 6 7 9"
-for i in $TSets; do
+for i in $TSets
+do
     echo "    processing temperature profile at y/yMax of 0.$i"
 
     OF="$OFDATAROOT/y0.${i}_T.xy"
@@ -101,7 +105,8 @@ done
 
 # generate velocity profiles
 USets="1 3 4 5 6 7 9"
-for i in $USets; do
+for i in $USets
+do
     echo "    processing velocity profile at y/yMax of 0.$i"
 
     OF="$OFDATAROOT/y0.${i}_U.xy"
@@ -110,6 +115,6 @@ for i in $USets; do
     createEpsU $i $OF $EXPT
 done
 
-echo "done"
+echo Done
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allclean
index 83fcec83ec..25243dd42f 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 cp 0/T.org 0/T
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
index c3373651df..814ade458e 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
 runApplication setHotRoom
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
index a76e8dff53..01acce5670 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -18,4 +19,4 @@ rm -rf constant/heater/polyMesh
 rm -rf constant/leftSolid/polyMesh
 rm -rf constant/rightSolid/polyMesh
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index 231c46e6ec..8a25708db6 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -58,4 +60,4 @@ do
    paraFoam -touch -region $i
 done
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
index a76e8dff53..01acce5670 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -18,4 +19,4 @@ rm -rf constant/heater/polyMesh
 rm -rf constant/leftSolid/polyMesh
 rm -rf constant/rightSolid/polyMesh
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index 5b96ab937d..d5e2652222 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -55,4 +57,4 @@ do
    paraFoam -touch -region $i
 done
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
index 836276fe9c..9210b03c39 100755
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -7,3 +9,5 @@ application=`getApplication`
 
 ./makeMesh
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
index 539f35641f..b333f4acc2 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
@@ -20,32 +20,32 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform (10 0 0);
     }
 
-    outlet          
+    outlet
     {
         //type            zeroGradient;
         type            inletOutlet;
         inletValue      uniform (0 0 0);
     }
 
-    upperWall       
+    upperWall
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    lowerWall       
+    lowerWall
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
index 2fdbc699de..e25eb90eee 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
@@ -20,13 +20,13 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform (-1 0 0);
     }
 
-    outlet          
+    outlet
     {
         //type            zeroGradient;
         //type            inletOutlet;
@@ -35,19 +35,19 @@ boundaryField
         value           uniform (0 0 0);
     }
 
-    upperWall       
+    upperWall
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    lowerWall       
+    lowerWall
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
index 86135d2627..0fdd33ec47 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
@@ -20,28 +20,28 @@ internalField   uniform 0;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    upperWall       
+    upperWall
     {
         type            zeroGradient;
     }
 
-    lowerWall       
+    lowerWall
     {
         type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
index 225a69938a..819d2fcaff 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
@@ -20,28 +20,28 @@ internalField   uniform 0;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            adjointOutletPressure;
         value           uniform 0;
     }
 
-    upperWall       
+    upperWall
     {
         type            zeroGradient;
     }
 
-    lowerWall       
+    lowerWall
     {
         type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/polyMesh/blockMeshDict
index ff3dc92a19..bc6201ea3d 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/polyMesh/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 convertToMeters 0.001;
 
-vertices        
+vertices
 (
     (-20.6 0 -0.5)
     (-20.6 3 -0.5)
@@ -64,7 +64,7 @@ vertices
     (290 16.6 0.5)
 );
 
-blocks          
+blocks
 (
     hex (0 6 7 1 22 28 29 23) (18 7 1) simpleGrading (0.5 1.8 1)
     hex (1 7 8 2 23 29 30 24) (18 10 1) simpleGrading (0.5 4 1)
@@ -81,19 +81,19 @@ blocks
     hex (14 20 21 15 36 42 43 37) (25 13 1) simpleGrading (2.5 0.25 1)
 );
 
-edges           
+edges
 (
 );
 
-patches         
+patches
 (
-    patch inlet 
+    patch inlet
     (
         (0 22 23 1)
         (1 23 24 2)
         (2 24 25 3)
     )
-    patch outlet 
+    patch outlet
     (
         (16 17 39 38)
         (17 18 40 39)
@@ -101,13 +101,13 @@ patches
         (19 20 42 41)
         (20 21 43 42)
     )
-    wall upperWall 
+    wall upperWall
     (
         (3 25 31 9)
         (9 31 37 15)
         (15 37 43 21)
     )
-    wall lowerWall 
+    wall lowerWall
     (
         (0 6 28 22)
         (6 5 27 28)
@@ -115,7 +115,7 @@ patches
         (4 10 32 26)
         (10 16 38 32)
     )
-    empty frontAndBack 
+    empty frontAndBack
     (
         (22 28 29 23)
         (23 29 30 24)
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
index f236efc56e..53e777c12c 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -7,3 +8,5 @@ cleanCase
 
 rm -rf logs
 rm -f *.eps yPlus_vs_uPlus
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
index 6f45774974..9a27a17f14 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -9,7 +10,8 @@ exponents="2 3 4 5 6 7 8"
 
 echo "# yPlus vs uPlus" > yPlus_vs_uPlus
 
-for e in $exponents; do
+for e in $exponents
+do
     echo "    Setting nu to 1e-$e"
 
     sed "s/XXX/$e/g" constant/transportProperties.template \
@@ -25,7 +27,8 @@ for e in $exponents; do
 
     mv log.foamLog log.foamLog_$e
 
-    if [ -e logs/yPlus_0 ]; then
+    if [ -e logs/yPlus_0 ]
+    then
         yPlus=`awk < logs/yPlus_0 'END{print $2}'`
         uPlus=`awk < logs/uPlus_0 'END{print $2}'`
 
@@ -39,7 +42,8 @@ done
 # create validation plot
 # test if gnuplot exists on the system
 type -P gnuplot &>/dev/null || {
-    echo "gnuplot not found - skipping graph creation" >&2; exit 1;
+    echo "gnuplot not found - skipping graph creation" >&2
+    exit 1
 }
 graphName="OF_vs_ANAYTICAL.eps"
 
@@ -65,5 +69,6 @@ gnuplot<<EOF
         "yPlus_vs_uPlus" title "OpenFOAM" with points lt 1 pt 6
 EOF
 
+echo Done
 
-echo "done"
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/channelFoam/channel395/Allrun b/tutorials/incompressible/channelFoam/channel395/Allrun
index 05cd6dfdf0..61c1b54530 100755
--- a/tutorials/incompressible/channelFoam/channel395/Allrun
+++ b/tutorials/incompressible/channelFoam/channel395/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ application=`getApplication`
 runApplication blockMesh
 runApplication $application
 runApplication postChannel
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/icoFoam/Allclean b/tutorials/incompressible/icoFoam/Allclean
index 4ead7ee3ea..c09ae6c8d9 100755
--- a/tutorials/incompressible/icoFoam/Allclean
+++ b/tutorials/incompressible/icoFoam/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,17 +7,23 @@
 keepCases="cavity cavityGrade cavityClipped elbow"
 loseCases="cavityFine cavityHighRe"
 
-for case in $keepCases
+for caseName in $keepCases
 do
-    (cd $case && foamCleanTutorials)
+(
+    cd $caseName || exit
 
-    if [ "$case" = "elbow" ]
+    foamCleanTutorials
+
+    if [ "$caseName" = elbow ]
     then
-        rm -rf $case/fluentInterface
+        rm -rf fluentInterface
     fi
+)
 done
 
-for case in $loseCases
+for caseName in $loseCases
 do
-    removeCase $case
+    removeCase $caseName
 done
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun
index 1a93d4eb32..185f95b979 100755
--- a/tutorials/incompressible/icoFoam/Allrun
+++ b/tutorials/incompressible/icoFoam/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,34 +9,34 @@ application="icoFoam"
 
 cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped"
 
-runMapFields ()
+runMapFields()
 {
     echo "Running mapFields from $1 to $2"
     mapFields $1 -case $2 -sourceTime latestTime > $2/log.mapFields 2>&1
 }
 
-runMapFieldsConsistent ()
+runMapFieldsConsistent()
 {
     echo "Running mapFields from $1 to $2"
     mapFields $1 -case $2 -sourceTime latestTime -consistent > $2/log.mapFields 2>&1
 }
 
-runFluentMeshToFoam ()
+runFluentMeshToFoam()
 {
     echo "fluentMeshToFoam: converting mesh $2"
     fluentMeshToFoam $2 -case $1 > $1/log.fluentMeshToFoam 2>&1
 }
 
-copySolutionDirs ()
+copySolutionDirs()
 {
     echo "Copying $2/0* directory to $1"
     cp -r $2/0* $1
 }
 
-setCavityFine ()
+setCavityFine()
 {
-    blockMeshDict="$case/constant/polyMesh/blockMeshDict"
-    controlDict="$case/system/controlDict"
+    blockMeshDict="$caseName/constant/polyMesh/blockMeshDict"
+    controlDict="$caseName/system/controlDict"
     sed s/"20 20 1"/"41 41 1"/g $blockMeshDict > temp.$$
     mv temp.$$ $blockMeshDict
     sed \
@@ -47,11 +49,11 @@ setCavityFine ()
     mv temp.$$ $controlDict
 }
 
-setCavityHighRe ()
+setCavityHighRe()
 {
     echo "Setting cavityHighRe to generate a secondary vortex"
-    controlDict="$case/system/controlDict"
-    transportProperties="$case/constant/transportProperties"
+    controlDict="$caseName/system/controlDict"
+    transportProperties="$caseName/constant/transportProperties"
     sed \
     -e s/"\(startFrom[ \t]*\) startTime;"/"\1 latestTime;"/g \
     -e s/"\(endTime[ \t]*\) 0.5;"/"\1 2.0;"/g \
@@ -61,47 +63,53 @@ setCavityHighRe ()
     mv temp.$$ $transportProperties
 }
 
-for case in $cavityCases
+
+for caseName in $cavityCases
 do
-    if [ "$case" = "cavityFine" ]
+    if [ "$caseName" = cavityFine ]
     then
-        cloneCase cavity $case
+        cloneCase cavity $caseName
         setCavityFine
     fi
 
-    if [ "$case" = "cavityHighRe" ]
+    if [ "$caseName" = cavityHighRe ]
     then
-        cloneCase cavity $case
+        cloneCase cavity $caseName
         setCavityHighRe
-        copySolutionDirs $case cavity
+        copySolutionDirs $caseName cavity
     fi
 
-    (cd $case && runApplication blockMesh)
-#
-    if [ "$case" = "cavityFine" -o "$case" = "cavityGrade" ]
-    then
-        runMapFieldsConsistent $previousCase $case
-    fi
+    ( cd $caseName && runApplication blockMesh )
 
-    if [ "$case" = "cavityClipped" ]
-    then
-        cp -r $case/0 $case/0.5
-        runMapFields cavity $case
-        if [ ".`grep nonuniform $case/0.5/U`" != "." ]
+    case "$caseName" in
+    cavityFine | cavityGrade)
+        runMapFieldsConsistent $previousCase $caseName
+        ;;
+    cavityClipped)
+        cp -r $caseName/0 $caseName/0.5
+        runMapFields cavity $caseName
+        if [ ".`grep nonuniform $caseName/0.5/U`" != "." ]
         then
-            sed -f resetFixedWallsScr $case/0.5/U > $case/0.5/U.temp
-            mv $case/0.5/U.temp $case/0.5/U
+            sed -f resetFixedWallsScr $caseName/0.5/U > $caseName/0.5/U.temp
+            mv $caseName/0.5/U.temp $caseName/0.5/U
         fi
-    fi
-#
-    previousCase="$case"
-#
-    (cd $case && runApplication $application)
+        ;;
+    esac
+
+    previousCase="$caseName"
+    ( cd $caseName && runApplication $application )
 done
 
 # elbow case for testing Fluent-FOAM conversion tools
 
 runFluentMeshToFoam elbow elbow/elbow.msh
-(cd elbow && runApplication $application)
-(cd elbow && runApplication foamMeshToFluent)
-(cd elbow && runApplication foamDataToFluent)
+
+(
+    cd elbow || exit
+
+    runApplication $application
+    runApplication foamMeshToFluent
+    runApplication foamDataToFluent
+)
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
index aeb984814c..5cf2386bfa 100755
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ application=`getApplication`
 runApplication blockMesh
 runApplication changeDictionary
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
index 35e38c65c5..e0102f95da 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
@@ -1,6 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Clean time folders only
 
 rm -rf *[1-9]*
 rm -f log.* 2>/dev/null
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
index 411704d783..581f444839 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -6,3 +7,5 @@
 application=`getApplication`
 
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 7e6037f4cd..802112d8b8 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -6,3 +8,4 @@ runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 runApplication simpleFoam
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
index 945c8974df..a67553deb1 100755
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -12,3 +13,5 @@ runApplication blockMesh
 runApplication cellSet
 
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
index 1dac791f4b..3f10797055 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -13,3 +14,5 @@ rm -rf postProcessing
 
 # copy 0.org to 0
 cp -r 0.org 0
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
index 04eb8794e0..b44a7c8e2f 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -22,3 +23,5 @@ createBaffles cycLeft cycLeft -overwrite >& log.createBaffles1
 createBaffles cycRight cycRight -overwrite >& log.createBaffles2
 
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allclean
index fbf6469b87..6ac02e9eab 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allclean
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
@@ -11,3 +13,4 @@ cp -r 0.org 0
 
 cleanCase
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allrun
index 6eb3715e65..40f241728a 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -11,3 +13,5 @@ rm -f 0/phi
 
 # run the solver
 runApplication porousExplicitSourceReactingParcelFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/snappyHexMesh/Allrun b/tutorials/mesh/snappyHexMesh/Allrun
index 90979fcb05..d15026b3b0 100755
--- a/tutorials/mesh/snappyHexMesh/Allrun
+++ b/tutorials/mesh/snappyHexMesh/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 exit 0
 
@@ -7,3 +8,4 @@ exit 0
 
 # This dummy Allrun script avoids meshing these cases twice.
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allclean b/tutorials/multiphase/cavitatingFoam/les/Allclean
index 35d86a2121..fae8abfab6 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/les/Allclean
@@ -1,17 +1,23 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cd throttle
+(
+    cd throttle || exit
+
     rm -rf constant/polyMesh/sets > /dev/null 2>&1
     rm -rf 0/polyMesh > /dev/null 2>&1
     rm system/cellSetDict > /dev/null 2>&1
 
     cleanCase
-cd ..
+)
+
+
+(
+    cd throttle3D || exit
 
-cd throttle3D
     rm -rf constant/polyMesh/sets > /dev/null 2>&1
     rm -rf 0 > /dev/null 2>&1
     cp -r 0.org 0
@@ -19,5 +25,6 @@ cd throttle3D
     rm -rf processor[0-9] > /dev/null 2>&1
 
     cleanCase
-cd ..
+)
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
index c6b98bda75..caff26f571 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -20,13 +21,19 @@ refineMeshByCellSet()
    done
 }
 
-cd throttle
+
+(
+    cd throttle || exit
+
     runApplication blockMesh
     refineMeshByCellSet 1 2 3
     runApplication $application
-cd ..
+)
+
+
+(
+    cd throttle3D || exit
 
-cd throttle3D
     cp -r 0.org 0
 
     runApplication blockMesh
@@ -38,5 +45,6 @@ cd throttle3D
     runApplication decomposePar
     runParallel $application 4
     runApplication reconstructPar
-cd ..
+)
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
index 224fbd6f0e..96f4954120 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -7,3 +8,5 @@ rm -rf constant/polyMesh/sets > /dev/null 2>&1
 rm -rf 0/polyMesh > /dev/null 2>&1
 rm system/cellSetDict > /dev/null 2>&1
 cleanCase
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 7f095c44f1..878222cf80 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -23,3 +24,4 @@ runApplication blockMesh
 refineMeshByCellSet 1 2 3
 runApplication $application
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
index a3d54875d4..2e0fd036f2 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -10,3 +12,5 @@ cp 0/alpha1.org 0/alpha1
 cp 0/p.org 0/p
 runApplication setFields
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
index 99cd62d923..6633e983d1 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
@@ -1,5 +1,8 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf processor*
 rm -rf 0/p.gz 0/alpha1.gz
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
index 695ef4d671..c77d2e8fc2 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -12,3 +14,5 @@ runApplication setFields
 runApplication decomposePar
 runParallel $application 4
 runApplication reconstructPar
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
index ce475808de..deafedf7a6 100755
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,3 +9,5 @@ runApplication setSet -batch createObstacle.setSet
 runApplication subsetMesh c0 -patch walls
 runApplication setFields
 runApplication interDyMFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
index 2cd0673fdd..2c6db87c7f 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -8,3 +9,4 @@ rm -rf 0 > /dev/null 2>&1
 
 cleanCase
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
index 7c7ab52940..8016666d73 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -24,4 +25,4 @@ cp -r 0.org 0 > /dev/null 2>&1
 runApplication setFields
 runApplication $application
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
index 20c2a63671..a65375ff72 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
@@ -1,4 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
index 0d2a8c8222..593a959d00 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,3 +9,5 @@ runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
index 20c2a63671..a65375ff72 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
@@ -1,4 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
index 0d2a8c8222..593a959d00 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,3 +9,5 @@ runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
index 20c2a63671..a65375ff72 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
@@ -1,4 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
index 0d2a8c8222..593a959d00 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,3 +9,5 @@ runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
index 20c2a63671..a65375ff72 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
@@ -1,4 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
index 0d2a8c8222..593a959d00 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,3 +9,5 @@ runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
index 20c2a63671..a65375ff72 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
@@ -1,4 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
index 0d2a8c8222..593a959d00 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -7,3 +9,5 @@ runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
index 069278e17c..4b3e979c4a 100755
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
@@ -1,4 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf 0/alpha1.gz
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
index aaf67a1250..9b42e0115f 100755
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -6,3 +8,5 @@ runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
index 99a20900eb..a718eaf7e6 100755
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -7,3 +8,5 @@ application=`getApplication`
 
 runApplication ./makeMesh
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/laminar/Allclean b/tutorials/multiphase/interFoam/laminar/Allclean
index 6ad97e1a0b..114bd5f0cb 100755
--- a/tutorials/multiphase/interFoam/laminar/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,17 +7,23 @@
 keepCases="damBreak"
 loseCases="damBreakFine"
 
-for case in $keepCases
+for caseName in $keepCases
 do
-    (cd $case && foamCleanTutorials)
+(
+    cd $caseName || exit
 
-    if [ "$case" = "damBreak" ]
+    foamCleanTutorials
+
+    if [ "$caseName" = damBreak ]
     then
-        cp $case/0/alpha1.org $case/0/alpha1
+        cp 0/alpha1.org 0/alpha1
     fi
+)
 done
 
-for case in $loseCases
+for caseName in $loseCases
 do
-    removeCase $case
+    removeCase $caseName
 done
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 03ffbeecde..3b03260773 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@@ -1,14 +1,17 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
 application="interFoam"
 
-setDamBreakFine ()
+setDamBreakFine()
 {
     blockMeshDict="constant/polyMesh/blockMeshDict"
     controlDict="system/controlDict"
+
     sed \
     -e s/"23 8"/"46 10"/g \
     -e s/"19 8"/"40 10"/g \
@@ -17,6 +20,7 @@ setDamBreakFine ()
     -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \
     $blockMeshDict > temp.$$
     mv temp.$$ $blockMeshDict
+
     sed \
     -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \
     -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \
@@ -25,23 +29,30 @@ setDamBreakFine ()
 }
 
 # Do damBreak
-cd damBreak
+(
+    cd damBreak || exit
+
     runApplication blockMesh
     runApplication setFields
     runApplication $application
-cd ..
+)
 
 # Clone case
 cloneCase damBreak damBreakFine
 
-cd damBreakFine
+(
+    cd damBreakFine || exit
+
     # Modify case
     setDamBreakFine
     cp ../damBreak/0/alpha1.org 0/alpha1
+
     # And execute
     runApplication blockMesh
     runApplication setFields
     runApplication decomposePar
     runParallel $application 4
     runApplication reconstructPar
-cd ..
+)
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
index 0bf8736235..cb4e2bd792 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
@@ -1,7 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 cp constant/polyMesh/boundary.org constant/polyMesh/boundary
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index 655eb4c887..c233dfa356 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@@ -1,24 +1,31 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
 application=`getApplication`
 
-runRefineMesh ()
+runRefineMesh()
 {
     echo "Running refineMesh on $PWD"
     refineMesh -dict > log.refineMesh 2>&1
 }
 
+
 runApplication blockMesh
 
 i=1
-if [ -f log.cellSet ] ; then
-   i=3
+if [ -f log.cellSet ]
+then
+    i=3
 fi
-while [ "$i" -lt 3 ] ; do
-    if [ -f log.cellSet ] ; then
+
+while [ "$i" -lt 3 ]
+do
+    if [ -f log.cellSet ]
+    then
         mv log.cellSet log.cellSet.1
     fi
     cp system/cellSetDict.${i} system/cellSetDict
@@ -31,3 +38,5 @@ done
 cp constant/polyMesh/boundary.org constant/polyMesh/boundary
 
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/Allclean b/tutorials/multiphase/interFoam/ras/Allclean
index 6ad97e1a0b..114bd5f0cb 100755
--- a/tutorials/multiphase/interFoam/ras/Allclean
+++ b/tutorials/multiphase/interFoam/ras/Allclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,17 +7,23 @@
 keepCases="damBreak"
 loseCases="damBreakFine"
 
-for case in $keepCases
+for caseName in $keepCases
 do
-    (cd $case && foamCleanTutorials)
+(
+    cd $caseName || exit
 
-    if [ "$case" = "damBreak" ]
+    foamCleanTutorials
+
+    if [ "$caseName" = damBreak ]
     then
-        cp $case/0/alpha1.org $case/0/alpha1
+        cp 0/alpha1.org 0/alpha1
     fi
+)
 done
 
-for case in $loseCases
+for caseName in $loseCases
 do
-    removeCase $case
+    removeCase $caseName
 done
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index c01559fc77..059151a12c 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -1,14 +1,17 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
 application="interFoam"
 
-setDamBreakFine ()
+setDamBreakFine()
 {
     blockMeshDict="constant/polyMesh/blockMeshDict"
     controlDict="system/controlDict"
+
     sed \
     -e s/"23 8"/"46 10"/g \
     -e s/"19 8"/"40 10"/g \
@@ -17,6 +20,7 @@ setDamBreakFine ()
     -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \
     $blockMeshDict > temp.$$
     mv temp.$$ $blockMeshDict
+
     sed \
     -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \
     -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \
@@ -25,19 +29,24 @@ setDamBreakFine ()
 }
 
 # Do damBreak
-(cd damBreak && foamRunTutorials)
+( cd damBreak && foamRunTutorials )
 
 # Clone case
 cloneCase damBreak damBreakFine
 
-cd damBreakFine
+(
+    cd damBreakFine || exit
+
     # Modify case
     setDamBreakFine
     cp ../damBreak/0/alpha1.org 0/alpha1
+
     # And execute
     runApplication blockMesh
     runApplication setFields
     runApplication decomposePar
     runParallel $application 4
     runApplication reconstructPar
-cd ..
+)
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
index 90917ec795..31c6c104c4 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ application=`getApplication`
 runApplication blockMesh
 runApplication setFields
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
index cff4dbd231..ec47d1656a 100755
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
@@ -1,4 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf 0/alpha[1-3].gz
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
index 15f6fafd90..ea8cb0136a 100755
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -8,3 +10,5 @@ cp 0/alpha2.org 0/alpha2
 cp 0/alpha3.org 0/alpha3
 runApplication setFields
 runApplication interMixingFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
index 849b5fd3e7..019100e5d8 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -12,3 +13,4 @@ runApplication snappyHexMesh -overwrite
 # Run the solver
 runApplication interPhaseChangeFoam
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
index 35e38c65c5..e0102f95da 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
@@ -1,6 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Clean time folders only
 
 rm -rf *[1-9]*
 rm -f log.* 2>/dev/null
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
index 411704d783..581f444839 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -6,3 +7,5 @@
 application=`getApplication`
 
 runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/wmake/rules/General/coco-cpp b/wmake/rules/General/coco-cpp
index e5da9c3395..94264971dc 100644
--- a/wmake/rules/General/coco-cpp
+++ b/wmake/rules/General/coco-cpp
@@ -6,9 +6,8 @@
 .SUFFIXES: .atg
 
 atgtoo =  \
-    $(WM_THIRD_PARTY_DIR)/coco-cpp/platforms/$(WM_ARCH)$(WM_COMPILER)/bin/coco-cpp \
+    $(WM_THIRD_PARTY_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)/coco-cpp/bin/coco-cpp \
     -single \
-    -frames $(WM_THIRD_PARTY_DIR)/coco-cpp/platforms/share/coco-cpp \
     $$SOURCE -o $(OBJECTS_DIR) && \
     $(CC) $(c++FLAGS) -c $*.cpp -o $@
 
diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index cac2a639a5..405ce98dc2 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -22,7 +22,7 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     Makefile
 #
 # Description
diff --git a/wmake/src/makeParserCode b/wmake/src/makeParserCode
new file mode 100755
index 0000000000..1feb1fe6ed
--- /dev/null
+++ b/wmake/src/makeParserCode
@@ -0,0 +1,55 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     makeParserCode
+#
+# Description
+#     Use coco-cpp to create parser code
+#
+#------------------------------------------------------------------------------
+cd ${0%/*} || exit 1    # run from this directory
+
+
+bindir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/coco-cpp/bin
+frames=$bindir/../share/coco-cpp
+
+[ -d "$bindir" -a -x "$bindir/coco-cpp" ] || {
+    echo "no coco-cpp binary found"
+    exit 1
+}
+
+[ -d "$frames" -a -f "$frames/Parser.frame" -a -f "$frames/Scanner.frame" ] || {
+    echo "no coco-cpp frames found"
+    exit 1
+}
+
+# run coco-cpp:
+$bindir/coco-cpp wmkdependParser.atg
+
+echo
+echo Done
+
+#------------------------------------------------------------------------------
diff --git a/wmake/src/wmkdep.l b/wmake/src/wmkdep.l
index e4422104ad..08c9b5149b 100644
--- a/wmake/src/wmkdep.l
+++ b/wmake/src/wmkdep.l
@@ -27,16 +27,16 @@ Application
     wmkdep
 
 Description
-    A fast dependency list generator that emulates the behaviour and
-    output of cpp -M. However, the output contains no duplications and
-    is ~40% faster than cpp.
+    A fast dependency list generator that emulates the behaviour and the
+    output of cpp -M. However, the output contains no duplicates and
+    is approx. 40% faster than cpp.
 
     The algorithm uses flex to scan for includes and searches the files
     found.  Each file is entered into a hash table so that files are scanned
     only once.  This is why this program is faster than cpp.
 
 Usage
-    wmkdep [ -Idirectory ... -Idirectory ] filename
+    wmkdep [ -Idir ... -Idir ] [ -iheader .. -iheader ] filename
 
 \*---------------------------------------------------------------------------*/
 
@@ -50,7 +50,7 @@ Usage
 
 void nextFile(const char* fileName);
 void importFile(const char* fileName);
-void importDirectory(const char* dirName);
+void importDir(const char* dirName);
 
 #   undef yywrap        /* sometimes a macro by default */
 
@@ -76,7 +76,7 @@ void importDirectory(const char* dirName);
 <JFNAME>sun.*;            BEGIN(INITIAL);
 <JFNAME>launcher.*;       BEGIN(INITIAL);
 <JFNAME>[^"\n*]*;       { BEGIN(INITIAL); importFile(yytext); } /*"*/
-<JFNAME>[^"\n]*\*;      { BEGIN(INITIAL); importDirectory(yytext); } /*"*/
+<JFNAME>[^"\n]*\*;      { BEGIN(INITIAL); importDir(yytext); } /*"*/
 
 "      "include[ \t]+\'   BEGIN(FFNAME);  /* FORTRAN-file name */
 <FFNAME>[^']*           { BEGIN(INITIAL); nextFile(yytext); } /*'*/
@@ -86,155 +86,24 @@ void importDirectory(const char* dirName);
 %%
 
 
-int nDirectories;
-char** directories;
-char* sourceFile = NULL;
-char* sourceExt = NULL;
-char* objectFile = NULL;
-char* classFile = NULL;
-char* depFile = NULL;
-
-int main(int argc, char* argv[])
-{
-    char *dotPtr, *slashPtr;
-    int i;
-
-    if (argc == 1)
-    {
-        fprintf(stderr,"input file not supplied\n");
-        exit(1);
-    }
-
-    sourceFile = (char*)malloc(strlen(argv[argc-1]) + 1);
-    strcpy(sourceFile, argv[argc-1]);
-    fprintf(stderr, "Making dependency list for source file %s\n", sourceFile);
-
-
-    /* Get list of -I directories. */
-    nDirectories = 0;
-
-    for (i = 1; i < argc; i++)
-    {
-        if (strncmp(argv[i], "-I", 2) == 0)
-        {
-            nDirectories++;
-        }
-    }
-
-    directories = (char**)malloc(sizeof(char*)*nDirectories);
-
-    nDirectories = 0;
-
-    for (i = 1; i < argc; i++)
-    {
-        if (strncmp(argv[i], "-I", 2) == 0)
-        {
-            directories[nDirectories++] = strdup(argv[i] + 2);
-        }
-    }
-
-
-
-    if ((dotPtr = strrchr(sourceFile, '.')) == NULL)
-    {
-        fprintf
-        (
-            stderr,
-            "Cannot find extension in source file name %s\n",
-            sourceFile
-        );
-        exit(1);
-    }
-
-    if ((slashPtr = strrchr(sourceFile, '/')) == NULL)
-    {
-        slashPtr = sourceFile;
-    }
-    else
-    {
-        slashPtr++;
-    }
-
-    sourceExt = (char*)malloc(strlen(sourceFile));
-    sourceExt[0] = 0;
-    strncat
-    (
-        sourceExt,
-        dotPtr+1,
-        (&sourceFile[strlen(sourceFile) - 1] - dotPtr)/sizeof(char)
-    );
-
-    /*
-     * initialise depFile to zero and use strncat rather than strncpy
-     * because there is a bug in the SGI strncat that if 0 preceeds the '.'
-     * it inserts a space
-     */
-    depFile = (char*)malloc(strlen(sourceFile) + 3);
-    depFile[0] = 0;
-    strncat(depFile, sourceFile, (dotPtr - sourceFile)/sizeof(char));
-    strcat(depFile, ".dep");
-
-    if (strcmp(sourceExt, "java") == 0)
-    {
-        classFile = (char*)malloc(strlen(sourceFile) + 17);
-        strcpy(classFile, "$(CLASSES_DIR)/");
-        strncat(classFile, sourceFile, (dotPtr - sourceFile)/sizeof(char));
-        strcat(classFile, ".class");
-
-        printf("%s: %s\n", classFile, depFile);
-    }
-    else
-    {
-        objectFile = (char*)malloc(strlen(sourceFile) + 16);
-        strcpy(objectFile, "$(OBJECTS_DIR)/");
-        strncat(objectFile, slashPtr, (dotPtr - slashPtr)/sizeof(char));
-        strcat(objectFile, ".o");
-
-        printf("%s: %s\n", objectFile, depFile);
-    }
-
-    nextFile(sourceFile);
-    yylex();
-
-
-    for (i = 0; i < nDirectories; i++)
-    {
-        free(directories[i]);
-    }
-    free(directories);
-
-    free(sourceFile);
-    free(sourceExt);
-    free(objectFile);
-    free(classFile);
-    free(depFile);
-
-    return 0;
-}
-
-
-int currentBuffer = 0;                     /* Buffer pointer stack counter */
-YY_BUFFER_STATE buffers[FILE_STACK_SIZE];  /* Buffer pointer stack */
-
-/* file name entry in hash table */
-
-struct FileName
+/* char* entry in hash table */
+struct HashEntry
 {
     char* name;
-    struct FileName* next;
+    struct HashEntry* next;
 };
 
-struct FileName* fileHashTable[HASH_TABLE_SIZE];   /* File hash table */
-struct FileName* dirHashTable[HASH_TABLE_SIZE];    /* Directory hash table */
 
-
-/* lookup name in hash table, if not found insert in table */
-
-int lookUp(struct FileName** hashTable, const char* p)
+/*
+ * lookup name in hash table.
+ * if found - return 1
+ * if not found - insert in table and return 0
+ */
+int lookUp(struct HashEntry** hashTable, const char* p)
 {
     int ii = 0;
-    struct FileName* n;
-    struct FileName* nn;
+    struct HashEntry* n;
+    struct HashEntry* nn;
 
     /* hash */
     const char* pp = p;
@@ -253,9 +122,8 @@ int lookUp(struct FileName** hashTable, const char* p)
     }
 
     /* insert */
-    nn = (struct FileName*)malloc(sizeof(struct FileName));
-    nn->name = (char*)malloc(strlen(p)+1);
-    strcpy(nn->name, p);
+    nn = (struct HashEntry*)malloc(sizeof(struct HashEntry));
+    nn->name = strdup(p);
     nn->next = hashTable[ii];
     hashTable[ii] = nn;
 
@@ -264,17 +132,152 @@ int lookUp(struct FileName** hashTable, const char* p)
 }
 
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* Add a directory name to the file name */
 
-char* addDirectoryName(const char* directoryName, const char* fileName)
+int nDirectories = 0;
+char** directories;
+char* sourceFile = NULL;
+char* depFile = NULL;
+
+/* Set of files already visited */
+struct HashEntry* visitedFiles[HASH_TABLE_SIZE];
+
+/* Set of (java) directories already visited */
+struct HashEntry* visitedDirs[HASH_TABLE_SIZE];
+
+
+int main(int argc, char* argv[])
 {
-    char* pathName;
-    pathName = (char*)malloc(strlen(directoryName) + strlen(fileName) + 2);
+    char *basePos, *dotPos;
+    int i;
 
-    strcpy(pathName, directoryName);
+    if (argc == 1)
+    {
+        fprintf(stderr, "input file not supplied\n");
+        exit(1);
+    }
 
-    if (directoryName[strlen(directoryName)-1] != '/')
+    sourceFile = strdup(argv[argc-1]);
+    fprintf(stderr, "Making dependency list for source file %s\n", sourceFile);
+
+
+    if ((basePos = strrchr(sourceFile, '/')) == NULL)
+    {
+        basePos = sourceFile;
+    }
+    else
+    {
+        basePos++;
+    }
+
+    if
+    (
+        (dotPos = strrchr(sourceFile, '.')) == NULL
+     || (dotPos < basePos)
+    )
+    {
+        fprintf
+        (
+            stderr,
+            "cannot find extension in source file name %s\n",
+            sourceFile
+        );
+        exit(1);
+    }
+
+    /* count number of -I directories */
+    nDirectories = 0;
+    for (i = 1; i < argc; i++)
+    {
+        if (strncmp(argv[i], "-I", 2) == 0)
+        {
+            if (strlen(argv[i]) > 2)
+            {
+                nDirectories++;
+            }
+        }
+    }
+
+    directories = (char**)malloc(sizeof(char*)*nDirectories);
+
+    /* build list of -I directories and add -i ignores */
+    nDirectories = 0;
+    for (i = 1; i < argc; i++)
+    {
+        if (strncmp(argv[i], "-I", 2) == 0)
+        {
+            if (strlen(argv[i]) > 2)
+            {
+                directories[nDirectories++] = strdup(argv[i] + 2);
+            }
+        }
+        else if (strncmp(argv[i], "-i", 2) == 0)
+        {
+            if (strlen(argv[i]) > 2)
+            {
+                lookUp(visitedFiles, (argv[i] + 2));
+            }
+        }
+    }
+
+    /*
+     * initialise depFile to zero and use strncat rather than strncpy
+     * because there is a bug in the SGI strncat that if 0 preceeds the '.'
+     * it inserts a space
+     */
+    depFile = (char*)malloc(strlen(sourceFile) + 3);
+    depFile[0] = 0;
+    strncat(depFile, sourceFile, (dotPos - sourceFile)/sizeof(char));
+    strcat(depFile, ".dep");
+
+    if (strcmp(dotPos, ".java") == 0)
+    {
+        char *classFile = strdup(sourceFile);
+        classFile[(dotPos - sourceFile)/sizeof(char)] = 0;
+
+        printf("$(CLASSES_DIR)/%s.class: %s\n", classFile, depFile);
+        free(classFile);
+    }
+    else
+    {
+        char *objectFile = strdup(basePos);
+        objectFile[(dotPos - basePos)/sizeof(char)] = 0;
+
+        printf("$(OBJECTS_DIR)/%s.o: %s\n", objectFile, depFile);
+        free(objectFile);
+    }
+
+    nextFile(sourceFile);
+    yylex();
+
+
+    for (i = 0; i < nDirectories; i++)
+    {
+        free(directories[i]);
+    }
+    free(directories);
+
+    free(sourceFile);
+    free(depFile);
+
+    return 0;
+}
+
+
+int currentBuffer = 0;                     /* Buffer pointer stack counter */
+YY_BUFFER_STATE buffers[FILE_STACK_SIZE];  /* Buffer pointer stack */
+
+
+/*
+ * Add a directory name to the file name
+ */
+char* addDirectoryName(const char* dirName, const char* fileName)
+{
+    char* pathName = (char*)malloc(strlen(dirName) + strlen(fileName) + 2);
+    strcpy(pathName, dirName);
+
+    if (dirName[strlen(dirName)-1] != '/')
     {
         strcat(pathName, "/");
     }
@@ -285,14 +288,15 @@ char* addDirectoryName(const char* directoryName, const char* fileName)
 }
 
 
-/* open a file and create buffer and put on stack stack */
-
+/*
+ * open a file and create buffer and put on stack
+ */
 void nextFile(const char* fileName)
 {
-    int d;
-    char* pathName;
-
-    if (lookUp(fileHashTable, fileName)) return;
+    if (lookUp(visitedFiles, fileName))
+    {
+        return;   /* already existed (did not insert) */
+    }
 
     if (currentBuffer >= FILE_STACK_SIZE)
     {
@@ -311,9 +315,10 @@ void nextFile(const char* fileName)
 
     if (!(newyyin = fopen(fileName, "r")))
     {
+        int d;
         for (d=0; d<nDirectories; d++)
         {
-            pathName = addDirectoryName(directories[d], fileName);
+            char* pathName = addDirectoryName(directories[d], fileName);
 
             if ((newyyin = fopen(pathName, "r")))
             {
@@ -337,6 +342,10 @@ void nextFile(const char* fileName)
         );
 
         fflush(stdout);
+        fflush(stderr);
+
+        /* only report the first occurance */
+        lookUp(visitedFiles, fileName);
     }
     else
     {
@@ -349,10 +358,12 @@ void nextFile(const char* fileName)
 }
 
 
+/*
+ * Replace all '.' with '/'
+ */
 void dotToSlash(char* fileName)
 {
     int i, len;
-
     len = strlen(fileName);
 
     for (i=0; i<len; i++)
@@ -362,6 +373,9 @@ void dotToSlash(char* fileName)
 }
 
 
+/*
+ * Import (java) file
+ */
 void importFile(const char* fileName)
 {
     char* javaFileName;
@@ -380,19 +394,23 @@ void importFile(const char* fileName)
 }
 
 
-void importDirectory(const char* dirName)
+/*
+ * Import (java) directories
+ */
+void importDir(const char* dirName)
 {
-    int dirNameLen;
-    char *uDirName, *path;
+    char *uDirName;
     DIR *source;
-    struct dirent *list;
 
-    if (lookUp(dirHashTable, dirName)) return;
+    if (lookUp(visitedDirs, dirName))
+    {
+        return;   /* already existed (did not insert) */
+    }
 
-    dirNameLen = strlen(dirName);
     uDirName = strdup(dirName);
     dotToSlash(uDirName);
-    uDirName[dirNameLen-2] = 0;
+
+    uDirName[strlen(dirName)-2] = 0;
 
     if ((source = opendir(uDirName)) == NULL)
     {
@@ -402,35 +420,33 @@ void importDirectory(const char* dirName)
             "could not open directory %s\n",
             uDirName
         );
-        free(uDirName);
-
-        return;
     }
     else
     {
         /* Read and parse all the entries in the directory */
+        struct dirent *list;
+
         while ((list = readdir(source)) != NULL)
         {
-            if
-            (
-                strstr(list->d_name, ".java")
-             && !strstr(list->d_name, ".java~")
-            )
+            char* dotPos = strrchr(list->d_name, '.');
+
+            if (dotPos != NULL && strcmp(dotPos, ".java") == 0)
             {
-                path = addDirectoryName(uDirName, list->d_name);
-                nextFile(path);
-                free(path);
+                char* pathName = addDirectoryName(uDirName, list->d_name);
+                nextFile(pathName);
+                free(pathName);
             }
         }
 
         closedir(source);
-        free(uDirName);
     }
+    free(uDirName);
 }
 
 
-/* The lexer calls yywrap to handle EOF conditions */
-
+/*
+ * The lexer calls yywrap to handle EOF conditions
+ */
 int yywrap()
 {
     /* Close the file for the buffer which has just reached EOF */
diff --git a/wmake/src/wmkdepend.cpp b/wmake/src/wmkdepend.cpp
index 159fb3849b..8a92a1fa4d 100644
--- a/wmake/src/wmkdepend.cpp
+++ b/wmake/src/wmkdepend.cpp
@@ -35,12 +35,12 @@ Description
     only once.  This is why this program is faster than cpp.
 
 Usage
-    wmkdep [ -Idirectory ... -Idirectory ] filename
+    wmkdepend [ -Idir ... -Idir ] [ -iheader .. -iheader ] filename
 
 \*---------------------------------------------------------------------------*/
 
 #include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 #include <cstring>
 
 #include "wmkdependParser.h"
@@ -58,7 +58,10 @@ void printUsage(const char* message = NULL)
     fwprintf
     (
         stderr,
-        L"Usage: wmkdepend [ -Idirectory ... -Idirectory ] filename\n"
+        L"Usage: wmkdepend %s filename\nOptions:\n%s\n",
+        "[ -Idir ... -Idir ] [ -iheader .. -iheader ]",
+        "  -Idir        specify include directory\n"
+        "  -iheader     specify header name to ignore\n"
     );
 }
 
@@ -67,23 +70,33 @@ int main(int argc, char* argv[])
 {
     if (argc == 1)
     {
-        printUsage("Error: input file not supplied");
+        printUsage("input file not supplied");
         ::exit(1);
     }
 
     for (int i=1; i < argc; i++)
     {
-        if (strncmp(argv[i], "-I", 2) == 0 && strlen(argv[i]) > 2)
+        if (strncmp(argv[i], "-I", 2) == 0)
         {
-            std::string dirName(argv[i] + 2);
-
-            // add trailing slash if required
-            if (dirName.rfind('/') != dirName.size()-1)
+            if (strlen(argv[i]) > 2)
             {
-                dirName += '/';
-            }
+                std::string dirName(argv[i] + 2);
 
-            wmake::Parser::includeDirs.push_back(dirName);
+                // add trailing slash if required
+                if (dirName.rfind('/') != dirName.size()-1)
+                {
+                    dirName += '/';
+                }
+
+                wmake::Parser::includeDirs.push_back(dirName);
+            }
+        }
+        else if (strncmp(argv[i], "-i", 2) == 0)
+        {
+            if (strlen(argv[i]) > 2)
+            {
+                wmake::Parser::visitedFiles.insert(argv[i] + 2);
+            }
         }
     }
 
@@ -117,7 +130,7 @@ int main(int argc, char* argv[])
         fwprintf
         (
             stderr,
-            L"Cannot find extension in source file name %s\n",
+            L"cannot find extension in source file name %s\n",
             sourceFile.c_str()
         );
         ::exit(1);
diff --git a/wmake/src/wmkdependParser.atg b/wmake/src/wmkdependParser.atg
index 5e514f5501..d69a8c1edf 100644
--- a/wmake/src/wmkdependParser.atg
+++ b/wmake/src/wmkdependParser.atg
@@ -2,10 +2,6 @@
     Attributed Grammar for Coco/R  (-*- C++ -*- version)
     compile with:
         coco-cpp wmkdependParser.atg
-    For example,
-    $WM_THIRD_PARTY_DIR/coco-cpp/platforms/$WM_ARCH$WM_COMPILER/bin/coco-cpp \
-        -frames $WM_THIRD_PARTY_DIR/coco-cpp/platforms/share/coco-cpp \
-        wmkdependParser.atg
 \*---------------------------------------------------------------------------*/
 [copy]
 /*---------------------------------*- C++ -*---------------------------------*\
@@ -59,9 +55,6 @@ COMPILER wmkdepend
 /*---------------------------------------------------------------------------*/
 private:
 
-    //! Set of files already visited
-    static std::set<std::string> visitedFiles_;
-
     //! Set of (java) directories already visited
     static std::set<std::string> visitedDirs_;
 
@@ -75,6 +68,9 @@ private:
     static void importFile(const std::string& name);
 
 public:
+    //! Set of files already visited
+    static std::set<std::string> visitedFiles;
+
     //! Include directories to search
     static std::list<std::string> includeDirs;
 
@@ -95,9 +91,9 @@ public:
 #include <sys/types.h>
 #include <dirent.h>
 
-std::set<std::string> Parser::visitedFiles_;
 std::set<std::string> Parser::visitedDirs_;
 
+std::set<std::string> Parser::visitedFiles;
 std::list<std::string> Parser::includeDirs;
 std::string Parser::sourceFile;
 std::string Parser::depFile;
@@ -123,7 +119,7 @@ void Parser::ignoreDir(const std::string& name)
 
 void Parser::includeFile(const std::string& name)
 {
-    if (!visitedFiles_.insert(name).second)
+    if (!visitedFiles.insert(name).second)
     {
         return;   // already existed (did not insert)
     }
@@ -170,6 +166,9 @@ void Parser::includeFile(const std::string& name)
             L"could not open file %s for source file %s\n",
             name.c_str(), sourceFile.c_str()
         );
+
+        // only report the first occurance
+        visitedFiles.insert(name);
     }
 }
 
diff --git a/wmake/src/wmkdependParser.cpp b/wmake/src/wmkdependParser.cpp
index 4b4a8e4c21..0f3712aeee 100644
--- a/wmake/src/wmkdependParser.cpp
+++ b/wmake/src/wmkdependParser.cpp
@@ -32,7 +32,7 @@ SourceFiles
     generated
 
 \*---------------------------------------------------------------------------*/
-// This file was generated with Coco/R C++ (7 Feb 2010)
+// This file was generated with Coco/R C++ (10 Mar 2010)
 // http://www.ssw.uni-linz.ac.at/coco/
 // with these defines:
 //     - FORCE_UTF8
@@ -52,9 +52,9 @@ namespace wmake {
 #include <sys/types.h>
 #include <dirent.h>
 
-std::set<std::string> Parser::visitedFiles_;
 std::set<std::string> Parser::visitedDirs_;
 
+std::set<std::string> Parser::visitedFiles;
 std::list<std::string> Parser::includeDirs;
 std::string Parser::sourceFile;
 std::string Parser::depFile;
@@ -80,7 +80,7 @@ void Parser::ignoreDir(const std::string& name)
 
 void Parser::includeFile(const std::string& name)
 {
-    if (!visitedFiles_.insert(name).second)
+    if (!visitedFiles.insert(name).second)
     {
         return;   // already existed (did not insert)
     }
@@ -127,6 +127,9 @@ void Parser::includeFile(const std::string& name)
             L"could not open file %s for source file %s\n",
             name.c_str(), sourceFile.c_str()
         );
+
+        // only report the first occurance
+        visitedFiles.insert(name);
     }
 }
 
diff --git a/wmake/src/wmkdependParser.h b/wmake/src/wmkdependParser.h
index b91f364f27..cd772ea502 100644
--- a/wmake/src/wmkdependParser.h
+++ b/wmake/src/wmkdependParser.h
@@ -32,7 +32,7 @@ SourceFiles
     generated
 
 \*---------------------------------------------------------------------------*/
-// This file was generated with Coco/R C++ (7 Feb 2010)
+// This file was generated with Coco/R C++ (10 Mar 2010)
 // http://www.ssw.uni-linz.ac.at/coco/
 // with these defines:
 //     - FORCE_UTF8
@@ -122,9 +122,6 @@ public:
 
 private:
 
-    //! Set of files already visited
-    static std::set<std::string> visitedFiles_;
-
     //! Set of (java) directories already visited
     static std::set<std::string> visitedDirs_;
 
@@ -138,6 +135,9 @@ private:
     static void importFile(const std::string& name);
 
 public:
+    //! Set of files already visited
+    static std::set<std::string> visitedFiles;
+
     //! Include directories to search
     static std::list<std::string> includeDirs;
 
diff --git a/wmake/src/wmkdependScanner.cpp b/wmake/src/wmkdependScanner.cpp
index 72f082f788..01cd985b05 100644
--- a/wmake/src/wmkdependScanner.cpp
+++ b/wmake/src/wmkdependScanner.cpp
@@ -32,7 +32,7 @@ SourceFiles
     generated
 
 \*---------------------------------------------------------------------------*/
-// This file was generated with Coco/R C++ (7 Feb 2010)
+// This file was generated with Coco/R C++ (10 Mar 2010)
 // http://www.ssw.uni-linz.ac.at/coco/
 // with these defines:
 //     - FORCE_UTF8
diff --git a/wmake/src/wmkdependScanner.h b/wmake/src/wmkdependScanner.h
index 7520b01ebd..8b9ee581c3 100644
--- a/wmake/src/wmkdependScanner.h
+++ b/wmake/src/wmkdependScanner.h
@@ -32,7 +32,7 @@ SourceFiles
     generated
 
 \*---------------------------------------------------------------------------*/
-// This file was generated with Coco/R C++ (7 Feb 2010)
+// This file was generated with Coco/R C++ (10 Mar 2010)
 // http://www.ssw.uni-linz.ac.at/coco/
 // with these defines:
 //     - FORCE_UTF8
diff --git a/wmake/wclean b/wmake/wclean
index 4c2970c363..1cc63ad02f 100755
--- a/wmake/wclean
+++ b/wmake/wclean
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -27,8 +27,8 @@
 #     wclean
 #
 # Description
-#     Clean up the wmake control directory Make and remove the include
-#     directories generated for libraries.
+#     Clean up the wmake control directory Make/\$WM_OPTIONS and remove the
+#     lnInclude directories generated for libraries.
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
@@ -36,18 +36,23 @@ Script=${0##*/}
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-usage: $Script [dir]
-       $Script target [dir [MakeDir]]
 
-Clean up the wmake control directory Make and remove the include
-directories generated for libraries.
+Usage: $Script [OPTION] [dir]
+       $Script [OPTION] target [dir [MakeDir]]
+
+options:
+  -help             print the usage
+
+Clean up the wmake control directory Make/\$WM_OPTIONS and remove the
+lnInclude directories generated for libraries.
 
 The targets correspond to a subset of the 'wmake' special targets:
     all       all subdirectories
-    exe       cleans dir/Make
-    lib       cleans dir/Make and dir/lnInclude
-    libso     cleans dir/Make and dir/lnInclude
-    libo      cleans dir/Make and dir/lnInclude
+              (NB: any Allwclean or Allclean files will be used if they exist)
+    exe       clean dir/Make
+    lib       clean dir/Make and dir/lnInclude
+    libo      clean dir/Make and dir/lnInclude
+    libso     clean dir/Make and dir/lnInclude
 
 USAGE
    exit 1
@@ -77,16 +82,11 @@ then
         makeOption=$1
     fi
 
-    if [ $# -ge 2 ]
-    then
-        dir=$2
-    fi
+    # specified directory name:
+    [ $# -ge 2 ] && dir=$2
 
-    # alternative name for the Make sub-directory
-    if [ $# -ge 3 ]
-    then
-        MakeDir=$3
-    fi
+    # specified alternative name for the Make sub-directory:
+    [ $# -ge 3 ] && MakeDir=$3
 
     if [ "$dir" ]
     then
@@ -106,7 +106,11 @@ fi
 
 if [ "$makeOption" = all ]
 then
-    if [ -e Allclean ]
+    if [ -e Allwclean ]       # consistent with Allwmake
+    then
+        ./Allwclean
+        exit $?
+    elif [ -e Allclean ]      # often used for tutorial cases
     then
         ./Allclean
         exit $?
@@ -141,7 +145,7 @@ rm -rf $MakeDir/$WM_OPTIONS $MakeDir/classes 2>/dev/null
 find . -name "*.dep" -exec rm {} \;
 
 case "$makeOption" in
-lib | libso | libo )
+lib | libo | libso )
     rm -rf lnInclude 2>/dev/null
     ;;
 esac
diff --git a/wmake/wcleanAll b/wmake/wcleanAll
index 9aaf87762a..94a0ad76bb 100755
--- a/wmake/wcleanAll
+++ b/wmake/wcleanAll
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -62,6 +62,6 @@ find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB
 echo "Removing misc files"
 find . \( -name exe -o -name log -o -name so_locations \) -exec rm {} \;
 
-( cd tutorials && ./Allclean )
+tutorials/Allclean
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wmake b/wmake/wmake
index 473119fd01..504af95a38 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -35,27 +35,32 @@ Script=${0##*/}
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-usage: $Script [dir]
-       $Script target [dir [MakeDir]]
+
+Usage: $Script [OPTION] [dir]
+       $Script [OPTION] target [dir [MakeDir]]
+
+options:
+  -help             print the usage
 
 A general, easy-to-use make system for multi-platform development
 
 The 'target' is a Makefile target:
     e.g., Make/linux64GccDPOpt/fvMesh.o
 
-  or a special target:
+or a special target:
     all       all subdirectories
+              (NB: any Allwmake files will be used if they exist)
     exe       build statically linked executable
     lib       build statically linked archive lib (.a)
-    libso     build dynamically linked lib (.so)
     libo      build statically linked lib (.o)
+    libso     build dynamically linked lib (.so)
     jar       build Java jar
 
 USAGE
     exit 1
 }
 
-# provide immediate help, even if none of the environment is set
+# provide immediate help, even if environment is not set
 if [ "$1" = "-h" -o "$1" = "-help" ]
 then
     usage
@@ -130,16 +135,11 @@ then
         makeOption=$1
     fi
 
-    if [ $# -ge 2 ]
-    then
-        dir=$2
-    fi
+    # specified directory name:
+    [ $# -ge 2 ] && dir=$2
 
-    # alternative name for the Make sub-directory
-    if [ $# -ge 3 ]
-    then
-        MakeDir=$3
-    fi
+    # specified alternative name for the Make sub-directory:
+    [ $# -ge 3 ] && MakeDir=$3
 
     if [ "$dir" ]
     then
@@ -221,7 +221,7 @@ OBJECTS_DIR=$MakeDir/$WM_OPTIONS
 touch $OBJECTS_DIR/dontIncludeDeps
 
 case "$makeOption" in
-lib | libso | libo )
+lib | libo | libso )
     $make -s -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/dontIncludeDeps lnInclude/uptodate
     ;;
 esac