diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
index e1b59064be1f0076f7a8d84e477c57e8b826a75b..4a5154440331e09772133fb77c00b1ad24bd9e86 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      binary;
     class       volVectorField;
-    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
index 6c2675d32b40276ad3469e81d2d869e281d70ea2..2ac162c2cc382f58eeb5d6ae9fd2253d7e1de947 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
@@ -47,4 +47,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
index 312f6b33855d2ea544dab458c4aedf8129f6b122..2994899c94754956a8a0ff73cdcbaf80f414c61d 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -100,25 +99,7 @@ subModels
     {
         patches
         (
-            top
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            bottom
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            walls
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            frontAndBack
+            "(top|bottom|walls|frontAndBack)"
             {
                 type rebound;
                 e    0.97;
@@ -127,15 +108,6 @@ subModels
         );
     }
 
-    StandardWallInteractionCoeffs
-    {
-        type rebound;
-        e    0.97;
-        mu   0.09;
-    }
-
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -176,8 +148,6 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
 
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
index 0aa475ea13376ccd61a0784ed68a051e09ad141a..6c483888ab44fc726c159f24b7953d7d3a0b8876 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1e-05;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
index 301493ec3d7b59d5917934c35be4c2f637ff816b..809ab215a40be931b2fb45aca4af9d92300ac937 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
index d955f4f7ec7625360cb497fb20dccbb692fba23b..d9d2fe776ce9a17c708be14739929081accec55c 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 6 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
index f2f3fdc7c5237e83cca35a3872951a10f5ce288f..bc10be5baef2058cac13226a30a4b62f8c86e2ff 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,9 +59,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict
deleted file mode 100644
index 0064b83046abfb1ecf4700344fca239b3f1f114c..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2012                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      mapFieldsDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// List of pairs of source/target patches for mapping
-patchMap
-(
-);
-
-// List of target patches cutting the source domain (these need to be
-// handled specially e.g. interpolated from internal values)
-cuttingPatches
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air b/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air
index 063fd73c86d58326993f4b81ac6944d44faf8c5a..ba5c92ff735d4b2e28c99e8d6f9641336a63b8a1 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U;
 }
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties
index dc05ae241557205d356903450f8eb37a2c726b39..84943487564e4563e5ac4f1d620db1a82b15bbc4 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties
@@ -90,19 +90,7 @@ subModels
     {
         patches
         (
-            sides
-            {
-                type rebound;
-                e    1;
-                mu   0.09;
-            }
-            top
-            {
-                type rebound;
-                e    1;
-                mu   0.09;
-            }
-            bottom
+            "(sides|top|bottom)"
             {
                 type rebound;
                 e    1;
@@ -111,8 +99,6 @@ subModels
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel implicit;
@@ -175,11 +161,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/T b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/T
deleted file mode 100644
index 01917695dccc6c046fb308285049168dab4e3990..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/T
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2012                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 1 0 0 0];
-
-internalField   uniform 350;
-
-boundaryField
-{
-    AMI1a
-    {
-        type            cyclicAMI;
-        value           $internalField;
-    }
-
-    AMI1b
-    {
-        type            cyclicAMI;
-        value           $internalField;
-    }
-
-    ".*"
-    {
-        type            zeroGradient;
-        value           $internalField;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties
index 18c6ad5b51bee40e2cbf2172776d4a15e13fc30d..0ab51355c9538913e6ca34dc57c4dc089b6ce690 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -76,14 +76,14 @@ subModels
             parcelsPerSecond  20000;
 
             sizeDistribution
-	    {
-	        type uniform;
+            {
+                type uniform;
                 uniformDistribution
                 {
                     minValue        5e-03;
                     maxValue        5e-03;
                 }
-	    }
+            }
 
             flowRateProfile constant 1;
             massTotal       2000000;
@@ -94,14 +94,8 @@ subModels
 
     dispersionModel none;
 
-    patchInteractionModel none;
-
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
-    collisionModel none;
-
     patchInteractionModel standardWallInteraction;
 
     standardWallInteractionCoeffs
@@ -158,11 +152,8 @@ subModels
             e 0.8;
         }
     }
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
index e1b59064be1f0076f7a8d84e477c57e8b826a75b..9226f1e7b6ad9d638a988dce24e10db202cda031 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
-    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
index e6529ef584cc24cd0f6033891bd618dc9f788506..406763a269567dfd577169d4880a20a792b36fda 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
index ebc62289ef232967511f88d27bcc8827e50c18f1..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 -9.81);
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
index 0256c6a610e36bd66297425183e44c6bb2ac27a6..46acb5ed19b8bb885b0449b6c315be8d5b51dbb5 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -94,25 +93,7 @@ subModels
     {
         patches
         (
-            top
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            bottom
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            walls
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            frontAndBack
+            "(top|bottom|walls|frontAndBack)"
             {
                 type rebound;
                 e    0.97;
@@ -121,8 +102,6 @@ subModels
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel explicit;
@@ -185,11 +164,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
index 7d906834f4e7ca44480694359aa9b4feaff94e9c..5a193362abbaf6c6d8c857cf8c77b416191911cc 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1.568e-05;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
index eee423a5109cf8a0781db2e9432bb5af796df8bf..b5abe538d06166501645a4bea980203f5741efba 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
index 9e7eafb19ac9805c59da9a38dfe483b19cc5e7dc..b50146547174bf363ed70d85259ad7a2e75732a6 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 5 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
index e256f146ce65e745476676fd455ac929f81543eb..e3fda5a02a504a92865e2b4fcb3a2463294cec4f 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
@@ -16,7 +16,7 @@ FoamFile
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
index c89b4f2aa8f45d4467969d52b59cdea14579cb43..d2750639d64836f278231f82785c6dcd85a41cb1 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,9 +67,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/column/0/U.air b/tutorials/lagrangian/MPPICFoam/column/0/U.air
index 7fc4d5545cbb1fc4cdaadc94c1b6653ba7cbfc16..ba5c92ff735d4b2e28c99e8d6f9641336a63b8a1 100644
--- a/tutorials/lagrangian/MPPICFoam/column/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/column/0/U.air
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -37,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/column/0/p b/tutorials/lagrangian/MPPICFoam/column/0/p
index 743d647292d65be6340d5f2baedd1b11bacfbcf6..d10f31f194e4ba08ba3c5a33b2f0ebd5b71a9636 100644
--- a/tutorials/lagrangian/MPPICFoam/column/0/p
+++ b/tutorials/lagrangian/MPPICFoam/column/0/p
@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/g b/tutorials/lagrangian/MPPICFoam/column/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
index bbe028997997667bf095bdcf09f5635729e761b7..16acfb70f47e247930f5f332d0cf540705f6e98a 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,7 +58,6 @@ subModels
         {
             alphac alpha.air;
         }
-        //gravity;
     }
 
     injectionModels
@@ -92,19 +90,7 @@ subModels
     {
         patches
         (
-            sides
-            {
-                type rebound;
-                e    1;
-                mu   0;
-            }
-            top
-            {
-                type rebound;
-                e    1;
-                mu   0;
-            }
-            bottom
+            "(sides|top|bottom)"
             {
                 type rebound;
                 e    1;
@@ -113,8 +99,6 @@ subModels
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel implicit;
@@ -177,11 +161,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
index 0aa475ea13376ccd61a0784ed68a051e09ad141a..6c483888ab44fc726c159f24b7953d7d3a0b8876 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1e-05;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/controlDict b/tutorials/lagrangian/MPPICFoam/column/system/controlDict
index c892342030951c77b1ab04e92fbf191b14a467fb..b8024c1c6fd1c7d72c9d5591e1aa3a2cae0da6cc 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/column/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
index 56cfbbd624015ee31ab7621d10af765f792d9719..11e09f246b68277861d70565407cdc89137143ff 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
@@ -16,12 +16,12 @@ FoamFile
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 d2dt2Schemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
index 604eaa94c2fe39b8525d132539372bfe72b4b964..598de5b53acd2ba69ff4f85f7c72a916a22a0ad5 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,9 +65,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air
similarity index 96%
rename from tutorials/lagrangian/MPPICFoam/cyclone/0/U.air
rename to tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air
index 0391b3bd3c0ef7f8aadcfd51d8df3d59a6833954..420651a6b6144d5e9af54e58c5dfcd8741f07a65 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
-    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/k.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air
similarity index 93%
rename from tutorials/lagrangian/MPPICFoam/cyclone/0/k.air
rename to tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air
index 210811899e30fdde6bcb3ba26c45e99ecd88b36d..a2a0f66192e766843455feedd62610221c313aa3 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0/k.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air
similarity index 93%
rename from tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air
rename to tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air
index 2818479ab6290e7331dc990f7b3c869fd3287384..3cf45e15882c63b7c305904cbb7e5216eff93953 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/p b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p
similarity index 100%
rename from tutorials/lagrangian/MPPICFoam/cyclone/0/p
rename to tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
index 0834bb8d4aaecdbe4d9dfc624ac14349084fa520..4afce75b5c8e2ba0162a1dbb03f904c6cd7b936b 100755
--- a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
@@ -3,8 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
 
-# rm -f constant/triSurface/cyclone.stl*
+rm -rf constant/triSurface
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
index a3fbae9767a9905a39d673a34da0f12bec88f421..29acb54d73665779003048727ecba760e1898d3c 100755
--- a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
@@ -3,7 +3,11 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-cp $FOAM_TUTORIALS/resources/geometry/cyclone.stl.gz constant/triSurface
+[ -d constant/triSurface ] || mkdir -p constant/triSurface
+
+cp -f "$FOAM_TUTORIALS"/resources/geometry/cyclone.stl.gz constant/triSurface
+
+restore0Dir
 
 runApplication blockMesh
 
@@ -11,6 +15,6 @@ runApplication snappyHexMesh -overwrite
 
 runApplication decomposePar
 
-runParallel MPPICFoam
+runParallel $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/g b/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
index ebc62289ef232967511f88d27bcc8827e50c18f1..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 -9.81);
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index ac646a7728f3067a407f8298376a034cafe02f66..88466d112fdac7540f46280f5ccf5fd4501dfe84 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -99,13 +98,7 @@ subModels
     {
         patches
         (
-            walls
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            inlet
+            "(walls|inlet)"
             {
                 type rebound;
                 e    0.97;
@@ -118,8 +111,6 @@ subModels
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel implicit;
@@ -172,11 +163,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
index 7d906834f4e7ca44480694359aa9b4feaff94e9c..5a193362abbaf6c6d8c857cf8c77b416191911cc 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1.568e-05;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README b/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README
deleted file mode 100644
index de3f29cc01268a637d915dc6d9b8fb98400e9906..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Directory to house tri-surfaces
-
-The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-directory
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
index 4a32819e8c61d8c35ef27e4e853b9431c338f38d..a5552b105d034932eb689646db09f765e823a475 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
index 2d35f315ce85e191a1e7113469676ed6a31c20c3..c1862b46c12bb1bb65d7d088e5ea49ea2e9ea353 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
index d5c24ac34d5f6e3992dcce6a0ee76e9cd2c7facd..249050a70b577af305cec65bcf214bf4d6a4c1a7 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 3);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
index 4d975cd678e0564c000728c40b72dedd2f06ada7..2ae5a4af50bb5160d468b6904002732c447b0084 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,9 +67,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
index de1304042d21c48c4e5e7e9cea370ee2a3b48f17..5324e151a1226711927fa78d6da340aaef3f95d0 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
index 51b3fe9dcd7e7871ca0ce57e81d7ffbe2b2e8a4a..6fd7865b7f6967bf18712bdafd9a5272abb09d79 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index bba5d7b224a068f32e26775b7d548242332645b3..ca96c07d2640458ab727b6b035fe0e04c153c00d 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -135,29 +134,19 @@ subModels
     {
         patches
         (
-            frontAndBack
+            "(frontAndBack|walls)"
             {
                 type rebound;
                 e    1;
                 mu   0;
             }
-
-            walls
-            {
-                type rebound;
-                e    1;
-                mu   0;
-            }
-
-            "lowerInlet|upperInlet|outlet"
+            "(lowerInlet|upperInlet|outlet)"
             {
                 type escape;
             }
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel none;
@@ -187,11 +176,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
index 0aa475ea13376ccd61a0784ed68a051e09ad141a..6c483888ab44fc726c159f24b7953d7d3a0b8876 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1e-05;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
index fc31000533da9d65672034a1f6a3706fedb7acbf..2640933aaf65603a7195ad78ae3e2b713e937f4a 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
index 27e11ffcee085d1ff0d710eb14b2af6335fb2c1b..79273c6abfc8322418bf8e45c1860233774e7e02 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
@@ -16,7 +16,7 @@ FoamFile
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes
@@ -47,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
index f665c50d4d1f7fd8e9391c56044ee9e0bb59fdfc..23b40cd4f4a9ada2dab4d2b7497964690dab6e2a 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,9 +58,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4
index 3c831e6d438ec40ee4042d9a09d1261527360040..64b060ab338232f4b10fd79a78ab21b02469a579 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CH4;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO
index 61cb17a85e3a2559eb4dddd172f08d4d85c590d8..f28a102b9fa241a83e8bb97ed7e4b55255cf07d5 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CO;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2
index 2c28b61c011bbcee6e9fdda255c37e372b4e1798..862c54d6fa3d585e1c639f1b9ac4bfc294350890 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CO2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G
index a4a9fa3b591c9b4111fd840898a344cb68bad74b..378189c7b72316c3b4d73973073bafadb8d3a8e9 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      G;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            MarshakRadiation;
         value           uniform 0;
     }
+
     bottom
     {
         type            MarshakRadiation;
         value           uniform 0;
     }
+
     walls
     {
         type            MarshakRadiation;
         value           uniform 0;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2
index 35835c94c00bc5c9f04002d2100f4bce62cac55a..41a5d065095077de3ef208b14523a7b8fa3422cc 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O
index 0d34dd15d8b4648cc0987474b4440ee202eda44f..5e1769d271a86164637aef3354618f7bffbdb3d5 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2
index 004d167f6686930c50e1466d00b257a7a27264dc..a05d5ce4e30c00c63c4a7ff5d02eb74e60e4eae3 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2
index 0e135b14ce1e85d2cb07d96af1c8c2d40d28dfde..a021df14767cd955ddbef502ef199ba2ac19f67c 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T
index cd03344d9b8b06ee785a85fc46675150d1f327ca..022f0afa594fffc55e56aacda421907f13a123d1 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U
index 0ed9e0a64931dab46176112e07a08fbd7a22ebbb..7831ef7872cc1df7bdb9a2c1b325b071fb7466c5 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,18 +24,22 @@ boundaryField
     {
         type            noSlip;
     }
+
     bottom
     {
         type            noSlip;
     }
+
     walls
     {
         type            noSlip;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat
index a425039f46c5a3c40cea3e4d2f923ea8b81b4ec2..f03279aa2ba5fef8ae67af667a1c3a19fea289e4 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     bottom
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon
index 9f9ed58ab63f5ad35d7ef9313956b3d21a65000b..e11854468457209538cf07d1e9f13959bfd886df 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            epsilonWallFunction;
         value           uniform 5390.5;
     }
+
     bottom
     {
         type            epsilonWallFunction;
         value           uniform 5390.5;
     }
+
     walls
     {
         type            epsilonWallFunction;
         value           uniform 5390.5;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k
index 0ec4bb84e50befea93cc74ac04f13de40f70e0ef..bd5d862d014753eba3dda011bda462a93ce7b53c 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            kqRWallFunction;
         value           uniform 37.5;
     }
+
     bottom
     {
         type            kqRWallFunction;
         value           uniform 37.5;
     }
+
     walls
     {
         type            kqRWallFunction;
         value           uniform 37.5;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut
index 28b0736d279d642e32520b0cbd659dc380d80f4a..36bc27b7a9248925335ecafe4b3709a0d29a3729 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     bottom
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     walls
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p
index b4830792561aa276506c235e7d93a216389fc5b0..09e3fd90067d706fbceefe64346eb4980407a103 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
index dcb1203962aa803c750ee1c133e3e47dbbc7e34f..f3bd90735514dffa735e516af20a18936d4917c2 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      boundaryRadiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ FoamFile
     absorptivity    0.0;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
index e2f997b952b5abe7f8542bd80dd3f6c8e7be4e08..1af905d0cb160654ae396013cce275cd8d1c6e7e 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
index fafb4d8705102404d00209a81cf10f10da65ed63..bd1feae58db0d99de252e22354a026c947566352 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
@@ -10,12 +10,11 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    location    "";
     class       vectorField;
     object      coalCloud1Positions;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 (
 (0.005 0.5 0.05)
 (0.010 0.5 0.05)
@@ -45,4 +44,6 @@ FoamFile
 (0.040 0.7 0.05)
 (0.045 0.7 0.05)
 )
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index ab221206024c8037fadd6218d43525510ee757e6..f6d7fd9ac4d8568e191197ce27e340c233b0bfee 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      coalCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
index 10c6f687c0a88fe05d4669c39fea27dd3dfa2820..fe796b32741708f18bcb13dd70aab7b329f7dc2c 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
index 7e267d828e87f0b55849aa73ab2a4a382b8008c1..e2a6d2e8dc41c134d292e42ff28fcf4f73628467 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      foam.dat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
index 7f357c85d2f014e22c4ac90259fbf5996f3a3e18..851c9d941a798724610b783f9ebf4631a55af1d6 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index 80daf67d764d3f155e6ac120ba557f81d67f05fb..1236cbb3b1e78d3b7bc6bae91906d7695676f3bc 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      limestoneCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
index d78d9b7fa6252b43aa1b05a81c052bc60e3dd139..38b81cb742dc45571fdad5c96da203b245460a00 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
@@ -9,11 +9,11 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    location    "";
     class       vectorField;
     object      limestonePositions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 (
 (0.0075 0.55 0.05)
 (0.0125 0.55 0.05)
@@ -34,4 +34,6 @@ FoamFile
 (0.0425 0.45 0.05)
 (0.0475 0.45 0.05)
 )
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
index 92a34d41142321024e8e7e7ac8b7847273e95d84..f846dda766ec26601b355a7ecac053ef7ec72a8b 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,4 +64,5 @@ cloudScatterCoeffs
 
 transmissivityModel none;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 02c68d6045737cc873fff82faffd06e7f02d18e4..085fb16a9ba1cb4b52a85bb21d5b8c249e91ec54 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
index ec2628ff4aa47db2ab04332fed8097e9cdf7fe31..8f39290a8c5712a0c31a1777f44d7b8daf826b52 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
index d1463af21e5d1c92eb03e359abf2dc749a422509..5e95e4963c64df2340a1e1713a4befb001558559 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,8 +54,8 @@ functions
 {
     #include "dataCloud"
     #include "vtkCloud"
-
     #include "runTimePostProcessing"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud
index ebbfa731e0d8942e291180e1ea0ee1bb79d0c3e4..0df6f6f0e847e043bec617fdc20a5770c5a072b4 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud
@@ -11,4 +11,5 @@ dataCloud
     field   d;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
index 898734ac677a1296527b34c2cc28bf4759967703..b672d302d5400cf910071c190273eafb0c16ca21 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
@@ -18,13 +18,5 @@ numberOfSubdomains 4;
 
 method          scotch;
 
-coeffs
-{
-    n           (2 2 1);
-}
-
-distributed     no;
-
-roots           ( );
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
index b8a84192852d46bd519b4c42c168f20a8f309a71..e3c9d678f9939599a3cca5a82b7a10f36210b583 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -32,7 +31,7 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
     div(phi,K)      Gauss linear;
-    div(phi,h)     Gauss upwind;
+    div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index 25028ffbd7d6baf6a724e56e5e8b3d771e743a41..49c39041de045c746906a0161527cb0f2bc6380a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,7 +82,6 @@ PIMPLE
     momentumPredictor yes;
 }
 
-
 relaxationFactors
 {
     fields
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing
index c84ecc3f226818eb29d2faaa8d0ecb2a2c73da83..ca93482176a76618b761af142f485c0b472d516a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing
@@ -115,4 +115,5 @@ postPro1
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
index 8bc24a11f97b906bc101d6b26c6f5bad27d2e03c..0f670467f319c4a279998a9ab166fbfd9921242d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U
similarity index 99%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U
rename to tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U
index 93a426d89abf7284b9e7bf2adac72a04720ce4f0..845c459bc15339f40459ff05b965475d527aad3f 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U
@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..fb1f3847301c377e02e12439ba58cbf303af3ef9
--- /dev/null
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun
index 8e142f906ceb13dca9e4a288d9ac0292ad36f33b..922b280b7c26e8aad75c1628f931bfe2d49c6ca2 100755
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun
@@ -3,6 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+restore0Dir
+
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
 
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
index 9f3d65ebab85b771e6b496826c23a1ca2b30a624..faf53e3ce6546686317453c0df8215ab588e666f 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g
index a6459975973849548b71cc992b06366b82d7a066..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g
@@ -10,13 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-
 value           (0 -9.81 0);
 
 
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
index 091e6e80ab1e7971eaa794823bfe208f67d99015..6c5bab9c1bd62706f410404a78ce653194285c93 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -100,8 +99,6 @@ subModels
         mu   0.09;
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -142,8 +139,6 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
 
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties
index b8d4c2fdb7c0094274c037d911b4b9672468ed68..3a6341dcf6230f5fd9051212d70786027c76ae91 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 transportModel  Newtonian;
 
-nu              [0 2 -1 0 0 0 0] 1e-05;
+nu              1e-05;
 
-rhoInf          [1 -3 0 0 0 0 0] 1.2;
+rhoInf          1.2;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
index 65d797fc7e588cacdf807df31651ad5d37b3bc8c..24b23b95484387da0634e1096aa6f128b74b16b7 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution
index 828f9064bad3c0182d9108b5dc44fe97e113c693..1b883c3edac86bf10e3b0ca4a1a7b69e2f488d37 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U
index 1cd979e031914143c43df00dbdab3bff64193d66..0777dca67adc0e070f890106b9e2ec6c9e0fbd36 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            noSlip;
     }
+
     frontAndBack
     {
         type            noSlip;
     }
+
     inlet
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu
index 8352ccf4bf2a8e49bc1c12c8c2d7b40326836ba8..04b9209d2b5c7d85d15f2e1976c297a438887834 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      mu;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,16 +25,19 @@ boundaryField
         type            calculated;
         value           uniform 1.2e-05;
     }
+
     frontAndBack
     {
         type            calculated;
         value           uniform 1.2e-05;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 1.2e-05;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho
index 20ac6a5d96ecd1d85f697bbb6bb3a24faa53b1c5..2ebfc7deea58263d6bdba4449da25676bf974680 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      rho;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,16 +25,19 @@ boundaryField
         type            calculated;
         value           uniform 1.2;
     }
+
     frontAndBack
     {
         type            calculated;
         value           uniform 1.2;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 1.2;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
index aa38b4f483e916f67e88939974e2af4440c50063..bc90d5e8660e270c3c679fdfe8bb8b0a59cc46b2 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
index 83c9470df8de430049564c4d7b920a8cc0fee507..e0a2a9585a64a8d217c3df40e7fc72144e5fb3f8 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,4 +20,5 @@ transportModel  Newtonian;
 
 nu              1e-05;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
index 7ca87208402e6d63a265d71abfda3635b36003ce..ce702251fa1f2f6d23c75d5be1a8142784d26c49 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
@@ -36,7 +36,6 @@ vertices
     (0 500 0)
 );
 
-
 blocks
 (
     hex (8 13 14 15 0 5 6 7) (24 50 1) simpleGrading (1 1 1)
@@ -94,7 +93,6 @@ boundary
             (3 2 10 11)
         );
     }
-
 );
 
 
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
index 65e1838ca5e03c538bfa595310a3fbbef3e54d7e..a5da92d85c9558b1227fe98b014d6a466ad339de 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
index 071e85c9f1236e61a67e27315ee3919627790e84..c4ba64fdf23f0e98e7c693352047eea1595e202f 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
@@ -24,9 +24,4 @@ coeffs
 }
 
 
-distributed     no;
-
-roots           ( );
-
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
index f447db580224e563137a399813cf43cc9352ca3f..d9124696f2ceb05cab79e7eddf4356f08474172a 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,4 +39,5 @@ interpolationSchemes
     default         linear;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
index 878c84cc9f71742d10ac2d8af0ac352900992ce4..8522ada14a8c8f4ee11b9e2d6c9956076134043e 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
@@ -10,13 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvers
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
index 0064b83046abfb1ecf4700344fca239b3f1f114c..1eb64d6bd5a5b3a5b0af5969afac331a63ab83ef 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      mapFieldsDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // List of pairs of source/target patches for mapping
@@ -26,4 +25,5 @@ cuttingPatches
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
index de61e007f69aad707654949811b2811dccfeb663..82a28a446c6dced701c10761da3b8ec6996b7017 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
@@ -25,14 +25,17 @@ boundaryField
         type            zeroGradient;
         value           uniform (0 0 0);
     }
+
     walls
     {
         type            noSlip;
     }
+
     frontAndBack
     {
         type            noSlip;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
index 39ecfaa5a29fb4bd8f1a079db48eae43eed5796a..e03cfe23846adde16dcfc2c6bf55d4e2e2e375cb 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 (
 (0.01 0.299 0.0032)
 (0.01 0.305 0.0032)
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
index a789eb9bc6ec24080f801b419202fec66236666a..7fc40c7d3d631adad85b4d7641241cc9310c2797 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -130,7 +129,6 @@ subModels
     }
 }
 
-
 cloudFunctions
 {}
 
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
index 83c9470df8de430049564c4d7b920a8cc0fee507..e0a2a9585a64a8d217c3df40e7fc72144e5fb3f8 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,4 +20,5 @@ transportModel  Newtonian;
 
 nu              1e-05;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
index 4aef9e86deaaf9220bdbaa036f09fe7c1032bf35..d6f8dfaef178c376c48926fc2a90fd444797c100 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
@@ -32,7 +32,6 @@ vertices
     (0 500 0)
 );
 
-
 blocks
 (
     hex (6 9 10 11 0 3 4 5 ) (20 40 1) simpleGrading (1 1 1)
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
index 3e6261a4246627258ed5eba6a1cf1e0e8abb4eb2..92120897d8bf49c8e002aceafe67d8ee4ba63494 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
index 453dfa71dde50fa93089b6e61081d818a6704f7c..c4ba64fdf23f0e98e7c693352047eea1595e202f 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
@@ -23,9 +23,5 @@ coeffs
     n           (4 1 1);
 }
 
-distributed     no;
-
-roots           ( );
-
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
index f447db580224e563137a399813cf43cc9352ca3f..d9124696f2ceb05cab79e7eddf4356f08474172a 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,4 +39,5 @@ interpolationSchemes
     default         linear;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
index 878c84cc9f71742d10ac2d8af0ac352900992ce4..8522ada14a8c8f4ee11b9e2d6c9956076134043e 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
@@ -10,13 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvers
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2 b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2
index c7fa20fff1a58f985fdd8f2de71eb6cd96ef410f..3499c75b5c08428982d0b44ae381f14811b2a553 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,12 +24,14 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         value           uniform 0.8;
         inletValue      uniform 0.8;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2 b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2
index c4576bdc3461df3adaed466796fa25d567ee2125..c9e0ca6bf442e63203b8a51dda9aa688b018e948 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,12 +24,14 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0.2;
         value           uniform 0.2;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T
index 6218aeb73e47dca725774c8fc8c0a8b267a702bd..8f7eba01c63ec59e69718ed5076283c423c92425 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,11 +24,13 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 900.0;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U
index bf31d0843d795a9edf7a7a4ccd5f62b66d6d72b0..961060bf2381d59d05b1ffbc6085fd0e1c66f03e 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U
@@ -10,14 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -1 0 0 0 0];
 
-
 internalField   uniform (2.0 0 0);
 
 boundaryField
@@ -27,11 +25,13 @@ boundaryField
         type            fixedValue;
         value           uniform (2.0 0 0);
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
         value            $internalField;
     }
+
     walls
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat
index 385150dcfe6786026f73db89cce5c5f07c476e2d..c8af26c02d5f1507b0739646ba7af090e80947a2 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            compressible::alphatWallFunction;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k
index 8e63a0e0575387b831bb692e1123d0f7f8adbe23..09911ae162a7a68d95ff7a9fdc4762e2baa5fa7a 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,11 +26,13 @@ boundaryField
         intensity       0.16;
         value           uniform 3.75e-9;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 3.75e-9;
     }
+
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut
index 453885241e797eb95c8df38346e32767b93c5eb5..298eb0e201e30ee541d94905a55715a62dc30cc3 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,17 +20,18 @@ internalField   uniform 0;
 
 boundaryField
 {
-
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega
index ee542305cce1c653acd311427e117e42ba11408d..8ae534241dc119ea896fb3357f010a2286c19737 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,7 +20,6 @@ internalField   uniform 4.5e-3;
 
 boundaryField
 {
-
     inlet
     {
         type            turbulentMixingLengthFrequencyInlet;
@@ -29,11 +27,13 @@ boundaryField
         k               k;
         value           uniform 4.5e-3;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 4.5e-3;
     }
+
     walls
     {
         type            omegaWallFunction;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p
index a73adab29648a67ad03dbff27902d796807ab962..74c201f3e4a446fc6a86bde71cc1ba374e1cc44f 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,17 +20,18 @@ internalField   uniform 1e5;
 
 boundaryField
 {
-
     inlet
     {
         type            calculated;
         value           $internalField;
     }
+
     outlet
     {
         type            calculated;
         value           $internalField;
     }
+
     walls
     {
         type            calculated;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh
index 17a2f17439e05272295b2ce2d54ce3f3b85efef3..034261749690d3e13097eaccd635bc084fca68e4 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,11 +24,13 @@ boundaryField
     {
         type            fixedFluxPressure;
     }
+
     outlet
     {
         type            totalPressure;
         p0              $internalField;
     }
+
     walls
     {
         type            fixedFluxPressure;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties
index 5b8fe1d3c1dc261c036ad233f304bd3142c43d0b..3dd86a9117c6a86c83ceaf4bdced9a1fb64c5fec 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties
index bcafaf4d7eacc9f7c3e96e6a140ae2d695b5b35d..1d66061fb5d1279f3e1770807816da2269d90a07 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat
index 51764b9de39d2331a79f79dee2b8cf64fda86eac..c83b00c2b67f6db54d276c2eab62db1f41f57fc0 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      foam.dat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict
index f44256b73e0aa9a03e7cb430d24fb02a78a5ffda..643f64dbdf5f9796f7e7141be5482b5976c17003 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      particleTrackDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties
index 276d33e98d41d0a02b57bed162eca573d14ef0e0..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,4 +18,5 @@ radiation       off;
 
 radiationModel  none;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties
index 337e7b8784e7f9aec109530ceda243e860c2bac2..58d866177b747119f935408fad0adbbdfb892919 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,7 +23,6 @@ solution
     maxCo           0.3;
     cellValueSourceCorrection off;
 
-
     sourceTerms
     {
         resetOnStartup  false;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties
index decaeb4f7c30467946f3a736cd54a6f20f7edc5f..4cf3e9f5cac58b4dce09711b90b316aac3f5bfa2 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,5 +68,4 @@ solids
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties
index f26a920baafdbbdc549c2617939f57ca75a58056..d2f17dbdb0754d16c9c8b1373542e538c452bec5 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties
@@ -18,7 +18,7 @@ simulationType  RAS;
 
 RAS
 {
-    RASModel            kOmegaSST; // kEpsilon;
+    RASModel            kOmegaSST;
 
     turbulence          on;
 
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict
index bae8e49391d73d09bb5fa22e0ca2a1f1ed168362..49c9c529fb1d421a2393a4d204fe2be4c5b03b68 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict
@@ -9,7 +9,6 @@ FoamFile
 {
     version         2.0;
     format          ascii;
-    note            "Created Wed Jul  1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
     class           dictionary;
     object          blockMeshDict;
 }
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict
index 142fadfbedf60860600ac8ea743c6ae9b09207f8..1245227d2a59df1ac258429952e9e1ead15f48b2 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict
@@ -10,10 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 DebugSwitches
 {
     MUCSheterogeneousRate   0;
@@ -55,8 +55,5 @@ maxCo           1;
 
 maxDeltaT       0.03;
 
-functions
-{}
-
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict
index 898734ac677a1296527b34c2cc28bf4759967703..b672d302d5400cf910071c190273eafb0c16ca21 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict
@@ -18,13 +18,5 @@ numberOfSubdomains 4;
 
 method          scotch;
 
-coeffs
-{
-    n           (2 2 1);
-}
-
-distributed     no;
-
-roots           ( );
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes
index 2e39b11ce57f90afa5703c4786cf898c87c3066d..1b6a7af6f1be45e8856eec1d5cd77db841c9d405 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,9 +30,9 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
     div(phi,K)      Gauss linear;
-    div(phi,h)       Gauss upwind;
-    div(phi,k)       Gauss upwind;
-    div(phi,epsilon)  Gauss upwind;
+    div(phi,h)      Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
     div(phi,omega)  Gauss upwind;
     div(phi,Yi_h)   Gauss upwind;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution
index fb56e719671fa70f1b0c669222bae13aa8e257da..521f14f12326bbd0ac501f189ee40d8acc9c86cc 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
index 820ed6508c749594e88c1ad2fd010ba5574f25aa..f190516f31a3b3200b0be7499c20fccc18b67f36 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CH4;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,18 +25,20 @@ boundaryField
         type            fixedValue;
         value           uniform 1.0;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 0.0;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0.0;
         value           uniform 0.0;
-
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
index cee79f28e8fd0bca957ed3fd27c312717ad9db61..98ad62ac9535afab0bfdd4e9af2a5f1306d28aca 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CO2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,18 +25,20 @@ boundaryField
         type            fixedValue;
         value           uniform 0;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0;
         value           uniform 0;
-
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
index b3b363c2e668d2cba36918b4701d8a6a62cba8ca..a64c45cd0c613f500938823f52fcc18384af5eb6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,18 +25,20 @@ boundaryField
         type            fixedValue;
         value           uniform 0;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0;
         value           uniform 0;
-
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
index 4d521a75d6dd77a99e6d0444b940746669ef374f..1b709fad89c9b471c9474fcf4857fc43ca8f5871 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,18 +25,20 @@ boundaryField
         type            fixedValue;
         value           uniform 0.0;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 0.77;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 1;
         value           uniform 1;
-
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
index aa29caac05d5776f513375e15a86bb811fee761e..fa80bef28ea5a0def2a11f767aaf87e16374a4b2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,17 +25,20 @@ boundaryField
         type            fixedValue;
         value           uniform 0.0;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 0.23;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0;
         value           uniform 0;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
index d751cc3132391cb1e363b0f673e46cfea9d3eb27..6da9b61da48c6b3304d3d46c529f98e869782569 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,17 +25,20 @@ boundaryField
         type            fixedValue;
         value           uniform 800;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 800;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 293;
         value           uniform 293;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
index f60e16161cd842e8677734a4d2f386db11597457..990bd48f9a1af2d987f48eacbb6fad90cd4f9ab8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,16 +25,19 @@ boundaryField
         type            fixedValue;
         value           uniform (0.1 0 0);
     }
+
     air
     {
         type            fixedValue;
         value           uniform (-0.1 0 0);
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
         value           $internalField;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
index 675838c548c17b5b85393b7555639ae12ddc5638..790e6073f1e61758317ddd1cc1a16cb72ff6c2ba 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,15 +25,18 @@ boundaryField
         type            fixedValue;
         value           uniform 0;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
index e43dbf61cc8effafb21a479adeec8deb9a409f7d..f561a3919233dc6ec7ee966a34a4b706f96cc1da 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh
index 35ab93a650b74fb58807872764419fb1569456e0..840e683a62a98098f3b58402a69e167a65bdf003 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
index 3437603d7283166e4e7174379bd2589ba3de45e3..88ebc991f0244be9f2b51cff3b47e70e1ae177ab 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      rho;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,16 +25,19 @@ boundaryField
         type            calculated;
         value           uniform 0.243121;
     }
+
     air
     {
         type            calculated;
         value           uniform 0.438564;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 1.18001;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
index 3881c4097afd3184e36b516c7270a43d43f0e109..a040f2813a3532edc524029d923269a6931177ac 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -37,4 +36,5 @@ odeCoeffs
     relTol          0.01;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
index 0d3fe3800e144edd0a268c59245e9b87afb2dc3f..5e1aa59a707f0ccdfd4654cd530f781def3a6bd6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,8 +19,7 @@ combustionModel  laminar;
 active  true;
 
 laminarCoeffs
-{
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
index 276d33e98d41d0a02b57bed162eca573d14ef0e0..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,4 +18,5 @@ radiation       off;
 
 radiationModel  none;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
index aa66b30466ced976ab66c80ece44e1cd666a7b07..a7789561ca84ecac5a73f6dfbff806e61c3497d7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,7 +19,6 @@ solution
     active          no;
 }
 
-
 constantProperties
 {
     volumeUpdateMethod  constantRho;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
index 1f61c24d2aaa2f1fe57b6e9661fc84eee930b475..a944f73f461df158457d957059a226fcf00831ff 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermo.compressibleGas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
index 61f4bbf2016ace41cecf918e5b3dddc945d32e3d..5bf51466aea375603b97bb48e5cf5f5f4570da49 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
index 378a50b9d62b1a427a0cee1e2104575239d9dd1b..8239be96d78018f439a451e37ad0a41fbfbaa202 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,4 +46,5 @@ runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
index 654277234a8de6ef394434c9fc7e5505c5faa2f5..0bd89fc77d538f5e117eb6e25cd43df965b5a186 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
index 2627079b6eea5a6b8678010571cca838926426f5..0b42792bf588489d8a57951ff5863e2b12d8c835 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O
index c15aaaf2dd019a19ea2fceb6ddf62c9a2d6a2481..19401cd8b72e055a9f88655f7172469d165ee7c5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O
@@ -10,12 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.0;
@@ -26,6 +24,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2
index 6a1ea9d15c34c8ffad21458f9a6379da3ad19dad..164984f655529e86db77863a7677978a4c3ddb90 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2
@@ -10,12 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.79;
@@ -26,6 +24,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2
index ce9c005faa8c924c2b2d7ff9a028c06a6fdcf6ee..6be3ccde5c68d89801e1dfa598f6ef977b4bb00a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2
@@ -10,10 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 0 0 0 0 0];
@@ -26,6 +24,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T
index 25668e0998944bd75e69d5d3afd4f995bd2b1c1b..b736b858f5acfe2c1b78631347f6b2c9ad971258 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T
@@ -9,7 +9,6 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    location    "0";
     class       volScalarField;
     object      T;
 }
@@ -26,6 +25,7 @@ boundaryField
         type            fixedValue;
         value           uniform 300;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            fixedValue;
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U
index a606d370f3f451ad0defd09e7d872db52d34e77a..0dec6dc0b3dd9d8d04aa6103441d448b6157bd9a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,6 +24,7 @@ boundaryField
     {
         type            noSlip;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            noSlip;
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p
index db41e33d38b02d3b5ee23efb3994b7b8973eeeba..334bf875b8e9804eb75f2543ff41f5b1f6eb69c2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            calculated;
         value           $internalField;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            calculated;
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh
index 5792f203afed3eb979b45bbecd3d726734dbe3e3..16219eced3a7a4e2a7a7e66a104bfbe76604746b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,10 +24,12 @@ boundaryField
     {
         type            fixedFluxPressure;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            fixedFluxPressure;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf
index 680e2d64e8fa0b52a8ad52771d7eb3195be7840c..24de27a941eef47b029c330a2803ad3aca95ffe8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
     object      Tf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf
index 7b15c6a28ce82ff88cc4c215b41d75f1d1aa26b0..e4907e887b8318270f6abd4c7f9f48ff08a2b2e1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0/wallFilmRegion";
     object      Uf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf
index 447992632d6ab57acf73c36b681665cb4d649bab..3811814a405992e92c4faf7b9c006f8392b11999 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
     object      deltaf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
index 8c2208c3d2dd716c2584c1f284c8202d8feb6f2e..a3637b7fb335547f1b1754083b1b804c6dbda99c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
index c25f6cf6f5a31f504a603d6ace95d1ca5b6ef69d..9b4cd088851cb79515af24ed1d60d139a048e647 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat
index af2a3dc3895142035047ea230bc4396c7b749c41..813528ef6f576c7e3ae39bfee5a20661df2ec514 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      foam.dat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
index fe92111002f37a1f0a14fda6f8c1c5ef941fb5df..241d64fa4c96aaa1afdae97cc5eac3e8dab4f07c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
@@ -10,10 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 // (x y z) (u v w) d rho mDot T Cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
 (
     (0 1.95 -0.2) (0 -5 0) 0.001 1000 0.002 300 4200 (0 1 0) () (1) ()
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties
index 791460502ca46d44b0ba310684f1693f83896f44..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties
index 389b0ae41da98e2acc3ed39558b5895d95559389..3603382a80cda48f712caba5d107e2b01c19f4cd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties
index 5a1951289ab7203411ca894e0fc6345d7afb2490..daafd837b2d759b2ffe09d044918b98a006e0380 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -72,3 +71,6 @@ thermoSingleLayerCoeffs
         }
     }
 }
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
index ced82076f0158d31c2e37514442db06d38e9c1ef..f62cdef1538751e7d39812ac6fdb2f6105d6ce15 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict
index fc500cb19ae13872c4dccee33a4ba97c4cd9efb7..53f75dd8411733f55ac4f0cf4444710221fdae6e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict
index dd8f37ec747b8357aff8eab64bf185911a75109f..30e9e81815b378b9ea5a88510d45ea343602a0fc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      createPatchDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // This application/dictionary controls:
@@ -51,4 +50,5 @@ patchInfo
     // none
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/decomposeParDict
deleted file mode 100644
index 214dfccd0247a4e881c603cbf981d67ac1df9431..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/decomposeParDict
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2012                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 4;
-
-method          metis;
-
-coeffs
-{
-    n           (2 2 1);
-}
-
-metisCoeffs
-{
-    processorWeights ( 1 1 1 1 );
-}
-
-distributed     no;
-
-roots           ( );
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict
index 51f22f7aeb25611e0d0d80ca44330cff2ccb2381..81a76667bac4335cdb423b52196e2f0efa7ef8c9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict
@@ -35,4 +35,5 @@ linearNormalCoeffs
     thickness       0.01;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes
index fbbf2274c4642ad43c2dc1a4f450cfd5107a3c14..7b01f028930645c832bdb6eae4c3172924db8620 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,5 +54,4 @@ snGradSchemes
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution
index 33550bcc906989a87d2fcff8027bce30993fd435..fc2a5a34922b1e1f4dcb42f7c6e4be544c044166 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,6 +74,7 @@ solvers
         tolerance       1e-6;
         relTol          0;
     }
+
     hFinal
     {
         solver          PBiCGStab;
@@ -84,7 +84,6 @@ solvers
     }
 }
 
-
 PIMPLE
 {
     nCorrectors     2;
@@ -94,7 +93,6 @@ PIMPLE
     pRefValue       1e5;
 }
 
-
 relaxationFactors
 {
     equations
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
index 46ade98cbf702766961baf5b531516099bcf612f..f2f4132d65c987002900ba570d2672d2cae79d2a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
@@ -33,4 +32,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes
index 6002e35b8ba6fdcb8bab31169f2aeba6f5374c3e..3c677d3c95f415535d4470138e1e3bb48332f3dd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,17 +19,6 @@ ddtSchemes
     default         Euler;
 }
 
-divSchemes
-{
-    default         none;
-    div(phi,Uf)     Gauss upwind;
-    div(phid,deltaf) Gauss upwind;
-    div(phi,hf)     Gauss upwind;
-
-    div(nHat)       Gauss linear;
-    div(grad(nHat)) Gauss linear;
-}
-
 gradSchemes
 {
     default none;
@@ -44,6 +32,17 @@ gradSchemes
     grad(nHat)      Gauss linear;
 }
 
+divSchemes
+{
+    default         none;
+    div(phi,Uf)     Gauss upwind;
+    div(phid,deltaf) Gauss upwind;
+    div(phi,hf)     Gauss upwind;
+
+    div(nHat)       Gauss linear;
+    div(grad(nHat)) Gauss linear;
+}
+
 laplacianSchemes
 {
     default         none;
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution
index 22282a78d8f2446975e5acface5beafc3ed821fa..35a8d0c5f947bd17c2639ee61a54d01f4e05245e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,4 +48,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
index 401561979489c91533c054d8f955757fd010c2ed..b745217d1bfb1dd38b39ac5dbc12144a5bc6c8d9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      G;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,6 +30,7 @@ boundaryField
         refGradient     uniform 0;
         valueFraction   uniform 0;
     }
+
     inlet
     {
         type            MarshakRadiation;
@@ -41,26 +41,32 @@ boundaryField
         refGradient     uniform 0;
         valueFraction   uniform 0;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O
index d026d92351ad5527805c732073b0e332901eb28e..7ab0d1c9deb363a1df5809626f02b3b5c321b393 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,31 +24,38 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2
index 52d69a0b78c457a96e7bfea899908c96828ad03e..8978d3bcb7a45aa97bf782fd27c9aa71e0c2d115 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,31 +24,38 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0.79;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2
index 23f6b0b5caecbf80c320c302edc1795a56c5a893..c52fe941ec895c82102f8bbda9455ba8d4db231b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      O2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,31 +24,38 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0.21;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T
index aaf3b13c113e1b07ffe977339ca8d8790b3dcfa5..53a4740a52a24313869b4694d75c21aad03e7e1e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,31 +25,38 @@ boundaryField
         type            fixedValue;
         value           uniform 400;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 350;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U
index 020e37b00ded038ba4d1a9fe81ffd3a4d1448b7a..258713d4c2c7df57191aed357dae2177178286e6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "1";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,31 +24,38 @@ boundaryField
     {
         type            noSlip;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform (5 0 0);
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat
index 8d26a5cea9c13390451fc94819e46267ace78b3a..fcdb8dc974c0c48eb2ce0572717e25c6b2983dbc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,32 +25,39 @@ boundaryField
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon
index b8fbf04cb72be323fc825ebcdaeb49510096627d..075bf88aa98870309772b9ce54fa3f775f146389 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,31 +25,38 @@ boundaryField
         type            epsilonWallFunction;
         value           uniform 0.0449;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0.0449;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k
index ca91db95a6c3fa058965f7fc3af8816add809ae0..389b78b24f32bdc9bbbe34f8d1a16145c3b95f6b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,31 +25,38 @@ boundaryField
         type            kqRWallFunction;
         value           uniform 0.0938;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0.0938;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut
index 9301830ad59cddedc643615b9dc6bd6471699b84..47260f8c7c52ab2ce1080f444a3fdc98b1054dfd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,32 +25,39 @@ boundaryField
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
index e37699006ffb64df11a000620e096b6658d146e2..d8094c48f6468d7597933cf81700d256b5f5312e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
index c25f6cf6f5a31f504a603d6ace95d1ca5b6ef69d..9b4cd088851cb79515af24ed1d60d139a048e647 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
index 765ac1e130276bba79f26653be07617b611294ee..e45aa3000e34e5442b69dd48bb08633000227fbb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/g b/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
index dcdd14bc0d37fde45f10c77a6feb55cfffdd8b13..f16f450adc69a469c12027e384d30d8f1730eabf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
index bfbb3477ca71220ddb9b911a11bd3c819b30945c..c2ccef00dd427cb12641f5828a05235079ec5d69 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      particleTrackProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
index 93ae4ac030e154cf7468f3fc117172778cd6d555..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,5 +19,4 @@ radiation       off;
 radiationModel  none;
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
index ab2d59d27112586e204fd79771316d62433d0082..f6c7a705fbaf5a0bc7b4010266195f9b609ad1ed 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -116,7 +115,7 @@ subModels
                 type        rebound;
             }
 
-            "inlet|outlet"
+            "(inlet|outlet)"
             {
                 type escape;
             }
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
index 3063e384eb5deb9abeb38502a5103f317d6bc926..543e3a6d4d0392e51cd517787e7794fa614a16e8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermo.incompressiblePoly;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
index dbfc2d653baa04d41688b7003f257a524d25be90..e8a958135e32f7e1347733e26df9d27857c621e0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
index 68ebb9075fe6f06ce677897857d91f90db0bca01..735b83ad32f736ebd730187f1b1cbdba0bc58cac 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,4 +57,5 @@ functions
     #include "vtkWrite"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
index 2017b2e980abd0582b6a332a0c9c9d6d5904a1b9..999f0ee4369c6c62bccc7f4e27771d3a190c61fb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
@@ -33,4 +33,5 @@ constraints
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
index 3dec620ee72b9a4a56e8e3fff6fe64d9d033db14..f9a9bcbae9aa61ca48e895d9689843823792fc18 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
index adf5bfdf0aa55ed0f60ee58a906b3f122e02a3dd..a66917eeae35ed6004617e5a2b49d38a160a1b1f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
index 5744221601552cd54f034a5dbd862143848e295a..2afdded2953b0fa43baf9596ac1a8ea1dca54fc3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O
index 0c9580f4f981456312bdbb7a7d66e5afaf929b4f..7cd80c53e3891b8f2e738851094555441fe7bb00 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,6 +24,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     wallFilm
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2
index f09848bbd16bb490401aa4c82e10d2a33f8db4b9..ab867143e134119bb0ed5d921797944ad378397d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,6 +24,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     wallFilm
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2
index d36395a9aa70cb8625f282a86b64e3f85c1da96d..91ee7eadfa16876ff7a75fcc33bab61fdfc86e2c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,6 +24,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     wallFilm
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T
index c5ce3f2f4a909d506694ff0df038a496f221ee08..d0c2c852370b3dbe2b73302fe292e34257dd20ff 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,12 @@ boundaryField
         type            fixedValue;
         value           uniform 300;
     }
+
     wallFilm
     {
         type            zeroGradient;
 //        type            mapped;
-//        field       Tsf;
+//        field           Tsf;
 //        average         300;
 //        setAverage      no;
 //        value           uniform 300;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U
index f70eb05547537fb53eeaee5e7ea281730a9ddadd..aea07023b7b433a3819600e9a5909ce4974f3d89 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,12 +25,13 @@ boundaryField
         type            uniformFixedValue;
         uniformValue    (0 0 0);
     }
+
     wallFilm
     {
         type            uniformFixedValue;
         uniformValue    (0 0 0);
 //        type            mapped;
-//        field       Usf;
+//        field           Usf;
 //        average         (0 0 0);
 //        setAverage      no;
 //        value           uniform (0 0 0);
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat
index 28069c9357c3307d9f49c620f2916dddc570e509..7e5743b614c6b70fbc690bc64c69193e3e094d7e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,6 +26,7 @@ boundaryField
         Prt             0.85;
         value           uniform 0;
     }
+
     wallFilm
     {
         type            alphatFilmWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon
index 7b48f99c59e161cca642feab6d92427874fd34d7..c1213df6b47c470bec2cba16ef6ece66b1355c43 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            epsilonWallFunction;
         value           uniform 1e-7;
     }
+
     wallFilm
     {
         type            epsilonWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv
index 275793de1adb53c6b676ec21284c021315ee4bb0..d84e8db547ce9b3a58c4ac4dcd3d7f3a3abd52f4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      htcConv;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            calculated;
         value           uniform 0;
     }
+
     wallFilm
     {
         type            convectiveHeatTransfer;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k
index 296375328295edc51be0be7555622236f3bfde66..fc9874e88d6a5aaaf9e946dfbdae485f54352aa5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            kqRWallFunction;
         value           uniform 1e-5;
     }
+
     wallFilm
     {
         type            kqRWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut
index 6ad5d9096d07f6fed2cd294f1ebe5c2b6307fc93..7886399cbc91b91840a30e5768ce941f09c7e5bd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     wallFilm
     {
         type            nutkFilmWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p
index dae18e13b9cfd3bbe552258728961c98379d6d48..1d784ffcc7c053c8b137bc5734818b30c56a9429 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            calculated;
         value           $internalField;
     }
+
     wallFilm
     {
         type            calculated;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh
index ac38238e87cc0375abeaa2cf3528393d14ff5a60..864f7687d975628fc35fc4f381c5d5159a0b7c70 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            fixedFluxPressure;
         value           uniform 100000;
     }
+
     wallFilm
     {
         type            fixedFluxPressure;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf
index cc5a80cbe83ea50004fd34323e47d1ed1478fbbe..49fcc740fcb81b8237dbd7d1e3082e8ace5ce1cb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0/region0_to_"(region0_to.*)"Region_masterRegion";
     object      Tf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -36,7 +35,6 @@ boundaryField
     // mapped boundaries
     "(region0_to.*)"
     {
-//        type            zeroGradient;
         type            fixedValue;
         value           uniform 350.0;
     }
@@ -48,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf
index d5c364ac2e505db03a6a7ec001b513fb86b28ebf..de91a4a1046124f399e63bdf2ca615d90e4458b2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0/region0_to_"(region0_to.*)"Region_masterRegion";
     object      Uf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf
index 1b0432bc7d816159d73cd24702274da0e77f798b..5571691d0f81d527088f070d1cef46194a1a68a0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0/region0_to_"(region0_to.*)"Region_masterRegion";
     object      deltaf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
index 8c2208c3d2dd716c2584c1f284c8202d8feb6f2e..a3637b7fb335547f1b1754083b1b804c6dbda99c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
index c25f6cf6f5a31f504a603d6ace95d1ca5b6ef69d..9b4cd088851cb79515af24ed1d60d139a048e647 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat
index af2a3dc3895142035047ea230bc4396c7b749c41..813528ef6f576c7e3ae39bfee5a20661df2ec514 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      foam.dat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties
index 791460502ca46d44b0ba310684f1693f83896f44..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
index 3c5eecbea311b3f91449832a309073923703fc50..00063ec701389db1830fc5939dcfc70750c10806 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
index 0e7aa0acbf1725a22f2d9c30246d35c09f06006c..8aec51333b884a5983db16028e855ad975466e7f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,13 +46,6 @@ thermoSingleLayerCoeffs
 
     upperSurfaceModels
     {
-        /*
-        heatTransferModel constant;
-        constantCoeffs
-        {
-           c0              1e-8;
-        }
-        */
         heatTransferModel mappedConvectiveHeatTransfer;
     }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
index ced82076f0158d31c2e37514442db06d38e9c1ef..f62cdef1538751e7d39812ac6fdb2f6105d6ce15 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties
index 48bbf910c0153bb9a2512e7f5f641f3534af5a8e..8f2bd3dbc68f9e54c770d9d35664d5c437694ccb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict
index f0bf29f55046d6c8b4d78b4ca0f4d1efd70b9c8d..a622f3117ba49c5e1c418acc00c93716e7cb65ca 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict
@@ -66,4 +66,5 @@ U
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict
index 58bf4522f1a541d3068c8e465066f77bdc592047..478638f6122026d6c100bf37473c618e6acfbf16 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -33,7 +32,7 @@ writeInterval   0.1;
 
 purgeWrite      0;
 
-writeFormat     ascii; // binary;
+writeFormat     ascii;
 
 writePrecision  10;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict
index 2fb67ea894bd5dfb625ab6060b67d5297390531a..b2320b11d4d371706c368ece8f4fcef21ee878ee 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict
@@ -39,4 +39,5 @@ linearNormalCoeffs
     thickness       0.001;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes
index 178a790b95dc80bf90e52a849431286328f43b65..6b5c373b46c9782c9789a62266716387810f49e7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,5 +54,4 @@ snGradSchemes
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution
index ac6ac8a927440ff9d0b4683f8cc18252297f3821..b6fd0e576ee78ab338c7f6df90f017a04c64ac92 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
index d72b40b632ffa4f8b74b9f3e6c39256aa7ede7db..516bcfc9a4393d0ad925c03345d7e71cb2b9dd78 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
@@ -57,4 +56,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes
index 63af30949b27ee180c296a72f476b9b47949bf4a..6a6137e567d645764e58fcb8f7f9c499d39834bf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,15 +19,6 @@ ddtSchemes
     default         Euler;
 }
 
-divSchemes
-{
-    default         none;
-    div(phi,Uf)     Gauss upwind;
-    div(phid,deltaf) Gauss upwind;
-    div(phi,hf)     Gauss upwind;
-    div(nHat)       Gauss linear;
-}
-
 gradSchemes
 {
     default         none;
@@ -41,6 +31,15 @@ gradSchemes
     grad(alpha)     Gauss linear;
 }
 
+divSchemes
+{
+    default         none;
+    div(phi,Uf)     Gauss upwind;
+    div(phid,deltaf) Gauss upwind;
+    div(phi,hf)     Gauss upwind;
+    div(nHat)       Gauss linear;
+}
+
 laplacianSchemes
 {
     default         none;
@@ -48,7 +47,6 @@ laplacianSchemes
     laplacian(deltaCoeff,deltaf) Gauss linear uncorrected;
 }
 
-
 snGradSchemes
 {
     snGrad(p) uncorrected;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution
index 968b3c968d1c11f2407b1a50634efcb0fd521765..2c83efc768584d17b36218d58d8d2ac051c3b8c5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G
rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/H2O b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/H2O
rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/T b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/T
rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U
rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/air b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/air
rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p
rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh
rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allclean b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..fb1f3847301c377e02e12439ba58cbf303af3ef9
--- /dev/null
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allrun b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..5f30e6c3bbff0d738d32641422fb6e6d2253eb9d
--- /dev/null
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allrun
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O
index e6d25813e6e812cd331a366ff4899c437139a7b8..00cc8217ee26b5b37680e28169e2d49206ae5079 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,16 +20,18 @@ internalField   uniform 0.01;
 
 boundaryField
 {
-     walls
+    walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0.01;
         value           uniform 0.01;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2
index c7fa20fff1a58f985fdd8f2de71eb6cd96ef410f..3499c75b5c08428982d0b44ae381f14811b2a553 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,12 +24,14 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         value           uniform 0.8;
         inletValue      uniform 0.8;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2
index 4121f73b6e38d7367dd21cd278b809f18a8bbf0d..b928e8efb64475b6b7a115505df115f9892f2584 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,12 +24,14 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0.19;
         value           uniform 0.19;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T
index 5f3a1372e353d183b01243b421fd41fb325f04a8..942e4bb1523d3c1d2f68e9db03e1d2ff12bcde09 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,11 +24,13 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 300.0;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U
index 6139a303a062b35a5d1a4b53ee855d92e393d295..a5ab8e32ff11fc6ec71f58907d8197f6360de2b1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            fixedValue;
         value           $internalField;
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
         value           $internalField;
     }
+
     walls
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat
index 385150dcfe6786026f73db89cce5c5f07c476e2d..c8af26c02d5f1507b0739646ba7af090e80947a2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            compressible::alphatWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k
index 8e63a0e0575387b831bb692e1123d0f7f8adbe23..09911ae162a7a68d95ff7a9fdc4762e2baa5fa7a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,11 +26,13 @@ boundaryField
         intensity       0.16;
         value           uniform 3.75e-9;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 3.75e-9;
     }
+
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut
index e49db263a488932e898f42b7c4374efd3645119d..298eb0e201e30ee541d94905a55715a62dc30cc3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega
index 0afa8bed9b5400be1696271091c398806d64b1e1..8ae534241dc119ea896fb3357f010a2286c19737 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,11 +27,13 @@ boundaryField
         k               k;
         value           uniform 4.5e-3;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 4.5e-3;
     }
+
     walls
     {
         type            omegaWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p
index a302b2a65fa34bd161e41615212d43ec1ee3e327..a9a8af09fcfa4c3e17041ac901abae708656bf78 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            calculated;
         value           $internalField;
     }
+
     outlet
     {
         type            calculated;
         value           $internalField;
     }
+
     walls
     {
         type            calculated;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh
index 4607a268238315987c9833a9c5533e76ed94e04b..bf4c95a7d149b1a99a6f701f80c1fa52a4ceaea5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,11 +24,13 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            totalPressure;
         p0              $internalField;
     }
+
     walls
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties
index d3bef1ea4905a85ac5536fa7c6b292fa4859d738..b9ac365d4d160c3eaed4eb370abd71c3173b4e78 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties
index bcafaf4d7eacc9f7c3e96e6a140ae2d695b5b35d..1d66061fb5d1279f3e1770807816da2269d90a07 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat
index af2a3dc3895142035047ea230bc4396c7b749c41..813528ef6f576c7e3ae39bfee5a20661df2ec514 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      foam.dat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties
index 276d33e98d41d0a02b57bed162eca573d14ef0e0..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,4 +18,5 @@ radiation       off;
 
 radiationModel  none;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties
index fbd1b3ba5064d78db9bf90e9f38f0239d63c34a9..a8f2b43e361a5651a09b0f89dc143b43d7a0af5e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties
index d23f1091c74443fa4f9cd13321d4e89482df8380..0dab70382675fc0dbbb38a5fad77cd6216a19c1d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties
index 1c63baac8d38200cdafde723747958cdca0527b9..c990214fbef925869be7c75fbdb0bb8c230cddaa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties
@@ -18,7 +18,7 @@ simulationType  laminar;
 
 RAS
 {
-    RASModel            kOmegaSST; // kEpsilon;
+    RASModel            kOmegaSST;
 
     turbulence          on;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict
index 1cb627ec2472153e1bd1551bb1eed885546c9141..49c9c529fb1d421a2393a4d204fe2be4c5b03b68 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version         2.0;
     format          ascii;
     class           dictionary;
-    location        "system";
     object          blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict
index 4de3f1785c221f35d63cdaf6d56305de22401a80..40fb383dfce6eb060626ef9debb3e4a77ea31717 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict
index 898734ac677a1296527b34c2cc28bf4759967703..422358793bfa48d80b3221ef819c68df3e074f63 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict
@@ -27,4 +27,5 @@ distributed     no;
 
 roots           ( );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes
index 2e39b11ce57f90afa5703c4786cf898c87c3066d..164f17a34463750dd4a992e990b001022a241349 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution
index 2b0d75b37519a53dd64bcdab45243f7baa5fd752..8135ad1814748613ded458180c1543482a98c121 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -92,7 +91,6 @@ potentialFlow
     nNonOrthogonalCorrectors 5;
 }
 
-
 PIMPLE
 {
     transonic       no;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O
index aade58052ba0e26beb05f3dc40578f2c05bc6c12..2210ee94cd7ea1f736078c1b49903ff5d0f5716b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,14 +25,17 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     sides
     {
         type            zeroGradient;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2
index 09d64fd98235ad0ea8c3b8e9ef8fec4eef56b835..64ee60c75bf98b02afa35d6f3a4e47226632eee5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,14 +25,17 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     sides
     {
         type            zeroGradient;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2
index 2f63b17eecda4aa045e48e1f2208017d2dca3e03..cc352366019fbc2a31c08e4d6ff6d6b206ed6852 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
 
@@ -26,14 +25,17 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     sides
     {
         type            zeroGradient;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T
index e97eb4fe1fca377abd9967b53296fe0334c77a02..b686ce8d9adc7db16ce42cad25700d22a7d49260 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T
@@ -9,7 +9,6 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    location    "0";
     class       volScalarField;
     object      T;
 }
@@ -26,16 +25,19 @@ boundaryField
         type            fixedValue;
         value           uniform 300;
     }
+
     outlet
     {
         type            fixedValue;
         value           uniform 300;
     }
+
     sides
     {
         type            fixedValue;
         value           uniform 300;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            fixedValue;
@@ -43,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U
index 53a9ef31a3ceedc98780cecadfe362839da5b9bd..de6f9a0ea1dac35c6d8aa8ed76588daf2d973bcd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,16 +25,19 @@ boundaryField
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
     }
+
     sides
     {
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            noSlip;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p
index 810f10de130ce10a6b924d0845f387a6483493be..b4ed92b45b5df6bf7edcfece22490e1c52d81f07 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,16 +25,19 @@ boundaryField
         type            calculated;
         value           $internalField;
     }
+
     outlet
     {
         type            calculated;
         value           $internalField;
     }
+
     sides
     {
         type            calculated;
         value           $internalField;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            calculated;
@@ -43,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh
index 6127d46448826d059c8944186e0f46a2baac61d6..d245241e2c92e6a0449ecb5aa4bc6f097d574823 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,18 +24,22 @@ boundaryField
     {
         type            fixedFluxPressure;
     }
+
     outlet
     {
         type            fixedFluxPressure;
     }
+
     sides
     {
         type            fixedFluxPressure;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            fixedFluxPressure;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf
index 1c425f68747175db22be658d418a693b7e43b9b9..2c9030d9fae3df9fd3e16bada1e569557c114de1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
     object      Tf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf
index 14793a1bf5ab51f3023e50f3af3c42d721842eac..1e46abb61807a85a5d5bf1f6e78f23ca201c2b62 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0/wallFilmRegion";
     object      Uf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf
index 4b403ab8a1d6f323d0a77828b3b970643948d71d..0cbbf3829cb186bdaef39ef446e8a18b3588333a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
     object      deltaf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
index 8c2208c3d2dd716c2584c1f284c8202d8feb6f2e..a3637b7fb335547f1b1754083b1b804c6dbda99c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
index c25f6cf6f5a31f504a603d6ace95d1ca5b6ef69d..9b4cd088851cb79515af24ed1d60d139a048e647 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat
index af2a3dc3895142035047ea230bc4396c7b749c41..813528ef6f576c7e3ae39bfee5a20661df2ec514 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      foam.dat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
index 7819aa3af2d8fe31d12313ff5b9666890f4a9b83..0b4dc44f93d947dc206ec78c048ccb805fcdac91 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
@@ -10,10 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 // (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
 (
     (0.050 0.025 0.09) (0 0 -5) 0.001 1000 0.002 300 4200 (1)
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties
index 791460502ca46d44b0ba310684f1693f83896f44..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties
index 28ece78e1df986820792363abeade504841fd67a..5c3b12a0df24d0612f95ed1dca1302d473733b15 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
index 289cfda2e54356f53dac4294b16a65e2596e46f6..7752d7df68535e561c929be3093dd52e25dc55d6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
index ced82076f0158d31c2e37514442db06d38e9c1ef..f62cdef1538751e7d39812ac6fdb2f6105d6ce15 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
index 5a97bdcf1663c82bef04f95c5e94c8cbf45d293f..fb9bd5d9c0fbc8a8f59437c62b50c6c54004364c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -82,6 +81,7 @@ functions
         name            inlet;
         writeFields     no;
     }
+
     filmPatchFluxOut
     {
         type            surfaceFieldValue;
@@ -95,4 +95,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict
index 8e9d8c0aa85cf480829d6ac91a28597bb9e14d47..0c8f6b3762c9181ad61a756cb496c3a3864ba9e0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      createPatchDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // This application/dictionary controls:
@@ -51,4 +50,5 @@ patches
     // none
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/decomposeParDict
deleted file mode 100644
index 169c096939215531e0f00b4a8e051a869f094333..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/decomposeParDict
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2012                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 4;
-
-method          metis;
-
-coeffs
-{
-    n           (2 2 1);
-}
-
-metisCoeffs
-{
-    processorWeights ( 1 1 1 1 );
-}
-
-
-distributed     no;
-
-roots           ( );
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict
index ece6c3de9e79ddef285b9f1b501737d837b08fe4..9c3b434196fa6a4a109361148b8182b456085212 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict
@@ -35,4 +35,5 @@ linearNormalCoeffs
     thickness       0.01;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes
index b9fb79e3619dc05931460b1140cd05ee251ec58a..0566f93d2439d888030415f42404b867ef4a18f5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,5 +54,4 @@ snGradSchemes
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution
index ad6e86add0b30352afab3c12ce918ee2981a84db..48ff621822362e11af0c8b0aa066dd7753f4bc10 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
index 875229cef32e76bd267f55bceb4885aae25659cc..f2f4132d65c987002900ba570d2672d2cae79d2a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
index d79ff9180d388b000b523866079b7866061af211..87a825965b6aa407b235aa73ef635d501f84b71a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      createPatchDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // This application/dictionary controls:
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
index 63565525281201d3dbcd3cd7238cd4e7a547f6bb..8a4277a192fb31988aa3a8b572af031d12f2db85 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,14 +19,6 @@ ddtSchemes
     default         Euler;
 }
 
-divSchemes
-{
-    default         none;
-    div(phi,Uf)     Gauss upwind;
-    div(phid,deltaf) Gauss upwind;
-    div(phi,hf)     Gauss upwind;
-}
-
 gradSchemes
 {
     default         none;
@@ -41,6 +32,14 @@ gradSchemes
     grad(alpha)     Gauss linear;
 }
 
+divSchemes
+{
+    default         none;
+    div(phi,Uf)     Gauss upwind;
+    div(phid,deltaf) Gauss upwind;
+    div(phi,hf)     Gauss upwind;
+}
+
 laplacianSchemes
 {
     default         none;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution
index 6cd29c6283b2fa3b20fa16757168107705b5a350..7f200966d09cac1434e7ae0871525b2bfbb40762 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,6 +23,7 @@ solvers
         tolerance       1e-10;
         relTol          0;
     }
+
     deltaf
     {
         solver          smoothSolver;
@@ -33,7 +33,6 @@ solvers
     }
 }
 
-
 PISO
 {
     momentumPredictor  yes;
@@ -41,7 +40,6 @@ PISO
     nNonOrthCorr    0;
 }
 
-
 relaxationFactors
 {
     equations
@@ -49,4 +47,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O
index 2d7bbd9afc05abb7a9f371433a68c901cd0a5c5e..dea3578e8e6e85e82039df5adade52a779df8ae8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O
@@ -10,12 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.0;
@@ -28,6 +26,7 @@ boundaryField
         inletValue      $internalField;
         value           $internalField;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2
index f4b50bafe00b0f38276196433135c0358245cd4a..621898f100d19faea6b3998b144be6cf51fe843a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2
@@ -10,12 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.79;
@@ -28,6 +26,7 @@ boundaryField
         inletValue      $internalField;
         value           $internalField;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2
index 551fffa1f22892746804e72b79b60d06164a6326..1fad1e03192a5e50e435ce373c99dac3cb01b750 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2
@@ -10,10 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 0 0 0 0 0];
@@ -28,6 +26,7 @@ boundaryField
         inletValue      $internalField;
         value           $internalField;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T
index 62f79d9297122615cafbd892d111ee1cda0fb9d0..12471f49a0d66b5b0b713c7a3ff659e8a74df2e1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T
@@ -9,7 +9,6 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    location    "0";
     class       volScalarField;
     object      T;
 }
@@ -27,6 +26,7 @@ boundaryField
         inletValue      $internalField;
         value           $internalField;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            fixedValue;
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U
index 4d42794a3d6095cd74146ed46ba667770c2342d1..b9c03e65d6f85c1506bbe2996f4b2cb8c0877d4a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            noSlip;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p
index f4b39b2c986c4388bd17c8f8d1ded6970f8b3466..997fa7516a3454f6f82b5042c0678b4222e7b1d4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,6 +25,7 @@ boundaryField
         type            calculated;
         value           $internalField;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            calculated;
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh
index 62e58ebcf9543e127c6f687a0930b1e4d2836109..0e7296092b5dbe1b6adaabfb7bb393b812574fb0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,10 +25,12 @@ boundaryField
         type            totalPressure;
         p0              $internalField;
     }
+
     region0_to_wallFilmRegion_wallFilmFaces
     {
         type            fixedFluxPressure;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
index 8c2208c3d2dd716c2584c1f284c8202d8feb6f2e..a3637b7fb335547f1b1754083b1b804c6dbda99c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
index c25f6cf6f5a31f504a603d6ace95d1ca5b6ef69d..9b4cd088851cb79515af24ed1d60d139a048e647 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat
index af2a3dc3895142035047ea230bc4396c7b749c41..813528ef6f576c7e3ae39bfee5a20661df2ec514 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      foam.dat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
index 5ee9f221dd089da609073ac15d466398d21eaf3e..ad0c8be30ab2768161cd2d7da647cbea3df13bb1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
@@ -10,10 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      parcelInjectionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 // (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
 (
     (0.050 0.025 0.09) (0 0 -5) 0.001 1000 0.002 300 4200 (0 1 0) () (1) ()
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties
index 791460502ca46d44b0ba310684f1693f83896f44..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties
index 78e833cace7367607c9484d63809d8d4f1cb9fce..2ab159a2075b5f77f0982e2fe615d8debb846491 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
index 0ce3f77f05d0d32cb11517f8f9576b4b02458fd0..f8e1146dd49ba08b94985021005381b5de9444f8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -72,3 +71,6 @@ thermoSingleLayerCoeffs
         }
     }
 }
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
index ced82076f0158d31c2e37514442db06d38e9c1ef..f62cdef1538751e7d39812ac6fdb2f6105d6ce15 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict
index 52de3a63c5692443d9fa917dd78d57576c39a260..f886ef61af38fc7e80476746d347f6e4fb64b7c6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict
index 8e9d8c0aa85cf480829d6ac91a28597bb9e14d47..0c8f6b3762c9181ad61a756cb496c3a3864ba9e0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      createPatchDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // This application/dictionary controls:
@@ -51,4 +50,5 @@ patches
     // none
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/decomposeParDict
deleted file mode 100644
index 214dfccd0247a4e881c603cbf981d67ac1df9431..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/decomposeParDict
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2012                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 4;
-
-method          metis;
-
-coeffs
-{
-    n           (2 2 1);
-}
-
-metisCoeffs
-{
-    processorWeights ( 1 1 1 1 );
-}
-
-distributed     no;
-
-roots           ( );
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict
index ece6c3de9e79ddef285b9f1b501737d837b08fe4..9c3b434196fa6a4a109361148b8182b456085212 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict
@@ -35,4 +35,5 @@ linearNormalCoeffs
     thickness       0.01;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes
index 178a790b95dc80bf90e52a849431286328f43b65..6b5c373b46c9782c9789a62266716387810f49e7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,5 +54,4 @@ snGradSchemes
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution
index c88586c08f087c7d142d94794b071c9ad669b56d..a29f0050404747838743b06cb889b781feab58f0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,6 +70,7 @@ solvers
         tolerance       1e-6;
         relTol          0;
     }
+
     hFinal
     {
         solver          PBiCGStab;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
index 46ade98cbf702766961baf5b531516099bcf612f..f2f4132d65c987002900ba570d2672d2cae79d2a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
@@ -33,4 +32,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict
index d79ff9180d388b000b523866079b7866061af211..c9d260fa5de967120f4f5e8cda52fe3bdf21f569 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      createPatchDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // This application/dictionary controls:
@@ -114,4 +113,5 @@ patches
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
index f123748ca2edbc1526487afb099c08ef749a477f..60780c41f78b88fba52cb9c436356ddb330a9d28 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
@@ -47,4 +46,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes
index f266dc042d8994b15971ea2260af9ab2880d13bb..7d3a2f92f03ab82a4baf12e8e1cddef25c986a32 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,14 +19,6 @@ ddtSchemes
     default         Euler;
 }
 
-divSchemes
-{
-    default         none;
-    div(phi,Uf)     Gauss upwind;
-    div(phid,deltaf) Gauss upwind;
-    div(phi,hf)     Gauss upwind;
-}
-
 gradSchemes
 {
     default         none;
@@ -39,6 +30,14 @@ gradSchemes
     grad(nHat)      Gauss linear;
 }
 
+divSchemes
+{
+    default         none;
+    div(phi,Uf)     Gauss upwind;
+    div(phid,deltaf) Gauss upwind;
+    div(phi,hf)     Gauss upwind;
+}
+
 laplacianSchemes
 {
     default         none;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution
index 1dfcf7ad5ed6daed005e9357a7e36a90edd20bf9..3bf6e386b2ba2ee9b890b4f8e3db92fedeb52d6a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,6 +23,7 @@ solvers
         tolerance       1e-10;
         relTol          0;
     }
+
     deltaf
     {
         solver          PBiCGStab;
@@ -54,4 +54,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O
index 574d778c33799445d3a9aaae8f8ea20cc7391b9f..76d8833f515daf74163981a17c779398d53fceb0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 0.01;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T
index b89a7ccb50f56b146b89b97fe0d370940d39e2d5..cd5dbdee69dfd32b77b6a54d33bb354f5c3c7022 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 473.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 473.0;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U
index 87c6682750bee6bf4356eca112077f45bcb78011..7f92792577a7b1a82c89d6fd970c31a2ccc56e9c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,27 +24,32 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.00379;
         rhoInlet        1.0;    // fallback value for e.g. potentialFoam
     }
+
     inletSides
     {
         type            flowRateInletVelocity;
         massFlowRate  constant 0.00832;
         rhoInlet        1.0;    // fallback value for e.g. potentialFoam
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform (0 0 0);
     }
+
     walls
     {
         type            noSlip;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air
index 4e39b86f32ee38965fb3b528deeeb4afd96e0abf..e5f8ab6aa78dacdff100ca2841bd01468c27db89 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 1.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 0.99;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat
index 6fda7cd934c87540db93643138a724d5dfdb4c65..2a1a2d5cde0c8b13fba0326f3bc15cb5460a79ba 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,25 +24,30 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            calculated;
         value           uniform 0;
     }
+
     inletSides
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            compressible::alphatWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k
index 43d04129bb0ea5fa3fe7bfd94b09659ba7ea8693..7819ebf3c7616da6b506550afa1d85ed43d3d3ff 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,27 +24,32 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.15;
         value           uniform 3.75e-9;
     }
+
     inletSides
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.16;
         value           uniform 3.75e-9;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 3.75e-9;
     }
+
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut
index a49b3e32e6fda6e7b0cf8a75de7619ee7ccb1a7b..8916341bf0654a611f574df7f5acfcadce043d94 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,25 +24,30 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            calculated;
         value           uniform 0;
     }
+
     inletSides
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega
index 415805ec9ff4e917e905967d4fb2158a4758a3ac..3dd4220eb5e7f27ae39986256c122cc7090817cf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,10 +24,12 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            turbulentMixingLengthFrequencyInlet;
@@ -36,6 +37,7 @@ boundaryField
         k               k;
         value           uniform 4.5e-3;
     }
+
     inletSides
     {
         type            turbulentMixingLengthFrequencyInlet;
@@ -43,11 +45,13 @@ boundaryField
         k               k;
         value           uniform 4.5e-3;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 4.5e-3;
     }
+
     walls
     {
         type            omegaWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p
index af3e28f5f5b5407e4b0685f9c7b94e9e91ffd3bf..147f4fd6cec7683d081638a16d525e7eb7dab942 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,25 +24,30 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            calculated;
         value           $internalField;
     }
+
     inletSides
     {
         type            calculated;
         value           $internalField;
     }
+
     outlet
     {
         type            calculated;
         value           $internalField;
     }
+
     walls
     {
         type            calculated;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh
index 0e7d68fb1f08f3be223c945a385fba385761ebcf..45cf8559203112321ffb38395b131b9edb9e2e55 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
index e37699006ffb64df11a000620e096b6658d146e2..d8094c48f6468d7597933cf81700d256b5f5312e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
index c25f6cf6f5a31f504a603d6ace95d1ca5b6ef69d..9b4cd088851cb79515af24ed1d60d139a048e647 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
index bfbb3477ca71220ddb9b911a11bd3c819b30945c..c2ccef00dd427cb12641f5828a05235079ec5d69 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      particleTrackProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
index 95d535346352cef205224728c7b689edc8f3a71a..43aedde869ae88c7709013196cc24bb30e194af7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,4 +20,5 @@ radiationModel  none;
 
 solverFreq      10;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 8303a4a154df7a62f8b08255cbd02339a5e95152..6abb17c61cd4dcc305c6a9ccd7f6e9ad23fd998a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index bdc7df00dc417d38c90e0ec005a4625f8b8dd6ac..40e3b95e29a8704331cb0544d792a55402f3f9ec 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermo.incompressiblePoly;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index ba904b03328da5e0235329044fc46fe7fecc2ad3..cc585f73b2c8fcf5166eced39d02fcf02b9a94ae 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
index d4c74fae043691d7404ff0f40444420554da1495..60a339e3b61866feabc3df9f51a2f53fd14fb1a3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
@@ -9,7 +9,6 @@ FoamFile
 {
     version         2.0;
     format          ascii;
-    note            "Created Wed Jul  1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
     class           dictionary;
     object          blockMeshDict;
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
index e8e9817bd159cac8bd9f29d1d8fc20ab018e71ce..ea1bd1c2e48eb5e98e3f36e3714e397e41fc9201 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -93,4 +92,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict
index 898734ac677a1296527b34c2cc28bf4759967703..422358793bfa48d80b3221ef819c68df3e074f63 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict
@@ -27,4 +27,5 @@ distributed     no;
 
 roots           ( );
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
index 83bb11e60897a895577d486372935b7f3e6f0c3e..694320f9571e2e99f25386a1469f1da17a2b8694 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
index 67d15df92af40ae50ee84913cbf85af27bc659d0..580af2455bd9aa1997cf24559c305473b84b2fd4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,7 +60,6 @@ solvers
     {
         solver          PBiCGStab;
         preconditioner  DILU;
-
         tolerance       1e-6;
         relTol          0;
     }
@@ -80,7 +78,6 @@ solvers
 
 potentialFlow
 {
-    // Used for potentialFoam initialisation
     nNonOrthogonalCorrectors 5;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O
index 574d778c33799445d3a9aaae8f8ea20cc7391b9f..76d8833f515daf74163981a17c779398d53fceb0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 0.01;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T
index b89a7ccb50f56b146b89b97fe0d370940d39e2d5..cd5dbdee69dfd32b77b6a54d33bb354f5c3c7022 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 473.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 473.0;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U
index 6fc282f98d17b600e62caa0574609b4ae60b64f6..704af2a1f3aa097d83d71a740a1edb2627e3ce4e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,10 +24,12 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            flowRateInletVelocity;
@@ -36,17 +37,20 @@ boundaryField
         value           uniform (0 14.68 0);
         rhoInlet        1.22;    // fallback value for e.g. potentialFoam
     }
+
     inletSides
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.00832;
         rhoInlet        1.22;    // fallback value for e.g. potentialFoam
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform (0 0 0);
     }
+
     walls
     {
         type            noSlip;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air
index 4e39b86f32ee38965fb3b528deeeb4afd96e0abf..e5f8ab6aa78dacdff100ca2841bd01468c27db89 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 1.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 0.99;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat
index 6fda7cd934c87540db93643138a724d5dfdb4c65..2a1a2d5cde0c8b13fba0326f3bc15cb5460a79ba 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,25 +24,30 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            calculated;
         value           uniform 0;
     }
+
     inletSides
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            compressible::alphatWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k
index 43d04129bb0ea5fa3fe7bfd94b09659ba7ea8693..7819ebf3c7616da6b506550afa1d85ed43d3d3ff 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,27 +24,32 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.15;
         value           uniform 3.75e-9;
     }
+
     inletSides
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.16;
         value           uniform 3.75e-9;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 3.75e-9;
     }
+
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut
index a49b3e32e6fda6e7b0cf8a75de7619ee7ccb1a7b..8916341bf0654a611f574df7f5acfcadce043d94 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,25 +24,30 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            calculated;
         value           uniform 0;
     }
