diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
index 5db8e7ede5..d9932d06dd 100644
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C
index 6124bf2522..193501ea42 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C
+++ b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
index 35797278d7..07a6b062bb 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
+++ b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C
index b935398866..2fb0013224 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C
index 7543b9c856..6d3f21c2fb 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H
index dd23e97024..ba6780e91b 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
index 8dbb7c038c..88497f6222 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C
index fe8923d3af..bc2cf7f2d1 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H
index f829297ad8..9d748fd737 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C
index 6822e0bbc5..4be68f4c26 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H
index ea2bec1b5d..0d39b94b9e 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
index 19eb8ddca7..a2c2b71fcf 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H
index 8616713b19..cc61acf674 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/doc/utilities.dox b/applications/utilities/doc/utilities.dox
new file mode 100644
index 0000000000..f9cbceeb99
--- /dev/null
+++ b/applications/utilities/doc/utilities.dox
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\page pageUtilities Utilities
+
+\section secUtilities Overview
+The available utilities are grouped into the following categories:
+  - \ref grpMeshUtilities
+  - \ref grpMiscUtilities
+  - \ref grpPreProcessingUtilities
+  - \ref grpPostProcessingUtilities
+  - \ref grpThermoUtilities
+  - \ref grpSurfaceUtilities
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/doc/utilitiesDoc.H b/applications/utilities/doc/utilitiesDoc.H
new file mode 100644
index 0000000000..d953a47480
--- /dev/null
+++ b/applications/utilities/doc/utilitiesDoc.H
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpUtilities Utilities
+@{
+    This group contains utilities
+@}
+
+\defgroup grpMeshUtilities Mesh
+@{
+    \ingroup grpUtilities
+    This group contains meshing utilities
+@}
+
+\defgroup grpPreProcessingUtilities Pre-processing
+@{
+    \ingroup grpUtilities
+    This group contains pre-processing utilities
+@}
+
+\defgroup grpPostProcessingUtilities Post-processing
+@{
+    \ingroup grpUtilities
+    This group contains post-processing utilities
+@}
+
+\defgroup grpParallelUtilities Parallel
+@{
+    \ingroup grpUtilities
+    This group contains parallel utilities
+@}
+
+\defgroup grpSurfaceUtilities Surface
+@{
+    \ingroup grpUtilities
+    This group contains surface utilities
+@}
+
+\defgroup grpThermophysicalUtilities Thermophysical
+@{
+    \ingroup grpUtilities
+    This group contains thermophysical utilities
+@}
+
+\defgroup grpMiscUtilities Miscellaneous
+@{
+    \ingroup grpUtilities
+    This group contains miscellaneous utilities
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index e38319f481..f936134e9a 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -24,6 +24,9 @@ License
 Application
     PDRMesh
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Mesh and field preparation utility for PDR type simulations.
 
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index b3099f4f28..7cbfa6d9cb 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -24,6 +24,9 @@ License
 Application
     collapseEdges
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Collapses short edges and combines edges that are in line.
 
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 9854ec2fef..2666d4c9de 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -24,6 +24,9 @@ License
 Application
     combinePatchFaces
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Checks for multiple patch faces on same cell and combines them.
     Multiple patch faces can result from e.g. removal of refined
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 766cd6a6e5..320a1f2d96 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -24,6 +24,9 @@ License
 Application
     modifyMesh
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Manipulates mesh elements.
 
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index dc797fdcee..fcdd7ec8f1 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -24,6 +24,9 @@ License
 Application
     refineHexMesh
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Refines a hex mesh by 2x2x2 cell splitting.
 
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index ba5b7f8548..754568cc4a 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -24,6 +24,9 @@ License
 Application
     refineWallLayer
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Utility to refine cells next to patches.
 
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index a12adf8413..744fcf5c5a 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -24,6 +24,9 @@ License
 Application
     refinementLevel
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Tries to figure out what the refinement level is on refined cartesian
     meshes. Run BEFORE snapping.
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index 64191b8bb0..ca82886601 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -24,6 +24,9 @@ License
 Application
     removeFaces
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Utility to remove faces (combines cells on both sides).
 
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C
index c71929e500..87b4398d28 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCells.C
+++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C
@@ -24,6 +24,9 @@ License
 Application
     selectCells
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Select cells in relation to surface.
 
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/Make/files b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/advanced/autoRefineMesh/Make/files
rename to applications/utilities/mesh/advanced/snappyRefineMesh/Make/files
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/Make/options b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/advanced/autoRefineMesh/Make/options
rename to applications/utilities/mesh/advanced/snappyRefineMesh/Make/options
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C b/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
similarity index 99%
rename from applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C
rename to applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
index abb29b1dea..4e4f7e0263 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C
+++ b/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
@@ -24,6 +24,9 @@ License
 Application
     snappyRefineMesh
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Utility to refine cells near to a surface.
 
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMeshDict b/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMeshDict
similarity index 100%
rename from applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMeshDict
rename to applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMeshDict
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 0e1eb5b1e5..7e44c20d36 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -24,6 +24,9 @@ License
 Application
     splitCells
 
+Group
+    grpMeshAdvancedUtilities
+
 Description
     Utility to split cells with flat faces.
 
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index d97133244c..c244c6379c 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Application
+    ccm26ToFoam
+
+Group
+    grpMeshConversionUtilities
+
 Description
     Reads CCM files as written by Prostar/ccm using ccm 2.6 (not 2.4)
 
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 9a21299127..3f17812bb4 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -24,6 +24,9 @@ License
 Application
     ansysToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts an ANSYS input mesh file, exported from I-DEAS,
     to OpenFOAM format.
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index c3d2fef073..af7f86f7b6 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     cfx4ToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts a CFX 4 mesh to OpenFOAM format.
 
diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
index 4ee10d1f15..2b1956e51f 100644
--- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
+++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     datToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Reads in a datToFoam mesh file and outputs a points file.  Used in
     conjunction with blockMesh.
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 1d28f046dc..3d1875d717 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -24,6 +24,9 @@ License
 Application
     fluent3DMeshToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts a Fluent mesh to OpenFOAM format.
 
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 3300ba9778..6cff0ce962 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -24,6 +24,9 @@ License
 Application
     fluentMeshToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts a Fluent mesh to OpenFOAM format
     including multiple region and region boundary handling.
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C
index 31ca1f9db4..d532e27d5f 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C
@@ -24,6 +24,9 @@ License
 Application
     foamMeshToFluent
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Writes out the OpenFOAM mesh in Fluent mesh format.
 
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
index a345d30015..adc86dc4b5 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -24,6 +24,9 @@ License
 Application
     foamToStarMesh
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Reads an OpenFOAM mesh and writes a pro-STAR (v4) bnd/cel/vrt format.
 
diff --git a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
index 9654b33fc2..16a6752cfb 100644
--- a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
+++ b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
@@ -24,6 +24,9 @@ License
 Application
     foamToSurface
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Reads an OpenFOAM mesh and writes the boundaries in a surface format.
 
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 6821af8fba..c2dfdf4355 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -24,6 +24,9 @@ License
 Application
     gambitToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts a GAMBIT mesh to OpenFOAM format.
 
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 5de646c441..9d466f64f2 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     gmshToFoam
 
+group
+    grpMeshConversionUtilities
+
 Description
     Reads .msh file as written by Gmsh.
 
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 7a94b27299..8c14a5373d 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     ideasUnvToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     I-Deas unv format mesh conversion.
 
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 99d522f741..56653cc921 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     kivaToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts a KIVA3v grid to OpenFOAM format.
 
diff --git a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
index a69f6047a5..81cc0322fc 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
+++ b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     mshToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts .msh file generated by the Adventure system.
 
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index e004220723..93c4267f77 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     netgenNeutralToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts neutral file format as written by Netgen v4.4.
 
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index 891af306e1..63ddfd1e69 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     plot3dToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Plot3d mesh (ascii/formatted format) converter.
 
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
index 5bceed621f..543b71cba3 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     sammToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts a Star-CD (v3) SAMM mesh to OpenFOAM format.
 
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
index 9668741305..4e6449b9fd 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     star3ToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts a Star-CD (v3) pro-STAR mesh into OpenFOAM format.
 
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
index f8e1657e79..cefbf009d1 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     star4ToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts a Star-CD (v4) pro-STAR mesh into OpenFOAM format.
 
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 46ea78e599..7eac643583 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     tetgenToFoam
 
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts .ele and .node and .face files, written by tetgen.
 
diff --git a/applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C b/applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C
index 4c6c7af788..507d8575e7 100644
--- a/applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C
+++ b/applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Application
+    vtkUnstructuredToFoam
+
+Group
+    grpMeshConversionUtilities
+
 Description
     Converts ascii .vtk (legacy format) file generated by vtk/paraview.
 
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index 3b0a226933..98923ea6ee 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -24,6 +24,9 @@ License
 Application
     writeMeshObj
 
+Group
+    grpMeshConversionUtilities
+
 Description
     For mesh debugging: writes mesh as three separate OBJ files which can
     be viewed with e.g. javaview.
diff --git a/applications/utilities/mesh/doc/meshUtilitiesDoc.H b/applications/utilities/mesh/doc/meshUtilitiesDoc.H
new file mode 100644
index 0000000000..f0ff94b39c
--- /dev/null
+++ b/applications/utilities/mesh/doc/meshUtilitiesDoc.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpMeshGenerationUtilities Generation
+@{
+    \ingroup grpMeshUtilities
+    This group contains mesh generation utilities
+@}
+
+\defgroup grpMeshConversionUtilities Conversion
+@{
+    \ingroup grpMeshUtilities
+    This group contains mesh conversion utilities
+@}
+
+\defgroup grpMeshManipulationUtilities Manipulation
+@{
+    \ingroup grpMeshUtilities
+    This group contains mesh generation utilities
+@}
+
+\defgroup grpMeshAdvancedUtilities Advanced
+@{
+    \ingroup grpMeshUtilities
+    This group contains advanced mesh utilities
+@}
+
+\*---------------------------------------------------------------------------*/
+
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 0c92180830..3d0624f745 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -24,6 +24,9 @@ License
 Application
     blockMesh
 
+Group
+    grpMeshGenerationUtilities
+
 Description
     A multi-block mesh generator.
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 00ced168eb..d52ed1b29f 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -24,6 +24,9 @@ License
 Application
     extrudeMesh
 
+Group
+    grpMeshGenerationUtilities
+
 Description
     Extrude mesh from existing patch (by default outwards facing normals;
     optional flips faces) or from patch read from file.
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 91aab57a1b..7f35de4b22 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -24,6 +24,9 @@ License
 Application
     extrudeToRegionMesh
 
+Group
+    grpMeshGenerationUtilities
+
 Description
     Extrude faceZones (internal or boundary faces) or faceSets (boundary faces
     only) into a separate mesh (as a different region).
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index a6916b7076..ef6cd069e9 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -24,6 +24,9 @@ License
 Application
     extrude2DMesh
 
+Group
+    grpMeshGenerationUtilities
+
 Description
     Takes 2D mesh (all faces 2 points only, no front and back faces) and
     creates a 3D mesh by extruding with specified thickness.
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
index fd8d6f1224..3588a9878f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
@@ -24,6 +24,9 @@ License
 Application
     foamyHexMesh
 
+Group
+    grpMeshGenerationUtilities
+
 Description
     Conformal Voronoi automatic mesh generator
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
index 997726bba6..f8d6054644 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@@ -24,6 +24,9 @@ License
 Application
     foamyQuadMesh
 
+Group
+    grpMeshGenerationUtilities
+
 Description
     Conformal-Voronoi 2D extruding automatic mesher with grid or read
     initial points and point position relaxation with optional
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index b5187f1e94..f318d12b5b 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -24,6 +24,9 @@ License
 Application
     snappyHexMesh
 
+Group
+    grpMeshGenerationUtilities
+
 Description
     Automatic split hex mesher. Refines and snaps to surface.
 
diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
index bf0dff94b0..7dea889f86 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
@@ -24,6 +24,9 @@ License
 Application
     attachMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Attach topologically detached mesh using prescribed mesh modifiers.
 
diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
index f35f70b45b..abd73d8445 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
@@ -24,6 +24,9 @@ License
 Application
     autoPatch
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Divides external faces into patches based on (user supplied) feature
     angle.
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 9a3ab3871e..c1a07e9fca 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -24,6 +24,9 @@ License
 Application
     checkMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Checks validity of a mesh.
 
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index d0d1439b85..e5892bef4b 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -24,6 +24,9 @@ License
 Application
     createBaffles
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Makes internal faces into boundary faces. Does not duplicate points, unlike
     mergeOrSplitBaffles.
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index eb89288a30..a97916281d 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -24,6 +24,9 @@ License
 Application
     createPatch
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Utility to create patches out of selected boundary faces. Faces come either
     from existing patches or from a faceSet.
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index 58f7447506..181e80e12d 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -24,6 +24,9 @@ License
 Application
     deformedGeom
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Deforms a polyMesh using a displacement field U and a scaling factor
     supplied as an argument.
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index f10405674d..7e2fd95c58 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -24,6 +24,9 @@ License
 Application
     flattenMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Flattens the front and back planes of a 2D cartesian mesh.
 
diff --git a/applications/utilities/mesh/manipulation/insideCells/insideCells.C b/applications/utilities/mesh/manipulation/insideCells/insideCells.C
index 31d1473294..a751b6e7d0 100644
--- a/applications/utilities/mesh/manipulation/insideCells/insideCells.C
+++ b/applications/utilities/mesh/manipulation/insideCells/insideCells.C
@@ -24,6 +24,9 @@ License
 Application
     insideCells
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Picks up cells with cell centre 'inside' of surface.
     Requires surface to be closed and singly connected.
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index 26c67575c7..cb80039e79 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -24,6 +24,9 @@ License
 Application
     mergeMeshes
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Merges two meshes.
 
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index 6db0d3abc6..5d52574886 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -24,6 +24,9 @@ License
 Application
     mergeOrSplitBaffles
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Detects faces that share points (baffles). Either merge them or
     duplicate the points.
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index f7383289cb..e06acc0205 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -24,6 +24,9 @@ License
 Application
     mirrorMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Mirrors a mesh around a given plane.
 
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 2fac9f25c0..7fed198993 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -24,6 +24,9 @@ License
 Application
     moveDynamicMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Mesh motion and topological mesh changes utility.
 
diff --git a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
index 54727b825a..9757be6655 100644
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
@@ -24,6 +24,9 @@ License
 Application
     moveEngineMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Solver for moving meshes for engine calculations.
 
diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
index f2ef289053..0f4049ad7c 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
+++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
@@ -24,6 +24,9 @@ License
 Application
     moveMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Solver for moving meshes.
 
diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
index e0da25a526..7b61f097cf 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
+++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
@@ -24,6 +24,9 @@ License
 Application
     objToVTK
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Read obj line (not surface!) file and convert into vtk.
 
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
index 5595138322..a13594496f 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
@@ -24,6 +24,9 @@ License
 Application
     orientFaceZone
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Corrects orientation of faceZone.
 
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
index f0c4c16d71..27209b9793 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
@@ -24,6 +24,9 @@ License
 Application
     polyDualMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Calculates the dual of a polyMesh. Adheres to all the feature and patch
     edges.
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 4877c45319..37cce07659 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -24,6 +24,9 @@ License
 Application
     refineMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Utility to refine cells in multiple directions.
 
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 167afe59dd..a4fb8169b0 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -24,6 +24,9 @@ License
 Application
     renumberMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Renumbers the cell list in order to reduce the bandwidth, reading and
     renumbering all fields from all the time directories.
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
index fb49b074fa..00ebde5cd5 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
+++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
@@ -24,6 +24,9 @@ License
 Application
     rotateMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Rotates the mesh and fields from the direction n1 to direction n2.
 
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 1cd3ad6958..4919e21d70 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -24,6 +24,9 @@ License
 Application
     setSet
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Manipulate a cell/face/point/ set or zone interactively.
 
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index 8b23cfe5cd..d855e98ca1 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -24,6 +24,9 @@ License
 Application
     setsToZones
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Add pointZones/faceZones/cellZones to the mesh from similar named
     pointSets/faceSets/cellSets.
diff --git a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
index 7ce51edf61..e015102ab1 100644
--- a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
+++ b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
@@ -24,6 +24,9 @@ License
 Application
     singleCellMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Reads all fields and maps them to a mesh with all internal faces removed
     (singleCellFvMesh) which gets written to region "singleCell".
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index 5cac0dad7d..09a3d25d59 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -24,6 +24,9 @@ License
 Application
     splitMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Splits mesh by making internal faces external. Uses attachDetach.
 
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 529153f812..a5789e7ebd 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -24,6 +24,9 @@ License
 Application
     splitMeshRegions
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Splits mesh into multiple regions.
 
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 1902f1543d..1718d725f9 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -24,6 +24,10 @@ License
 Application
     stitchMesh
 
+Group
+    grpMeshManipulationUtilities
+
+
 Description
     'Stitches' a mesh.
 
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index c158b74842..19489611c4 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -24,6 +24,9 @@ License
 Application
     subsetMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Selects a section of mesh based on a cellSet.
 
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index 8f368f1b3f..d5e5358bf5 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -24,6 +24,9 @@ License
 Application
     topoSet
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Operates on cellSets/faceSets/pointSets through a dictionary.
 
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index cfddb19c2e..eb13245ec3 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -24,6 +24,9 @@ License
 Application
     transformPoints
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Transforms the mesh points in the polyMesh directory according to the
     translate, rotate and scale options.
diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
index f4df1dd062..4dbc6a4a75 100644
--- a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
+++ b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
@@ -24,6 +24,9 @@ License
 Application
     zipUpMesh
 
+Group
+    grpMeshManipulationUtilities
+
 Description
     Reads in a mesh with hanging vertices and zips up the cells to guarantee
     that all polyhedral cells of valid shape are closed.
diff --git a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
index 1b8ecac86d..cdbd3c76a9 100644
--- a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
+++ b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
@@ -24,6 +24,9 @@ License
 Application
     expandDictionary
 
+Group
+    grpMiscUtilities
+
 Description
     Read the dictionary provided as an argument, expand the macros etc. and
     write the resulting dictionary to standard output.
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
index 1b5670fc83..c9ad6ca0a9 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
@@ -24,6 +24,9 @@ License
 Application
     foamDebugSwitches
 
+Group
+    grpMiscUtilities
+
 Description
     Write out all library debug switches.
 
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index 715af2481a..81971b85f5 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -24,6 +24,9 @@ License
 Application
     foamFormatConvert
 
+Group
+    grpMiscUtilities
+
 Description
     Converts all IOobjects associated with a case into the format specified
     in the controlDict.
diff --git a/applications/utilities/miscellaneous/foamHelp/foamHelp.C b/applications/utilities/miscellaneous/foamHelp/foamHelp.C
index 277b7a024a..d4d145ee21 100644
--- a/applications/utilities/miscellaneous/foamHelp/foamHelp.C
+++ b/applications/utilities/miscellaneous/foamHelp/foamHelp.C
@@ -24,6 +24,9 @@ License
 Application
     foamHelp
 
+Group
+    grpMiscUtilities
+
 Description
     Top level wrapper utility around foam help utilities
 
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index 74d9028c2b..3b336287f8 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -24,6 +24,9 @@ License
 Application
     foamInfoExec
 
+Group
+    grpMiscUtilities
+
 Description
     Interrogates a case and prints information to stdout.
 
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
index 074774676a..2dc5cbcacd 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
@@ -24,6 +24,9 @@ License
 Application
     patchSummary
 
+Group
+    grpMiscUtilities
+
 Description
     Writes fields and boundary condition info for each patch at each requested
     time instance.
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 45c14b5d38..c35660d0be 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -24,6 +24,9 @@ License
 Application
     decomposePar
 
+Group
+    grpParallelUtilities
+
 Description
     Automatically decomposes a mesh and fields of a case for parallel
     execution of OpenFOAM.
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 47fc4aacce..a561f05462 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -24,6 +24,9 @@ License
 Application
     reconstructPar
 
+Group
+    grpParallelUtilities
+
 Description
     Reconstructs fields of a case that is decomposed for parallel
     execution of OpenFOAM.
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index a4ccd17bb1..182fb79f7f 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -24,6 +24,9 @@ License
 Application
     reconstructParMesh
 
+Group
+    grpParallelUtilities
+
 Description
     Reconstructs a mesh using geometric information only.
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 8dc2731d31..dfe0340347 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -24,6 +24,9 @@ License
 Application
     redistributePar
 
+Group
+    grpParallelUtilities
+
 Description
     Redistributes existing decomposed mesh and fields according to the current
     settings in the decomposeParDict file.
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
index 8427f9b1b4..a1eb5461b6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
@@ -24,6 +24,9 @@ License
 Application
     foamDataToFluent
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Translates OpenFOAM data to Fluent format.
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 25e9905ac5..af56283641 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -24,6 +24,9 @@ License
 Application
     foamToEnsight
 
+Group
+    grpPostProcessingUtilitie
+
 Description
     Translates OpenFOAM data to EnSight format.
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index ff67c2758d..894361e38a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -24,6 +24,9 @@ License
 Application
     foamToEnsightParts
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Translates OpenFOAM data to Ensight format.
     An Ensight part is created for each cellZone and patch.
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
index 9014f10ffd..7c74c7e203 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
@@ -24,6 +24,9 @@ License
 Application
     foamToGMV
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Translates foam output to GMV readable files.
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index 3cf58fde37..b834cca26a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -24,6 +24,9 @@ License
 Application
     foamToTecplot360
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Tecplot binary file format writer.
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
index 6e50d70471..786a137a7d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
@@ -24,6 +24,9 @@ License
 Application
     foamToTetDualMesh
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Converts polyMesh results to tetDualMesh.
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index fa46eeb5ce..3ac7b6f766 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -24,6 +24,9 @@ License
 Application
     foamToVTK
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Legacy VTK file format writer.
 
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
index 2b186d88ba..5cceb026f4 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     smapToFoam
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Translates a STAR-CD SMAP data file into OpenFOAM field format.
 
diff --git a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
index 0a24afc131..ecdb57f1cf 100644
--- a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
+++ b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
@@ -24,6 +24,9 @@ License
 Application
     foamCalc
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Generic wrapper for calculating a quantity at each time.
 
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index d6dbcb41e4..3a570236a6 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -24,6 +24,9 @@ License
 Application
     particleTracks
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Generates a VTK file of particle tracks for cases that were computed using
     a tracked-parcel-type cloud.
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 11f6bd116e..c306ed14ae 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -24,6 +24,10 @@ License
 Application
     steadyParticleTracks
 
+Group
+    grpPostProcessingUtilitie
+
+
 Description
     Generates a VTK file of particle tracks for cases that were computed using
     a steady-state cloud
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
index 5abf6253fe..c634412aa2 100644
--- a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
+++ b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
@@ -24,6 +24,9 @@ License
 Application
     dsmcFieldsCalc
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculate intensive fields (U and T) from averaged extensive fields from a
     DSMC calculation.
diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
index 42904e4c68..f5d2261bc5 100644
--- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
+++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
@@ -24,6 +24,9 @@ License
 Application
     engineCompRatio
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculate the geometric compression ratio.
 
@@ -83,7 +86,7 @@ int main(int argc, char *argv[])
     Info<< "\nVmax = " << Vmax
         << ", Vmin = " << Vmin << nl
         << "Vmax/Vmin = " << Vmax/Vmin << endl;
-    
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 2baabfa331..b0c422cc65 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -24,6 +24,9 @@ License
 Application
     execFlowFunctionObjects
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Execute the set of functionObjects specified in the selected dictionary
     (which defaults to system/controlDict) for the selected set of times.
diff --git a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
index 88be47e53d..553f9f7f52 100644
--- a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
+++ b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
@@ -24,6 +24,9 @@ License
 Application
     foamListTimes
 
+Group
+    grpPostProcessingUtilities
+
 Description
     List times using timeSelector.
 
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
index ea9f4f03bb..57bcfa9510 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
@@ -24,6 +24,9 @@ License
 Application
     pdfPlot
 
+Group
+    grpPostProcessingUtilitie
+
 Description
     Generates a graph of a probability distribution function.
 
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
index 93373ee6a9..7533203900 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
@@ -24,6 +24,9 @@ License
 Application
     postChannel
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Post-processes data from channel flow calculations.
 
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
index 0f47e54d6a..59f8c66ea4 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
@@ -24,6 +24,9 @@ License
 Application
     ptot
 
+Group
+    grpPostProcessingUtilities
+
 Description
     For each time: calculate the total pressure.
 
diff --git a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
index ea8fc4975d..37638d2c9f 100644
--- a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
+++ b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Application
+    temporalInterpolate
+
+Group
+    grpPostProcessingUtilities
+
 Description
     Interpolate fields between time-steps e.g. for animation.
 
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
index 873bb53a72..121c88aea5 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
@@ -24,6 +24,9 @@ License
 Application
     wdot
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes wdot for each time.
 
diff --git a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C
index 0025015339..fe1a749749 100644
--- a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C
+++ b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Application
+    writeCellCentres
+
+Group
+    grpPostProcessingUtilities
+
 Description
     Write the three components of the cell centres as volScalarFields so
     they can be used in postprocessing in thresholding.
diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index 43597560f0..1b0ca07fec 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -24,6 +24,9 @@ License
 Application
     noise
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Utility to perform noise analysis of pressure data using the noiseFFT
     library.
diff --git a/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C b/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C
index 53190221b7..4830e2d54e 100644
--- a/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C
+++ b/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C
@@ -24,6 +24,9 @@ License
 Application
     patchAverage
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates the average of the specified field over the specified patch.
 
diff --git a/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C b/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
index e17f43cf29..f1a26f6504 100644
--- a/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
+++ b/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
@@ -24,6 +24,9 @@ License
 Application
     patchIntegrate
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates the integral of the specified field over the specified patch.
 
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C b/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C
index daf48a3f68..40ce8dc038 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C
+++ b/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C
@@ -24,6 +24,9 @@ License
 Application
     probeLocations
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Probe locations.
 
diff --git a/applications/utilities/postProcessing/sampling/sample/sample.C b/applications/utilities/postProcessing/sampling/sample/sample.C
index 59abc2e2f1..0f47b2bca8 100644
--- a/applications/utilities/postProcessing/sampling/sample/sample.C
+++ b/applications/utilities/postProcessing/sampling/sample/sample.C
@@ -24,6 +24,9 @@ License
 Application
     sample
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Sample field data with a choice of interpolation schemes, sampling options
     and write formats.
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
index 46b11f79f2..e24c4b8542 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
@@ -24,6 +24,9 @@ License
 Application
     pPrime2
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the scalar field of pPrime2 (sqr(p - pMean)) at
     each time
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 2d7bab324c..d75ece4737 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.C
@@ -24,6 +24,9 @@ License
 Application
     R
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the Reynolds stress R for the current time step.
 
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index 06ceb70f49..64754db868 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -24,6 +24,9 @@ License
 Application
     createTurbulenceFields
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Creates a full set of turbulence fields.
 
diff --git a/applications/utilities/postProcessing/velocityField/Co/Co.C b/applications/utilities/postProcessing/velocityField/Co/Co.C
index 1e88dd92d3..96e6a2107f 100644
--- a/applications/utilities/postProcessing/velocityField/Co/Co.C
+++ b/applications/utilities/postProcessing/velocityField/Co/Co.C
@@ -24,6 +24,9 @@ License
 Application
     Co
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the Co number as a volScalarField obtained
     from field phi.
diff --git a/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C b/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
index 3208b5beeb..d545ae0b95 100644
--- a/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
+++ b/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
@@ -24,6 +24,9 @@ License
 Application
     Lambda2
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the second largest eigenvalue of the sum of the
     square of the symmetrical and anti-symmetrical parts of the velocity
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 9914a3a098..9fdd797c92 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -24,6 +24,9 @@ License
 Application
     Mach
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and optionally writes the local Mach number from the velocity
     field U at each time.
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index 69c4964429..79e9c5bdb2 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -24,6 +24,9 @@ License
 Application
     Pe
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates the Peclet number Pe from the flux phi and writes the maximum
     value, the surfaceScalarField Pef and volScalarField Pe.
diff --git a/applications/utilities/postProcessing/velocityField/Q/Q.C b/applications/utilities/postProcessing/velocityField/Q/Q.C
index b54a4ce399..04f1b7c202 100644
--- a/applications/utilities/postProcessing/velocityField/Q/Q.C
+++ b/applications/utilities/postProcessing/velocityField/Q/Q.C
@@ -24,6 +24,9 @@ License
 Application
     Q
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the second invariant of the velocity gradient tensor.
 
diff --git a/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C b/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
index ea681d69d9..971ea8d73f 100644
--- a/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
+++ b/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
@@ -24,6 +24,9 @@ License
 Application
     enstrophy
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the enstrophy of the velocity field U.
 
diff --git a/applications/utilities/postProcessing/velocityField/flowType/flowType.C b/applications/utilities/postProcessing/velocityField/flowType/flowType.C
index 309393d19d..d26668d52e 100644
--- a/applications/utilities/postProcessing/velocityField/flowType/flowType.C
+++ b/applications/utilities/postProcessing/velocityField/flowType/flowType.C
@@ -24,6 +24,9 @@ License
 Application
     flowType
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the flowType of velocity field U.
 
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
index 120c197a91..341832e655 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
@@ -24,6 +24,9 @@ License
 Application
     streamFunction
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the stream function of velocity field U at each
     time.
diff --git a/applications/utilities/postProcessing/velocityField/uprime/uprime.C b/applications/utilities/postProcessing/velocityField/uprime/uprime.C
index 8b1b9f15b0..2ec5c44427 100644
--- a/applications/utilities/postProcessing/velocityField/uprime/uprime.C
+++ b/applications/utilities/postProcessing/velocityField/uprime/uprime.C
@@ -24,6 +24,9 @@ License
 Application
     uprime
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the scalar field of uprime (sqrt(2/3 k)).
 
diff --git a/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C b/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
index 7662dff311..efc95a8bd3 100644
--- a/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
+++ b/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
@@ -24,6 +24,9 @@ License
 Application
     vorticity
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the vorticity of velocity field U.
 
diff --git a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
index 650d075ea7..9d5b29f498 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
+++ b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
@@ -24,6 +24,9 @@ License
 Application
     wallGradU
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the gradient of U at the wall.
 
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
index d1c37e70cc..00a2211d2c 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
@@ -24,6 +24,9 @@ License
 Application
     wallHeatFlux
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and writes the heat flux for all patches as the boundary field
     of a volScalarField and also prints the integrated flux for all wall
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index 6d8b48dff6..025f3a5a27 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -24,6 +24,9 @@ License
 Application
     wallShearStress
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and reports the turbulent wall shear stress for all patches,
     for the specified times.
diff --git a/applications/utilities/postProcessing/wall/yPlus/yPlus.C b/applications/utilities/postProcessing/wall/yPlus/yPlus.C
index 04d80ab6c0..492cd57fd7 100644
--- a/applications/utilities/postProcessing/wall/yPlus/yPlus.C
+++ b/applications/utilities/postProcessing/wall/yPlus/yPlus.C
@@ -24,6 +24,9 @@ License
 Application
     yPlus
 
+Group
+    grpPostProcessingUtilities
+
 Description
     Calculates and reports yPlus for the near-wall cells of all wall patches,
     for the specified times for laminar, LES and RAS.
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 7b597bd777..3783227fa3 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -24,6 +24,9 @@ License
 Application
     applyBoundaryLayer
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Apply a simplified boundary-layer model to the velocity and
     turbulence fields based on the 1/7th power-law.
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index 4ed0356e1c..56cfb42d32 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -24,6 +24,9 @@ License
 Application
     boxTurb
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Makes a box of turbulence which conforms to a given energy
     spectrum and is divergence free.
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index adacf92248..30f0a480fc 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -24,6 +24,9 @@ License
 Application
     changeDictionary
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Utility to change dictionary entries, e.g. can be used to change the patch
     type in the field and polyMesh/boundary files.
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
index 6a8b78c683..bcb6fa7860 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
@@ -24,6 +24,9 @@ License
 Application
     createExternalCoupledPatchGeometry.
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Application to generate the patch geometry (points and faces) for use
     with the externalCoupled functionObject.
diff --git a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
index e7da840547..68ef4c3d69 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
@@ -24,6 +24,9 @@ License
 Application
     createZeroDirectory
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Creates a zero directory with fields appropriate for the chosen solver and
     turbulence model. Operates on both single and multi-region cases.
diff --git a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
index e873f10d77..f2a2574e9d 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
+++ b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
@@ -24,6 +24,9 @@ License
 Application
     dsmcInitialise
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Initialise a case for dsmcFoam by reading the initialisation dictionary
     system/dsmcInitialise.
diff --git a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
index 4652cb2afd..f59d166d68 100644
--- a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
+++ b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
@@ -24,6 +24,9 @@ License
 Application
     engineSwirl
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Generates a swirling flow for engine calulations.
 
diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
index 163c9fa8c1..808e9a7cf8 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
+++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
@@ -24,6 +24,9 @@ License
 Application
     faceAgglomerate
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Agglomerate boundary faces using the pairPatchAgglomeration algorithm.
 
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index 7f2746338c..66e2f4f651 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -24,6 +24,9 @@ License
 Application
     foamUpgradeCyclics
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Tool to upgrade mesh and fields for split cyclics.
 
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 6e3f4ef06b..5eceb0c2b5 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -24,6 +24,9 @@ License
 Application
     mapFields
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Maps volume fields from one mesh to another, reading and
     interpolating all fields present in the time directory of both cases.
diff --git a/applications/utilities/preProcessing/mapFields/mapFieldsDict b/applications/utilities/preProcessing/mapFields/mapFieldsDict
index 39e471e381..8fcc91efd7 100644
--- a/applications/utilities/preProcessing/mapFields/mapFieldsDict
+++ b/applications/utilities/preProcessing/mapFields/mapFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.2.2                                 |
+|  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
index fdfdaad1da..2043644e20 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
+++ b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
@@ -24,6 +24,9 @@ License
 Application
     mapFieldsPar
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Maps volume fields from one mesh to another, reading and
     interpolating all fields present in the time directory of both cases.
diff --git a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
index 7af246cb25..a3127cdc1f 100644
--- a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
+++ b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Application
+    mdInitialise
+
+Group
+    grpPreProcessingUtilities
+
 Description
     Initialises fields for a molecular dynamics (MD) simulation.
 
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 7d22cec68b..9517689240 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Application
+    setFields
+
+Group
+    grpPreProcessingUtilities
+
 Description
     Set values on a selected set of cells/patchfaces through a dictionary.
 
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index 02f0c5d9ad..11a8becd5a 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -24,6 +24,9 @@ License
 Application
     viewFactorsGen
 
+Group
+    grpPreProcessingUtilities
+
 Description
     View factors are calculated based on a face agglomeration array
     (finalAgglom generated by faceAgglomerate utility).
diff --git a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C
index eca14ca40c..6e2da72660 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C
@@ -24,6 +24,9 @@ License
 Application
     wallFunctionTable
 
+Group
+    grpPreProcessingUtilities
+
 Description
     Generates a table suitable for use by tabulated wall functions.
 
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index 9ac5bbbb94..5072534076 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceAdd
 
+Group
+    grpSurfaceUtilities
+
 Description
     Add two surfaces. Does geometric merge on points. Does not check for
     overlapping/intersecting triangles.
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index f8c094c4bd..c24520790b 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceBooleanFeatures
 
+Group
+    grpSurfaceUtilities
+
 Description
     Generates the extendedFeatureEdgeMesh for the interface between a boolean
     operation on two surfaces.
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 16989e4771..7b223a36d9 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceCheck
 
+Group
+    grpSurfaceUtilities
+
 Description
     Checks geometric and topological quality of a surface.
 
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index eecdbb5155..6c55ce14d5 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceClean
 
+Group
+    grpSurfaceUtilities
+
 Description
     Utility to clean surfaces.
 
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index fdbeca8e28..24284ec5d4 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceCoarsen
 
+Group
+    grpSurfaceUtilities
+
 Description
     Surface coarsening using `bunnylod'
 
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index 1d79b08059..c1f637c3e2 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceConvert
 
+Group
+    grpSurfaceUtilities
+
 Description
     Converts from one surface mesh format to another.
 
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index 1263b7813a..bf9f1040ca 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceFeatureConvert
 
+Group
+    grpSurfaceUtilities
+
 Description
     Convert between edgeMesh formats.
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 5c81c5699c..9c9db1babf 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceFeatureExtract
 
+Group
+    grpSurfaceUtilities
+
 Description
     Extracts and writes surface features to file. All but the basic feature
     extraction is WIP.
diff --git a/applications/utilities/surface/surfaceFind/surfaceFind.C b/applications/utilities/surface/surfaceFind/surfaceFind.C
index b002e13d31..279411cc7e 100644
--- a/applications/utilities/surface/surfaceFind/surfaceFind.C
+++ b/applications/utilities/surface/surfaceFind/surfaceFind.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceFind
 
+Group
+    grpSurfaceUtilities
+
 Description
     Finds nearest face and vertex.
 
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index b7c5ca03b2..64c0f5f5fa 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceHookUp
 
+Group
+    grpSurfaceUtilities
+
 Description
     Find close open edges and stitches the surface along them
 
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index 3c83296697..e566d09ca2 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceInertia
 
+Group
+    grpSurfaceUtilities
+
 Description
     Calculates the inertia tensor, principal axes and moments of a
     command line specified triSurface.
diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
index e30ff5fc55..c8edf91962 100644
--- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C
+++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceInflate
 
+Group
+    grpSurfaceUtilities
+
 Description
     Inflates surface. WIP. Checks for overlaps and locally lowers
     inflation distance
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index 0352ce0eef..e7006475c7 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceLambdaMuSmooth
 
+Group
+    grpSurfaceUtilities
+
 Description
     Smooths a surface using lambda/mu smoothing.
 
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index e34cf579b3..c35819d008 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceMeshConvert
 
+Group
+    grpSurfaceUtilities
+
 Description
     Converts between surface formats with optional scaling or
     transformations (rotate/translate) on a coordinateSystem.
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
index 12bd9f32e2..dfd2d5f2cc 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceMeshConvertTesting
 
+Group
+    grpSurfaceUtilities
+
 Description
     Converts from one surface mesh format to another, but primarily
     used for testing functionality.
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index d9c98b3e74..11accd59cb 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceMeshExport
 
+Group
+    grpSurfaceUtilities
+
 Description
     Export from surfMesh to various third-party surface formats with
     optional scaling or transformations (rotate/translate) on a
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 708d5ab5ba..5534398026 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceMeshImport
 
+Group
+    grpSurfaceUtilities
+
 Description
     Import from various third-party surface formats into surfMesh
     with optional scaling or transformations (rotate/translate)
diff --git a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
index 0129154b84..3ea27c4f8b 100644
--- a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
+++ b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceMeshInfo
 
+Group
+    grpSurfaceUtilities
+
 Description
     Miscellaneous information about surface meshes.
 
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 580411eda6..2a42bd8ce0 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceMeshTriangulate
 
+Group
+    grpSurfaceUtilities
+
 Description
     Extracts surface from a polyMesh. Depending on output surface format
     triangulates faces.
diff --git a/applications/utilities/surface/surfaceOrient/surfaceOrient.C b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
index 29b60c7916..4dad7dd570 100644
--- a/applications/utilities/surface/surfaceOrient/surfaceOrient.C
+++ b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceOrient
 
+Group
+    grpSurfaceUtilities
+
 Description
     Set normal consistent with respect to a user provided 'outside' point.
     If the -inside option is used the point is considered inside.
diff --git a/applications/utilities/surface/surfacePatch/surfacePatch.C b/applications/utilities/surface/surfacePatch/surfacePatch.C
index 3df36f6ec6..474a820623 100644
--- a/applications/utilities/surface/surfacePatch/surfacePatch.C
+++ b/applications/utilities/surface/surfacePatch/surfacePatch.C
@@ -24,6 +24,9 @@ License
 Application
     surfacePatch
 
+Group
+    grpSurfaceUtilities
+
 Description
     Patches (regionises) a surface using a user-selectable method.
 
diff --git a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
index 585072d7c0..830e861654 100644
--- a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
+++ b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
@@ -24,6 +24,9 @@ License
 Application
     surfacePointMerge
 
+Group
+    grpSurfaceUtilities
+
 Description
     Merges points on surface if they are within absolute distance.
     Since absolute distance use with care!
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index c94e56ac4c..d6bb838e1b 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceRedistributePar
 
+Group
+    grpSurfaceUtilities
+
 Description
     (Re)distribution of triSurface. Either takes an undecomposed surface
     or an already decomposed surface and redistributes it so that each
diff --git a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
index d5d1dccd20..2dbea9fce6 100644
--- a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
+++ b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceRefineRedGreen
 
+Group
+    grpSurfaceUtilities
+
 Description
     Refine by splitting all three edges of triangle ('red' refinement).
 
diff --git a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
index 2825822607..ae79b9573c 100644
--- a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
+++ b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceSplitByPatch
 
+Group
+    grpSurfaceUtilities
+
 Description
     Writes regions of triSurface to separate files.
 
diff --git a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
index c90dee56e9..d45ce83154 100644
--- a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
+++ b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Application
+    surfaceSplitByTopology
+
+Group
+    grpSurfaceUtilities
+
 Description
     Strips any baffle parts of a surface.
 
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index b490fe726a..b8a869ef76 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceSplitNonManifolds
 
+Group
+    grpSurfaceUtilities
+
 Description
     Takes multiply connected surface and tries to split surface at
     multiply connected edges by duplicating points.
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index 0a77fde05f..70932a615c 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceSubset
 
+Group
+    grpSurfaceUtilities
+
 Description
     A surface analysis tool which sub-sets the triSurface
     to choose only a part of interest. Based on subsetMesh.
diff --git a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
index bbcf96b96e..f450b6d453 100644
--- a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
+++ b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceToPatch
 
+Group
+    grpSurfaceUtilities
+
 Description
     Reads surface and applies surface regioning to a mesh. Uses boundaryMesh
     to do the hard work.
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 3dcc86b9a9..2f1f7699ca 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -24,6 +24,9 @@ License
 Application
     surfaceTransformPoints
 
+Group
+    grpSurfaceUtilities
+
 Description
     Transform (scale/rotate) a surface.
     Like transformPoints but for surfaces.
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 2e41a7870e..7ed0fe3f46 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -24,6 +24,9 @@ License
 Application
     adiabaticFlameT
 
+Group
+    grpThermophysicalUtilities
+
 Description
     Calculates the adiabatic flame temperature for a given fuel over a
     range of unburnt temperatures and equivalence ratios.
diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
index e91f968a87..83bb9b1db5 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
+++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
@@ -24,6 +24,9 @@ License
 Application
     chemkinToFoam
 
+Group
+    grpSurfaceUtilities
+
 Description
     Converts CHEMKINIII thermodynamics and reaction data files into
     OpenFOAM format.
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 9ecd074bb4..974b9c8549 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -24,6 +24,9 @@ License
 Application
     equilibriumCO
 
+Group
+    grpThermophysicalUtilities
+
 Description
     Calculates the equilibrium level of carbon monoxide.
 
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index fae3960ab6..0f2407223c 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -24,6 +24,9 @@ License
 Application
     equilibriumFlameT
 
+Group
+    grpThermophysicalUtilities
+
 Description
     Calculates the equilibrium flame temperature for a given fuel and
     pressure for a range of unburnt gas temperatures and equivalence
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index c755532d65..227ddb1be8 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -24,6 +24,9 @@ License
 Application
     mixtureAdiabaticFlameT
 
+Group
+    grpThermophysicalUtilities
+
 Description
     Calculates the adiabatic flame temperature for a given mixture
     at a given temperature.
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 407800e791..8bd7b2f5d1 100755
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -41,7 +41,7 @@ isTest()
 
 getNumberOfProcessors()
 {
-    if [ -f $1 ]
+    if [ -f "$1" ]
     then
         expandDictionary $1 | sed -ne 's/^numberOfSubdomains\s*\(.*\);/\1/p'
     fi
@@ -166,7 +166,7 @@ compileApplication()
 
 cloneCase()
 {
-    if [ -d $2 ]
+    if [ -d "$2" ]
     then
         echo "Case already cloned: remove case directory $2 to clone"
     else
@@ -175,9 +175,22 @@ cloneCase()
         cpfiles="0 system constant"
         for f in $cpfiles
         do
-            cp -r $1/$f $2
+            \cp -r $1/$f $2
         done
     fi
 }
 
+# Overwrite 0/ with the contents of 0.org/ if it exists
+restore0Dir()
+{
+    echo "Restore 0/ from 0.org/"
+    if [ -d 0.org ]
+    then
+        \rm -rf 0
+        \cp -r 0.org 0 > /dev/null 2>&1
+    else
+        echo "    Warning: no 0.org/ found"
+    fi
+}
+
 #------------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index 225f5e22ff..78fe3bd975 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -180,6 +180,7 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/FFTW`
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/etc/config.csh/FFTW b/etc/config.csh/FFTW
new file mode 100644
index 0000000000..514216e1bf
--- /dev/null
+++ b/etc/config.csh/FFTW
@@ -0,0 +1,71 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/config.sh/FFTW
+#
+# Description
+#     Setup file for FFTW include/libraries.
+#     Sourced from OpenFOAM-<VERSION>/etc/cshrc
+#
+#     If using system-wide installations, use the following settings:
+#
+#         fftw_version=fftw-system
+#
+#     If the system fftw is unusable (eg, too old) and you don't
+#     have or want a ThirdParty installation:
+#
+#         fftw_version=fftw-none
+#
+#     If using a central installation, but not located under ThirdParty:
+#         - specify fftw-system
+#         - provide full paths for FFTW_ARCH_PATH
+#
+# Note
+#     When building OpenFOAM, any changes made here MUST be made in the
+#     equivalent config.sh version too, since that is the one which will
+#     be used during the build process.
+#
+#------------------------------------------------------------------------------
+
+set fftw_version=fftw-system
+
+setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
+
+#------------------------------------------------------------------------------
+if ($?FOAM_VERBOSE && $?prompt) then
+    echo "Using fftw ($fftw_version)  ->  $FFTW_ARCH_PATH"
+endif
+
+# If FFTW_ARCH_PATH does not end with '-system' or '-none',
+# it is either located within ThirdParty, or a central installation
+# outside of ThirdParty and must be added to the lib-path.
+
+set ending="${FFTW_ARCH_PATH:t}"
+if ( "$ending" != "fftw-none" && "$ending" != "fftw-system" ) then
+    _foamAddLib $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+endif
+
+unset fftw_version ending
+
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW
new file mode 100644
index 0000000000..74115fccfc
--- /dev/null
+++ b/etc/config.sh/FFTW
@@ -0,0 +1,77 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/config.sh/FFTW
+#
+# Description
+#     Setup file for FFTW include/libraries.
+#     Sourced from OpenFOAM-<VERSION>/etc/bashrc
+#
+#     If using system-wide installations, use the following settings:
+#
+#         fftw_version=fftw-system
+#
+#     If the system fftw is unusable (eg, too old) and you don't
+#     have or want a ThirdParty installation:
+#
+#         fftw_version=fftw-none
+#
+#     If using a central installation, but not located under ThirdParty:
+#         - specify fftw-system
+#         - provide full paths for FFTW_ARCH_PATH
+#
+# Note
+#     When _foamAddLib is unset (eg, called from makeFFTW):
+#         - fftw_version variable is retained.
+#         - the LD_LIBRARY_PATH is not adjusted.
+#------------------------------------------------------------------------------
+
+fftw_version=fftw-system
+
+export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
+
+#------------------------------------------------------------------------------
+if [ "$FOAM_VERBOSE" -a "$PS1" ]
+then
+    echo "Using fftw ($fftw_version)  ->  $FFTW_ARCH_PATH" 1>&2
+fi
+
+if type _foamAddLib > /dev/null 2>&1    # normal sourcing
+then
+
+    # If FFTW_ARCH_PATH does not end with '-system' or '-none',
+    # it is either located within ThirdParty, or a central installation
+    # outside of ThirdParty and must be added to the lib-path.
+
+    ending="${FFTW_ARCH_PATH_PATH##*-}"
+    if [ "$ending" != none -a "$ending" != system ]
+    then
+        _foamAddLib $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    fi
+
+    unset fftw_version ending
+
+fi
+
+#------------------------------------------------------------------------------
diff --git a/etc/cshrc b/etc/cshrc
index 30138fdb36..099662b296 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -211,6 +211,7 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/FFTW`
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/src/ODE/ODESolvers/Euler/Euler.H b/src/ODE/ODESolvers/Euler/Euler.H
index fecfc57fa0..228bbdea6d 100644
--- a/src/ODE/ODESolvers/Euler/Euler.H
+++ b/src/ODE/ODESolvers/Euler/Euler.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::Euler
 
+Group
+    grpODESolvers
+
 Description
     Euler ODE solver of order (0)1.
 
diff --git a/src/ODE/ODESolvers/EulerSI/EulerSI.H b/src/ODE/ODESolvers/EulerSI/EulerSI.H
index a6703cc20c..c9776d9713 100644
--- a/src/ODE/ODESolvers/EulerSI/EulerSI.H
+++ b/src/ODE/ODESolvers/EulerSI/EulerSI.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::EulerSI
 
+Group
+    grpODESolvers
+
 Description
     Semi-implicit Euler ODE solver of order (0)1.
 
diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.H b/src/ODE/ODESolvers/ODESolver/ODESolver.H
index de4ef399f8..5d9cd4a70b 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolver.H
+++ b/src/ODE/ODESolvers/ODESolver/ODESolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::ODESolver
 
+Group
+    grpODESolvers
+
 Description
     Abstract base-class for ODE system solvers
 
diff --git a/src/ODE/ODESolvers/RKCK45/RKCK45.H b/src/ODE/ODESolvers/RKCK45/RKCK45.H
index c376a5f423..3a315237d2 100644
--- a/src/ODE/ODESolvers/RKCK45/RKCK45.H
+++ b/src/ODE/ODESolvers/RKCK45/RKCK45.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RKCK45
 
+Group
+    grpODESolvers
+
 Description
     4/5th Order Cash-Karp Runge-Kutta ODE solver.
 
diff --git a/src/ODE/ODESolvers/RKDP45/RKDP45.H b/src/ODE/ODESolvers/RKDP45/RKDP45.H
index b3f5c7bca4..f5f783592f 100644
--- a/src/ODE/ODESolvers/RKDP45/RKDP45.H
+++ b/src/ODE/ODESolvers/RKDP45/RKDP45.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RKDP45
 
+Group
+    grpODESolvers
+
 Description
     4/5th Order Dormand–Prince Runge-Kutta ODE solver.
 
diff --git a/src/ODE/ODESolvers/RKF45/RKF45.H b/src/ODE/ODESolvers/RKF45/RKF45.H
index 5198d5553f..735fe5e12e 100644
--- a/src/ODE/ODESolvers/RKF45/RKF45.H
+++ b/src/ODE/ODESolvers/RKF45/RKF45.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RKF45
 
+Group
+    grpODESolvers
+
 Description
     4/5th Order Runge-Kutta-Fehlberg ODE solver
 
diff --git a/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H b/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H
index b0bf1c79ef..318091b6b8 100644
--- a/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H
+++ b/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::Rosenbrock12
 
+Group
+    grpODESolvers
+
 Description
     L-stable embedded Rosenbrock ODE solver of order (1)2.
 
diff --git a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H
index 38541a7c99..ff97cf10c7 100644
--- a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H
+++ b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::Rosenbrock23
 
+Group
+    grpODESolvers
+
 Description
     L-stable embedded Rosenbrock ODE solver of order (2)3.
 
diff --git a/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H b/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H
index 2af18e5d40..9d57979a46 100644
--- a/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H
+++ b/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::Rosenbrock34
 
+Group
+    grpODESolvers
+
 Description
     L-stable embedded Rosenbrock ODE solver of order (3)4.
 
diff --git a/src/ODE/ODESolvers/SIBS/SIBS.H b/src/ODE/ODESolvers/SIBS/SIBS.H
index 0ef0a1d40c..83e5385c29 100644
--- a/src/ODE/ODESolvers/SIBS/SIBS.H
+++ b/src/ODE/ODESolvers/SIBS/SIBS.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::SIBS
 
+Group
+    grpODESolvers
+
 Description
     Foam::SIBS
 
diff --git a/src/ODE/ODESolvers/Trapezoid/Trapezoid.H b/src/ODE/ODESolvers/Trapezoid/Trapezoid.H
index 667b6ee2ad..1f1c5e6674 100644
--- a/src/ODE/ODESolvers/Trapezoid/Trapezoid.H
+++ b/src/ODE/ODESolvers/Trapezoid/Trapezoid.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::Trapezoid
 
+Group
+    grpODESolvers
+
 Description
     Trapezoidal ODE solver of order (1)2.
 
diff --git a/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.H b/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.H
index 0d7dcb035c..141ec9bb7a 100644
--- a/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.H
+++ b/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::adaptiveSolver
 
+Group
+    grpODESolvers
+
 Description
 
 SourceFiles
diff --git a/src/ODE/ODESolvers/rodas23/rodas23.H b/src/ODE/ODESolvers/rodas23/rodas23.H
index 75f0262813..60d6eda446 100644
--- a/src/ODE/ODESolvers/rodas23/rodas23.H
+++ b/src/ODE/ODESolvers/rodas23/rodas23.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::rodas23
 
+Group
+    grpODESolvers
+
 Description
     L-stable, stiffly-accurate embedded Rosenbrock ODE solver of order (2)3.
 
diff --git a/src/ODE/ODESolvers/rodas34/rodas34.H b/src/ODE/ODESolvers/rodas34/rodas34.H
index 35cb468f6a..87051184db 100644
--- a/src/ODE/ODESolvers/rodas34/rodas34.H
+++ b/src/ODE/ODESolvers/rodas34/rodas34.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::rodas34
 
+Group
+    grpODESolvers
+
 Description
     L-stable, stiffly-accurate embedded Rosenbrock ODE solver of order (3)4.
 
diff --git a/src/ODE/ODESolvers/seulex/seulex.H b/src/ODE/ODESolvers/seulex/seulex.H
index c3cd540198..224ccc6f90 100644
--- a/src/ODE/ODESolvers/seulex/seulex.H
+++ b/src/ODE/ODESolvers/seulex/seulex.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::seulex
 
+Group
+    grpODESolvers
+
 Description
     An extrapolation-algorithm, based on the linearly implicit Euler method
     with step size control and order selection.
diff --git a/src/ODE/doc/ODEDoc.H b/src/ODE/doc/ODEDoc.H
new file mode 100644
index 0000000000..bd293c5823
--- /dev/null
+++ b/src/ODE/doc/ODEDoc.H
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpODESolvers Ordinary Differential Equation (ODE) solvers
+@{
+    \ingroup grpNumerics
+    This group contains ODE solvers
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/global/profiling/profiling.C b/src/OpenFOAM/global/profiling/profiling.C
index e9c02687f7..6471022850 100644
--- a/src/OpenFOAM/global/profiling/profiling.C
+++ b/src/OpenFOAM/global/profiling/profiling.C
@@ -369,8 +369,10 @@ void Foam::profiling::Information::update(const scalar& elapsed)
 
 bool Foam::profiling::writeData(Ostream& os) const
 {
-    os  << indent << "profiling" << nl
-        << indent << token::BEGIN_LIST << incrIndent << nl;
+    os.beginBlock("profiling") << nl; // FUTURE: without nl
+
+    // Add extra new line between entries
+    label nTrigger = 0;
 
     // write on-stack items
     // newest is first on the stack, top-level is at the end
@@ -382,6 +384,10 @@ bool Foam::profiling::writeData(Ostream& os) const
             const Information *info = *iter;
             scalar elapsed = timers_[info->id()]->elapsedTime();
 
+            if (nTrigger++)
+            {
+                os << nl;
+            }
             info->write(os, true, elapsed, oldElapsed);
             oldElapsed = elapsed;
         }
@@ -406,13 +412,15 @@ bool Foam::profiling::writeData(Ostream& os) const
 
         forAllConstIter(LookupContainer, lookup, iter)
         {
+            if (nTrigger++)
+            {
+                os << nl;
+            }
             iter()->write(os);
         }
     }
 
-    os  << decrIndent
-        << indent << token::END_LIST << token::END_STATEMENT << nl;
-
+    os.endBlock() << nl; // FUTURE: without nl
 
     if (sysInfo_)
     {
@@ -528,8 +536,7 @@ Foam::Ostream& Foam::profiling::Information::write
 {
     // write in dictionary format
 
-    // os.beginBlock("_" + Foam::name(id_)) << nl;
-    os.beginBlock() << nl; // FUTURE: without nl
+    os.beginBlock("trigger" + Foam::name(id_)) << nl; // FUTURE: without nl
 
     // FUTURE: os.writeEntry(key, value);
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index a20ba8773e..c8ecbc7ce6 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -314,6 +314,11 @@ inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::vectorComponent
             return z();
             break;
     }
+
+    FatalErrorInFunction
+        << "Unhandled component " << cmpt << abort(FatalError);
+
+    return x();
 }
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/tensor/tensor.C b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
index cadbef6a9b..f84d2e5316 100644
--- a/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
+++ b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
@@ -70,24 +70,30 @@ const Foam::tensor Foam::tensor::I
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::vector Foam::eigenValues(const tensor& t)
+Foam::vector Foam::eigenValues(const tensor& T)
 {
     // The eigenvalues
     scalar i, ii, iii;
 
     // diagonal matrix
-    if
-    (
+    const scalar onDiagMagSum =
         (
-            mag(t.xy()) + mag(t.xz()) + mag(t.yx())
-            + mag(t.yz()) + mag(t.zx()) + mag(t.zy())
-        )
-        < SMALL
-    )
+            mag(T.xx()) + mag(T.yy()) + mag(T.zz())
+        );
+
+    const scalar offDiagMagSum =
+        (
+            mag(T.xy()) + mag(T.xz()) + mag(T.yx())
+          + mag(T.yz()) + mag(T.zx()) + mag(T.zy())
+        );
+
+    const scalar magSum = onDiagMagSum + offDiagMagSum;
+
+    if (offDiagMagSum < max(VSMALL, SMALL*magSum))
     {
-        i = t.xx();
-        ii = t.yy();
-        iii = t.zz();
+        i = T.xx();
+        ii = T.yy();
+        iii = T.zz();
     }
 
     // non-diagonal matrix
@@ -96,16 +102,16 @@ Foam::vector Foam::eigenValues(const tensor& t)
         // Coefficients of the characteristic polynmial
         // x^3 + a*x^2 + b*x + c = 0
         scalar a =
-           - t.xx() - t.yy() - t.zz();
+           - T.xx() - T.yy() - T.zz();
 
         scalar b =
-            t.xx()*t.yy() + t.xx()*t.zz() + t.yy()*t.zz()
-          - t.xy()*t.yx() - t.yz()*t.zy() - t.zx()*t.xz();
+            T.xx()*T.yy() + T.xx()*T.zz() + T.yy()*T.zz()
+          - T.xy()*T.yx() - T.yz()*T.zy() - T.zx()*T.xz();
 
         scalar c =
-          - t.xx()*t.yy()*t.zz()
-          - t.xy()*t.yz()*t.zx() - t.xz()*t.zy()*t.yx()
-          + t.xx()*t.yz()*t.zy() + t.yy()*t.zx()*t.xz() + t.zz()*t.xy()*t.yx();
+          - T.xx()*T.yy()*T.zz()
+          - T.xy()*T.yz()*T.zx() - T.xz()*T.zy()*T.yx()
+          + T.xx()*T.yz()*T.zy() + T.yy()*T.zx()*T.xz() + T.zz()*T.xy()*T.yx();
 
         // Auxillary variables
         scalar aBy3 = a/3;
@@ -117,13 +123,13 @@ Foam::vector Foam::eigenValues(const tensor& t)
         scalar QQ = Q*Q;
 
         // Three identical roots
-        if (mag(P) < SMALL && mag(Q) < SMALL)
+        if (mag(P) < SMALL*sqr(magSum) && mag(Q) < SMALL*pow3(magSum))
         {
             return vector(- aBy3, - aBy3, - aBy3);
         }
 
         // Two identical roots and one distinct root
-        else if (mag(PPP/QQ - 1) < SMALL)
+        else if (mag(PPP - QQ) < SMALL*pow6(magSum))
         {
             scalar sqrtP = sqrt(P);
             scalar signQ = sign(Q);
@@ -148,11 +154,11 @@ Foam::vector Foam::eigenValues(const tensor& t)
         // based on the above logic, PPP must be less than QQ
         else
         {
-            WarningInFunction
-                << "complex eigenvalues detected for tensor: " << t
+            WarningIn("eigenValues(const tensor&)")
+                << "complex eigenvalues detected for tensor: " << T
                 << endl;
 
-            if (mag(P) < SMALL)
+            if (mag(P) < SMALL*sqr(magSum))
             {
                 i = cbrt(QQ/2);
             }
@@ -188,21 +194,14 @@ Foam::vector Foam::eigenValues(const tensor& t)
 
 Foam::vector Foam::eigenVector
 (
-    const tensor& t,
-    const scalar lambda
+    const tensor& T,
+    const scalar lambda,
+    const vector& direction1,
+    const vector& direction2
 )
 {
-    // Constantly rotating direction ensures different eigenvectors are
-    // generated when called sequentially with a multiple eigenvalue
-    static vector direction(1,0,0);
-    vector oldDirection(direction);
-    scalar temp = direction[2];
-    direction[2] = direction[1];
-    direction[1] = direction[0];
-    direction[0] = temp;
-
     // Construct the linear system for this eigenvalue
-    tensor A(t - lambda*I);
+    tensor A(T - lambda*I);
 
     // Determinants of the 2x2 sub-matrices used to find the eigenvectors
     scalar sd0, sd1, sd2;
@@ -252,9 +251,9 @@ Foam::vector Foam::eigenVector
     }
 
     // Sub-determinants for a repeated eigenvalue
-    sd0 = A.yy()*direction.z() - A.yz()*direction.y();
-    sd1 = A.zz()*direction.x() - A.zx()*direction.z();
-    sd2 = A.xx()*direction.y() - A.xy()*direction.x();
+    sd0 = A.yy()*direction1.z() - A.yz()*direction1.y();
+    sd1 = A.zz()*direction1.x() - A.zx()*direction1.z();
+    sd2 = A.xx()*direction1.y() - A.xy()*direction1.x();
     magSd0 = mag(sd0);
     magSd1 = mag(sd1);
     magSd2 = mag(sd2);
@@ -265,8 +264,8 @@ Foam::vector Foam::eigenVector
         vector ev
         (
             1,
-            (A.yz()*direction.x() - direction.z()*A.yx())/sd0,
-            (direction.y()*A.yx() - A.yy()*direction.x())/sd0
+            (A.yz()*direction1.x() - direction1.z()*A.yx())/sd0,
+            (direction1.y()*A.yx() - A.yy()*direction1.x())/sd0
         );
 
         return ev/mag(ev);
@@ -275,9 +274,9 @@ Foam::vector Foam::eigenVector
     {
         vector ev
         (
-            (direction.z()*A.zy() - A.zz()*direction.y())/sd1,
+            (direction1.z()*A.zy() - A.zz()*direction1.y())/sd1,
             1,
-            (A.zx()*direction.y() - direction.x()*A.zy())/sd1
+            (A.zx()*direction1.y() - direction1.x()*A.zy())/sd1
         );
 
         return ev/mag(ev);
@@ -286,8 +285,8 @@ Foam::vector Foam::eigenVector
     {
         vector ev
         (
-            (A.xy()*direction.z() - direction.y()*A.xz())/sd2,
-            (direction.x()*A.xz() - A.xx()*direction.z())/sd2,
+            (A.xy()*direction1.z() - direction1.y()*A.xz())/sd2,
+            (direction1.x()*A.xz() - A.xx()*direction1.z())/sd2,
             1
         );
 
@@ -295,40 +294,57 @@ Foam::vector Foam::eigenVector
     }
 
     // Triple eigenvalue
-    return oldDirection;
+    return direction1^direction2;
 }
 
 
-Foam::tensor Foam::eigenVectors(const tensor& t)
+Foam::tensor Foam::eigenVectors(const tensor& T, const vector& lambdas)
 {
-    vector evals(eigenValues(t));
+    vector Ux(1, 0, 0), Uy(0, 1, 0), Uz(0, 0, 1);
 
-    tensor evs
-    (
-        eigenVector(t, evals.x()),
-        eigenVector(t, evals.y()),
-        eigenVector(t, evals.z())
-    );
+    Ux = eigenVector(T, lambdas.x(), Uy, Uz);
+    Uy = eigenVector(T, lambdas.y(), Uz, Ux);
+    Uz = eigenVector(T, lambdas.z(), Ux, Uy);
 
-    return evs;
+    return tensor(Ux, Uy, Uz);
 }
 
 
-Foam::vector Foam::eigenValues(const symmTensor& t)
+Foam::tensor Foam::eigenVectors(const tensor& T)
 {
-    return eigenValues(tensor(t));
+    const vector lambdas(eigenValues(T));
+
+    return eigenVectors(T, lambdas);
 }
 
 
-Foam::vector Foam::eigenVector(const symmTensor& t, const scalar lambda)
+Foam::vector Foam::eigenValues(const symmTensor& T)
 {
-    return eigenVector(tensor(t), lambda);
+    return eigenValues(tensor(T));
 }
 
 
-Foam::tensor Foam::eigenVectors(const symmTensor& t)
+Foam::vector Foam::eigenVector
+(
+    const symmTensor& T,
+    const scalar lambda,
+    const vector& direction1,
+    const vector& direction2
+)
 {
-    return eigenVectors(tensor(t));
+    return eigenVector(tensor(T), lambda, direction1, direction2);
+}
+
+
+Foam::tensor Foam::eigenVectors(const symmTensor& T, const vector& lambdas)
+{
+    return eigenVectors(tensor(T), lambdas);
+}
+
+
+Foam::tensor Foam::eigenVectors(const symmTensor& T)
+{
+    return eigenVectors(tensor(T));
 }
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/tensor/tensor.H b/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
index b92cc8e64a..94d724c9c0 100644
--- a/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,13 +50,27 @@ namespace Foam
 
 typedef Tensor<scalar> tensor;
 
-vector eigenValues(const tensor&);
-vector eigenVector(const tensor&, const scalar lambda);
-tensor eigenVectors(const tensor&);
+vector eigenValues(const tensor& T);
+vector eigenVector
+(
+    const tensor& T,
+    const scalar lambda,
+    const vector& direction1,
+    const vector& direction2
+);
+tensor eigenVectors(const tensor& T, const vector& lambdas);
+tensor eigenVectors(const tensor& T);
 
-vector eigenValues(const symmTensor&);
-vector eigenVector(const symmTensor&, const scalar lambda);
-tensor eigenVectors(const symmTensor&);
+vector eigenValues(const symmTensor& T);
+vector eigenVector
+(
+    const symmTensor& T,
+    const scalar lambda,
+    const vector& direction1,
+    const vector& direction2
+);
+tensor eigenVectors(const symmTensor& T, const vector& lambdas);
+tensor eigenVectors(const symmTensor& T);
 
 //- Data associated with tensor type are contiguous
 template<>
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
index afba64df74..e2fec45161 100644
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
+++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
@@ -66,18 +66,19 @@ Foam::cachedRandom::cachedRandom(const label seed, const label count)
         seed_ = seed;
     }
 
+    // Initialise samples
+    osRandomSeed(seed_);
+
     // Samples will be cached if count > 0
     if (count > 0)
     {
         samples_.setSize(count);
-        sampleI_ = 0;
-    }
+        forAll(samples_, i)
+        {
+            samples_[i] = osRandomDouble();
+        }
 
-    // Initialise samples
-    osRandomSeed(seed_);
-    forAll(samples_, i)
-    {
-        samples_[i] = osRandomDouble();
+        sampleI_ = 0;
     }
 }
 
@@ -90,23 +91,28 @@ Foam::cachedRandom::cachedRandom(const cachedRandom& cr, const bool reset)
     hasGaussSample_(cr.hasGaussSample_),
     gaussSample_(cr.gaussSample_)
 {
+    //if (sampleI_ == -1)
+    //{
+    //    WarningInFunction
+    //        << "Copy constructor called, but samples not being cached. "
+    //        << "This may lead to non-repeatable behaviour" << endl;
+    //
+    //}
+
     if (reset)
     {
         hasGaussSample_ = false;
         gaussSample_ = 0;
-    }
-    if (sampleI_ == -1)
-    {
-        WarningInFunction
-            << "Copy constructor called, but samples not being cached. "
-            << "This may lead to non-repeatable behaviour" << endl;
 
-        osRandomSeed(seed_);
-    }
-
-    if (reset && samples_.size())
-    {
-        sampleI_ = 0;
+        if (samples_.size())
+        {
+            sampleI_ = 0;
+        }
+        else
+        {
+            // Re-initialise the samples
+            osRandomSeed(seed_);
+        }
     }
 }
 
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H
index 539d8103b1..a42034284a 100644
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H
+++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,6 +143,10 @@ public:
                 template<class Type>
                 void randomise01(Type& value);
 
+                //- Shuffle the values in the list
+                template<class Type>
+                void shuffle(UList<Type>& values);
+
 
             // Global random numbers - consistent across all processors
 
@@ -224,7 +228,7 @@ label cachedRandom::globalPosition<label>(const label& start, const label& end);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "cachedRandomTemplates.C"
+#   include "cachedRandomTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C
index 6684a64cca..66612e765b 100644
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C
+++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C
@@ -75,6 +75,23 @@ void Foam::cachedRandom::randomise01(Type& value)
 }
 
 
+template<class Type>
+void Foam::cachedRandom::shuffle(UList<Type>& values)
+{
+    const label nSample = values.size();
+    label posI = nSample - 1;
+
+    for (label i = 1; i < nSample; i++)
+    {
+        label j = position<label>(0, posI);
+        Type t = values[j];
+        values[j] = values[posI];
+        values[posI] = t;
+        posI--;
+    }
+}
+
+
 template<class Type>
 Type Foam::cachedRandom::globalSample01()
 {
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
index 1c294e35bf..2912886024 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
@@ -23,13 +23,13 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpCmpTurbulenceBoundaryConditions Compressible Turbulence BCs
+\defgroup grpCmpTurbulenceBoundaryConditions Boundary conditions
 @{
     \ingroup grpCmpTurbulence
     This group contains compressible turbulence model boundary conditions
 @}
 
-\defgroup grpCmpWallFunctions Compressible turbulence wall functions
+\defgroup grpCmpWallFunctions Wall functions
 @{
     \ingroup grpCmpTurbulenceBoundaryConditions
     This group contains compressible turbulence model wall functions
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
index c65a7170c2..5b589b0221 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
@@ -23,13 +23,13 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpIcoTurbulenceBoundaryConditions Incompressible Turbulence BCs
+\defgroup grpIcoTurbulenceBoundaryConditions Boundary conditions
 @{
     \ingroup grpIcoTurbulence
     This group contains incompressible turbulence model boundary conditions
 @}
 
-\defgroup grpIcoWallFunctions Incompressible turbulence wall functions
+\defgroup grpIcoWallFunctions Wall functions
 @{
     \ingroup grpIcoTurbulenceBoundaryConditions
     This group contains incompressible turbulence model wall functions
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H
index aeea3263fb..3c7a006033 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H
@@ -23,7 +23,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpRASBoundaryConditions RAS boundary conditions
+\defgroup grpRASBoundaryConditions Boundary conditions
 @{
     \ingroup grpRASTurbulence
     This group contains RAS turbulence model boundary conditions
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
index 651e95c161..82709888ae 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
@@ -23,7 +23,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpTurbulenceBoundaryConditions Turbulence boundary conditions
+\defgroup grpTurbulenceBoundaryConditions Boundary conditions
 @{
     \ingroup grpTurbulence
     This group contains turbulence model boundary conditions
diff --git a/src/TurbulenceModels/turbulenceModels/doc/turbulenceModelDoc.H b/src/TurbulenceModels/turbulenceModels/doc/turbulenceModelDoc.H
index 91eab7254d..926d957680 100644
--- a/src/TurbulenceModels/turbulenceModels/doc/turbulenceModelDoc.H
+++ b/src/TurbulenceModels/turbulenceModels/doc/turbulenceModelDoc.H
@@ -23,7 +23,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpTurbulence Turbulence
+\defgroup grpTurbulence Turbulence models
 @{
     This group contains turbulence models.
 @}
diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H
index c9b4b6fa7d..2d4e17b637 100644
--- a/src/combustionModels/FSD/FSD.H
+++ b/src/combustionModels/FSD/FSD.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModels::FSD
 
+Group
+    grpCombustionModels
+
 Description
 
     Flame Surface Dennsity (FDS) combustion model.
diff --git a/src/combustionModels/PaSR/PaSR.H b/src/combustionModels/PaSR/PaSR.H
index 51614ab2e6..cbcb37bc83 100644
--- a/src/combustionModels/PaSR/PaSR.H
+++ b/src/combustionModels/PaSR/PaSR.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModels::PaSR
 
+Group
+    grpCombustionModels
+
 Description
     Partially stirred reactor combustion model.  The model calculates a finite
     rate, based on both turbulence and chemistry time scales.  Depending on
diff --git a/src/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H
index badd484829..b5d218cc0a 100644
--- a/src/combustionModels/combustionModel/combustionModel.H
+++ b/src/combustionModels/combustionModel/combustionModel.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModel
 
+Group
+    grpCombustionModels
+
 Description
     Base class for combustion models
 
diff --git a/src/combustionModels/diffusion/diffusion.H b/src/combustionModels/diffusion/diffusion.H
index a3023ee32b..59b6ecda4d 100644
--- a/src/combustionModels/diffusion/diffusion.H
+++ b/src/combustionModels/diffusion/diffusion.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModels::diffusion
 
+Group
+    grpCombustionModels
+
 Description
     Simple diffusion-based combustion model based on the principle mixed is
     burnt. Additional parameter C is used to distribute the heat release rate
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
index 3261bf1b51..f1aa8eb574 100644
--- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
index f7143d00ee..6d849cfe9b 100644
--- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModels::diffusionMulticomponent
 
+Group
+    grpCombustionModels
+
 Description
 
     Diffusion based turbulent combustion model for multicomponent species.
diff --git a/src/combustionModels/doc/combustionModelsDoc.H b/src/combustionModels/doc/combustionModelsDoc.H
new file mode 100644
index 0000000000..53c5e1debd
--- /dev/null
+++ b/src/combustionModels/doc/combustionModelsDoc.H
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpCombustionModels Combustion models
+@{
+    This group contains combustion models.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
index 08dec407c0..16a89b9cee 100644
--- a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
+++ b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModels::infinitelyFastChemistry
 
+Group
+    grpCombustionModels
+
 Description
     Simple infinitely fast chemistry combustion model based on the principle
     mixed is burnt. Additional parameter C is used to distribute the heat
diff --git a/src/combustionModels/laminar/laminar.H b/src/combustionModels/laminar/laminar.H
index 0caf5a80f0..a4589d4ac1 100644
--- a/src/combustionModels/laminar/laminar.H
+++ b/src/combustionModels/laminar/laminar.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModels::laminar
 
+Group
+    grpCombustionModels
+
 Description
     Laminar combustion model.
 
diff --git a/src/combustionModels/noCombustion/noCombustion.H b/src/combustionModels/noCombustion/noCombustion.H
index 7e7a3b3781..641970fd6f 100644
--- a/src/combustionModels/noCombustion/noCombustion.H
+++ b/src/combustionModels/noCombustion/noCombustion.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModels::noCombustion
 
+Group
+    grpCombustionModels
+
 Description
     Dummy combustion model for 'no combustion'
 
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.H b/src/combustionModels/singleStepCombustion/singleStepCombustion.H
index 404bfe1c13..4a17add9f1 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.H
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::combustionModels::singleStepCombustion
 
+Group
+    grpCombustionModels
+
 Description
     Base class for combustion models using singleStepReactingMixture.
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 5136f38376..c64fa8fd3c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -458,7 +458,7 @@ void Foam::edgeCollapser::faceCollapseAxisAndAspectRatio
             // normal, as it has the greatest value.  The minimum eigenvalue
             // is the dominant collapse axis for high aspect ratio faces.
 
-            collapseAxis = eigenVector(J, eVals.x());
+            collapseAxis = eigenVectors(J, eVals).x();
 
             // The inertia calculation describes the mass distribution as a
             // function of distance squared to the axis, so the square root of
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index cb44ca9e26..f2de327da3 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -184,6 +184,9 @@ $(derivedFvPatchFields)/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueF
 $(derivedFvPatchFields)/totalPressure/totalPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/totalTemperature/totalTemperatureFvPatchScalarField.C
 $(derivedFvPatchFields)/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+$(derivedFvPatchFields)/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+$(derivedFvPatchFields)/turbulentDFSEMInlet/eddy/eddy.C
+$(derivedFvPatchFields)/turbulentDFSEMInlet/eddy/eddyIO.C
 $(derivedFvPatchFields)/turbulentInlet/turbulentInletFvPatchFields.C
 $(derivedFvPatchFields)/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
 $(derivedFvPatchFields)/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.C
new file mode 100644
index 0000000000..b4a73f3b91
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.C
@@ -0,0 +1,356 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "eddy.H"
+#include "mathematicalConstants.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+Foam::label Foam::eddy::Gamma2Values[] = {1, 2, 3, 4, 5, 6, 7, 8};
+Foam::UList<Foam::label> Foam::eddy::Gamma2(&Gamma2Values[0], 8);
+int Foam::eddy::debug = 0;
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::eddy::setScales
+(
+    const scalar sigmaX,
+    const label gamma2,
+    const vector& e,
+    const vector& lambda,
+    vector& sigma,
+    vector& alpha
+) const
+{
+    // Static array of gamma^2 vs c2 coefficient
+    static const scalar gamma2VsC2[8] =
+        {2, 1.875, 1.737, 1.75, 0.91, 0.825, 0.806, 1.5};
+
+    scalar gamma = Foam::sqrt(scalar(gamma2));
+
+    // c2 coefficient retrieved from array
+    scalar c2 = gamma2VsC2[gamma2 - 1];
+
+    // Length scale in largest eigenvalue direction
+    label d1 = dir1_;
+    label d2 = (d1 + 1) % 3;
+    label d3 = (d1 + 2) % 3;
+
+    sigma[d1] = sigmaX;
+
+    // Note: sigma_average = 1/3*(sigma_x + sigma_y + sigma_z)
+    // Substituting for sigma_y = sigma_x/gamma and sigma_z = sigma_y
+    //sigma[d1] = 3*sigmaX/(1 + 2/gamma);
+    // Other length scales equal, as function of major axis length and gamma
+    sigma[d2] = sigma[d1]/gamma;
+    sigma[d3] = sigma[d2];
+
+    vector sigma2 = cmptMultiply(sigma, sigma);
+    scalar slos2 = cmptSum(cmptDivide(lambda, sigma2));
+
+    bool ok = true;
+
+    for (label beta = 0; beta < 3; ++beta)
+    {
+        scalar x = slos2 - 2*lambda[beta]/sigma2[beta];
+
+        if (x < 0)
+        {
+            alpha[beta] = 0;
+            ok = false;
+        }
+        else
+        {
+            alpha[beta] = e[beta]*sqrt(x/(2*c2));
+        }
+    }
+
+    if (debug > 1)
+    {
+        Pout<< "c2:" << c2
+            << ", gamma2:" << gamma2
+            << ", gamma:" << gamma
+            << ", lambda:" << lambda
+            << ", sigma2: " << sigma2
+            << ", slos2: " << slos2
+            << ", sigmaX:" << sigmaX
+            << ", sigma:" << sigma
+            << ", alpha:" << alpha
+            << endl;
+    }
+
+    return ok;
+}
+
+
+// * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * * //
+
+Foam::eddy::eddy()
+:
+    patchFaceI_(-1),
+    position0_(vector::zero),
+    x_(0),
+    sigma_(vector::zero),
+    alpha_(vector::zero),
+    Rpg_(tensor::I),
+    c1_(-1),
+    dir1_(0)
+{}
+
+
+Foam::eddy::eddy
+(
+    const label patchFaceI,
+    const point& position0,
+    const scalar x,
+    const scalar sigmaX,
+    const symmTensor& R,
+    cachedRandom& rndGen
+)
+:
+    patchFaceI_(patchFaceI),
+    position0_(position0),
+    x_(x),
+    sigma_(vector::zero),
+    alpha_(vector::zero),
+    Rpg_(tensor::I),
+    c1_(-1),
+    dir1_(0)
+{
+    // Principal stresses - eigenvalues returned in ascending order
+    vector lambda = eigenValues(R);
+
+    // Eddy rotation from principal-to-global axes
+    // - given by the 3 eigenvectors of the Reynold stress tensor as rows in
+    //   the result tensor (transposed transformation tensor)
+    // - returned in ascending eigenvalue order
+    Rpg_ = eigenVectors(R, lambda).T();
+
+    if (debug)
+    {
+        // Global->Principal transform = Rgp = Rpg.T()
+        // Rgp & R & Rgp.T() should have eigenvalues on its diagonal and
+        // zeros for all other components
+        Pout<< "Rpg.T() & R & Rpg: " << (Rpg_.T() & R & Rpg_) << endl;
+    }
+
+    // Set the eddy orientation to position of max eigenvalue
+    // (direction of eddy major axis, sigma_x in reference)
+    dir1_ = 2;
+
+    // Random vector of 1's and -1's
+    const vector e(epsilon(rndGen));
+
+    // Set intensities and length scales
+    bool found = false;
+    forAll(Gamma2, i)
+    {
+        // Random length scale ratio, gamma = sigmax/sigmay = sigmax/sigmaz
+        // - using gamma^2 to ease lookup of c2 coefficient
+        label g2 = Gamma2[i];
+
+        if (setScales(sigmaX, g2, e, lambda, sigma_, alpha_))
+        {
+            found = true;
+            break;
+        }
+    }
+
+    // Normalisation coefficient (eq. 11)
+    // Note: sqrt(10*V)/sqrt(nEddy) applied outside when computing uDash
+    c1_ = cmptAv(sigma_)/cmptProduct(sigma_)*cmptMin(sigma_);
+
+    if (found)
+    {
+        // Shuffle the gamma^2 values
+        rndGen.shuffle(Gamma2);
+    }
+    else
+    {
+        if (debug)
+        {
+            // If not found typically means that the stress has a repeated
+            // eigenvalue/not covered by the selection of Gamma values, e.g.
+            // as seen by range of applicability on Lumley diagram
+            WarningInFunction
+                << "Unable to set eddy intensity for eddy: " << *this
+                << endl;
+        }
+
+        // Remove the influence of this eddy/indicate that its initialisation
+        // failed
+        patchFaceI_ = -1;
+    }
+}
+
+
+Foam::eddy::eddy(const eddy& e)
+:
+    patchFaceI_(e.patchFaceI_),
+    position0_(e.position0_),
+    x_(e.x_),
+    sigma_(e.sigma_),
+    alpha_(e.alpha_),
+    Rpg_(e.Rpg_),
+    c1_(e.c1_),
+    dir1_(e.dir1_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::vector Foam::eddy::uDash(const point& xp, const vector& n) const
+{
+    // Relative position inside eddy (global system)
+    const vector r = cmptDivide(xp - position(n), sigma_);
+
+    if (mag(r) > 1)
+    {
+        return vector::zero;
+    }
+
+    // Relative position inside eddy (eddy principal system)
+    const vector rp = Rpg_.T() & r;
+
+    // Shape function (eddy principal system)
+    const vector q = cmptMultiply(sigma_, vector::one - cmptMultiply(rp, rp));
+
+    // Fluctuating velocity (eddy principal system) (eq. 8)
+    const vector uDashp = cmptMultiply(q, rp^alpha_);
+
+    // Convert into global system (eq. 10)
+    return c1_*(Rpg_ & uDashp);
+}
+
+
+void Foam::eddy::writeCentreOBJ
+(
+    const vector& n,
+    Ostream& os
+) const
+{
+    point p = position(n);
+    os  << "v " << p.x() << " " << p.y() << " " << p.z() << nl;
+}
+
+
+Foam::label Foam::eddy::writeSurfaceOBJ
+(
+    const label pointOffset,
+    const vector& n,
+    Ostream& os
+) const
+{
+    if (patchFaceI_ < 0)
+    {
+        // Invalid eddy
+        return 0;
+    }
+
+    static const label nFaceAxis = 20;
+    static const label nFaceTheta = 22;
+    static const label nEddyPoints = (nFaceAxis - 1)*nFaceTheta + 2;
+    static FixedList<point, nEddyPoints> x;
+
+    static scalar dTheta = mathematical::twoPi/nFaceTheta;
+    static scalar dPhi = mathematical::pi/scalar(nFaceAxis);
+
+    label pointI = pointOffset;
+
+    const vector& s = sigma_;
+
+    const vector axisDir = tensor::I.vectorComponent(dir1_);
+    const label dir2 = (dir1_ + 1) % 3;
+    const label dir3 = (dir1_ + 2) % 3;
+
+    // Calculate the point positions
+    x[0] = axisDir*s[dir1_];
+    x[nEddyPoints - 1] = - axisDir*s[dir1_];
+
+    label eddyPtI = 1;
+    for (label axisI = 1; axisI < nFaceAxis; axisI++)
+    {
+        scalar z = s[dir1_]*cos(axisI*dPhi);
+        scalar r = sqrt(sqr(s[dir2])*(1 - sqr(z)/sqr(s[dir1_])));
+
+        for (label thetaI = 0; thetaI < nFaceTheta; thetaI++)
+        {
+            scalar theta = thetaI*dTheta;
+            point& p = x[eddyPtI++];
+            p[dir1_] = z;
+            p[dir2] = r*sin(theta);
+            p[dir3] = r*cos(theta);
+        }
+    }
+
+    // Write points
+    forAll(x, i)
+    {
+        point p = position(n) + (Rpg_ & x[i]);
+        os  << "v " << p.x() << " " << p.y() << " " << p.z() << nl;
+    }
+
+    // Write the end cap tri faces
+    for (label faceI = 0; faceI < nFaceTheta; faceI++)
+    {
+        label p1 = pointI + 1;
+        label p2 = p1 + faceI + 1;
+        label p3 = p2 + 1;
+        if (faceI == nFaceTheta - 1) p3 -= nFaceTheta;
+        os  << "f " << p1 << " " << p2 << " " << p3 << nl;
+
+        label q1 = pointI + nEddyPoints;
+        label q2 = q1 - faceI - 1;
+        label q3 = q2 - 1;
+        if (faceI == nFaceTheta - 1) q3 += nFaceTheta;
+        os  << "f " << q1 << " " << q2 << " " << q3 << nl;
+    }
+
+    // Write quad faces
+    for (label axisI = 1; axisI < nFaceAxis - 1; axisI++)
+    {
+        for (label thetaI = 0; thetaI < nFaceTheta; thetaI++)
+        {
+            label p1 = pointI + 1 + (axisI - 1)*nFaceTheta + thetaI + 1;
+            label p2 = p1 + nFaceTheta;
+            label p3 = p2 + 1;
+            label p4 = p1 + 1;
+
+            if (thetaI == nFaceTheta - 1)
+            {
+                p3 -= nFaceTheta;
+                p4 -= nFaceTheta;
+            }
+            os  << "f " << p1 << " " << p2 << " " << p3 << " " << p4 << nl;
+        }
+    }
+
+    return nEddyPoints;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
new file mode 100644
index 0000000000..e2f6be1405
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
@@ -0,0 +1,247 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::eddy
+
+Description
+    Class to describe eddies for the turbulentDFSEMInletFvPatchVectorField
+    boundary condition.
+
+SourceFiles
+    eddy.C
+    eddyI.H
+    eddyIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulentDFSEMInletFvPatchVectorField_eddy_H
+#define turbulentDFSEMInletFvPatchVectorField_eddy_H
+
+#include "vector.H"
+#include "point.H"
+#include "tensor.H"
+#include "cachedRandom.H"
+#include "coordinateSystem.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                            Class eddy Declaration
+\*---------------------------------------------------------------------------*/
+
+class eddy
+{
+    // Private data
+
+        static label Gamma2Values[8];
+        static UList<label> Gamma2;
+
+        //- Patch face index that spawned the eddy
+        label patchFaceI_;
+
+        //- Reference position
+        point position0_;
+
+        //- Distance from reference position in normal direction
+        scalar x_;
+
+        //- Length scales in 3-D space
+        vector sigma_;
+
+        //- Time-averaged intensity
+        vector alpha_;
+
+        //- Co-ordinate system transformation from local to global axes
+        //  X-direction aligned with max stress eigenvalue
+        tensor Rpg_;
+
+        //- Model coefficient c1
+        scalar c1_;
+
+        //- Index of streamwise direction
+        label dir1_;
+
+
+    // Private Member Functions
+
+        //- Set the eddy scales: length, intensity
+        bool setScales
+        (
+            const scalar sigmaX,
+            const label gamma2,
+            const vector& e,
+            const vector& lambda,
+            vector& sigma,
+            vector& alpha
+        ) const;
+
+        //- Return a number with zero mean and unit variance
+        inline scalar epsi(cachedRandom& rndGen) const;
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        eddy();
+
+        //- Construct from Istream
+        eddy(Istream& is);
+
+        //- Construct from components
+        eddy
+        (
+            const label patchFaceI,     // patch face index
+            const point& position0,     // reference position
+            const scalar x,             // distance from reference position
+            const scalar sigmaX,        // length scale
+            const symmTensor& R,        // Stress tensor
+            cachedRandom& rndGen
+        );
+
+        //- Construct copy
+        eddy(const eddy& e);
+
+        static int debug;
+
+
+    // Public Member Functions
+
+        // Access
+
+            //- Return the patch face index that spawned the eddy
+            inline label patchFaceI() const;
+
+            //- Return the reference position
+            inline const point& position0() const;
+
+            //- Return the distance from the reference position
+            inline scalar x() const;
+
+            //- Return the lLength scales in 3-D space
+            inline const vector& sigma() const;
+
+            //- Return the time-averaged intensity
+            inline const vector& alpha() const;
+
+            //- Return the co-ordinate system transformation from local
+            //  principal to global axes
+            inline const tensor& Rpg() const;
+
+            //- Return the model coefficient c1
+            inline scalar c1() const;
+
+            //- Return the eddy position
+            inline point position(const vector& n) const;
+
+            //- Return the index of the streamwise direction
+            inline label dir1() const;
+
+            //- Return random vector of -1 and 1's
+            inline vector epsilon(cachedRandom& rndGen) const;
+
+
+        // Helper functions
+
+            //- Volume
+            inline scalar volume() const;
+
+            //- Move the eddy
+            inline void move(const scalar dx);
+
+            //- Eddy bounds
+            inline boundBox bounds(const bool global = true) const;
+
+
+        // Evaluate
+
+            //- Return the fluctuating velocity contribution at local point xp
+            vector uDash(const point& xp, const vector& n) const;
+
+
+        // Writing
+
+            //- Write the eddy centre in OBJ format
+            void writeCentreOBJ(const vector& n, Ostream& os) const;
+
+            //- Write the eddy surface in OBJ format
+            //  Returns the number of points used to describe the eddy surface
+            label writeSurfaceOBJ
+            (
+                const label pointOffset,
+                const vector& n,
+                Ostream& os
+            ) const;
+
+
+    // Member Operators
+
+        void operator=(const eddy& e);
+
+
+    // Friend Operators
+
+        friend bool operator==(const eddy& a, const eddy& b)
+        {
+            return
+                a.patchFaceI_ == b.patchFaceI_
+             && a.position0_ == b.position0_
+             && a.x_ == b.x_
+             && a.sigma_ == b.sigma_
+             && a.alpha_ == b.alpha_
+             && a.Rpg_ == b.Rpg_
+             && a.c1_ == b.c1_
+             && a.dir1_ == b.dir1_;
+        }
+
+        friend bool operator!=(const eddy& a, const eddy& b)
+        {
+            return !(a == b);
+        }
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream& is, eddy& e);
+        friend Ostream& operator<<(Ostream& os, const eddy& e);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "eddyI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyI.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyI.H
new file mode 100644
index 0000000000..82c579fcc5
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyI.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "mathematicalConstants.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::scalar Foam::eddy::epsi(cachedRandom& rndGen) const
+{
+    // Random number with zero mean and unit variance
+    return rndGen.sample01<scalar>() > 0.5 ? 1 : -1;
+}
+
+
+inline Foam::label Foam::eddy::patchFaceI() const
+{
+    return patchFaceI_;
+}
+
+
+inline const Foam::point& Foam::eddy::position0() const
+{
+    return position0_;
+}
+
+
+inline Foam::scalar Foam::eddy::x() const
+{
+    return x_;
+}
+
+
+inline const Foam::vector& Foam::eddy::sigma() const
+{
+    return sigma_;
+}
+
+
+inline const Foam::vector& Foam::eddy::alpha() const
+{
+    return alpha_;
+}
+
+
+inline const Foam::tensor& Foam::eddy::Rpg() const
+{
+    return Rpg_;
+}
+
+
+inline Foam::point Foam::eddy::position(const vector& n) const
+{
+    return position0_ + n*x_;
+}
+
+
+inline Foam::scalar Foam::eddy::c1() const
+{
+    return c1_;
+}
+
+
+Foam::vector Foam::eddy::epsilon(cachedRandom& rndGen) const
+{
+    return vector(epsi(rndGen), epsi(rndGen), epsi(rndGen));
+}
+
+
+inline Foam::scalar Foam::eddy::volume() const
+{
+    return mathematical::pi*4.0/3.0*cmptProduct(sigma_);
+}
+
+
+void Foam::eddy::move(const scalar dx)
+{
+    x_ += dx;
+}
+
+
+Foam::boundBox Foam::eddy::bounds(const bool global) const
+{
+    boundBox bb;
+
+    if (global)
+    {
+        bb.min() = Rpg_ & -sigma_;
+        bb.max() = Rpg_ & sigma_;
+    }
+    else
+    {
+        bb.min() = -sigma_;
+        bb.max() = sigma_;
+    }
+
+    return bb;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyIO.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyIO.C
new file mode 100644
index 0000000000..cb5a49bbae
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyIO.C
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "eddy.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::eddy::eddy(Istream& is)
+:
+    patchFaceI_(readLabel(is)),
+    position0_(is),
+    x_(readScalar(is)),
+    sigma_(is),
+    alpha_(is),
+    Rpg_(is),
+    c1_(readScalar(is)),
+    dir1_(readLabel(is))
+{
+    is.check("Foam::eddy::eddy(Foam::Istream&)");
+}
+
+
+// * * * * * * * * * * * * * * * * * Operators * * * * * * * * * * * * * * * //
+
+void Foam::eddy::operator=(const eddy& e)
+{
+    patchFaceI_ = e.patchFaceI_;
+    position0_ = e.position0_;
+    x_ = e.x_;
+    sigma_ = e.sigma_;
+    alpha_ = e.alpha_;
+    Rpg_ = e.Rpg_;
+    c1_ = e.c1_;
+    dir1_ = e.dir1_;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, eddy& e)
+{
+    is.check
+    (
+        "Foam::Istream& Foam::operator>>"
+        "(Foam::Istream&, Foam::eddy&)"
+    );
+
+    is  >> e.patchFaceI_
+        >> e.position0_
+        >> e.x_
+        >> e.sigma_
+        >> e.alpha_
+        >> e.Rpg_
+        >> e.c1_
+        >> e.dir1_;
+
+    is.check
+    (
+        "Foam::Istream& Foam::operator>>"
+        "(Foam::Istream&, Foam::eddy&)"
+    );
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const eddy& e)
+{
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<"
+        "(Foam::Ostream&, const Foam::eddy&)"
+    );
+
+    os  << e.patchFaceI_ << token::SPACE
+        << e.position0_ << token::SPACE
+        << e.x_ << token::SPACE
+        << e.sigma_ << token::SPACE
+        << e.alpha_ << token::SPACE
+        << e.Rpg_ << token::SPACE
+        << e.c1_ << token::SPACE
+        << e.dir1_;
+
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<"
+        "(Foam::Ostream&, const Foam::eddy&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
new file mode 100644
index 0000000000..23eaed91eb
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -0,0 +1,1148 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentDFSEMInletFvPatchVectorField.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "momentOfInertia.H"
+#include "cartesianCS.H"
+#include "OFstream.H"
+#include "globalIndex.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+Foam::label Foam::turbulentDFSEMInletFvPatchVectorField::seedIterMax_ = 1000;
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::writeEddyOBJ() const
+{
+    {
+        // Output the bounding box
+        OFstream os(db().time().path()/"eddyBox.obj");
+
+        const polyPatch& pp = this->patch().patch();
+        const labelList& boundaryPoints = pp.boundaryPoints();
+        const pointField& localPoints = pp.localPoints();
+
+        vector offset = patchNormal_*maxSigmaX_;
+        forAll(boundaryPoints, i)
+        {
+            point p = localPoints[boundaryPoints[i]];
+            p += offset;
+            os  << "v " << p.x() << " " << p.y() << " " << p.z() << nl;
+        }
+
+        forAll(boundaryPoints, i)
+        {
+            point p = localPoints[boundaryPoints[i]];
+            p -= offset;
+            os  << "v " << p.x() << " " << p.y() << " " << p.z() << nl;
+        }
+
+        // Draw lines between points
+        // Note: need to order to avoid crossing patch
+        //const label nPoint = boundaryPoints.size();
+        //
+        //forAll(boundaryPoints, i)
+        //{
+        //    label i1 = i;
+        //    label i2 = (i + 1) % nPoint;
+        //    os  << "l " << i1 << " " << i2 << nl;
+        //}
+        //
+        //forAll(boundaryPoints, i)
+        //{
+        //    label i1 = i + nPoint;
+        //    label i2 = ((i + 1) % nPoint) + nPoint;
+        //    os  << "l " << i1 << " " << i2 << nl;
+        //}
+    }   
+
+    {
+        OFstream os(db().time().path()/"eddies.obj");
+
+        label pointOffset = 0;
+        forAll(eddies_, eddyI)
+        {
+            const eddy& e = eddies_[eddyI];
+            pointOffset += e.writeSurfaceOBJ(pointOffset, patchNormal_, os);
+        }
+    }                 
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::writeLumleyCoeffs() const
+{
+    // Output list of xi vs eta
+
+    // Before interpolation/raw data
+    if (interpolateR_)
+    {
+        AverageIOField<symmTensor> Rexp
+        (
+            IOobject
+            (
+                "R",
+                this->db().time().caseConstant(),
+                "boundaryData"/patch().name()/"0",
+                this->db(),
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE,
+                false
+            )
+        );
+
+        OFstream os(db().time().path()/"lumley_input.out");
+
+        os  << "# xi" << token::TAB << "eta" << endl;
+
+        forAll(Rexp, faceI)
+        {
+            // Normalised anisotropy tensor
+            symmTensor devR = dev(Rexp[faceI]/(tr(Rexp[faceI])));
+
+            // Second tensor invariant
+            scalar ii = min(0, invariantII(devR));
+
+            // Third tensor invariant
+            scalar iii = invariantIII(devR);
+
+            // xi, eta
+            // See Pope - characterization of Reynolds-stress anisotropy
+            scalar xi = cbrt(0.5*iii);
+            scalar eta = sqrt(-ii/3.0);
+            os  << xi << token::TAB << eta << token::TAB
+                << ii << token::TAB << iii << endl;
+        }    
+    }
+
+    // After interpolation
+    {
+        OFstream os(db().time().path()/"lumley_interpolated.out");
+
+        os  << "# xi" << token::TAB << "eta" << endl;
+
+        forAll(R_, faceI)
+        {
+            // Normalised anisotropy tensor
+            symmTensor devR = dev(R_[faceI]/(tr(R_[faceI])));
+
+            // Second tensor invariant
+            scalar ii = min(0, invariantII(devR));
+
+            // Third tensor invariant
+            scalar iii = invariantIII(devR);
+
+            // xi, eta
+            // See Pope - characterization of Reynolds-stress anisotropy
+            scalar xi = cbrt(0.5*iii);
+            scalar eta = sqrt(-ii/3.0);
+            os  << xi << token::TAB << eta << token::TAB
+                << ii << token::TAB << iii << endl;
+        }
+    }
+}
+
+
+const Foam::pointToPointPlanarInterpolation&
+Foam::turbulentDFSEMInletFvPatchVectorField::patchMapper() const
+{
+    // Initialise interpolation (2D planar interpolation by triangulation)
+    if (mapperPtr_.empty())
+    {
+//        vectorGlobalIOField samplePoints
+        vectorIOField samplePoints
+        (
+            IOobject
+            (
+                "points",
+                this->db().time().caseConstant(),
+                "boundaryData"/this->patch().name(),
+                this->db(),
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE,
+                false
+            )
+        );
+
+        const fileName samplePointsFile = samplePoints.filePath();
+
+        if (debug)
+        {
+            InfoInFunction
+                << " Read " << samplePoints.size() << " sample points from "
+                << samplePointsFile << endl;
+        }
+
+
+        // tbd: run-time selection
+        bool nearestOnly =
+        (
+           !mapMethod_.empty()
+         && mapMethod_ != "planarInterpolation"
+        );
+
+        // Allocate the interpolator
+        mapperPtr_.reset
+        (
+            new pointToPointPlanarInterpolation
+            (
+                samplePoints,
+                this->patch().patch().faceCentres(),
+                perturb_,
+                nearestOnly
+            )
+        );
+    }
+
+    return mapperPtr_();
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::initialisePatch()
+{
+    const vectorField nf(patch().nf());
+
+    // Patch normal points into domain
+    patchNormal_ = -gAverage(nf);
+
+    // Check that patch is planar
+    scalar error = max(magSqr(patchNormal_ + nf));
+
+    if (error > SMALL)
+    {
+        WarningInFunction
+            << "Patch " << patch().name() << " is not planar"
+            << endl;
+    }
+
+    patchNormal_ /= mag(patchNormal_) + ROOTVSMALL;
+
+
+    // Decompose the patch faces into triangles to enable point search
+
+    const polyPatch& patch = this->patch().patch();
+    const pointField& points = patch.points();
+
+    // Triangulate the patch faces and create addressing
+    DynamicList<label> triToFace(2*patch.size());
+    DynamicList<scalar> triMagSf(2*patch.size());
+    DynamicList<face> triFace(2*patch.size());
+    DynamicList<face> tris(5);
+
+    // Set zero value at the start of the tri area list
+    triMagSf.append(0.0);
+
+    forAll(patch, faceI)
+    {
+        const face& f = patch[faceI];
+
+        tris.clear();
+        f.triangles(points, tris);
+
+        forAll(tris, i)
+        {
+            triToFace.append(faceI);
+            triFace.append(tris[i]);
+            triMagSf.append(tris[i].mag(points));
+        }
+    }
+
+    forAll(sumTriMagSf_, i)
+    {
+        sumTriMagSf_[i] = 0.0;
+    }
+
+    sumTriMagSf_[Pstream::myProcNo() + 1] = sum(triMagSf);
+
+    Pstream::listCombineGather(sumTriMagSf_, maxEqOp<scalar>());
+    Pstream::listCombineScatter(sumTriMagSf_);
+
+    for (label i = 1; i < triMagSf.size(); i++)
+    {
+        triMagSf[i] += triMagSf[i-1];
+    }
+
+    // Transfer to persistent storage
+    triFace_.transfer(triFace);
+    triToFace_.transfer(triToFace);
+    triCumulativeMagSf_.transfer(triMagSf);
+
+    // Convert sumTriMagSf_ into cumulative sum of areas per proc
+    for (label i = 1; i < sumTriMagSf_.size(); i++)
+    {
+        sumTriMagSf_[i] += sumTriMagSf_[i-1];
+    }
+
+    // Global patch area (over all processors)
+    patchArea_ = sumTriMagSf_.last();
+
+    // Local patch bounds (this processor)
+    patchBounds_ = boundBox(patch.localPoints(), false);
+    patchBounds_.inflate(0.1);
+
+    // Determine if all eddies spawned from a single processor
+    singleProc_ = patch.size() == returnReduce(patch.size(), sumOp<label>());
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::initialiseEddyBox()
+{
+    const scalarField& magSf = patch().magSf();
+
+    //const scalarField cellDx(Foam::sqrt(magSf));
+    const scalarField cellDx(max(Foam::sqrt(magSf), 2/patch().deltaCoeffs()));
+
+    // Inialise eddy box extents
+    forAll(*this, faceI)
+    {
+        scalar& s = sigmax_[faceI];
+
+        // Length scale in x direction (based on eq. 14)
+        s = mag(L_[faceI]);
+        s = min(s, kappa_*delta_);
+
+        // Allow eddies to be smaller than the mesh scale as suggested by
+        // the reference?
+        // s = min(s, nCellPerEddy_*cellDx[faceI]);
+        s = max(s, nCellPerEddy_*cellDx[faceI]);
+    }
+
+    // Maximum extent across all processors
+    maxSigmaX_ = gMax(sigmax_);
+
+    // Eddy box volume
+    v0_ = 2*gSum(magSf)*maxSigmaX_;
+
+    if (debug)
+    {
+        Info<< "Patch: " << patch().patch().name() << " eddy box:" << nl
+            << "    volume    : " << v0_ << nl
+            << "    maxSigmaX : " << maxSigmaX_ << nl
+            << endl;
+    }
+}
+
+
+Foam::pointIndexHit Foam::turbulentDFSEMInletFvPatchVectorField::setNewPosition
+(
+    const bool global
+)
+{
+    // Initialise to miss
+    pointIndexHit pos(false, vector::max, -1);
+
+    const polyPatch& patch = this->patch().patch();
+    const pointField& points = patch.points();
+
+    if (global)
+    {
+        scalar areaFraction = rndGen_.globalPosition<scalar>(0, patchArea_);
+
+        // Determine which processor to use
+        label procI = 0;
+        forAllReverse(sumTriMagSf_, i)
+        {
+            if (areaFraction >= sumTriMagSf_[i])
+            {
+                procI = i;
+                break;
+            }
+        }
+
+        if (Pstream::myProcNo() == procI)
+        {
+            // Find corresponding decomposed face triangle
+            label triI = 0;
+            scalar offset = sumTriMagSf_[procI];
+            forAllReverse(triCumulativeMagSf_, i)
+            {
+                if (areaFraction > triCumulativeMagSf_[i] + offset)
+                {
+                    triI = i;
+                    break;
+                }
+            }
+
+            // Find random point in triangle
+            const face& tf = triFace_[triI];
+            const triPointRef tri(points[tf[0]], points[tf[1]], points[tf[2]]);
+
+            pos.setHit();
+            pos.setIndex(triToFace_[triI]);
+            pos.rawPoint() = tri.randomPoint(rndGen_);
+        }
+    }
+    else
+    {
+        // Find corresponding decomposed face triangle on local processor
+        label triI = 0;
+        scalar maxAreaLimit = triCumulativeMagSf_.last();
+        scalar areaFraction = rndGen_.position<scalar>(0, maxAreaLimit);
+
+        forAllReverse(triCumulativeMagSf_, i)
+        {
+            if (areaFraction > triCumulativeMagSf_[i])
+            {
+                triI = i;
+                break;
+            }
+        }
+
+        // Find random point in triangle
+        const face& tf = triFace_[triI];
+        const triPointRef tri(points[tf[0]], points[tf[1]], points[tf[2]]);
+
+        pos.setHit();
+        pos.setIndex(triToFace_[triI]);
+        pos.rawPoint() = tri.randomPoint(rndGen_);
+    }
+
+    return pos;
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::initialiseEddies()
+{
+    DynamicList<eddy> eddies(size());
+
+    // Initialise eddy properties
+    scalar sumVolEddy = 0;
+    scalar sumVolEddyAllProc = 0;
+
+    while (sumVolEddyAllProc/v0_ < d_)
+    {
+        bool search = true;
+        label iter = 0;
+
+        while (search && iter++ < seedIterMax_)
+        {
+            // Get new parallel consistent position
+            pointIndexHit pos(setNewPosition(true));
+            label faceI = pos.index();
+
+            // Note: only 1 processor will pick up this face
+            if (faceI != -1)
+            {
+                eddy e
+                (
+                    faceI,
+                    pos.hitPoint(),
+                    rndGen_.position<scalar>(-maxSigmaX_, maxSigmaX_),
+                    sigmax_[faceI],
+                    R_[faceI],
+                    rndGen_
+                );
+
+                // If eddy valid, patchFaceI is non-zero
+                if (e.patchFaceI() != -1)
+                {
+                    eddies.append(e);
+                    sumVolEddy += e.volume();
+                    search = false;
+                }
+            }
+            // else eddy on remote processor
+
+            reduce(search, andOp<bool>());
+        }
+
+
+        sumVolEddyAllProc = returnReduce(sumVolEddy, sumOp<scalar>());
+    }
+    eddies_.transfer(eddies);
+
+    nEddy_ = eddies_.size();
+
+    if (debug)
+    {
+        Pout<< "Patch:" << patch().patch().name();
+
+        if (Pstream::parRun())
+        {
+            Pout<< " processor:" << Pstream::myProcNo();
+        }
+
+        Pout<< " seeded:" << nEddy_ << " eddies" << endl;
+    }
+
+    reduce(nEddy_, sumOp<label>());
+
+    if (nEddy_ > 0)
+    {
+        Info<< "Turbulent DFSEM patch: " << patch().name()
+            << " seeded " << nEddy_ << " eddies with total volume "
+            << sumVolEddyAllProc
+            << endl;
+    }
+    else
+    {
+        WarningInFunction
+            << "Patch: " << patch().patch().name()
+            << " on field " << dimensionedInternalField().name()
+            << ": No eddies seeded - please check your set-up" << endl;
+    }
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::convectEddies
+(
+    const scalar deltaT
+)
+{
+    // Note: all operations applied to local processor only
+
+    label nRecycled = 0;
+
+    forAll(eddies_, eddyI)
+    {
+        eddy& e = eddies_[eddyI];
+        e.move(deltaT*(UMean_ & patchNormal_));
+
+        const scalar position0 = e.x();
+
+        // Check to see if eddy has exited downstream box plane
+        if (position0 > maxSigmaX_)
+        {
+            bool search = true;
+            label iter = 0;
+
+            while (search && iter++ < seedIterMax_)
+            {
+               // Spawn new eddy with new random properties (intensity etc)
+               pointIndexHit pos(setNewPosition(false));
+               label faceI = pos.index();
+
+               e = eddy
+                    (
+                        faceI,
+                        pos.hitPoint(),
+                        position0 - floor(position0/maxSigmaX_)*maxSigmaX_,
+                        sigmax_[faceI],
+                        R_[faceI],
+                        rndGen_
+                    );
+
+                if (e.patchFaceI() != -1)
+                {
+                    search = false;
+                }
+            }
+
+            nRecycled++;
+        }
+    }
+
+    reduce(nRecycled, sumOp<label>());
+
+    if (debug && nRecycled > 0)
+    {
+        Info<< "Patch: " << patch().patch().name() << " recycled "
+            << nRecycled << " eddies" << endl;
+    }
+}
+
+
+Foam::vector Foam::turbulentDFSEMInletFvPatchVectorField::uDashEddy
+(
+    const List<eddy>& eddies,
+    const point& patchFaceCf
+) const
+{
+    vector uDash(vector::zero);
+
+    forAll(eddies, k)
+    {
+        const eddy& e = eddies[k];
+        uDash += e.uDash(patchFaceCf, patchNormal_);
+    }
+
+    return uDash;
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::calcOverlappingProcEddies
+(
+    List<List<eddy> >& overlappingEddies
+) const
+{
+    int oldTag = UPstream::msgType();
+    UPstream::msgType() = oldTag + 1;
+
+    List<boundBox> patchBBs(Pstream::nProcs());
+    patchBBs[Pstream::myProcNo()] = patchBounds_;
+    Pstream::gatherList(patchBBs);
+    Pstream::scatterList(patchBBs);
+
+    // Per processor indices into all segments to send
+    List<DynamicList<label> > dynSendMap(Pstream::nProcs());
+
+    forAll(eddies_, i)
+    {
+        // Collect overlapping eddies
+        const eddy& e = eddies_[i];
+
+        // Eddy bounds
+        point x = e.position(patchNormal_);
+        boundBox ebb = e.bounds();
+        ebb.min() += x;
+        ebb.max() += x;
+
+        forAll(patchBBs, procI)
+        {
+            // Not including intersection with local patch
+            if (procI != Pstream::myProcNo())
+            {
+                if (ebb.overlaps(patchBBs[procI]))
+                {
+                    dynSendMap[procI].append(i);
+                }
+            }
+        }
+    }
+
+    labelListList sendMap(Pstream::nProcs());
+    forAll(sendMap, procI)
+    {
+        sendMap[procI].transfer(dynSendMap[procI]);
+    }
+
+    // Send the number of eddies for local processors to receive
+    labelListList sendSizes(Pstream::nProcs());
+    sendSizes[Pstream::myProcNo()].setSize(Pstream::nProcs());
+    forAll(sendMap, procI)
+    {
+        sendSizes[Pstream::myProcNo()][procI] = sendMap[procI].size();
+    }
+    Pstream::gatherList(sendSizes);
+    Pstream::scatterList(sendSizes);
+
+    // Determine order of receiving
+    labelListList constructMap(Pstream::nProcs());
+
+    // Local segment first
+    constructMap[Pstream::myProcNo()] = identity
+    (
+        sendMap[Pstream::myProcNo()].size()
+    );
+
+    label segmentI = constructMap[Pstream::myProcNo()].size();
+    forAll(constructMap, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            // What I need to receive is what other processor is sending to me
+            label nRecv = sendSizes[procI][Pstream::myProcNo()];
+            constructMap[procI].setSize(nRecv);
+
+            for (label i = 0; i < nRecv; i++)
+            {
+                constructMap[procI][i] = segmentI++;
+            }
+        }
+    }
+
+    mapDistribute map(segmentI, sendMap.xfer(), constructMap.xfer());
+
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
+    for (label domain = 0; domain < Pstream::nProcs(); domain++)
+    {
+        const labelList& sendElems = map.subMap()[domain];
+
+        if (domain != Pstream::myProcNo() && sendElems.size())
+        {
+            List<eddy> subEddies(UIndirectList<eddy>(eddies_, sendElems));
+
+            UOPstream toDomain(domain, pBufs);
+
+            toDomain<< subEddies;
+        }
+    }
+
+    // Start receiving
+    pBufs.finishedSends();
+
+    // Consume
+    for (label domain = 0; domain < Pstream::nProcs(); domain++)
+    {
+        const labelList& recvElems = map.constructMap()[domain];
+
+        if (domain != Pstream::myProcNo() && recvElems.size())
+        {
+            UIPstream str(domain, pBufs);
+            {
+                str >> overlappingEddies[domain];
+            }
+        }
+    }
+
+    // Restore tag
+    UPstream::msgType() = oldTag;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::turbulentDFSEMInletFvPatchVectorField::
+turbulentDFSEMInletFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(p, iF),
+    delta_(0),
+    d_(0),
+    kappa_(0),
+
+    perturb_(1e-5),
+    mapMethod_("planarInterpolation"),
+    mapperPtr_(NULL),
+    interpolateR_(false),
+    R_(),
+    interpolateL_(false),
+    L_(),
+    interpolateU_(false),
+    U_(),
+    UMean_(vector::zero),
+
+    patchArea_(-1),
+    triFace_(),
+    triToFace_(),
+    triCumulativeMagSf_(),
+    sumTriMagSf_(Pstream::nProcs() + 1, 0.0),
+
+    eddies_(0),
+    nCellPerEddy_(5),
+    patchNormal_(vector::zero),
+    v0_(0),
+    rndGen_(0, -1),
+    sigmax_(size(), 0),
+    maxSigmaX_(0),
+    nEddy_(0),
+    curTimeIndex_(-1),
+    patchBounds_(boundBox::invertedBox),
+    singleProc_(false),
+    writeEddies_(false)
+{}
+
+
+Foam::turbulentDFSEMInletFvPatchVectorField::
+turbulentDFSEMInletFvPatchVectorField
+(
+    const turbulentDFSEMInletFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    delta_(ptf.delta_),
+    d_(ptf.d_),
+    kappa_(ptf.kappa_),
+
+    perturb_(ptf.perturb_),
+    mapMethod_(ptf.mapMethod_),
+    mapperPtr_(NULL),
+    interpolateR_(ptf.interpolateR_),
+    R_(ptf.R_, mapper),
+    interpolateL_(ptf.interpolateL_),
+    L_(ptf.L_, mapper),
+    interpolateU_(ptf.interpolateU_),
+    U_(ptf.U_, mapper),
+    UMean_(ptf.UMean_),
+
+    patchArea_(ptf.patchArea_),
+    triFace_(ptf.triFace_),
+    triToFace_(ptf.triToFace_),
+    triCumulativeMagSf_(ptf.triCumulativeMagSf_),
+    sumTriMagSf_(ptf.sumTriMagSf_),
+
+    eddies_(ptf.eddies_),
+    nCellPerEddy_(ptf.nCellPerEddy_),
+    patchNormal_(ptf.patchNormal_),
+    v0_(ptf.v0_),
+    rndGen_(ptf.rndGen_),
+    sigmax_(ptf.sigmax_, mapper),
+    maxSigmaX_(ptf.maxSigmaX_),
+    nEddy_(0),
+    curTimeIndex_(-1),
+    patchBounds_(ptf.patchBounds_),
+    singleProc_(ptf.singleProc_),
+    writeEddies_(ptf.writeEddies_)
+{}
+
+
+Foam::turbulentDFSEMInletFvPatchVectorField::
+turbulentDFSEMInletFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    delta_(readScalar(dict.lookup("delta"))),
+    d_(dict.lookupOrDefault<scalar>("d", 1)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+
+    perturb_(dict.lookupOrDefault<scalar>("perturb", 1e-5)),
+    mapMethod_(dict.lookup("mapMethod")),
+    mapperPtr_(NULL),
+    interpolateR_(false),
+    R_(interpolateOrRead<symmTensor>("R", dict, interpolateR_)),
+    interpolateL_(false),
+    L_(interpolateOrRead<scalar>("L", dict, interpolateL_)),
+    interpolateU_(false),
+    U_(interpolateOrRead<vector>("U", dict, interpolateU_)),
+    UMean_(vector::zero),
+
+    patchArea_(-1),
+    triFace_(),
+    triToFace_(),
+    triCumulativeMagSf_(),
+    sumTriMagSf_(Pstream::nProcs() + 1, 0.0),
+
+    eddies_(),
+    nCellPerEddy_(dict.lookupOrDefault<label>("nCellPerEddy", 5)),
+    patchNormal_(vector::zero),
+    v0_(0),
+    rndGen_(0, -1),
+    sigmax_(size(), 0),
+    maxSigmaX_(0),
+    nEddy_(0),
+    curTimeIndex_(-1),
+    patchBounds_(boundBox::invertedBox),
+    singleProc_(false),
+    writeEddies_(dict.lookupOrDefault<bool>("writeEddies", false))
+{
+    eddy::debug = debug;
+
+    // Set UMean as patch area average value
+    UMean_ = gSum(U_*patch().magSf())/gSum(patch().magSf());
+}
+
+
+Foam::turbulentDFSEMInletFvPatchVectorField::
+turbulentDFSEMInletFvPatchVectorField
+(
+    const turbulentDFSEMInletFvPatchVectorField& ptf
+)
+:
+    fixedValueFvPatchField<vector>(ptf),
+    delta_(ptf.delta_),
+    d_(ptf.d_),
+    kappa_(ptf.kappa_),
+
+    perturb_(ptf.perturb_),
+    mapMethod_(ptf.mapMethod_),
+    mapperPtr_(NULL),
+    interpolateR_(ptf.interpolateR_),
+    R_(ptf.R_),
+    interpolateL_(ptf.interpolateL_),
+    L_(ptf.L_),
+    interpolateU_(ptf.interpolateU_),
+    U_(ptf.U_),
+    UMean_(ptf.UMean_),
+
+    patchArea_(ptf.patchArea_),
+    triFace_(ptf.triFace_),
+    triToFace_(ptf.triToFace_),
+    triCumulativeMagSf_(ptf.triCumulativeMagSf_),
+    sumTriMagSf_(ptf.sumTriMagSf_),
+
+    eddies_(ptf.eddies_),
+    nCellPerEddy_(ptf.nCellPerEddy_),
+    patchNormal_(ptf.patchNormal_),
+    v0_(ptf.v0_),
+    rndGen_(ptf.rndGen_),
+    sigmax_(ptf.sigmax_),
+    maxSigmaX_(ptf.maxSigmaX_),
+    nEddy_(0),
+    curTimeIndex_(-1),
+    patchBounds_(ptf.patchBounds_),
+    singleProc_(ptf.singleProc_),
+    writeEddies_(ptf.writeEddies_)
+{}
+
+
+Foam::turbulentDFSEMInletFvPatchVectorField::
+turbulentDFSEMInletFvPatchVectorField
+(
+    const turbulentDFSEMInletFvPatchVectorField& ptf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(ptf, iF),
+    delta_(ptf.delta_),
+    d_(ptf.d_),
+    kappa_(ptf.kappa_),
+
+    perturb_(ptf.perturb_),
+    mapMethod_(ptf.mapMethod_),
+    mapperPtr_(NULL),
+    interpolateR_(ptf.interpolateR_),
+    R_(ptf.R_),
+    interpolateL_(ptf.interpolateL_),
+    L_(ptf.L_),
+    interpolateU_(ptf.interpolateU_),
+    U_(ptf.U_),
+    UMean_(ptf.UMean_),
+
+    patchArea_(ptf.patchArea_),
+    triFace_(ptf.triFace_),
+    triToFace_(ptf.triToFace_),
+    triCumulativeMagSf_(ptf.triCumulativeMagSf_),
+    sumTriMagSf_(ptf.sumTriMagSf_),
+
+    eddies_(ptf.eddies_),
+    nCellPerEddy_(ptf.nCellPerEddy_),
+    patchNormal_(ptf.patchNormal_),
+    v0_(ptf.v0_),
+    rndGen_(ptf.rndGen_),
+    sigmax_(ptf.sigmax_),
+    maxSigmaX_(ptf.maxSigmaX_),
+    nEddy_(0),
+    curTimeIndex_(-1),
+    patchBounds_(ptf.patchBounds_),
+    singleProc_(ptf.singleProc_),
+    writeEddies_(ptf.writeEddies_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::turbulentDFSEMInletFvPatchVectorField::~
+turbulentDFSEMInletFvPatchVectorField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    fixedValueFvPatchField<vector>::autoMap(m);
+
+    // Clear interpolator
+    mapperPtr_.clear();
+    R_.autoMap(m);
+    L_.autoMap(m);
+    U_.autoMap(m);
+
+    sigmax_.autoMap(m);
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::rmap
+(
+    const fvPatchVectorField& ptf,
+    const labelList& addr
+)
+{
+    fixedValueFvPatchField<vector>::rmap(ptf, addr);
+
+    const turbulentDFSEMInletFvPatchVectorField& dfsemptf =
+        refCast<const turbulentDFSEMInletFvPatchVectorField>(ptf);
+
+    R_.rmap(dfsemptf.R_, addr);
+    L_.rmap(dfsemptf.L_, addr);
+    U_.rmap(dfsemptf.U_, addr);
+
+    // Clear interpolator
+    mapperPtr_.clear();
+
+    sigmax_.rmap(dfsemptf.sigmax_, addr);
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    if (curTimeIndex_ == -1)
+    {
+        initialisePatch();
+
+        initialiseEddyBox();
+
+        initialiseEddies();
+    }
+
+
+    if (curTimeIndex_ != db().time().timeIndex())
+    {
+        if (debug)
+        {
+            label n = eddies_.size();
+            Info<< "Number of eddies: " << returnReduce(n, sumOp<label>())
+                << endl;
+        }
+
+        const scalar deltaT = db().time().deltaTValue();
+
+        // Move eddies using mean velocity
+        convectEddies(deltaT);
+
+        // Set velocity
+        vectorField& U = *this;
+        //U = UMean_;
+        U = U_;
+
+        const pointField& Cf = patch().Cf();
+
+        // Apply second part of normalisation coefficient
+        // Note: factor of 2 required to match reference stresses?
+        const scalar FACTOR = 2;
+        const scalar c = FACTOR*Foam::sqrt(10*v0_)/Foam::sqrt(scalar(nEddy_));
+
+        // In parallel, need to collect all eddies that will interact with
+        // local faces
+
+        if (singleProc_ || !Pstream::parRun())
+        {
+            forAll(U, faceI)
+            {
+                U[faceI] += c*uDashEddy(eddies_, Cf[faceI]);
+            }
+        }
+        else
+        {
+            // Process local eddy contributions
+            forAll(U, faceI)
+            {
+                U[faceI] += c*uDashEddy(eddies_, Cf[faceI]);
+            }
+
+            // Add contributions from overlapping eddies
+            List<List<eddy> > overlappingEddies(Pstream::nProcs());
+            calcOverlappingProcEddies(overlappingEddies);
+
+            forAll(overlappingEddies, procI)
+            {
+                const List<eddy>& eddies = overlappingEddies[procI];
+
+                if (eddies.size())
+                {
+                    //Pout<< "Applying " << eddies.size()
+                    //    << " eddies from processor " << procI << endl;
+
+                    forAll(U, faceI)
+                    {
+                        U[faceI] += c*uDashEddy(eddies, Cf[faceI]);
+                    }
+                }
+            }
+        }
+
+        // Re-scale to ensure correct flow rate
+        scalar fCorr =
+            gSum((UMean_ & patchNormal_)*patch().magSf())
+           /gSum(U & -patch().Sf());
+
+        U *= fCorr;
+
+        if (debug)
+        {
+            Info<< "Patch:" << patch().patch().name()
+                << " min/max(U):" << gMin(U) << ", " << gMax(U) << endl;
+        }
+
+        curTimeIndex_ = db().time().timeIndex();
+
+        if (writeEddies_)
+        {
+            writeEddyOBJ();
+        }
+
+        if (debug && db().time().outputTime())
+        {
+            writeLumleyCoeffs();
+        }
+    }
+
+    fixedValueFvPatchVectorField::updateCoeffs();
+}
+
+
+void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
+{
+    fvPatchField<vector>::write(os);
+    writeEntry("value", os);
+    os.writeKeyword("delta") << delta_ << token::END_STATEMENT << nl;
+    writeEntryIfDifferent(os, "d", 1.0, d_);
+    writeEntryIfDifferent(os, "kappa", 0.41, kappa_);
+    writeEntryIfDifferent(os, "perturb", 1e-5, perturb_);
+    writeEntryIfDifferent(os, "nCellPerEddy", 5, nCellPerEddy_);
+    writeEntryIfDifferent(os, "writeEddies", false, writeEddies_);
+
+    if (!interpolateR_)
+    {
+        R_.writeEntry("R", os);
+    }
+
+    if (!interpolateL_)
+    {
+        L_.writeEntry("L", os);
+    }
+
+    if (!interpolateU_)
+    {
+        U_.writeEntry("U", os);
+    }
+
+    if
+    (
+       !mapMethod_.empty()
+     && mapMethod_ != "planarInterpolation"
+    )
+    {
+        os.writeKeyword("mapMethod") << mapMethod_
+            << token::END_STATEMENT << nl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchVectorField,
+       turbulentDFSEMInletFvPatchVectorField
+   );
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
new file mode 100644
index 0000000000..b1d0afe62a
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
@@ -0,0 +1,376 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::turbulentDFSEMInletFvPatchVectorField
+
+Group
+    grpInletBoundaryConditions
+
+Description
+    Velocity boundary condition including synthesised eddies for use with LES
+    and DES turbulent flows.
+
+    Reference:
+    \verbatim
+        Poletto, R., Craft, T., and Revell, A.,
+        "A New Divergence Free Synthetic Eddy Method for the Reproduction
+         of Inlet Flow Conditions for LES",
+        Flow Turbulence Combust (2013) 91:519-539
+    \endverbatim
+
+    Reynolds stress, velocity and turbulence length scale values can either
+    be sepcified directly, or mapped.  If mapping, the values should be
+    entered in the same form as the timeVaryingMappedFixedValue condition,
+    except that no interpolation in time is supported.  These should be
+    located in the directory:
+ 
+        \$FOAM_CASE/constant/boundaryData/<patchName>/points
+        \$FOAM_CASE/constant/boundaryData/<patchName>/0/\{R|U|L\}
+
+
+Usage
+    \table
+        Property  | Description         | Required         | Default value
+        value     | Restart value       | yes              |
+        delta     | Local limiting length scale  | yes     |
+        R         | Reynolds stress field | no             |
+        U         | Velocity field      | no               |
+        L         | Turbulence length scale field | no     |
+        d         | Eddy density(fill fraction) | no       | 1
+        kappa     | Von Karman constant | no               | 0.41
+        mapMethod | Method to map reference values | no | planarInterpolation
+        perturb   | Point perturbation for interpolation | no | 1e-5
+        writeEddies | Flag to write eddies as OBJ file | no | no
+    \endtable
+
+Note
+    - The \c delta value typically represents a channel half-height
+    - For R, U and L specification: if the entry is not user input, it is
+      assumed that the data will be mapped
+
+SeeAlso
+    timeVaryingMappedFixedValueFvPatchField
+
+SourceFiles
+    turbulentDFSEMInletFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulentDFSEMInletFvPatchVectorField_H
+#define turbulentDFSEMInletFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "cachedRandom.H"
+#include "eddy.H"
+#include "pointIndexHit.H"
+#include "instantList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class cartesianCS;
+class pointToPointPlanarInterpolation;
+
+/*---------------------------------------------------------------------------*\
+           Class turbulentDFSEMInletFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulentDFSEMInletFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Maximum number of attempts when seeding eddies
+        static label seedIterMax_;
+
+        //- Typical length scale, e.g. half channel height
+        const scalar delta_;
+
+        //- Ratio of sum of eddy volumes to eddy box volume; default = 1
+        const scalar d_;
+
+        //- Von Karman constant
+        const scalar kappa_;
+
+        //- Global numbering for faces
+        mutable autoPtr<globalIndex> globalFacesPtr_;
+
+
+        // Table reading for patch inlet flow properties
+
+            //- Fraction of perturbation (fraction of bounding box) to add
+            scalar perturb_;
+
+            //- Interpolation scheme to use
+            word mapMethod_;
+
+            //- 2D interpolation (for 'planarInterpolation' mapMethod)
+            mutable autoPtr<pointToPointPlanarInterpolation> mapperPtr_;
+
+            //- Flag to identify to interpolate the R field
+            bool interpolateR_;
+
+            //- Reynolds stress tensor
+            symmTensorField R_;
+
+            //- Flag to identify to interpolate the L field
+            bool interpolateL_;
+
+            //- Length scale
+            scalarField L_;
+
+            //- Flag to identify to interpolate the U field
+            bool interpolateU_;
+
+            //- Inlet velocity
+            vectorField U_;
+
+            //- Mean inlet velocity
+            vector UMean_;
+
+
+        // Patch information
+
+            //- Patch area - total across all processors
+            scalar patchArea_;
+
+            //- Decomposed patch faces as a list of triangles
+            faceList triFace_;
+
+            //- Addressing from per triangle to patch face
+            labelList triToFace_;
+
+            //- Cumulative triangle area per triangle face
+            scalarList triCumulativeMagSf_;
+
+            //- Cumulative area fractions per processor
+            scalarList sumTriMagSf_;
+
+
+        //- List of eddies
+        List<eddy> eddies_;
+
+        //- Minimum number of cells required to resolve an eddy
+        label nCellPerEddy_;
+
+        //- Patch normal into the domain
+        vector patchNormal_;
+
+        //- Eddy box volume
+        scalar v0_;
+
+        //- Random number generator
+        cachedRandom rndGen_;
+
+        //- Length scale per patch face
+        scalarField sigmax_;
+
+        //- Maximum length scale (across all processors)
+        scalar maxSigmaX_;
+
+        //- Global number of eddies
+        label nEddy_;
+
+        //- Current time index (used for updating)
+        label curTimeIndex_;
+
+        //- Patch bounds (local processor)
+        boundBox patchBounds_;
+
+        //- Single processor contains all eddies (flag)
+        bool singleProc_;
+
+        //- Flag to write the eddies to file
+        bool writeEddies_;
+
+
+    // Private Member Functions
+
+        //- Initialise info for patch point search
+        void initialisePatch();
+
+        //- Initialise the eddy box
+        void initialiseEddyBox();
+
+        //- Set a new eddy position
+        pointIndexHit setNewPosition(const bool global);
+
+        //- Initialise eddies
+        void initialiseEddies();
+
+        //- Convect the eddies
+        void convectEddies(const scalar deltaT);
+
+        //- Calculate the velocity fluctuation at a point
+        vector uDashEddy(const List<eddy>& eddies, const point& globalX) const;
+
+        //- Helper function to interpolate values from the boundary data or
+        //  read from dictionary
+        template<class Type>
+        tmp<Field<Type> > interpolateOrRead
+        (
+            const word& fieldName,
+            const dictionary& dict,
+            bool& interpolateField
+        ) const;
+
+        //- Helper function to interpolate values from the boundary data
+        template<class Type>
+        tmp<Field<Type> > interpolateBoundaryData
+        (
+            const word& fieldName
+        ) const;
+
+        //- Write Lumley coefficients to file
+        void writeLumleyCoeffs() const;
+
+        //- Write eddy info in OBJ format
+        void writeEddyOBJ() const;
+
+        //- Return a reference to the patch mapper object
+        const pointToPointPlanarInterpolation& patchMapper() const;
+
+        //- Return eddies from remote processors that interact with local
+        //  processor
+        void calcOverlappingProcEddies
+        (
+            List<List<eddy> >& overlappingEddies
+        ) const;
+
+
+public:
+
+   //- Runtime type information
+   TypeName("turbulentDFSEMInlet");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        turbulentDFSEMInletFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        turbulentDFSEMInletFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given turbulentDFSEMInletFvPatchVectorField
+        //  onto a new patch
+        turbulentDFSEMInletFvPatchVectorField
+        (
+            const turbulentDFSEMInletFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        turbulentDFSEMInletFvPatchVectorField
+        (
+            const turbulentDFSEMInletFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new turbulentDFSEMInletFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        turbulentDFSEMInletFvPatchVectorField
+        (
+            const turbulentDFSEMInletFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new turbulentDFSEMInletFvPatchVectorField(*this, iF)
+            );
+        }
+
+    virtual ~turbulentDFSEMInletFvPatchVectorField();
+
+
+    // Member functions
+
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap(const fvPatchFieldMapper& m);
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchVectorField& ptf,
+                const labelList& addr
+            );
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "turbulentDFSEMInletFvPatchVectorFieldTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorFieldTemplates.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorFieldTemplates.C
new file mode 100644
index 0000000000..230e1c707f
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorFieldTemplates.C
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "AverageIOField.H"
+#include "pointToPointPlanarInterpolation.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::Field<Type> >
+Foam::turbulentDFSEMInletFvPatchVectorField::interpolateOrRead
+(
+    const word& fieldName,
+    const dictionary& dict,
+    bool& interpolateField
+) const
+{
+    if (dict.found(fieldName))
+    {
+        tmp<Field<Type> > tFld
+        (
+            new Field<Type>
+            (
+                fieldName,
+                dict,
+                this->patch().size()
+            )
+        );
+
+        interpolateField = false;
+        return tFld;
+    }
+    else
+    {
+        interpolateField = true;
+        return interpolateBoundaryData<Type>(fieldName);
+    }
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type> >
+Foam::turbulentDFSEMInletFvPatchVectorField::interpolateBoundaryData
+(
+    const word& fieldName
+) const
+{
+    const word& patchName = this->patch().name();
+
+    // Note: reading from the '0' directory only
+    IOobject io
+    (
+        fieldName,
+        this->db().time().caseConstant(),
+        "boundaryData"/patchName/"0",
+        this->db(),
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE,
+        false
+    );
+
+    Info<< "Turbulent DFSEM patch " << this->patch().name()
+        << ": interpolating field " << fieldName
+        << " from " << io.path() << endl;
+
+    AverageIOField<Type> aFld(io);
+
+    return patchMapper().interpolate(aFld);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/doc/fvPatchFieldDoc.H b/src/finiteVolume/fields/fvPatchFields/doc/fvPatchFieldDoc.H
index 8b6889ea03..47684ecc4f 100644
--- a/src/finiteVolume/fields/fvPatchFields/doc/fvPatchFieldDoc.H
+++ b/src/finiteVolume/fields/fvPatchFields/doc/fvPatchFieldDoc.H
@@ -23,7 +23,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpBoundaryConditions Boundary Conditions
+\defgroup grpBoundaryConditions Boundary conditions
 @{
     This group contains OpenFOAM boundary condition types.  All conditions
     are derived from the base Foam::fvPatchField class.  Patch values are
@@ -38,38 +38,38 @@ License
     of the matrix solve, via a call to \<field\>.correctBoundaryConditions().
 @}
 
-\defgroup grpConstraintBoundaryConditions Constraint boundary Conditions
+\defgroup grpConstraintBoundaryConditions Constraint
 @{
     \ingroup grpBoundaryConditions
     This group contains constraint boundary condition types.  These conditions
     are mainly employed to reduced dimensioned cases.
 @}
 
-\defgroup grpInletBoundaryConditions Inlet boundary Conditions
+\defgroup grpInletBoundaryConditions Inlet
 @{
     \ingroup grpBoundaryConditions
     This group contains inlet boundary condition types
 @}
 
-\defgroup grpOutletBoundaryConditions Outlet boundary Conditions
+\defgroup grpOutletBoundaryConditions Outlet
 @{
     \ingroup grpBoundaryConditions
     This group contains outlet boundary condition types
 @}
 
-\defgroup grpGenericBoundaryConditions Generic boundary Conditions
+\defgroup grpGenericBoundaryConditions Generic
 @{
     \ingroup grpBoundaryConditions
     This group contains generic boundary condition types
 @}
 
-\defgroup grpCoupledBoundaryConditions Coupled boundary Conditions
+\defgroup grpCoupledBoundaryConditions Coupled
 @{
     \ingroup grpBoundaryConditions
     This group contains coupled boundary condition types
 @}
 
-\defgroup grpWallBoundaryConditions Wall boundary Conditions
+\defgroup grpWallBoundaryConditions Wall
 @{
     \ingroup grpBoundaryConditions
     This group contains wall boundary condition types
diff --git a/src/fvMotionSolver/doc/motionSolversDoc.H b/src/fvMotionSolver/doc/motionSolversDoc.H
new file mode 100644
index 0000000000..818a34eea9
--- /dev/null
+++ b/src/fvMotionSolver/doc/motionSolversDoc.H
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpMeshMotion Mesh motion
+@{
+    This group contains Mesh motion models.
+@}
+
+\defgroup grpMeshMotionSolvers Solvers
+@{
+    \ingroup grpMeshMotion
+    This group contains Mesh motion solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
index e4b1ae9605..bed5a61674 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::displacementComponentLaplacianFvMotionSolver
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Mesh motion solver for an fvMesh.  Based on solving the cell-centre
     Laplacian for the given component of the motion displacement.
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
index bc7c746ea2..d4075ff93b 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::velocityComponentLaplacianFvMotionSolver
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Mesh motion solver for an fvMesh.  Based on solving the cell-centre
     Laplacian for the given component of the motion velocity.
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
index 3a4779d9db..5e4c7b64c1 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::displacementSBRStressFvMotionSolver
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Mesh motion solver for an fvMesh.  Based on solving the cell-centre
     solid-body rotation stress equations for the motion displacement.
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
index 3742417349..2458d1d400 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::displacementInterpolationMotionSolver
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Mesh motion solver for an fvMesh.
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
index 7ec7790985..1df49597a6 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::displacementLaplacianFvMotionSolver
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Mesh motion solver for an fvMesh.  Based on solving the cell-centre
     Laplacian for the motion displacement.
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
index c876e560ef..be002c6056 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::displacementLayeredMotionMotionSolver
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Mesh motion solver for an (multi-block) extruded fvMesh. Gets given the
     structure of the mesh blocks and boundary conditions on these blocks.
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H
index 719c699449..77f83e5ad5 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::surfaceAlignedSBRStressFvMotionSolver
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Mesh motion solver for an fvMesh.  Based on solving the cell-centre
     solid-body rotation stress equations for the motion displacement.
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
index 479234dc22..af213a9675 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::velocityLaplacianFvMotionSolver
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Mesh motion solver for an fvMesh.  Based on solving the cell-centre
     Laplacian for the motion velocity.
diff --git a/src/fvOptions/Make/files b/src/fvOptions/Make/files
index 6e74683868..205a7f8ef3 100644
--- a/src/fvOptions/Make/files
+++ b/src/fvOptions/Make/files
@@ -12,6 +12,7 @@ $(generalSources)/codedSource/codedSource.C
 $(generalSources)/semiImplicitSource/semiImplicitSource.C
 
 derivedSources=sources/derived
+$(derivedSources)/acousticDampingSource/acousticDampingSource.C
 $(derivedSources)/actuationDiskSource/actuationDiskSource.C
 $(derivedSources)/buoyancyForce/buoyancyForce.C
 $(derivedSources)/buoyancyForce/buoyancyForceIO.C
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
new file mode 100644
index 0000000000..7c9f27febc
--- /dev/null
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
@@ -0,0 +1,218 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "acousticDampingSource.H"
+#include "fvMesh.H"
+#include "fvMatrices.H"
+#include "fvmSup.H"
+#include "addToRunTimeSelectionTable.H"
+#include "mathematicalConstants.H"
+#include "zeroGradientFvPatchFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+    defineTypeNameAndDebug(acousticDampingSource, 0);
+    addToRunTimeSelectionTable
+    (
+        option,
+        acousticDampingSource,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::fv::acousticDampingSource::setBlendingFactor()
+{
+    blendFactor_.internalField() = 1;
+
+    const vectorField& Cf = mesh_.C();
+
+    const scalar pi = constant::mathematical::pi;
+ 
+    forAll(cells_, i)
+    {
+        label celli = cells_[i];
+        scalar d = mag(Cf[celli] - x0_);
+
+        if (d < r1_)
+        {
+            blendFactor_[celli] = 0.0;
+        }
+        else if ((d >= r1_) && (d <= (r1_ + r2_)))
+        {
+            blendFactor_[celli] = (1.0 - cos(pi*mag(d - r1_)/r2_))/2.0;
+        }
+    }
+
+    blendFactor_.correctBoundaryConditions();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fv::acousticDampingSource::acousticDampingSource
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    cellSetOption(name, modelType, dict, mesh),
+    frequency_("frequency", dimless/dimTime, 0),
+    blendFactor_
+    (
+        volScalarField
+        (
+            IOobject
+            (
+                name_ + ":blend",
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar("blend0", dimless, 1.0),
+            zeroGradientFvPatchField<vector>::typeName
+        )
+    ),
+    URefName_("unknown-URefName"),
+    x0_(Zero),
+    r1_(0),
+    r2_(0),
+    w_(20)
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fv::acousticDampingSource::addSup
+(
+    fvMatrix<vector>& eqn,
+    const label fieldI
+)
+{
+    const volVectorField& U = eqn.psi();
+    const volScalarField coeff(name_ + ":coeff", w_*frequency_*blendFactor_);
+    const volVectorField& URef(mesh().lookupObject<volVectorField>(URefName_));
+
+    fvMatrix<vector> dampingEqn
+    (
+        fvm::Sp(coeff, U) - coeff*URef
+    );
+    eqn -= dampingEqn;
+}
+
+
+void Foam::fv::acousticDampingSource::addSup
+(
+    const volScalarField& rho,
+    fvMatrix<vector>& eqn,
+    const label fieldI
+)
+{
+    const volVectorField& U = eqn.psi();
+    const volScalarField coeff(name_ + ":coeff", w_*frequency_*blendFactor_);
+    const volVectorField& URef(mesh().lookupObject<volVectorField>(URefName_));
+
+    fvMatrix<vector> dampingEqn
+    (
+        fvm::Sp(rho*coeff, U) - rho*coeff*URef
+    );
+    eqn -= dampingEqn;
+}
+
+
+void Foam::fv::acousticDampingSource::addSup
+(
+    const volScalarField& alpha,
+    const volScalarField& rho,
+    fvMatrix<vector>& eqn,
+    const label fieldI
+)
+{
+    const volVectorField& U = eqn.psi();
+    const volScalarField coeff(name_ + ":coeff", w_*frequency_*blendFactor_);
+    const volVectorField& URef(mesh().lookupObject<volVectorField>(URefName_));
+
+    fvMatrix<vector> dampingEqn
+    (
+        fvm::Sp(alpha*rho*coeff, U) - alpha*rho*coeff*URef
+    );
+    eqn -= dampingEqn;
+}
+
+
+bool Foam::fv::acousticDampingSource::read(const dictionary& dict)
+{
+    if (cellSetOption::read(dict))
+    {
+        if (coeffs_.found("UNames"))
+        {
+            coeffs_.lookup("UNames") >> fieldNames_;
+        }
+        else if (coeffs_.found("UName"))
+        {
+            word UName(coeffs_.lookup("UName"));
+            fieldNames_ = wordList(1, UName);
+        }
+        else
+        {
+            fieldNames_ = wordList(1, "U");
+        }
+
+        applied_.setSize(fieldNames_.size(), false);
+
+        coeffs_.lookup("frequency") >> frequency_.value();
+        coeffs_.lookup("URef") >> URefName_;
+        coeffs_.lookup("centre") >> x0_;
+        coeffs_.lookup("radius1") >> r1_;
+        coeffs_.lookup("radius2") >> r2_;
+
+        if (coeffs_.readIfPresent("w", w_))
+        {
+            Info<< name_ << ": Setting stencil width to " << w_ << endl;
+        }
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
new file mode 100644
index 0000000000..02a283bf2d
--- /dev/null
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fv::acousticDampingSource
+
+Group
+    grpFvOptionsSources
+
+Description
+    Acoustic damping source
+
+    \heading Source usage
+
+    Example usage:
+    \verbatim
+    acousticDampingSourceCoeffs
+    {
+    }
+    \endverbatim
+
+SourceFiles
+    acousticDampingSource.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef acousticDampingSource_H
+#define acousticDampingSource_H
+
+#include "cellSetOption.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class porosityModel;
+
+namespace fv
+{
+
+
+/*---------------------------------------------------------------------------*\
+                    Class acousticDampingSource Declaration
+\*---------------------------------------------------------------------------*/
+
+class acousticDampingSource
+:
+    public cellSetOption
+{
+
+protected:
+
+    // Protected data
+
+        //- Frequency [Hz]
+        dimensionedScalar frequency_;
+
+        //- Blending factor []
+        volScalarField blendFactor_;
+
+        //- Name of reference velocity field
+        word URefName_;
+
+        // Sphere centre location or damping
+        point x0_;
+
+        // Inner radius at which to start damping
+        scalar r1_;
+
+        // Outer radius beyond which damping is applied
+        scalar r2_;
+
+        //- Stencil width, default = 20
+        label w_;
+
+
+    // Protected Member Functions
+
+        //- Helper function to set the blending factor
+        void setBlendingFactor();
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        acousticDampingSource(const acousticDampingSource&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const acousticDampingSource&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("acousticDampingSource");
+
+
+    // Constructors
+
+        //- Construct from components
+        acousticDampingSource
+        (
+            const word& name,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    //- Destructor
+    virtual ~acousticDampingSource()
+    {}
+
+
+    // Member Functions
+
+        // Add explicit and implicit contributions
+
+            //- Add implicit contribution to momentum equation
+            virtual void addSup
+            (
+                fvMatrix<vector>& eqn,
+                const label fieldI
+            );
+
+            //- Add implicit contribution to compressible momentum equation
+            virtual void addSup
+            (
+                const volScalarField& rho,
+                fvMatrix<vector>& eqn,
+                const label fieldI
+            );
+
+            //- Add implicit contribution to phase momentum equation
+            virtual void addSup
+            (
+                const volScalarField& alpha,
+                const volScalarField& rho,
+                fvMatrix<vector>& eqn,
+                const label fieldI
+            );
+
+
+        // IO
+
+            //- Read dictionary
+            virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/doc/lagrangianIntermediateDoc.H b/src/lagrangian/intermediate/doc/lagrangianIntermediateDoc.H
index 238d0a0a5b..a4b300bfee 100644
--- a/src/lagrangian/intermediate/doc/lagrangianIntermediateDoc.H
+++ b/src/lagrangian/intermediate/doc/lagrangianIntermediateDoc.H
@@ -23,7 +23,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpLagrangianIntermediate Lagrangian particle modelling
+\defgroup grpLagrangianIntermediate Lagrangian particle models
 @{
     This group contains Lagrangian modelling available in the 'intermediate' library
 @}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index 41ac099cdd..74b85bce92 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
index 4f61b2df63..15810b1ed5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
index e61a40391e..b191f076a2 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -272,6 +272,10 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
                     << endl;
             }
 
+            OBJstream str("stencil.obj");
+            Pout<< "pointToPointPlanarInterpolation::calcWeights :"
+                << " Dumping stencil to " << str.name() << endl;
+
             forAll(destPoints, i)
             {
                 label v0 = nearestVertex_[i][0];
@@ -285,17 +289,21 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
                     << " at:" << sourcePoints[v0]
                     << " weight:" << nearestVertexWeight_[i][0] << nl;
 
+                str.write(linePointRef(destPoints[i], sourcePoints[v0]));
+
                 if (v1 != -1)
                 {
                     Pout<< "    " << v1
                         << " at:" << sourcePoints[v1]
                         << " weight:" << nearestVertexWeight_[i][1] << nl;
+                    str.write(linePointRef(destPoints[i], sourcePoints[v1]));
                 }
                 if (v2 != -1)
                 {
                     Pout<< "    " << v2
                         << " at:" << sourcePoints[v2]
                         << " weight:" << nearestVertexWeight_[i][2] << nl;
+                    str.write(linePointRef(destPoints[i], sourcePoints[v2]));
                 }
 
                 Pout<< endl;
@@ -317,7 +325,10 @@ Foam::pointToPointPlanarInterpolation::pointToPointPlanarInterpolation
 :
     perturb_(perturb),
     nearestOnly_(nearestOnly),
-    referenceCS_(calcCoordinateSystem(sourcePoints)),
+    referenceCS_
+    (
+        nearestOnly ? coordinateSystem() : calcCoordinateSystem(sourcePoints)
+    ),
     nPoints_(sourcePoints.size())
 {
     calcWeights(sourcePoints, destPoints);
@@ -341,6 +352,43 @@ Foam::pointToPointPlanarInterpolation::pointToPointPlanarInterpolation
 }
 
 
+Foam::pointToPointPlanarInterpolation::pointToPointPlanarInterpolation
+(
+    const scalar perturb,
+    const bool nearestOnly,
+    const coordinateSystem& referenceCS,
+    const label sourceSize,
+    const List<FixedList<label, 3> >& nearestVertex,
+    const List<FixedList<scalar, 3> >& nearestVertexWeight
+)
+:
+    perturb_(perturb),
+    nearestOnly_(nearestOnly),
+    referenceCS_(referenceCS),
+    nPoints_(sourceSize),
+    nearestVertex_(nearestVertex),
+    nearestVertexWeight_(nearestVertexWeight)
+{}
+
+
+Foam::autoPtr<Foam::pointToPointPlanarInterpolation>
+Foam::pointToPointPlanarInterpolation::clone() const
+{
+    return autoPtr<pointToPointPlanarInterpolation>
+    (
+        new pointToPointPlanarInterpolation
+        (
+            perturb_,
+            nearestOnly_,
+            referenceCS_,
+            nPoints_,
+            nearestVertex_,
+            nearestVertexWeight_
+        )
+    );
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::wordList Foam::pointToPointPlanarInterpolation::timeNames
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
index 85f6743485..ce468fcc02 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
@@ -73,6 +73,7 @@ class pointToPointPlanarInterpolation
         //  patch
         List<FixedList<scalar, 3>> nearestVertexWeight_;
 
+
     // Private Member Functions
 
         //- Calculate a local coordinate system from set of points
@@ -85,6 +86,7 @@ class pointToPointPlanarInterpolation
             const pointField& destPoints
         );
 
+
 public:
 
     // Declare name of the class and its debug switch
@@ -114,9 +116,35 @@ public:
             const scalar perturb
         );
 
+        //- Construct from components
+        pointToPointPlanarInterpolation
+        (
+            const scalar perturb,
+            const bool nearestOnly,
+            const coordinateSystem& referenceCS,
+            const label sourceSize,
+            const List<FixedList<label, 3> >& nearestVertex,
+            const List<FixedList<scalar, 3> >& nearestVertexWeight
+        );
+
+        //- Construct and return a clone
+        autoPtr<pointToPointPlanarInterpolation> clone() const;
+
 
     // Member Functions
 
+        //- Perturbation factor (for triangulation)
+        scalar perturb() const
+        {
+            return perturb_;
+        }
+
+        //- Whether to use nearest point only (avoids triangulation, projection)
+        bool nearestOnly() const
+        {
+            return nearestOnly_;
+        }
+
         //- Return the coordinateSystem
         const coordinateSystem& referenceCS() const
         {
@@ -158,7 +186,6 @@ public:
         //- Interpolate from field on source points to dest points
         template<class Type>
         tmp<Field<Type>> interpolate(const Field<Type>& sourceFld) const;
-
 };
 
 
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C
index 07a43d6bbc..0179e27874 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +30,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(readFields, 0);
+    defineTypeNameAndDebug(readFields, 0);
 }
 
 
@@ -54,6 +54,9 @@ Foam::readFields::readFields
     if (isA<fvMesh>(obr_))
     {
         read(dict);
+
+        // Fields should all be present from start time so read on construction
+        execute();
     }
     else
     {
@@ -87,16 +90,28 @@ void Foam::readFields::execute()
 {
     if (active_)
     {
+        if (log_) Info << type() << " " << name_ << ":" << nl;
+
+        bool loaded = false;
         forAll(fieldSet_, fieldI)
         {
             const word& fieldName = fieldSet_[fieldI];
 
-            // If necessary load field
-            loadField<scalar>(fieldName);
-            loadField<vector>(fieldName);
-            loadField<sphericalTensor>(fieldName);
-            loadField<symmTensor>(fieldName);
-            loadField<tensor>(fieldName);
+            // Load field if necessary
+            loaded = loadField<scalar>(fieldName) || loaded;
+            loaded = loadField<vector>(fieldName) || loaded;
+            loaded = loadField<sphericalTensor>(fieldName) || loaded;
+            loaded = loadField<symmTensor>(fieldName) || loaded;
+            loaded = loadField<tensor>(fieldName) || loaded;
+        }
+
+        if (log_)
+        {
+            if (!loaded)
+            {
+                Info<< "    no fields loaded" << endl;
+            }
+            Info<< endl;
         }
     }
 }
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index f785e4a881..dca694a7bc 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -106,7 +106,7 @@ protected:
     // Protected Member Functions
 
         template<class Type>
-        void loadField(const word&) const;
+        bool loadField(const word&) const;
 
 
 private:
diff --git a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
index 4b128aa388..6810bf7f09 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::readFields::loadField(const word& fieldName) const
+bool Foam::readFields::loadField(const word& fieldName) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> vfType;
     typedef GeometricField<Type, fvsPatchField, surfaceMesh> sfType;
@@ -77,6 +77,7 @@ void Foam::readFields::loadField(const word& fieldName) const
             if (log_) Info<< "    Reading " << fieldName << endl;
             vfType* vfPtr = new vfType(fieldHeader, mesh);
             mesh.objectRegistry::store(vfPtr);
+            return true;
         }
         else if
         (
@@ -88,8 +89,11 @@ void Foam::readFields::loadField(const word& fieldName) const
             if (log_) Info<< "    Reading " << fieldName << endl;
             sfType* sfPtr = new sfType(fieldHeader, mesh);
             mesh.objectRegistry::store(sfPtr);
+            return true;
         }
     }
+
+    return false;
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index e9b8fed150..8918624887 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -18,6 +18,11 @@ fluxSummary/fluxSummaryFunctionObject.C
 Lambda2/Lambda2.C
 Lambda2/Lambda2FunctionObject.C
 
+/*
+mapFields/mapFields.C
+mapFields/mapFieldsFunctionObject.C
+*/
+
 Peclet/Peclet.C
 Peclet/PecletFunctionObject.C
 
diff --git a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
index 02034a8aca..43fa9a0964 100644
--- a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
+++ b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H
index 1a75aa7192..7fa52e6304 100644
--- a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H
+++ b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.C b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.C
index 01110e17c8..4f892e9a39 100644
--- a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.H b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.H
index 7abeca2d78..77f90831ed 100644
--- a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
index 662ed39e8a..0d7a353d94 100644
--- a/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
+++ b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::compositeBody
 
+Group
+    grpRigidBodyDynamicsBodies
+
 Description
     This specialized rigidBody holds the original body after it has been merged
     into a parent.
diff --git a/src/rigidBodyDynamics/bodies/cuboid/cuboid.H b/src/rigidBodyDynamics/bodies/cuboid/cuboid.H
index 7432f7cbc0..348792db4a 100644
--- a/src/rigidBodyDynamics/bodies/cuboid/cuboid.H
+++ b/src/rigidBodyDynamics/bodies/cuboid/cuboid.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::cuboid
 
+Group
+    grpRigidBodyDynamicsBodies
+
 Description
     Specialization of rigidBody to construct a cuboid given the mass and
     lengths of the sides.
diff --git a/src/rigidBodyDynamics/bodies/jointBody/jointBody.H b/src/rigidBodyDynamics/bodies/jointBody/jointBody.H
index 1784de009d..a4b3d41894 100644
--- a/src/rigidBodyDynamics/bodies/jointBody/jointBody.H
+++ b/src/rigidBodyDynamics/bodies/jointBody/jointBody.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::jointBody
 
+Group
+    grpRigidBodyDynamicsBodies
+
 Description
 
 SourceFiles
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
index a29585e3f6..0375a54684 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::masslessBody
 
+Group
+    grpRigidBodyDynamicsBodies
+
 Description
 
 SourceFiles
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
index 2c8679b1e4..6307234184 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::rigidBody
 
+Group
+    grpRigidBodyDynamicsBodies
+
 Description
 
 SourceFiles
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.H b/src/rigidBodyDynamics/bodies/sphere/sphere.H
index e3310f735d..7538f367c4 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::sphere
 
+Group
+    grpRigidBodyDynamicsBodies
+
 Description
     Specialization of rigidBody to construct a sphere given the mass and radius.
 
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.H b/src/rigidBodyDynamics/bodies/subBody/subBody.H
index 0cd3f7c930..c6a0bc220e 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::subBody
 
+Group
+    grpRigidBodyDynamicsBodies
+
 Description
     This specialized rigidBody holds the original body after it has been merged
     into a master.
diff --git a/src/rigidBodyDynamics/doc/rigidBodyDynamicsDoc.H b/src/rigidBodyDynamics/doc/rigidBodyDynamicsDoc.H
new file mode 100644
index 0000000000..20f1db927b
--- /dev/null
+++ b/src/rigidBodyDynamics/doc/rigidBodyDynamicsDoc.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpRigidBodyDynamics Rigid body dynamics
+@{
+    \ingroup grpMeshMotion
+    This group contains rigid body dynamics models.
+@}
+
+\defgroup grpRigidBodyDynamicsBodies Bodies
+@{
+    \ingroup grpRigidBodyDynamics
+    This group contains rigid body dynamics body models.
+@}
+
+\defgroup grpRigidBodyDynamicsJoints Joints
+@{
+    \ingroup grpRigidBodyDynamics
+    This group contains rigid body dynamics joint models.
+@}
+
+\defgroup grpRigidBodyDynamicsRestraints Restraints
+@{
+    \ingroup grpRigidBodyDynamics
+    This group contains rigid body dynamics restraint models.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.H b/src/rigidBodyDynamics/joints/Pa/Pa.H
index d67af31d9a..7f02161422 100644
--- a/src/rigidBodyDynamics/joints/Pa/Pa.H
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Pa
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Prismatic joint for translation along the specified arbitrary axis.
 
diff --git a/src/rigidBodyDynamics/joints/Px/Px.H b/src/rigidBodyDynamics/joints/Px/Px.H
index 979abcf5c0..dc03df42df 100644
--- a/src/rigidBodyDynamics/joints/Px/Px.H
+++ b/src/rigidBodyDynamics/joints/Px/Px.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Px
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Prismatic joint for translation along the x-axis.
 
diff --git a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
index 02746bf14c..8f4a83cc02 100644
--- a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
+++ b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Pxyz
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Prismatic joint for translation in the x/y/z directions.
 
diff --git a/src/rigidBodyDynamics/joints/Py/Py.H b/src/rigidBodyDynamics/joints/Py/Py.H
index bcbcd47785..ed324124af 100644
--- a/src/rigidBodyDynamics/joints/Py/Py.H
+++ b/src/rigidBodyDynamics/joints/Py/Py.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Py
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Prismatic joint for translation along the y-axis.
 
diff --git a/src/rigidBodyDynamics/joints/Pz/Pz.H b/src/rigidBodyDynamics/joints/Pz/Pz.H
index 611397ded5..bcb9d39df4 100644
--- a/src/rigidBodyDynamics/joints/Pz/Pz.H
+++ b/src/rigidBodyDynamics/joints/Pz/Pz.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Pz
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Prismatic joint for translation along the x-axis.
 
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.H b/src/rigidBodyDynamics/joints/Ra/Ra.H
index cd634f7b89..8a3d342edb 100644
--- a/src/rigidBodyDynamics/joints/Ra/Ra.H
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Ra
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Revolute joint for rotation about the specified arbitrary axis.
 
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.H b/src/rigidBodyDynamics/joints/Rs/Rs.H
index f689869056..7a0ae947c6 100644
--- a/src/rigidBodyDynamics/joints/Rs/Rs.H
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Rs
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Spherical joint for rotation about the x/y/z-axes using a quaternion
     (Euler parameters) to avoid gimble-lock.
diff --git a/src/rigidBodyDynamics/joints/Rx/Rx.H b/src/rigidBodyDynamics/joints/Rx/Rx.H
index 892cfcb709..c66667a542 100644
--- a/src/rigidBodyDynamics/joints/Rx/Rx.H
+++ b/src/rigidBodyDynamics/joints/Rx/Rx.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Rx
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Revolute joint for rotation about the x-axis
 
diff --git a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
index 43582796de..9377f33046 100644
--- a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
+++ b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Rxyz
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Spherical joint for rotation about the x/y/z-axes using Euler-angles
     in the order x, y, z.
diff --git a/src/rigidBodyDynamics/joints/Ry/Ry.H b/src/rigidBodyDynamics/joints/Ry/Ry.H
index 0a870bd925..832fa26a27 100644
--- a/src/rigidBodyDynamics/joints/Ry/Ry.H
+++ b/src/rigidBodyDynamics/joints/Ry/Ry.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Ry
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Revolute joint for rotation about the y-axis
 
diff --git a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
index 1371abcf80..77a2761c19 100644
--- a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
+++ b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Ryxz
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Spherical joint for rotation about the x/y/z-axes using Euler-angles
     in the order y, x, z.
diff --git a/src/rigidBodyDynamics/joints/Rz/Rz.H b/src/rigidBodyDynamics/joints/Rz/Rz.H
index 01ed3139b0..d7c8486710 100644
--- a/src/rigidBodyDynamics/joints/Rz/Rz.H
+++ b/src/rigidBodyDynamics/joints/Rz/Rz.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Rz
 
+Group
+    grpRigidBodyDynamicsJoints
+    
 Description
     Revolute joint for rotation about the z-axis
 
diff --git a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
index 3aeb85dd63..9797904352 100644
--- a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
+++ b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::Rzyx
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Spherical joint for rotation about the x/y/z-axes using Euler-angles
     in the order z, y, x.
diff --git a/src/rigidBodyDynamics/joints/composite/compositeJoint.H b/src/rigidBodyDynamics/joints/composite/compositeJoint.H
index 5d12bf5025..709b7abcb0 100644
--- a/src/rigidBodyDynamics/joints/composite/compositeJoint.H
+++ b/src/rigidBodyDynamics/joints/composite/compositeJoint.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::composite
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Prismatic joint for translation along the specified arbitrary axis.
 
diff --git a/src/rigidBodyDynamics/joints/floating/floatingJoint.H b/src/rigidBodyDynamics/joints/floating/floatingJoint.H
index 58c314d784..7850777559 100644
--- a/src/rigidBodyDynamics/joints/floating/floatingJoint.H
+++ b/src/rigidBodyDynamics/joints/floating/floatingJoint.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::floating
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Prismatic joint for translation along the specified arbitrary axis.
 
diff --git a/src/rigidBodyDynamics/joints/joint/joint.H b/src/rigidBodyDynamics/joints/joint/joint.H
index 0ea00b678b..10bdfc8495 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.H
+++ b/src/rigidBodyDynamics/joints/joint/joint.H
@@ -24,6 +24,9 @@ License
 Namespace
     Foam::RBD::joints
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Namespace for rigid-body joints
 
diff --git a/src/rigidBodyDynamics/joints/null/nullJoint.H b/src/rigidBodyDynamics/joints/null/nullJoint.H
index cc97aed72b..de3b1164af 100644
--- a/src/rigidBodyDynamics/joints/null/nullJoint.H
+++ b/src/rigidBodyDynamics/joints/null/nullJoint.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::joints::null
 
+Group
+    grpRigidBodyDynamicsJoints
+
 Description
     Null joint for the root-body.
 
diff --git a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
index 66b34e0df7..4698baee70 100644
--- a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
+++ b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::restraints::linearAxialAngularSpring
 
+Group
+    grpRigidBodyDynamicsRestraints
+
 Description
     Linear axial angular spring restraint.
 
diff --git a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H
index c0a2c37288..b329dcb0de 100644
--- a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H
+++ b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::restraints::linearDamper
 
+Group
+    grpRigidBodyDynamicsRestraints
+
 Description
     Linear damper restraint.  Operates in the local frame of the body.
 
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
index b7a90f77d0..c522ffd3f8 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::restraints::linearSpring
 
+Group
+    grpRigidBodyDynamicsRestraints
+
 Description
     Linear spring restraint.
 
diff --git a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H
index ccff2ff660..ae0f3356d1 100644
--- a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H
+++ b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::RBD::restraints::sphericalAngularDamper
 
+Group
+    grpRigidBodyDynamicsRestraints
+
 Description
     Spherical angular damper restraint.
     Operates in the local frame of the body.
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
index 35234268d9..1c7b6b8c0e 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::rigidBodyMeshMotion
 
+Group
+    grpMeshMotionSolvers 
+
 Description
     Rigid-body mesh motion solver for fvMesh.
 
diff --git a/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict b/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
index dc989e813c..66d32ea1ee 100644
--- a/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
+++ b/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/sixDoFRigidBodyMotion/doc/sixDofRigidBodyMotionDoc.H b/src/sixDoFRigidBodyMotion/doc/sixDofRigidBodyMotionDoc.H
new file mode 100644
index 0000000000..585cc5ccd8
--- /dev/null
+++ b/src/sixDoFRigidBodyMotion/doc/sixDofRigidBodyMotionDoc.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpSixDoFRigidBody Six Degree of Freedom (DoF)
+@{
+    \ingroup grpMeshMotion
+    This group contains six DoF models.
+@}
+
+\defgroup grpSixDoFRigidBodySolvers Solvers
+@{
+    \ingroup grpSixDoFRigidBody
+    This group contains six DoF solvers.
+@}
+
+\defgroup grpSixDoFRigidBodyConstraints Constraints
+@{
+    \ingroup grpSixDoFRigidBody
+    This group contains six DoF Constraints.
+@}
+
+\defgroup grpSixDoFRigidBodyRestraints Restraints
+@{
+    \ingroup grpSixDoFRigidBody
+    This group contains six DoF Restraints.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
index 2ad4921aaa..1c9fd69fc7 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::sixDoFRigidBodyMotionSolver
 
+Group
+   grpMeshMotionSolvers 
+
 Description
     6-DoF solid-body mesh motion solver for an fvMesh.
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
index a8dd2ccbff..e2f7ae8226 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::sixDoFSolvers::CrankNicolson
 
+Group
+    grpSixDoFRigidBodySolvers
+
 Description
     Crank-Nicolson 2nd-order time-integrator for 6DoF solid-body motion.
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
index e605fcc294..d15bc2fcb1 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::sixDoFSolvers::Newmark
 
+Group
+    grpSixDoFRigidBodySolvers
+
 Description
     Newmark 2nd-order time-integrator for 6DoF solid-body motion.
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
index cb00660314..a1e536f755 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::sixDoFSolver
 
+Group
+    grpSixDoFRigidBodySolvers
+
 Description
 
 SourceFiles
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
index d03b77bbd5..3aac7c7e18 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
@@ -24,6 +24,9 @@ License
 Class
     Foam::sixDoFSolvers::symplectic
 
+Group
+    grpSixDoFRigidBodySolvers
+
 Description
     Symplectic 2nd-order explicit time-integrator for 6DoF solid-body motion.
 
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/doc/thermophysicalBoundaryConditionsDoc.H b/src/thermophysicalModels/basic/derivedFvPatchFields/doc/thermophysicalBoundaryConditionsDoc.H
index f7f9389b71..787b9e7dbe 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/doc/thermophysicalBoundaryConditionsDoc.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/doc/thermophysicalBoundaryConditionsDoc.H
@@ -23,7 +23,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpThermoBoundaryConditions Thermophysical boundary conditions
+\defgroup grpThermoBoundaryConditions Thermophysical
 @{
     \ingroup grpBoundaryConditions
     This group contains thermophysical model boundary conditions
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index 8863b95ebe..6843c685e4 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/thermophysicalModels/radiation/doc/radiationModelsDoc.H b/src/thermophysicalModels/radiation/doc/radiationModelsDoc.H
index e192421c2f..20b23cb22d 100644
--- a/src/thermophysicalModels/radiation/doc/radiationModelsDoc.H
+++ b/src/thermophysicalModels/radiation/doc/radiationModelsDoc.H
@@ -29,7 +29,7 @@ License
     This group contains radiation models
 @}
 
-\defgroup grpRadiationSubModels Radiation sub-models
+\defgroup grpRadiationSubModels Sub-models
 @{
     \ingroup grpRadiationModels
     This group contains radiation sub-models
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index ade482077b..10ece3bc45 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H
index 077079bfb1..4bd82c36b2 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.C
index 31942309d9..c63354266b 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.H
index 2c1797a1a0..52b5fed46f 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H
index 39a7f156f9..86f253d215 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
index a78b940bfe..59ad9a4415 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index cc712b4cb2..905194a914 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
index 5c54294d96..dd83c23f94 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.C
index a981883006..7f056a1154 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.C
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.H b/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.H
index f195f526c3..44593c42eb 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.H
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/multiBandSolidTransmissivity/multiBandSolidTransmissivity.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/multiBandSolidTransmissivity/multiBandSolidTransmissivity.C
index d39fa2e1d4..1db1944b91 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/multiBandSolidTransmissivity/multiBandSolidTransmissivity.C
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/multiBandSolidTransmissivity/multiBandSolidTransmissivity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/multiBandSolidTransmissivity/multiBandSolidTransmissivity.H b/src/thermophysicalModels/radiation/submodels/transmissivityModel/multiBandSolidTransmissivity/multiBandSolidTransmissivity.H
index bae7831153..9745accd9a 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/multiBandSolidTransmissivity/multiBandSolidTransmissivity.H
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/multiBandSolidTransmissivity/multiBandSolidTransmissivity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.C
index 6d995d89f0..a76818e03e 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.C
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.H b/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.H
index a48f4017ba..517bf43771 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.H
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModel.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModel.C
index ddd9226bf5..9d44749c5d 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModel.C
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModel.H b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModel.H
index 46e9babc13..85ac96fe97 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModel.H
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
index d976fc0652..897895d7f3 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
index 26449db3a8..41bac4e87d 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication boxTurb
diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun
index 89c210c48c..91c4818b86 100755
--- a/tutorials/basic/laplacianFoam/flange/Allrun
+++ b/tutorials/basic/laplacianFoam/flange/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runAnsysToFoam()
 {
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
index d8a1591738..fc215995a5 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allrun
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 runApplication blockMesh
 runApplication $application -withFunctionObjects -writePhi -writep
 runApplication streamFunction
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
index 3383ef1dad..8affee72b0 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 runApplication blockMesh
 runApplication $application -writePhi -writep
 runApplication streamFunction
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
index e00af435e6..12857916b8 100755
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
@@ -5,8 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-rm -rf 0
-cp -r 0.org 0
+restore0Dir
 runApplication blockMesh
 runApplication changeDictionary
 runApplication topoSet
@@ -14,6 +13,6 @@ runApplication topoSet
 runApplication PDRMesh -overwrite
 
 # Run
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun
index 595770a6d1..d79a59a4f5 100755
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun
@@ -6,12 +6,12 @@ cd ${0%/*} || exit 1
 
 ./Allrun.mesh
 
-rm -rf 0 && cp -r 0.org 0
+restore0Dir
 
 runApplication decomposePar -force
 
 runParallel potentialFoam -pName pPotential -initialiseUBCs
 
-rm -f processor*/0/phi
+\rm -f processor*/0/phi
 
 runParallel XiDyMFoam
diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun
index e1db61c60c..4cf6e15fdf 100755
--- a/tutorials/combustion/XiFoam/ras/Allrun
+++ b/tutorials/combustion/XiFoam/ras/Allrun
@@ -33,7 +33,7 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
 
     cp -r ../moriyoshiHomogeneous/0.005 .
     setControlDict
-    runApplication `getApplication`
+    runApplication $(getApplication)
 )
 
 # Clone case for hydrogen
@@ -48,7 +48,7 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
        constant/thermophysicalProperties.propane
     mv constant/thermophysicalProperties.hydrogen \
        constant/thermophysicalProperties
-    runApplication `getApplication`
+    runApplication $(getApplication)
 )
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/gri/Allrun b/tutorials/combustion/chemFoam/gri/Allrun
index 62adab28f3..de26a4017d 100755
--- a/tutorials/combustion/chemFoam/gri/Allrun
+++ b/tutorials/combustion/chemFoam/gri/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 
diff --git a/tutorials/combustion/chemFoam/h2/Allrun b/tutorials/combustion/chemFoam/h2/Allrun
index 62adab28f3..de26a4017d 100755
--- a/tutorials/combustion/chemFoam/h2/Allrun
+++ b/tutorials/combustion/chemFoam/h2/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 
diff --git a/tutorials/combustion/chemFoam/ic8h18/Allrun b/tutorials/combustion/chemFoam/ic8h18/Allrun
index 62adab28f3..de26a4017d 100755
--- a/tutorials/combustion/chemFoam/ic8h18/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 
diff --git a/tutorials/combustion/chemFoam/nc7h16/Allrun b/tutorials/combustion/chemFoam/nc7h16/Allrun
index 62adab28f3..de26a4017d 100755
--- a/tutorials/combustion/chemFoam/nc7h16/Allrun
+++ b/tutorials/combustion/chemFoam/nc7h16/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
index e51b7da7c0..33555b4809 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allrun
+++ b/tutorials/combustion/engineFoam/kivaTest/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication kivaToFoam -file otape17
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
index 6101e96371..b686d7ee80 100755
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
@@ -34,7 +34,7 @@ rm log.createPatch
 runApplication createPatch -region filmRegion -overwrite
 
 # Run
-runApplication `getApplication`
+runApplication $(getApplication)
 
 paraFoam -touchAll
 
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index 63bace3c2c..42cc666832 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
@@ -34,7 +34,7 @@ runApplication -s panelRegion \
 runApplication -s fields \
     decomposePar -fields
 
-runParallel `getApplication`
+runParallel $(getApplication)
 
 paraFoam -touch
 paraFoam -touch -region panelRegion
diff --git a/tutorials/combustion/fireFoam/les/simplePMMApanel/Allrun b/tutorials/combustion/fireFoam/les/simplePMMApanel/Allrun
index 241ab1b976..9a56766a61 100755
--- a/tutorials/combustion/fireFoam/les/simplePMMApanel/Allrun
+++ b/tutorials/combustion/fireFoam/les/simplePMMApanel/Allrun
@@ -11,7 +11,7 @@ runApplication topoSet
 runApplication extrudeToRegionMesh -overwrite
 
 # Run
-runApplication `getApplication`
+runApplication $(getApplication)
 
 paraFoam -touchAll
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
index 11ae4b0d7c..e188e14796 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
@@ -10,6 +10,6 @@ runApplication topoSet
 runApplication createPatch -overwrite
 
 # Run
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
index 81460ea389..64bba51d9a 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
@@ -4,7 +4,7 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication topoSet
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
index a1d7b7290c..93d274a590 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
@@ -28,7 +28,7 @@ mv $CONST/polyMesh/boundary $CONST/polyMesh/boundary.bak
 sed -f $CONST/wedgeScr $CONST/polyMesh/boundary.bak > $CONST/polyMesh/boundary
 rm $CONST/polyMesh/boundary.bak
 
-runApplication `getApplication`
+runApplication $(getApplication)
 
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
index 416eb9a89d..a52c67d9c5 100755
--- a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
@@ -4,8 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0
-cp -r 0.org 0
+\rm -rf 0
+\cp -r 0.org 0
 cleanCase
 cleanSamples
 
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
index 7f1047e95d..ed61ac5435 100755
--- a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
index 24b6237449..07492af16c 100755
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
@@ -9,14 +9,12 @@ runApplication surfaceFeatureExtract
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 
-if [ -d 0 ] ; then
-   rm -rf 0
-fi
+\rm -rf 0
 
 runApplication createBaffles -overwrite
 runApplication mergeOrSplitBaffles -split -overwrite
 
-cp -r 0.org 0
+restore0Dir
 
 runApplication $(getApplication)
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun
index 8b610fff80..4f55fd7efa 100755
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun
@@ -7,4 +7,4 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-runApplication `getApplication`
+runApplication $(getApplication)
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/Allrun b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/Allrun
index 8b610fff80..4f55fd7efa 100755
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/Allrun
@@ -7,4 +7,4 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-runApplication `getApplication`
+runApplication $(getApplication)
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/Allrun b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/Allrun
index 836276fe9c..2e9c3f7fb3 100755
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/Allrun
@@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 ./makeMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
index 2a52698c04..bb18fc3feb 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
@@ -6,7 +6,7 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
index 2a52698c04..bb18fc3feb 100755
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
@@ -6,7 +6,7 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
index a0d99d7592..298f96e299 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf 0
-cp -r 0.org 0
+\rm -rf 0
+\cp -r 0.org 0
 cleanSamples
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
index 20ffce0a15..e52180e06d 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
index b6157963be..44af4c156c 100755
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication star3ToFoam prostar/nacaAirfoil
 
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
index 044fd34bfc..deb3e8f4c6 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@@ -39,7 +39,7 @@ cloneCase decompressionTank decompressionTankFine
 
     # And execute
     runApplication blockMesh
-    runApplication `getApplication`
+    runApplication $(getApplication)
 )
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
index 120c352ecb..d56e57bf75 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication dsmcInitialise
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
index 120c352ecb..d56e57bf75 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication dsmcInitialise
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
index f502a72e59..d433a8c026 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 runApplication blockMesh
 runApplication decomposePar
 runParallel dsmcInitialise
-runParallel `getApplication`
+runParallel $(getApplication)
 runApplication reconstructPar -noLagrangian
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
index 45c06e38e5..3d5ec5cbd9 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 runApplication blockMesh
 runApplication decomposePar
 runParallel dsmcInitialise
-runParallel `getApplication`
+runParallel $(getApplication)
 runApplication reconstructPar -noLagrangian
 
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
index 4830eb007f..31e783b003 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication mdInitialise
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
index 4830eb007f..31e783b003 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication mdInitialise
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
index 9f9a93ff37..c373ee1079 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
index bb8053763d..97d68a3db1 100755
--- a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
index 0ecf4b2d13..a22b82774f 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
@@ -4,10 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
-cp 0/T.org 0/T
+\cp 0/T.org 0/T
 runApplication setFields
 runApplication $application
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
index 0ecf4b2d13..a22b82774f 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@@ -4,10 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
-cp 0/T.org 0/T
+\cp 0/T.org 0/T
 runApplication setFields
 runApplication $application
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
index de3f6389f8..29414545d7 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
index 6fe57d72bb..c61a79c810 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-cp 0/T.org 0/T
+\cp 0/T.org 0/T
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
index 0df95afd2e..b18d70e448 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
index 740f3a5ed6..ca50fd7fff 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
index e60b87bdff..ae95e9ed61 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
@@ -2,11 +2,11 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
-cp -r 0.org 0
+restore0Dir
 
 # Create 1D and 3D baffles
 runApplication createBaffles -overwrite
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
index 2d455d1fbc..ebc19b3d2a 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
index 2d455d1fbc..ebc19b3d2a 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
index 42f495ac5f..225acd829f 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
@@ -23,7 +23,7 @@ do
     viewFactorsGen -region $i > log.viewFactorsGen.$i 2>&1
 done
 
-runApplication `getApplication`
+runApplication $(getApplication)
 
 
 echo
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index 602f7159e2..c569b76029 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -23,13 +23,13 @@ done
 
 
 #-- Run on single processor
-#runApplication `getApplication`
+#runApplication $(getApplication)
 
 # Decompose
 runApplication decomposePar -allRegions
 
 # Run
-runParallel `getApplication`
+runParallel $(getApplication)
 
 # Reconstruct
 runApplication reconstructPar -allRegions
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index 6e65d85280..c21e4adafc 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -27,14 +27,14 @@ done
 
 
 #-- Run on single processor
-runApplication `getApplication`
+runApplication $(getApplication)
 
 
 ## Decompose
 #runApplication decomposePar -allRegions
 #
 ## Run
-#runParallel `getApplication`
+#runParallel $(getApplication)
 #
 ## Reconstruct
 #runApplication reconstructPar -allRegions
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun
index 0330f6a530..b75fde5c9a 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun
@@ -21,7 +21,6 @@ rm log.topoSet
 runApplication topoSet -region cabin -dict system/topoSetDictRegister
 
 # set the initial fields
-rm -rf 0
-cp -rf 0.org 0
+restore0Dir
 
 runApplication $(getApplication)
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre
index f22237bf9d..0818ebd1a4 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre
@@ -17,5 +17,4 @@ runApplication subsetMesh c0 -patch walls -overwrite
 runApplication splitMeshRegions -cellZones -overwrite
 
 # set the initial fields
-rm -rf 0
-cp -rf 0.org 0
+restore0Dir
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
index 020b201778..9780d15756 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
@@ -25,5 +24,4 @@ rm -rf constant/air/polyMesh/sets
 paraFoam -touch -region porous
 paraFoam -touch -region air
 
-
-cp -rf 0.org 0
+restore0Dir
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
index 1b32e96d00..8224dffa9c 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
@@ -26,7 +26,7 @@ do
         viewFactorsGen -region $i
 done
 
-runApplication `getApplication`
+runApplication $(getApplication)
 
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
index f248b4fb32..919b7d0b75 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
@@ -30,7 +30,7 @@ do
 done
 
 # Run
-runParallel `getApplication`
+runParallel $(getApplication)
 
 # Reconstruct
 runApplication reconstructPar -allRegions
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
index 85523c3f63..021754896d 100755
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 ./makeMesh
 runApplication $application
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
index 26d2834e81..b52a946819 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@@ -17,7 +17,7 @@ do
     sed "s/XXX/$e/g" constant/transportProperties.template \
         > constant/transportProperties
 
-    runApplication -s $e  `getApplication`
+    runApplication -s $e  $(getApplication)
 
     # extract y+, U+
     # note: both must be added to foamLog.db
diff --git a/tutorials/incompressible/icoFoam/cavity/Allrun b/tutorials/incompressible/icoFoam/cavity/Allrun
index 97f489d7f8..fdeea0d08d 100755
--- a/tutorials/incompressible/icoFoam/cavity/Allrun
+++ b/tutorials/incompressible/icoFoam/cavity/Allrun
@@ -83,7 +83,7 @@ do
     esac
 
     previousCase="$caseName"
-    ( cd $caseName && runApplication `getApplication` )
+    ( cd $caseName && runApplication $(getApplication) )
 done
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/elbow/Allrun b/tutorials/incompressible/icoFoam/elbow/Allrun
index 60c5cad943..6da96f6a74 100755
--- a/tutorials/incompressible/icoFoam/elbow/Allrun
+++ b/tutorials/incompressible/icoFoam/elbow/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application=`getApplication`
+application=$(getApplication)
 
 runApplication fluentMeshToFoam elbow.msh
 runApplication "$application"
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
index ebb4061015..c454c9b3f6 100755
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 ./makeMesh
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre
index db20559080..c18efa4cc9 100755
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre
@@ -14,4 +14,4 @@ runApplication createBaffles -overwrite
 # remove zero-sized patches
 runApplication createPatch -overwrite
 
-cp -rf 0.org 0
+restore0Dir
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
index 1d24256eb0..3f7cab5d82 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
@@ -8,6 +8,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication decomposePar
 
-runParallel `getApplication`
+runParallel $(getApplication)
 
 runApplication reconstructPar
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
index e35686cce4..15491d569a 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@@ -11,11 +11,8 @@ cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
 # - meshing
 
 runApplication blockMesh
-
 runApplication surfaceFeatureExtract
-
 runApplication snappyHexMesh -overwrite
-
 runApplication renumberMesh -overwrite
 
 # force removal of fields generated by snappy
@@ -31,4 +28,4 @@ runApplication createPatch -overwrite
 #runApplication moveDynamicMesh -checkAMI
 
 # - set the initial fields
-cp -rf 0.org 0
+restore0Dir
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
index f7d6ef5a87..d01b222a10 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
@@ -4,14 +4,19 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cd wingMotion_snappyHexMesh
-cleanCase
+(
+    cd wingMotion_snappyHexMesh || exit 1
+    cleanCase
+)
 
-cd ../wingMotion2D_simpleFoam
-cleanCase
-rm -rf 0
-
-cd ../wingMotion2D_pimpleDyMFoam
-cleanCase
-rm -rf 0
+(
+    cd wingMotion2D_simpleFoam || exit 1
+    cleanCase
+    rm -rf 0
+)
 
+(
+    cd wingMotion2D_pimpleDyMFoam || exit 1
+    cleanCase
+    rm -rf 0
+)
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
index 997bdd6cfb..0b5930fddc 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
@@ -5,26 +5,36 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Make 3D mesh in slab of cells.
-cd wingMotion_snappyHexMesh
-runApplication blockMesh
-runApplication snappyHexMesh -overwrite
+(
+    cd wingMotion_snappyHexMesh || exit 1
+
+    runApplication blockMesh
+    runApplication snappyHexMesh -overwrite
+)
 
 # Make a 2D mesh by extruding a patch and solve to steady state.
-cd ../wingMotion2D_simpleFoam
-runApplication extrudeMesh
-runApplication createPatch -overwrite
-cp -r 0.org 0
-runApplication simpleFoam
+(
+    cd wingMotion2D_simpleFoam || exit 1
 
-# Copy the mesh from the steady state case and map the results to a
-# mesh motion case, then solve transient.
-cd ../wingMotion2D_pimpleDyMFoam
-cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant
-cp -r 0.org 0
-runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
-mv 0/pointDisplacement.unmapped 0/pointDisplacement
-runApplication decomposePar
-runParallel `getApplication`
-runApplication reconstructPar
+    runApplication extrudeMesh
+    runApplication createPatch -overwrite
+    restore0Dir
+    runApplication simpleFoam
+)
+
+# Copy mesh from the steady state case, map the results to a mesh motion case,
+# then solve transient.
+(
+    cd wingMotion2D_pimpleDyMFoam || exit 1
+
+    \rm -rf constant/polyMesh
+    \cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant
+    restore0Dir
+    runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
+    \mv 0/pointDisplacement.unmapped 0/pointDisplacement
+    runApplication decomposePar
+    runParallel $(getApplication)
+    runApplication reconstructPar
+)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun b/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
index 628bd511a9..827542cfc5 100755
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
@@ -4,14 +4,14 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
 # Create faceZones for baffles and fan
 runApplication topoSet
 
-cp -r 0.org 0
+restore0Dir
 
 # Create wall and cyclic baffles and the fields on them
 runApplication createBaffles -overwrite
diff --git a/tutorials/incompressible/pimpleFoam/channel395/Allrun b/tutorials/incompressible/pimpleFoam/channel395/Allrun
index 989291cfdd..c34f238440 100755
--- a/tutorials/incompressible/pimpleFoam/channel395/Allrun
+++ b/tutorials/incompressible/pimpleFoam/channel395/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/U b/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/U
new file mode 100644
index 0000000000..a03c347987
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/U
@@ -0,0 +1,61 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "1";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 1 -1 0 0 0 0 ];
+
+// Re = 395, L = pi, utau = 1, nu = pi/395 = 7.9534e-3
+// Ub/utau = 17.55
+internalField   uniform ( 17.55 0 0 );
+
+boundaryField
+{
+    bottomWall
+    {
+        type            fixedValue;
+        value           uniform ( 0 0 0 );
+    }
+    topWall
+    {
+        type            fixedValue;
+        value           uniform ( 0 0 0 );
+    }
+    sides_half0
+    {
+        type            cyclic;
+    }
+    sides_half1
+    {
+        type            cyclic;
+    }
+    inlet
+    {
+        type            turbulentDFSEMInlet;
+        delta           2;
+        nCellPerEddy    1;
+        mapMethod       nearestCell;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform (0 0 0);
+        value           uniform (0 0 0);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/k b/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/k
new file mode 100644
index 0000000000..f440f53296
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/k
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "1";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 1e-5;
+
+boundaryField
+{
+    bottomWall
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+    topWall
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+    sides_half0
+    {
+        type            cyclic;
+    }
+    sides_half1
+    {
+        type            cyclic;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/nut b/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/nut
new file mode 100644
index 0000000000..3f2c1f0c7b
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/nut
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "1";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -1 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    bottomWall
+    {
+        type            zeroGradient;
+    }
+    topWall
+    {
+        type            zeroGradient;
+    }
+    sides_half0
+    {
+        type            cyclic;
+    }
+    sides_half1
+    {
+        type            cyclic;
+    }
+    inlet
+    {
+        type            calculated;
+        value           uniform 1e-8;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 1e-8;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/p b/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/p
new file mode 100644
index 0000000000..ba5b4cf743
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/p
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "1";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    bottomWall
+    {
+        type            zeroGradient;
+    }
+    topWall
+    {
+        type            zeroGradient;
+    }
+    sides_half0
+    {
+        type            cyclic;
+    }
+    sides_half1
+    {
+        type            cyclic;
+    }
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun b/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
new file mode 100755
index 0000000000..f3cf09467d
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
@@ -0,0 +1,20 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application directory
+application=`getApplication`
+
+runApplication blockMesh
+
+#- Run serial
+#runApplication $application
+
+#- Run parallel
+runApplication decomposePar -cellDist
+runParallel $application
+#runApplication reconstructPar -latestTime
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/README b/tutorials/incompressible/pimpleFoam/channel395DFSEM/README
new file mode 100644
index 0000000000..5763359c07
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/README
@@ -0,0 +1,18 @@
+Channel test case for ReTau=395,based on the reference:
+
+    Poletto, R., Craft, T., and Revell, A.,
+    "A New Divergence Free Synthetic Eddy Method for the
+    Reproduction of Inlet Flow Conditions for LES",
+    Flow Turbulence Combust (2013) 91:519-539
+
+
+Inlet patch Reynolds stress, velocity and turbulence length scale data has been
+extracted from DNS data of:
+
+    Moser, Kim & Mansour
+    "DNS of Turbulent Channel Flow up to Re_tau=590",
+    Physics of Fluids (1999) vol 11, 943-945.
+
+Data available from (last checked 28 June 2016)
+
+    http://turbulence.ices.utexas.edu/MKM_1999.html
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/L b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/L
new file mode 100644
index 0000000000..94aef1c203
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/L
@@ -0,0 +1,276 @@
+/*--------------------------------*- C++ -*----------------------------------*| =========                 |                                                 |
+| \      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \    /   O peration     | Version:  plus                                  |
+|   \  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       scalarAverageField;
+    object      values;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// LMean
+0
+
+(
+0
+1.76693e-06
+1.06447e-07
+2.85582e-08
+1.73393e-08
+3.56243e-08
+3.79499e-08
+1.50479e-07
+1.55614e-07
+1.93408e-07
+4.50118e-08
+2.6295e-10
+6.18128e-08
+4.4709e-08
+5.98657e-07
+2.25711e-06
+4.20946e-06
+6.292e-06
+7.5414e-06
+9.02814e-06
+1.04737e-05
+1.25187e-05
+1.37559e-05
+1.40338e-05
+1.24681e-05
+1.08272e-05
+9.10144e-06
+7.81661e-06
+6.08627e-06
+4.68729e-06
+3.01241e-06
+1.93855e-06
+1.03945e-06
+2.49601e-07
+2.33919e-07
+3.47823e-08
+3.05604e-06
+8.25413e-06
+1.04748e-05
+1.36651e-05
+2.35252e-05
+3.87371e-05
+5.21582e-05
+6.71737e-05
+6.89399e-05
+4.57512e-05
+1.94891e-05
+9.7778e-06
+1.47858e-05
+3.40409e-05
+6.06823e-05
+8.59513e-05
+8.29571e-05
+5.42278e-05
+3.46015e-05
+2.20432e-05
+1.73878e-05
+1.05749e-05
+4.67814e-06
+8.66793e-06
+1.79361e-05
+1.22464e-05
+3.93103e-06
+1.00778e-06
+1.81983e-06
+2.70815e-05
+9.56468e-05
+0.000139304
+0.00012493
+9.50459e-05
+4.78307e-05
+8.71962e-06
+1.24275e-05
+4.91383e-05
+8.77264e-05
+0.000114449
+0.00014567
+0.000201758
+0.000251863
+0.000272594
+0.000213599
+0.000145126
+0.000115603
+0.000122779
+0.000116865
+8.36843e-05
+4.06009e-05
+3.49149e-05
+5.22978e-05
+5.07525e-05
+2.5995e-05
+2.6683e-06
+9.29144e-06
+1.14821e-05
+9.41939e-06
+1.01946e-05
+6.64024e-06
+1.1913e-06
+3.25066e-06
+8.47834e-06
+1.42023e-06
+4.30742e-05
+0.000106228
+0.000115468
+9.07632e-05
+7.04511e-05
+9.21776e-05
+0.000104486
+0.000111678
+0.000109852
+0.000111867
+9.10747e-05
+6.82206e-05
+4.09085e-05
+2.3961e-05
+2.0467e-06
+7.74345e-06
+1.66716e-05
+1.54967e-05
+2.95089e-05
+4.82299e-05
+6.99781e-05
+7.16947e-05
+7.33475e-05
+7.40551e-05
+9.45846e-05
+0.000107202
+0.000120068
+0.000122517
+0.000120068
+0.000107202
+9.45846e-05
+7.40551e-05
+7.33475e-05
+7.16947e-05
+6.99781e-05
+4.82299e-05
+2.95089e-05
+1.54967e-05
+1.66716e-05
+7.74345e-06
+2.0467e-06
+2.3961e-05
+4.09085e-05
+6.82206e-05
+9.10747e-05
+0.000111867
+0.000109852
+0.000111678
+0.000104486
+9.21776e-05
+7.04511e-05
+9.07632e-05
+0.000115468
+0.000106228
+4.30742e-05
+1.42023e-06
+8.47834e-06
+3.25066e-06
+1.1913e-06
+6.64024e-06
+1.01946e-05
+9.41939e-06
+1.14821e-05
+9.29144e-06
+2.6683e-06
+2.5995e-05
+5.07525e-05
+5.22978e-05
+3.49149e-05
+4.06009e-05
+8.36843e-05
+0.000116865
+0.000122779
+0.000115603
+0.000145126
+0.000213599
+0.000272594
+0.000251863
+0.000201758
+0.00014567
+0.000114449
+8.77264e-05
+4.91383e-05
+1.24275e-05
+8.71962e-06
+4.78307e-05
+9.50459e-05
+0.00012493
+0.000139304
+9.56468e-05
+2.70815e-05
+1.81983e-06
+1.00778e-06
+3.93103e-06
+1.22464e-05
+1.79361e-05
+8.66793e-06
+4.67814e-06
+1.05749e-05
+1.73878e-05
+2.20432e-05
+3.46015e-05
+5.42278e-05
+8.29571e-05
+8.59513e-05
+6.06823e-05
+3.40409e-05
+1.47858e-05
+9.7778e-06
+1.94891e-05
+4.57512e-05
+6.89399e-05
+6.71737e-05
+5.21582e-05
+3.87371e-05
+2.35252e-05
+1.36651e-05
+1.04748e-05
+8.25413e-06
+3.05604e-06
+3.47823e-08
+2.33919e-07
+2.49601e-07
+1.03945e-06
+1.93855e-06
+3.01241e-06
+4.68729e-06
+6.08627e-06
+7.81661e-06
+9.10144e-06
+1.08272e-05
+1.24681e-05
+1.40338e-05
+1.37559e-05
+1.25187e-05
+1.04737e-05
+9.02814e-06
+7.5414e-06
+6.292e-06
+4.20946e-06
+2.25711e-06
+5.98657e-07
+4.4709e-08
+6.18128e-08
+2.6295e-10
+4.50118e-08
+1.93408e-07
+1.55614e-07
+1.50479e-07
+3.79499e-08
+3.56243e-08
+1.73393e-08
+2.85582e-08
+1.06447e-07
+1.76693e-06
+0
+)
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/R b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/R
new file mode 100644
index 0000000000..497e864386
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/R
@@ -0,0 +1,277 @@
+/*--------------------------------*- C++ -*----------------------------------*| =========                 |                                                 |
+| \      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \    /   O peration     | Version:  plus                                  |
+|   \  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       symmTensorAverageField;
+    object      values;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// UU, UV, UZ, VV, VW, WW
+
+// Average
+(0 0 0 0 0 0)
+(
+(5.3376e-28 1.1206e-30 -6.1282e-30 4.9018e-29 6.2793e-32 5.9575e-28)
+(1.3684e-04 -2.4414e-08 5.9464e-08 9.4734e-11 -2.8525e-11 5.2943e-05)
+(2.1828e-03 -1.5728e-06 8.3228e-07 2.3603e-08 -1.7141e-09 8.2715e-04)
+(1.1020e-02 -1.8113e-05 3.3616e-06 5.7878e-07 -1.9051e-08 4.0392e-03)
+(3.4718e-02 -1.0324e-04 1.0732e-05 5.4400e-06 -1.0411e-07 1.2147e-02)
+(8.4454e-02 -4.0027e-04 2.8297e-05 3.0014e-05 -3.8272e-07 2.7852e-02)
+(1.7438e-01 -1.2143e-03 6.6865e-05 1.1756e-04 -1.0969e-06 5.3564e-02)
+(3.2123e-01 -3.1009e-03 1.4506e-04 3.6204e-04 -2.6288e-06 9.0947e-02)
+(5.4336e-01 -6.9486e-03 2.9097e-04 9.3203e-04 -5.4596e-06 1.4062e-01)
+(8.5851e-01 -1.4015e-02 5.4723e-04 2.0879e-03 -1.0091e-05 2.0209e-01)
+(1.2802e+00 -2.5858e-02 9.7373e-04 4.1852e-03 -1.7119e-05 2.7384e-01)
+(1.8132e+00 -4.4135e-02 1.6529e-03 7.6610e-03 -2.7764e-05 3.5369e-01)
+(2.4490e+00 -7.0276e-02 2.6847e-03 1.3005e-02 -4.4587e-05 4.3919e-01)
+(3.1644e+00 -1.0513e-01 4.1721e-03 2.0724e-02 -7.1044e-05 5.2804e-01)
+(3.9229e+00 -1.4869e-01 6.1889e-03 3.1300e-02 -1.0893e-04 6.1834e-01)
+(4.6811e+00 -1.9999e-01 8.7562e-03 4.5157e-02 -1.5460e-04 7.0871e-01)
+(5.3953e+00 -2.5724e-01 1.1834e-02 6.2636e-02 -1.9552e-04 7.9819e-01)
+(6.0286e+00 -3.1808e-01 1.5387e-02 8.3971e-02 -2.1029e-04 8.8610e-01)
+(6.5558e+00 -3.8001e-01 1.9449e-02 1.0928e-01 -1.7262e-04 9.7178e-01)
+(6.9642e+00 -4.4073e-01 2.4133e-02 1.3854e-01 -6.0490e-05 1.0545e+00)
+(7.2524e+00 -4.9837e-01 2.9501e-02 1.7162e-01 1.3268e-04 1.1333e+00)
+(7.4274e+00 -5.5162e-01 3.5418e-02 2.0824e-01 3.9086e-04 1.2075e+00)
+(7.5016e+00 -5.9969e-01 4.1511e-02 2.4803e-01 6.7818e-04 1.2762e+00)
+(7.4897e+00 -6.4224e-01 4.7330e-02 2.9050e-01 9.5511e-04 1.3387e+00)
+(7.4069e+00 -6.7924e-01 5.2512e-02 3.3510e-01 1.1989e-03 1.3948e+00)
+(7.2679e+00 -7.1090e-01 5.6926e-02 3.8121e-01 1.4016e-03 1.4444e+00)
+(7.0865e+00 -7.3759e-01 6.0659e-02 4.2818e-01 1.5532e-03 1.4878e+00)
+(6.8750e+00 -7.5980e-01 6.3835e-02 4.7535e-01 1.6360e-03 1.5251e+00)
+(6.6441e+00 -7.7810e-01 6.6418e-02 5.2211e-01 1.6465e-03 1.5568e+00)
+(6.4025e+00 -7.9302e-01 6.8207e-02 5.6790e-01 1.6026e-03 1.5833e+00)
+(6.1573e+00 -8.0503e-01 6.9001e-02 6.1229e-01 1.5073e-03 1.6047e+00)
+(5.9141e+00 -8.1452e-01 6.8896e-02 6.5493e-01 1.3268e-03 1.6216e+00)
+(5.6767e+00 -8.2184e-01 6.8285e-02 6.9554e-01 1.0303e-03 1.6344e+00)
+(5.4477e+00 -8.2733e-01 6.7481e-02 7.3388e-01 6.4119e-04 1.6439e+00)
+(5.2291e+00 -8.3133e-01 6.6450e-02 7.6971e-01 2.3642e-04 1.6512e+00)
+(5.0223e+00 -8.3412e-01 6.4937e-02 8.0285e-01 -1.3612e-04 1.6567e+00)
+(4.8279e+00 -8.3590e-01 6.2875e-02 8.3316e-01 -4.7569e-04 1.6606e+00)
+(4.6462e+00 -8.3683e-01 6.0710e-02 8.6061e-01 -7.8412e-04 1.6623e+00)
+(4.4768e+00 -8.3700e-01 5.9182e-02 8.8520e-01 -1.0539e-03 1.6618e+00)
+(4.3194e+00 -8.3649e-01 5.8527e-02 9.0700e-01 -1.2655e-03 1.6594e+00)
+(4.1730e+00 -8.3523e-01 5.8437e-02 9.2607e-01 -1.4126e-03 1.6553e+00)
+(4.0370e+00 -8.3321e-01 5.8512e-02 9.4247e-01 -1.4930e-03 1.6500e+00)
+(3.9106e+00 -8.3044e-01 5.8376e-02 9.5626e-01 -1.5118e-03 1.6439e+00)
+(3.7930e+00 -8.2687e-01 5.8084e-02 9.6754e-01 -1.5196e-03 1.6373e+00)
+(3.6834e+00 -8.2252e-01 5.8125e-02 9.7651e-01 -1.6228e-03 1.6299e+00)
+(3.5821e+00 -8.1762e-01 5.8537e-02 9.8341e-01 -1.8295e-03 1.6209e+00)
+(3.4896e+00 -8.1249e-01 5.8809e-02 9.8850e-01 -2.0145e-03 1.6105e+00)
+(3.4053e+00 -8.0726e-01 5.8494e-02 9.9197e-01 -2.0826e-03 1.5991e+00)
+(3.3278e+00 -8.0180e-01 5.7876e-02 9.9396e-01 -2.1101e-03 1.5872e+00)
+(3.2557e+00 -7.9592e-01 5.7034e-02 9.9455e-01 -2.1628e-03 1.5754e+00)
+(3.1886e+00 -7.8961e-01 5.5746e-02 9.9379e-01 -2.2441e-03 1.5637e+00)
+(3.1269e+00 -7.8296e-01 5.4259e-02 9.9183e-01 -2.3220e-03 1.5510e+00)
+(3.0702e+00 -7.7613e-01 5.2957e-02 9.8887e-01 -2.3519e-03 1.5367e+00)
+(3.0178e+00 -7.6929e-01 5.1819e-02 9.8512e-01 -2.3018e-03 1.5212e+00)
+(2.9678e+00 -7.6243e-01 5.0872e-02 9.8075e-01 -2.0851e-03 1.5052e+00)
+(2.9191e+00 -7.5552e-01 5.0514e-02 9.7583e-01 -1.6209e-03 1.4889e+00)
+(2.8712e+00 -7.4851e-01 5.0564e-02 9.7044e-01 -8.5802e-04 1.4721e+00)
+(2.8239e+00 -7.4146e-01 5.0229e-02 9.6465e-01 1.1783e-04 1.4551e+00)
+(2.7776e+00 -7.3445e-01 4.9171e-02 9.5846e-01 1.0337e-03 1.4379e+00)
+(2.7324e+00 -7.2737e-01 4.7565e-02 9.5179e-01 1.6440e-03 1.4206e+00)
+(2.6883e+00 -7.2012e-01 4.5716e-02 9.4459e-01 1.9851e-03 1.4035e+00)
+(2.6453e+00 -7.1271e-01 4.3916e-02 9.3679e-01 2.2291e-03 1.3867e+00)
+(2.6031e+00 -7.0521e-01 4.2134e-02 9.2845e-01 2.4143e-03 1.3696e+00)
+(2.5612e+00 -6.9761e-01 4.0077e-02 9.1976e-01 2.5128e-03 1.3515e+00)
+(2.5196e+00 -6.8985e-01 3.7520e-02 9.1087e-01 2.5006e-03 1.3322e+00)
+(2.4793e+00 -6.8192e-01 3.4358e-02 9.0185e-01 2.3726e-03 1.3118e+00)
+(2.4411e+00 -6.7396e-01 3.0858e-02 8.9268e-01 2.1952e-03 1.2910e+00)
+(2.4055e+00 -6.6598e-01 2.7094e-02 8.8335e-01 2.0517e-03 1.2700e+00)
+(2.3714e+00 -6.5794e-01 2.3371e-02 8.7385e-01 1.9999e-03 1.2488e+00)
+(2.3380e+00 -6.4977e-01 2.0500e-02 8.6418e-01 1.9700e-03 1.2276e+00)
+(2.3046e+00 -6.4148e-01 1.8795e-02 8.5436e-01 1.8189e-03 1.2066e+00)
+(2.2708e+00 -6.3298e-01 1.7891e-02 8.4439e-01 1.4336e-03 1.1855e+00)
+(2.2365e+00 -6.2415e-01 1.7572e-02 8.3421e-01 7.5375e-04 1.1641e+00)
+(2.2023e+00 -6.1500e-01 1.7517e-02 8.2369e-01 -7.9290e-05 1.1423e+00)
+(2.1682e+00 -6.0551e-01 1.7095e-02 8.1285e-01 -8.3720e-04 1.1202e+00)
+(2.1335e+00 -5.9561e-01 1.5913e-02 8.0181e-01 -1.3413e-03 1.0983e+00)
+(2.0983e+00 -5.8530e-01 1.4306e-02 7.9074e-01 -1.5771e-03 1.0767e+00)
+(2.0631e+00 -5.7460e-01 1.2812e-02 7.7968e-01 -1.5179e-03 1.0551e+00)
+(2.0277e+00 -5.6350e-01 1.1907e-02 7.6856e-01 -1.1762e-03 1.0339e+00)
+(1.9920e+00 -5.5204e-01 1.1640e-02 7.5731e-01 -7.0498e-04 1.0131e+00)
+(1.9568e+00 -5.4040e-01 1.1503e-02 7.4588e-01 -2.0689e-04 9.9279e-01)
+(1.9229e+00 -5.2883e-01 1.1097e-02 7.3425e-01 2.0529e-04 9.7254e-01)
+(1.8896e+00 -5.1747e-01 1.0218e-02 7.2249e-01 5.0971e-04 9.5187e-01)
+(1.8562e+00 -5.0626e-01 9.0004e-03 7.1064e-01 7.6211e-04 9.3057e-01)
+(1.8232e+00 -4.9507e-01 7.8753e-03 6.9862e-01 9.2292e-04 9.0936e-01)
+(1.7908e+00 -4.8386e-01 7.1617e-03 6.8642e-01 9.3017e-04 8.8926e-01)
+(1.7591e+00 -4.7269e-01 7.0121e-03 6.7417e-01 7.2814e-04 8.7042e-01)
+(1.7274e+00 -4.6164e-01 7.3802e-03 6.6201e-01 2.7352e-04 8.5243e-01)
+(1.6948e+00 -4.5072e-01 8.2299e-03 6.5007e-01 -2.9303e-04 8.3469e-01)
+(1.6610e+00 -4.3999e-01 9.3954e-03 6.3843e-01 -7.4565e-04 8.1690e-01)
+(1.6264e+00 -4.2949e-01 1.0585e-02 6.2712e-01 -9.5384e-04 7.9939e-01)
+(1.5910e+00 -4.1910e-01 1.1834e-02 6.1613e-01 -9.5389e-04 7.8241e-01)
+(1.5550e+00 -4.0876e-01 1.3728e-02 6.0545e-01 -1.0075e-03 7.6587e-01)
+(1.5184e+00 -3.9853e-01 1.6563e-02 5.9512e-01 -1.2970e-03 7.4931e-01)
+(1.4808e+00 -3.8843e-01 1.9835e-02 5.8523e-01 -1.7620e-03 7.3258e-01)
+(1.4425e+00 -3.7835e-01 2.2555e-02 5.7589e-01 -2.2305e-03 7.1572e-01)
+(1.4037e+00 -3.6810e-01 2.3965e-02 5.6715e-01 -2.5637e-03 6.9868e-01)
+(1.3647e+00 -3.5761e-01 2.4099e-02 5.5896e-01 -2.7183e-03 6.8159e-01)
+(1.3260e+00 -3.4695e-01 2.3378e-02 5.5120e-01 -2.7095e-03 6.6492e-01)
+(1.2881e+00 -3.3621e-01 2.2236e-02 5.4372e-01 -2.5722e-03 6.4916e-01)
+(1.2513e+00 -3.2544e-01 2.0871e-02 5.3642e-01 -2.4646e-03 6.3424e-01)
+(1.2162e+00 -3.1468e-01 1.9224e-02 5.2919e-01 -2.5472e-03 6.2001e-01)
+(1.1827e+00 -3.0393e-01 1.7273e-02 5.2197e-01 -2.7871e-03 6.0660e-01)
+(1.1500e+00 -2.9315e-01 1.5116e-02 5.1473e-01 -3.0094e-03 5.9377e-01)
+(1.1175e+00 -2.8231e-01 1.3055e-02 5.0750e-01 -3.1202e-03 5.8101e-01)
+(1.0843e+00 -2.7133e-01 1.1360e-02 5.0029e-01 -3.1772e-03 5.6815e-01)
+(1.0507e+00 -2.6019e-01 9.9787e-03 4.9312e-01 -3.2410e-03 5.5541e-01)
+(1.0173e+00 -2.4893e-01 8.7677e-03 4.8605e-01 -3.3171e-03 5.4304e-01)
+(9.8478e-01 -2.3753e-01 7.8868e-03 4.7922e-01 -3.3738e-03 5.3113e-01)
+(9.5377e-01 -2.2605e-01 7.6156e-03 4.7268e-01 -3.4135e-03 5.1971e-01)
+(9.2454e-01 -2.1462e-01 7.9424e-03 4.6644e-01 -3.4897e-03 5.0882e-01)
+(8.9706e-01 -2.0326e-01 8.6379e-03 4.6047e-01 -3.6720e-03 4.9853e-01)
+(8.7113e-01 -1.9188e-01 9.5840e-03 4.5478e-01 -3.9882e-03 4.8883e-01)
+(8.4645e-01 -1.8043e-01 1.0540e-02 4.4932e-01 -4.3896e-03 4.7982e-01)
+(8.2296e-01 -1.6898e-01 1.1159e-02 4.4410e-01 -4.7685e-03 4.7164e-01)
+(8.0062e-01 -1.5752e-01 1.1209e-02 4.3915e-01 -5.0417e-03 4.6392e-01)
+(7.7929e-01 -1.4601e-01 1.0617e-02 4.3458e-01 -5.1687e-03 4.5618e-01)
+(7.5889e-01 -1.3442e-01 9.5260e-03 4.3044e-01 -5.1040e-03 4.4842e-01)
+(7.3932e-01 -1.2272e-01 8.2998e-03 4.2671e-01 -4.8287e-03 4.4071e-01)
+(7.2051e-01 -1.1094e-01 7.2287e-03 4.2339e-01 -4.4056e-03 4.3345e-01)
+(7.0261e-01 -9.9120e-02 6.4502e-03 4.2046e-01 -3.8984e-03 4.2708e-01)
+(6.8576e-01 -8.7301e-02 6.1696e-03 4.1796e-01 -3.3462e-03 4.2169e-01)
+(6.7023e-01 -7.5441e-02 6.4277e-03 4.1591e-01 -2.7927e-03 4.1709e-01)
+(6.5620e-01 -6.3452e-02 7.0238e-03 4.1431e-01 -2.2376e-03 4.1319e-01)
+(6.4389e-01 -5.1252e-02 7.7818e-03 4.1313e-01 -1.6855e-03 4.0984e-01)
+(6.3375e-01 -3.8772e-02 8.7489e-03 4.1234e-01 -1.1858e-03 4.0689e-01)
+(6.2626e-01 -2.6001e-02 9.8627e-03 4.1188e-01 -7.6554e-04 4.0431e-01)
+(6.2174e-01 -1.3031e-02 1.0731e-02 4.1166e-01 -3.8835e-04 4.0247e-01)
+(6.2024e-01 0.0000e+00 1.1032e-02 4.1160e-01 0.0000e+00 4.0179e-01)
+(6.2174e-01 1.3031e-02 1.0731e-02 4.1166e-01 3.8835e-04 4.0247e-01)
+(6.2626e-01 2.6001e-02 9.8627e-03 4.1188e-01 7.6554e-04 4.0431e-01)
+(6.3375e-01 3.8772e-02 8.7489e-03 4.1234e-01 1.1858e-03 4.0689e-01)
+(6.4389e-01 5.1252e-02 7.7818e-03 4.1313e-01 1.6855e-03 4.0984e-01)
+(6.5620e-01 6.3452e-02 7.0238e-03 4.1431e-01 2.2376e-03 4.1319e-01)
+(6.7023e-01 7.5441e-02 6.4277e-03 4.1591e-01 2.7927e-03 4.1709e-01)
+(6.8576e-01 8.7301e-02 6.1696e-03 4.1796e-01 3.3462e-03 4.2169e-01)
+(7.0261e-01 9.9120e-02 6.4502e-03 4.2046e-01 3.8984e-03 4.2708e-01)
+(7.2051e-01 1.1094e-01 7.2287e-03 4.2339e-01 4.4056e-03 4.3345e-01)
+(7.3932e-01 1.2272e-01 8.2998e-03 4.2671e-01 4.8287e-03 4.4071e-01)
+(7.5889e-01 1.3442e-01 9.5260e-03 4.3044e-01 5.1040e-03 4.4842e-01)
+(7.7929e-01 1.4601e-01 1.0617e-02 4.3458e-01 5.1687e-03 4.5618e-01)
+(8.0062e-01 1.5752e-01 1.1209e-02 4.3915e-01 5.0417e-03 4.6392e-01)
+(8.2296e-01 1.6898e-01 1.1159e-02 4.4410e-01 4.7685e-03 4.7164e-01)
+(8.4645e-01 1.8043e-01 1.0540e-02 4.4932e-01 4.3896e-03 4.7982e-01)
+(8.7113e-01 1.9188e-01 9.5840e-03 4.5478e-01 3.9882e-03 4.8883e-01)
+(8.9706e-01 2.0326e-01 8.6379e-03 4.6047e-01 3.6720e-03 4.9853e-01)
+(9.2454e-01 2.1462e-01 7.9424e-03 4.6644e-01 3.4897e-03 5.0882e-01)
+(9.5377e-01 2.2605e-01 7.6156e-03 4.7268e-01 3.4135e-03 5.1971e-01)
+(9.8478e-01 2.3753e-01 7.8868e-03 4.7922e-01 3.3738e-03 5.3113e-01)
+(1.0173e+00 2.4893e-01 8.7677e-03 4.8605e-01 3.3171e-03 5.4304e-01)
+(1.0507e+00 2.6019e-01 9.9787e-03 4.9312e-01 3.2410e-03 5.5541e-01)
+(1.0843e+00 2.7133e-01 1.1360e-02 5.0029e-01 3.1772e-03 5.6815e-01)
+(1.1175e+00 2.8231e-01 1.3055e-02 5.0750e-01 3.1202e-03 5.8101e-01)
+(1.1500e+00 2.9315e-01 1.5116e-02 5.1473e-01 3.0094e-03 5.9377e-01)
+(1.1827e+00 3.0393e-01 1.7273e-02 5.2197e-01 2.7871e-03 6.0660e-01)
+(1.2162e+00 3.1468e-01 1.9224e-02 5.2919e-01 2.5472e-03 6.2001e-01)
+(1.2513e+00 3.2544e-01 2.0871e-02 5.3642e-01 2.4646e-03 6.3424e-01)
+(1.2881e+00 3.3621e-01 2.2236e-02 5.4372e-01 2.5722e-03 6.4916e-01)
+(1.3260e+00 3.4695e-01 2.3378e-02 5.5120e-01 2.7095e-03 6.6492e-01)
+(1.3647e+00 3.5761e-01 2.4099e-02 5.5896e-01 2.7183e-03 6.8159e-01)
+(1.4037e+00 3.6810e-01 2.3965e-02 5.6715e-01 2.5637e-03 6.9868e-01)
+(1.4425e+00 3.7835e-01 2.2555e-02 5.7589e-01 2.2305e-03 7.1572e-01)
+(1.4808e+00 3.8843e-01 1.9835e-02 5.8523e-01 1.7620e-03 7.3258e-01)
+(1.5184e+00 3.9853e-01 1.6563e-02 5.9512e-01 1.2970e-03 7.4931e-01)
+(1.5550e+00 4.0876e-01 1.3728e-02 6.0545e-01 1.0075e-03 7.6587e-01)
+(1.5910e+00 4.1910e-01 1.1834e-02 6.1613e-01 9.5389e-04 7.8241e-01)
+(1.6264e+00 4.2949e-01 1.0585e-02 6.2712e-01 9.5384e-04 7.9939e-01)
+(1.6610e+00 4.3999e-01 9.3954e-03 6.3843e-01 7.4565e-04 8.1690e-01)
+(1.6948e+00 4.5072e-01 8.2299e-03 6.5007e-01 2.9303e-04 8.3469e-01)
+(1.7274e+00 4.6164e-01 7.3802e-03 6.6201e-01 -2.7352e-04 8.5243e-01)
+(1.7591e+00 4.7269e-01 7.0121e-03 6.7417e-01 -7.2814e-04 8.7042e-01)
+(1.7908e+00 4.8386e-01 7.1617e-03 6.8642e-01 -9.3017e-04 8.8926e-01)
+(1.8232e+00 4.9507e-01 7.8753e-03 6.9862e-01 -9.2292e-04 9.0936e-01)
+(1.8562e+00 5.0626e-01 9.0004e-03 7.1064e-01 -7.6211e-04 9.3057e-01)
+(1.8896e+00 5.1747e-01 1.0218e-02 7.2249e-01 -5.0971e-04 9.5187e-01)
+(1.9229e+00 5.2883e-01 1.1097e-02 7.3425e-01 -2.0529e-04 9.7254e-01)
+(1.9568e+00 5.4040e-01 1.1503e-02 7.4588e-01 2.0689e-04 9.9279e-01)
+(1.9920e+00 5.5204e-01 1.1640e-02 7.5731e-01 7.0498e-04 1.0131e+00)
+(2.0277e+00 5.6350e-01 1.1907e-02 7.6856e-01 1.1762e-03 1.0339e+00)
+(2.0631e+00 5.7460e-01 1.2812e-02 7.7968e-01 1.5179e-03 1.0551e+00)
+(2.0983e+00 5.8530e-01 1.4306e-02 7.9074e-01 1.5771e-03 1.0767e+00)
+(2.1335e+00 5.9561e-01 1.5913e-02 8.0181e-01 1.3413e-03 1.0983e+00)
+(2.1682e+00 6.0551e-01 1.7095e-02 8.1285e-01 8.3720e-04 1.1202e+00)
+(2.2023e+00 6.1500e-01 1.7517e-02 8.2369e-01 7.9290e-05 1.1423e+00)
+(2.2365e+00 6.2415e-01 1.7572e-02 8.3421e-01 -7.5375e-04 1.1641e+00)
+(2.2708e+00 6.3298e-01 1.7891e-02 8.4439e-01 -1.4336e-03 1.1855e+00)
+(2.3046e+00 6.4148e-01 1.8795e-02 8.5436e-01 -1.8189e-03 1.2066e+00)
+(2.3380e+00 6.4977e-01 2.0500e-02 8.6418e-01 -1.9700e-03 1.2276e+00)
+(2.3714e+00 6.5794e-01 2.3371e-02 8.7385e-01 -1.9999e-03 1.2488e+00)
+(2.4055e+00 6.6598e-01 2.7094e-02 8.8335e-01 -2.0517e-03 1.2700e+00)
+(2.4411e+00 6.7396e-01 3.0858e-02 8.9268e-01 -2.1952e-03 1.2910e+00)
+(2.4793e+00 6.8192e-01 3.4358e-02 9.0185e-01 -2.3726e-03 1.3118e+00)
+(2.5196e+00 6.8985e-01 3.7520e-02 9.1087e-01 -2.5006e-03 1.3322e+00)
+(2.5612e+00 6.9761e-01 4.0077e-02 9.1976e-01 -2.5128e-03 1.3515e+00)
+(2.6031e+00 7.0521e-01 4.2134e-02 9.2845e-01 -2.4143e-03 1.3696e+00)
+(2.6453e+00 7.1271e-01 4.3916e-02 9.3679e-01 -2.2291e-03 1.3867e+00)
+(2.6883e+00 7.2012e-01 4.5716e-02 9.4459e-01 -1.9851e-03 1.4035e+00)
+(2.7324e+00 7.2737e-01 4.7565e-02 9.5179e-01 -1.6440e-03 1.4206e+00)
+(2.7776e+00 7.3445e-01 4.9171e-02 9.5846e-01 -1.0337e-03 1.4379e+00)
+(2.8239e+00 7.4146e-01 5.0229e-02 9.6465e-01 -1.1783e-04 1.4551e+00)
+(2.8712e+00 7.4851e-01 5.0564e-02 9.7044e-01 8.5802e-04 1.4721e+00)
+(2.9191e+00 7.5552e-01 5.0514e-02 9.7583e-01 1.6209e-03 1.4889e+00)
+(2.9678e+00 7.6243e-01 5.0872e-02 9.8075e-01 2.0851e-03 1.5052e+00)
+(3.0178e+00 7.6929e-01 5.1819e-02 9.8512e-01 2.3018e-03 1.5212e+00)
+(3.0702e+00 7.7613e-01 5.2957e-02 9.8887e-01 2.3519e-03 1.5367e+00)
+(3.1269e+00 7.8296e-01 5.4259e-02 9.9183e-01 2.3220e-03 1.5510e+00)
+(3.1886e+00 7.8961e-01 5.5746e-02 9.9379e-01 2.2441e-03 1.5637e+00)
+(3.2557e+00 7.9592e-01 5.7034e-02 9.9455e-01 2.1628e-03 1.5754e+00)
+(3.3278e+00 8.0180e-01 5.7876e-02 9.9396e-01 2.1101e-03 1.5872e+00)
+(3.4053e+00 8.0726e-01 5.8494e-02 9.9197e-01 2.0826e-03 1.5991e+00)
+(3.4896e+00 8.1249e-01 5.8809e-02 9.8850e-01 2.0145e-03 1.6105e+00)
+(3.5821e+00 8.1762e-01 5.8537e-02 9.8341e-01 1.8295e-03 1.6209e+00)
+(3.6834e+00 8.2252e-01 5.8125e-02 9.7651e-01 1.6228e-03 1.6299e+00)
+(3.7930e+00 8.2687e-01 5.8084e-02 9.6754e-01 1.5196e-03 1.6373e+00)
+(3.9106e+00 8.3044e-01 5.8376e-02 9.5626e-01 1.5118e-03 1.6439e+00)
+(4.0370e+00 8.3321e-01 5.8512e-02 9.4247e-01 1.4930e-03 1.6500e+00)
+(4.1730e+00 8.3523e-01 5.8437e-02 9.2607e-01 1.4126e-03 1.6553e+00)
+(4.3194e+00 8.3649e-01 5.8527e-02 9.0700e-01 1.2655e-03 1.6594e+00)
+(4.4768e+00 8.3700e-01 5.9182e-02 8.8520e-01 1.0539e-03 1.6618e+00)
+(4.6462e+00 8.3683e-01 6.0710e-02 8.6061e-01 7.8412e-04 1.6623e+00)
+(4.8279e+00 8.3590e-01 6.2875e-02 8.3316e-01 4.7569e-04 1.6606e+00)
+(5.0223e+00 8.3412e-01 6.4937e-02 8.0285e-01 1.3612e-04 1.6567e+00)
+(5.2291e+00 8.3133e-01 6.6450e-02 7.6971e-01 -2.3642e-04 1.6512e+00)
+(5.4477e+00 8.2733e-01 6.7481e-02 7.3388e-01 -6.4119e-04 1.6439e+00)
+(5.6767e+00 8.2184e-01 6.8285e-02 6.9554e-01 -1.0303e-03 1.6344e+00)
+(5.9141e+00 8.1452e-01 6.8896e-02 6.5493e-01 -1.3268e-03 1.6216e+00)
+(6.1573e+00 8.0503e-01 6.9001e-02 6.1229e-01 -1.5073e-03 1.6047e+00)
+(6.4025e+00 7.9302e-01 6.8207e-02 5.6790e-01 -1.6026e-03 1.5833e+00)
+(6.6441e+00 7.7810e-01 6.6418e-02 5.2211e-01 -1.6465e-03 1.5568e+00)
+(6.8750e+00 7.5980e-01 6.3835e-02 4.7535e-01 -1.6360e-03 1.5251e+00)
+(7.0865e+00 7.3759e-01 6.0659e-02 4.2818e-01 -1.5532e-03 1.4878e+00)
+(7.2679e+00 7.1090e-01 5.6926e-02 3.8121e-01 -1.4016e-03 1.4444e+00)
+(7.4069e+00 6.7924e-01 5.2512e-02 3.3510e-01 -1.1989e-03 1.3948e+00)
+(7.4897e+00 6.4224e-01 4.7330e-02 2.9050e-01 -9.5511e-04 1.3387e+00)
+(7.5016e+00 5.9969e-01 4.1511e-02 2.4803e-01 -6.7818e-04 1.2762e+00)
+(7.4274e+00 5.5162e-01 3.5418e-02 2.0824e-01 -3.9086e-04 1.2075e+00)
+(7.2524e+00 4.9837e-01 2.9501e-02 1.7162e-01 -1.3268e-04 1.1333e+00)
+(6.9642e+00 4.4073e-01 2.4133e-02 1.3854e-01 6.0490e-05 1.0545e+00)
+(6.5558e+00 3.8001e-01 1.9449e-02 1.0928e-01 1.7262e-04 9.7178e-01)
+(6.0286e+00 3.1808e-01 1.5387e-02 8.3971e-02 2.1029e-04 8.8610e-01)
+(5.3953e+00 2.5724e-01 1.1834e-02 6.2636e-02 1.9552e-04 7.9819e-01)
+(4.6811e+00 1.9999e-01 8.7562e-03 4.5157e-02 1.5460e-04 7.0871e-01)
+(3.9229e+00 1.4869e-01 6.1889e-03 3.1300e-02 1.0893e-04 6.1834e-01)
+(3.1644e+00 1.0513e-01 4.1721e-03 2.0724e-02 7.1044e-05 5.2804e-01)
+(2.4490e+00 7.0276e-02 2.6847e-03 1.3005e-02 4.4587e-05 4.3919e-01)
+(1.8132e+00 4.4135e-02 1.6529e-03 7.6610e-03 2.7764e-05 3.5369e-01)
+(1.2802e+00 2.5858e-02 9.7373e-04 4.1852e-03 1.7119e-05 2.7384e-01)
+(8.5851e-01 1.4015e-02 5.4723e-04 2.0879e-03 1.0091e-05 2.0209e-01)
+(5.4336e-01 6.9486e-03 2.9097e-04 9.3203e-04 5.4596e-06 1.4062e-01)
+(3.2123e-01 3.1009e-03 1.4506e-04 3.6204e-04 2.6288e-06 9.0947e-02)
+(1.7438e-01 1.2143e-03 6.6865e-05 1.1756e-04 1.0969e-06 5.3564e-02)
+(8.4454e-02 4.0027e-04 2.8297e-05 3.0014e-05 3.8272e-07 2.7852e-02)
+(3.4718e-02 1.0324e-04 1.0732e-05 5.4400e-06 1.0411e-07 1.2147e-02)
+(1.1020e-02 1.8113e-05 3.3616e-06 5.7878e-07 1.9051e-08 4.0392e-03)
+(2.1828e-03 1.5728e-06 8.3228e-07 2.3603e-08 1.7141e-09 8.2715e-04)
+(1.3684e-04 2.4414e-08 5.9464e-08 9.4734e-11 2.8525e-11 5.2943e-05)
+(5.3376e-28 -1.1206e-30 -6.1282e-30 4.9018e-29 -6.2793e-32 5.9575e-28)
+)
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/U b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/U
new file mode 100644
index 0000000000..925381d73a
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/U
@@ -0,0 +1,276 @@
+/*--------------------------------*- C++ -*----------------------------------*| =========                 |                                                 |
+| \      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \    /   O peration     | Version:  plus                                  |
+|   \  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       vectorAverageField;
+    object      values;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// UMean
+(0 0 0)
+
+(
+( 0.0000e+00 0 0 )
+( 2.9538e-02 0 0 )
+( 1.1811e-01 0 0 )
+( 2.6562e-01 0 0 )
+( 4.7198e-01 0 0 )
+( 7.3701e-01 0 0 )
+( 1.0605e+00 0 0 )
+( 1.4417e+00 0 0 )
+( 1.8799e+00 0 0 )
+( 2.3729e+00 0 0 )
+( 2.9177e+00 0 0 )
+( 3.5093e+00 0 0 )
+( 4.1409e+00 0 0 )
+( 4.8032e+00 0 0 )
+( 5.4854e+00 0 0 )
+( 6.1754e+00 0 0 )
+( 6.8611e+00 0 0 )
+( 7.5309e+00 0 0 )
+( 8.1754e+00 0 0 )
+( 8.7870e+00 0 0 )
+( 9.3607e+00 0 0 )
+( 9.8937e+00 0 0 )
+( 1.0385e+01 0 0 )
+( 1.0836e+01 0 0 )
+( 1.1248e+01 0 0 )
+( 1.1624e+01 0 0 )
+( 1.1966e+01 0 0 )
+( 1.2278e+01 0 0 )
+( 1.2563e+01 0 0 )
+( 1.2822e+01 0 0 )
+( 1.3060e+01 0 0 )
+( 1.3278e+01 0 0 )
+( 1.3479e+01 0 0 )
+( 1.3664e+01 0 0 )
+( 1.3837e+01 0 0 )
+( 1.3998e+01 0 0 )
+( 1.4148e+01 0 0 )
+( 1.4290e+01 0 0 )
+( 1.4425e+01 0 0 )
+( 1.4552e+01 0 0 )
+( 1.4673e+01 0 0 )
+( 1.4790e+01 0 0 )
+( 1.4902e+01 0 0 )
+( 1.5011e+01 0 0 )
+( 1.5117e+01 0 0 )
+( 1.5221e+01 0 0 )
+( 1.5322e+01 0 0 )
+( 1.5421e+01 0 0 )
+( 1.5518e+01 0 0 )
+( 1.5614e+01 0 0 )
+( 1.5707e+01 0 0 )
+( 1.5799e+01 0 0 )
+( 1.5890e+01 0 0 )
+( 1.5979e+01 0 0 )
+( 1.6067e+01 0 0 )
+( 1.6153e+01 0 0 )
+( 1.6239e+01 0 0 )
+( 1.6324e+01 0 0 )
+( 1.6409e+01 0 0 )
+( 1.6493e+01 0 0 )
+( 1.6576e+01 0 0 )
+( 1.6659e+01 0 0 )
+( 1.6741e+01 0 0 )
+( 1.6823e+01 0 0 )
+( 1.6903e+01 0 0 )
+( 1.6984e+01 0 0 )
+( 1.7063e+01 0 0 )
+( 1.7141e+01 0 0 )
+( 1.7218e+01 0 0 )
+( 1.7294e+01 0 0 )
+( 1.7369e+01 0 0 )
+( 1.7443e+01 0 0 )
+( 1.7517e+01 0 0 )
+( 1.7590e+01 0 0 )
+( 1.7664e+01 0 0 )
+( 1.7738e+01 0 0 )
+( 1.7812e+01 0 0 )
+( 1.7886e+01 0 0 )
+( 1.7960e+01 0 0 )
+( 1.8034e+01 0 0 )
+( 1.8108e+01 0 0 )
+( 1.8182e+01 0 0 )
+( 1.8254e+01 0 0 )
+( 1.8326e+01 0 0 )
+( 1.8396e+01 0 0 )
+( 1.8466e+01 0 0 )
+( 1.8535e+01 0 0 )
+( 1.8603e+01 0 0 )
+( 1.8669e+01 0 0 )
+( 1.8734e+01 0 0 )
+( 1.8797e+01 0 0 )
+( 1.8859e+01 0 0 )
+( 1.8919e+01 0 0 )
+( 1.8978e+01 0 0 )
+( 1.9035e+01 0 0 )
+( 1.9092e+01 0 0 )
+( 1.9148e+01 0 0 )
+( 1.9202e+01 0 0 )
+( 1.9256e+01 0 0 )
+( 1.9308e+01 0 0 )
+( 1.9359e+01 0 0 )
+( 1.9408e+01 0 0 )
+( 1.9456e+01 0 0 )
+( 1.9503e+01 0 0 )
+( 1.9548e+01 0 0 )
+( 1.9593e+01 0 0 )
+( 1.9636e+01 0 0 )
+( 1.9678e+01 0 0 )
+( 1.9719e+01 0 0 )
+( 1.9758e+01 0 0 )
+( 1.9796e+01 0 0 )
+( 1.9832e+01 0 0 )
+( 1.9865e+01 0 0 )
+( 1.9897e+01 0 0 )
+( 1.9927e+01 0 0 )
+( 1.9955e+01 0 0 )
+( 1.9981e+01 0 0 )
+( 2.0004e+01 0 0 )
+( 2.0026e+01 0 0 )
+( 2.0046e+01 0 0 )
+( 2.0064e+01 0 0 )
+( 2.0080e+01 0 0 )
+( 2.0094e+01 0 0 )
+( 2.0106e+01 0 0 )
+( 2.0116e+01 0 0 )
+( 2.0123e+01 0 0 )
+( 2.0129e+01 0 0 )
+( 2.0132e+01 0 0 )
+( 2.0133e+01 0 0 )
+( 2.0132e+01 0 0 )
+( 2.0129e+01 0 0 )
+( 2.0123e+01 0 0 )
+( 2.0116e+01 0 0 )
+( 2.0106e+01 0 0 )
+( 2.0094e+01 0 0 )
+( 2.0080e+01 0 0 )
+( 2.0064e+01 0 0 )
+( 2.0046e+01 0 0 )
+( 2.0026e+01 0 0 )
+( 2.0004e+01 0 0 )
+( 1.9981e+01 0 0 )
+( 1.9955e+01 0 0 )
+( 1.9927e+01 0 0 )
+( 1.9897e+01 0 0 )
+( 1.9865e+01 0 0 )
+( 1.9832e+01 0 0 )
+( 1.9796e+01 0 0 )
+( 1.9758e+01 0 0 )
+( 1.9719e+01 0 0 )
+( 1.9678e+01 0 0 )
+( 1.9636e+01 0 0 )
+( 1.9593e+01 0 0 )
+( 1.9548e+01 0 0 )
+( 1.9503e+01 0 0 )
+( 1.9456e+01 0 0 )
+( 1.9408e+01 0 0 )
+( 1.9359e+01 0 0 )
+( 1.9308e+01 0 0 )
+( 1.9256e+01 0 0 )
+( 1.9202e+01 0 0 )
+( 1.9148e+01 0 0 )
+( 1.9092e+01 0 0 )
+( 1.9035e+01 0 0 )
+( 1.8978e+01 0 0 )
+( 1.8919e+01 0 0 )
+( 1.8859e+01 0 0 )
+( 1.8797e+01 0 0 )
+( 1.8734e+01 0 0 )
+( 1.8669e+01 0 0 )
+( 1.8603e+01 0 0 )
+( 1.8535e+01 0 0 )
+( 1.8466e+01 0 0 )
+( 1.8396e+01 0 0 )
+( 1.8326e+01 0 0 )
+( 1.8254e+01 0 0 )
+( 1.8182e+01 0 0 )
+( 1.8108e+01 0 0 )
+( 1.8034e+01 0 0 )
+( 1.7960e+01 0 0 )
+( 1.7886e+01 0 0 )
+( 1.7812e+01 0 0 )
+( 1.7738e+01 0 0 )
+( 1.7664e+01 0 0 )
+( 1.7590e+01 0 0 )
+( 1.7517e+01 0 0 )
+( 1.7443e+01 0 0 )
+( 1.7369e+01 0 0 )
+( 1.7294e+01 0 0 )
+( 1.7218e+01 0 0 )
+( 1.7141e+01 0 0 )
+( 1.7063e+01 0 0 )
+( 1.6984e+01 0 0 )
+( 1.6903e+01 0 0 )
+( 1.6823e+01 0 0 )
+( 1.6741e+01 0 0 )
+( 1.6659e+01 0 0 )
+( 1.6576e+01 0 0 )
+( 1.6493e+01 0 0 )
+( 1.6409e+01 0 0 )
+( 1.6324e+01 0 0 )
+( 1.6239e+01 0 0 )
+( 1.6153e+01 0 0 )
+( 1.6067e+01 0 0 )
+( 1.5979e+01 0 0 )
+( 1.5890e+01 0 0 )
+( 1.5799e+01 0 0 )
+( 1.5707e+01 0 0 )
+( 1.5614e+01 0 0 )
+( 1.5518e+01 0 0 )
+( 1.5421e+01 0 0 )
+( 1.5322e+01 0 0 )
+( 1.5221e+01 0 0 )
+( 1.5117e+01 0 0 )
+( 1.5011e+01 0 0 )
+( 1.4902e+01 0 0 )
+( 1.4790e+01 0 0 )
+( 1.4673e+01 0 0 )
+( 1.4552e+01 0 0 )
+( 1.4425e+01 0 0 )
+( 1.4290e+01 0 0 )
+( 1.4148e+01 0 0 )
+( 1.3998e+01 0 0 )
+( 1.3837e+01 0 0 )
+( 1.3664e+01 0 0 )
+( 1.3479e+01 0 0 )
+( 1.3278e+01 0 0 )
+( 1.3060e+01 0 0 )
+( 1.2822e+01 0 0 )
+( 1.2563e+01 0 0 )
+( 1.2278e+01 0 0 )
+( 1.1966e+01 0 0 )
+( 1.1624e+01 0 0 )
+( 1.1248e+01 0 0 )
+( 1.0836e+01 0 0 )
+( 1.0385e+01 0 0 )
+( 9.8937e+00 0 0 )
+( 9.3607e+00 0 0 )
+( 8.7870e+00 0 0 )
+( 8.1754e+00 0 0 )
+( 7.5309e+00 0 0 )
+( 6.8611e+00 0 0 )
+( 6.1754e+00 0 0 )
+( 5.4854e+00 0 0 )
+( 4.8032e+00 0 0 )
+( 4.1409e+00 0 0 )
+( 3.5093e+00 0 0 )
+( 2.9177e+00 0 0 )
+( 2.3729e+00 0 0 )
+( 1.8799e+00 0 0 )
+( 1.4417e+00 0 0 )
+( 1.0605e+00 0 0 )
+( 7.3701e-01 0 0 )
+( 4.7198e-01 0 0 )
+( 2.6562e-01 0 0 )
+( 1.1811e-01 0 0 )
+( 2.9538e-02 0 0 )
+( 0.0000e+00 0 0 )
+)
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/points b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/points
new file mode 100644
index 0000000000..a89fc76345
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/points
@@ -0,0 +1,273 @@
+/*--------------------------------*- C++ -*----------------------------------*| =========                 |                                                 |
+| \      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \    /   O peration     | Version:  plus                                  |
+|   \  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       vectorField;
+    object      points;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+(
+(0 0.0000e+00 0)
+(0 7.5298e-05 0)
+(0 3.0118e-04 0)
+(0 6.7762e-04 0)
+(0 1.2045e-03 0)
+(0 1.8819e-03 0)
+(0 2.7095e-03 0)
+(0 3.6874e-03 0)
+(0 4.8153e-03 0)
+(0 6.0930e-03 0)
+(0 7.5205e-03 0)
+(0 9.0974e-03 0)
+(0 1.0823e-02 0)
+(0 1.2699e-02 0)
+(0 1.4722e-02 0)
+(0 1.6895e-02 0)
+(0 1.9215e-02 0)
+(0 2.1683e-02 0)
+(0 2.4298e-02 0)
+(0 2.7060e-02 0)
+(0 2.9969e-02 0)
+(0 3.3024e-02 0)
+(0 3.6224e-02 0)
+(0 3.9569e-02 0)
+(0 4.3060e-02 0)
+(0 4.6694e-02 0)
+(0 5.0472e-02 0)
+(0 5.4393e-02 0)
+(0 5.8456e-02 0)
+(0 6.2661e-02 0)
+(0 6.7007e-02 0)
+(0 7.1494e-02 0)
+(0 7.6120e-02 0)
+(0 8.0886e-02 0)
+(0 8.5790e-02 0)
+(0 9.0832e-02 0)
+(0 9.6011e-02 0)
+(0 1.0133e-01 0)
+(0 1.0678e-01 0)
+(0 1.1236e-01 0)
+(0 1.1808e-01 0)
+(0 1.2393e-01 0)
+(0 1.2991e-01 0)
+(0 1.3603e-01 0)
+(0 1.4227e-01 0)
+(0 1.4864e-01 0)
+(0 1.5515e-01 0)
+(0 1.6178e-01 0)
+(0 1.6853e-01 0)
+(0 1.7541e-01 0)
+(0 1.8242e-01 0)
+(0 1.8954e-01 0)
+(0 1.9679e-01 0)
+(0 2.0416e-01 0)
+(0 2.1165e-01 0)
+(0 2.1926e-01 0)
+(0 2.2699e-01 0)
+(0 2.3483e-01 0)
+(0 2.4279e-01 0)
+(0 2.5086e-01 0)
+(0 2.5905e-01 0)
+(0 2.6735e-01 0)
+(0 2.7575e-01 0)
+(0 2.8427e-01 0)
+(0 2.9289e-01 0)
+(0 3.0162e-01 0)
+(0 3.1046e-01 0)
+(0 3.1940e-01 0)
+(0 3.2844e-01 0)
+(0 3.3758e-01 0)
+(0 3.4683e-01 0)
+(0 3.5617e-01 0)
+(0 3.6561e-01 0)
+(0 3.7514e-01 0)
+(0 3.8477e-01 0)
+(0 3.9449e-01 0)
+(0 4.0430e-01 0)
+(0 4.1420e-01 0)
+(0 4.2419e-01 0)
+(0 4.3427e-01 0)
+(0 4.4443e-01 0)
+(0 4.5467e-01 0)
+(0 4.6500e-01 0)
+(0 4.7541e-01 0)
+(0 4.8590e-01 0)
+(0 4.9646e-01 0)
+(0 5.0710e-01 0)
+(0 5.1782e-01 0)
+(0 5.2860e-01 0)
+(0 5.3946e-01 0)
+(0 5.5039e-01 0)
+(0 5.6138e-01 0)
+(0 5.7244e-01 0)
+(0 5.8357e-01 0)
+(0 5.9476e-01 0)
+(0 6.0601e-01 0)
+(0 6.1732e-01 0)
+(0 6.2868e-01 0)
+(0 6.4010e-01 0)
+(0 6.5158e-01 0)
+(0 6.6311e-01 0)
+(0 6.7469e-01 0)
+(0 6.8632e-01 0)
+(0 6.9799e-01 0)
+(0 7.0972e-01 0)
+(0 7.2148e-01 0)
+(0 7.3329e-01 0)
+(0 7.4513e-01 0)
+(0 7.5702e-01 0)
+(0 7.6894e-01 0)
+(0 7.8090e-01 0)
+(0 7.9289e-01 0)
+(0 8.0491e-01 0)
+(0 8.1696e-01 0)
+(0 8.2904e-01 0)
+(0 8.4114e-01 0)
+(0 8.5327e-01 0)
+(0 8.6542e-01 0)
+(0 8.7759e-01 0)
+(0 8.8978e-01 0)
+(0 9.0198e-01 0)
+(0 9.1420e-01 0)
+(0 9.2644e-01 0)
+(0 9.3868e-01 0)
+(0 9.5093e-01 0)
+(0 9.6319e-01 0)
+(0 9.7546e-01 0)
+(0 9.8773e-01 0)
+(0 1.0000e-00 0)
+(0 1.01227 0)
+(0 1.02454 0)
+(0 1.03681 0)
+(0 1.04907 0)
+(0 1.06132 0)
+(0 1.07356 0)
+(0 1.0858 0)
+(0 1.09802 0)
+(0 1.11022 0)
+(0 1.12241 0)
+(0 1.13458 0)
+(0 1.14673 0)
+(0 1.15886 0)
+(0 1.17096 0)
+(0 1.18304 0)
+(0 1.19509 0)
+(0 1.20711 0)
+(0 1.2191 0)
+(0 1.23106 0)
+(0 1.24298 0)
+(0 1.25487 0)
+(0 1.26671 0)
+(0 1.27852 0)
+(0 1.29028 0)
+(0 1.30201 0)
+(0 1.31368 0)
+(0 1.32531 0)
+(0 1.33689 0)
+(0 1.34842 0)
+(0 1.3599 0)
+(0 1.37132 0)
+(0 1.38268 0)
+(0 1.39399 0)
+(0 1.40524 0)
+(0 1.41643 0)
+(0 1.42756 0)
+(0 1.43862 0)
+(0 1.44961 0)
+(0 1.46054 0)
+(0 1.4714 0)
+(0 1.48218 0)
+(0 1.4929 0)
+(0 1.50354 0)
+(0 1.5141 0)
+(0 1.52459 0)
+(0 1.535 0)
+(0 1.54533 0)
+(0 1.55557 0)
+(0 1.56573 0)
+(0 1.57581 0)
+(0 1.5858 0)
+(0 1.5957 0)
+(0 1.60551 0)
+(0 1.61523 0)
+(0 1.62486 0)
+(0 1.63439 0)
+(0 1.64383 0)
+(0 1.65317 0)
+(0 1.66242 0)
+(0 1.67156 0)
+(0 1.6806 0)
+(0 1.68954 0)
+(0 1.69838 0)
+(0 1.70711 0)
+(0 1.71573 0)
+(0 1.72425 0)
+(0 1.73265 0)
+(0 1.74095 0)
+(0 1.74914 0)
+(0 1.75721 0)
+(0 1.76517 0)
+(0 1.77301 0)
+(0 1.78074 0)
+(0 1.78835 0)
+(0 1.79584 0)
+(0 1.80321 0)
+(0 1.81046 0)
+(0 1.81758 0)
+(0 1.82459 0)
+(0 1.83147 0)
+(0 1.83822 0)
+(0 1.84485 0)
+(0 1.85136 0)
+(0 1.85773 0)
+(0 1.86397 0)
+(0 1.87009 0)
+(0 1.87607 0)
+(0 1.88192 0)
+(0 1.88764 0)
+(0 1.89322 0)
+(0 1.89867 0)
+(0 1.90399 0)
+(0 1.90917 0)
+(0 1.91421 0)
+(0 1.91911 0)
+(0 1.92388 0)
+(0 1.92851 0)
+(0 1.93299 0)
+(0 1.93734 0)
+(0 1.94154 0)
+(0 1.94561 0)
+(0 1.94953 0)
+(0 1.95331 0)
+(0 1.95694 0)
+(0 1.96043 0)
+(0 1.96378 0)
+(0 1.96698 0)
+(0 1.97003 0)
+(0 1.97294 0)
+(0 1.9757 0)
+(0 1.97832 0)
+(0 1.98079 0)
+(0 1.9831 0)
+(0 1.98528 0)
+(0 1.9873 0)
+(0 1.98918 0)
+(0 1.9909 0)
+(0 1.99248 0)
+(0 1.99391 0)
+(0 1.99518 0)
+(0 1.99631 0)
+(0 1.99729 0)
+(0 1.99812 0)
+(0 1.9988 0)
+(0 1.99932 0)
+(0 1.9997 0)
+(0 1.99992 0)
+(0 2 0)
+)
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/transportProperties b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/transportProperties
new file mode 100644
index 0000000000..ca586f4638
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/transportProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel  Newtonian;
+
+// Re_tau = u_tau L / nu
+// Re_tau = 395
+// L = half channel height = 1
+// Ubulk/u_tau = 17.55
+// U_bulk = 17.55 -> u_tau = 1
+// -> nu = 1*1/395 = 2.532e-3
+
+nu              nu [ 0 2 -1 0 0 0 0 ] 2.532e-3;
+
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/turbulenceProperties
new file mode 100644
index 0000000000..924410797a
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/turbulenceProperties
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType LES;
+
+LES
+{
+    turbulence      on;
+
+    LESModel        kEqn;
+    kEqnCoeffs
+    {
+        Ce              1.048;
+        Ck              0.07; // 0.094;
+    }
+
+    printCoeffs     on;
+
+    delta           vanDriest;
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        Aplus           26;
+        Cdelta          0.158;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/blockMeshDict
new file mode 100644
index 0000000000..31cee0dff7
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/blockMeshDict
@@ -0,0 +1,94 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+L #calc "20*M_PI";
+H #calc "1";
+H2 #calc "2*$H";
+W #calc "M_PI";
+
+vertices
+(
+    ( 0   0   0)
+    ($L   0   0)
+    ($L  $H   0)
+    ($L $H2   0)
+    ( 0 $H2   0)
+    ( 0  $H   0)
+
+    ( 0   0  $W)
+    ($L   0  $W)
+    ($L  $H  $W)
+    ($L $H2  $W)
+    ( 0 $H2  $W)
+    ( 0  $H  $W)
+);
+
+blocks
+(
+    hex ( 0  1  2  5  6  7  8 11) (500 23 82) simpleGrading (1 25 1)
+    hex ( 5  2  3  4 11  8  9 10) (500 23 82) simpleGrading (1 0.04 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    bottomWall
+    {
+        type            wall;
+        faces           ((0 6 7 1));
+    }
+    topWall
+    {
+        type            wall;
+        faces           ((4 3 9 10));
+    }
+
+    sides_half0
+    {
+        type            cyclic;
+        neighbourPatch  sides_half1;
+        faces           ((1 2 5 0)(2 3 4 5));
+    }
+    sides_half1
+    {
+        type            cyclic;
+        neighbourPatch  sides_half0;
+        faces           ((6 11 8 7)(11 10 9 8));
+    }
+
+
+    inlet
+    {
+        type            patch;
+        faces           ((0 5 11 6)(5 4 10 11));
+    }
+    outlet
+    {
+        type            patch;
+        faces           ((1 7 8 2)(2 8 9 3));
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict
new file mode 100644
index 0000000000..66503a3ad5
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict
@@ -0,0 +1,95 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     pimpleFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         85;
+
+deltaT          4e-3;
+
+writeControl    timeStep;
+
+writeInterval   25;
+
+purgeWrite      10;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+functions
+{
+    Q1
+    {
+        type            Q;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        outputControl   outputTime;
+    }
+    vorticity1
+    {
+        type            vorticity;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        outputControl   outputTime;
+    }
+    yPlus
+    {
+        type            yPlus;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        outputControl   outputTime;
+    }
+    fieldAverage1
+    {
+        type            fieldAverage;
+        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        outputControl   outputTime;
+        timeStart       8.5;
+
+        fields
+        (
+            U
+            {
+                mean        on;
+                prime2Mean  on;
+                base        time;
+            }
+
+            p
+            {
+                mean        on;
+                prime2Mean  on;
+                base        time;
+            }
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/decomposeParDict
new file mode 100644
index 0000000000..0a7cc129c1
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/decomposeParDict
@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    note        "mesh decomposition control dictionary";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  8;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (4 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSchemes b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSchemes
new file mode 100644
index 0000000000..11697433ce
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSchemes
@@ -0,0 +1,61 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         backward;
+}
+
+gradSchemes
+{
+    default         leastSquares;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss linear;
+    div(phi,k)      Gauss limitedLinear 0.1;
+    div(phi,B)      Gauss limitedLinear 0.1;
+    div(B)          Gauss linear;
+    div(phi,nuTilda) Gauss limitedLinear 0.1;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p               ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSolution b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSolution
new file mode 100644
index 0000000000..89a963a457
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSolution
@@ -0,0 +1,67 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          GAMG;
+        tolerance       0;
+        relTol          0.01;
+        smoother        DICGaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        $p;
+        smoother        DICGaussSeidel;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    "(U|k)"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-05;
+        relTol          0.1;
+        minIter         1;
+    }
+
+    "(U|k)Final"
+    {
+        $U;
+        tolerance       1e-06;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors 3;
+    nCorrectors     1;
+    nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
index c82525b2f1..05b7969601 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication transformPoints -scale '(1.6666 1 1)'
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
index a651bf5d0e..fe3da42bf4 100755
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
index 15e3932e9e..6c45de5d87 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
@@ -31,7 +31,7 @@ then
     cloneParallelCase motorBike motorBikeLES
 
     # Do the LES case
-    cp lesFiles/Allrun motorBikeLES/
+    \cp lesFiles/Allrun motorBikeLES/
     (cd motorBikeLES && foamRunTutorials)
 fi
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
index be0ad68bf8..eb23f3566e 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
@@ -4,12 +4,13 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set-up the LES case
-cp ../lesFiles/fvS* ../lesFiles/controlDict system/
-cp ../lesFiles/turbulenceProperties constant/
+\cp ../lesFiles/fvS* ../lesFiles/controlDict system/
+\cp ../lesFiles/turbulenceProperties constant/
 
-ls -d processor* | xargs -I {} rm -rf ./{}/0 $1
-ls -d processor* | xargs -I {} mv ./{}/500 ./{}/0 $1
-ls -d processor* | xargs -I {} rm -rf ./{}/0/uniform $1
+# $1 for special test cases?
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0 $1
+\ls -d processor* | xargs -I {} \mv ./{}/500 ./{}/0 $1
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0/uniform $1
 
 runParallel pisoFoam
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
index 3aa5f32e81..9d825fda18 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
@@ -5,26 +5,27 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy motorbike surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 
 # Make dummy 0 directory
 mkdir 0
 
 runApplication blockMesh
-# cp system/decomposeParDict.hierarchical system/decomposeParDict
+# \cp system/decomposeParDict.hierarchical system/decomposeParDict
 runApplication decomposePar -decomposeParDict system/decomposeParDict.hierarchical
 
-# cp system/decomposeParDict.ptscotch system/decomposeParDict
+# \cp system/decomposeParDict.ptscotch system/decomposeParDict
 runParallel snappyHexMesh -decomposeParDict system/decomposeParDict.ptscotch -profiling -overwrite -parallel
 
 find . -type f -iname "*level*" -exec rm {} \;
 
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0 $1
+#- set the initial fields
+# $1 for special test cases?
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0 $1
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0 $1
 
 runParallel renumberMesh -overwrite
-
 runParallel potentialFoam -initialiseUBCs
-
-runParallel `getApplication`
+runParallel $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun
index 6b3f573025..45b119cf09 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun
@@ -7,5 +7,5 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-runApplication `getApplication`
+runApplication $(getApplication)
 
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun
index f3df037202..dbc0b12711 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
index 2718173247..89647850f5 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
index 85523c3f63..021754896d 100755
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 ./makeMesh
 runApplication $application
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 39b3f3785b..7400dfe8c1 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy motorbike surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 runApplication surfaceFeatureExtract
 
 runApplication blockMesh
@@ -13,12 +13,12 @@ runApplication blockMesh
 runApplication decomposePar
 runParallel snappyHexMesh -overwrite
 
-#- For non-parallel running
-#cp -r 0.org 0 > /dev/null 2>&1
+#- For non-parallel running: - set the initial fields
+# restore0Dir
 
-#- For parallel running
-ls -d processor* | xargs -I {} rm -rf ./{}/0
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
+#- For parallel running: set the initial fields
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
 
 runParallel patchSummary
 runParallel potentialFoam
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
index 8d9f834d23..17041f20bc 100755
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
@@ -5,12 +5,13 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication topoSet
 runApplication refineHexMesh c0 -overwrite
-cp -r 0.org 0
+
+restore0Dir
 
 #runApplication $application
 runApplication decomposePar -cellDist
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
index c8ff7fbe9d..1726168131 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
@@ -16,10 +16,12 @@ runParallel snappyHexMesh -overwrite
 
 find . -type f -iname "*level*" -exec rm {} \;
 
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
+# - set the initial fields
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
 
 runParallel topoSet
-runParallel `getApplication`
+runParallel $(getApplication)
 
 runApplication reconstructParMesh -constant
 runApplication reconstructPar
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
index b11e5980cf..1d01582b28 100755
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 # create mesh
 runApplication blockMesh
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
index 7e66459137..85527724bf 100755
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
@@ -4,11 +4,17 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cd hopperInitialState
-cleanCase
+(
+    cd hopperInitialState || exit 1
 
-cd ../hopperEmptying
-cleanCase
-rm -rf 0
+    cleanCase
+)
+
+(
+    cd hopperEmptying || exit 1
+
+    cleanCase
+    rm -rf 0
+)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
index 6a0667ccb8..2beb0f0355 100755
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
@@ -4,20 +4,24 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cd hopperInitialState
-runApplication blockMesh
-runApplication decomposePar
-runParallel `getApplication`
-runApplication reconstructPar -latestTime
-cd ..
+(
+    cd hopperInitialState || exit 1
 
-cd hopperEmptying
-rm -rf 0
-cp -r 0.org 0
-runApplication blockMesh
-runApplication mapFields ../hopperInitialState -sourceTime latestTime
-runApplication decomposePar
-runParallel `getApplication`
-runApplication reconstructPar
+    runApplication blockMesh
+    runApplication decomposePar
+    runParallel $(getApplication)
+    runApplication reconstructPar -latestTime
+)
+
+(
+    cd hopperEmptying || exit 1
+
+    restore0Dir
+    runApplication blockMesh
+    runApplication mapFields ../hopperInitialState -sourceTime latestTime
+    runApplication decomposePar
+    runParallel $(getApplication)
+    runApplication reconstructPar
+)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun
index 3e58a9551e..ebb4bc401c 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
index ae65df0e25..e4d467e68e 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
@@ -1,7 +1,7 @@
 #!/bin/sh
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -rf 0.org 0
+restore0Dir
 runApplication blockMesh
 
 #runApplication setSet -batch wallFilmRegion.setSet
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun
index 61f03edcaf..fa03916aba 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
index 29817ff80b..7779179a35 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication -s wallFilmRegion decomposePar -region wallFilmRegion
 runApplication -s primaryRegion  decomposePar
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
index 784b007b2c..ab63cbf9b3 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -rf 0.org 0
+restore0Dir
 
 # create the underlying block mesh
 runApplication blockMesh
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun
index 3e58a9551e..ebb4bc401c 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
index d00e6b23ff..c82f75cd2d 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
@@ -1,7 +1,7 @@
 #!/bin/sh
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -rf 0.org 0
+restore0Dir
 
 runApplication blockMesh
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun
index 3e58a9551e..ebb4bc401c 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
index 512715678f..9292f83031 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
@@ -1,7 +1,7 @@
 #!/bin/sh
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -rf 0.org 0
+restore0Dir
 
 runApplication blockMesh
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
index a298a17347..0949f3df04 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
@@ -6,13 +6,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-# remove 0 directory
-rm -rf 0
+# remove 0 directory and post-processing directories
+\rm -rf 0 postProcessing
 
-# remove post-processing directory
-rm -rf postProcessing
-
-# copy 0.org to 0
-cp -r 0.org 0
+# restore 0/ directory from 0.org/
+\cp -r 0.org 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
index 5163ff42ca..268fd14d4d 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 # create mesh
 runApplication blockMesh
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
index 35dc16c075..58c87fca19 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
@@ -7,14 +7,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 # create mesh
 runApplication blockMesh
 
-cp -r 0.org 0
+restore0Dir
 
 # initialise with potentialFoam solution
 runApplication potentialFoam
 
-rm -f 0/phi
+\rm -f 0/phi
 
 # run the solver
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
index d0a367501d..f82a26ecb6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
@@ -33,12 +33,14 @@ boundaryField
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.00379;
+        rhoInlet        1.22;
         value           uniform (0 14.68 0);
     }
     inletSides
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.00832;
+        rhoInlet        1.22;
         value           uniform (0 17.79 0);
     }
     outlet
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun
index 35dc16c075..58c87fca19 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun
@@ -7,14 +7,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 # create mesh
 runApplication blockMesh
 
-cp -r 0.org 0
+restore0Dir
 
 # initialise with potentialFoam solution
 runApplication potentialFoam
 
-rm -f 0/phi
+\rm -f 0/phi
 
 # run the solver
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
index f3fc6b9244..2a88549d7e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
@@ -59,6 +59,12 @@ solvers
         relTol          0.1;
         maxIter         20;
     }
+
+    Phi
+    {
+        $p;
+    }
+
 }
 
 PIMPLE
@@ -76,5 +82,9 @@ PIMPLE
     maxDeltaT       1;
 }
 
+potentialFlow
+{
+    nNonOrthogonalCorrectors 3;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
index fa0d0929d9..dae58cf5bc 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
@@ -5,10 +5,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 # remove old time and post-processing directories
-rm -rf 0 *[1-9]* processor* postProcessing
+\rm -rf 0 *[1-9]* processor* postProcessing
 
-# copy 0.org to 0
-cp -r 0.org 0
+# restore 0/ directory from 0.org/
+\cp -r 0.org 0
 
 cleanCase
 
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
index 94c17f61f5..a4698df1e2 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
@@ -4,15 +4,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-rm -rf 0
-cp -rf 0.org 0
+restore0Dir
 
 runApplication blockMesh
 
 runApplication potentialFoam
 
 # remove incompatible (volumetric) flux field
-rm -f 0/phi
+\rm -f 0/phi 2>/dev/null
 
 runApplication $(getApplication)
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
index 6d2f719787..5041d32a55 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
@@ -18,7 +18,7 @@ runApplication mergeOrSplitBaffles -split -overwrite
 runApplication createPatch -overwrite
 
 # Copy fields after meshing to avoind the generation of unnecessary patch fields
-\cp -r 0.org 0
+restore0Dir
 
 # Initialize alpha
 runApplication setFields
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
index 8ab7ec8251..266fee9c0b 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
@@ -4,8 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp system/controlDict.rhoCentralFoam system/controlDict
-cp -r 0.org 0
+\cp system/controlDict.rhoCentralFoam system/controlDict
+restore0Dir
 
 runApplication decomposePar
 runParallel rhoCentralFoam
diff --git a/tutorials/mesh/parallel/filter/Allrun b/tutorials/mesh/parallel/filter/Allrun
index 9dabedb155..e1c37c3dd1 100755
--- a/tutorials/mesh/parallel/filter/Allrun
+++ b/tutorials/mesh/parallel/filter/Allrun
@@ -10,7 +10,7 @@ application=$(getApplication)
 runApplication blockMesh
 
 # Copy 0.org to 0
-cp -r 0.org 0
+restore0Dir
 
 # Create sets
 runApplication topoSet
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
index deec9791ea..188dbba1cd 100755
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
@@ -6,14 +6,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 # create the underlying block mesh
 m4 system/pachuka.m4 > system/blockMeshDict
 
 runApplication blockMesh
 
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 # create faceSet for burner inlet and faceZone for coupled wall
 runApplication topoSet
@@ -28,9 +28,9 @@ runApplication setFields
 decomposePar > log.decomposePar 2>&1
 
 # Run
-runParallel `getApplication`
+runParallel $(getApplication)
 
 # Reconstruct case
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
\ No newline at end of file
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
index d0b7026c3a..6ed1c6ba9b 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 refineMeshByCellSet()
 {
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
index fb55f327c6..e020b8a0fc 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 refineMeshByCellSet()
 {
@@ -25,7 +25,7 @@ refineMeshByCellSet()
    done
 }
 
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 refineMeshByCellSet 1 2 3
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 4f68fa57c2..746320a279 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 refineMeshByCellSet()
 {
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
index d527e2ed86..41332c6843 100755
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
index 5040c29590..fd07af1d46 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-cp -r 0.org 0
+restore0Dir
 runApplication setFields
 runApplication $(getApplication)
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
index 4e091494f6..6c6dafdea4 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-cp -r 0.org 0
+restore0Dir
 runApplication setFields
 runApplication decomposePar
 runParallel $(getApplication)
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
index b275240a50..912c34cfdb 100755
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
@@ -5,10 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
-\rm -rf 0
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun
index 66c1631fd3..f5e6c61a9e 100755
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication ./makeMesh
 runApplication $application
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun b/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun
index 2718173247..89647850f5 100755
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 
diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun
index 2d455d1fbc..ebc19b3d2a 100755
--- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun
+++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun
index d527e2ed86..41332c6843 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun
@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun
index d527e2ed86..41332c6843 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun
@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun
index d527e2ed86..41332c6843 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun
@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun
index d527e2ed86..41332c6843 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun
@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
index d527e2ed86..41332c6843 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun b/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun
index f49fa8dbc4..fce37c0511 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun
@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
index 49e618ecd4..3eddb17d71 100755
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
@@ -5,10 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy DTC hull surface from resources folder
-cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/
 
 runApplication surfaceFeatureExtract
-
 runApplication blockMesh
 
 for i in 1 2 3 4 5 6
@@ -21,18 +20,11 @@ do
 done
 
 runApplication snappyHexMesh -overwrite
-
-\rm -rf 0
-\cp -r 0.org 0
-
+restore0Dir
 runApplication setFields
-
 runApplication decomposePar
-
 runParallel renumberMesh -overwrite
-
 runParallel $(getApplication)
-
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
index 0424df0e63..755d7612a4 100755
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
@@ -4,12 +4,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 runApplication blockMesh
 #runApplication setSet -batch createObstacle.setSet
 runApplication topoSet
 runApplication subsetMesh -overwrite c0 -patch walls
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
index 62915ff2cf..8753191466 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
@@ -5,12 +5,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication topoSet
 runApplication subsetMesh -overwrite c0 -patch floatingObject
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 runApplication setFields
 runApplication $application
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
index da8fc430fe..f35012c3e0 100755
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 
 ./Allrun.pre
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre
index a491c1ae2e..1f8a3f5f9f 100755
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 \rm -rf 0
 
@@ -16,8 +16,8 @@ runApplication snappyHexMesh -overwrite
 runApplication createBaffles -overwrite
 runApplication mergeOrSplitBaffles -split -overwrite
 
-# Copy fields after meshing to avoind the generation of unnecessary patch fields
-\cp -r 0.org 0
+# Copy fields after meshing to avoid the generation of unnecessary patch fields
+restore0Dir
 
 # Initialize alpha
 runApplication setFields
diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre b/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre
index 2a010de9b4..5a68a5bd0c 100755
--- a/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre
+++ b/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre
@@ -5,23 +5,27 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy motorbike surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 
 runApplication surfaceFeatureExtract
 
 runApplication blockMesh
 
+# Serial
+# ------
 #runApplication snappyHexMesh -overwrite
 #\rm -f constant/polyMesh/refinementHistory*
 # - set the initial fields
-#cp -rf 0.org 0
+# restore0Dir
 #runApplication setFields
 
+# Parallel
+# --------
 runApplication decomposePar -force
 runParallel snappyHexMesh -overwrite
-ls -d processor* | xargs -I {} rm -f ./{}/constant/polyMesh/refinementHistory
+\ls -d processor* | xargs -I {} rm -f ./{}/constant/polyMesh/refinementHistory
 
 # - set the initial fields
-ls -d processor* | xargs -I {} rm -rf ./{}/0
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
 runParallel setFields
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
index 9a17d2d525..2bed23d97f 100755
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
@@ -4,10 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication $application
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
index 125f1aa53b..1e016f651a 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
@@ -34,12 +34,12 @@ cloneCase damBreak damBreakFine
 
     # Modify case
     setDamBreakFine
-    cp ../damBreak/0/alpha.water.org 0/alpha.water
+    \cp ../damBreak/0/alpha.water.org 0/alpha.water
     # And execute
     runApplication blockMesh
     runApplication setFields
     runApplication decomposePar
-    runParallel `getApplication`
+    runParallel $(getApplication)
     runApplication reconstructPar
 )
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
index 901c358b37..f1696e1017 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
index 0df95afd2e..b18d70e448 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
index c0a3a7154e..6f9ee4e232 100755
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
@@ -4,10 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication ./makeMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication $application
 
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index 5b0b162e78..f56f378d9f 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
index 49e618ecd4..99249befa7 100755
--- a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
@@ -22,8 +22,7 @@ done
 
 runApplication snappyHexMesh -overwrite
 
-\rm -rf 0
-\cp -r 0.org 0
+restore0Dir
 
 runApplication setFields
 
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/Allrun b/tutorials/multiphase/interFoam/ras/angledDuct/Allrun
index 8b610fff80..4f55fd7efa 100755
--- a/tutorials/multiphase/interFoam/ras/angledDuct/Allrun
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/Allrun
@@ -7,4 +7,4 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-runApplication `getApplication`
+runApplication $(getApplication)
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
index 125f1aa53b..1e016f651a 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
@@ -34,12 +34,12 @@ cloneCase damBreak damBreakFine
 
     # Modify case
     setDamBreakFine
-    cp ../damBreak/0/alpha.water.org 0/alpha.water
+    \cp ../damBreak/0/alpha.water.org 0/alpha.water
     # And execute
     runApplication blockMesh
     runApplication setFields
     runApplication decomposePar
-    runParallel `getApplication`
+    runParallel $(getApplication)
     runApplication reconstructPar
 )
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
index 901c358b37..f1696e1017 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
+++ b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
index 0df95afd2e..b18d70e448 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
index 901c358b37..f1696e1017 100755
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
index a3c43a6c31..cdc9763e1b 100755
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh b/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh
index 2fcc7a8f5f..c941916ef1 100755
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
index eccd6c9252..a5b348b069 100755
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 ./Allmesh
 
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
index 95936e3073..04c76caa4a 100755
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
@@ -3,12 +3,12 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 
 runApplication blockMesh
 
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 runApplication setFields
 
-runApplication `getApplication`
+runApplication $(getApplication)
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
index 9ce3033132..71f00053f9 100755
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
@@ -9,6 +9,6 @@ cp 0/alpha.air.org 0/alpha.air
 cp 0/alpha.other.org 0/alpha.other
 cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
index 1d24256eb0..3f7cab5d82 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
@@ -8,6 +8,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication decomposePar
 
-runParallel `getApplication`
+runParallel $(getApplication)
 
 runApplication reconstructPar
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
index 40f5f5f1d4..0fb9f45467 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
@@ -5,17 +5,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy propeller surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
 
 
 # - meshing
 
 runApplication blockMesh
-
 runApplication surfaceFeatureExtract
-
 runApplication snappyHexMesh -overwrite
-
 runApplication renumberMesh -overwrite
 
 # force removal of fields generated by snappy
@@ -27,7 +24,6 @@ runApplication renumberMesh -overwrite
 #runApplication setSet -batch createInletOutletSets.setSet
 runApplication topoSet -dict system/createInletOutletSets.topoSetDict
 
-
 # - create the inlet/outlet and AMI patches
 
 runApplication createPatch -overwrite
@@ -39,4 +35,4 @@ runApplication createPatch -overwrite
 
 # - apply the initial fields
 
-cp -rf 0.org 0
+restore0Dir
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
index dc60517665..4f35a71a26 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
@@ -13,12 +13,12 @@ runApplication blockMesh
 # Generate the snappy mesh
 runApplication snappyHexMesh -overwrite
 
-cp -r 0.org 0
+restore0Dir
 
 # Initialise with potentialFoam solution
 runApplication potentialFoam -pName p_rgh
 
 # Run the solver
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
index b275240a50..912c34cfdb 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
@@ -5,10 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
-\rm -rf 0
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
index 6103dad628..a0ed70da03 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
@@ -5,10 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
-\rm -rf 0
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
index 66c1631fd3..f5e6c61a9e 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication ./makeMesh
 runApplication $application
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
index d7ecd3dbdc..f8ec2f0689 100755
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
@@ -4,12 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 ./makeMesh
 
-rm -rf 0
-cp -r 0.org 0
+restore0Dir
 runApplication setFields
 
 #runApplication $application
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
index b275240a50..912c34cfdb 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
@@ -5,10 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
-\rm -rf 0
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
index b92d6cc19a..a0ed70da03 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
@@ -5,9 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
index 66c1631fd3..f5e6c61a9e 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication ./makeMesh
 runApplication $application
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
index 4358c30059..c2b53fdc45 100755
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
@@ -18,7 +18,7 @@ runApplication -s selectBottom \
 
 runApplication createPatch -overwrite
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 
 runApplication $application
 
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
index 6514e8598b..7f340efedb 100755
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
@@ -5,12 +5,13 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication topoSet
 runApplication subsetMesh -overwrite c0 -patch floatingObject
-cp -r 0.org 0 > /dev/null 2>&1
+
+restore0Dir
 
 runApplication $application
 
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
index 66c1631fd3..f5e6c61a9e 100755
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication ./makeMesh
 runApplication $application
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
index 66c1631fd3..f5e6c61a9e 100755
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication ./makeMesh
 runApplication $application
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
index b275240a50..912c34cfdb 100755
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
@@ -5,10 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
-\rm -rf 0
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
index 66c1631fd3..f5e6c61a9e 100755
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication ./makeMesh
 runApplication $application