+
     inletSides
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega
index 415805ec9ff4e917e905967d4fb2158a4758a3ac..3dd4220eb5e7f27ae39986256c122cc7090817cf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,10 +24,12 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            turbulentMixingLengthFrequencyInlet;
@@ -36,6 +37,7 @@ boundaryField
         k               k;
         value           uniform 4.5e-3;
     }
+
     inletSides
     {
         type            turbulentMixingLengthFrequencyInlet;
@@ -43,11 +45,13 @@ boundaryField
         k               k;
         value           uniform 4.5e-3;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 4.5e-3;
     }
+
     walls
     {
         type            omegaWallFunction;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p
index af3e28f5f5b5407e4b0685f9c7b94e9e91ffd3bf..147f4fd6cec7683d081638a16d525e7eb7dab942 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,25 +24,30 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            calculated;
         value           $internalField;
     }
+
     inletSides
     {
         type            calculated;
         value           $internalField;
     }
+
     outlet
     {
         type            calculated;
         value           $internalField;
     }
+
     walls
     {
         type            calculated;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh
index eb540bfc1d6d410537d3debb62a1cb8e4708b9cf..72c4fee2bdc479890e50a5d450f80172d12bbe2d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
index 5b8fe1d3c1dc261c036ad233f304bd3142c43d0b..3dd86a9117c6a86c83ceaf4bdced9a1fb64c5fec 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
index c25f6cf6f5a31f504a603d6ace95d1ca5b6ef69d..9b4cd088851cb79515af24ed1d60d139a048e647 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
index f44256b73e0aa9a03e7cb430d24fb02a78a5ffda..643f64dbdf5f9796f7e7141be5482b5976c17003 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      particleTrackDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
index 276d33e98d41d0a02b57bed162eca573d14ef0e0..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,4 +18,5 @@ radiation       off;
 
 radiationModel  none;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
index 9203c54d9d35619c41b546ffb2cec24a7c49fa5e..2e40ba4194d47901e5a2802cdb1c003c7d1811d4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
index bdc7df00dc417d38c90e0ec005a4625f8b8dd6ac..40e3b95e29a8704331cb0544d792a55402f3f9ec 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermo.incompressiblePoly;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
index 7d8642622e884e30bd64660d96c4f5e0ce699608..cbfb2326398882f93c79e06e109df0411104f798 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
index d4c74fae043691d7404ff0f40444420554da1495..60a339e3b61866feabc3df9f51a2f53fd14fb1a3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
@@ -9,7 +9,6 @@ FoamFile
 {
     version         2.0;
     format          ascii;
-    note            "Created Wed Jul  1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
     class           dictionary;
     object          blockMeshDict;
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
index c1511e6a37b5e6710a9f2c8893647f7d3a894683..3b65f6506c37a20f92d19fa1f0293481960580b8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
index 956941e2f554628441b4820d4d61adc63306de0a..8213112eda4ded118e723a66c7e4339af8f5f19c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
index b1a4e3618a914fb3a38f1bcf75d273d0a1ba3867..6539b7cea56ad29857ab685f855967423b86b8ba 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,13 +58,11 @@ solvers
     {
         $p;
     }
-
 }
 
 potentialFlow
 {
-    // Used for potentialFoam initialisation
-    nNonOrthogonalCorrectors 5;
+    nNonOrthogonalCorrectors 3;
 }
 
 PIMPLE
@@ -84,9 +81,5 @@ PIMPLE
     maxDeltaT       1;
 }
 
-potentialFlow
-{
-    nNonOrthogonalCorrectors 3;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O
index 574d778c33799445d3a9aaae8f8ea20cc7391b9f..76d8833f515daf74163981a17c779398d53fceb0 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 0.01;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T
index b89a7ccb50f56b146b89b97fe0d370940d39e2d5..cd5dbdee69dfd32b77b6a54d33bb354f5c3c7022 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 473.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 473.0;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U
index a83451a8dc92ceb7fd24212775a7dd980ec332bd..1b418a4c363fbd96df295df61385f43c2943ac26 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,10 +24,12 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            flowRateInletVelocity;
@@ -36,6 +37,7 @@ boundaryField
         massFlowRate    constant 0.00379;
         value           uniform (0 14.68 0);
     }
+
     inletSides
     {
         type            flowRateInletVelocity;
@@ -43,11 +45,13 @@ boundaryField
         massFlowRate    constant 0.00832;
         value           uniform (0 17.79 0);
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
     }
+
     walls
     {
         type            noSlip;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air
index 4e39b86f32ee38965fb3b528deeeb4afd96e0abf..e5f8ab6aa78dacdff100ca2841bd01468c27db89 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,24 +24,29 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     walls
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 1.0;
     }
+
     inletSides
     {
         type            fixedValue;
         value           uniform 0.99;
     }
+
     inletCentral
     {
         type            fixedValue;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat
index 6fda7cd934c87540db93643138a724d5dfdb4c65..2a1a2d5cde0c8b13fba0326f3bc15cb5460a79ba 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,25 +24,30 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            calculated;
         value           uniform 0;
     }
+
     inletSides
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            compressible::alphatWallFunction;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k
index 43d04129bb0ea5fa3fe7bfd94b09659ba7ea8693..7819ebf3c7616da6b506550afa1d85ed43d3d3ff 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,27 +24,32 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.15;
         value           uniform 3.75e-9;
     }
+
     inletSides
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.16;
         value           uniform 3.75e-9;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 3.75e-9;
     }
+
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut
index a49b3e32e6fda6e7b0cf8a75de7619ee7ccb1a7b..8916341bf0654a611f574df7f5acfcadce043d94 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,25 +24,30 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            calculated;
         value           uniform 0;
     }
+
     inletSides
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega
index 415805ec9ff4e917e905967d4fb2158a4758a3ac..3dd4220eb5e7f27ae39986256c122cc7090817cf 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,10 +24,12 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            turbulentMixingLengthFrequencyInlet;
@@ -36,6 +37,7 @@ boundaryField
         k               k;
         value           uniform 4.5e-3;
     }
+
     inletSides
     {
         type            turbulentMixingLengthFrequencyInlet;
@@ -43,11 +45,13 @@ boundaryField
         k               k;
         value           uniform 4.5e-3;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 4.5e-3;
     }
+
     walls
     {
         type            omegaWallFunction;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p
index 5a5f497ac7479e77e3bafb933d2b7f5b07161b66..198df38bc8ade55c1832fd5306af438a77d8ba70 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,23 +24,28 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inletCentral
     {
         type            zeroGradient;
     }
+
     inletSides
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            totalPressure;
         p0              $internalField;
     }
+
     walls
     {
         type            zeroGradient;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
index 5b8fe1d3c1dc261c036ad233f304bd3142c43d0b..3dd86a9117c6a86c83ceaf4bdced9a1fb64c5fec 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
index bcafaf4d7eacc9f7c3e96e6a140ae2d695b5b35d..1d66061fb5d1279f3e1770807816da2269d90a07 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
index f44256b73e0aa9a03e7cb430d24fb02a78a5ffda..643f64dbdf5f9796f7e7141be5482b5976c17003 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      particleTrackDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
index 276d33e98d41d0a02b57bed162eca573d14ef0e0..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,4 +18,5 @@ radiation       off;
 
 radiationModel  none;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 9203c54d9d35619c41b546ffb2cec24a7c49fa5e..2e40ba4194d47901e5a2802cdb1c003c7d1811d4 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      reactingCloud1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index bdc7df00dc417d38c90e0ec005a4625f8b8dd6ac..40e3b95e29a8704331cb0544d792a55402f3f9ec 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermo.incompressiblePoly;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index b0afa9e394fb813c415432fe7c7386bbc27f0a80..22fd53b276cc5f0feead9d504e51430a9c686a9b 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
index f26a920baafdbbdc549c2617939f57ca75a58056..d2f17dbdb0754d16c9c8b1373542e538c452bec5 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -18,7 +18,7 @@ simulationType  RAS;
 
 RAS
 {
-    RASModel            kOmegaSST; // kEpsilon;
+    RASModel            kOmegaSST;
 
     turbulence          on;
 
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
index d4c74fae043691d7404ff0f40444420554da1495..60a339e3b61866feabc3df9f51a2f53fd14fb1a3 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
@@ -9,7 +9,6 @@ FoamFile
 {
     version         2.0;
     format          ascii;
-    note            "Created Wed Jul  1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
     class           dictionary;
     object          blockMeshDict;
 }
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
index 9b334d7da82fb8829fb34ab65b993cabef366a6e..cb167bb2f5340bae3cb278e6f13a5ce6fa0aa0ee 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict
index 898734ac677a1296527b34c2cc28bf4759967703..b672d302d5400cf910071c190273eafb0c16ca21 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict
@@ -18,13 +18,5 @@ numberOfSubdomains 4;
 
 method          scotch;
 
-coeffs
-{
-    n           (2 2 1);
-}
-
-distributed     no;
-
-roots           ( );
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
index 95af1840d202d7518f6a40fe2db04ea14b0bc7e5..7c7d6b6e5dc99557fde991af56f5806e0b35db07 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
index 8b9f81dc77a5e0564a9a82fd245e73cb5cb51eea..4783ad21514a5e9615fb904645d87032e5468528 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,14 +19,9 @@ solvers
     p
     {
         solver           GAMG;
-
         tolerance        0;
         relTol           0.05;
-
         smoother         DICGaussSeidel;
-
-
-
         maxIter          50;
     };
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
index 7b47877d4472391e7c8f411ed66f75ab1838fb6d..d7846f77d14483f892ab8fdc62ee00dad55597d7 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
index 7c7bc687b8e131afc2a90a3601e98a201cdf78e6..ddb7bdcd156fa070222b5722dac38e0a0b255924 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/U b/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
index ec65053cf56c4064f50dd38c8baa854b52085bee..a68a3a8f4906b3ef483fec402b19e08f509c2469 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault b/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
index 999bbcefaf50f4a76461bbeb218f4d8ecb7af889..75a831d832cad7ff41a83ea5e530cb2e2d3959d9 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat b/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat
index d5d328824e29aac746a16240c597e7216ce1563f..36e72aa4e9c896e485714021538a645cc63e4f5a 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon b/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
index b5db9b012386eaaa5e1689e5e4b9fe61d3ab1952..f553bc486792b0ad292f819eae0cae462987ee3c 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/k b/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
index 3e8bf9dfd70be8ca661d7952313508d77439c796..68fb0923c3e6ca89901b0f8d6393677ca7c1eb81 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut b/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
index 9819af86618ad42be3c8cafdd9c34389155bf1fb..0b9465face1f8e58a3d828f6b6244d084c4e315d 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/p b/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
index 4dc6359db397526095f5bba9e6b45866f34b565c..7d88af72e3149af8425c95fb52d364650dc7fe66 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
@@ -16,7 +16,7 @@ FoamFile
 
 dimensions          [1 -1 -2 0 0 0 0];
 
-internalField       uniform 5e+06;
+internalField       uniform 5e06;
 
 boundaryField
 {
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
index ce77ea7ccd8a13713c1915c46fe32991c9c7e186..5c7fd51d2fdab6c0e2a9d14d046b5a75b95416f4 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
index 76f3ba2ac43706abfbda0730a1e34e9c302bc379..3bbb5116bc267a40fa6028cadb27c935af87732b 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
index 111080ed5d4f069de0a135b826c794181d5bda22..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
index 791460502ca46d44b0ba310684f1693f83896f44..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
index 4bad7148cd9b415265d4ad4ac62357115ad7093e..3f780e0657abb2e7fbe17b775124181d72775f35 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
-    location    "constant";
     object      sprayCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
index b2a95e6495c15da511ff888574e2387cbcb38dd3..a67f194c640a33912da0786111f84c6dc57f8d86 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
index 0a31cf32140ba9452d8c1312dae167bda3a31514..01e6dce9ed2d38309f15ef5df1434ee422035ec4 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
index e81cfea028d7de2413201d52053a7902e1dba952..97bef45e051ce94d1f2b7c8852ff1aaf560dd163 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
index 413db0e50a6f5670ffe9a7071377c1bdadd4936a..f79c14095740ebf6eac6318d74e83cec3cfd423b 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
index 5ed26a46841bc4db172db7a17e3c073464b8cf9a..05dd2ddaf3e53f02367b605891e732eec95ec9de 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -98,4 +97,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties
index a4e14aadcf5825ac9e841e96c37916fe85697465..1ce11c1513ad2aed3e520a6f6cd06f9f7ac293b8 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -90,8 +90,6 @@ subModels
 
     patchInteractionModel none;
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     collisionModel none;
@@ -107,8 +105,6 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }