diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U
index d6bb5b1805683d7fe21e77a4777fe1b0b828e787..660ba748a427cbfa2efba994ef242d774a81e02c 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U
@@ -123,4 +123,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water
index b5603344c4146071b3c079cbc911bc2c8d0f1364..7c4635364a2ec127640c8802447e409897d4e20d 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water
@@ -56,4 +56,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh
index d2d6335aebf3b56b36aaa0cf39f9b2abb0a19150..7ea42a8bcf8137b8ee263f7ee8042ac65599b075 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g
index 2ad198d79133e84d1d2d520560f9c102e7c4bd94..43118d7762ab45a84049b3a21df8c3526c95dae3 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
index 3f7255db5ef76e2b7cdf97fe364f8ec554dbe4b6..035805d6e901b02305ae0f9b1041eeb16001f419 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties
index 8499d166445cd8ee01f2694ec2305a7c668146d7..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties
@@ -10,17 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
     RASModel        kEpsilon;
+
     turbulence      on;
+
     printCoeffs     on;
 }
+
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict
index 706c1a4570dc6997837d382e2fc387548f6c5aaa..c3c2a2476fa399d83f364dd33b307a91fc963bb3 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      1.0;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     minMax
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict
index 93d668053a8fa7e41e30601bf71a5c80f98c0fdb..c818232b3760ce7caebd82de8caeb789fef82589 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict
@@ -37,4 +37,5 @@ patches
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
index 64e9fd4cb1d14294f582dc92089b20d53cc73351..3c1520aa676365518336d36f66a4182b1f76e46e 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
index fcb1b9d0715483404e128f004eb11073ecdd5a55..59871a6d0d5e91186c7ea1b6cd5540ecab955810 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -92,4 +91,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict
index 724cd8843f075b16e0c5ea6805c88103250949ba..a55abd43465621b1acd1631a41a841acfd32fe4c 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
index 21d8127b58d9d824d4a429164c0f94522a80c55b..463b49e37b927e6f50754b6056686d3e54a3d42c 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34,4 +33,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U
index 55ac15224d187878ad7b66833e6e06adc77b3977..76bac0f29ef9a89db1bb375117241231f20b3c96 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour
index ae5e042974ec8ff9f4213f06aa9ac8c42a469e40..e5cdee1276ac351baf50a5801e158703551366d3 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p
index 8da5d6c17ab1403788e35449ab6cdbe720fb098a..677b4fe31ad07a2df63905ad9416ba0ca9b47e5d 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho
index 01307c981c382421f6274d10a1458df309603a77..2430792461c8ba0b011827afd1c816f5415aec81 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
index bb0b5370dd2d664d98090c22c128520e1484e1c6..1133f25d208a9ea1a97cf183e7352f01fb1d43f0 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
@@ -24,7 +24,9 @@ refineMeshByCellSet()
 restore0Dir
 
 runApplication blockMesh
+
 refineMeshByCellSet 1 2 3
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties
index 1fe5833cc376c73e5c2fa4b0221b49506e81434b..fb555488e14982decf20fd995ccdce4c87eadfa2 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermodynamicProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties
index d48547da66df54e64080dabb8468c68a3ea4fde8..818e4509569e05f0bffbb40d4eb7c7c1542dff25 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties
index e78377b8625d4cdad2624a7e00a3bd146cd3b3b2..ee92925b72d21433e04995c3587c8044a153846a 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LES;
+simulationType      LES;
 
 LES
 {
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict
index 6f92f85be601c1ccd5120f1b10f1c9c6a71da426..db84b6156d82b33549d820175544a8287f71deea 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict
@@ -134,4 +134,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict
index 4503e17924c4223589e11febdb0ad2171e61d226..4e5dca5df2912d7115318a5a298a602a09fd000b 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes
index 32ae3a8f63b58531aa1b97421ed062561cd3d616..c9fd53133df55d4ee1ec83451fbc11d2923c18bc 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,6 +27,7 @@ interpolationSchemes
 divSchemes
 {
     default         none;
+
     div(phi,rho)    Gauss vanLeer;
     div(rhoPhi,U)   Gauss LUST grad(U);
     div(phi,k)      Gauss LUST grad(k);
@@ -49,4 +49,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution
index bbb0ffc245dc0879d053e225e7813b8f64651b5a..428b34bf323aa50ccfe3082d8a62deec82a68ebd 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict
index 02c398db238a1865b9d125b9891cbc77bc8d8036..be9fb70811a9080d43d5056fdb82f22e39ebc1aa 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      refineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
index 2e80e36f41c817767a09af694acba4af5962751c..1ebc06e75716b2abfea7b321dae98f802ebd9be5 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
index f73afa1d5bfbc3cb8e00c2848e3a650265356d64..60660a9f091095de9519dfb9af1ff3841864c173 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
index 040addae2ba097d36acca085f2de539558e51bc1..a67aa89b52df894a6e76c8cbb899b7f7c105771d 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U
index ab3d8c02475db729ce0baa777f3b34293356524a..33ddfe4aa866b1f6588a71f57e0035aa6732729b 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour
index 1d5e79a2348e007e5d27f071a32da1ec75fff082..eb645f9b38db9a6ee7cbb0261c6e42a7df4ef86a 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k
index 206b11839360a75e7afaf9c95bf7fcd3c846e908..0338ffae207398c99b0825cfa52673a602b77bfe 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p
index f82ed3c1a72150875e866d54cbbf411740602921..2f835015067925e22c057535bcd6cb654ec581b3 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho
index 62bd47723e3fa772b7636b92b8bff586cce1df7e..adf66b766c48338b8326a67935812e3536f28474 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
index 08d6265bc9b7a764aa98c2930903b7ddc067f57c..077dd122bff4002c139827f91d1d61d18fe5e983 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
@@ -24,13 +24,16 @@ refineMeshByCellSet()
 restore0Dir
 
 runApplication blockMesh
+
 refineMeshByCellSet 1 2 3
 
 #echo "mapping fields from 2D throttle case"
 #runApplication mapFields ../throttle -sourceTime latestTime
 
 runApplication decomposePar
+
 runParallel $(getApplication)
+
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties
index 1fe5833cc376c73e5c2fa4b0221b49506e81434b..fb555488e14982decf20fd995ccdce4c87eadfa2 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermodynamicProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties
index 05038dab588c2b171bcb01bb7f6bfcac94c003e8..818e4509569e05f0bffbb40d4eb7c7c1542dff25 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,4 +30,5 @@ vapour
     rho             0.14;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties
index e78377b8625d4cdad2624a7e00a3bd146cd3b3b2..ee92925b72d21433e04995c3587c8044a153846a 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LES;
+simulationType      LES;
 
 LES
 {
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict
index dc95a7f18460aa27fa660e77729421da8969a533..a55a0644046a9653cb9ef0adb7ea01521837e36d 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict
@@ -134,4 +134,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict
index a9e1f78dd9115c79827cc79ac8c4564d523bf0cf..f0da3515b7a266b3ed94caa8eb13b096e0fe4088 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict
index a34c4a69f0745991277c7d7fe5c46317ac76baf5..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict
@@ -23,9 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
-distributed     no;
-
-roots           ( );
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes
index e0f3f18fe0a90cf6a564964b28c064390647faa3..c9fd53133df55d4ee1ec83451fbc11d2923c18bc 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution
index 19df71b9fcbd5f194cc0259936d3015180eadfe4..841fd8077e5b01d4ac27e24a7485a0b0ef979d68 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict
index 8600f7ee4c91e33a9494c36798fc0964cd6576f9..6b04f02d83289486797e6d6268ebdd4a60de9612 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      refineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
index 2e80e36f41c817767a09af694acba4af5962751c..1ebc06e75716b2abfea7b321dae98f802ebd9be5 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
index f73afa1d5bfbc3cb8e00c2848e3a650265356d64..60660a9f091095de9519dfb9af1ff3841864c173 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
index 040addae2ba097d36acca085f2de539558e51bc1..a67aa89b52df894a6e76c8cbb899b7f7c105771d 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U
index f7baa3cafd6fcd6616f17103235897b146282655..6dd8873a43f0a29c18b12585e67772fa7e4aab9b 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour
index ae5e042974ec8ff9f4213f06aa9ac8c42a469e40..e5cdee1276ac351baf50a5801e158703551366d3 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p
index 8da5d6c17ab1403788e35449ab6cdbe720fb098a..677b4fe31ad07a2df63905ad9416ba0ca9b47e5d 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho
index 01307c981c382421f6274d10a1458df309603a77..2430792461c8ba0b011827afd1c816f5415aec81 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties
index f2100c3b6684d33a68d36cfa925b008d04febcd9..fb555488e14982decf20fd995ccdce4c87eadfa2 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermodynamicProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,4 +26,5 @@ pSat            4500;
 
 rhoMin          0.001;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties
index 05038dab588c2b171bcb01bb7f6bfcac94c003e8..818e4509569e05f0bffbb40d4eb7c7c1542dff25 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,4 +30,5 @@ vapour
     rho             0.14;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties
index 4bdf335073b4e55e629185f23017975968a27fd7..a8013f99c88d5dbb4c98d98b510328d759741827 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict
index 6f92f85be601c1ccd5120f1b10f1c9c6a71da426..db84b6156d82b33549d820175544a8287f71deea 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict
@@ -134,4 +134,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict
index cda1fa902881e8f8995b5e2143cee28e1d17e125..638e154d5b3beb79c398585367ec60ddfa5e8bcc 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes
index 278bd03facf3e21c45ae2f67619f2cb19dfb4803..80337e1ef1bf738f0f709437e3fafb14af0d9b56 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,6 +27,7 @@ interpolationSchemes
 divSchemes
 {
     default         none;
+
     div(phi,rho)    Gauss limitedLinear 1;
     div(rhoPhi,U)   Gauss limitedLinearV 1;
     div(phi,omega)  Gauss limitedLinear 1;
@@ -52,7 +52,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution
index bbb0ffc245dc0879d053e225e7813b8f64651b5a..428b34bf323aa50ccfe3082d8a62deec82a68ebd 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict
index 02c398db238a1865b9d125b9891cbc77bc8d8036..be9fb70811a9080d43d5056fdb82f22e39ebc1aa 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      refineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
index 2e80e36f41c817767a09af694acba4af5962751c..1ebc06e75716b2abfea7b321dae98f802ebd9be5 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
index f73afa1d5bfbc3cb8e00c2848e3a650265356d64..60660a9f091095de9519dfb9af1ff3841864c173 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
index 040addae2ba097d36acca085f2de539558e51bc1..a67aa89b52df894a6e76c8cbb899b7f7c105771d 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict.3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T
index 5bd7361221f4e0d7b3810e6457fbba515edbe37d..b5aec6caacfd642762bb9a928f7888e1bd75d2b7 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U
index f4400b92b9fb41fa94cea5d85edc20204c46e9d5..8aae30e0ed6c630e073bdf2ccd2d29c385123731 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U
@@ -37,4 +37,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water
index be5471701ce99b5127c455b5d5f1cbd9b6b1fa8c..aca52b40d6cdf639706b6754265a0584803fc6f8 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p
index f7e1d4d4669a7d962501c6e8ec86d52066b4407b..67df9418b46f6cf5a346552349966be38b39f301 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p
@@ -37,4 +37,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh
index 1f7ba75814557c18de5021492bc4651728f2517c..ac6377bf32d035245ad133a8dbff789f58e3b3ef 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
index 5c1363c36f186c1e372991fbe46b5bbd68078656..a79cc4085dfec1089665403ee5548ac371e4fade 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties
index cbbd439e65d6af062c2142a25883f9f0417a3aa3..49fa457e2106cd61759bbb2059f048d89863f429 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties
@@ -10,15 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 pMin            1000;
 
 sigma           0;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air
index 4e26caef401214678d39d02b0f7939fe3b11408e..3461f00cbbb2f83e2bd21e56afe805d74fee9db8 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water
index 331814358584eede2999df2cee4036329109612c..1ec6586814e229ff82382aef3f86fee509e4b313 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties
index 17cc2918337abe9d6b842963e5d9fa5ec32e1e32..14191a2360a3761d8cbc1e797dd3ea6995743ac2 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
index 93df557d7aafc1b95d3fba1f0c44989fe03976f2..82757258457a95f8d43b621b4a117c3b2e198bf1 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict
index df13f4e670707bcb89e06456400826778d225b07..d569ffffc01e6d0b8527cd6799c00b49fa9b194c 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 3 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes
index 9818cdc2203ff43bac5386be552b02061716cc92..caba7226a7fe526de9ee4704b26edde4b4a01774 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,4 +56,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
index f5a0898f94460a7c20b5e38cdca83a5496560c6e..89490af6612fed1bf5836b292e3fae31977c3eb3 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict
index 39cff1bf12c499544a880157eba4ccbac1fc5de2..a09f27caa04daa40edb3bb8f1637353a31aa5c50 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun
index 7bd9a171455a428f8bbe0493abecc20a9c140bbc..9406f6ea5054d9c8eec56c62dce337d755e60e77 100755
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun
@@ -4,6 +4,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 runApplication topoSet
 
 # remove empty patches
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
index ff75ba67a16c05845e1909f184b112e0f0eecf0d..74d9d099b2e5a040ae8d61e85bb4d288929a36bf 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -105,4 +104,5 @@ displacementLayeredMotionCoeffs
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g
index eb9ef76472bfa8b1fa83bcdd5a567f981af6d0ba..d549aafe23c983c1f71cce9dcda4b242ca4e3be3 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/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 -9.81 0 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties
index 63ba13e090e5a0a77f4363e01f87c4757a68c814..fc2860995b52b85b2fd4cc381a16e555dfa9bc7e 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties
@@ -10,15 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
-pMin            pMin [1 -1 -2 0 0 0 0] 1000;
+pMin            1000;
+
+sigma           0.07;
 
-sigma           sigma [1 0 -2 0 0 0 0] 0.07;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air
index 4e26caef401214678d39d02b0f7939fe3b11408e..3461f00cbbb2f83e2bd21e56afe805d74fee9db8 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water
index 91721783b2e22beaf276e40fa489c3f2672866cb..5d99e3e2258d219c1bf16132445162153bc066f5 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
index c2f778d436394e83cab70a304b2de75435f16c16..1c5c09e87d1789df544f32d4b3ffb076442c4307 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,4 +30,5 @@ air
     rho             1;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T
index 49509d27ef6f7804162cba28897d8de785c1e8ec..23085b16262e957aa848300ad9487090f0ff2050 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T
@@ -34,4 +34,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid
index 8c1cfff2c7f05a9b32afe3a085e551c0e078174e..833770f5d36c708b76f2a03cf9d04465f6cf08fe 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid
@@ -34,4 +34,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p
index e2eee474df1bd36d0de7d6c8f103b41394ad256d..49dddf94f2ae24e344b8831b264df4e32a43f0f3 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p
@@ -35,4 +35,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh
index c325260cc7f094aec87ac562764694092354e8b4..c5942f5df6df799295726b6938a0444e9753c5cb 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh
@@ -35,4 +35,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun
index 316fb4d9fb2c421202cf3cc9aa27bb73099139c1..01b0311740192436f091011847c681311c030762 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun
@@ -4,11 +4,13 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 runApplication extrudeMesh
 
 restore0Dir
 
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README.md
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README
rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README.md
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions
index 858312aa9dbd1c809d53c1abbc92ff27a54c485f..e91f727309418866b4701726e79e1804cdb7f557 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties
index 2e80464dfcc1d5ca3312e8eeb30f48b2006074f1..821cc40f4f9eadd5f6ff84e97ebe54ae50ee9eca 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties
@@ -10,15 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (liquid air);
+phases          (liquid air);
 
-pMin        10000;
+pMin            10000;
+
+sigma           0.0309;
 
-sigma       0.0309;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air
index b3b37a11661c77c2afabdb40d67a4d992b15312b..d3978c6c74cb9f8eed70673709103e7ef9781876 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
index df77fddda7cb9602b39bea1f62f35e1ef7552709..dd6d219817d9c95865a67dabfb9ae3fbd27b24c6 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties
index dfec0fcf56cc3d9d1db8b2edbac3e74cde7b97e5..38ab5df9e21cfea4cce91ec38fd62ae877a3802c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
index a7800f7a761c2830a8910782b4e0fdd5ba24d606..a9a9f62b28d9f2a63534543d0f9ece703086bbe1 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict
index 501d37d5dd736fceaab71116d8d384356a855ced..552fc1a943266374b74d4d2216f75b3b59542d79 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict
@@ -111,4 +111,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
index 97cae911d8d2fc9505fd3c3719ecd7139943c1e4..590c8e86d360e3b7f623d1a23a5c7fc188ff1ebe 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
index 8cc09850d2050182f71c6a46e690bf761acabdef..bd262c8f99533f6134f5e8e74666970469fce23c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
@@ -33,4 +33,5 @@ flipNormals false;
 
 mergeFaces  false;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes
index b96fb66c7e598212f84a5195ccc45f404f12c028..de272046d8f029298e6e3e7a98e4d70b4b286096 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution
index 4ee8c5b4bf658aa580a452f54cf2b092eed9e3a7..c55b40e63aa64fefc92a851509dc46789224907b 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict
index faabf2cb1631fa94c18b4a2d41ff5f28960af353..882e325a1c6a987ba2c8333f89100bac9409f779 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T
index 0a2e987bc42623e700a6a9495bb430f67a08720b..8c11db8f3fe96a69ef162b4f1231cc2c74728be5 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U
index c55c20bf7b293e12e54397ec14a47b8c1a54ab0b..0acd7f37cace20c938a0b6c213fbf238493702c8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water
index f1b4aa5d64fa6142ceb93eebcc7dc3328a6e1abe..c2b40f30eb6c5d1feb4a2f1abb7786299dc9336a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p
index 7242894261bad53351b81eb189c949c4170e31ac..6d8fac3490375c3b8caab6966b10e255449bdf31 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p
@@ -32,4 +32,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh
index 4ba2a87bce634165e609cf9828698dea18cbba28..b44869f693600d0af20be9e23a0d5b8dac4186ac 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
index b7317548189fffb0621b791259fb29d78760b528..6f75dcbe9b225ac032797b4d7e87615598521603 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
@@ -4,8 +4,11 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 restore0Dir
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
index 73d356bf27c72b7ade5ec7c55d88ed15473a0cb0..4f12bd376a63c36a400d2c4d1f4fe912ca7f0862 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
@@ -10,19 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
-pMin        10000;
+pMin            10000;
 
 sigma
 {
-    type    constant;
-    sigma   0.07;
+    type        constant;
+    sigma       0.07;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
index 4e26caef401214678d39d02b0f7939fe3b11408e..3461f00cbbb2f83e2bd21e56afe805d74fee9db8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
index 476e01ef73073e14ac0d48e1685246db6efa7034..1ec6586814e229ff82382aef3f86fee509e4b313 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,5 +49,4 @@ mixture
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
index 726c4fa753c151edb227ffa23c4fb4f3027fc268..1b1fb8c6d9ce4b5c9c5b3714770baaf733dac9ad 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
@@ -49,4 +49,5 @@ patches
     )
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
index 235892e01ba590ca7173550f89c97afeb1dbd33a..3189e30576b65a1d29b48faed15219dfd46d7158 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
index b76be9b0d672998a482bdb5d542d43ac7b443a1a..3152139fb4bdbc1faca9a76bc4f2ae4577c74ed8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,4 +53,5 @@ snGradSchemes
     default         uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
index 806544b0cdba5d77cba86bd41a0f595c7da10905..4fbe6ba118664589d1b9779ae3879873220c4705 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
index 6b77dac570e6a118b2ca33c04ef36c236296a031..f68e139d7a8c89adea3cc4895731adfb27c4dd0c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T
index 0a2e987bc42623e700a6a9495bb430f67a08720b..8c11db8f3fe96a69ef162b4f1231cc2c74728be5 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U
index c55c20bf7b293e12e54397ec14a47b8c1a54ab0b..0acd7f37cace20c938a0b6c213fbf238493702c8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
index f1b4aa5d64fa6142ceb93eebcc7dc3328a6e1abe..c2b40f30eb6c5d1feb4a2f1abb7786299dc9336a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p
index 7242894261bad53351b81eb189c949c4170e31ac..6d8fac3490375c3b8caab6966b10e255449bdf31 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p
@@ -32,4 +32,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh
index 1159752eee572705b679f90a2eb7275eba9702ea..005fa9a14d0ac4145b4298921195db39c1cd379a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh
@@ -32,4 +32,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
index 02b2d981f376706913ce5194fbaa0bf40fd76c08..ba5c6cd4f044d1f4fec24fc7feac4b1f35e73bff 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
@@ -4,10 +4,15 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 restore0Dir
+
 runApplication setFields
+
 runApplication decomposePar
+
 runParallel $(getApplication)
+
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
index 84c2163377085b21aebc5c687d37989186ea2c70..24fab8a8adfff953cc6635e8c9259c97f99dbc5f 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
@@ -10,15 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
-pMin        10000;
+pMin            10000;
+
+sigma           0.07;
 
-sigma       0.07;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
index 4e26caef401214678d39d02b0f7939fe3b11408e..3461f00cbbb2f83e2bd21e56afe805d74fee9db8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
index f82a05a524abd0baae648c73d2c69346695f25e1..ad5964c9978393cfc96779cd9cb6d7f268e667b9 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
index 567218a756530e7516d13b0642f7d4f65cfdb108..4497d57f341d16406523a03ddb446407f461f9eb 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
@@ -50,4 +50,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
index a0834cb5663eb5f9d771f31397043e39199a9bc0..60f8aa281271de431fc6973dd6b806c06f0a77ea 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
index b76be9b0d672998a482bdb5d542d43ac7b443a1a..3152139fb4bdbc1faca9a76bc4f2ae4577c74ed8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,4 +53,5 @@ snGradSchemes
     default         uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
index 692726b4d44815c310d09be782efa668bf0a8bd9..3db6dae2136f2986f1eece0386926a4a7074ee9f 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
index 354a7c2bf5fcc1acc0feed35359ee4f63a789caa..a6ecdb09c2df296f9cd01a78306f40943198d107 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T
index 1093da2194856e7aa9696f61a3c44d1c9475cd58..301fac88606b39aa437d5f352e2d352324699342 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U
index 0d3b411960edd5664ed330c65c5da83cbab622f0..44f612af5259308545db7e910ecdc2958153a3a8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U
@@ -24,10 +24,12 @@ boundaryField
     {
         type            noSlip;
     }
+
     frontAndBack
     {
         type            empty;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water
index 0ed2df341eeca847007993948f683142487e9b3b..b18c264eca98d2d4c5cad71c9ad686ac84a392d0 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p
index 5b7d50284f4ec5aac5e0d54a21698501c4dbf680..1e2e1a91a9619dc677832aeb1213985f796b5c42 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p
@@ -32,4 +32,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh
index 3f0751ecd54014a4e879e8dce6bc280088095fc1..8ce700c6a7e02d3f6a23a6e4d785b95a39a981ed 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/Allrun.pre b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/Allrun.pre
index dc32010f00b53c6951df4f9a6a239989717ed198..8402842cd95ac8b822427bde784f5427a1b668d4 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/Allrun.pre
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/Allrun.pre
@@ -4,7 +4,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 restore0Dir
+
 runApplication setFields
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties
index 73d356bf27c72b7ade5ec7c55d88ed15473a0cb0..4f12bd376a63c36a400d2c4d1f4fe912ca7f0862 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties
@@ -10,19 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
-pMin        10000;
+pMin            10000;
 
 sigma
 {
-    type    constant;
-    sigma   0.07;
+    type        constant;
+    sigma       0.07;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air
index 4e26caef401214678d39d02b0f7939fe3b11408e..3461f00cbbb2f83e2bd21e56afe805d74fee9db8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water
index 99832c235ae3bf6b65001cea99db31e48dfaf872..1ec6586814e229ff82382aef3f86fee509e4b313 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water
@@ -10,25 +10,9 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-/*
-thermoType
-{
-    type            heRhoThermo;
-    mixture         pureMixture;
-    properties      liquid;
-    energy          sensibleInternalEnergy;
-}
-
-mixture
-{
-    H2O;
-}
-*/
-
 
 thermoType
 {
@@ -65,5 +49,4 @@ mixture
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict
index 039d598b548de71e576e0c011b1867a354ca2d77..f407ad124c8f7cfd3444ba15405eaf06f5ada90a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict
@@ -82,4 +82,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict
index 6b31f9ba9b4bd6dce40185bf7e39b8e4c9763bba..3c1a5e760231949f993007cbb514ed4278c4586b 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,11 +27,12 @@ endTime         5;
 deltaT          0.005;
 
 writeControl    timeStep;
+
 writeInterval   10;
 
 purgeWrite      0;
 
-writeFormat     ascii;  //binary;
+writeFormat     ascii;
 
 writePrecision  16;
 
@@ -44,10 +44,9 @@ timePrecision   10;
 
 runTimeModifiable yes;
 
-//adjustTimeStep  yes;
 maxCo           0.5;
 maxAlphaCo      0.5;
-//maxDeltaT       1;
+
 
 libs        (utilityFunctionObjects);
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict
index 89597becbf09b3f98db1fb0b9570dbb5ba15d3ce..7511837b488e10c6feb1047fac16c7c7b42596e2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict
@@ -18,4 +18,5 @@ numberOfSubdomains 3;
 
 method          scotch;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes
index b76be9b0d672998a482bdb5d542d43ac7b443a1a..3152139fb4bdbc1faca9a76bc4f2ae4577c74ed8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,4 +53,5 @@ snGradSchemes
     default         uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution
index 806544b0cdba5d77cba86bd41a0f595c7da10905..4fbe6ba118664589d1b9779ae3879873220c4705 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict
index 570766804998852bf02fb375f1e1a25c42f8bdfd..b0c30cd551bb5ebcea5058fbce203b52b8187159 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T
index 1853f9996a45dc80cea1a5c74fb68f58bd5faf5b..30ef14e0a50713ed048daac53320121be763e193 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p
index 7eac01f2b720a9994b970592b9c027d1bf49f549..b2b32518c953b0641b8a18bc728ba40e0658eed0 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p
@@ -29,4 +29,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties
index 8f1ab773618ec0c3c7dde92e8eb08b2a4fc171b5..5f4c038afffc9ec1f30f5d64338ac414108ccc87 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties
@@ -5,13 +5,11 @@
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,4 +18,5 @@ radiation off;
 
 radiationModel  none;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties
index 91f83eb540108b317b4ecfc8fbc59c61b4075a2f..c215a804ea42ab4baaf18f16531cc43b9ad25e3f 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties
@@ -31,22 +31,20 @@ mixture
     {
         molWeight   50;
     }
-
     transport
     {
         kappa   80;
     }
-
     thermodynamics
     {
         Hf      0;
         Cp      450;
     }
-
     equationOfState
     {
         rho     8000;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict
index dca7af2941063b427a4da4ae33fd298b3f654bbf..1921be7e94853d132d3d6ff93a2a6dff2019d685 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict
@@ -28,7 +28,6 @@ vertices
     (0  0 0.1)
 );
 
-
 blocks
 (
     hex (0 1 2 3 4 5 6 7) (10 10 1) simpleGrading (1 10 1)
@@ -89,4 +88,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict
index cc2c81dd0e51d0954b74aa9d87d4e54fae5b8185..096bd8463f13dd3b3357c8e6dae9f395a9b683d3 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,11 +27,12 @@ endTime         5;
 deltaT          0.005;
 
 writeControl    timeStep;
+
 writeInterval   10;
 
 purgeWrite      0;
 
-writeFormat     ascii;  //binary;
+writeFormat     ascii;
 
 writePrecision  16;
 
@@ -64,4 +64,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict
index 2b48e0c1aae3c940ca5ea708b91b0236bb9b01c9..e62a5c9bbdaf40ee7ad81ee91697f2f36eb77ed0 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict
@@ -18,4 +18,5 @@ numberOfSubdomains 2;
 
 method          scotch;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes
index 8c93ad122d379e58d2b0cbf154d3c80342ad70f0..9d684697778fa7fadbb3c25b7c1a61a4f61a31c3 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution
index 3aeaccb953718343237a1506f05887524a231260..168b3ba77a401756dd90b131c638c8dccd68c0cd 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,4 +30,5 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T
index 49509d27ef6f7804162cba28897d8de785c1e8ec..23085b16262e957aa848300ad9487090f0ff2050 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T
@@ -34,4 +34,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U
index db516bfd91d01546d6da4a50bc89181beea9ec8a..07fea9e7914f2d5b6f0393a1a0b2d83f08716c68 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid
index 8c1cfff2c7f05a9b32afe3a085e551c0e078174e..833770f5d36c708b76f2a03cf9d04465f6cf08fe 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid
@@ -34,4 +34,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p
index e2eee474df1bd36d0de7d6c8f103b41394ad256d..49dddf94f2ae24e344b8831b264df4e32a43f0f3 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p
@@ -35,4 +35,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh
index c325260cc7f094aec87ac562764694092354e8b4..c5942f5df6df799295726b6938a0444e9753c5cb 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh
@@ -35,4 +35,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/Allrun b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/Allrun
index 316fb4d9fb2c421202cf3cc9aa27bb73099139c1..01b0311740192436f091011847c681311c030762 100755
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/Allrun
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/Allrun
@@ -4,11 +4,13 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 runApplication extrudeMesh
 
 restore0Dir
 
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/README b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/README.md
similarity index 100%
rename from tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/README
rename to tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/README.md
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions
index 858312aa9dbd1c809d53c1abbc92ff27a54c485f..e91f727309418866b4701726e79e1804cdb7f557 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties
index 2e80464dfcc1d5ca3312e8eeb30f48b2006074f1..821cc40f4f9eadd5f6ff84e97ebe54ae50ee9eca 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties
@@ -10,15 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (liquid air);
+phases          (liquid air);
 
-pMin        10000;
+pMin            10000;
+
+sigma           0.0309;
 
-sigma       0.0309;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air
index b3b37a11661c77c2afabdb40d67a4d992b15312b..d3978c6c74cb9f8eed70673709103e7ef9781876 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
index df77fddda7cb9602b39bea1f62f35e1ef7552709..dd6d219817d9c95865a67dabfb9ae3fbd27b24c6 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties
index dfec0fcf56cc3d9d1db8b2edbac3e74cde7b97e5..38ab5df9e21cfea4cce91ec38fd62ae877a3802c 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
index a7800f7a761c2830a8910782b4e0fdd5ba24d606..a9a9f62b28d9f2a63534543d0f9ece703086bbe1 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict
index 501d37d5dd736fceaab71116d8d384356a855ced..552fc1a943266374b74d4d2216f75b3b59542d79 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict
@@ -111,4 +111,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict
index 8f80450bf40a81584b7c5c0fcf2f85a7205da3d4..d92305d0c23af486b37daf7c359ea2b2a11d5d33 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict
index 8cc09850d2050182f71c6a46e690bf761acabdef..bd262c8f99533f6134f5e8e74666970469fce23c 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict
@@ -33,4 +33,5 @@ flipNormals false;
 
 mergeFaces  false;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes
index 0fed507ac59e99637a9a6cb84ab6acb85293af8b..6285469ff7ccbcd33e95ece429f36ae306d8ba91 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution
index 5a704b1b32151a55bf7520aec9fb0ccbbe79b9f9..78287cad4af416c7f4f974020e6ec03cf20655eb 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict
index faabf2cb1631fa94c18b4a2d41ff5f28960af353..882e325a1c6a987ba2c8333f89100bac9409f779 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T
index 0a2e987bc42623e700a6a9495bb430f67a08720b..8c11db8f3fe96a69ef162b4f1231cc2c74728be5 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U
index 516e7372bf1ec54b6c12e562ee63f91c1c56dca1..0acd7f37cace20c938a0b6c213fbf238493702c8 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U
@@ -24,10 +24,12 @@ boundaryField
     {
         type            noSlip;
     }
+
     frontAndBack
     {
         type            empty;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water
index f1b4aa5d64fa6142ceb93eebcc7dc3328a6e1abe..c2b40f30eb6c5d1feb4a2f1abb7786299dc9336a 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p
index 7242894261bad53351b81eb189c949c4170e31ac..6d8fac3490375c3b8caab6966b10e255449bdf31 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p
@@ -32,4 +32,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh
index 4ba2a87bce634165e609cf9828698dea18cbba28..b44869f693600d0af20be9e23a0d5b8dac4186ac 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/Allrun
index 30fed9690edc74843640ca740ea3b4552996bcc0..d60272f8d10296873e86dcb554fcdd45ac1a4712 100755
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/Allrun
@@ -4,10 +4,15 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 restore0Dir
+
 runApplication setFields
+
 runApplication setAlphaField
+
 runApplication $(getApplication)
+
 foamSequenceVTKFiles -vtp
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties
index 73d356bf27c72b7ade5ec7c55d88ed15473a0cb0..4f12bd376a63c36a400d2c4d1f4fe912ca7f0862 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties
@@ -10,19 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
-pMin        10000;
+pMin            10000;
 
 sigma
 {
-    type    constant;
-    sigma   0.07;
+    type        constant;
+    sigma       0.07;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
index 4e26caef401214678d39d02b0f7939fe3b11408e..3461f00cbbb2f83e2bd21e56afe805d74fee9db8 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
index 99832c235ae3bf6b65001cea99db31e48dfaf872..1ec6586814e229ff82382aef3f86fee509e4b313 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
@@ -10,25 +10,9 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-/*
-thermoType
-{
-    type            heRhoThermo;
-    mixture         pureMixture;
-    properties      liquid;
-    energy          sensibleInternalEnergy;
-}
-
-mixture
-{
-    H2O;
-}
-*/
-
 
 thermoType
 {
@@ -65,5 +49,4 @@ mixture
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict
index 726c4fa753c151edb227ffa23c4fb4f3027fc268..1b1fb8c6d9ce4b5c9c5b3714770baaf733dac9ad 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict
@@ -49,4 +49,5 @@ patches
     )
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict
index b3eba361c4b443470b4543c92062cb50c2f6b8cf..a349f2ec33591ffff73ec5bd45cfe85825bb3ef7 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,4 +74,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes
index 0ed64990841c04a39c23e050673868d0e511ba0b..5647002db342097079ec01c52271b300aeecf664 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,4 +55,5 @@ snGradSchemes
     default         uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution
index 872f08e63db087471d0be32e9015b02777c91d66..02c0fb1f061be98912369dc9b73b8ed31e549efb 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict
index 90fded7512f2c1a29fba8b8d999978019595e4e2..52cae3320cc3a809332aa1ec02e3a78e3f0a9ed3 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -35,6 +34,7 @@ composedFunction
         direction (0 0 1);
         scale -1;
     }
-
 }
+
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict
index 6acdee5873d0c8e337f7f670365ac9b5bc348e16..e0bfefcfd3eba0bf88ffa64003626c619dfc36fc 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict
@@ -10,14 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 defaultFieldValues
 (
-//    volScalarFieldValue alpha.water 1
     volScalarFieldValue p_rgh 1e5
     volScalarFieldValue p 1e5
     volScalarFieldValue T 300
@@ -32,20 +30,11 @@ regions
 
         fieldValues
         (
-            //volScalarFieldValue alpha.water 0
             volScalarFieldValue p_rgh 1e6
             volScalarFieldValue p 1e6
             volScalarFieldValue T 578
         );
     }
-   /* boxToCell
-    {
-        box (-10 1 -1) (10 10 1);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 0
-        );
-    }*/
 );
 
 
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T
index 0a2e987bc42623e700a6a9495bb430f67a08720b..8c11db8f3fe96a69ef162b4f1231cc2c74728be5 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U
index 516e7372bf1ec54b6c12e562ee63f91c1c56dca1..0acd7f37cace20c938a0b6c213fbf238493702c8 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U
@@ -24,10 +24,12 @@ boundaryField
     {
         type            noSlip;
     }
+
     frontAndBack
     {
         type            empty;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water
index f1b4aa5d64fa6142ceb93eebcc7dc3328a6e1abe..c2b40f30eb6c5d1feb4a2f1abb7786299dc9336a 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p
index 7242894261bad53351b81eb189c949c4170e31ac..6d8fac3490375c3b8caab6966b10e255449bdf31 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p
@@ -32,4 +32,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh
index 1159752eee572705b679f90a2eb7275eba9702ea..005fa9a14d0ac4145b4298921195db39c1cd379a 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh
@@ -32,4 +32,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allclean
index a3ef4042a2c651541bbbcbe38d29d15c703f41b5..fb1f3847301c377e02e12439ba58cbf303af3ef9 100755
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allclean
@@ -5,6 +5,4 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 cleanCase0
 
-rm -rf processor*
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allrun
index 02b2d981f376706913ce5194fbaa0bf40fd76c08..ba5c6cd4f044d1f4fec24fc7feac4b1f35e73bff 100755
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allrun
@@ -4,10 +4,15 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 restore0Dir
+
 runApplication setFields
+
 runApplication decomposePar
+
 runParallel $(getApplication)
+
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties
index 84c2163377085b21aebc5c687d37989186ea2c70..24fab8a8adfff953cc6635e8c9259c97f99dbc5f 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties
@@ -10,15 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
-pMin        10000;
+pMin            10000;
+
+sigma           0.07;
 
-sigma       0.07;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
index 4e26caef401214678d39d02b0f7939fe3b11408e..3461f00cbbb2f83e2bd21e56afe805d74fee9db8 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
index 331814358584eede2999df2cee4036329109612c..1ec6586814e229ff82382aef3f86fee509e4b313 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict
index 567218a756530e7516d13b0642f7d4f65cfdb108..4497d57f341d16406523a03ddb446407f461f9eb 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict
@@ -50,4 +50,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict
index 4f00a16cb1b145bd3669eb046f61e5dbff39f487..9d58a5fbc531ca1586515d89cd424de5edd31875 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict
index 0cf712db50c017b32feb1698ce71aed4e80f6cdc..042a24ffd8b7947aed58bc544a22d11ebcda62f6 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 4 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes
index 0ed64990841c04a39c23e050673868d0e511ba0b..5647002db342097079ec01c52271b300aeecf664 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,4 +55,5 @@ snGradSchemes
     default         uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution
index 93fe7bbef8c885564f7742733fd63d6efad56361..8a77fe12fe25da09e01d458907cdddc2690005fa 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict
index 354a7c2bf5fcc1acc0feed35359ee4f63a789caa..a6ecdb09c2df296f9cd01a78306f40943198d107 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p
index c896ef3868e9b2cb0e6456b75519af688da89bad..a5f3704a21610b0552e28308efef7cf9c9867a98 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
index 755fc4733e5b0a11307d2fc388c549672f87c552..aeebc21920714b7bf6b861647b73c6c35cffff0f 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
index 9134abbfbf2b401c08d28cdae7ad8998908ef58e..cc36822e88765b83d3e0074bffb6d56f150595d3 100755
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
@@ -6,7 +6,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 restore0Dir
 
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
index 31f0ab23ce3067bde2c075dcb85db34054d8c7ad..d56e844ee64166b2a32b3989967ba5bd04716ddd 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water oil mercury air);
+phases          (water oil mercury air);
 
 pMin            10000;
 
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
index bb3d2e50014d56392428abff9b96a78c71298873..f2c03645500cdc167f67b0ae44452c8751bb14ea 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
index 7239e53527582a4b2d74908fcdeef1aaf02a4b70..7667e21b3137a1189995d14aff8433174de98f11 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
index 8aa850cdd7fd094baab25dbda5ec97d7980fd52a..b2c4a73f396202af8f1e77324f7140c7dfa10b0d 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
index 7676445dfa23a9bb7be5735c449e39daab9ab808..867860524d7db076ba20d4e5a2610eebcfe5f448 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index 835a9bfbf76c2f0bab1927d4262c027e9aa588c0..e4d379c275f127c36e7235d7d48f97bb122db4b5 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index 41f3d7b4e8ef490ead9f3198ba1cd732ab628902..1e395b550c40fd234d2c47b486bdcd0fc649293e 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index b3ef93e7e3adddaf3fad357523219ea3b3c0d57d..987b9fb3ba083d1ba1a6f5a81dec89cc92b2ebc7 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -97,4 +96,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
index 354cada94e9b80c77c066f4a3cded899525c6ce7..4dcccd460a97a631cf6b9f4c5951695a86878c1f 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U
index 3cede6453c89baefcb86e6ce7f2e8bc81fe08265..1abeaee18a351fb492bcd2a21268162a7f948b79 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U
@@ -53,4 +53,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge
index 01ef357fa64be0b72d90a114a2a9c9583110e43c..59e732ac8f22b8df04bde91835f8dfb11300a9fb 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge
@@ -53,4 +53,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon
index bc2f6d3552dc132f23f19b324d6e86b86f3dbdd7..d5f500a4b8cb8da2e7fef28e5bfdd3c6567403bb 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon
@@ -61,4 +61,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k
index 8acadd0a62c04e05d29d0bf6bb36f8878d770f05..8934ac7a62cc75d873517f4099880d4caf8589e7 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k
@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh
index 135599b9e3912b6a92080439af5ce95d51af4ccb..617841e640efc57112bd0b274db167529fc2ca0e 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh
@@ -56,4 +56,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties
index ac07301080e047360f1e04121b658524acfcd677..7aa29edd9332909fd35e1d3067e4680c5d4de591 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (sludge water);
+phases          (sludge water);
 
 sludge
 {
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties
index 8768fc3944da68de7d0cdadce0eadbf78e3cc0d3..9a356e87e8b3bc55a67f2fb6fe5eaa11b2e24b6f 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel buoyantKEpsilon;
+    RASModel        buoyantKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 
     buoyantKEpsilonCoeffs
@@ -30,4 +30,5 @@ RAS
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict
index 023725638224f318e9e457c1fa5003dfd0b26f3c..9b789f79a03c0f31464ccafd3a1d20d7205e0ec9 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict
@@ -102,4 +102,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict
index fe1114b11861e0d9b1f667680d351b471c09f209..dc875580ae6757b64f055b76c8a35303b60efca6 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ maxCo           5;
 
 maxDeltaT       1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes
index bedf86254f4abc013afcd426eb8869ba039d002e..09ee79385afd122939e58dd6f7a6cb562f72ee67 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,4 +53,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution
index 1abb9323c758c91946fb46c06bc9a0fa4b4f65be..0fe618cc8f9dae1db83f2cbed0a4ae9cf019ecdb 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge
index 49d0bfda07c315ab31688a5d909088fbaa070d06..d8f89c7d40b22287e823ddcb0e02ab5525e8eb26 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh
index 9b420c815b9a368d02d15288dd2df5eeece4419f..67bd9687ef8201b79c63ad8bd467fad3ffc8adb2 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties
index 43b9d8392403a0d2813917e95d7c17ff17564bc2..58fd56d294fe80c379ac9c8109b9b36a7004953a 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,4 +27,5 @@ MRF1
     omega     constant 6.2831853;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g
index 72a61dd0aa50b58065f024124c802c825bf38720..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/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 -9.81 0);
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties
index ac07301080e047360f1e04121b658524acfcd677..7aa29edd9332909fd35e1d3067e4680c5d4de591 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (sludge water);
+phases          (sludge water);
 
 sludge
 {
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties
index 8768fc3944da68de7d0cdadce0eadbf78e3cc0d3..9a356e87e8b3bc55a67f2fb6fe5eaa11b2e24b6f 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel buoyantKEpsilon;
+    RASModel        buoyantKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 
     buoyantKEpsilonCoeffs
@@ -30,4 +30,5 @@ RAS
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict
index 23416edf2ce393354fcbb933b3ff57a045f4689f..0d31a91f5228428b6299948781c4b1d05aaf7b7d 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes
index 5cd9876a4232c1cf5d23d2d719293a66b77df639..62b24c8d9bacd1c0b11cb0740140eaf74493f192 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,4 +55,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution
index 6a7902b22101b41e823ce8bdcdb5a2d9377bc36f..50343e9aa435df286a5a9749e7eecd895f8bf41e 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
index e80ff4b1c1725c5c4ad5527619ffee69dea399e5..4268bb1969b92c7342a0e532f4abc85f48a685c5 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
index 403e370591760a67ca21e33f8251ffcb572c6684..ef51cdb1736e7be4004dc8b25c8e4a6acfaad771 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U
index db5b60941a3c93db5429748b7dba5001e1c258a6..41756d80c68409b30ed2e29887a7d1bc76f4ef51 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U
@@ -129,4 +129,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge
index 1ab2316428da3f0f01f53bb7b8feb38d3920a0bf..12276306d47f4083a5837cd2a8abcca7b017575d 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge
@@ -63,4 +63,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon
index 735ef825e25693e69cf31bc3b1e4961d7bac4c7b..a7c81595e0751e6d223732d71f725ab3ad1947f1 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon
@@ -64,4 +64,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k
index 3cb7069fdf9af9951e3ebf5697d5482f81398473..ff1a7c53b4b9b24ebb3b7efaeb525ffd9d273425 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k
@@ -64,4 +64,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut
index ebe57fa30d64a1d09310c23b501553e01ad663de..ecca4835ed79aa7b989c84a3769b2bdf4fa4147d 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh
index e38402b5c611452995463dd153b5fe54add53489..d6bd571dd2e5e815a9019d7bf209b4ffd06ebf42 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh
@@ -69,4 +69,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun
index ad391b25ac18261784068292328d58a841fc0a7d..3cd2400ec9aba7df7612bfc3905d130fdfedce23 100755
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun
@@ -4,6 +4,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 cp -rf constant/polyMesh.orig constant/polyMesh
+
 restore0Dir
 
 runApplication $(getApplication)
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties
index befa5d398a8b80447b352abb3f3616b322e597e1..f5e4794c8a93cc55fa6094564e87102ea3a94e69 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (sludge water);
+phases          (sludge water);
 
 sludge
 {
@@ -54,4 +53,5 @@ relativeVelocityModel simple;
     residualAlpha   0;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties
index 8768fc3944da68de7d0cdadce0eadbf78e3cc0d3..9a356e87e8b3bc55a67f2fb6fe5eaa11b2e24b6f 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel buoyantKEpsilon;
+    RASModel        buoyantKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 
     buoyantKEpsilonCoeffs
@@ -30,4 +30,5 @@ RAS
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict
index e1522aa30badfb7451f0f0f3b4e6f02b643484b4..812b845babe959822f9614aaeebc61cf39582151 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/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/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes
index 05d0ca00d767520bed0dacc71c3f89c3835d95ca..193155b1f61266bc029a361c1df1c1802c125dba 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,4 +53,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution
index 0db0db76b779240fdea8c66fc2c5687fef32df4b..9c214b7b7cedc93765ff991c2fa6d6603848ad03 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/T
index cb0dc7a32a2bc6c0c44f44ef923dfd0d12f6f5c6..f21a89cc4cfd3acc22b2228a37a498c7a215f3fe 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/T
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/U b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/U
index 106cce5c19f8112d7ed8403e0f378fe277999f0a..c41ea73601bd3ad2ec44ef948d7c3236090e3936 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/U
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas
index ba7af22b520bdf80c9bb611eb01eadfecf6c65bc..99ef278b58f6bcdb2245aae0e1864291ecf8e5ea 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid
index 57aca06c10020f0d07e385550556d869e0b12226..6e41c252918b362ee383b4a0dc370b97d461bb67 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p
index 4d560ef267f200067982b69425f17d35a88cc5ea..a733a2cb20859e87f1a4eeca81aa36090791555b 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p_rgh
index 4e2f59b4086efed6811323f53814363bb706b921..42cbaff8e904cd53198098d9540f10b69eff02bc 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p_rgh
@@ -51,4 +51,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun
index 9134abbfbf2b401c08d28cdae7ad8998908ef58e..cc36822e88765b83d3e0074bffb6d56f150595d3 100755
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun
@@ -6,7 +6,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 restore0Dir
 
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/g
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas
index 993c4cde2fe67ed9c54dfc1d40f70dd001dd76e2..14a8b3570bb8a783c49baace94d427a775e7cc4f 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas
@@ -46,7 +46,7 @@ vapour
     }
     thermodynamics
     {
-        Hf          0;//-1.338e7; //[J/kg]
+        Hf          0;
         Cp          1900;
     }
     transport
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties
index c6d5f49dc150a436487dc391a97a6e71ed9b598a..a884621163796f9530e8204fcbbb519e47793b51 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties
@@ -10,18 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
+
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
     RASModel        kEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/blockMeshDict
index a63960fed67d182ae0ef5a71618c7906e20e7323..1b461a25593e7ad9f079a10327a0e3b99f8c535e 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/blockMeshDict
@@ -79,4 +79,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/controlDict
index a0ec3ef7855557087dd75ee0ba4eb2ebe2a452e5..b0a8634e446e6e0adb45c4350e8570d8085769a8 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,4 +54,5 @@ maxAlphaCo      1.5;
 
 maxAlphaDdt     1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSchemes
index 91de7fba726f2f6fb8654ea50a8966244b6fe95a..51f594b04f580d8eb611ccc850608c6c026c56b5 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -64,4 +63,6 @@ fluxRequired
     Xvapour.gas;
     "alpha.*";
 }
+
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSolution
index b8d923c24dba7a09d05b22775371195a36543153..5afed91e417d07db56dade349d03623b8026537d 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -70,12 +69,9 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0.01;
-
         nPreSweeps      0;
         nPostSweeps     2;
-
         cacheAgglomeration true;
-
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/setFieldsDict
index e0d10ac6d4c62c6b59d45a3f4f8f269869b8131c..0294fbbb98dc147fb0333de6ea94f763d26c766b 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/setFieldsDict
@@ -33,4 +33,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/T
index 278923c502570097b0d3934d4e4057de3a4b2bc7..c803d45cc750d96b83390eab77246335b872b693 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/T
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/U b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/U
index c0a1da3aed7cebb4278e6bf85579e55641396e85..8491b82e0f09d7003a00515ff095fee09b7a2e97 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p
index 4d560ef267f200067982b69425f17d35a88cc5ea..a733a2cb20859e87f1a4eeca81aa36090791555b 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh
index 5f8f0b96e0e1bea0fdc65d4a04e0ded75a0d97a1..d87d3ffc98d12542fbf37246c07e551ad1442246 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh
@@ -51,4 +51,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun
index 9134abbfbf2b401c08d28cdae7ad8998908ef58e..cc36822e88765b83d3e0074bffb6d56f150595d3 100755
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun
@@ -6,7 +6,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 restore0Dir
 
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/g
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid
index 3a9537484aab6daea774985cfae76e49a8b38af8..6b92f17814ee96acb5d054c16321864f3c151b9f 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid
@@ -81,4 +81,5 @@ O2
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury
index 3f5fb3d62f2e71931ba4fd6144a8139a038871c0..ce79112dc0370cba8a4bc43964cdd7e394c8d784 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury
@@ -71,4 +71,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil
index af2d3f6b49721417a3a426b2393a44740a689e6e..a49ddd7d610c7134f554917283db999927f3a836 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil
@@ -53,4 +53,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties
index 46994ac2fea685b1d2831b1239e9b08ffd9a5dbd..67e69909387289b138a97b5260f401ecca2525c4 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;
+simulationType      laminar;
 
 laminar
 {
-    model       generalizedNewtonian;
+    model           generalizedNewtonian;
 
     viscosityModel  powerLaw;
     nuMin           1e-06;
@@ -28,4 +27,5 @@ laminar
     n               0.4;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict
index 7df23225a90c56aea29b567ff5a3c9976b47094b..b2f5b2147e97796fe208cc9c61cf530a74d9a735 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict
@@ -79,4 +79,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/controlDict
index 06be31bba1068cb9e801e7ad238d53ef0fab500b..964c234ba0ab96bde7a3c1ab1f7e0cefb33c4c06 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,4 +52,5 @@ maxDeltaT       0.2;
 
 maxAlphaCo      1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes
index 1a6c64832489229a49d12af469e382ade2fc2bad..10f5522e4dc3e180cc740dbced5d7cb7f28b1787 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -76,4 +75,5 @@ fluxRequired
     "alpha.*";
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution
index eaf78c1a7e3dfa54093cf8dd4ca6121057b436c5..4542356c815c536aaafc7311941edb3214b3a6bf 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -78,9 +77,7 @@ solvers
         smoother            DICGaussSeidel;
         tolerance           1e-11;
         relTol              0.01;
-
         cacheAgglomeration  true;
-
         nCellsInCoarsestLevel 10;
         agglomerator        faceAreaPair;
         mergeLevels         1;
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict
index 825ab2511d64479adc335266f55531bcd5f93436..de72ac88a05830ed25fcd30b89544cf4fecb11a6 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,7 +40,6 @@ regions
         fieldValues
         (
             volScalarFieldValue alpha.liquid    1
-
             volScalarFieldValue O2.liquid       0.01
             volScalarFieldValue water.liquid    0.99
         );
@@ -65,20 +63,17 @@ regions
         );
     }
 
-
     boxToCell
     {
         box (0 0.5 0) (0.5 1.1 1);
         fieldValues
         (
             volScalarFieldValue alpha.gas       1
-
             volScalarFieldValue vapour.gas      0.3
             volScalarFieldValue CO2.gas         0.2
             volScalarFieldValue air.gas         0.5
         );
     }
-
 );
 
 
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/T
index a6acc2b690920da11fd6be480520a7df6924d17d..a7a83fcff7b7dc5f4895387ef040755ded070dad 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/T
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/U b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/U
index 93a426d89abf7284b9e7bf2adac72a04720ce4f0..845c459bc15339f40459ff05b965475d527aad3f 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/U
@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury
index 2a6cb8ccb670aa56665b94a682fe5516959fa1f3..b59d9d36137fa24e8467d1e3a38e15794784bcee 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury
@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/epsilon b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/epsilon
index 87b4d0ee6387c9c7098fba59ab2a98c05a35f899..97221d4a47ba34606d2599d6d77f45dd579ae33c 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/epsilon
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/epsilon
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/k b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/k
index 88cfaf3aaf1cdd7a1108de4de0c86c031ad2b9f5..196a430d9d3edef9f4267dbe42eb606e7ef6f2be 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/k
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/k
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh
index 4e77489d74bc1b403817d2379e31df0f8c029996..32d9490dc1f59ffc9d88803c9a3548c9e9647b7d 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh
@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun
index 10a82743b441bb70236d4fcd61a5d1f75f6d2e76..5e04c4e2561270322eb098cd6dc040739877d91a 100755
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun
@@ -3,13 +3,16 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-./makeMesh
+./Allrun.pre
 
 restore0Dir
+
 runApplication setFields
-#runApplication $(getApplication)
+
 runApplication decomposePar
+
 runParallel $(getApplication)
+
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/makeMesh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun.pre
similarity index 100%
rename from tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/makeMesh
rename to tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun.pre
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict
index d596fb30ce8dab987f7680cf9be413223e86db55..6a8a2018df28aa8d9ab394f5ce84646af5c02a1f 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,4 +26,5 @@ origin        (0 0 0);
 axis          (0 0 1);
 omega         1.2832; // rad/s
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/g
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/phaseProperties
index b9bd16a4f1a175c298ff023357e89151bcb8d02d..b8f6a5cc8b4252c6f59b29b439e945049bb8682d 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/phaseProperties
@@ -18,7 +18,6 @@ type    massTransferMultiphaseSystem;
 
 phases  (gas mercury oil liquid);
 
-
 oil
 {
     type            pureMovingPhaseModel;
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury
index 3f5fb3d62f2e71931ba4fd6144a8139a038871c0..ce79112dc0370cba8a4bc43964cdd7e394c8d784 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury
@@ -71,4 +71,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil
index af2d3f6b49721417a3a426b2393a44740a689e6e..a49ddd7d610c7134f554917283db999927f3a836 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil
@@ -53,4 +53,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl
deleted file mode 100644
index 94883275879023b9df36a37fd55359261b95f1fd..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl
+++ /dev/null
@@ -1,1346 +0,0 @@
-solid AMI1
-  facet normal 0.999464 -0.0327281 0
-    outer loop
-       vertex 0.06 0 0
-       vertex 0.06 0 0.01
-       vertex 0.0598715 -0.00392419 0.01
-    endloop
-  endfacet
-  facet normal 0.999464 -0.0327281 0
-    outer loop
-       vertex 0.0598715 -0.00392419 0.01
-       vertex 0.0598715 -0.00392419 0
-       vertex 0.06 0 0
-    endloop
-  endfacet
-  facet normal 0.995186 -0.0980062 0
-    outer loop
-       vertex 0.0598715 -0.00392419 0
-       vertex 0.0598715 -0.00392419 0.01
-       vertex 0.0594867 -0.00783157 0.01
-    endloop
-  endfacet
-  facet normal 0.995186 -0.0980062 0
-    outer loop
-       vertex 0.0594867 -0.00783157 0.01
-       vertex 0.0594867 -0.00783157 0
-       vertex 0.0598715 -0.00392419 0
-    endloop
-  endfacet
-  facet normal 0.986642 -0.162902 0
-    outer loop
-       vertex 0.0594867 -0.00783157 0
-       vertex 0.0594867 -0.00783157 0.01
-       vertex 0.0588471 -0.0117054 0.01
-    endloop
-  endfacet
-  facet normal 0.986642 -0.162902 0
-    outer loop
-       vertex 0.0588471 -0.0117054 0.01
-       vertex 0.0588471 -0.0117054 0
-       vertex 0.0594867 -0.00783157 0
-    endloop
-  endfacet
-  facet normal 0.973875 -0.227085 0
-    outer loop
-       vertex 0.0588471 -0.0117054 0
-       vertex 0.0588471 -0.0117054 0.01
-       vertex 0.0579555 -0.0155291 0.01
-    endloop
-  endfacet
-  facet normal 0.973875 -0.227085 0
-    outer loop
-       vertex 0.0579555 -0.0155291 0.01
-       vertex 0.0579555 -0.0155291 0
-       vertex 0.0588471 -0.0117054 0
-    endloop
-  endfacet
-  facet normal 0.956945 -0.29027 0
-    outer loop
-       vertex 0.0579555 -0.0155291 0
-       vertex 0.0579555 -0.0155291 0.01
-       vertex 0.0568158 -0.0192864 0.01
-    endloop
-  endfacet
-  facet normal 0.956945 -0.29027 0
-    outer loop
-       vertex 0.0568158 -0.0192864 0.01
-       vertex 0.0568158 -0.0192864 0
-       vertex 0.0579555 -0.0155291 0
-    endloop
-  endfacet
-  facet normal 0.935908 -0.352245 0
-    outer loop
-       vertex 0.0568158 -0.0192864 0
-       vertex 0.0568158 -0.0192864 0.01
-       vertex 0.0554328 -0.022961 0.01
-    endloop
-  endfacet
-  facet normal 0.935908 -0.352245 0
-    outer loop
-       vertex 0.0554328 -0.022961 0.01
-       vertex 0.0554328 -0.022961 0
-       vertex 0.0568158 -0.0192864 0
-    endloop
-  endfacet
-  facet normal 0.910864 -0.412707 0
-    outer loop
-       vertex 0.0554328 -0.022961 0
-       vertex 0.0554328 -0.022961 0.01
-       vertex 0.0538124 -0.0265373 0.01
-    endloop
-  endfacet
-  facet normal 0.910864 -0.412707 0
-    outer loop
-       vertex 0.0538124 -0.0265373 0.01
-       vertex 0.0538124 -0.0265373 0
-       vertex 0.0554328 -0.022961 0
-    endloop
-  endfacet
-  facet normal 0.881916 -0.471406 0
-    outer loop
-       vertex 0.0538124 -0.0265373 0
-       vertex 0.0538124 -0.0265373 0.01
-       vertex 0.0519615 -0.03 0.01
-    endloop
-  endfacet
-  facet normal 0.881916 -0.471406 0
-    outer loop
-       vertex 0.0519615 -0.03 0.01
-       vertex 0.0519615 -0.03 0
-       vertex 0.0538124 -0.0265373 0
-    endloop
-  endfacet
-  facet normal 0.849207 -0.528061 0
-    outer loop
-       vertex 0.0519615 -0.03 0
-       vertex 0.0519615 -0.03 0.01
-       vertex 0.0498882 -0.0333342 0.01
-    endloop
-  endfacet
-  facet normal 0.849207 -0.528061 0
-    outer loop
-       vertex 0.0498882 -0.0333342 0.01
-       vertex 0.0498882 -0.0333342 0
-       vertex 0.0519615 -0.03 0
-    endloop
-  endfacet
-  facet normal 0.812846 -0.582478 0
-    outer loop
-       vertex 0.0498882 -0.0333342 0
-       vertex 0.0498882 -0.0333342 0.01
-       vertex 0.0476012 -0.0365257 0.01
-    endloop
-  endfacet
-  facet normal 0.812846 -0.582478 0
-    outer loop
-       vertex 0.0476012 -0.0365257 0.01
-       vertex 0.0476012 -0.0365257 0
-       vertex 0.0498882 -0.0333342 0
-    endloop
-  endfacet
-  facet normal 0.773005 -0.634399 0
-    outer loop
-       vertex 0.0476012 -0.0365257 0
-       vertex 0.0476012 -0.0365257 0.01
-       vertex 0.0451104 -0.0395607 0.01
-    endloop
-  endfacet
-  facet normal 0.773005 -0.634399 0
-    outer loop
-       vertex 0.0451104 -0.0395607 0.01
-       vertex 0.0451104 -0.0395607 0
-       vertex 0.0476012 -0.0365257 0
-    endloop
-  endfacet
-  facet normal 0.729867 -0.683589 0
-    outer loop
-       vertex 0.0451104 -0.0395607 0
-       vertex 0.0451104 -0.0395607 0.01
-       vertex 0.0424264 -0.0424264 0.01
-    endloop
-  endfacet
-  facet normal 0.729867 -0.683589 0
-    outer loop
-       vertex 0.0424264 -0.0424264 0.01
-       vertex 0.0424264 -0.0424264 0
-       vertex 0.0451104 -0.0395607 0
-    endloop
-  endfacet
-  facet normal 0.683589 -0.729867 0
-    outer loop
-       vertex 0.0424264 -0.0424264 0
-       vertex 0.0424264 -0.0424264 0.01
-       vertex 0.0395607 -0.0451104 0.01
-    endloop
-  endfacet
-  facet normal 0.683589 -0.729867 0
-    outer loop
-       vertex 0.0395607 -0.0451104 0.01
-       vertex 0.0395607 -0.0451104 0
-       vertex 0.0424264 -0.0424264 0
-    endloop
-  endfacet
-  facet normal 0.634399 -0.773005 0
-    outer loop
-       vertex 0.0395607 -0.0451104 0
-       vertex 0.0395607 -0.0451104 0.01
-       vertex 0.0365257 -0.0476012 0.01
-    endloop
-  endfacet
-  facet normal 0.634399 -0.773005 0
-    outer loop
-       vertex 0.0365257 -0.0476012 0.01
-       vertex 0.0365257 -0.0476012 0
-       vertex 0.0395607 -0.0451104 0
-    endloop
-  endfacet
-  facet normal 0.582478 -0.812846 0
-    outer loop
-       vertex 0.0365257 -0.0476012 0
-       vertex 0.0365257 -0.0476012 0.01
-       vertex 0.0333342 -0.0498882 0.01
-    endloop
-  endfacet
-  facet normal 0.582478 -0.812846 0
-    outer loop
-       vertex 0.0333342 -0.0498882 0.01
-       vertex 0.0333342 -0.0498882 0
-       vertex 0.0365257 -0.0476012 0
-    endloop
-  endfacet
-  facet normal 0.528061 -0.849207 0
-    outer loop
-       vertex 0.0333342 -0.0498882 0
-       vertex 0.0333342 -0.0498882 0.01
-       vertex 0.03 -0.0519615 0.01
-    endloop
-  endfacet
-  facet normal 0.528061 -0.849207 0
-    outer loop
-       vertex 0.03 -0.0519615 0.01
-       vertex 0.03 -0.0519615 0
-       vertex 0.0333342 -0.0498882 0
-    endloop
-  endfacet
-  facet normal 0.471406 -0.881916 0
-    outer loop
-       vertex 0.03 -0.0519615 0
-       vertex 0.03 -0.0519615 0.01
-       vertex 0.0265373 -0.0538124 0.01
-    endloop
-  endfacet
-  facet normal 0.471406 -0.881916 0
-    outer loop
-       vertex 0.0265373 -0.0538124 0.01
-       vertex 0.0265373 -0.0538124 0
-       vertex 0.03 -0.0519615 0
-    endloop
-  endfacet
-  facet normal 0.412707 -0.910864 0
-    outer loop
-       vertex 0.0265373 -0.0538124 0
-       vertex 0.0265373 -0.0538124 0.01
-       vertex 0.022961 -0.0554328 0.01
-    endloop
-  endfacet
-  facet normal 0.412707 -0.910864 0
-    outer loop
-       vertex 0.022961 -0.0554328 0.01
-       vertex 0.022961 -0.0554328 0
-       vertex 0.0265373 -0.0538124 0
-    endloop
-  endfacet
-  facet normal 0.352245 -0.935908 0
-    outer loop
-       vertex 0.022961 -0.0554328 0
-       vertex 0.022961 -0.0554328 0.01
-       vertex 0.0192864 -0.0568158 0.01
-    endloop
-  endfacet
-  facet normal 0.352245 -0.935908 0
-    outer loop
-       vertex 0.0192864 -0.0568158 0.01
-       vertex 0.0192864 -0.0568158 0
-       vertex 0.022961 -0.0554328 0
-    endloop
-  endfacet
-  facet normal 0.29027 -0.956945 0
-    outer loop
-       vertex 0.0192864 -0.0568158 0
-       vertex 0.0192864 -0.0568158 0.01
-       vertex 0.0155291 -0.0579555 0.01
-    endloop
-  endfacet
-  facet normal 0.29027 -0.956945 0
-    outer loop
-       vertex 0.0155291 -0.0579555 0.01
-       vertex 0.0155291 -0.0579555 0
-       vertex 0.0192864 -0.0568158 0
-    endloop
-  endfacet
-  facet normal 0.227085 -0.973875 0
-    outer loop
-       vertex 0.0155291 -0.0579555 0
-       vertex 0.0155291 -0.0579555 0.01
-       vertex 0.0117054 -0.0588471 0.01
-    endloop
-  endfacet
-  facet normal 0.227085 -0.973875 0
-    outer loop
-       vertex 0.0117054 -0.0588471 0.01
-       vertex 0.0117054 -0.0588471 0
-       vertex 0.0155291 -0.0579555 0
-    endloop
-  endfacet
-  facet normal 0.162902 -0.986642 0
-    outer loop
-       vertex 0.0117054 -0.0588471 0
-       vertex 0.0117054 -0.0588471 0.01
-       vertex 0.00783157 -0.0594867 0.01
-    endloop
-  endfacet
-  facet normal 0.162902 -0.986642 0
-    outer loop
-       vertex 0.00783157 -0.0594867 0.01
-       vertex 0.00783157 -0.0594867 0
-       vertex 0.0117054 -0.0588471 0
-    endloop
-  endfacet
-  facet normal 0.0980062 -0.995186 0
-    outer loop
-       vertex 0.00783157 -0.0594867 0
-       vertex 0.00783157 -0.0594867 0.01
-       vertex 0.00392419 -0.0598715 0.01
-    endloop
-  endfacet
-  facet normal 0.0980062 -0.995186 0
-    outer loop
-       vertex 0.00392419 -0.0598715 0.01
-       vertex 0.00392419 -0.0598715 0
-       vertex 0.00783157 -0.0594867 0
-    endloop
-  endfacet
-  facet normal 0.0327281 -0.999464 0
-    outer loop
-       vertex 0.00392419 -0.0598715 0
-       vertex 0.00392419 -0.0598715 0.01
-       vertex 1.07694e-10 -0.06 0.01
-    endloop
-  endfacet
-  facet normal 0.0327281 -0.999464 0
-    outer loop
-       vertex 1.07694e-10 -0.06 0.01
-       vertex 1.07694e-10 -0.06 0
-       vertex 0.00392419 -0.0598715 0
-    endloop
-  endfacet
-  facet normal -0.0327281 -0.999464 0
-    outer loop
-       vertex 1.07694e-10 -0.06 0
-       vertex 1.07694e-10 -0.06 0.01
-       vertex -0.00392419 -0.0598715 0.01
-    endloop
-  endfacet
-  facet normal -0.0327281 -0.999464 -0
-    outer loop
-       vertex -0.00392419 -0.0598715 0.01
-       vertex -0.00392419 -0.0598715 0
-       vertex 1.07694e-10 -0.06 0
-    endloop
-  endfacet
-  facet normal -0.0980062 -0.995186 0
-    outer loop
-       vertex -0.00392419 -0.0598715 0
-       vertex -0.00392419 -0.0598715 0.01
-       vertex -0.00783157 -0.0594867 0.01
-    endloop
-  endfacet
-  facet normal -0.0980062 -0.995186 -0
-    outer loop
-       vertex -0.00783157 -0.0594867 0.01
-       vertex -0.00783157 -0.0594867 0
-       vertex -0.00392419 -0.0598715 0
-    endloop
-  endfacet
-  facet normal -0.162902 -0.986642 0
-    outer loop
-       vertex -0.00783157 -0.0594867 0
-       vertex -0.00783157 -0.0594867 0.01
-       vertex -0.0117054 -0.0588471 0.01
-    endloop
-  endfacet
-  facet normal -0.162902 -0.986642 -0
-    outer loop
-       vertex -0.0117054 -0.0588471 0.01
-       vertex -0.0117054 -0.0588471 0
-       vertex -0.00783157 -0.0594867 0
-    endloop
-  endfacet
-  facet normal -0.227085 -0.973875 0
-    outer loop
-       vertex -0.0117054 -0.0588471 0
-       vertex -0.0117054 -0.0588471 0.01
-       vertex -0.0155291 -0.0579555 0.01
-    endloop
-  endfacet
-  facet normal -0.227085 -0.973875 -0
-    outer loop
-       vertex -0.0155291 -0.0579555 0.01
-       vertex -0.0155291 -0.0579555 0
-       vertex -0.0117054 -0.0588471 0
-    endloop
-  endfacet
-  facet normal -0.29027 -0.956945 0
-    outer loop
-       vertex -0.0155291 -0.0579555 0
-       vertex -0.0155291 -0.0579555 0.01
-       vertex -0.0192864 -0.0568158 0.01
-    endloop
-  endfacet
-  facet normal -0.29027 -0.956945 -0
-    outer loop
-       vertex -0.0192864 -0.0568158 0.01
-       vertex -0.0192864 -0.0568158 0
-       vertex -0.0155291 -0.0579555 0
-    endloop
-  endfacet
-  facet normal -0.352245 -0.935908 0
-    outer loop
-       vertex -0.0192864 -0.0568158 0
-       vertex -0.0192864 -0.0568158 0.01
-       vertex -0.022961 -0.0554328 0.01
-    endloop
-  endfacet
-  facet normal -0.352245 -0.935908 -0
-    outer loop
-       vertex -0.022961 -0.0554328 0.01
-       vertex -0.022961 -0.0554328 0
-       vertex -0.0192864 -0.0568158 0
-    endloop
-  endfacet
-  facet normal -0.412707 -0.910864 0
-    outer loop
-       vertex -0.022961 -0.0554328 0
-       vertex -0.022961 -0.0554328 0.01
-       vertex -0.0265373 -0.0538124 0.01
-    endloop
-  endfacet
-  facet normal -0.412707 -0.910864 -0
-    outer loop
-       vertex -0.0265373 -0.0538124 0.01
-       vertex -0.0265373 -0.0538124 0
-       vertex -0.022961 -0.0554328 0
-    endloop
-  endfacet
-  facet normal -0.471406 -0.881916 0
-    outer loop
-       vertex -0.0265373 -0.0538124 0
-       vertex -0.0265373 -0.0538124 0.01
-       vertex -0.03 -0.0519615 0.01
-    endloop
-  endfacet
-  facet normal -0.471406 -0.881916 -0
-    outer loop
-       vertex -0.03 -0.0519615 0.01
-       vertex -0.03 -0.0519615 0
-       vertex -0.0265373 -0.0538124 0
-    endloop
-  endfacet
-  facet normal -0.528061 -0.849207 0
-    outer loop
-       vertex -0.03 -0.0519615 0
-       vertex -0.03 -0.0519615 0.01
-       vertex -0.0333342 -0.0498882 0.01
-    endloop
-  endfacet
-  facet normal -0.528061 -0.849207 -0
-    outer loop
-       vertex -0.0333342 -0.0498882 0.01
-       vertex -0.0333342 -0.0498882 0
-       vertex -0.03 -0.0519615 0
-    endloop
-  endfacet
-  facet normal -0.582478 -0.812846 0
-    outer loop
-       vertex -0.0333342 -0.0498882 0
-       vertex -0.0333342 -0.0498882 0.01
-       vertex -0.0365257 -0.0476012 0.01
-    endloop
-  endfacet
-  facet normal -0.582478 -0.812846 -0
-    outer loop
-       vertex -0.0365257 -0.0476012 0.01
-       vertex -0.0365257 -0.0476012 0
-       vertex -0.0333342 -0.0498882 0
-    endloop
-  endfacet
-  facet normal -0.634399 -0.773005 0
-    outer loop
-       vertex -0.0365257 -0.0476012 0
-       vertex -0.0365257 -0.0476012 0.01
-       vertex -0.0395607 -0.0451104 0.01
-    endloop
-  endfacet
-  facet normal -0.634399 -0.773005 -0
-    outer loop
-       vertex -0.0395607 -0.0451104 0.01
-       vertex -0.0395607 -0.0451104 0
-       vertex -0.0365257 -0.0476012 0
-    endloop
-  endfacet
-  facet normal -0.683589 -0.729867 0
-    outer loop
-       vertex -0.0395607 -0.0451104 0
-       vertex -0.0395607 -0.0451104 0.01
-       vertex -0.0424264 -0.0424264 0.01
-    endloop
-  endfacet
-  facet normal -0.683589 -0.729867 -0
-    outer loop
-       vertex -0.0424264 -0.0424264 0.01
-       vertex -0.0424264 -0.0424264 0
-       vertex -0.0395607 -0.0451104 0
-    endloop
-  endfacet
-  facet normal -0.729867 -0.683589 0
-    outer loop
-       vertex -0.0424264 -0.0424264 0
-       vertex -0.0424264 -0.0424264 0.01
-       vertex -0.0451104 -0.0395607 0.01
-    endloop
-  endfacet
-  facet normal -0.729867 -0.683589 -0
-    outer loop
-       vertex -0.0451104 -0.0395607 0.01
-       vertex -0.0451104 -0.0395607 0
-       vertex -0.0424264 -0.0424264 0
-    endloop
-  endfacet
-  facet normal -0.773005 -0.634399 0
-    outer loop
-       vertex -0.0451104 -0.0395607 0
-       vertex -0.0451104 -0.0395607 0.01
-       vertex -0.0476012 -0.0365257 0.01
-    endloop
-  endfacet
-  facet normal -0.773005 -0.634399 -0
-    outer loop
-       vertex -0.0476012 -0.0365257 0.01
-       vertex -0.0476012 -0.0365257 0
-       vertex -0.0451104 -0.0395607 0
-    endloop
-  endfacet
-  facet normal -0.812846 -0.582478 0
-    outer loop
-       vertex -0.0476012 -0.0365257 0
-       vertex -0.0476012 -0.0365257 0.01
-       vertex -0.0498882 -0.0333342 0.01
-    endloop
-  endfacet
-  facet normal -0.812846 -0.582478 -0
-    outer loop
-       vertex -0.0498882 -0.0333342 0.01
-       vertex -0.0498882 -0.0333342 0
-       vertex -0.0476012 -0.0365257 0
-    endloop
-  endfacet
-  facet normal -0.849207 -0.528061 0
-    outer loop
-       vertex -0.0498882 -0.0333342 0
-       vertex -0.0498882 -0.0333342 0.01
-       vertex -0.0519615 -0.03 0.01
-    endloop
-  endfacet
-  facet normal -0.849207 -0.528061 -0
-    outer loop
-       vertex -0.0519615 -0.03 0.01
-       vertex -0.0519615 -0.03 0
-       vertex -0.0498882 -0.0333342 0
-    endloop
-  endfacet
-  facet normal -0.881916 -0.471406 0
-    outer loop
-       vertex -0.0519615 -0.03 0
-       vertex -0.0519615 -0.03 0.01
-       vertex -0.0538124 -0.0265373 0.01
-    endloop
-  endfacet
-  facet normal -0.881916 -0.471406 -0
-    outer loop
-       vertex -0.0538124 -0.0265373 0.01
-       vertex -0.0538124 -0.0265373 0
-       vertex -0.0519615 -0.03 0
-    endloop
-  endfacet
-  facet normal -0.910864 -0.412707 0
-    outer loop
-       vertex -0.0538124 -0.0265373 0
-       vertex -0.0538124 -0.0265373 0.01
-       vertex -0.0554328 -0.022961 0.01
-    endloop
-  endfacet
-  facet normal -0.910864 -0.412707 -0
-    outer loop
-       vertex -0.0554328 -0.022961 0.01
-       vertex -0.0554328 -0.022961 0
-       vertex -0.0538124 -0.0265373 0
-    endloop
-  endfacet
-  facet normal -0.935908 -0.352245 0
-    outer loop
-       vertex -0.0554328 -0.022961 0
-       vertex -0.0554328 -0.022961 0.01
-       vertex -0.0568158 -0.0192864 0.01
-    endloop
-  endfacet
-  facet normal -0.935908 -0.352245 -0
-    outer loop
-       vertex -0.0568158 -0.0192864 0.01
-       vertex -0.0568158 -0.0192864 0
-       vertex -0.0554328 -0.022961 0
-    endloop
-  endfacet
-  facet normal -0.956945 -0.29027 0
-    outer loop
-       vertex -0.0568158 -0.0192864 0
-       vertex -0.0568158 -0.0192864 0.01
-       vertex -0.0579555 -0.0155291 0.01
-    endloop
-  endfacet
-  facet normal -0.956945 -0.29027 -0
-    outer loop
-       vertex -0.0579555 -0.0155291 0.01
-       vertex -0.0579555 -0.0155291 0
-       vertex -0.0568158 -0.0192864 0
-    endloop
-  endfacet
-  facet normal -0.973875 -0.227085 0
-    outer loop
-       vertex -0.0579555 -0.0155291 0
-       vertex -0.0579555 -0.0155291 0.01
-       vertex -0.0588471 -0.0117054 0.01
-    endloop
-  endfacet
-  facet normal -0.973875 -0.227085 -0
-    outer loop
-       vertex -0.0588471 -0.0117054 0.01
-       vertex -0.0588471 -0.0117054 0
-       vertex -0.0579555 -0.0155291 0
-    endloop
-  endfacet
-  facet normal -0.986642 -0.162902 0
-    outer loop
-       vertex -0.0588471 -0.0117054 0
-       vertex -0.0588471 -0.0117054 0.01
-       vertex -0.0594867 -0.00783157 0.01
-    endloop
-  endfacet
-  facet normal -0.986642 -0.162902 -0
-    outer loop
-       vertex -0.0594867 -0.00783157 0.01
-       vertex -0.0594867 -0.00783157 0
-       vertex -0.0588471 -0.0117054 0
-    endloop
-  endfacet
-  facet normal -0.995186 -0.0980062 0
-    outer loop
-       vertex -0.0594867 -0.00783157 0
-       vertex -0.0594867 -0.00783157 0.01
-       vertex -0.0598715 -0.00392419 0.01
-    endloop
-  endfacet
-  facet normal -0.995186 -0.0980062 -0
-    outer loop
-       vertex -0.0598715 -0.00392419 0.01
-       vertex -0.0598715 -0.00392419 0
-       vertex -0.0594867 -0.00783157 0
-    endloop
-  endfacet
-  facet normal -0.999464 -0.0327281 0
-    outer loop
-       vertex -0.0598715 -0.00392419 0
-       vertex -0.0598715 -0.00392419 0.01
-       vertex -0.06 2.15388e-10 0.01
-    endloop
-  endfacet
-  facet normal -0.999464 -0.0327281 -0
-    outer loop
-       vertex -0.06 2.15388e-10 0.01
-       vertex -0.06 2.15388e-10 0
-       vertex -0.0598715 -0.00392419 0
-    endloop
-  endfacet
-  facet normal -0.999464 0.0327281 0
-    outer loop
-       vertex -0.06 2.15388e-10 0
-       vertex -0.06 2.15388e-10 0.01
-       vertex -0.0598715 0.00392419 0.01
-    endloop
-  endfacet
-  facet normal -0.999464 0.0327281 0
-    outer loop
-       vertex -0.0598715 0.00392419 0.01
-       vertex -0.0598715 0.00392419 0
-       vertex -0.06 2.15388e-10 0
-    endloop
-  endfacet
-  facet normal -0.995186 0.0980062 0
-    outer loop
-       vertex -0.0598715 0.00392419 0
-       vertex -0.0598715 0.00392419 0.01
-       vertex -0.0594867 0.00783157 0.01
-    endloop
-  endfacet
-  facet normal -0.995186 0.0980062 0
-    outer loop
-       vertex -0.0594867 0.00783157 0.01
-       vertex -0.0594867 0.00783157 0
-       vertex -0.0598715 0.00392419 0
-    endloop
-  endfacet
-  facet normal -0.986642 0.162902 0
-    outer loop
-       vertex -0.0594867 0.00783157 0
-       vertex -0.0594867 0.00783157 0.01
-       vertex -0.0588471 0.0117054 0.01
-    endloop
-  endfacet
-  facet normal -0.986642 0.162902 0
-    outer loop
-       vertex -0.0588471 0.0117054 0.01
-       vertex -0.0588471 0.0117054 0
-       vertex -0.0594867 0.00783157 0
-    endloop
-  endfacet
-  facet normal -0.973875 0.227085 0
-    outer loop
-       vertex -0.0588471 0.0117054 0
-       vertex -0.0588471 0.0117054 0.01
-       vertex -0.0579555 0.0155291 0.01
-    endloop
-  endfacet
-  facet normal -0.973875 0.227085 0
-    outer loop
-       vertex -0.0579555 0.0155291 0.01
-       vertex -0.0579555 0.0155291 0
-       vertex -0.0588471 0.0117054 0
-    endloop
-  endfacet
-  facet normal -0.956945 0.29027 0
-    outer loop
-       vertex -0.0579555 0.0155291 0
-       vertex -0.0579555 0.0155291 0.01
-       vertex -0.0568158 0.0192864 0.01
-    endloop
-  endfacet
-  facet normal -0.956945 0.29027 0
-    outer loop
-       vertex -0.0568158 0.0192864 0.01
-       vertex -0.0568158 0.0192864 0
-       vertex -0.0579555 0.0155291 0
-    endloop
-  endfacet
-  facet normal -0.935908 0.352245 0
-    outer loop
-       vertex -0.0568158 0.0192864 0
-       vertex -0.0568158 0.0192864 0.01
-       vertex -0.0554328 0.022961 0.01
-    endloop
-  endfacet
-  facet normal -0.935908 0.352245 0
-    outer loop
-       vertex -0.0554328 0.022961 0.01
-       vertex -0.0554328 0.022961 0
-       vertex -0.0568158 0.0192864 0
-    endloop
-  endfacet
-  facet normal -0.910864 0.412707 0
-    outer loop
-       vertex -0.0554328 0.022961 0
-       vertex -0.0554328 0.022961 0.01
-       vertex -0.0538124 0.0265373 0.01
-    endloop
-  endfacet
-  facet normal -0.910864 0.412707 0
-    outer loop
-       vertex -0.0538124 0.0265373 0.01
-       vertex -0.0538124 0.0265373 0
-       vertex -0.0554328 0.022961 0
-    endloop
-  endfacet
-  facet normal -0.881916 0.471406 0
-    outer loop
-       vertex -0.0538124 0.0265373 0
-       vertex -0.0538124 0.0265373 0.01
-       vertex -0.0519615 0.03 0.01
-    endloop
-  endfacet
-  facet normal -0.881916 0.471406 0
-    outer loop
-       vertex -0.0519615 0.03 0.01
-       vertex -0.0519615 0.03 0
-       vertex -0.0538124 0.0265373 0
-    endloop
-  endfacet
-  facet normal -0.849207 0.528061 0
-    outer loop
-       vertex -0.0519615 0.03 0
-       vertex -0.0519615 0.03 0.01
-       vertex -0.0498882 0.0333342 0.01
-    endloop
-  endfacet
-  facet normal -0.849207 0.528061 0
-    outer loop
-       vertex -0.0498882 0.0333342 0.01
-       vertex -0.0498882 0.0333342 0
-       vertex -0.0519615 0.03 0
-    endloop
-  endfacet
-  facet normal -0.812846 0.582478 0
-    outer loop
-       vertex -0.0498882 0.0333342 0
-       vertex -0.0498882 0.0333342 0.01
-       vertex -0.0476012 0.0365257 0.01
-    endloop
-  endfacet
-  facet normal -0.812846 0.582478 0
-    outer loop
-       vertex -0.0476012 0.0365257 0.01
-       vertex -0.0476012 0.0365257 0
-       vertex -0.0498882 0.0333342 0
-    endloop
-  endfacet
-  facet normal -0.773005 0.634399 0
-    outer loop
-       vertex -0.0476012 0.0365257 0
-       vertex -0.0476012 0.0365257 0.01
-       vertex -0.0451104 0.0395607 0.01
-    endloop
-  endfacet
-  facet normal -0.773005 0.634399 0
-    outer loop
-       vertex -0.0451104 0.0395607 0.01
-       vertex -0.0451104 0.0395607 0
-       vertex -0.0476012 0.0365257 0
-    endloop
-  endfacet
-  facet normal -0.729867 0.683589 0
-    outer loop
-       vertex -0.0451104 0.0395607 0
-       vertex -0.0451104 0.0395607 0.01
-       vertex -0.0424264 0.0424264 0.01
-    endloop
-  endfacet
-  facet normal -0.729867 0.683589 0
-    outer loop
-       vertex -0.0424264 0.0424264 0.01
-       vertex -0.0424264 0.0424264 0
-       vertex -0.0451104 0.0395607 0
-    endloop
-  endfacet
-  facet normal -0.683589 0.729867 0
-    outer loop
-       vertex -0.0424264 0.0424264 0
-       vertex -0.0424264 0.0424264 0.01
-       vertex -0.0395607 0.0451104 0.01
-    endloop
-  endfacet
-  facet normal -0.683589 0.729867 0
-    outer loop
-       vertex -0.0395607 0.0451104 0.01
-       vertex -0.0395607 0.0451104 0
-       vertex -0.0424264 0.0424264 0
-    endloop
-  endfacet
-  facet normal -0.634399 0.773005 0
-    outer loop
-       vertex -0.0395607 0.0451104 0
-       vertex -0.0395607 0.0451104 0.01
-       vertex -0.0365257 0.0476012 0.01
-    endloop
-  endfacet
-  facet normal -0.634399 0.773005 0
-    outer loop
-       vertex -0.0365257 0.0476012 0.01
-       vertex -0.0365257 0.0476012 0
-       vertex -0.0395607 0.0451104 0
-    endloop
-  endfacet
-  facet normal -0.582478 0.812846 0
-    outer loop
-       vertex -0.0365257 0.0476012 0
-       vertex -0.0365257 0.0476012 0.01
-       vertex -0.0333342 0.0498882 0.01
-    endloop
-  endfacet
-  facet normal -0.582478 0.812846 0
-    outer loop
-       vertex -0.0333342 0.0498882 0.01
-       vertex -0.0333342 0.0498882 0
-       vertex -0.0365257 0.0476012 0
-    endloop
-  endfacet
-  facet normal -0.528061 0.849207 0
-    outer loop
-       vertex -0.0333342 0.0498882 0
-       vertex -0.0333342 0.0498882 0.01
-       vertex -0.03 0.0519615 0.01
-    endloop
-  endfacet
-  facet normal -0.528061 0.849207 0
-    outer loop
-       vertex -0.03 0.0519615 0.01
-       vertex -0.03 0.0519615 0
-       vertex -0.0333342 0.0498882 0
-    endloop
-  endfacet
-  facet normal -0.471406 0.881916 0
-    outer loop
-       vertex -0.03 0.0519615 0
-       vertex -0.03 0.0519615 0.01
-       vertex -0.0265373 0.0538124 0.01
-    endloop
-  endfacet
-  facet normal -0.471406 0.881916 0
-    outer loop
-       vertex -0.0265373 0.0538124 0.01
-       vertex -0.0265373 0.0538124 0
-       vertex -0.03 0.0519615 0
-    endloop
-  endfacet
-  facet normal -0.412707 0.910864 0
-    outer loop
-       vertex -0.0265373 0.0538124 0
-       vertex -0.0265373 0.0538124 0.01
-       vertex -0.022961 0.0554328 0.01
-    endloop
-  endfacet
-  facet normal -0.412707 0.910864 0
-    outer loop
-       vertex -0.022961 0.0554328 0.01
-       vertex -0.022961 0.0554328 0
-       vertex -0.0265373 0.0538124 0
-    endloop
-  endfacet
-  facet normal -0.352245 0.935908 0
-    outer loop
-       vertex -0.022961 0.0554328 0
-       vertex -0.022961 0.0554328 0.01
-       vertex -0.0192864 0.0568158 0.01
-    endloop
-  endfacet
-  facet normal -0.352245 0.935908 0
-    outer loop
-       vertex -0.0192864 0.0568158 0.01
-       vertex -0.0192864 0.0568158 0
-       vertex -0.022961 0.0554328 0
-    endloop
-  endfacet
-  facet normal -0.29027 0.956945 0
-    outer loop
-       vertex -0.0192864 0.0568158 0
-       vertex -0.0192864 0.0568158 0.01
-       vertex -0.0155291 0.0579555 0.01
-    endloop
-  endfacet
-  facet normal -0.29027 0.956945 0
-    outer loop
-       vertex -0.0155291 0.0579555 0.01
-       vertex -0.0155291 0.0579555 0
-       vertex -0.0192864 0.0568158 0
-    endloop
-  endfacet
-  facet normal -0.227085 0.973875 0
-    outer loop
-       vertex -0.0155291 0.0579555 0
-       vertex -0.0155291 0.0579555 0.01
-       vertex -0.0117054 0.0588471 0.01
-    endloop
-  endfacet
-  facet normal -0.227085 0.973875 0
-    outer loop
-       vertex -0.0117054 0.0588471 0.01
-       vertex -0.0117054 0.0588471 0
-       vertex -0.0155291 0.0579555 0
-    endloop
-  endfacet
-  facet normal -0.162902 0.986642 0
-    outer loop
-       vertex -0.0117054 0.0588471 0
-       vertex -0.0117054 0.0588471 0.01
-       vertex -0.00783157 0.0594867 0.01
-    endloop
-  endfacet
-  facet normal -0.162902 0.986642 0
-    outer loop
-       vertex -0.00783157 0.0594867 0.01
-       vertex -0.00783157 0.0594867 0
-       vertex -0.0117054 0.0588471 0
-    endloop
-  endfacet
-  facet normal -0.0980062 0.995186 0
-    outer loop
-       vertex -0.00783157 0.0594867 0
-       vertex -0.00783157 0.0594867 0.01
-       vertex -0.00392419 0.0598715 0.01
-    endloop
-  endfacet
-  facet normal -0.0980062 0.995186 0
-    outer loop
-       vertex -0.00392419 0.0598715 0.01
-       vertex -0.00392419 0.0598715 0
-       vertex -0.00783157 0.0594867 0
-    endloop
-  endfacet
-  facet normal -0.0327281 0.999464 0
-    outer loop
-       vertex -0.00392419 0.0598715 0
-       vertex -0.00392419 0.0598715 0.01
-       vertex 1.07694e-10 0.06 0.01
-    endloop
-  endfacet
-  facet normal -0.0327281 0.999464 0
-    outer loop
-       vertex 1.07694e-10 0.06 0.01
-       vertex 1.07694e-10 0.06 0
-       vertex -0.00392419 0.0598715 0
-    endloop
-  endfacet
-  facet normal 0.0327281 0.999464 -0
-    outer loop
-       vertex 1.07694e-10 0.06 0
-       vertex 1.07694e-10 0.06 0.01
-       vertex 0.00392419 0.0598715 0.01
-    endloop
-  endfacet
-  facet normal 0.0327281 0.999464 0
-    outer loop
-       vertex 0.00392419 0.0598715 0.01
-       vertex 0.00392419 0.0598715 0
-       vertex 1.07694e-10 0.06 0
-    endloop
-  endfacet
-  facet normal 0.0980062 0.995186 -0
-    outer loop
-       vertex 0.00392419 0.0598715 0
-       vertex 0.00392419 0.0598715 0.01
-       vertex 0.00783157 0.0594867 0.01
-    endloop
-  endfacet
-  facet normal 0.0980062 0.995186 0
-    outer loop
-       vertex 0.00783157 0.0594867 0.01
-       vertex 0.00783157 0.0594867 0
-       vertex 0.00392419 0.0598715 0
-    endloop
-  endfacet
-  facet normal 0.162902 0.986642 -0
-    outer loop
-       vertex 0.00783157 0.0594867 0
-       vertex 0.00783157 0.0594867 0.01
-       vertex 0.0117054 0.0588471 0.01
-    endloop
-  endfacet
-  facet normal 0.162902 0.986642 0
-    outer loop
-       vertex 0.0117054 0.0588471 0.01
-       vertex 0.0117054 0.0588471 0
-       vertex 0.00783157 0.0594867 0
-    endloop
-  endfacet
-  facet normal 0.227085 0.973875 -0
-    outer loop
-       vertex 0.0117054 0.0588471 0
-       vertex 0.0117054 0.0588471 0.01
-       vertex 0.0155291 0.0579555 0.01
-    endloop
-  endfacet
-  facet normal 0.227085 0.973875 0
-    outer loop
-       vertex 0.0155291 0.0579555 0.01
-       vertex 0.0155291 0.0579555 0
-       vertex 0.0117054 0.0588471 0
-    endloop
-  endfacet
-  facet normal 0.29027 0.956945 -0
-    outer loop
-       vertex 0.0155291 0.0579555 0
-       vertex 0.0155291 0.0579555 0.01
-       vertex 0.0192864 0.0568158 0.01
-    endloop
-  endfacet
-  facet normal 0.29027 0.956945 0
-    outer loop
-       vertex 0.0192864 0.0568158 0.01
-       vertex 0.0192864 0.0568158 0
-       vertex 0.0155291 0.0579555 0
-    endloop
-  endfacet
-  facet normal 0.352245 0.935908 -0
-    outer loop
-       vertex 0.0192864 0.0568158 0
-       vertex 0.0192864 0.0568158 0.01
-       vertex 0.022961 0.0554328 0.01
-    endloop
-  endfacet
-  facet normal 0.352245 0.935908 0
-    outer loop
-       vertex 0.022961 0.0554328 0.01
-       vertex 0.022961 0.0554328 0
-       vertex 0.0192864 0.0568158 0
-    endloop
-  endfacet
-  facet normal 0.412707 0.910864 -0
-    outer loop
-       vertex 0.022961 0.0554328 0
-       vertex 0.022961 0.0554328 0.01
-       vertex 0.0265373 0.0538124 0.01
-    endloop
-  endfacet
-  facet normal 0.412707 0.910864 0
-    outer loop
-       vertex 0.0265373 0.0538124 0.01
-       vertex 0.0265373 0.0538124 0
-       vertex 0.022961 0.0554328 0
-    endloop
-  endfacet
-  facet normal 0.471406 0.881916 -0
-    outer loop
-       vertex 0.0265373 0.0538124 0
-       vertex 0.0265373 0.0538124 0.01
-       vertex 0.03 0.0519615 0.01
-    endloop
-  endfacet
-  facet normal 0.471406 0.881916 0
-    outer loop
-       vertex 0.03 0.0519615 0.01
-       vertex 0.03 0.0519615 0
-       vertex 0.0265373 0.0538124 0
-    endloop
-  endfacet
-  facet normal 0.528061 0.849207 -0
-    outer loop
-       vertex 0.03 0.0519615 0
-       vertex 0.03 0.0519615 0.01
-       vertex 0.0333342 0.0498882 0.01
-    endloop
-  endfacet
-  facet normal 0.528061 0.849207 0
-    outer loop
-       vertex 0.0333342 0.0498882 0.01
-       vertex 0.0333342 0.0498882 0
-       vertex 0.03 0.0519615 0
-    endloop
-  endfacet
-  facet normal 0.582478 0.812846 -0
-    outer loop
-       vertex 0.0333342 0.0498882 0
-       vertex 0.0333342 0.0498882 0.01
-       vertex 0.0365257 0.0476012 0.01
-    endloop
-  endfacet
-  facet normal 0.582478 0.812846 0
-    outer loop
-       vertex 0.0365257 0.0476012 0.01
-       vertex 0.0365257 0.0476012 0
-       vertex 0.0333342 0.0498882 0
-    endloop
-  endfacet
-  facet normal 0.634399 0.773005 -0
-    outer loop
-       vertex 0.0365257 0.0476012 0
-       vertex 0.0365257 0.0476012 0.01
-       vertex 0.0395607 0.0451104 0.01
-    endloop
-  endfacet
-  facet normal 0.634399 0.773005 0
-    outer loop
-       vertex 0.0395607 0.0451104 0.01
-       vertex 0.0395607 0.0451104 0
-       vertex 0.0365257 0.0476012 0
-    endloop
-  endfacet
-  facet normal 0.683589 0.729867 -0
-    outer loop
-       vertex 0.0395607 0.0451104 0
-       vertex 0.0395607 0.0451104 0.01
-       vertex 0.0424264 0.0424264 0.01
-    endloop
-  endfacet
-  facet normal 0.683589 0.729867 0
-    outer loop
-       vertex 0.0424264 0.0424264 0.01
-       vertex 0.0424264 0.0424264 0
-       vertex 0.0395607 0.0451104 0
-    endloop
-  endfacet
-  facet normal 0.729867 0.683589 -0
-    outer loop
-       vertex 0.0424264 0.0424264 0
-       vertex 0.0424264 0.0424264 0.01
-       vertex 0.0451104 0.0395607 0.01
-    endloop
-  endfacet
-  facet normal 0.729867 0.683589 0
-    outer loop
-       vertex 0.0451104 0.0395607 0.01
-       vertex 0.0451104 0.0395607 0
-       vertex 0.0424264 0.0424264 0
-    endloop
-  endfacet
-  facet normal 0.773005 0.634399 -0
-    outer loop
-       vertex 0.0451104 0.0395607 0
-       vertex 0.0451104 0.0395607 0.01
-       vertex 0.0476012 0.0365257 0.01
-    endloop
-  endfacet
-  facet normal 0.773005 0.634399 0
-    outer loop
-       vertex 0.0476012 0.0365257 0.01
-       vertex 0.0476012 0.0365257 0
-       vertex 0.0451104 0.0395607 0
-    endloop
-  endfacet
-  facet normal 0.812846 0.582478 -0
-    outer loop
-       vertex 0.0476012 0.0365257 0
-       vertex 0.0476012 0.0365257 0.01
-       vertex 0.0498882 0.0333342 0.01
-    endloop
-  endfacet
-  facet normal 0.812846 0.582478 0
-    outer loop
-       vertex 0.0498882 0.0333342 0.01
-       vertex 0.0498882 0.0333342 0
-       vertex 0.0476012 0.0365257 0
-    endloop
-  endfacet
-  facet normal 0.849207 0.528061 -0
-    outer loop
-       vertex 0.0498882 0.0333342 0
-       vertex 0.0498882 0.0333342 0.01
-       vertex 0.0519615 0.03 0.01
-    endloop
-  endfacet
-  facet normal 0.849207 0.528061 0
-    outer loop
-       vertex 0.0519615 0.03 0.01
-       vertex 0.0519615 0.03 0
-       vertex 0.0498882 0.0333342 0
-    endloop
-  endfacet
-  facet normal 0.881916 0.471406 -0
-    outer loop
-       vertex 0.0519615 0.03 0
-       vertex 0.0519615 0.03 0.01
-       vertex 0.0538124 0.0265373 0.01
-    endloop
-  endfacet
-  facet normal 0.881916 0.471406 0
-    outer loop
-       vertex 0.0538124 0.0265373 0.01
-       vertex 0.0538124 0.0265373 0
-       vertex 0.0519615 0.03 0
-    endloop
-  endfacet
-  facet normal 0.910864 0.412707 -0
-    outer loop
-       vertex 0.0538124 0.0265373 0
-       vertex 0.0538124 0.0265373 0.01
-       vertex 0.0554328 0.022961 0.01
-    endloop
-  endfacet
-  facet normal 0.910864 0.412707 0
-    outer loop
-       vertex 0.0554328 0.022961 0.01
-       vertex 0.0554328 0.022961 0
-       vertex 0.0538124 0.0265373 0
-    endloop
-  endfacet
-  facet normal 0.935908 0.352245 -0
-    outer loop
-       vertex 0.0554328 0.022961 0
-       vertex 0.0554328 0.022961 0.01
-       vertex 0.0568158 0.0192864 0.01
-    endloop
-  endfacet
-  facet normal 0.935908 0.352245 0
-    outer loop
-       vertex 0.0568158 0.0192864 0.01
-       vertex 0.0568158 0.0192864 0
-       vertex 0.0554328 0.022961 0
-    endloop
-  endfacet
-  facet normal 0.956945 0.29027 -0
-    outer loop
-       vertex 0.0568158 0.0192864 0
-       vertex 0.0568158 0.0192864 0.01
-       vertex 0.0579555 0.0155291 0.01
-    endloop
-  endfacet
-  facet normal 0.956945 0.29027 0
-    outer loop
-       vertex 0.0579555 0.0155291 0.01
-       vertex 0.0579555 0.0155291 0
-       vertex 0.0568158 0.0192864 0
-    endloop
-  endfacet
-  facet normal 0.973875 0.227085 -0
-    outer loop
-       vertex 0.0579555 0.0155291 0
-       vertex 0.0579555 0.0155291 0.01
-       vertex 0.0588471 0.0117054 0.01
-    endloop
-  endfacet
-  facet normal 0.973875 0.227085 0
-    outer loop
-       vertex 0.0588471 0.0117054 0.01
-       vertex 0.0588471 0.0117054 0
-       vertex 0.0579555 0.0155291 0
-    endloop
-  endfacet
-  facet normal 0.986642 0.162902 -0
-    outer loop
-       vertex 0.0588471 0.0117054 0
-       vertex 0.0588471 0.0117054 0.01
-       vertex 0.0594867 0.00783157 0.01
-    endloop
-  endfacet
-  facet normal 0.986642 0.162902 0
-    outer loop
-       vertex 0.0594867 0.00783157 0.01
-       vertex 0.0594867 0.00783157 0
-       vertex 0.0588471 0.0117054 0
-    endloop
-  endfacet
-  facet normal 0.995186 0.0980062 -0
-    outer loop
-       vertex 0.0594867 0.00783157 0
-       vertex 0.0594867 0.00783157 0.01
-       vertex 0.0598715 0.00392419 0.01
-    endloop
-  endfacet
-  facet normal 0.995186 0.0980062 0
-    outer loop
-       vertex 0.0598715 0.00392419 0.01
-       vertex 0.0598715 0.00392419 0
-       vertex 0.0594867 0.00783157 0
-    endloop
-  endfacet
-  facet normal 0.999464 0.0327281 -0
-    outer loop
-       vertex 0.0598715 0.00392419 0
-       vertex 0.0598715 0.00392419 0.01
-       vertex 0.06 0 0.01
-    endloop
-  endfacet
-  facet normal 0.999464 0.0327281 0
-    outer loop
-       vertex 0.06 0 0.01
-       vertex 0.06 0 0
-       vertex 0.0598715 0.00392419 0
-    endloop
-  endfacet
-endsolid AMI1
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/controlDict
index 453b9d2248314b73f871df549a618c4e828b50a5..81ea05d5133bfa25ccb68b0fcde55db290596aa0 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/controlDict
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 application     icoReactingMultiphaseInterFoam;
 
-startFrom       latestTime;//startTime;
+startFrom       latestTime;
 
 startTime       0;
 
@@ -53,4 +52,5 @@ maxDeltaT       0.2;
 
 maxAlphaCo      0.7;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/decomposeParDict
index 763854b64d348e24bd2c7d2c51c4506b4f5c87a1..502f3507ae1b288abaa4cbc6a7e944136f4df99c 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/decomposeParDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/decomposeParDict
@@ -22,9 +22,5 @@ numberOfSubdomains 4;
 
 method          scotch;
 
-distributed     no;
-
-roots           ( );
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSchemes
index 3d51db46887d487468e4cb8c488f178e632697d6..28b296e260bf7d250488049cf332a91211848e72 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -63,7 +62,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 fluxRequired
@@ -73,4 +72,5 @@ fluxRequired
     "alpha.*";
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSolution
index eff5f35e1bbc4725386987f444a56eb5cc9f357d..e2af0f606351313ce1f701026578a1120258273a 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,7 +43,6 @@ solvers
         // Compressiion factor for species in each alpha phase
         // NOTE: It should be similar to cAlpha
         cYi             1;
-
     }
 
     "U.*"
@@ -68,7 +66,6 @@ solvers
     {
         solver              PBiCGStab;
         preconditioner      FDIC;
-
         tolerance           1e-9;
         relTol              0.01;
     };
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/setFieldsDict
index a9d2a38754d722c63b320b0fa0d7556a50d5d1cf..9aefa887dbb51aea904bd66417bb63edd5e2505f 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,7 +53,6 @@ regions
         );
     }
 
-
     boxToCell
     {
         box (0 -1 -1) (1 0 1);
@@ -63,7 +61,6 @@ regions
             volScalarFieldValue alpha.gas       1
         );
     }
-
 );
 
 
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/topoSetDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/topoSetDict
index a4db29b04bc0f389473d2b76d4af8d238428f314..3536410c189637d983c712ee8b8a3c39178aae10 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/topoSetDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/topoSetDict
@@ -29,4 +29,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T
index acce5d6b0ed7caac125242ed53cbff7f001cba10..2d05c0583da4d4b64c4064b266d72dd4d688a4d5 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T
@@ -58,11 +58,13 @@ boundaryField
         kappaMethod     fluidThermo;
         value           $internalField;
     }
+
     right
     {
         type            zeroGradient;
         value           $internalField;
     }
+
     bottom
     {
         type            externalWallHeatFluxTemperature;
@@ -71,12 +73,14 @@ boundaryField
         kappaMethod     fluidThermo;
         value           $internalField;
     }
+
     top
     {
         type            inletOutlet;
         value           uniform 371;
         inletValue      uniform 371;
     }
+
     frontAndBack
     {
         type            zeroGradient;
@@ -84,4 +88,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/U b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/U
index 86cf67df0fbf13db7b585cd3533f5854b7b639a7..412c7ddfc451dcc9d560852a1214f8d25b687ac4 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/U
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -25,22 +25,26 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
+
     right
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
+
     bottom
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
+
     top
     {
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
         inletValue      uniform (0 0 0);
     }
+
     frontAndBack
     {
         type            fixedValue;
@@ -48,4 +52,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/air.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/air.gas
index 0f20613e65d02ff6a57f2c23ff4bd69a49303f87..a6513d4576681df8e11af75581755cf2ade8dfd4 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/air.gas
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/air.gas
@@ -24,20 +24,24 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     right
     {
         type            zeroGradient;
     }
+
     bottom
     {
         type            zeroGradient;
     }
+
     top
     {
         type            inletOutlet;
         inletValue      uniform 1;
         value           uniform 1;
     }
+
     frontAndBack
     {
         type            zeroGradient;
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.gas
index e004d20427c0a0ad1dcc8030b505b61839d2a72e..d5060fc58672d94c5b295633ab2d1af30d49623d 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.gas
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.gas
@@ -20,28 +20,33 @@ internalField   uniform 0;
 
 boundaryField
 {
-     left
+    left
     {
         type            zeroGradient;
     }
+
     right
     {
         type            zeroGradient;
     }
+
     bottom
     {
         type            zeroGradient;
     }
+
     top
     {
         type            inletOutlet;
         inletValue      uniform 1;
         value           uniform 1;
     }
+
     frontAndBack
     {
         type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.liquid
index 5ed5bf784765c4e092a415b83a7d024206415ade..d28a5c0d6bc983403fe4aa11fb5193b5186aa52b 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.liquid
@@ -24,24 +24,29 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     right
     {
         type            zeroGradient;
     }
+
     bottom
     {
         type            zeroGradient;
     }
+
     top
     {
         type            inletOutlet;
         inletValue      uniform 0;
         value           uniform 0;
     }
+
     frontAndBack
     {
         type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/p_rgh
index 5e31bb3313357df620fef597ce260f744a35b8ce..bdc0fbe2e77ff13a305f7edf1ef87b088f646936 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/p_rgh
@@ -25,22 +25,26 @@ boundaryField
         type            fixedFluxPressure;
         value           uniform 1e5;
     }
+
     right
     {
         type            fixedFluxPressure;
         value           uniform 1e5;
     }
+
     bottom
     {
         type            fixedFluxPressure;
         value           uniform 1e5;
     }
+
     top
     {
         type            prghTotalPressure;
         p0              $internalField;
         value           uniform 100000;
     }
+
     frontAndBack
     {
         type            fixedFluxPressure;
@@ -48,4 +52,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/vapour.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/vapour.gas
index 3e3faeffbfce28b9de76ee7fef010dba4b819803..ea0994bf4cac46edb6b6f8393d921d4015f39ec7 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/vapour.gas
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/vapour.gas
@@ -24,20 +24,24 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     right
     {
         type            zeroGradient;
     }
+
     bottom
     {
         type            zeroGradient;
     }
+
     top
     {
         type            inletOutlet;
         inletValue      uniform 0;
         value           uniform 0;
     }
+
     frontAndBack
     {
         type            zeroGradient;
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/Allrun
index 6a7592f324dfd8234404d69c3ba33a747f351e48..70ded50baa69ee85f790ae79f0e23ad80b3d8857 100755
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/Allrun
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/Allrun
@@ -8,9 +8,13 @@ canCompile || exit 0    # Dynamic code
 restore0Dir
 
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication decomposePar
+
 runParallel $(getApplication)
+
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README.md
similarity index 100%
rename from tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README
rename to tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README.md
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/g
index 72a61dd0aa50b58065f024124c802c825bf38720..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/g
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/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 -9.81 0);
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/phaseProperties
index b31bc43bf37659307c32c7dd8e73205271c62543..20954d424106641370f1b2d2c6cf7cf9e0251fca 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/phaseProperties
@@ -10,10 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
+
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 type    massTransferMultiphaseSystem;
 
 phases  (gas liquid);
@@ -50,4 +51,5 @@ massTransferModel
    }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas
index b2c332812f8fbbce383dcff60539d7f364aa7724..08fbe77cb748f58c1701fdf67ad23f3d8f081360 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,8 +25,6 @@ thermoType
     energy          sensibleEnthalpy;
 }
 
-// ************************************************************************* //
-
 species
 (
     air
@@ -81,3 +78,6 @@ air
         Pr          0.7;
     }
 }
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid
index e36048d3b104d5bbf6fadbb2177536604786dec3..4269bd815707b05a6764828eaaa3271209f49c33 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,4 +48,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict
index 39bd26df71a588cf93c84d6fac6db9eab87bb8ac..7b5046e2fb36686c7474999bca47cf9f61441efb 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/controlDict
index 7af6c5f99a31126f6d1202a27ce7b274a2c81d66..8eb6ac8ae12d4d6282d1e96fcd24423324f27637 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,7 +54,6 @@ maxAlphaDdt     1;
 
 functions
 {
-
     mass
     {
         type            volFieldValue;
@@ -75,4 +73,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict
index 9fc924007588ebd7899fb12be6f10d8dbbc0e7f8..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      decomposeParDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSchemes
index 2e3873075ec0c314edb588150d9c3cbdbe2f8c86..14a570a8459d16cec08ed3865763f6f1e1a377b4 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSolution
index f142c63606e6a4b5baa8f29c066a0bb30977e0e7..ede6884c3b6e45212d3c22fe9c5779ed93bd0c89 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSolution
@@ -10,14 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
 {
-
     "alpha.*"
     {
         solver          PBiCGStab;
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/setFieldsDict
index e69d37ea3fbf80b552e0f6d9ca30e283978d38fc..423162bf13dadb511fd924a04838792a5d463f40 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -33,4 +32,6 @@ regions
         );
     }
 );
+
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/0/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/0/T
index 552f509027171915a82d14e020509376ee772e0d..5f6a111fa7d344464a8ebe00cc3749c4bb87433e 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/0/T
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/0/T
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      T;
 }
@@ -51,4 +51,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/g
index bc86019b956ccd9d55a0958577f76b5191573994..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/g
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/g
@@ -17,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 -9.81);
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/phaseProperties
index 3933439b7e58354350334af722c0997c62889d00..16e821afe34ac8dbeada1a0d353796e48095691d 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/phaseProperties
@@ -48,4 +48,5 @@ massTransferModel
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid
index a4d08a6bd6c92978d2c543159547c9375037555b..d2ea7d50237b1fd2115d09bc3d66df30d7ca2765 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid
@@ -50,4 +50,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid
index c3c4947476925f4f0262d875fd6cd23282d96aa0..686860208486da87b8a58b46e3df7d2a7119e150 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid
@@ -47,4 +47,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/turbulenceProperties
index f8eaeffb095f3f71941381804d918ca031801760..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/turbulenceProperties
@@ -16,4 +16,5 @@ FoamFile
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/blockMeshDict
index ca2914cd87dc7fa1b989bc7c0e676c53ffe83db9..08a43a95b31c013f717bd34edc131635b09d6151 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/blockMeshDict
@@ -82,4 +82,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/controlDict
index 2d624ede08420c1bfae00c3dddf994eb7ef34cf4..21a0b4dbfcbc8e462c5bc7bfff2e2337e9e5b30f 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,4 +56,5 @@ maxAlphaDdt     2.3;
 
 maxDi           25;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSchemes
index df3588ecd13ead2e830dc9910d164f8369d71a56..8dc8eb21afb7ffa7e0111db151cbeb5ee3c9f060 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSolution
index 863ae999ec7d4be42a297fed8d4c93957f1febd5..f3603c7e6b613c82daaaa5e4d21e43aa06257342 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,7 +49,6 @@ solvers
         preconditioner  DIC;
         tolerance       1e-09;
         relTol          0.02;
-        //maxIter         0;
     }
 
     p_rghFinal
@@ -65,7 +63,6 @@ solvers
         smoother        symGaussSeidel;
         tolerance       1e-06;
         relTol          0;
-
     }
 
     "Yi.*"
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T
index e5a9ecd1b11a10759ff4b2505034ed2cdbf4ed22..6d81da0d28db9b176a0e773e8dea948624392939 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U
index 771b585d306ec52f1f7867b08c57c7929b0247eb..8491b82e0f09d7003a00515ff095fee09b7a2e97 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U;
 }
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid
index 0305a9b04c2388300ddd926de2f6afa957d0c7a0..cc7b1c58162bdb7713962751fe69d043282c2bb9 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p
index 4d560ef267f200067982b69425f17d35a88cc5ea..a733a2cb20859e87f1a4eeca81aa36090791555b 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh
index 40684d8a7122906cfb707a9e2af3610843be8840..cbebbc1e73de40a33abb03fe4d39f19cfaec0583 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun
index 97b73101acb6f50c90ee361fb9330d2bf45f8479..5f30e6c3bbff0d738d32641422fb6e6d2253eb9d 100755
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun
@@ -4,7 +4,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 runApplication blockMesh
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties
index f05b309feeb89700ce7be9f78209d15f4191ea5c..67d63b4721d994379c3a0a62c2206b707d073f83 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties
@@ -14,8 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (liquid vapour); // FC-72
-
+phases          (liquid vapour); // FC-72
 
 sigma           0;
 
@@ -25,7 +24,6 @@ liquid
     nu              2.64e-7;
     rho             1583.4;
 
-
     Cp              1.1072e3;
     Cv              1.1072e3;   // assume Cp for liquid
     kappa           0.057;
@@ -38,7 +36,6 @@ vapour
     nu              5e-7;
     rho             14.9;
 
-
     Cp              895.2;      // FC72 vapour
     Cv              870.4;      // Cv = Cp - R/w
     kappa           0.01;       // FC72 vapour
@@ -47,4 +44,5 @@ vapour
 
 Prt             0.7;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties
index 6ca732de1416c18bbaa4575bdde39dedcc30978c..a8b82a714113b42cf7d5e6fdd20675e77efde1df 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
     RASModel        kOmegaSST;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict
index 8031fcc40664260301d3dce166704ab752e4dcb7..4f50efd9d20dbb33b3b2997e5b151287f6c9ae8a 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict
@@ -79,4 +79,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict
index 9ba2bca74894d9a0d706b8b8ff986dde36d86fc6..0dee2ea5e9747a068ca8e7f0dde1db7c61f89337 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes
index a06331261c62953aeb39ac9ee792ecbdf292958c..2339ecec1ccecc6fd3a5fa1a9d504b0d6355cb8f 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +59,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution
index db9e42af737be92a2c6224e6a54a927ef695386f..0a92f5106edb12c3ec4c6708d2ee77fb47983c31 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,13 +49,10 @@ solvers
         solver          GAMG;
         tolerance       1e-8;
         relTol          0.01;
-
         smoother        DICGaussSeidel;
         nPreSweeps      0;
         nPostSweeps     2;
-
         cacheAgglomeration true;
-
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
@@ -69,17 +65,13 @@ solvers
         preconditioner
         {
             preconditioner  GAMG;
-
             tolerance       1e-6;
             relTol          0;
-
             nVcycles        2;
-
             smoother        DICGaussSeidel;
             nPreSweeps      0;
             nPostSweeps     2;
             nFinestSweeps   2;
-
             cacheAgglomeration true;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U
index 41289d50e4e4afe5a9c80a9ea73c923a1d570905..85eaaf288a0ee0855b86c52da5e1c64f48c3a093 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U
@@ -53,4 +53,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel
index 454e7659f4b55891f6b7c26e8169f70c1bc71634..6c53d505a4dac9f1cb809e989dcfcb98c4acf9ef 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel
@@ -54,4 +54,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k
index a8c2048aef389a6d2f31ecb3a6f71ca7bfe53152..70a90fcdee856ce3a115c257049d9388e3e8cf27 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k
@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda
index 0c6c04e2558dd8d686a2c2f021c062766057222c..5ce577cf215c56912f9f43e1852cd00cc021f018 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda
@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut
index 5bd9043ff8556e0f3ab9e14fae21f635e673573b..ca79fafa7a4e58200cd6fb34d72634a9a2c25c31 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut
@@ -51,4 +51,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh
index 2060b65d1effa9fd8d2139d60df6fc9f40a536a6..1d17f04329d4d2e5ca143221c45e98333bbcb428 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh
@@ -52,4 +52,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties
index 3e35bf081b466a68f3eb62fff78712149dc853ae..26bc95ef2289cf4bdaa9b03b1f88b06712fa1da8 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (fuel air);
+phases          (fuel air);
 
 fuel
 {
@@ -33,4 +32,5 @@ air
 
 sigma           0.0261;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties
index 348d46833f223a660c01d0d7c367bb290cb99abe..ee92925b72d21433e04995c3587c8044a153846a 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LES;
+simulationType      LES;
 
 LES
 {
@@ -89,4 +88,5 @@ LES
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict
index 587b616b4d59711ad782686c7987578c684257be..9f98e48f1b2556373433450c11611c5eab398110 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict
@@ -137,4 +137,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict
index 0ecec753d71e00035a2a75ce2a77964587c0fa68..1bf157be8b49e9eadb774ec205481ec2e4ade6af 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes
index a337c0384d7e0c7367b6022d0a9cd1f2be4334bd..fc8d7fd63c264e8b6ae93b7b87418311999b93fe 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,4 +51,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution
index 89fc0d71ac7865f9bcb8e74a8459575c7539cd24..bee8efa91bda8c2ad2babd7f5054146958ac36fa 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict
index de2ebb7c4e0f27cb114246a67913cc87d4fb4033..dae3a8798321b2a17307f5285a5280ef307918cf 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      refineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
index c5339f78a71db7b0495d7050b23990011513ab73..aa00667b453f1c59c517d0dd9c09c418853fbbd7 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
index ca56a40e7a717223e197c85184f0201b8b001d1e..0c68fdab5a9ba588ba4c8446fb4d2712802923de 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
index b89ae971cb04979f59fb3b8dbb9fb7b30deaec49..b749015071b5751b9b7f5e428daac6890f047c48 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
index 9c2d27a30f6f22960da658833116ed31d5076dc5..484900850a8baef090851f1ec2cb5ca7fb59d249 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
index ffa67b53fab216ae265a05235f13540604ffb3fb..3dbe418dbca652267f8145ff14d748e608780241 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
@@ -50,5 +50,4 @@ boundaryField
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
index 9c30eeb2f46c80a0bc1077254e40589e3d160e69..983a4ecdb75eb36f96bd8f6e6aabb34f241be687 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
index b1638d242a31a7e08338f59dbe5305f241ab80ce..439656a35e81141629b247324b6589d380a6ba67 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
@@ -6,7 +6,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 mkdir -p constant/triSurface
 
 # copy DTC hull surface from resources folder
-cp -f $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/
+cp -f \
+    "$FOAM_TUTORIALS"/resources/geometry/DTC-scaled.stl.gz \
+    constant/triSurface/
 
 runApplication surfaceFeatureExtract
 
@@ -14,10 +16,10 @@ runApplication blockMesh
 
 for i in 1 2 3 4 5 6
 do
-    runApplication -s $i \
+    runApplication -s "$i" \
         topoSet -dict system/topoSetDict.${i}
 
-    runApplication -s $i \
+    runApplication -s "$i" \
         refineMesh -dict system/refineMeshDict -overwrite
 done
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/README b/tutorials/multiphase/interFoam/RAS/DTCHull/README.md
similarity index 100%
rename from tutorials/multiphase/interFoam/RAS/DTCHull/README
rename to tutorials/multiphase/interFoam/RAS/DTCHull/README.md
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g
index ebc62289ef232967511f88d27bcc8827e50c18f1..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/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/multiphase/interFoam/RAS/DTCHull/constant/hRef b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef
index aef0c2a31d8c6e786f287772b43a9512ee68a5c0..3c4a89890688b57f0d42ecd47ae595b2aeb0aae6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedScalarField;
-    location    "constant";
     object      hRef;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +17,5 @@ FoamFile
 dimensions      [0 1 0 0 0 0 0];
 value           0.244;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties
index 5221f59d3b634f422a7aea3013a7b647c43c3fa3..136c7aeb330f5a54f08d8ddb5913a687d4785322 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -33,4 +32,5 @@ air
 
 sigma           0;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties
index 4bdf335073b4e55e629185f23017975968a27fd7..a8013f99c88d5dbb4c98d98b510328d759741827 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
index 065ed34a37502a7eb111adaa4a805421d862385a..3131f25e3a1c02b4279e4402ae9799905f6b47df 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
@@ -144,4 +144,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict
index 6aeb7d950f188b651685065a9c2d24a90d86e79f..e6b3adcfa0c2e86a6dce895ac537aa02e8db60ee 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,7 +44,6 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-
 functions
 {
     forces
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes
index 73acedca10d880d8f68c782872780350a50b2692..563ce386db2312dd1c64f771ff007af2be9ba4c8 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution
index 9d8fb11304c179b88b4cd3fb7f7f512e64f1c5ab..61beac8a1219dd31e031749a3f4256329daa7a8e 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,17 +37,13 @@ solvers
     "pcorr.*"
     {
         solver          PCG;
-
         preconditioner
         {
             preconditioner  GAMG;
-
             smoother        GaussSeidel;
-
             tolerance       1e-5;
             relTol          0;
         };
-
         tolerance       1e-5;
         relTol          0;
     };
@@ -56,9 +51,7 @@ solvers
     p_rgh
     {
         solver          GAMG;
-
         smoother        DIC;
-
         tolerance       1e-7;
         relTol          0.01;
     };
@@ -72,10 +65,8 @@ solvers
     "(U|k|omega).*"
     {
         solver          smoothSolver;
-
         smoother        symGaussSeidel;
         nSweeps         1;
-
         tolerance       1e-7;
         relTol          0.1;
         minIter         1;
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
index e208d6bab999dee1ce553cd26a5ff57dda8929a4..f10cf03628d6c342b0078700afd0de615d61dc3c 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      meshQualityDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
index 4332d7eb4bc7665f08595e6f3bb89e4a23c6213c..3e900d1c88519b104ba3efafe567179c8fcb3651 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      refineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict
index 4d99651c4a5d169817b4934ec1d4b0ce0794d7cf..6d378d609b81fd1f78b97d22020a7c82c181bd11 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,4 +45,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
index 9c19d43e09bd24b4d67eccb3aaaeb4b8703814d5..ab4cb039ddb42b6e0dfd22585df83b5b6e69bd8b 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
index 36a67e797a1445f1c0df48342be6d8cae297a873..b377138bf4438986026748421407d29542d9899a 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
index 105572d2d68999b4a4d454a71eba32c759fed830..02205590c70673f48cea767f55ff9bd74af5675b 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
index 95a455b655cdd9f49af84535cdd6081923c27816..c34cce6266aa55e585d2724cd8d15938bbeaa776 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
index 8c82990d7cd6c7965cdbe3e79d251267d4dd2aef..49a624dd6f16f565606effb66c494a625dd72154 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
index 6edabfa073f62ef57c69811c6c6fdc2d3d76817d..7d459ce2f908e941a0b6f12da7bb938aeca5b31e 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water
index b89ae971cb04979f59fb3b8dbb9fb7b30deaec49..b749015071b5751b9b7f5e428daac6890f047c48 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k
index 9c2d27a30f6f22960da658833116ed31d5076dc5..484900850a8baef090851f1ec2cb5ca7fb59d249 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega
index 03db58f8da92e39ca75f42cf38aacfa9e0d74c98..f314cf71281bae268ca567b82708235c7f60fdcb 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega
@@ -51,5 +51,4 @@ boundaryField
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh
index 9c30eeb2f46c80a0bc1077254e40589e3d160e69..983a4ecdb75eb36f96bd8f6e6aabb34f241be687 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean
index c3d9032c1a93cdbd9784b4ab9bcc95958cd4e0b4..93ba6c1a4aa3262f23bc3727be7d0b97e1c40989 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean
@@ -7,7 +7,6 @@ cleanCase0
 
 rm -f system/topoSetDict
 
-# Remove surface and features
 rm -rf constant/triSurface
 rm -rf constant/extendedFeatureEdgeMesh
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun
index b1638d242a31a7e08338f59dbe5305f241ab80ce..439656a35e81141629b247324b6589d380a6ba67 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun
@@ -6,7 +6,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 mkdir -p constant/triSurface
 
 # copy DTC hull surface from resources folder
-cp -f $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/
+cp -f \
+    "$FOAM_TUTORIALS"/resources/geometry/DTC-scaled.stl.gz \
+    constant/triSurface/
 
 runApplication surfaceFeatureExtract
 
@@ -14,10 +16,10 @@ runApplication blockMesh
 
 for i in 1 2 3 4 5 6
 do
-    runApplication -s $i \
+    runApplication -s "$i" \
         topoSet -dict system/topoSetDict.${i}
 
-    runApplication -s $i \
+    runApplication -s "$i" \
         refineMesh -dict system/refineMeshDict -overwrite
 done
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/README b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/README.md
similarity index 100%
rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/README
rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/README.md
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g
index ebc62289ef232967511f88d27bcc8827e50c18f1..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/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/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef
index aef0c2a31d8c6e786f287772b43a9512ee68a5c0..3c4a89890688b57f0d42ecd47ae595b2aeb0aae6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedScalarField;
-    location    "constant";
     object      hRef;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +17,5 @@ FoamFile
 dimensions      [0 1 0 0 0 0 0];
 value           0.244;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties
index 5221f59d3b634f422a7aea3013a7b647c43c3fa3..136c7aeb330f5a54f08d8ddb5913a687d4785322 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -33,4 +32,5 @@ air
 
 sigma           0;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties
index 4bdf335073b4e55e629185f23017975968a27fd7..a8013f99c88d5dbb4c98d98b510328d759741827 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
index 065ed34a37502a7eb111adaa4a805421d862385a..3131f25e3a1c02b4279e4402ae9799905f6b47df 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
@@ -144,4 +144,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict
index 578923a209e016d75f3e5bceb404ee9696a5d7e9..0e81fe2d34c0d79d22477196df56ff9828b77c0c 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      15;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     forces
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes
index bce7b523240221358099a4455057a6d85fbdf17f..25ba9d3dfe897b79eb9903d0c31fa3ac2b628427 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
index 11b975a2ca807af2a9341be80f71a23eb7dec97d..8ee04f63487c83375417e3973e896c389ad9e619 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,9 +37,7 @@ solvers
     "pcorr.*"
     {
         solver          GAMG;
-
         smoother        DIC;
-
         tolerance       1e-3;
         relTol          0;
     };
@@ -48,9 +45,7 @@ solvers
     p_rgh
     {
         solver          GAMG;
-
         smoother        DIC;
-
         tolerance       5e-8;
         relTol          0;
     };
@@ -64,10 +59,8 @@ solvers
     "(U|k|omega).*"
     {
         solver          smoothSolver;
-
         smoother        symGaussSeidel;
         nSweeps         1;
-
         tolerance       1e-7;
         relTol          0;
         minIter         1;
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
index 08a8efe62d5fffd35067b38ee4c4042811f61c78..7bfee16de0e297cfa5552055b01a40d0467e2fed 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      meshQualityDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict
index 4332d7eb4bc7665f08595e6f3bb89e4a23c6213c..3e900d1c88519b104ba3efafe567179c8fcb3651 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      refineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict
index 4d99651c4a5d169817b4934ec1d4b0ce0794d7cf..6d378d609b81fd1f78b97d22020a7c82c181bd11 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,4 +45,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
index 9c19d43e09bd24b4d67eccb3aaaeb4b8703814d5..ab4cb039ddb42b6e0dfd22585df83b5b6e69bd8b 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
index 36a67e797a1445f1c0df48342be6d8cae297a873..b377138bf4438986026748421407d29542d9899a 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
index 105572d2d68999b4a4d454a71eba32c759fed830..02205590c70673f48cea767f55ff9bd74af5675b 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
index 95a455b655cdd9f49af84535cdd6081923c27816..c34cce6266aa55e585d2724cd8d15938bbeaa776 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
index 8c82990d7cd6c7965cdbe3e79d251267d4dd2aef..49a624dd6f16f565606effb66c494a625dd72154 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
index 989cf479204f23dde80629b06a9d960deaa98563..7d459ce2f908e941a0b6f12da7bb938aeca5b31e 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,9 +21,9 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-
         box     (-0.5 -0.55 -0.15) (6.25 0 0.65);
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U
index a2fc17528193e6337cf51107c71b0a6eb20c604f..37944f78e5fa153da4abd55802232503ce2216dc 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water
index 794df84a5be3f7bcf1356f08bf32711c79b0699d..0cd51bd008226e610e2a40ee40178a03fbbaf63f 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh
index 222b17589124d1ef3eb03a2b376982d58dbaf5ee..977347e9bcbcf0fbc79e4a7935dc43ff4b6078aa 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
index 982a0146f56f812de627ea3b2d583abeb25241eb..7df9550adf1b11657cdd062c21acbaec30019a6e 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties
index 812822fc798b884274aacd2110e4c4de933c694d..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
index 30a5eae53a424f57dbe9541a52c1aa7a2c9f293d..ade5ef4069536274d28726c8bee53e888a898419 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      1;
 
 maxDeltaT       1;
 
-
 functions
 {
     sTransport
@@ -96,4 +94,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
index c5782af226b8463a55e54a22874c41fd7fba0005..62d4027a502469553ca10f285997befa3cec4582 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
index 447a7447e4a9fde89d76a1ed7bce6dfaaa961a1f..c86404824d2475992818bfb9f9b4a19fd5a0ebda 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,11 +51,7 @@ solvers
         solver           GAMG;
         tolerance        5e-9;
         relTol           0.01;
-
         smoother         GaussSeidel;
-
-
-
         maxIter          50;
     };
 
@@ -92,4 +87,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/Allclean b/tutorials/multiphase/interFoam/RAS/damBreak/Allclean
index 26e52f3f9f6bd2b8a77a8d214a695f0b5983bf1c..8aa080425ed7cf779fd034170de4af938f2963ad 100755
--- a/tutorials/multiphase/interFoam/RAS/damBreak/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/Allclean
@@ -8,12 +8,12 @@ loseCases="damBreakFine"
 
 for caseName in $keepCases
 do
-    (cd $caseName && foamCleanTutorials)
+    (cd "$caseName" && foamCleanTutorials)
 done
 
 for caseName in $loseCases
 do
-    removeCase $caseName
+    removeCase "$caseName"
 done
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
index 5f71730f0acd6b3b04534333c9d0f48b8aad8d8d..2d0b6b80c823a6e03cc64075cdc834015e4146a7 100755
--- a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
@@ -13,13 +13,13 @@ setDamBreakFine ()
     -e s/"23 42\(.*\) 1 1)"/"46 76\1 2 1)"/g \
     -e s/"4 42\(.*\) 1 1)"/"4 76\1 2 1)"/g \
     -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \
-    $blockMeshDict > temp.$$
-    mv temp.$$ $blockMeshDict
+    "$blockMeshDict" > temp.$$
+    mv -f temp.$$ "$blockMeshDict"
     sed \
     -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \
     -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \
-    $controlDict > temp.$$
-    mv temp.$$ $controlDict
+    "$controlDict" > temp.$$
+    mv -f temp.$$ "$controlDict"
 }
 
 # Do damBreak
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water
index 81ca6599f6e65c1d39374d697d1c6faec9d15c39..721ca601150436bf5071551166f213f396fbff5d 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda
index 1c79d05e9401d93bd0600edb846e617e5db0c2c6..84ae5553898db6b294e02b9766b3aa382e155804 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh
index 34245108ab80457e6f9cd34ee6d4bbbe3aade5e4..95248d7537ba5933c392f42130e44c6fc943f162 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties
index 89844d9793e1698155a8ae99368c69451ded575d..f113b8d4078c0a15fba49dd6fbb3965f470968e0 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
-density         variable;
+density             variable;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict
index 7676445dfa23a9bb7be5735c449e39daab9ab808..867860524d7db076ba20d4e5a2610eebcfe5f448 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict
index ffff8455b68c20cb5ea250e08939a94c8c1cc72f..472dac9be27176cf085a8e04945ac5b4be709dcb 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict
index 33631badb5a5224759a37aca4bb44b8fc6be53d7..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes
index d923b9d1a28dccc6d9cdbb92e1498274e2d70321..69508dc40446828a434ae7a7c5f59633eb9a85c5 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution
index ac49c0b26625dd8c3514d0bd1496d514f44c1bf0..98dda729681a9b5d60e686dc05338c9cd7a40e6e 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -80,4 +79,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict
index 9962581b7e319ecca961fb8b45133ddf9f0c1fa2..804fd6506cd701e0cfd6b1b59af0f21f3b2c387d 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties
index 812822fc798b884274aacd2110e4c4de933c694d..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict
index 7676445dfa23a9bb7be5735c449e39daab9ab808..867860524d7db076ba20d4e5a2610eebcfe5f448 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict
index 8eb1d8059305c1aa46165c76c6354cdd64077cde..0de6747b1057aeb25833be11224dc477faf52f2c 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict
@@ -41,4 +41,5 @@ p_rgh
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict
index 51377d0a62b4a0613ddff4eecd424bf1ed9c1b5a..438b51fc2cb1af3f1fc569d9c4800ff7e29ed133 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes
index 502ea2e3a40f45325b04d7488f2bb70a5168d134..55231591357375c9d44c3bb948b627331f6a9f8f 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution
index 17655ee254b639a8cea3981cdae99662f1d42df5..725b4caad46f79fb18e0facb6449367bba6f6de8 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -80,4 +79,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict
index 9962581b7e319ecca961fb8b45133ddf9f0c1fa2..804fd6506cd701e0cfd6b1b59af0f21f3b2c387d 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
index 032c02f6325549254bfdac363aa95f934a6edcff..b2b9bd193d7c6403a5a8f40cfce0ecd29baf129d 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
@@ -44,4 +43,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh
index 167c9ba977b1bda8a9e719b5cd130ffd9c0e850e..72a4f202acc2964d5e0c5953c75c7343fe6ae5e7 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh
@@ -37,4 +37,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun b/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun
index 76d3c8b00359dc1fcfc99328ead9f96c5fe2f469..e13100a35f94a26293fae39fedac947cb2defd82 100755
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun
@@ -5,11 +5,16 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 canCompile || exit 0    # Dynamic code
 
+restore0Dir
+
 runApplication blockMesh
+
 runApplication topoSet
+
 runApplication subsetMesh -overwrite c0 -patch floatingObject
-restore0Dir
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties
index 17cc2918337abe9d6b842963e5d9fa5ec32e1e32..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties
index 812822fc798b884274aacd2110e4c4de933c694d..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict
index 7baa7d1f4724674a3e9968ec95ad77b2113164dd..cd0fa0b421d1f19b870061a16c5cd80813d8e74a 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict
@@ -70,4 +70,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict
index 2a834a0f9364da72e9db9dbf1aee3abe72244e0f..3b9078c8317b33d0dc10244533f5db450eae8507 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,4 +52,5 @@ maxAlphaCo      1;
 
 maxDeltaT       1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes
index c0ba81f14627b129f87acb35e474ecc95d9bdd20..4a12b7b53e9e230758d3209e0f9393c36344672a 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
index a0b06fbef7499759593cf19febc59b5cc5d8a1d4..b17bcb8bcc48a1517c8be3521050fb1e8ad02010 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,7 +43,6 @@ solvers
             smoother        DICGaussSeidel;
             cacheAgglomeration no;
         }
-
         tolerance       1e-05;
         relTol          0;
         maxIter         100;
@@ -70,7 +68,6 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      2;
         }
-
         tolerance       1e-8;
         relTol          0;
         maxIter         20;
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict
index 25bd734223c9ebaa682b3db245a55ea9bc693339..a9d384c5ce317d009f820e4f444d79b2af18bdd9 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
index 8a85e64a7f0d4516d3ffc7bd2e2751b727154604..96c6e5dc701d9db752c9b0f9fbaa1f6bbaab1a9a 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
@@ -31,4 +31,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U
index de03bab4057a08cb22a3abf691c87942d290beea..859b8a51a28d53174e2e3239eb8e7081783817c5 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U;
 }
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water
index d80369583e3ddd075614f685fcfaefb8e7118b42..0df6fab28411cc7a1e0d0001695d82e5696c9219 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k
index 8a5eeb1265a98d5b60d9fc08a0d7c4b6e0dff69c..8a0fed09b8e6ae280f6491850917b28f82153a4f 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut
index 42622fb1998f6193fb2a69d84620c929286115a3..92d1f86f977c3088bb2498fe329751a6ae604499 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh
index 113b32e684ef87bfb88265746193263fa1091c83..1ba7281c26da776cd2ee8b1d907045fa7ef85ddd 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh
@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre
index be2f18b3403122081e8a74a0914afa878a8b806f..986ec4e550a074c6dc947054450ce37e4d2015a9 100755
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre
@@ -3,14 +3,15 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-mkdir -p constant/triSurface
+mkdir -p constant
 
 # copy STL files from resources folder
-cp -f $FOAM_TUTORIALS/resources/geometry/mixerVesselAMI/* constant/triSurface/.
+cp -rf \
+    "$FOAM_TUTORIALS"/resources/geometry/mixerVesselAMI \
+    constant/triSurface
 
 rm -rf 0
 
-# Meshing
 runApplication blockMesh
 
 runApplication surfaceFeatureExtract
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
index 3345171612c0914432b1fa82bc54a9d4da8870d6..bea602c932848f1727b65151a2d16157e3a2664c 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties
index a85ff2611ecac68c737c27401fec6b919befea10..7ca833f1a2837d6bb7d0aee661bb493f3a688512 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -33,4 +32,5 @@ air
 
 sigma           0.07;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties
index 18ba965f85fab26ebbf79c842f9297207803315c..f17089fda5c2519d91493e272b2e9530324d7f84 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict
index ad93dc0906333f06261127ebcc72ced2de14693d..950bfbd049e08842e6fa6ad4dc8a49f3b19771a7 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict
@@ -54,4 +54,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict
index fbd7680909c668b9be9b034c0d93a4575d4e8e57..47a0d7176a3aee263f8e9cd70928255ae2bae142 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,4 +52,5 @@ maxAlphaCo      1;
 
 maxDeltaT       1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes
index 06074e58376e284153ec8bcddea873121b4382ff..e876c4221eaebbce8378a0821a6e168294a474c6 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,4 +54,5 @@ snGradSchemes
     default         limited corrected 0.33;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution
index fbbbe1bc1527af4e5f5c3821436b136a8ceb3452..b6883f879160ed18e1f50192ac4b46d30138bb9a 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict
index 977727ebe4bcbddca6059f3f08855d6b3e1afd2e..1733da981d372978d68b311a8fb09c1c77500fd0 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
index 69a67228c839f142f9e98786428c2b40786b311b..256d457871bf779f357d5672faf17f38d2d182ea 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
@@ -564,4 +564,5 @@ meshQualityControls
 // Note: the write tolerance needs to be higher than this.
 mergeTolerance 1e-6;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water
index 5ec2035a14c2bbfa55c5af9bf72cfe7ed2d3ae94..6109391692a77dd4883ce32d1d5b8c30778b9e60 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water
@@ -35,4 +35,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k
index 14f65ba785acab218b639b3b6e8c94f5851e307c..3db4d866354fd3a9d745e7d698deac941d2db406 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega
index e21a5da04cd19cffb1c3365b9e2ed261b7b79b2c..72c30c576c48502d7cde01de68923a233b087255 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega
@@ -38,5 +38,4 @@ boundaryField
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh
index 067d99d6fce7c3a46c27a93b85812c5dbb9c0ed2..15b12b788154033b35e2f7ed9866574485239a40 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre b/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre
index b10bd4698d6bc005c9a39db3783f88ba8601a5e0..8242ba306c5c881c7a10ab8b36e5fbd2edcbc225 100755
--- a/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre
@@ -6,7 +6,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 mkdir -p constant/triSurface
 
 # copy motorbike surface from resources directory
-cp -f $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+cp -f \
+    "$FOAM_TUTORIALS"/resources/geometry/motorBike.obj.gz \
+    constant/triSurface/
 
 runApplication surfaceFeatureExtract
 
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict
index f28c2b327aec7db270750b1bba3b868c721fa747..746488cba68e08c1c3333f02272d85069c1a411f 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/g b/tutorials/multiphase/interFoam/RAS/motorBike/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties
index 0ba1d6aa5fe7d2954774193a0663ef3c2a50edbf..a8013f99c88d5dbb4c98d98b510328d759741827 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties
@@ -10,20 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel            kOmegaSST;
+    RASModel        kOmegaSST;
 
-    turbulence          on;
+    turbulence      on;
 
-    printCoeffs         on;
+    printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict
index 74733172eadc68d2d30ca1a64ac8c4f3e854190c..08f3c411731218b91cf7845a0476a073ea41ccfc 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      blockMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 scale   1;
@@ -86,4 +85,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict
index 47806a361639059aa1f40a84d3a45c7a8e206efd..81c45e7281065bec8e8d7eb271a9a492c28d4df5 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,7 +54,6 @@ maxDeltaT       1;
 
 functions
 {
-    // Print stats
     #include "minMax"
 }
 
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite
index 820fa72c6869946772404cfd07e5f47e2ee40fcc..bbc3004338c63c19ae5ed9ae7cbcbc8420cf1a0b 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run
index 47806a361639059aa1f40a84d3a45c7a8e206efd..81c45e7281065bec8e8d7eb271a9a492c28d4df5 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,7 +54,6 @@ maxDeltaT       1;
 
 functions
 {
-    // Print stats
     #include "minMax"
 }
 
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes
index 9d64c7889b19c0b8d9c0346925c1aa28098e3e70..752e2bc10bd365bd452148fbd6a3f1a9f0561227 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +51,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
index a29895a40d024575dac98c2363aef1aee59de936..1879ae3e0f4a8893b7b1093729fda5c29a8acb69 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax b/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
index fd5005b9eb780417fa10244cbb1e98ae1005781a..71399c494dcd91b7f92d2ea9e3f4b5315e1684c7 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      minMax;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34,4 +33,5 @@ minMax
     );
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict
index c2417b6e2e9d49f5113201132566a93dec444096..1fa91b25c55d761cb164cd987a52234f80385271 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,8 +24,6 @@ regions
 (
     boxToCell
     {
-        //box ( -1 -0.5 0 ) ( -0.5 0.5 2 );
-        //box ( -0.5 -0.5 1.5 ) ( 1.5 0.5 2 );
         box ( 0 -0.5 1.5 ) ( 2 0.5 1.75 );
         fieldValues
         (
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water
index 54fb6cf07d9a2cfba455036f6ba734e9e4f2e604..ad8a9082677c277e2ffcd6d721707c9f611d878d 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k
index 96ad5e7a36caec98de2d42b8a982e90817f6fa8f..4cbc0fea64c84cd140c75f100457d94baf83652d 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega
index b99b12d827705eaea0b301eade3950b5ad23e74c..533d851961391b930b8adbd07ff9bd3d63276a49 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh
index ac9231ad195549e75352f1e4267569df4bdd4b45..1ce0403465e17105794bdaeb49097cea77123c7d 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s
index c9eff3eedfe7607fa3566ab339d51b5303b6d728..a76149c5895e382559acdd6c837a5d94107ff783 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g
index ebc62289ef232967511f88d27bcc8827e50c18f1..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/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/multiphase/interFoam/RAS/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties
index 4bdf335073b4e55e629185f23017975968a27fd7..a8013f99c88d5dbb4c98d98b510328d759741827 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict
index 36a979a0d4ec2882e84394e479e265de9411612c..bbec6acd0d161a763edaa7b0f05e248bbe82b20d 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict
@@ -94,4 +94,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
index abb8a5f4e7a710f8cdee380d7cf4195ee470a75c..cbfca42d2bf72f7b9ba1bc25e699cdc82dd08c4c 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      6;
 
 maxDeltaT       1;
 
-
 functions
 {
     inletFlux
@@ -124,4 +122,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict
index a3468367ef7374a66ee7af833dd7c3fc7e924388..89866c42c9ff1500cbb9a5907b9239102e9d7388 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict
@@ -33,4 +33,5 @@ linearDirectionCoeffs
 
 mergeFaces      false;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1 b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1
index dfbda2fbfb61debe0f3d947e3740da3d3f78fe80..4744be49a2b953757b3158b54eb552661aff5353 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1
@@ -33,4 +33,5 @@ linearDirectionCoeffs
 
 mergeFaces      false;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2 b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2
index a3468367ef7374a66ee7af833dd7c3fc7e924388..89866c42c9ff1500cbb9a5907b9239102e9d7388 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2
@@ -33,4 +33,5 @@ linearDirectionCoeffs
 
 mergeFaces      false;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
index 56d737affe0c1d6825e9a4691ace28a1b0074b6e..217ad0ff38d66f1834da48ff65a76df728e51379 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,7 +56,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
index 6b9641f109d2407780b4ea01a4e539fd64ef4c44..7622a91b865f63b90119fd7a3529d76b7a877403 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,11 +51,7 @@ solvers
         solver           GAMG;
         tolerance        5e-9;
         relTol           0.01;
-
         smoother         GaussSeidel;
-
-
-
         maxIter          50;
     };
 
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict
index f096778dc0c07c9fcb9d067cfee44eba619fe102..72a1720616b0b68860da005ee029d46c9102d164 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U
index 8cf77cb136b215dd8d069f515d3ff24d432e8d3e..0417b2f6cd22c1ba3304e5572630ae11a438a0df 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U
@@ -52,4 +52,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water
index 08b2dbad12e76c463c17835626cf392cc98aaf49..135a642dfb7c79b9dc580b5e6d6201edbbdf8782 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water
@@ -53,4 +53,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut
index 68921fd77c6a48ca0cbe71a4bc984d41febf7410..058888ec6cee850744b6815326b884ab55b869eb 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut
@@ -25,16 +25,19 @@ boundaryField
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     lowerWall
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     atmosphere
     {
         type            calculated;
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh
index 417ba4aaad280723e91cb9fc522903109729bb64..adcc89845731c58ac0266dbe8cefc75fa72efd00 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties
index 812822fc798b884274aacd2110e4c4de933c694d..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
index 3b4a59abd3ee37d39166428bc12be8d7259dca3f..63f1917685ca6e2fa0f6523aff2e442edf91c66d 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
@@ -90,4 +90,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict
index 43467c22af307e57b6b7c4e6c81bee6ad73a0ba4..a989aeff58cf92eac7bf37fbde4b216825295165 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,4 +52,5 @@ maxAlphaCo      0.2;
 
 maxDeltaT       1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes
index edbcdb041e61fa1514f3d5e6925afba5b2d3690f..59bca45058ae4bec977fc572aa154a9824c6d50e 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,4 +52,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict
index 331b1fc0b552c91cb2ae97e5ab4775b5e0d4d79c..9584d9053f155f091d5aef396ddea3acdd36a5e0 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict
@@ -32,4 +32,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
index b7317548189fffb0621b791259fb29d78760b528..cc36822e88765b83d3e0074bffb6d56f150595d3 100755
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
@@ -3,9 +3,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-runApplication blockMesh
 restore0Dir
+
+runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
index d43697de04570b37359f9946c40f70e1128df34d..528f720d0809f4dcc09b32f673d6129cdb18b223 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
index c987696a1cc882e3eb31108a3bbb4b35d75357f9..a97c7bad47d9e0cf23a98d5dfeb9ab6e606ace43 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
index 74e4dbfd21ab5921c9c221feeaf5c43abfcb7044..2ccb7991e6d9382d91f095930427177209c37a1d 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
index a2fda5bfa442085bc51fdb7dc25ed8d635ac8996..43279597fcaf6cbfa712aaca9f77f8528140f5e1 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes
@@ -27,7 +26,7 @@ gradSchemes
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss upwind;
+    div(rhoPhi,U)   Gauss upwind;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
index 327bb1a5854743e4df12e7b7b431315b139aa705..7c6ddc8f7710b6f4a28fa288027a16ac12be06f5 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
index d967dbe2324256dd8eac12cc55cb5da29a54afc2..728413bcb917c2e4770d656dcb41605ef97095b5 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean
index 26e52f3f9f6bd2b8a77a8d214a695f0b5983bf1c..8aa080425ed7cf779fd034170de4af938f2963ad 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean
@@ -8,12 +8,12 @@ loseCases="damBreakFine"
 
 for caseName in $keepCases
 do
-    (cd $caseName && foamCleanTutorials)
+    (cd "$caseName" && foamCleanTutorials)
 done
 
 for caseName in $loseCases
 do
-    removeCase $caseName
+    removeCase "$caseName"
 done
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
index 05e7a0ad9dee8e3a622fe329246b3933c552df91..2870598d16a8dd0e1ccb48269de7a6e89345d4bf 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
@@ -14,12 +14,12 @@ setDamBreakFine ()
         -e s/"4 42\(.*\) 1 1)"/"4 76\1 2 1)"/g \
         -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \
         $blockMeshDict > temp.$$
-    mv temp.$$ $blockMeshDict
+    mv -f temp.$$ $blockMeshDict
     sed \
         -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \
         -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \
         $controlDict > temp.$$
-    mv temp.$$ $controlDict
+    mv -f temp.$$ $controlDict
 }
 
 # Do damBreak
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water
index 81ca6599f6e65c1d39374d697d1c6faec9d15c39..721ca601150436bf5071551166f213f396fbff5d 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh
index 34245108ab80457e6f9cd34ee6d4bbbe3aade5e4..95248d7537ba5933c392f42130e44c6fc943f162 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
index 01eb91b884b25ebe72b1a502cc295208a357fd1d..cc36822e88765b83d3e0074bffb6d56f150595d3 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
@@ -4,8 +4,11 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties
index 58a9f54c86700a779ca1ee0b350029e6e2b0049d..4751f65418877f5678d754295945e2d27537baed 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -33,4 +32,5 @@ air
 
 sigma            0.07;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict
index 7676445dfa23a9bb7be5735c449e39daab9ab808..867860524d7db076ba20d4e5a2610eebcfe5f448 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
index 3aa6beb9dd49c1329ffcfca4231d9dd3395e783d..5ac0620ac9d8815038a2eef95689f47ae6582230 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,4 +54,5 @@ maxDeltaT       1;
 
 #sinclude   "sampling"
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict
index 33631badb5a5224759a37aca4bb44b8fc6be53d7..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes
index a57cabdd2031015f546c23ee983b0ec676352add..ff9938fccfeee45aa77242190da1f7bd07660e84 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ gradSchemes
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss linearUpwind grad(U);
+    div(rhoPhi,U)   Gauss linearUpwind grad(U);
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution
index 435e82b830a2d0b8058ace407acbcfda9cf28014..3d3ae2b914aa996300b1afda41ea49c16e9f1550 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling
index f1d86f91c0ce11ee14ea14fc391453b8dee3ac7d..b9428ae3abcb5b075bb76b332488453540333b73 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling
@@ -51,4 +51,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict
index 9962581b7e319ecca961fb8b45133ddf9f0c1fa2..804fd6506cd701e0cfd6b1b59af0f21f3b2c387d 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water
index b19e91c56706194909e51bcb3b81624081c95298..19794e2f8d8dcd33d6d2e092e557fbae10fe56d2 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water
@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k
index 2a060788684822cb3fcc7f770dac658addeb4a51..ba49a24ea5132af717bd605014fd8d06250e2569 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega
index ea794bf45144c6ee3fb11d130e98c4c64e9def11..9f62360de7194c2377a9d302a1fd12420febdea6 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega
@@ -35,5 +35,4 @@ boundaryField
 }
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh
index a85fb3cad305f03963849d7528e9e9ef3412b9a4..5299e2469b3aeab0136bfa27e0f17e86a7523dcd 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun
index 1cbd09d70acbedacfb7a576a365779e864c46066..428597cb086326d2ca8910b479ff4d161211a7c1 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun
@@ -4,10 +4,15 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 runApplication blockMesh
+
 runApplication topoSet
+
 runApplication subsetMesh -overwrite c0 -patch walls
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict
index 0f852902f661c8850124c960852dcc599005c4d9..5ad68e3b9df10f68fe07824e30650ba4787f7b53 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict
index 572f7d27a41d9bb3c8dad229db4f0875ad79c599..8e9e650f4d08a0aef0a3dce5b66a34d070c06575 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict
@@ -65,4 +65,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict
index 4334c542ead05b0c84651b8a9ffead08805639fc..74a51ea3fac5f41b74d4b898043a15c087e3bb48 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict
index 9c3640dcca6abaf698304f21010cb46c440c6e10..819830315be482a58c697cf3ac2280432af7c15b 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict
@@ -18,4 +18,5 @@ numberOfSubdomains  6;
 
 method              scotch;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes
index 439e535bf1c8f9fa4c1d807485cc9db2a719b1f2..7f77bdd288c6fd83b1e97fa6e485508e32cffb17 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +51,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
index 18fa645c5fc0f09df4d6156609ebbe0fa90023c8..2c5e371e1e95f498dcde635b0076854ecb94a901 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict
index aa61cf6845cc14c7c6c8bb686a04f23cd94b4bd9..6d289562736fa09f5ccbf907cf08cfe66c5e2cc2 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
index 12c2c0754d3692bb8a83e94673e81892191d3467..35986158a56f5f70196500ef1654a9d037d700e4 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
@@ -36,4 +35,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water
index be2c17e6a81c741426ee15a2f702826e4fcdac31..823204793b8542863b7b5dbe3d71c029c8b5fa5f 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh
index 9b420c815b9a368d02d15288dd2df5eeece4419f..67bd9687ef8201b79c63ad8bd467fad3ffc8adb2 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun.pre
index 9d3d4a8a37e9f2de5d1b14d969c7074a55fe5d96..3dd269fcca7f96dd15fc232114a62ac4ae1183d2 100755
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun.pre
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun.pre
@@ -4,7 +4,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
-
 runApplication blockMesh
 
 runApplication topoSet
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
index 43b9d8392403a0d2813917e95d7c17ff17564bc2..58fd56d294fe80c379ac9c8109b9b36a7004953a 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,4 +27,5 @@ MRF1
     omega     constant 6.2831853;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g
index aa97844247dde59b859143026a9d4bf3af09b6da..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/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 0);
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
index a1353b43efc43c6ac68504ea0acd6ae32b83f3d5..36a69a79f21a18a1d7f863ef0dac8557c1616ce7 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water oil);
+phases          (water oil);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
index 79a1d2d9ca2febfc9978db9c4e27ff2618c1aaec..65a8c00e180b16c402611c636056c515383249e8 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
index 50198586ac579fc82f4497e086606cec12c433a1..c10e722212d9884f9f2919ae9ff6ad97faa5ec5f 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
index ab4d4614729d00837be29353fb2c8dc564f462ad..0edacd1e7c54f1cad69c07fecd86058df87fcccb 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
index e80ff4b1c1725c5c4ad5527619ffee69dea399e5..4268bb1969b92c7342a0e532f4abc85f48a685c5 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
index 403e370591760a67ca21e33f8251ffcb572c6684..ef51cdb1736e7be4004dc8b25c8e4a6acfaad771 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U
index 10d30af247b8600c0f8ee1e5f41071c258298ef3..1b1b865dbcd902711b4da08cef8a849928776a55 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U
@@ -29,4 +29,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water
index 8b27893bcdea55486840a7341988cf50a6931d00..37c967302425c896fdace2ef0f00a86d191f7165 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water
@@ -28,4 +28,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh
index 4873a9a85e2bf5c02d7283f5d2b9d974f88d7b96..4ed9694313ee7108f2524d0ec60d14cae97e7c96 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh
@@ -28,4 +28,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean
index 21a3ef143cef22ef26bb903f23d8ae89c6b63f23..64e0b6245f8b82d7f223d828ef0cda85e1c6939d 100755
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean
@@ -5,7 +5,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 cleanCase0
 
-# Remove surface and features
 rm -rf constant/triSurface
 rm -rf constant/extendedFeatureEdgeMesh
 
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun
index 9040147a8274e8045d04952a3e3dc9f57349dd55..07f4092bb6f3305c0efffa1c3e998ec3d3bc26b2 100755
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun
@@ -3,13 +3,14 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-restore0Dir
-
 mkdir -p constant/triSurface
 
-cp -f $FOAM_TUTORIALS/resources/geometry/sloshingCylinder.obj.gz \
+cp -f \
+    "$FOAM_TUTORIALS"/resources/geometry/sloshingCylinder.obj.gz \
     constant/triSurface/
 
+restore0Dir
+
 runApplication blockMesh
 
 runApplication snappyHexMesh -overwrite
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict
index 995165dbed47ec8981a7fe4c3b2efc93f51e98b2..5279a7a4ad1268c905909f4563196bfeb938e746 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties
index 329748eb5606a0491c67150135fbb495447bc55d..eb9a504ed78734bdd243e098ee0ba1d9a96c53cb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -33,4 +32,5 @@ air
 
 sigma           0.07;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict
index b0e98f9d8bf2bc3ce15b83218eb9d92306dfdac9..083ee5ad1074b6f17a4e1a2cf46c53bf298015df 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict
@@ -91,4 +91,5 @@ boundary
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict
index 4b24c8a9f5b5240e128022dc3021d692832606c4..a45cf01b464cb726370f5bdc0519eca1d1093fa3 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes
index a9c66d982c7ee4c8db7f3830399c470921d22d6b..953a57921fe79edd81988861e400e06edfc49ba0 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution
index deda89f4389ea717a720c06a54fa1765dd41e7bd..6320788b1dc3c72dd008f290296cde0640b4ff74 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -72,7 +71,6 @@ PIMPLE
     nCorrectors     2;
     nNonOrthogonalCorrectors 1;
     correctPhi      no;
-
     pRefPoint       (0 0 0);
     pRefValue       1e5;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict
index 60f2158bacebd299dcef7816921dd6f088e7532e..5d780ddde4b883d590aacc8475df1123c7ada43c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict
@@ -16,4 +16,5 @@ FoamFile
 
 #includeEtc "caseDicts/mesh/generation/meshQualityDict.cfg"
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict
index 2dbbf1db63ec8e04990ba98172b7421131f1bccc..4a782c51802d6c102b2e313484517d00c1b85cd0 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict
index 673ff332edcac1bb50110dd558d4954e3c2f84eb..b8b9bca3df91f7d8057158dbb54d9aabb6a038cd 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict
@@ -80,4 +80,5 @@ writeFlags
 
 mergeTolerance 1e-6;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U
index f4400b92b9fb41fa94cea5d85edc20204c46e9d5..8aae30e0ed6c630e073bdf2ccd2d29c385123731 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U
@@ -37,4 +37,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water
index be5471701ce99b5127c455b5d5f1cbd9b6b1fa8c..aca52b40d6cdf639706b6754265a0584803fc6f8 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh
index 2e5c06a4581b7fe5471c14d641a1616f7496e81b..8eaf0a1284acf878756303f385d920744147ee1d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun
index b7ffa9ddcecb3e60131a90a77c9810a9a1797f05..71fee596c5090c284895886922bfc7d0a6dc909b 100755
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun
@@ -4,9 +4,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
index 5c1363c36f186c1e372991fbe46b5bbd68078656..a79cc4085dfec1089665403ee5548ac371e4fade 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties
index a0163959c37cddbf761ea244e775f6f89cf90a1e..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -33,4 +32,5 @@ air
 
 sigma           0;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
index d219ee8cb5f5bea063d0eb520dd4edf5f24b03c5..6a6c59d18d24e7387b887e08a91bcdd25bd9dff2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict
index df13f4e670707bcb89e06456400826778d225b07..d569ffffc01e6d0b8527cd6799c00b49fa9b194c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 3 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes
index a9c66d982c7ee4c8db7f3830399c470921d22d6b..c2b37a723cc006599ce58124a5bfb69fa9669495 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ gradSchemes
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss vanLeerV;
+    div(rhoPhi,U)   Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
@@ -48,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
index 1765a14ca312892e8bca27127eab8c7dd653ce5d..aae92e91743ac670e6490537d61c8c871e5ce3d6 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,7 +82,6 @@ PIMPLE
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     correctPhi      no;
-
     pRefPoint       (0 0 0.15);
     pRefValue       1e5;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict
index 39cff1bf12c499544a880157eba4ccbac1fc5de2..a09f27caa04daa40edb3bb8f1637353a31aa5c50 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U
index f4400b92b9fb41fa94cea5d85edc20204c46e9d5..8aae30e0ed6c630e073bdf2ccd2d29c385123731 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U
@@ -37,4 +37,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water
index be5471701ce99b5127c455b5d5f1cbd9b6b1fa8c..aca52b40d6cdf639706b6754265a0584803fc6f8 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh
index 2e5c06a4581b7fe5471c14d641a1616f7496e81b..8eaf0a1284acf878756303f385d920744147ee1d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun
index b7ffa9ddcecb3e60131a90a77c9810a9a1797f05..71fee596c5090c284895886922bfc7d0a6dc909b 100755
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun
@@ -4,9 +4,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict
index 02b17418b0bc757b6036dc7dda8e8b9bad21a744..bc1b4b60db002be6464efd2127a79de38d870a30 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties
index 17cc2918337abe9d6b842963e5d9fa5ec32e1e32..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
index d219ee8cb5f5bea063d0eb520dd4edf5f24b03c5..6a6c59d18d24e7387b887e08a91bcdd25bd9dff2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict
index df13f4e670707bcb89e06456400826778d225b07..d569ffffc01e6d0b8527cd6799c00b49fa9b194c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 3 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes
index a9c66d982c7ee4c8db7f3830399c470921d22d6b..c2b37a723cc006599ce58124a5bfb69fa9669495 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ gradSchemes
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss vanLeerV;
+    div(rhoPhi,U)   Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
@@ -48,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
index 1765a14ca312892e8bca27127eab8c7dd653ce5d..aae92e91743ac670e6490537d61c8c871e5ce3d6 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,7 +82,6 @@ PIMPLE
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     correctPhi      no;
-
     pRefPoint       (0 0 0.15);
     pRefValue       1e5;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict
index 39cff1bf12c499544a880157eba4ccbac1fc5de2..a09f27caa04daa40edb3bb8f1637353a31aa5c50 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U
index 62323e5e3997a68cc64788d764d08e7087549093..1970ae7d0af5bdcc8f8e44e732f0a3a7eb284093 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U
@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water
index 632a2df297c27d19a09517945e61ec52be33d37c..0e29bb264d5633c3946b17e532b69547a0852d97 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh
index e550218822581707991efca81767a34852dc7d4f..1d0fd3aaea1c03db147f3e3a33f27566ed628a25 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun
index b7ffa9ddcecb3e60131a90a77c9810a9a1797f05..71fee596c5090c284895886922bfc7d0a6dc909b 100755
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun
@@ -4,9 +4,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict
index 5c1363c36f186c1e372991fbe46b5bbd68078656..a79cc4085dfec1089665403ee5548ac371e4fade 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties
index a0163959c37cddbf761ea244e775f6f89cf90a1e..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -33,4 +32,5 @@ air
 
 sigma           0;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict
index b8044a7e626f10186d18b6b9a1dd49f758a8877c..8be7682779386a1e06cec53589fe645f624d0ac2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict
index ad85180cd9f2265b0fc6da874e5257347b7b970f..5846a3813ff26d7e1233e2a39d0e0a1f9ca2ce5d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (4 2 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes
index a9c66d982c7ee4c8db7f3830399c470921d22d6b..c2b37a723cc006599ce58124a5bfb69fa9669495 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ gradSchemes
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss vanLeerV;
+    div(rhoPhi,U)   Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
@@ -48,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
index 1765a14ca312892e8bca27127eab8c7dd653ce5d..80d090994db9ef424fe902c761518d275151f4f0 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict
index 39cff1bf12c499544a880157eba4ccbac1fc5de2..a09f27caa04daa40edb3bb8f1637353a31aa5c50 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U
index 62323e5e3997a68cc64788d764d08e7087549093..1970ae7d0af5bdcc8f8e44e732f0a3a7eb284093 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U
@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water
index 632a2df297c27d19a09517945e61ec52be33d37c..0e29bb264d5633c3946b17e532b69547a0852d97 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh
index e550218822581707991efca81767a34852dc7d4f..1d0fd3aaea1c03db147f3e3a33f27566ed628a25 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun
index b7ffa9ddcecb3e60131a90a77c9810a9a1797f05..71fee596c5090c284895886922bfc7d0a6dc909b 100755
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun
@@ -4,9 +4,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict
index 02b17418b0bc757b6036dc7dda8e8b9bad21a744..bc1b4b60db002be6464efd2127a79de38d870a30 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties
index 17cc2918337abe9d6b842963e5d9fa5ec32e1e32..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict
index adeddd1d1a345a816369324f5ebd1eb6afbbae04..68edde48676f32c80254aa1e6316e93e2c6413e8 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict
index ad85180cd9f2265b0fc6da874e5257347b7b970f..5846a3813ff26d7e1233e2a39d0e0a1f9ca2ce5d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (4 2 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes
index a9c66d982c7ee4c8db7f3830399c470921d22d6b..c2b37a723cc006599ce58124a5bfb69fa9669495 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ gradSchemes
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss vanLeerV;
+    div(rhoPhi,U)   Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
@@ -48,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
index 1765a14ca312892e8bca27127eab8c7dd653ce5d..80d090994db9ef424fe902c761518d275151f4f0 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict
index 39cff1bf12c499544a880157eba4ccbac1fc5de2..a09f27caa04daa40edb3bb8f1637353a31aa5c50 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U
index 62323e5e3997a68cc64788d764d08e7087549093..1970ae7d0af5bdcc8f8e44e732f0a3a7eb284093 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U
@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water
index 632a2df297c27d19a09517945e61ec52be33d37c..0e29bb264d5633c3946b17e532b69547a0852d97 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh
index e550218822581707991efca81767a34852dc7d4f..1d0fd3aaea1c03db147f3e3a33f27566ed628a25 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun
index b7ffa9ddcecb3e60131a90a77c9810a9a1797f05..71fee596c5090c284895886922bfc7d0a6dc909b 100755
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun
@@ -4,9 +4,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict
index 4e4de53a3ca0142e95645c63b7c341295c22946d..c1b3664a831d355323ba14e5b1bcfde75264b988 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties
index a0163959c37cddbf761ea244e775f6f89cf90a1e..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -33,4 +32,5 @@ air
 
 sigma           0;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict
index adeddd1d1a345a816369324f5ebd1eb6afbbae04..68edde48676f32c80254aa1e6316e93e2c6413e8 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict
index ad85180cd9f2265b0fc6da874e5257347b7b970f..5846a3813ff26d7e1233e2a39d0e0a1f9ca2ce5d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (4 2 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes
index a9c66d982c7ee4c8db7f3830399c470921d22d6b..c2b37a723cc006599ce58124a5bfb69fa9669495 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ gradSchemes
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss vanLeerV;
+    div(rhoPhi,U)   Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
@@ -48,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
index 1765a14ca312892e8bca27127eab8c7dd653ce5d..80d090994db9ef424fe902c761518d275151f4f0 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict
index 39cff1bf12c499544a880157eba4ccbac1fc5de2..a09f27caa04daa40edb3bb8f1637353a31aa5c50 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U
index 62323e5e3997a68cc64788d764d08e7087549093..1970ae7d0af5bdcc8f8e44e732f0a3a7eb284093 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U
@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water
index 632a2df297c27d19a09517945e61ec52be33d37c..0e29bb264d5633c3946b17e532b69547a0852d97 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh
index e550218822581707991efca81767a34852dc7d4f..1d0fd3aaea1c03db147f3e3a33f27566ed628a25 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun
index 01eb91b884b25ebe72b1a502cc295208a357fd1d..cc36822e88765b83d3e0074bffb6d56f150595d3 100755
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun
@@ -4,8 +4,11 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 restore0Dir
+
 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict
index 3573fd5d930d733e7ed65700ad4e5d14bbc9cdeb..607fa7b7b4ae053415233d8813a6f0a6e31908f9 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties
index 17cc2918337abe9d6b842963e5d9fa5ec32e1e32..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict
index 686698de0369bbe68e2ce132e07c3afb9d6d32f9..d0945691d3952d5d4701dba2c4153ae7cdb20502 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict
index ad85180cd9f2265b0fc6da874e5257347b7b970f..5846a3813ff26d7e1233e2a39d0e0a1f9ca2ce5d 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (4 2 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes
index a9c66d982c7ee4c8db7f3830399c470921d22d6b..c2b37a723cc006599ce58124a5bfb69fa9669495 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ gradSchemes
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss vanLeerV;
+    div(rhoPhi,U)   Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
@@ -48,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
index ae33ddbdeb2ed547197fab14fbedd9a7b940deb0..9c795481eb22e396b2c4049e0e0e52885836d32b 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict
index c04816471ccd897fed3a135da32903871faf5b50..0aef22e8719c5bc740c32f92cd9064562fd778be 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U
index 60ec27bd7d81d7e1c2e0b05e54e8c9da1266d25c..1e5c481e92ee4af35545cbeecda68c8006e241b5 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water
index 5c4a181206ac77cf677cc4541b285f4253c91184..c42184424432ba328302bb1472250a81929ad2ad 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      alpha.water;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh
index ce39087eea0e95a0399b902cb2487d02e11e230b..f7b84011f48217e0ca9fdb537c01f89edea66a41 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      p_rgh;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun
index e3b61a0f14bc89ad1bc111d8bb4a2011b556a8ff..b10aff3e94d5c9db587e93d80e7f3734e5bf69d1 100755
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun
@@ -4,16 +4,24 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
-runApplication -s createBlockage topoSet -dict system/topoSetDict.createBlockage
+
+runApplication -s createBlockage \
+    topoSet -dict system/topoSetDict.createBlockage
+
 runApplication subsetMesh -overwrite blockage -patch bottom
-runApplication -s createPatch topoSet -dict system/topoSetDict.createPatch
-runApplication -s createCollector topoSet -dict system/topoSetDict.createCollector
+
+runApplication -s createPatch \
+    topoSet -dict system/topoSetDict.createPatch
+
+runApplication -s createCollector \
+    topoSet -dict system/topoSetDict.createCollector
 
 restore0Dir
 
 runApplication decomposePar
 
 runParallel setFields
+
 runParallel $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties
index 5c5a9b7a5ecb6784285591bd55329a83cb442f03..15c0d5bd12c02dda59fffc7e9b1d915b8abcbc5a 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict
index 98db7243e7a848bcfbfecf6daa82163a2778436e..887c491d9b9f81a0722d143a4327ab4225c9230d 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict
@@ -72,4 +72,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict
index 61d3e40010c6acd46c5589f04ff6ebabaa0f5e17..789599f161e6ea93c60369d53f5d2ccd2fc4c31f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      1;
 
 maxDeltaT       1;
 
-
 functions
 {
     extractEulerianParticles1
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes
index 29ccd9c080ccb348082d21f77bbee8ff178f9788..0c69d453d42e930c168efb6a54cf696cef35c7bf 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution
index 379628c616c4811165a04694e57f62910688f8ce..c39bc0ba56a79d5b07956d920bdf49d32d566b4c 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict
index f87b10535ed4c52287eaaaef498096f3dd8e03e9..6917ef25e59bbbadb9099960a116f6b41d0388af 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
index 43a9ebe6e50a450d65b428584d79f252bb9edecb..27aac59a285c9209a0ec89c2f4dde6411e3126cb 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
@@ -34,4 +34,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
index a82bdb8eecbb5e29cd657875f8a0cccfb36666a5..2f5880d4cc4377917ed6f270c310fa925b5f2379 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
@@ -48,4 +48,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2
index 7b47877d4472391e7c8f411ed66f75ab1838fb6d..992a995fe42096c960fa5e1dfba2c343fa322594 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2
@@ -12,18 +12,19 @@ FoamFile
     class       volScalarField;
     object      N2;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 0 0 0 0];
+dimensions      [0 0 0 0 0 0 0];
 
-internalField       uniform 0.766;
+internalField   uniform 0.766;
 
 boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2
index 7c7bc687b8e131afc2a90a3601e98a201cdf78e6..071749dd8b5cb431a01610038aaaa6a722a8a6e6 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2
@@ -12,18 +12,19 @@ FoamFile
     class       volScalarField;
     object      O2;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 0 0 0 0];
+dimensions      [0 0 0 0 0 0 0];
 
-internalField       uniform 0.234;
+internalField   uniform 0.234;
 
 boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T
index b17f99cc705fe4796b41d597cc98bedae67f1f22..78b0c62c6bf95834ff80599fd579544fb79964f5 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T
@@ -12,18 +12,19 @@ FoamFile
     class       volScalarField;
     object      T;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 293;
+internalField   uniform 293;
 
 boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U
index ec65053cf56c4064f50dd38c8baa854b52085bee..16bc34420464f1dc16c3cfaa09c84fc1d66824e5 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U
@@ -12,19 +12,20 @@ FoamFile
     class       volVectorField;
     object      U;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 1 -1 0 0 0 0];
+dimensions      [0 1 -1 0 0 0 0];
 
-internalField       uniform (0 0 0);
+internalField   uniform (0 0 0);
 
 boundaryField
 {
     walls
     {
-        type                fixedValue;
-        value               uniform (0 0 0);
+        type            fixedValue;
+        value           uniform (0 0 0);
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault
index 999bbcefaf50f4a76461bbeb218f4d8ecb7af889..835daddcef5b9f6ba28cbdf2f1434a013b7f775a 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault
@@ -12,18 +12,19 @@ FoamFile
     class       volScalarField;
     object      Ydefault;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 0 0 0 0];
+dimensions      [0 0 0 0 0 0 0];
 
-internalField       uniform 0;
+internalField   uniform 0;
 
 boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat
index 97df3fd4c4f325e29fedc0f5ec65e50554d21fc3..36e72aa4e9c896e485714021538a645cc63e4f5a 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      alphat;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon
index 4d9b0213d1ea30c573f904721722e8f5bc905e62..f553bc486792b0ad292f819eae0cae462987ee3c 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      epsilon;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k
index ed075a93143dc4520157b8d2f2b4ebb254b626a7..68fb0923c3e6ca89901b0f8d6393677ca7c1eb81 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      k;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut
index eeaa0059049f1126042941b7f918070c854ac844..0b9465face1f8e58a3d828f6b6244d084c4e315d 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      nut;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p
index 4025036b9e3fb155b92f60dc2e5dee1cc3d2df5a..ac7ffa751d5f3eeb38a46aff4a5d0e44eecb66d1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p
@@ -12,11 +12,11 @@ FoamFile
     class       volScalarField;
     object      p;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 101325;
+internalField   uniform 101325;
 
 boundaryField
 {
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun
index 9bec2595a842b19f9839453b5fbb9783d2d6dd03..8dc8ad497dd9233456446f01ef949d4623c3996a 100755
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun
@@ -34,8 +34,8 @@ copyLagrangianData()
     if [ -d $dir ]
     then
         echo "Copying lagrangian data from $ldir to 0 directory"
-        \cp -r $ldir 0
-        mkdir 0/uniform && \cp -r $udir 0/uniform
+        cp -rf $ldir 0
+        mkdir 0/uniform && cp -rf $udir 0/uniform
     else
         echo "Error: unable to find Lagrangian data in case $ldir"
         exit 1
@@ -43,7 +43,7 @@ copyLagrangianData()
 }
 
 
-restore0Dir;
+restore0Dir
 
 copyLagrangianData ${eulerianCase}
 
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties
index 9f9ae1f2d28b4ffd643b457d1b78880a12b32d07..7c18c53a428ae7a0e16bdec848ac59e7ba3b8c3b 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
index bcafaf4d7eacc9f7c3e96e6a140ae2d695b5b35d..1d66061fb5d1279f3e1770807816da2269d90a07 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g
index 111080ed5d4f069de0a135b826c794181d5bda22..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties
index 791460502ca46d44b0ba310684f1693f83896f44..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
index 25af7568202fc3ebd2af47765629486c6679028f..8c8b4932709d6348b539620c9e07b52ccb45b9c9 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
-    location    "constant";
     object      sprayCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties
index 20cf0a5cc29fdb1df54e32f5224c77753101af24..1335d6bd368722014c3c58c0c03b1945b5160cc3 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -76,4 +75,5 @@ liquids
 solids
 {}
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties
index 0a31cf32140ba9452d8c1312dae167bda3a31514..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties
@@ -8,14 +8,13 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict
index b69932d601cd009d1785be49116547443979dc8b..2014e5f310d5510b1e7f8b9436fe99d84618f6fb 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict
@@ -54,4 +54,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict
index d6a4a32b4f99423d4c99a2f56ab1f705749629c9..e6dfc7ac1f35e19e38f4923a340f143fe58fa598 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 application     sprayFoam;
 
-startFrom       latestTime; // startTime;
+startFrom       latestTime;
 
 startTime       0;
 
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes
index 413db0e50a6f5670ffe9a7071377c1bdadd4936a..f79c14095740ebf6eac6318d74e83cec3cfd423b 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution
index 5ed26a46841bc4db172db7a17e3c073464b8cf9a..05dd2ddaf3e53f02367b605891e732eec95ec9de 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/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/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2
index 7b47877d4472391e7c8f411ed66f75ab1838fb6d..992a995fe42096c960fa5e1dfba2c343fa322594 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2
@@ -12,18 +12,19 @@ FoamFile
     class       volScalarField;
     object      N2;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 0 0 0 0];
+dimensions      [0 0 0 0 0 0 0];
 
-internalField       uniform 0.766;
+internalField   uniform 0.766;
 
 boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2
index 7c7bc687b8e131afc2a90a3601e98a201cdf78e6..071749dd8b5cb431a01610038aaaa6a722a8a6e6 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2
@@ -12,18 +12,19 @@ FoamFile
     class       volScalarField;
     object      O2;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 0 0 0 0];
+dimensions      [0 0 0 0 0 0 0];
 
-internalField       uniform 0.234;
+internalField   uniform 0.234;
 
 boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T
index b17f99cc705fe4796b41d597cc98bedae67f1f22..78b0c62c6bf95834ff80599fd579544fb79964f5 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T
@@ -12,18 +12,19 @@ FoamFile
     class       volScalarField;
     object      T;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 293;
+internalField   uniform 293;
 
 boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U
index ec65053cf56c4064f50dd38c8baa854b52085bee..16bc34420464f1dc16c3cfaa09c84fc1d66824e5 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U
@@ -12,19 +12,20 @@ FoamFile
     class       volVectorField;
     object      U;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 1 -1 0 0 0 0];
+dimensions      [0 1 -1 0 0 0 0];
 
-internalField       uniform (0 0 0);
+internalField   uniform (0 0 0);
 
 boundaryField
 {
     walls
     {
-        type                fixedValue;
-        value               uniform (0 0 0);
+        type            fixedValue;
+        value           uniform (0 0 0);
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault
index 999bbcefaf50f4a76461bbeb218f4d8ecb7af889..835daddcef5b9f6ba28cbdf2f1434a013b7f775a 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault
@@ -12,18 +12,19 @@ FoamFile
     class       volScalarField;
     object      Ydefault;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 0 0 0 0];
+dimensions      [0 0 0 0 0 0 0];
 
-internalField       uniform 0;
+internalField   uniform 0;
 
 boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat
index 97df3fd4c4f325e29fedc0f5ec65e50554d21fc3..36e72aa4e9c896e485714021538a645cc63e4f5a 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      alphat;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon
index 4d9b0213d1ea30c573f904721722e8f5bc905e62..f553bc486792b0ad292f819eae0cae462987ee3c 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      epsilon;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k
index ed075a93143dc4520157b8d2f2b4ebb254b626a7..68fb0923c3e6ca89901b0f8d6393677ca7c1eb81 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      k;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut
index eeaa0059049f1126042941b7f918070c854ac844..0b9465face1f8e58a3d828f6b6244d084c4e315d 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     object      nut;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p
index 4025036b9e3fb155b92f60dc2e5dee1cc3d2df5a..ac7ffa751d5f3eeb38a46aff4a5d0e44eecb66d1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p
@@ -12,11 +12,11 @@ FoamFile
     class       volScalarField;
     object      p;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 101325;
+internalField   uniform 101325;
 
 boundaryField
 {
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun
index 9bec2595a842b19f9839453b5fbb9783d2d6dd03..e35bd8e7456fb807e6bf2780f1fc40970562cf12 100755
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun
@@ -34,8 +34,8 @@ copyLagrangianData()
     if [ -d $dir ]
     then
         echo "Copying lagrangian data from $ldir to 0 directory"
-        \cp -r $ldir 0
-        mkdir 0/uniform && \cp -r $udir 0/uniform
+        cp -rf $ldir 0
+        mkdir 0/uniform && cp -rf $udir 0/uniform
     else
         echo "Error: unable to find Lagrangian data in case $ldir"
         exit 1
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties
index 9f9ae1f2d28b4ffd643b457d1b78880a12b32d07..7c18c53a428ae7a0e16bdec848ac59e7ba3b8c3b 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
index bcafaf4d7eacc9f7c3e96e6a140ae2d695b5b35d..1d66061fb5d1279f3e1770807816da2269d90a07 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g
index 111080ed5d4f069de0a135b826c794181d5bda22..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties
index 791460502ca46d44b0ba310684f1693f83896f44..6766c9f953a7dbef310f886e3f61d38fd2c82e3e 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
index 1e0af721fc78b51cd92e2771bfb2c0a4c0735a49..796093d2a762f067f67848ebbb304ae946589a16 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
-    location    "constant";
     object      sprayCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties
index 20cf0a5cc29fdb1df54e32f5224c77753101af24..1335d6bd368722014c3c58c0c03b1945b5160cc3 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -76,4 +75,5 @@ liquids
 solids
 {}
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties
index 0a31cf32140ba9452d8c1312dae167bda3a31514..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties
@@ -8,14 +8,13 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict
index b69932d601cd009d1785be49116547443979dc8b..2014e5f310d5510b1e7f8b9436fe99d84618f6fb 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict
@@ -54,4 +54,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict
index d6a4a32b4f99423d4c99a2f56ab1f705749629c9..e6dfc7ac1f35e19e38f4923a340f143fe58fa598 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 application     sprayFoam;
 
-startFrom       latestTime; // startTime;
+startFrom       latestTime;
 
 startTime       0;
 
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict
index 8f4899af2f794d928b2f3259817356667d6c7808..facb2d6e4ec3de12dd9b359ad32d28663e61d07e 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes
index 413db0e50a6f5670ffe9a7071377c1bdadd4936a..f79c14095740ebf6eac6318d74e83cec3cfd423b 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution
index 5ed26a46841bc4db172db7a17e3c073464b8cf9a..05dd2ddaf3e53f02367b605891e732eec95ec9de 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/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/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U
index 7bc6acf72cc6226111031d4fa632a8f11cf5dc73..424ae008701e1333a87b3f288d947f8050e1d4b9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water
index 62552cce513fde7d39c2c430b0994ae3e1b6e20b..841420a68788dd753513a876a3de54ca02e27178 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties
index 27474bf84cab9ff8cc77f632f22d9296e6a54fe5..42f828993176bf82db6f655f7abe147b844a90fb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
index 6571348e585f0ca7bfc7ce82a520bb67ba180981..f018ab73fb031256020f671f220c035ada9262ae 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
index e6ebe500186e4582bbda6fbf9006078bc48f85aa..1da8e0814ea40a4154c58d5eed4d729aa7232ca3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     line
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
index 5c53b81a2667c35569bca98a32e5d5a92879928d..01f551af4ef40b474e92ed8e1f5bf092fa59c668 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict
index 2f11f3b41dc96886b60b3068afb05df4ed306141..7bc80051e02154452b19cb27e70b58a1f4f24731 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U
index 2391c3d9ab6dd31a5b7bc698df29e0fa3cc065e9..bfb0cebb432f479d3a5906209ad2ab53bb78194e 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U
@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water
index 5718e07f6449b9347ab4200f8576d086862950d6..7ef82c7d757a167720b76f8dfc079794ffd36d11 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water
@@ -54,4 +54,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties
index 3f951b0d05df0062f0c25dd1b4ea635d4574d028..7df4019c92192d7409bd53910cab559d08a8bb30 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
index 296be769e0429e4dab64292abc6a00fd9ffe38a0..5ba9577fcefd7e31b9727e5786c67b8aab41a934 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
@@ -93,4 +93,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
index 449f225305a1e3e5f5cb66fb7bb100ec9a85390b..a679cdd8880bd0aeeb0662b8b29ecdb98b1beab2 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict
index f8b2b572bd73f84e9c8e1d157ad29a3bd6f93a55..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict
@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      decomposeParDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 numberOfSubdomains 2;
@@ -24,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
index 5a4621b07419f8f40156bac4daaf0cbf9b19dadc..93f5e6999cf325b425bef40320063ac80f0939b8 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict
index 431b8f0509f7d278c86f44b26cf387f257173138..77f52122122f94eeb4c08bbd6540b0dfaabd0ebe 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex
index 7af2e76f8d23b60b632f6ab07643527ee2ece507..9a4d300dbfa470ee40cf26a5d24ed94f2a8e08d7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex
@@ -26,4 +26,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U
index 2bdfb7fd57ece86929ddabcf8a4008001dfd5564..ca2846d414658bc40821ab7faf1d63aaf54adaab 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
index 8de29dccfd3771ae9a582f98ebeb068275e28833..a118150eff08bd03c9c33bb9eb4c068565b6b12a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties
index 3c91f6f349b09605dfd045c5a63f70dd3b301d8d..926cc75bd35e30f7ee920e78383b02bda53d49d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties
index 812822fc798b884274aacd2110e4c4de933c694d..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
index eb88113a87599239990d6e070908187f65bcba1b..7b627c46bf5336fab499f582e8460b18b8482798 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -39,4 +38,5 @@ right
     nPaddle         1;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict
index 4ae2c77fab0148e5d56eddda9ce8a39123d531e1..0e7182b1896f4d9b32cf500f6aa3cd8b04ad5f62 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
index e3607abcb423ae080af167d82ec45dc7456485ad..8e70940bf43fc08b676081848d4b4edc3fa6e692 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -158,4 +157,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions
index e6db5d5ba940c2db37cb6820adea50b73b03cb75..deb09cbc9d0e49501bdebe857fc55bc666429be7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,4 +58,5 @@ TurbulenciaMangroves
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
index d39cd3bea8053d7ce208155493ee1e0aace810ad..4e8f4ff17ba21d6d564a9491013570a5dd9475ba 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
index e9ad1e020bde370aa584feb2df9ff3ca5a8ee3a7..20496a6ea373762a1ca30c62926a15a1782e2463 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict
index c60d1ca4444dfb364002157e9b99a1c6db3750b5..d83f936c7ca9067be71aeba8b413c5195aa26e4f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict
index ac0921c82811144358c840f0ffef2be1b6d4c237..48ea53997f6f2bd6f5df239f7987696cc0444e4a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict
@@ -28,4 +28,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U
index 7bc6acf72cc6226111031d4fa632a8f11cf5dc73..424ae008701e1333a87b3f288d947f8050e1d4b9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water
index 62552cce513fde7d39c2c430b0994ae3e1b6e20b..841420a68788dd753513a876a3de54ca02e27178 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties
index 3c91f6f349b09605dfd045c5a63f70dd3b301d8d..926cc75bd35e30f7ee920e78383b02bda53d49d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties
index e9a91881a9a2a09c5c8fa410e3d32c913d954297..09f5c313a7152279c3edeab4061e102733ecdd92 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
index f50f47536a7977b30b00c06ce0ce7b27505e53c7..9f408adddc2ce0e5229a1c175cf8d1b52274c5d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
index 066287f6e8da766d9b492344ac67cc4e520051bd..62de4ebb1ebdaa1a46edd6c0db9886acb0cf79e1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
index 5c53b81a2667c35569bca98a32e5d5a92879928d..01f551af4ef40b474e92ed8e1f5bf092fa59c668 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict
index d6d25ade47e877b535264c4adb4895bc410bfc44..3a48eebaa2b0bed574e760fc022100a046f50398 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U
index 2bdfb7fd57ece86929ddabcf8a4008001dfd5564..ca2846d414658bc40821ab7faf1d63aaf54adaab 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
index 8de29dccfd3771ae9a582f98ebeb068275e28833..a118150eff08bd03c9c33bb9eb4c068565b6b12a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties
index 3c91f6f349b09605dfd045c5a63f70dd3b301d8d..926cc75bd35e30f7ee920e78383b02bda53d49d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
index 3280af9f337e127aab9aebb4b7b0bf0415f88882..8f0c8668322d17d9dc1ab53622d7c092ec1713e4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -39,4 +38,5 @@ right
     nPaddle         1;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
index b81840bcce512d5cb91cada7c92143967ea7f427..8c04bb7a6caea2174cab78bd59c9a67b44c7e0f3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
index 96f12807a7a3b2db4a0eb812531e4812dc84b8d7..9389a10a7b610fa00ea80775876270ab3b1f8c5f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
index 5c53b81a2667c35569bca98a32e5d5a92879928d..01f551af4ef40b474e92ed8e1f5bf092fa59c668 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict
index bb5f1a00cfac03861365fcfe8314ab146365ca59..87d6ce586849c8dbc1a07198d2c923a2bf0e1160 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U
index 2bdfb7fd57ece86929ddabcf8a4008001dfd5564..ca2846d414658bc40821ab7faf1d63aaf54adaab 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
index 8de29dccfd3771ae9a582f98ebeb068275e28833..a118150eff08bd03c9c33bb9eb4c068565b6b12a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties
index 3c91f6f349b09605dfd045c5a63f70dd3b301d8d..926cc75bd35e30f7ee920e78383b02bda53d49d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
index 7dd9e5d81b3d803cd90702f971b1016749806b19..be73af8a5500fe59e6777a8f5f999dac7ce73616 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -39,4 +38,5 @@ right
     nPaddle         1;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
index b81840bcce512d5cb91cada7c92143967ea7f427..8c04bb7a6caea2174cab78bd59c9a67b44c7e0f3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
index 061bf8f19e8901fd3e809edb25eb0f5af5610fbd..52c0e356a0901896dd159c82dbd64f9e08044f70 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
index 5c53b81a2667c35569bca98a32e5d5a92879928d..01f551af4ef40b474e92ed8e1f5bf092fa59c668 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict
index bb5f1a00cfac03861365fcfe8314ab146365ca59..87d6ce586849c8dbc1a07198d2c923a2bf0e1160 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U
index 7bc6acf72cc6226111031d4fa632a8f11cf5dc73..424ae008701e1333a87b3f288d947f8050e1d4b9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water
index 62552cce513fde7d39c2c430b0994ae3e1b6e20b..841420a68788dd753513a876a3de54ca02e27178 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties
index 11a54d14c08335d9928893d1191647e3f16747c9..894321a96c3627a9d50d121d3937940ed398f4f8 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
index 3bd8e6dc6f75f0782d36ee9193b0f943513112f5..46b4643f05595c29e19da6270390d6ac1fbbc7a6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
index 60dafb468d65a32fdb849ea5318b17fdae1579df..ddb56a5171b4c5cecf76104cbd2335276b9c8ce1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution
index 5c53b81a2667c35569bca98a32e5d5a92879928d..01f551af4ef40b474e92ed8e1f5bf092fa59c668 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict
index f56fe76957368c2fe45b34f33a81ca55ef5aea10..23320c888255a5e7f1bba54bfeac803124e0ccd6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U
index 7bc6acf72cc6226111031d4fa632a8f11cf5dc73..424ae008701e1333a87b3f288d947f8050e1d4b9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water
index 62552cce513fde7d39c2c430b0994ae3e1b6e20b..841420a68788dd753513a876a3de54ca02e27178 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties
index 0a654e28fd66fa97a551ebfe5d11cfc60c4d2938..a5e4f84e6ef6333fa27df1fe08a832872a91388f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
index ba18bfecbcbdd82aea9d44ff441883aca4e873f3..94c28853769c77ab1217ade9824814a0e767d0c1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
index 0400ebc67aaddeecd0627b3bcea0bbe0c52b0d0e..f25a7a25077a613ac1aca4c8169191c4a345a46b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution
index 5c53b81a2667c35569bca98a32e5d5a92879928d..01f551af4ef40b474e92ed8e1f5bf092fa59c668 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict
index 2f11f3b41dc96886b60b3068afb05df4ed306141..7bc80051e02154452b19cb27e70b58a1f4f24731 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U
index 7bc6acf72cc6226111031d4fa632a8f11cf5dc73..424ae008701e1333a87b3f288d947f8050e1d4b9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water
index 62552cce513fde7d39c2c430b0994ae3e1b6e20b..841420a68788dd753513a876a3de54ca02e27178 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties
index 6d3344991a6c790b3cb6bb11c95f57d879f234da..9578ce54f15c339b05370d2d2cf5fc22eb054bd7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
index 6571348e585f0ca7bfc7ce82a520bb67ba180981..f018ab73fb031256020f671f220c035ada9262ae 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
index 81df529f31dd912155cb1e0b05140e1b77b06a61..a99c2d74d0cad08c1ed831f20bbbdf55d16054f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution
index 5c53b81a2667c35569bca98a32e5d5a92879928d..01f551af4ef40b474e92ed8e1f5bf092fa59c668 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict
index 2f11f3b41dc96886b60b3068afb05df4ed306141..7bc80051e02154452b19cb27e70b58a1f4f24731 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U
index 7bc6acf72cc6226111031d4fa632a8f11cf5dc73..424ae008701e1333a87b3f288d947f8050e1d4b9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water
index 62552cce513fde7d39c2c430b0994ae3e1b6e20b..841420a68788dd753513a876a3de54ca02e27178 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties
index 0fc1a253c6a9979532c95945d7604a4a0dc163e7..74b4d8931521568a4b26629178157c12761195a0 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
index 5177f8d76badbf130d09c4b92ae1b923ceecc73a..0eb3b2b67ac621def833fb6f3098f3892178a15f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
index d4f849f79f4b0903d7417071e89416a74e6c3e86..2a978090c3da535b84e7e0579d3628fe32a0b4a3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes
index d92faf4ca3ccc0d57b8bc55d6bcb7652430371da..ea446f6b84da1a990a5b94f343a67ea1edc9d229 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution
index 5c53b81a2667c35569bca98a32e5d5a92879928d..01f551af4ef40b474e92ed8e1f5bf092fa59c668 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict
index ad53914da368090cb57757517021f35900caf667..7c6ac00b785555fa57ce72d9ebe53a4ea297affe 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U
index c428c6be4bf35594e5bf250cb015f45320093391..dd4d9752712640f9de9708eabe80c74705d60b44 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U
@@ -61,4 +61,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water
index 6409acaf0a675d904bf2c898a6bdcf1d89333b49..f4e57d9d506e47b2e6dc6b21966d2e620762c3d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water
@@ -58,4 +58,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh
index 651c7ea402cb89f463faddb5c91e619302e94a3c..a222cbdd76a90b08a8f545fe6299db765e9c39d8 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh
@@ -67,4 +67,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties
index fe643fe630dea96d3bea627b0de52292d2bbad03..d0c6b889d434c430ea6062c59848fad0eddc0a6a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      wavesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
index 361c85b4acb50bea22513d24510e67d06c1cb7ae..369de23dfb2d56dfddca475a0ae5ed6c57913ed3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
@@ -107,4 +107,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
index 65b4dcedcd809f75ceb230d140de80b94df5c30f..e5297bac7454a175a6c82661c814462c3a6b2b04 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict
index bfa38f257d5fc33d016c6b5d78e65fd6e647a069..c4ba64fdf23f0e98e7c693352047eea1595e202f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      decomposeParDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,4 +23,5 @@ coeffs
     n           (4 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes
index 0a0d528759ac849e80a2d8b18e997093683b9990..8c4cc3d2b835abb507f6cb63c8881566c132b1c4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
index 7c19db7aef67b5a744046243f9094317d71264ff..80f199419e49c437bbce6e4d23593ce6b4d37511 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict
index 872c696c2c53f0eabd7d9f41633c7f5c8fa6274b..c255964c18dd2175ee717cadda893e71c1389961 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U
index 64aea071e5df92fc205c1bb662981c7d440200ae..7388a641e2d79cc03fe51d5845ed557673d13a0c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U
@@ -61,4 +61,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water
index 0e419fc326a831c805659fadb22c30fb21ca2bb1..0b0e554036acc909ac7d5a5c6ee4c3c701a0eb2f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water
@@ -58,4 +58,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh
index f1c36ddffacb1e546431a5d6c76da7ff56aa0ba9..a6d2c0bc5301e5054033806bb6849e91c18df48b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh
@@ -69,4 +69,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties
index 749c142a914df3f4db0da804ddc91da4544159a7..09cd8fb0e1218321df11d56d7850dad8458c11ed 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      wavesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict
index 1cefaa81399d5d810f8d45db0e2050ba0528d937..27d3b119aedef10b9093d6dfcbf50e0978043c5d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict
@@ -107,4 +107,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
index 232f2853aa37a401fa32fbb701b9944a626a6de1..6f6f1820778d0ae65a08e76b034f3e48a3fa6568 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict
index c0a21d0a6ad295d1b0e8eef2844fc943bd86128f..b43f91110940e687f45981566d6d3f67a313ec55 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      decomposeParDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes
index 0a0d528759ac849e80a2d8b18e997093683b9990..8c4cc3d2b835abb507f6cb63c8881566c132b1c4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
index db477ec7d94379d3e9d9241f6e9e10cc9a3def60..74af7fb1477f52b947ddbd215280c95c7125d41e 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict
index 872c696c2c53f0eabd7d9f41633c7f5c8fa6274b..c255964c18dd2175ee717cadda893e71c1389961 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U
index 64aea071e5df92fc205c1bb662981c7d440200ae..7388a641e2d79cc03fe51d5845ed557673d13a0c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U
@@ -61,4 +61,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water
index 0e419fc326a831c805659fadb22c30fb21ca2bb1..0b0e554036acc909ac7d5a5c6ee4c3c701a0eb2f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water
@@ -58,4 +58,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh
index f1c36ddffacb1e546431a5d6c76da7ff56aa0ba9..a6d2c0bc5301e5054033806bb6849e91c18df48b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh
@@ -69,4 +69,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties
index 749c142a914df3f4db0da804ddc91da4544159a7..09cd8fb0e1218321df11d56d7850dad8458c11ed 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      wavesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict
index 7d5fec4780955cb237d430e8c92a17643b28bd19..f2feff9fc58d03642673972d39252cf3602fc150 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict
@@ -109,4 +109,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
index 449069264027bd268cdb6e106daca08cf2f488af..8547c84721bfb5be9adfc4b2481e27325426e29a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict
index c0a21d0a6ad295d1b0e8eef2844fc943bd86128f..b43f91110940e687f45981566d6d3f67a313ec55 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      decomposeParDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes
index 0a0d528759ac849e80a2d8b18e997093683b9990..8c4cc3d2b835abb507f6cb63c8881566c132b1c4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
index db477ec7d94379d3e9d9241f6e9e10cc9a3def60..74af7fb1477f52b947ddbd215280c95c7125d41e 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict
index 872c696c2c53f0eabd7d9f41633c7f5c8fa6274b..c255964c18dd2175ee717cadda893e71c1389961 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U
index c428c6be4bf35594e5bf250cb015f45320093391..dd4d9752712640f9de9708eabe80c74705d60b44 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U
@@ -61,4 +61,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water
index 6409acaf0a675d904bf2c898a6bdcf1d89333b49..f4e57d9d506e47b2e6dc6b21966d2e620762c3d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water
@@ -58,4 +58,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh
index 651c7ea402cb89f463faddb5c91e619302e94a3c..a222cbdd76a90b08a8f545fe6299db765e9c39d8 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh
@@ -67,4 +67,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties
index fe643fe630dea96d3bea627b0de52292d2bbad03..d0c6b889d434c430ea6062c59848fad0eddc0a6a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      wavesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
index 4ed08354b2db6d393899c4b9135cfeca92f1594f..3663e63122f41ea948a686f862f76c4ba0edd6b2 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
@@ -109,4 +109,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
index 26c89d24ff341d9a56f079a8afa43ee141299a7d..e5297bac7454a175a6c82661c814462c3a6b2b04 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     line
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict
index bfa38f257d5fc33d016c6b5d78e65fd6e647a069..c4ba64fdf23f0e98e7c693352047eea1595e202f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      decomposeParDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,4 +23,5 @@ coeffs
     n           (4 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes
index 0a0d528759ac849e80a2d8b18e997093683b9990..8c4cc3d2b835abb507f6cb63c8881566c132b1c4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
index 7c19db7aef67b5a744046243f9094317d71264ff..80f199419e49c437bbce6e4d23593ce6b4d37511 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict
index 872c696c2c53f0eabd7d9f41633c7f5c8fa6274b..c255964c18dd2175ee717cadda893e71c1389961 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U
index c6bc4d91e0d686900286023e81a63038b298ea61..04e4be73c7898d21624c0937027cb13eccd558ad 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U
@@ -77,4 +77,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water
index 72825448063ff81b8be7392cb9fde9dd9f5f5591..e3c07bfdc96ad2fb78787b71388a80f34248abbe 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water
@@ -75,4 +75,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
index eede33a4e4d314e6670c57b5aa85af3a78802d83..1f799ea85aa3a81dbb5da7058632a0872a9b50f9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
@@ -24,4 +24,5 @@ displacementLaplacianCoeffs
     diffusivity     inverseDistance (inlet);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g
index 2f85d79da8f7b11af2ea4f958e6a7f1acd04abaf..06ba6d0e67d5087b5803c234ae5a1d77ebd5cf3f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/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/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties
index 3c91f6f349b09605dfd045c5a63f70dd3b301d8d..926cc75bd35e30f7ee920e78383b02bda53d49d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
index ff1ff771773659b76b0c87334227fca29ac1a5aa..a3e14e163fd41d0c61644d67069a97eb1c95edf3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
index 863660ab8c55f5b5dde51755337df5ecccf4dca4..4535e81910cf1fad5db7ccc34c1609011b78f649 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      wavesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict
index 4451b9aeb643527166ce81c855814a57e7c1fb5f..0f7e167e652ab66f985482c8e7ea90500ca84a89 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict
@@ -131,4 +131,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
index 747be5d959356650393e8c1af1b38d3fd4f4089a..686e0ab678c816c3f9ce949ada39797970032e5a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     lineMOVING
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict
index 7eb7c77b034a14e9924b4904dd5967e41a8c3c0d..c85271feab8931008fe89e773d2393c1ca787992 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict
@@ -25,4 +25,5 @@ coeffs
     order       xyz;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
index eaf0374bb9a268dd4f1b668b0e98e1b8e59cc1d7..d222f247ea5e3677c9c1cb0c36bfe5cec67cc1e1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
index 79a1423a5a3ddf572980244781d2010fcf66b7a8..09ba23d7d5c807c85f7f28d6e3d9cdc42acf272a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
index b46a45a339edd653a2089c7db3d584868de8e541..bfd280900fb3f630690010ae15948da701d352d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air
index bb57c049cb3efaeb5817bc726ec8b440046dcdb9..8217082955df106267a93b11230e6f80c476c296 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other
index 12c7dcee1c02094da8630a5dd115636176c4f6bc..a4b0acdef6426b2703210bb6ed2286fa193912dd 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water
index 81ca6599f6e65c1d39374d697d1c6faec9d15c39..721ca601150436bf5071551166f213f396fbff5d 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh
index 34245108ab80457e6f9cd34ee6d4bbbe3aade5e4..95248d7537ba5933c392f42130e44c6fc943f162 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
index 191eaa99fc411d64519174c116d99b6e1e71d382..90916d4255c375253c8d518f2d7106688ac505d0 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (air other water);
+phases          (air other water);
 
 air
 {
@@ -45,4 +44,5 @@ sigma13         0.04;
 // Diffusivity between miscible phases
 D23             3e-09;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..b49f4275d4448b75d21a5bd208e54dd0e2115aed 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
+
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
index 7676445dfa23a9bb7be5735c449e39daab9ab808..867860524d7db076ba20d4e5a2610eebcfe5f448 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
index 6ffe9afaa1008885f6f2eb755c414ae0d2c54322..5f7eda35459fff85f4a48d1c3ad14eee287fa043 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
index 33631badb5a5224759a37aca4bb44b8fc6be53d7..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
index 1aa6886be23cca7693ba35ef34ea73c9cc16fc05..3178781ce15952639a07ee13fd73104051ed49fb 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
index a5acbc99b956cf8363dda80848915bc6f5efa70b..67babf8beaa2170420ba495f69dbc6e668b8fa60 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
index 1b24cdd9887082d30811209714c58922968e93ce..6c3537469df36d2a31e1d90b6f4f5465f452df4b 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
index 93e6d6bc81f7d1a414cca5d0001fc73e4e3b8e55..16d541c8224df4e7bb8b3fb07bc191e461af93de 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
index c8ee365d67f06dcce96fae2c42d55bcf49bcead3..b9af8787b205ccddb853095c748e2447a67e7fae 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
@@ -5,7 +5,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 ./Allrun.pre
 
-# apply the initial fields
 restore0Dir
 
 runApplication decomposePar
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
index 39c8c2af97e21d5286df610d271396e28ae80f38..584d1282cc15377103912dab8d0309e610fc202d 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
@@ -3,12 +3,13 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-mkdir -p constant/triSurface
+mkdir -p constant
 
 # copy propeller surface from resources directory
-cp -f $FOAM_TUTORIALS/resources/geometry/propeller/* constant/triSurface/
+cp -rf \
+    "$FOAM_TUTORIALS"/resources/geometry/propeller \
+    constant/triSurface
 
-# meshing
 runApplication blockMesh
 
 runApplication surfaceFeatureExtract
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
index dcf7e3a079007186e604b88184e3688a88702766..661ecc8181ca1846cbc697db244371f0502b0bc3 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
index a3d34576c4a5d1b47b2b8a5e454bde57101f4444..bd3b9de22718cafa9644c295fcc98f0444f02963 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water vapour);
+phases          (water vapour);
 
 phaseChangeTwoPhaseMixture SchnerrSauer;
 
@@ -61,4 +60,5 @@ SchnerrSauerCoeffs
     Cv              1;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
index 812822fc798b884274aacd2110e4c4de933c694d..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
index dbd68906ff302cc5812cc7935c4e42dae6bc8536..e4e2184817fd4a47a19ba236b6d49f286e13d97f 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
@@ -68,4 +68,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
index 5050883d56434a84fce0424a2c97fe0947c7d490..c0f860534b2e90210fa1c42d82e6dd01956b47cb 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ maxCo           2;
 
 maxAlphaCo      1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
index 54c4ec165c92001508f8ffeb826f88afb064856d..5f8fe411f8b672557f94cb11f78933c1e52d9171 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
@@ -59,4 +59,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
index 4d360506333ae89d99945d502d8a0cfa484a3443..770f2c16b4b77e534629de614e97bf92b0b27a60 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
@@ -70,4 +70,5 @@ patches
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
index bca0429cb9025d7b07e3235f12a6cabbe48e58cf..1bb6c0dad77ddf345fb0593817a28236603fb921 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
index c494ff093190c9639d27860e8788246089e89e8b..3c2730ed10c68a9a1f9a2d2930c68b5448f156fa 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
@@ -91,4 +91,5 @@ cache
     grad(U);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi
index 5d1c2bf015aa089bf206a558ce63f928ce0cefbe..495051bcdb15a03fe674d4564070bf3bbef2fd97 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi
@@ -42,4 +42,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
index 775cc3a3e74538c26b560e5368edf8c07365b961..d94be683aebae3af346ab0e2d7e52819f923bf96 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water
index 5341dd4dddc8bd9b3cbbe1eb7f55b88cd69d24ac..3d60945155483643b4df3fc5d74f234fded05721 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh
index 2174eae0c1cfbc31b4f611cd700c2a889a987387..0412032351836507ab7bf83716b4fe29b00853df 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh
@@ -42,4 +42,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
index a8b6a58e8747f0b6098d24182df96b274e69794e..72148a84fe6cece8763f4fe4249133a17d159306 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
@@ -6,7 +6,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 mkdir -p constant/triSurface
 
 # Copy bullet surface from resources directory
-cp -f $FOAM_TUTORIALS/resources/geometry/bullet.stl.gz constant/triSurface/
+cp -f \
+    "$FOAM_TUTORIALS"/resources/geometry/bullet.stl.gz \
+    constant/triSurface/
 
 # Generate the base block mesh
 runApplication blockMesh
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
index f9f44ac51e3d688af7201d3ad12a54a715c07385..ff5f078a5210cd6414ab17fbbd10376fbb0ec325 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water vapour);
+phases          (water vapour);
 
 phaseChangeTwoPhaseMixture SchnerrSauer;
 
@@ -39,7 +39,7 @@ vapour
 KunzCoeffs
 {
     UInf            U20.0;
-    tInf            t0.005; // L = 0.1 m
+    tInf            0.005; // L = 0.1 m
     Cc              C1000;
     Cv              C1000;
 }
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
index 33631badb5a5224759a37aca4bb44b8fc6be53d7..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air
index c6978c03c6c70bd0909bc9072b9bc3f93f1e100d..c080ee403c512cef2b5bc3ff3021aad74e0868de 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water
index f9358a19ee9142efec27d6e3c903a7de662bf214..e8c1e86d556619b1ab4717e80ee7738128b3b757 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta
index e61ad817e2699a748fd7ab181917b3760b5d4ba4..929954cbe28983590801845e9166f5fb5fff4826 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air
index 6cf43c988b008376bfc8deff2f891e428a6c766a..309c389fe7911015da90bba3d7941b5858ad499d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water
index 7eae197b6c5020a65693714344cf9dd357d13ec3..9da0789be82aec7758f11eb7264d5215faabcddb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh
index dfd9b496179081f56ef3ade3d07cbb5058686710..278565aceec828e61b1b06e5849f34fb00ac06c0 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh
@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
index 07c95bf30e2e57e35a07e2a8920383f0e7060fa0..70063c4b0845a095039d82000ebec35a11de5d31 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
index d8c094f1e835347f6147de50576e606322b5402f..e53a41bd2420e8421f70b022a7f4eff5a191a789 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
index 8894df1c0052b2636b6ffc05ac787e8c3d4d0c9e..de3cd34b6a6d6c1f275d220031786769c650eaef 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,4 +51,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
index 50a7f23fa69cebb8409dd3a17aded21e5c95d834..1564e8a5bb8ffbc77200775a6cd89de8ef77d82c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
index 20048d87d0a5ed7a8f28fe247491e3530d2d5527..119282004cf4ef34a90d98d4b6bbb5119f912749 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh
index bc8a434df8e77ee79925aaf7078eeec904f9c0d6..0f153f4869f18c834b6c1b2374d276548228227c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh
@@ -52,4 +52,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
index c96db8700209314ce43de4cb81dddb5db9bfc245..d285821e5b2ef587c3886feb671b688f20fa14d9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      motionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
index e4abe802bdf7d4d572413a1f9d3f25ea183b37a9..8015c5ce7b704e078f3072a01e0112d4f4b139c9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
index 7676445dfa23a9bb7be5735c449e39daab9ab808..867860524d7db076ba20d4e5a2610eebcfe5f448 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
index 3674325224b382eb1bd2e3f5b4db15f72f3d9423..ef3c2475ac3944650dd57aab659a0fbcc2a1e4cb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
index 33631badb5a5224759a37aca4bb44b8fc6be53d7..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
index abae3604314ec751116783c33ca56dd98c552e2a..204c4118de6d82d7935387b01ae277b1a3139d01 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
index 1e601fbe8afe7a6b6a22d6c9052e26e9e6e2530a..405247dcbd70d9bda7cf183fc41c417404ef1075 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -81,4 +80,5 @@ relaxationFactors
     "U.*"           1;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
index 354cada94e9b80c77c066f4a3cded899525c6ce7..4dcccd460a97a631cf6b9f4c5951695a86878c1f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
index 34245108ab80457e6f9cd34ee6d4bbbe3aade5e4..95248d7537ba5933c392f42130e44c6fc943f162 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
index c96db8700209314ce43de4cb81dddb5db9bfc245..d285821e5b2ef587c3886feb671b688f20fa14d9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      motionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
index e4abe802bdf7d4d572413a1f9d3f25ea183b37a9..8015c5ce7b704e078f3072a01e0112d4f4b139c9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
index 0aedb5728ae92939ca81937393d375a37e77814b..a12022706d16ab3a3a4b646e2b80a61705bcd8e5 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
index 349df11535007a4db3d529603e8ad55306256f7a..b62ebfafb30aca8a6b896e86488563c4fea500b4 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
index abae3604314ec751116783c33ca56dd98c552e2a..204c4118de6d82d7935387b01ae277b1a3139d01 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
index 1e601fbe8afe7a6b6a22d6c9052e26e9e6e2530a..405247dcbd70d9bda7cf183fc41c417404ef1075 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -81,4 +80,5 @@ relaxationFactors
     "U.*"           1;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
index 354cada94e9b80c77c066f4a3cded899525c6ce7..4dcccd460a97a631cf6b9f4c5951695a86878c1f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta
index 40b638f90e90f1db4702e7fb1ad9f6baae5df440..595db950a49eefbb1dddbfd83ef6555073e7d623 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air
index ba293edd3df6a6a8c2aa49f6e60a6851b7542883..2494e439c30f0ea3c9504753f90e73bbbc2e17ff 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury
index 48629a163561b75d861d69cd2f22135827f4a9a0..48f22f53ab856d94a34b609ff3c3a299031a0a44 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil
index 06facc0cefcdfed5200bd345a87a4b6ac20a3cdf..0ffc609d16dfab5bad91756ce37c1f5041973195 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water
index eebc0e51a4506714773a272fb5443749ffbc1633..9887ac49d7e50a8b3acd142847835bc099cf2e0e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air
index c884f91b74cdb235b49f8c0925ed48e28f179f0b..f26e7cfcdaa3edb96323172f7d280c048f112a8c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury
index bebc8bb074f0a4349eae584b85785ab73467628a..35046693eea48a84faab87a277ca941afcdef598 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil
index b7026e2fb9d3fcd64af6522445e378cf7a188e35..225de14f926853033be28ca56c5dfcb5d2cb12f1 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water
index 2434f0a71293204632ae1867c2b71f1781456341..3aecb1de6a68aae1eb0b7908c7613baf797c7ece 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh
index d2b21c250ed49493d5f13706e707351bc0b0880e..30296f00f8d5277d3602a5d84c66bc78576e347f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun.pre b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun.pre
index 9d3d4a8a37e9f2de5d1b14d969c7074a55fe5d96..3dd269fcca7f96dd15fc232114a62ac4ae1183d2 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun.pre
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun.pre
@@ -4,7 +4,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
-
 runApplication blockMesh
 
 runApplication topoSet
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
index d16670a97af07bf65d1bee2155d625e69141c08d..498dc68b66e763b6f40646e7337fdab4432f5f99 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
+
     object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,4 +28,5 @@ MRF1
     omega     constant 10.472;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
index 8fd7419f48c0c4e39ac6ada3d6b0825206a0c8ff..6da83cde3e466f5c9de514d86d486948ca62f5c6 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      interfacialProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,4 +26,5 @@ dragPhase           blended;
 residualSlip        1e-2;
 minInterfaceAlpha   1e-3;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
index 8ceef8d0e305a8e447c83dd8f75700f93e96a17b..9f5b0b5f9dea286bdb576496a5f8d4e74ea471c9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
index 4577e82e468711f2a88a575592d6a65d85ec4d60..13ad3019d924e09c44d1301fce36e1b784abe09c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
index abae3604314ec751116783c33ca56dd98c552e2a..204c4118de6d82d7935387b01ae277b1a3139d01 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
index 9db5029868d4c18501c427fc1c9ec6d28f7ea3c0..2c467ae61725e09147ed4de440f55b36e079e3d8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -85,4 +84,5 @@ relaxationFactors
     "U.*"           1;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
index 403e370591760a67ca21e33f8251ffcb572c6684..ef51cdb1736e7be4004dc8b25c8e4a6acfaad771 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
index 7570594a85b365fd51128b968a9c3f7c7c47f8c6..2c4d4cc5d3e89c95d796d900730786f82321e643 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,18 +24,22 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     rightWall
     {
         type            zeroGradient;
     }
+
     lowerWall
     {
         type            zeroGradient;
     }
+
     atmosphere
     {
         type            zeroGradient;
     }
+
     defaultFaces
     {
         type            empty;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
index 34245108ab80457e6f9cd34ee6d4bbbe3aade5e4..95248d7537ba5933c392f42130e44c6fc943f162 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
index c96db8700209314ce43de4cb81dddb5db9bfc245..d285821e5b2ef587c3886feb671b688f20fa14d9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      motionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
index e83df524455e985c474328065c5be28c3664bc07..0895b171627ecee490aed5cda2be5555cdb1a76a 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
index 7676445dfa23a9bb7be5735c449e39daab9ab808..867860524d7db076ba20d4e5a2610eebcfe5f448 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index 5383dee8cb4d33154ff3b41a853215c7221b6577..6fa70e6c900a70616dd6bd73e8d4e8280cc9dd6f 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
index 33631badb5a5224759a37aca4bb44b8fc6be53d7..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index 78366ca0bbe06fd850a377d18bc9819c8de3f91f..0d2d8b5c88907e1b0c4741efff122acc2f02371d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index f6e17f25b9fa9da2e04de0c779381fe2116d99ee..97dccb5b57fa823084e4f9ae847a9e0910d273c7 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -93,4 +92,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
index 00cbd8a4018f75c1824203ba45b1349eaefbbd8b..00f29c93e6ad787034ebb033cc65dca555d24ae7 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
index 34245108ab80457e6f9cd34ee6d4bbbe3aade5e4..95248d7537ba5933c392f42130e44c6fc943f162 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
index c96db8700209314ce43de4cb81dddb5db9bfc245..d285821e5b2ef587c3886feb671b688f20fa14d9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      motionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
index e83df524455e985c474328065c5be28c3664bc07..0895b171627ecee490aed5cda2be5555cdb1a76a 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
index 0aedb5728ae92939ca81937393d375a37e77814b..a12022706d16ab3a3a4b646e2b80a61705bcd8e5 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
@@ -105,4 +105,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
index 2ca63055995213163d426f7a5d2c9d84363c1cdb..992da604087cafb9e67d97cad3f71c4d976501b5 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
index 33631badb5a5224759a37aca4bb44b8fc6be53d7..d96083400d61168c382b569cc2bc91911727531b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
index 78366ca0bbe06fd850a377d18bc9819c8de3f91f..0d2d8b5c88907e1b0c4741efff122acc2f02371d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index 7a2d730e44371a4b6ce5f1282be99a0cf83fce61..de10ce8584eef3fd8b6af17b3158da14f19323ab 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -87,4 +86,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
index 00cbd8a4018f75c1824203ba45b1349eaefbbd8b..00f29c93e6ad787034ebb033cc65dca555d24ae7 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T
index 1b70d8e5c42a72bc70a417ec5c6afc5912358ef3..6ce1e1cef3b417ff04dc89f535d21ed4f3c4f27a 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T
@@ -42,4 +42,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air
index 01ca60ab163f381acb4992a48262ed19e71ccb46..54a73323f2a61eab0e1f9852f96886548a167357 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
index f729e408b922a782e77a3becab11cefcbc6bf5ad..6524f2989d954455f785bd3511a2ddb778a46d57 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil
index 4a8628b922d66c6f18a77c07d25b6e63ffb17d96..bf15f9332374eea0ae2a7d14166fb200f94218ae 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water
index be2c17e6a81c741426ee15a2f702826e4fcdac31..823204793b8542863b7b5dbe3d71c029c8b5fa5f 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh
index 9b420c815b9a368d02d15288dd2df5eeece4419f..67bd9687ef8201b79c63ad8bd467fad3ffc8adb2 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre
index 9d3d4a8a37e9f2de5d1b14d969c7074a55fe5d96..3dd269fcca7f96dd15fc232114a62ac4ae1183d2 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre
@@ -4,7 +4,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
-
 runApplication blockMesh
 
 runApplication topoSet
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
index 8465846cd6639c594887e7ecc0fc6ec5c7c88caa..135c41a134b76ac853a0e7809db131b35bfc8c7e 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,4 +27,5 @@ MRF1
     omega     constant 2.2831853;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
index aa97844247dde59b859143026a9d4bf3af09b6da..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/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 0);
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
index e83df524455e985c474328065c5be28c3664bc07..635326981f831e89d7b8cb9c25ff48b6a2546744 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -10,40 +10,39 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 phases
 (
-     water
-     {
-         transportModel Newtonian;
-         nu             1e-06;
-         rho            1000;
-     }
+    water
+    {
+        transportModel Newtonian;
+        nu             1e-06;
+        rho            1000;
+    }
 
-     oil
-     {
-         transportModel Newtonian;
-         nu             1e-06;
-         rho            500;
-     }
+    oil
+    {
+        transportModel Newtonian;
+        nu             1e-06;
+        rho            500;
+    }
 
-     mercury
-     {
-         transportModel Newtonian;
-         nu             1.125e-07;
-         rho            13529;
-     }
+    mercury
+    {
+        transportModel Newtonian;
+        nu             1.125e-07;
+        rho            13529;
+    }
 
-     air
-     {
-         transportModel Newtonian;
-         nu             1.48e-05;
-         rho            1;
-     }
+    air
+    {
+        transportModel Newtonian;
+        nu             1.48e-05;
+        rho            1;
+    }
 );
 
 sigmas
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
index a0f14fbfc0f488a8c1a614c6cc3417c1d5ebf744..6e768718bc6a8fc8288b9682c2759d2659f5b0be 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo      0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     sTransport
@@ -109,4 +107,6 @@ functions
         }
     }
 }
+
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
index 5b8d9a3157c437aaef97530957ac4f0d994b3e5e..6477ea937ad82bbbdbabe25befd927f727785238 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
index cd0bacefd020273540a3a06d32a764a7a7fe2e41..542801e5066a822951afa539c94737c734af71cd 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,4 +74,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
index 5b2928b5b57c294cdfa158bef5a1b58b3073351a..c9695ff36a633ffffeda646ed4b6ff418a3d98c4 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
index 403e370591760a67ca21e33f8251ffcb572c6684..ef51cdb1736e7be4004dc8b25c8e4a6acfaad771 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/Allrun b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/Allrun
index 85ec45dcbb8f0b413c8d373201d5876c38b5cf96..f779483d1e1a8a18656885754ba5edac3b7f3449 100755
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/Allrun
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/Allrun
@@ -12,6 +12,7 @@ canCompile || exit 0    # Dynamic code
 
 # Parallel
 runApplication decomposePar -cellDist
+
 runParallel  $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties
index 1d1a274e4ea50f3bb4710e6ef704170da33a4a36..4f12bd376a63c36a400d2c4d1f4fe912ca7f0862 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties
@@ -14,14 +14,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
-pMin        10000;
+pMin            10000;
 
 sigma
 {
-    type    constant;
-    sigma   0.07;
+    type        constant;
+    sigma       0.07;
 }
 
 
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties
index d8137df73f14aa4d7f576b26bb63fa091eac6eb5..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties
@@ -14,11 +14,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType   RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel    kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
 
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution
index 11eefb782836ae5ba0c6569b6d376778b058060e..3c4c1b4ac9a68e2b24d00f17fbb8fe9caa67b3fe 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution
@@ -96,7 +96,6 @@ PIMPLE
     nOuterCorrectors    2;
     nCorrectors         3;
     nNonOrthogonalCorrectors 0;
-
     ddtCorr             false;
 }
 
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U
index 7b65d338f5b6f071058ccb9b385bfc96406bb564..f3e40d809df4fa94a938464af587f479807af4e2 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k
index b462e88792e4a5f68aea1e9b14104db374af4f8c..7f41f0c079395e13f3fa793cbd91e69b56a04fff 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k
@@ -18,7 +18,6 @@ dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.01;
 
-
 boundaryField
 {
     #includeEtc "caseDicts/setConstraintTypes"
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale
index 4caf6099b8fffa35bb661f654443423e98e1b564..65fbc07082618deee5ad5f16b76f6fc25a14a475 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale
@@ -16,7 +16,6 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-
 internalField   uniform 0;
 
 boundaryField
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh
index 8a1fd600809ae9a2c7a0b23422eacbc2e53aa9f7..eea2365d8348f1f3c16258ad7abf8e8106f85900 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh
@@ -51,4 +51,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement
index 69d67e889656303245d419a26c05f8c7fbdc4c5b..99b6b894a1251a1cf3767e258cb1956a504a1195 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement
@@ -57,4 +57,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
index 03503032cac19308e1817386e43e214b86439173..3defe7b552a911245a6616cd3b66fb7def7b1c75 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
@@ -20,7 +20,7 @@ dynamicFvMesh       dynamicOversetFvMesh;
 
 motionSolver        rigidBodyMotion;
 
-report          on;
+report              on;
 
 solver
 {
@@ -126,6 +126,10 @@ restraints
         body                    rudder;
         referenceOrientation    (1 0 0 0 1 0 0 0 1);
         axis                    (0 1 0);    // Axis of rotation
+        relax                   0.5;
+        p                       0.5;
+        i                       0.5;
+        d                       0.5;
         omega                   sine;       // Function1 entry
         omegaCoeffs
         {
@@ -141,6 +145,10 @@ restraints
         body                    propeller;
         referenceOrientation    (1 0 0 0 1 0 0 0 1);
         axis                    (1 0 0);
+        relax                   0.5;
+        p                       0.5;
+        i                       0.5;
+        d                       0.5;
         omega                   table
         (
             (0 (0 0 0))
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g
index 22b147334b2fd5ad9d471fcd0466e10a16389a2d..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g
@@ -15,6 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           (0 -9.81 0);//( 0 -9.81 0 );
+value           (0 -9.81 0);
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties
index 69ab717551c6cb633183024606db53bbf44a15ab..0a3210ea65f816d3e322d3e4ac8e94e5b6d891ad 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -32,4 +32,5 @@ air
 
 sigma               0;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties
index 7fda7da62a12309011a2b59cf9def9bb730ebf51..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
@@ -25,4 +25,5 @@ RAS
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict
index 0053b918265959e9a443aba50552c0b9a1cb068a..3d932902b6fe48519a4508744266d0303bf65024 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict
@@ -148,4 +148,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict
index 8d7907a04eb743e482ac26046fab25b26b347e54..a8d4f21bc3e9254a8292782c73b55bd377d89078 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict
@@ -59,7 +59,6 @@ maxAlphaCo      5.0;
 
 maxDeltaT       1;
 
-
 functions
 {
     minMax
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict
index 5818eabe6cc734c3e85a5c3f01d271b3ba588ed0..eded3e94ab18e0e6f70d5f84403b2c47e382f246 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes
index 94cc4ebb2c3840cee6fd3e3e0b2244c650ce336c..715ad329d9bd23f06775fc9e2af61364f8d94dfe 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes
@@ -67,4 +67,5 @@ fluxRequired
 {
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution
index 5289bd091987786209fb3c2e03ad14bac6f3b439..16dd7092d97ce0543bcd31e1c3c0610ce879aa9e 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution
@@ -69,7 +69,6 @@ solvers
         relTol          0;
     }
 
-
     "(U|k|omega|epsilon).*"
     {
         solver          smoothSolver;
@@ -94,8 +93,8 @@ PIMPLE
     turbOnFinalIterOnly yes;
 
     oversetAdjustPhi    no;
-
 }
+
 potentialFlow
 {
     nNonOrthogonalCorrectors    2;
@@ -119,4 +118,5 @@ cache
         grad(U);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict
index fd73989ac93250983a07cea90d7fc94d8745e08c..93da9c93048d59c35798186e2f6e809dbb94ae44 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      refineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2
index 6d246f652d477a1ea0c9785dd9c74d409c48298e..11183495cb5dbfed2a7bc7f6c0a394dcaf3d1929 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      refineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict
index 829c560961e2212dac044307dfd5432e402dc065..1abe18b27e45756c8854dd991d82f486a693dbce 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict
@@ -64,4 +64,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel
index edeebdfb63e0704929d9e6997eb1abbcc132e79d..b2295ce6bc9c2c06d7fb8ba3af2b707b5e4c280e 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel
@@ -38,7 +38,7 @@ regions
             volScalarFieldValue alpha.water 1
         );
     }
-
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
index 3dd4cec98cbb241ad484cc8b3d8ab78ea73c27da..dd6106d7ce9e653dfecb6709035678afc5370459 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
@@ -99,4 +99,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
index a552b75d10f7539cf557388c44765a29ec99e642..798774e223aad194eec77fff4ddc10ae2bdb0c66 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
@@ -53,7 +53,6 @@ actions
         set     propeller0;
     }
 
-
     {
         name    box;   // hole in mesh
         type    cellSet;
@@ -100,4 +99,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
index e847774fd94167fa10b61acc9b967dcc136bd329..a54958e693e3e818e528433dc7fc694593ccd412 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
@@ -35,4 +35,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2
index 1bffebbbed9dfb391247625c982498fc42be8bac..fbb91c0baca6a505e39e15a7d5c8e29ef491770d 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2
@@ -35,4 +35,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3
index 1aa08c74b94bdb1cdfd244cc7cf0022c8b6f614c..2cd7df3d9f12f77f0d5c66cecd8b783ea2ccb6f5 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3
@@ -35,4 +35,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4
index efc28f2e5f10167e07b363e777b5e119a030de83..462dd6d94fe4a155983b92c6e3927373294d56f8 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4
@@ -35,4 +35,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
index c8b7c92cfd7a028620e749558e86c289a49291d2..dfe58ab51445ce8e5ae6afcc89153dbba2b88d94 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
@@ -53,7 +53,6 @@ actions
         set     rudder0;
     }
 
-
     {
         name    box;   // hole in mesh
         type    cellSet;
@@ -100,4 +99,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean
index b59c2c7a0025e0d61f3aeebc09235f7404de1625..f04b9ede6f3982c9e63367df20f82317e6e564f3 100755
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean
@@ -3,6 +3,7 @@ cd "${0%/*}" || exit                                 # Run from this directory
 #------------------------------------------------------------------------------
 
 (cd background && ./Allclean)
+
 (cd floatingBody && ./Allclean)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun
index 0d76f4c07221df9fb90d63b3e95c68e42639b8fe..d11b4e5ea8382deed961e930ed349876556c6b87 100755
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun
@@ -4,6 +4,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 ./Allrun.pre
+
 (cd background && runApplication $(getApplication))
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
index aa5f231db462a1df975992f8776e388d82de25c4..4c3fd517f81bdb6427eb6e170fc6937436632bd5 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
index 5936f81765ec9b2b4f0f551aeda12cc184933752..15c1132bcb7cfbd22f801b745f7d7616497441a9 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
index ccc2c4cc4412d20d2d8db762141de1c5576bfdc8..cd14a83edbba2c098236c4b5c825210ed7b618cf 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
@@ -42,4 +42,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
index 77815cb6a820e9aff7d273dddfdb0df36a144915..57590b0f812b5cc54bc0a2340aaa84fb6079e3d3 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
@@ -42,4 +42,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
index 09ab2161730bb0176018f4dec480f0d4034b1cff..41faa1bc24ca694316e670e4c412e1b46d99b848 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh
index a7fd7bccc3f47624041bec897636ee540e4072fc..8b4c9c1e8a630112afc8ef69ff70709b79d1cce5 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh
@@ -54,4 +54,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
index 39f7cf00149a97d2c1ff66b0cd5bc216292b3d63..3792b79da22e8f980a8d6299dd797352a1fb9873 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
@@ -53,4 +53,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
index b135df694904ec04ecf18cdc82f9516b2d0b0897..a70d165e5dd8c60c442fdb5be45192f455df0493 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun
index 588af966ba741ccc3c50ed51266271bd6ef61569..e3119c141421dabb5738ea6ae631338a45e97df5 100755
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun
@@ -6,6 +6,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 canCompile || exit 0    # Dynamic code
 
 runApplication blockMesh
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
index 4f7d398c02d90ef1586f97c472119c3b28eb79cb..0f856c3472b8592ab6ef327a7ef6e9e6503f1fcb 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
@@ -96,4 +96,5 @@ sixDoFRigidBodyMotionCoeffs
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g
index e79bb636eafb0852d1a57f0b47acdbae02597c2c..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g
@@ -17,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           ( 0 0 -9.81 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties
index 530a4acd18b75a21f6b40dbb0c193e7c261d9a04..0e40dfaf8c62b3ce54fc81bb61402d54ec1a0aad 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -32,4 +32,5 @@ air
 
 sigma               0.007;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties
index 7fda7da62a12309011a2b59cf9def9bb730ebf51..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
@@ -25,4 +25,5 @@ RAS
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict
index 9ebecb84679cd7a6c223054ff0f53d5a90194ce8..1d058b5e4bac38589196a4ba6e2ef0765900c8a4 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict
@@ -71,4 +71,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict
index 29741d51207b021c71523eb6eaa1ba1989df51bc..3583dd85913f9314d5822befb14f51e5ba501a0f 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict
@@ -54,7 +54,6 @@ maxAlphaCo      2.0;
 
 maxDeltaT       1;
 
-
 functions
 {
     probes
@@ -101,4 +100,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict
index 6be38431e5e94fdf2c51205c8ccc22b3cf1e764e..1100e69a734a92df50119cc4c8f72541f4f61ded 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes
index af340f0ada08065ff4ebcf06dda6bcfd34148020..ee0bb9d4c714f0e895790d0cbd7a52e81ae2f668 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes
@@ -71,4 +71,5 @@ fluxRequired
     alpha.water;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution
index 41df39d2df1847a82e56b411929feb4f0bd8e070..faf4b8df7a84ffeadc528cebbe021f3295a134f1 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution
@@ -16,12 +16,10 @@ FoamFile
 
 solvers
 {
-
     "cellDisplacement.*"
     {
         solver          PCG;
         preconditioner  DIC;
-
         tolerance       1e-06;
         relTol          0;
         maxIter         100;
@@ -102,7 +100,5 @@ relaxationFactors
     }
 }
 
-cache
-{}
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict
index 2732fcac96a41661f46a852feb40e82581723009..e10d88be1cb30dd5463df2b3791790923714c7b8 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict
@@ -58,7 +58,7 @@ regions
             volScalarFieldValue zoneID 1
         );
     }
-
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
index 4593f4414b087e60c3a540c923dfe935636b40a7..52380c0896e4ccda0707275c65bd327dc31cd018 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
@@ -39,4 +39,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict
index 6ba5cb561f46c305d712805da6d2b80cf5ad4480..720ac1271923abd833af27d568c38cbc513d6e80 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict
@@ -59,4 +59,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict
index b049e114ff5e8375fb0bea6259b77c32a4ec04f4..93360c053471a3b536cbfd9c54d9ff67c6eb86fb 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict
@@ -52,4 +52,5 @@ maxAlphaCo      1;
 
 maxDeltaT       1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes
index 122423d8e97408c9a46ab71b4b11866c06fc9a50..460209e87df82c3dfa430d20e86c05332393f8c6 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes
@@ -57,4 +57,5 @@ fluxRequired
     alpha.water;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
index 702e672d099c0fb870255ce2933b34700b38f733..4f78eded0bf182641018f7a8f68adb74b57868c8 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
@@ -49,7 +49,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-05;
         relTol          0;
         maxIter         100;
@@ -134,4 +133,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
index 3c43ba175076a9b1d31e8282201d6cb51fd13d73..abd007ffc741f34328408e38509a2a313dfcdd29 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
@@ -31,4 +31,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean
index 982b1116ba33909dc4d29dd0c4a2119c4388155c..668e230e58527958360f43c48d71971649c52f43 100755
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean
@@ -3,6 +3,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 (cd background && ./Allclean)
+
 (cd floatingBody && ./Allclean)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun
index 0d76f4c07221df9fb90d63b3e95c68e42639b8fe..d11b4e5ea8382deed961e930ed349876556c6b87 100755
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun
@@ -4,6 +4,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 ./Allrun.pre
+
 (cd background && runApplication $(getApplication))
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U
index a0cff12a25b783f45b9aa4743b854c564968afaf..a8d8eb0b0f5b2233a439452994b57978b0ab9bfd 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U
@@ -58,4 +58,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water
index 36a83d232e89c99a187b25d8f0f45a023e3f1a13..e14b1253cb8fc52015f714791a7a761fb8fd8f7d 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water
@@ -65,4 +65,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon
index f580003f67f13448919b929675466cdd7ea78860..9efffdc96605e44495104d9a83fa869f7e5b95d2 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon
@@ -53,4 +53,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k
index cd33231b59464e88a9dc23213bb8a4781bbd02b4..e687a4b608a24f1d1dba4dd09eb8b9ba314a8fca 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k
@@ -53,4 +53,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut
index 2842ba320a987a6221327471c0573ae3b9013521..558b693686dddcdef2c8acdd32006c91248e3575 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut
@@ -52,4 +52,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh
index 8586d0ca3ff610450a876363a6d8359cd883db38..f4c95b9c7dfc9467ce0ee34a1f94dfb1d184742b 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh
@@ -54,4 +54,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement
index 974853e81dfc133300b89e4d71213e712994bd42..ebb7a84685df124aa0dadc3898b1a2af9eac3243 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement
@@ -53,4 +53,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID
index 34770225e9d80f8e077380f17a6d2d2d4d3c2b09..a101cb396353f01c6af873b43a3a643a392ddbd0 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
index c3cbcfb6a6d1a5fd714bd525cb6d0084036f6450..24b8767fc855d980074b09e88f277a18e67b3330 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
@@ -109,4 +109,5 @@ solvers
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g
index e79bb636eafb0852d1a57f0b47acdbae02597c2c..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g
@@ -17,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           ( 0 0 -9.81 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties
index 530a4acd18b75a21f6b40dbb0c193e7c261d9a04..0e40dfaf8c62b3ce54fc81bb61402d54ec1a0aad 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -32,4 +32,5 @@ air
 
 sigma               0.007;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties
index 7fda7da62a12309011a2b59cf9def9bb730ebf51..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
@@ -25,4 +25,5 @@ RAS
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict
index ebb8d5a57175b2d6e3faa7287cd454050b966a09..9a125116ed167970985f77f72dade688ba1a21d0 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict
@@ -78,4 +78,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict
index 4b3c3a0d9827565cc9d62021543a47a5823ce81f..4e51415f297db9a4ae7dd5033058f2757877eea2 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 2 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes
index fe32afa7f8b94583663f6eadb11733cf04744029..18539c484411f1332cefe53bccde6e80cf4f8a40 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes
@@ -71,4 +71,5 @@ fluxRequired
     alpha.water;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution
index 333a7609aee1c7470c81898bc84dbce23b2ee131..a0c30a5b15cfdf4553cf73707bc48fd2415c8562 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution
@@ -20,7 +20,6 @@ solvers
     {
         solver          PCG;
         preconditioner  DIC;
-
         tolerance       1e-06;
         relTol          0;
         maxIter         100;
@@ -101,7 +100,5 @@ relaxationFactors
     }
 }
 
-cache
-{}
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict
index 96c7a70b5b2099b4ae34b72f8563f2dbec48f760..e63059a2456968e0d2ad4afc527342356fbb4036 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict
@@ -40,14 +40,6 @@ regions
         );
     }
 
-    /*
-    boxToCell
-    {
-        box ( 0.9 0.9 -100 ) ( 100 100 0.75 );
-        fieldValues ( volScalarFieldValue alpha.water 1 );
-    }
-    */
-
     cellToCell
     {
         set c0;
@@ -69,4 +61,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict
index 4593f4414b087e60c3a540c923dfe935636b40a7..52380c0896e4ccda0707275c65bd327dc31cd018 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict
@@ -39,4 +39,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre
index 1f396f9a699334105572c41906f0452e8507de4a..80b922bf2f3db6575edbc146de958148bed49ae3 100755
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre
@@ -4,7 +4,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
+
 runApplication topoSet
+
 runApplication subsetMesh -overwrite c0 -patch floatingObject
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict
index 6ba5cb561f46c305d712805da6d2b80cf5ad4480..720ac1271923abd833af27d568c38cbc513d6e80 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict
@@ -59,4 +59,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict
index b049e114ff5e8375fb0bea6259b77c32a4ec04f4..93360c053471a3b536cbfd9c54d9ff67c6eb86fb 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict
@@ -52,4 +52,5 @@ maxAlphaCo      1;
 
 maxDeltaT       1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes
index 122423d8e97408c9a46ab71b4b11866c06fc9a50..460209e87df82c3dfa430d20e86c05332393f8c6 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes
@@ -57,4 +57,5 @@ fluxRequired
     alpha.water;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
index 702e672d099c0fb870255ce2933b34700b38f733..93eb9bfbd8d567b73186aad6dff6206005756ad6 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
@@ -49,7 +49,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-05;
         relTol          0;
         maxIter         100;
@@ -88,7 +87,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-8;
         relTol          0;
         maxIter         20;
@@ -134,4 +132,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict
index 3c43ba175076a9b1d31e8282201d6cb51fd13d73..abd007ffc741f34328408e38509a2a313dfcdd29 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict
@@ -31,4 +31,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U
index e63b03c08f72108b9a96b09f9bcaba611e0f9887..ff7faf0efefafb6a2e8693eb9307f220456f5412 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U
@@ -52,4 +52,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water
index e3d444f61e3e73fb16aee8971b9fdc66c134942d..fd81533db959671f6ad09e5255da4f6f709afde2 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water
@@ -27,10 +27,11 @@ boundaryField
         type            zeroGradient;
     }
 
-     overset
+    overset
     {
         type            overset;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon
index 6986ac976c07dccaf2c77a61708137809dd4091d..ee34e560cc38bb158f5b7d51693483c6fa7e916f 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k
index fbcbb648a0932b3334001101cd00e60cb11b7a22..bcb8cfdf7930829386658335f5611b9c64124a7f 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut
index dcd3a6fd79c0e9b9c7fa906e2b542eb4db2d0c44..3c53092bde9babc725960d527ec331ff3f6c47d9 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p
index 65181dea321a2c7df06689a0619192bd5421bba8..836644648742b317d152dce22e642ff6b8de77aa 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh
index 4350b4fc0e5913657420dfda4d086a1670418b7e..2bd49cab0918996d47f8f56740910624c3ae1538 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
index 7afb2fbb5b8ca490bb9005bf79eb967b26de84e3..198c73f06ee8fcb02bb9d881dc43fc08530c2db6 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID
index db2217a7d88fd32fa59e41511ddbb5e32db4e7ec..426893f1025f0709f3de78019cb16166f5960749 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun
index 85ec45dcbb8f0b413c8d373201d5876c38b5cf96..f779483d1e1a8a18656885754ba5edac3b7f3449 100755
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun
@@ -12,6 +12,7 @@ canCompile || exit 0    # Dynamic code
 
 # Parallel
 runApplication decomposePar -cellDist
+
 runParallel  $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
index c1280b553e1df370f51ca5d4ddabb069c0fc295e..09de2385cecfffe86970b756e1f796f84aa02963 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
@@ -48,4 +48,5 @@ multiSolidBodyMotionSolverCoeffs
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g
index a1465941a85d566e54b8aa2be8e8a885ecd0c83c..0a45494f3f428ff116f08140739a71b06cd004b4 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g
@@ -17,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           ( 0 -9.81 0);
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties
index 7178bc2c93033cfb3d547198a3dd612f019f6be0..15bbbed904d38fea1b320a14520c93b7ac468979 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases          (water air);
 
 water
 {
@@ -32,4 +32,5 @@ air
 
 sigma               0.0;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties
index d8137df73f14aa4d7f576b26bb63fa091eac6eb5..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties
@@ -14,11 +14,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType   RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel    kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
 
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict
index 6384752412db7991cc7138b6a9c129598691202d..6d02d13bd0ce8e7096e6b1acb0579cba9acdc665 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict
@@ -145,4 +145,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
index 26e6d49691db8c6f8c1a65278b95b5f81b33ab5f..231d96a970fb2b0e6f0109d8bbaf594e696e5ede 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
@@ -61,7 +61,6 @@ maxAlphaCo      2.0;
 
 maxDeltaT       1;
 
-
 functions
 {
     probes
@@ -109,4 +108,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict
index 05a9daf95f19a52f65e9b06b994639d44dc4e78f..d3db36e01a41ce1d849b3704eea671326c89b94e 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (3 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes
index 2b5b20ee9a05a61332eea8ad38d277d989812479..fd5e3450185c6deb6a408c6da84e98e4910a37d2 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes
@@ -77,4 +77,5 @@ oversetInterpolationSuppressed
     surfaceIntegrate(phiHbyA);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution
index bc9638c2783e58d9fdc6ae2c35ca95631339d9fe..bbaf70e013dfd51247c622b88ed8ccfe5882008d 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution
@@ -20,7 +20,6 @@ solvers
     {
         solver          PCG;
         preconditioner  DIC;
-
         tolerance       1e-06;
         relTol          0;
         maxIter         100;
@@ -114,4 +113,5 @@ relaxationFactors
    }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict
index 5d00ff1f5cdc018a31b3a4b93e3da54547ed0882..42f0865f67172ba01d8619a3d2aceae53d7fc004 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict
@@ -64,4 +64,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
index 3930dde0a9235a874976069d404e95eb47fd6986..dcc91bceb618431ba2b8c00ea93eddcaf2ace94f 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
@@ -91,4 +91,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/Allrun b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/Allrun
index 27fce6927bfff20114aa36ef7bb4199f924a0a16..c6652f8e64b9dd687cdae1b81e7bfc006e0a6c5d 100755
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/Allrun
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/Allrun
@@ -12,6 +12,7 @@ canCompile || exit 0    # Dynamic code
 
 # Parallel
 runApplication decomposePar -cellDist
+
 runParallel $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties
index af7b43712b7eab7a31d749f5bcae174bc37a86ce..de342a2d292215abf82c9eed276b94deabb9f986 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water vapour);
+phases          (water vapour);
 
 phaseChangeTwoPhaseMixture SchnerrSauer;
 
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties
index d8137df73f14aa4d7f576b26bb63fa091eac6eb5..b9b70921b6ed92dbe4366477975a4791a3ef08e9 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties
@@ -14,11 +14,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType   RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel    kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
 
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict
index 6d02d13bd0ce8e7096e6b1acb0579cba9acdc665..47879994bf8b0ad5faca58ab7284177f96f2989a 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict
@@ -51,9 +51,7 @@ vertices
 blocks
 (
     hex (0 1 2 3 4 5 6 7) (140 70 1) simpleGrading (1 1 1)
-
     hex (8 9 10 11 12 13 14 15) movingZone1 (60 24 1) simpleGrading (1 1 1)
-
     hex (16 17 18 19 20 21 22 23) movingZone2 (24 60 1) simpleGrading (1 1 1)
 );
 
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
index b2fa9eef55ab9bd46e615a27872948aa73e26410..57d7d195de512b0754aa0d2942930c0515ee3e6c 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
index 699ff952d41aa1b3c20c86a334042d2dfc6a8154..7975c9a3c000e6d6dd21e44b7da22b69a029abfd 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
@@ -93,4 +93,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
index e8222e85b56d808d7ff0228638987522e9d067ee..e7276cf21351d95438860b5e628fd63cb9169a01 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxCo           0.4;
 
 maxDeltaT       1;
 
-
 functions
 {
     forces
@@ -87,4 +85,5 @@ functions
     }
 };
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
index e46459e74fb9a33a82e41f28eab7f1fc5d0b8da6..ae24f1b31f0e0e04c22f534b30328e84727c0850 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
@@ -40,4 +40,5 @@ patches
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
index 3ecdb95436db379f0d45d6e9a95de2278ad5b242..2cae3d7a358d4cf79ff67c0d90943a4e9ab34935 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,4 +46,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
index 37868bd1f7e457fb746973e3ea2576d8a8818e47..23b030fda705d4c7ecce4ab0e8546e035e0c0648 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
index 87c62a4b4ef86d4095c0d10ebe26b60aacf2845a..d8424cb3f6bd1cad77e5bb7fc2bb18b71ca39079 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
@@ -34,4 +34,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
index 16ed50ec2e97dcd0b8ab307e908d0b8cc130ba57..85a3a80ca3a46894de51e7c4d04063199775401e 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
@@ -79,4 +79,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
index 72ae8ea95222b51878f45600c286b27d6561ff97..a8a30427836f22b13f1b4b53f75f9751cd4e0d16 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.4;
 
 maxDeltaT       1;
 
-
 functions
 {
     forces
@@ -85,4 +83,5 @@ functions
     }
 };
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
index 351eaa26425b0e16912574c61d0fb44a5950e2f6..638ce7559c4183bfbd3d30595f04f20df4265762 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
index 59e1164066a040a29cd1c54996e622079453a15f..4ff35995f15633abe2a715f39d4800911dd3f1b7 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun
index 07a7802ec24d050f678e4193cd77ab0780c73242..5628375500e96387c6be41b9e6ea9c41ea6bec3b 100755
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun
@@ -5,11 +5,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 restore0Dir
 
-application=$(getApplication)
-
 runApplication blockMesh
 
-runApplication $application
+runApplication $(getApplication)
 
 if notTest "$@"
 then
@@ -19,7 +17,7 @@ then
     foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000'
     foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000'
     foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue'
-    runApplication -a $application
+    runApplication -a $(getApplication)
 fi
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g
index 722ae9f25b88128dce5d5e6bf39859a5b0084c9b..e7fde4fc816150d5ba9eafa77332ff5818e81569 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/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 -9.81 0 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties
index 6862b1dcad8a2004feb337491fbde04b6f2e2d85..cc9f3266efb927b85159ee5c865708917db1c8d7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    thermalPhaseChangeMultiphaseSystem;
+type            thermalPhaseChangeMultiphaseSystem;
 
-phases (gas liquid);
+phases          (gas liquid);
 
 phaseChange on;
 
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas
index 0ff2a3a94389fd1da605981dd0caacad4521a150..20d71d1779e0c2f1859ab0383bb2741a7a4d24c9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid
index 15f549059b7c98aceea5478c050abea7687cf897..f23806f61b7f3ddc1a4f2f82f2ffd6d2cca0acc3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas
index b46742f8d53d50372c5ab477dfefc2c147863725..310273ba2eee1d776c1e94aa033f984ab02b73ae 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;//RAS;
+simulationType      laminar;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid
index fe2526b31f649fd820e320c2dfb9c32027b78446..2485a891040fe69d6a59673b8d429ee570e8e3f2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict
index 103be411db895ad859a84cad6406a61a89e35d62..1817e5b2f79f4433b4232ba58f96d0c2932d9508 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict
@@ -74,4 +74,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict
index c5743bf5042e7eedf26bd0c6532f2271e43e9320..a9d33267d0f5cc267c917b5fec40d4253a9fafba 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ maxCo           0.05;
 
 maxDeltaT       0.001;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes
index fd5b1fc43581e971dbe239feaf4741cd4c187b7a..0d4cae164b80e01dc6db85b26e96d2a246e05d2c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution
index 42b711b9d5f5c4e70e47edeca98097122c87a47a..0aa45f71d72b8f9b0e71eac6d8f91f1c416d4781 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2
index ca9f0847a26ea957bbde5bf4e33de2b3a9bd3a21..e7334f898a515e9805b3af2e6b7981290c02afe5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat.gas2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun
index 07a7802ec24d050f678e4193cd77ab0780c73242..5628375500e96387c6be41b9e6ea9c41ea6bec3b 100755
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun
@@ -5,11 +5,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 restore0Dir
 
-application=$(getApplication)
-
 runApplication blockMesh
 
-runApplication $application
+runApplication $(getApplication)
 
 if notTest "$@"
 then
@@ -19,7 +17,7 @@ then
     foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000'
     foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000'
     foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue'
-    runApplication -a $application
+    runApplication -a $(getApplication)
 fi
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g
index 4a405bec523c5a7d8940a572c9663884ac3202ab..e7fde4fc816150d5ba9eafa77332ff5818e81569 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties
index 7e14cce0b605582877d7ac6c09055d54ab5a95e2..d2e92ec18b10a4e9eb00753d9d0566017a9e9764 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    thermalPhaseChangeMultiphaseSystem;
+type            thermalPhaseChangeMultiphaseSystem;
 
-phases (gas gas2 liquid);
+phases          (gas gas2 liquid);
 
 phaseChange on;
 
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas
index 0ff2a3a94389fd1da605981dd0caacad4521a150..20d71d1779e0c2f1859ab0383bb2741a7a4d24c9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2
index 0ff2a3a94389fd1da605981dd0caacad4521a150..20d71d1779e0c2f1859ab0383bb2741a7a4d24c9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid
index 15f549059b7c98aceea5478c050abea7687cf897..f23806f61b7f3ddc1a4f2f82f2ffd6d2cca0acc3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas
index b46742f8d53d50372c5ab477dfefc2c147863725..310273ba2eee1d776c1e94aa033f984ab02b73ae 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;//RAS;
+simulationType      laminar;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2
index b46742f8d53d50372c5ab477dfefc2c147863725..310273ba2eee1d776c1e94aa033f984ab02b73ae 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;//RAS;
+simulationType      laminar;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid
index fe2526b31f649fd820e320c2dfb9c32027b78446..2485a891040fe69d6a59673b8d429ee570e8e3f2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict
index 103be411db895ad859a84cad6406a61a89e35d62..1817e5b2f79f4433b4232ba58f96d0c2932d9508 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict
@@ -74,4 +74,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict
index c5743bf5042e7eedf26bd0c6532f2271e43e9320..a9d33267d0f5cc267c917b5fec40d4253a9fafba 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ maxCo           0.05;
 
 maxDeltaT       0.001;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes
index fd5b1fc43581e971dbe239feaf4741cd4c187b7a..0d4cae164b80e01dc6db85b26e96d2a246e05d2c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution
index 42b711b9d5f5c4e70e47edeca98097122c87a47a..0aa45f71d72b8f9b0e71eac6d8f91f1c416d4781 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
index c6978c03c6c70bd0909bc9072b9bc3f93f1e100d..c080ee403c512cef2b5bc3ff3021aad74e0868de 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
index e80e066a6412d7c90ceb28e3d2999e578bcb07e9..37ea845c8625a026f0c4c619c047d5899a1ec5d0 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
index e61ad817e2699a748fd7ab181917b3760b5d4ba4..929954cbe28983590801845e9166f5fb5fff4826 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water
index 7eae197b6c5020a65693714344cf9dd357d13ec3..9da0789be82aec7758f11eb7264d5215faabcddb 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
index 5ee2ebbf6ef7822d03c9879be5496ddd7946dba7..3d8406eb8260fa6dcec8af635c1b962050aaf9da 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index 9872685e2ff03c2a5dd27aaee610d560e5356c6a..b6be214cbe0d0ba418bb3a6fd99185d6b9818157 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type basicMultiphaseSystem;
+type            basicMultiphaseSystem;
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/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/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
index d3e8fba1eb09192071b1633ff7c655874fb775cd..3793f318f1099898e35679265bc34f87d8b1e517 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index d36924d3eeb6033ab64ec21b89abbd0ee36d52ef..9dedb368f072765a543b2b04d7708e0e2cc7e608 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index c599ab3c29d7a161f3e0bef1e08d59a4c9d2edd3..83f441238664a230da03e7cf3b04e5cc80b9e869 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index 20048d87d0a5ed7a8f28fe247491e3530d2d5527..119282004cf4ef34a90d98d4b6bbb5119f912749 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
index 3f4adea37d4066ce89bb1f7acdee300d6594b92e..c88a66db4521553cb4133351cd878a9f48ef245e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury
index 0a9b3d0622936de099c958bdf9545136f824e65c..44260b132efa18eb0403255356e2345ace4ce26c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
index 40b638f90e90f1db4702e7fb1ad9f6baae5df440..595db950a49eefbb1dddbfd83ef6555073e7d623 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
index ba293edd3df6a6a8c2aa49f6e60a6851b7542883..2494e439c30f0ea3c9504753f90e73bbbc2e17ff 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury
index 48629a163561b75d861d69cd2f22135827f4a9a0..48f22f53ab856d94a34b609ff3c3a299031a0a44 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil
index 06facc0cefcdfed5200bd345a87a4b6ac20a3cdf..0ffc609d16dfab5bad91756ce37c1f5041973195 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
index eebc0e51a4506714773a272fb5443749ffbc1633..9887ac49d7e50a8b3acd142847835bc099cf2e0e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
index ebe0e2a1921805506531923a6634f2da9a441ecc..b73a7974ba7c363c6e2aed6666d4ca089bcfcaa9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
index 427b27ce9f9dd24545edc46b2c92e964db727077..565851acc6efa487d5205710ee5a3055d06f86a8 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil
index 5890915cdcff14c3b2591dc8589ccea0a5defc64..a097b6b08120bd5e4927649190e9a262976e9e26 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water
index 905005560b154429f76f0add49148957cd9b25c5..b9e1761d698d12306e70490d8ab23f6626b7e512 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p
index f6ddd7fbd54848d895182fa2464d5e6b9541e986..7d911a5d848190cee3f3a6073cf9c782458a7fe7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
index d2b21c250ed49493d5f13706e707351bc0b0880e..30296f00f8d5277d3602a5d84c66bc78576e347f 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
index 9d3d4a8a37e9f2de5d1b14d969c7074a55fe5d96..3dd269fcca7f96dd15fc232114a62ac4ae1183d2 100755
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
@@ -4,7 +4,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
-
 runApplication blockMesh
 
 runApplication topoSet
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index d16670a97af07bf65d1bee2155d625e69141c08d..bdb9fdd668b1e7737b7e3c3510da9dac9c90debb 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,4 +27,5 @@ MRF1
     omega     constant 10.472;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 42c6f1487641d22f86d84fe575b58eed7b04ea9c..6a9e7c7c6b5e3c286ded22bc046c7e1ad0a0d6b7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type basicMultiphaseSystem;
+type            basicMultiphaseSystem;
 
-phases (water oil mercury air);
+phases          (water oil mercury air);
 
 water
 {
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index ba7d49722884f7afc1ead06e7d9a197d96a6e8dd..c1f588161cae8157ecbdb715d2ff789d1fff1358 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
index e4dd2e38a3c953c1aceb8bcf022e2775901cae5c..772d077165fed0a9f0af7a4c6de2c4381534c057 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
index 1908a881eb77d74b0641c2d05b72880ad44b5d9d..dc3dbef6f9e9ae017c28145ec6d87ecd1442c701 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/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/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
index fcb0adf64c1e6705edb3660a69ab581bb2b94576..5dc244f97dca4fc7a2d22d08dd9ea6cbb9ec20fb 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
index cff9016a0a8e85da56d50cb6153a22ac4c1f256a..dfd37e62b328184389212687029f8020fd275c46 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index c174b9eab334f5a79eba105d9fce0fc4eb209221..3ae2cbf82fb1296bece05b0047ad3826564cd9a7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index b98141dc6893a29f3190abfc83a4ae17a120f82a..0982fdd694c16615a2d3e69223b7d8447c003db2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,4 +54,5 @@ snGradSchemes
     default         uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index 611cc2ea20827e059836faec2f3818b94b04276e..13900d2768b70f0444cf77a09f2beecf3aad5b35 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index 403e370591760a67ca21e33f8251ffcb572c6684..ef51cdb1736e7be4004dc8b25c8e4a6acfaad771 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
index a615fd23897ccdc59a709061d1430d85c4c3e6df..53136e4bf61a160a1c398fdf5d883ffcea761eff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
index 530900776d4c712b0bc2aafed738bab4515c7b9e..d2b959be9cb79752bcea6afc55ac8fe8e3ff0a25 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
index 66852186553b237d726858a9ff54337bf1c95c20..3b3372ae19b446649539d0276d7eaa5c04eb8694 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
index 40673aace0ecdca1d41ffff1831d204de7634b31..deacc8487aff5580bc8f5a76e46c71d10f571513 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
index 66a25708a4cd63f6ae3b2e3963d79688225d0ae0..d19fdd9d9a217a172186a24d19759d6584529c1c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
index 86f4c4086ca5be30246430f431c4090deea6e663..e81d6d3d7393bfe944a6a73edf49b073867a1aa4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
index fb2aa3eb0b8635d4c2a36623b2149b6740a7326f..bf9801d972623cb916760134b31c87bcfaa24b19 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
index a9b69d4ab1248602c74c7ef4e39aee2e77a89573..8fe2ff4d1127ab257301933348a6f6cd7a2723fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
index 044d0c5c406d26f7e7825a7d338b232512098fc0..b5bacc3dd396d55245d5ec376f0b5e92cff5f161 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
index 5cc98089b3435a2821986b8ea01a5ba4b4b89840..580c110f065e0280c459b5a95c3c70c230d33393 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
index f6faddc147cd43b091d1b70b55b14bce7fb9462e..b95ac005cd7a3cc2b746d22be237203d708fd58f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
index 7b4a40024c647354db11ff92df21b77d2f8547d3..bdf3f8ab05fe0ee053f0fa7a25a2d75121a16b85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
index 13a6a876f558e9f0496417a2864ed2ceec7af95b..7f2bc21d97c916dd93119d3479b3d46cb7c7a1fa 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
index 301bdcb24f3cab4b1cf50aed850b1d8d051ee7a4..8d0cda0bfc844090019ee79adedef55ba22acfa7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LES;
+simulationType      LES;
 
 LES
 {
-    LESModel continuousGasKEqn; //Smagorinsky;
+    LESModel        continuousGasKEqn; //Smagorinsky;
 
     turbulence      on;
+
     printCoeffs     on;
 
     delta           cubeRootVol;
@@ -31,4 +31,5 @@ LES
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
index 4e6cf043f17e6e46230221da7763cfb7edae00d1..4c8e2d44713585c0203594fd01baa033da758963 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LES;
+simulationType      LES;
 
 LES
 {
-    LESModel NicenoKEqn; //SmagorinskyZhang;
+    LESModel        NicenoKEqn; //SmagorinskyZhang;
 
     turbulence      on;
+
     printCoeffs     on;
 
     delta           cubeRootVol;
@@ -31,4 +31,5 @@ LES
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 53ac1bb584bdbbd65a653a0da860a9baca62d59b..de63d8da24d6d3949c019fca83d57a7afeab997d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
index b033569ba06d8f80b918b7c465980070439b8d64..be017664b185e65084f42e75bc0c35a8c017fd9d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
index 5c50887cb1eea8267a4b4ce720a199acf33d1f20..77970ea35fa04660869636b9f7a80bf523749f41 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
index 0b0cb9c186e80fb11d098df95e6cda5d2996b94c..fe851e9b41723629b08c5f80057c81f0b867f22f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
index e8d718ef3295843675778254ac2507ac3b062c9b..0784cf37cdfafa757c470606e7cb5af53b1ae7eb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
index 4049ce473d4133a8dcf179e16d1988bc3793b206..0455a7b399c8631af2c53b6125812a3e19b75ef5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
@@ -12,7 +12,7 @@ FoamFile
     class       volScalarField;
     object      Theta.solids;
 }
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions          [0 2 -2 0 0 0 0];
 
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
index c50c75a88f6ec1cb6e91571f128636e7e353516f..579c6593b430408959b799a0ea9ecedb48f9cda8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
index 908e88ef90360eef10d50d88da6a208a51b63b00..488948f0bf5d02f39c43f9991fe32448ff6759e0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
index a87f5b5925a4702efcf065d63c98b42779d88bc0..6f825a48921d6d2f5028b8a7cc7cb14fb6fb29f1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
@@ -42,4 +42,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
index 0ea532c91b2dd17e6172ec1c3730afac3731ebf0..20335236d7327d8c51c96b4548b8e3f67dc4e7ce 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
index 8c9b48a60556ecee6474a1ed8bd064330da7bd03..937e3624b10d3fd4a839768902cf4d6a030af6bf 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
index c1937b981b8ce095e6c017580f0ca1df67a7795b..35f92fa4f2e696b22f36c10ff66e4d4b6b80121d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
index d49606cfa84e18a16ff01981e841c4cfcd1efbb4..e76a0c319561826aaf36042cf40c817d7f1d6987 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
index 0772b2f85f62b3bc3ae5646a8ef1f93cfbd165fa..5a4a16c8b5803a084f4002ef73124fa968065cdf 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
index ba7300a2175282d84e60ad5d09bedd5477283df5..af726a1494b018439d1c056a57a524e25a54e846 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
index d007d7875b73c54003eacd6eb202b9ff65c0bc41..7bb846eb87b5c41455cf69cd27bc96548f89e96f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
index e1f33584a9eb459f41028d90c872e8b89bce329f..1c3264a884dc91ed1d094a8d40a4db38c2d5f45d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
@@ -48,4 +48,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
index 4a405bec523c5a7d8940a572c9663884ac3202ab..e7fde4fc816150d5ba9eafa77332ff5818e81569 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
index 00f48b17064b758881189bce1cb77af88f6214bf..70a0f79aaac5168bd6324379867bd97fe0549748 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (solids gas);
+phases          (solids gas);
 
 solids
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
index 1ac9a8e071d94bfaa1e2b36b9d41197d5741c4f8..2cc10cca995706bebbe3a42f6ebd57ce1221cc63 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
index f9f61327ab9f09b00e58c2fd135e64322897c6b2..30931a03d71a483d23526459c5213935642a3b1c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.solids;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
index 86d2ec2d62b99d839bbd098c02042b10ded74b93..baf66ef5950927028180fec714bb0f16b8435f75 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
@@ -10,34 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
-    printCoeffs     on;
-}
-
-LES
-{
-    LESModel Smagorinsky;
 
-    turbulence      on;
     printCoeffs     on;
-
-    delta cubeRootVol;
-
-    cubeRootVolCoeffs
-    {
-        deltaCoeff 1;
-    }
 }
 
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
index ad7d6f3cb04831c6e08b497be982cbb484951b4f..28032677c2c847b48925cc2042753cf42ca82ffc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.solids;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kineticTheory;
+    RASModel        kineticTheory;
 
     turbulence      on;
+
     printCoeffs     on;
 
     kineticTheoryCoeffs
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
index a1d70c8f81aed3ade875cc6245fa998ea7a0ed81..68326558255529f97d3c97eb95195bb6c9ad32d1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
@@ -125,4 +125,5 @@ mergePatchPairs
     (wall_merge wall_merge2)
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
index f315e4e2ebf5e41621035cfcda54947ecdc12cc1..00ff61c65fe29e766ab383127aa7727b0292790b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
index cfc4e15196121df25c08e7a45125cca06aae72fa..4da7dbc7dae8b241b300605012f0b1baeaad4b13 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
index 5676024b70a5eaebf7b2c89490f00fdcef54fab7..0e3a4f3d1c6a07b92eac56ce7ab0734834c5f474 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
index a615fd23897ccdc59a709061d1430d85c4c3e6df..53136e4bf61a160a1c398fdf5d883ffcea761eff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
index 530900776d4c712b0bc2aafed738bab4515c7b9e..d2b959be9cb79752bcea6afc55ac8fe8e3ff0a25 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
index 66852186553b237d726858a9ff54337bf1c95c20..3b3372ae19b446649539d0276d7eaa5c04eb8694 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
index 1ef9eeeacd12b7d0a678f0971da9e4978916f465..710b3220cdeb4f47bba5e209231def8a50d0bdc4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
index 70031191b3d3e473f597554f2963c791282d9f97..e3b87366a863f346bf8f36c6df0cdd207d090e11 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
index e1cf84aca99c5a298d844b007b1436f2108700b2..c13cbeb320f9996d49fdc4ebe619934deece3809 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
index bb851eb16ea68f31e30ad0ac1a2317623fde37e8..80257a093186c5d713fc2b14de5b3bd6ddf2819c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
index f30788e0e65d77fb86ad3f90b14df24896c8132c..91facc65dd45a7ca1f87d56fd9b4ea903954c901 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
index a997be6dc0dbb71f3afe52b318a87d90132e6ac6..2f6781cb920fda6a24a12d64c83dc6785797ea49 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
index ea7c9339b53ee12661129dfc2fd1fd59330bdc41..9a1143d17ed989a23087de071bbcf953d329bdc7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
index e9d9db34ea6e52c05a796716eacff4a444620b64..cc80dd9e04cb4cc2ed5215dfe1ece16c3f5f86b0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
index cd43ee91b192faccc61d2bad1b81a4a2b18cf5a9..720312a82624c4f34a24af89eb6a3a7b8f34b74f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
index 45b2fc985595fe462a328d9e6ca35979358b9cff..e6dd5f650887411d29dff9d6ac31133e4ae7c49f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
index e1d74901ae285edb9b80bfb190f0288ce59ccb3f..d4c2051fff1040f4b17d3ed560bfa5c5e8e2bbcb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
index 06c760c1d9c5b698441cefc494e9c2c4597df18d..20f6662cd49b66aff2a510f7c597a7ae805910a4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
index 13a6a876f558e9f0496417a2864ed2ceec7af95b..7f2bc21d97c916dd93119d3479b3d46cb7c7a1fa 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
index 4727cf5d7e481b6a6573f8b9651ca7783caea404..2e6ea5c747d20537c95f990ca587db8b647b0e6e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
index df20e46d48b5e292be1dafd8cc8c4b69389af572..f578ff10b3ebb365e66e136a42315a584345498d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel mixtureKEpsilon; //continuousGasKEpsilon;
+    RASModel        mixtureKEpsilon; //continuousGasKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 
     // mixtureKEpsilonCoeffs
@@ -31,4 +31,5 @@ RAS
     // }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
index f283e236b012f5de1c66ecda58de1761cb2810dc..9737bd8cffb186b9b6f5b45d973a37b811e989b7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel mixtureKEpsilon; //LaheyKEpsilon;
+    RASModel        mixtureKEpsilon; //LaheyKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 53ac1bb584bdbbd65a653a0da860a9baca62d59b..de63d8da24d6d3949c019fca83d57a7afeab997d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
index 4e1b0f9280e6ec757986abf895a77c273241d3c1..895a4a2979fd6571a25b592bf7f02603f37c44aa 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
index 16517019deca321f6a739116d21d328466aa4ff2..35cbb39b0aca0ddb30f4d0c432a88ac03ed9216f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas
index d5e835ea8b9f81bbd415b565a369e471127f09b1..754f0f3fa710b9d7c57aa5e9533fc152056fd6d5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid
index dca0e3230232a60dc86120f6b680c1dfcb7684b3..f3486a6203b60c5bb8a1399c8d6911f3bc5e905e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas
index 0a8ab30aa7ca7a932b8f5398669fef9d886760a4..48f5010bcd35eb4d72ed6c6d3800f16ce3e35f7b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas
index 6760af998d1a584c44dae82617019b453d042492..2b03b5646ffce2d493aaec5ee7992268acdee932 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid
index 4248a7177a025eace749e5ac01e81f4cd96d61fd..f6e95dc81aeee05318b05882f5ebcd02f3c89eae 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas
index d1887a30baf6f346539f7acf39802402e326d2c7..903e6f581cee495ae41cff20593d3151d820af9a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid
index 54270e5b06dfa804129a55833ae244d7e6d521ad..02e2329d9fbc1143774846db81ed9519ce15dd37 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas
index 3b967ee69fdba9d0913e3ebc0c6a0a7854bcdc25..f262a310be73bf71cbb11f845cae52061d08a45d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.gas;
 }
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid
index 7e55204663767f98c0ae6c2ee8e1d0cfd45a05a2..e0d43d0689998fbcceb17bc1577fac5757115643 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.liquid;
 }
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas
index cca6ccf73b6d490c2a0c3c7d2aa318fa830b77bc..425011249ba8f89480605b6cea8579d697240403 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas
index 248c8f354f942785f2e3ec13252db5f4a5451942..fa61e0270058574f765388f155c11175982e36d2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid
index 350319fc1569842de5fbcbe2ec89a05254436da1..0e78f27f7bfe5a5385cb292f34d0010328638636 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas
index 1c0f5402e9529c728f378e9c8e99ef1e37ead850..8fd997147dbe0277eed397a7fc2ffe8f79d7f77a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas
index 053dc487a672f138b46bb773ff6066d1b5ece109..c563cf807996cb2a86b2ae930de73e42c0fe34c4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas
index cc8ab2c2f6cc7665e4321a29733d08f7485e662d..3dac754e1a46709111cc2171d4c7de3c4fa2f354 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas
index c3a4b0c74118e3e5e52a3afc4ce0237501691025..67218d7126ef0c640ce0da6ee379904d903eee02 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p
index e8d9da3792c5804bb3d9993841f468177cb246b0..40653c60d3f743e3ba8cb617d87e9181d44773d6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh
index a9637739c3ca5acc8bb2113c5cb6536a7d3c6d38..14fd81c63a615d1ff91ff094025fd2fbbf851905 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
index ae188df8be6d958cc02f576fb03b12d15c7bd9b3..cae5b8cd9f8c0400ede52adb4ec010b2ebcfd308 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -37,4 +36,5 @@ odeCoeffs
     relTol          0.01;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
index c1bf6866fca4786a38cd1b2c93aa9ddc4f41e238..94acaef3b1322b50254600abafe80d89ce7dc877 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ PaSRCoeffs
     Cmix                1.0;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
index e5faa5b6c8c8153044b9e1fea84694b38d8ea470..87f853d3e86ad05ca4229f6f3534c824e6e7577e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    interfaceCompositionPhaseChangeTwoPhaseSystem;
+type            interfaceCompositionPhaseChangeTwoPhaseSystem;
 
-phases (gas liquid);
+phases          (gas liquid);
 
 gas
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
index 004b6bae2dfcd035ff9e202b6493e10d2ab2d38a..ef6abea6379d1ad96fc746d2e53a67d3350becfe 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
index 1cd1b979d123c76739c0485ee1e8af83515fcdde..fe7abec8a3e575642415215a611f28e7e3e6e911 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
index 4e8a04f54bc7c6d57c1016e28d0369d9ed472e64..16da8d00e7f7da0f89cea151b0ca676eab920d97 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
@@ -10,18 +10,17 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
-    turbulence on;
+    turbulence      on;
 }
 
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
index 1ebede1a7d23d2fed2692b5fbf16c65e9f9f1ece..c21588291f8292e24ac9dc513f805c955e93fcd8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
index e60eee34660f18ae63a57ce29be4928cba77b075..cf9e3843a011d5bf49476fd7b7892539aaa03b22 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
index feb6127cd1db3f501e20be6fcef7c17f1f6a3c8b..f65004969b2fee2ae926218a24f0f64c2d2b2a07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 6 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
index 54b2c746d464689c6ec5f9b34e7c8f3d62e3f6e5..43d62438eac4695bd1f9739ecf038e71a708c7ac 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
index 2e7cc5f9d5b33d66f3aa86a2bb54f616a9f5f32e..b8b5bb94cd9559b240cfeb8b8666bd97461d2eb5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
index 7e64c3bf2f1d17b01822ad02411524d37c2f396a..0f1a198a18d779827438ca8121c530091c290f19 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air
index a615fd23897ccdc59a709061d1430d85c4c3e6df..53136e4bf61a160a1c398fdf5d883ffcea761eff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water
index 530900776d4c712b0bc2aafed738bab4515c7b9e..d2b959be9cb79752bcea6afc55ac8fe8e3ff0a25 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta
index 66852186553b237d726858a9ff54337bf1c95c20..3b3372ae19b446649539d0276d7eaa5c04eb8694 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air
index 70031191b3d3e473f597554f2963c791282d9f97..e3b87366a863f346bf8f36c6df0cdd207d090e11 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water
index e1cf84aca99c5a298d844b007b1436f2108700b2..c13cbeb320f9996d49fdc4ebe619934deece3809 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air
index bb851eb16ea68f31e30ad0ac1a2317623fde37e8..80257a093186c5d713fc2b14de5b3bd6ddf2819c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water
index f30788e0e65d77fb86ad3f90b14df24896c8132c..91facc65dd45a7ca1f87d56fd9b4ea903954c901 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm
index a997be6dc0dbb71f3afe52b318a87d90132e6ac6..2f6781cb920fda6a24a12d64c83dc6785797ea49 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles
index 870949127d7a795b52559e8559b1379d8ffa87b7..e43a5d41936c44850ece3b19c097fdd49a3003ab 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air
index ea7c9339b53ee12661129dfc2fd1fd59330bdc41..9a1143d17ed989a23087de071bbcf953d329bdc7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water
index e9d9db34ea6e52c05a796716eacff4a444620b64..cc80dd9e04cb4cc2ed5215dfe1ece16c3f5f86b0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km
index cd43ee91b192faccc61d2bad1b81a4a2b18cf5a9..720312a82624c4f34a24af89eb6a3a7b8f34b74f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air
index 5cc98089b3435a2821986b8ea01a5ba4b4b89840..580c110f065e0280c459b5a95c3c70c230d33393 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water
index f6faddc147cd43b091d1b70b55b14bce7fb9462e..b95ac005cd7a3cc2b746d22be237203d708fd58f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh
index 7b4a40024c647354db11ff92df21b77d2f8547d3..bdf3f8ab05fe0ee053f0fa7a25a2d75121a16b85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties
index cba7417524dbb1a08cec55b68ee3cf8cef1028da..8b85342cd57bf2733b9e8319658ba79d4b09dd41 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type populationBalanceTwoPhaseSystem;
+type            populationBalanceTwoPhaseSystem;
 
-phases (air water);
+phases          (air water);
 
 populationBalances (bubbles);
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air
index bae0e6595709e8ee865c70a5e84fdf1afb1e31f6..93bcec623e33898349c15c217bbe49edef776ab7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel mixtureKEpsilon; // continuousGasKEpsilon;
+    RASModel        mixtureKEpsilon; // continuousGasKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 
     // mixtureKEpsilonCoeffs
@@ -31,4 +31,5 @@ RAS
     // }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water
index c302655a351642a97921f6fae64d31c925396fa2..9e962d1917753612fd44e80db88e00e7e99163df 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel mixtureKEpsilon; // LaheyKEpsilon;
+    RASModel        mixtureKEpsilon; // LaheyKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict
index 4457cdce5bb4f7f49090ce0e0694d5cf7032f2ee..261dd08ce25638315f31f8863b3ccf0a87e0a58d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes
index d28ec6a6311c2b4a2621a0b20868aff47ab8db6a..57a78fdfda84ac679a2f7b5ff738b0bd38f696dc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution
index 95fe84d68651b747401dc4c52635e6a7c51c9ca0..f596a2308dbb6af1f3d08ecff9e9bd5a4aebe1df 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict
index 5b56ee3a21c4833a7ec7873cfdd048b5b91de783..f4fc7541cd340bca0dba6481574a0c52b7ec00ee 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict
@@ -38,4 +38,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
index 1bf14ee7d522ebb290a7af6b30cd79cb734f7c45..fcfe1978deb74c4b9e76f63bcaf44d075cdaf8db 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
index f72fa7714baf869c7aa6c9bc0cf2cbb2b65b878e..2c97b75af6a0c425934c5a2a975d785cae8f3b4a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
index 180fa8b93271151e624056e1295a2016de1e2adc..43bbfdedd853de6e0f963bef89a960775746bf68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
index 7256909c00579fc45744395fc39af0e87e371407..096fda3316b6b108be66fae435b2e55446d0e5a2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
index 95768a2ad943d810f26ced901181c14ff5ab2a9f..d0a28a0e08bbded3e38aa98524a3397c7e7013f9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
index 2d2a97f803b7bcf785779b3bd7013feaa83c1e52..df8ef22135ffbca3c540d961f80e951e9852974e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
index 5e112f5504c547603a7c2035d538d093dbf9c348..f4735f18be01b787ba1def3c149b52e642773a74 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
index 40673aace0ecdca1d41ffff1831d204de7634b31..deacc8487aff5580bc8f5a76e46c71d10f571513 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
index e577438533e15a557b439b43da93dfdb10a0ab9c..7517e447eb12ffcf98270b722cbbf78817280795 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
index 30a47b4ca243a436b4ad2bfcf69df46ca469a08c..d961694df64bc0afc99e35e60f26a8af13bea44a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
index c0c5739f0943d4e5cc19b614a1517584ba2c36d5..604342dd69d62ada40f084c525606cc0f631dfca 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
index 30dda230590a3e0cef48c6b461971a4ce03232eb..cfecbc4e15169d952d57f85ef24b75f496317e74 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
index 26f16a7a0655a60115ce63ce6f48d4a620314528..6e4e249ddbeed1a25d37f329cb92367ab9c904eb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
index 53585d65e35bc83550894e535238abeab0424b92..e738541e58aa19a208be4b74cbee4f10301736d9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
index 7d3408d8f278e7f4d1388bc56e6e677168955c1f..b950b749c2d46d686eaac0e96a632bb9c8e18258 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (particles air);
+phases          (particles air);
 
 particles
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
index 008c2cdb27e9a703a841dae3570d24dfd4f18add..4d509cfaa67849ccae5fc616be0ff28ba61f5e4a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
index 35f95b28d3e820282a0685e363304232db137878..66dfd3a5431463c8c0172a48d0923c987385afcc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
@@ -10,34 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
-    printCoeffs     on;
-}
-
-LES
-{
-    LESModel Smagorinsky;
 
-    turbulence      on;
     printCoeffs     on;
-
-    delta cubeRootVol;
-
-    cubeRootVolCoeffs
-    {
-        deltaCoeff 1;
-    }
 }
 
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 21d51a46a62118b64068a9ccb55cf08d2df98b1f..86245e5a591a2bb4ff2af29a8aebc893420ed72c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kineticTheory;
+    RASModel        kineticTheory;
 
     turbulence      on;
+
     printCoeffs     on;
 
     kineticTheoryCoeffs
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
index 3f4b950a99bee0bbfd824456d720a705b9d43ce5..fe125cf9f29d12c47ca4664a1d4ab57a4748579e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
@@ -63,4 +63,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index 04e6f71dc126aca9853218c37d6342e1623fdb63..d09782a63c9562b07f089e7927ffff60811e465c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.9;
 
 maxDeltaT       1e-05;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
index 938ff82dfc49b380abf433f33a1eba707901f0a5..e84299974ff52a164b76b9e18c4a556c4891d02e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
index e9cd8a4f51bdd62b16587445ecc133fd0b19aba5..f7ab047d5b406bbdd281457ca438fb1f27ac962e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
index f966cac17a7d4d21b03c13b703a521ec3f7ad604..a1702dc32420902a88db965db4bf57d7c5bc5d6f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g
index 722ae9f25b88128dce5d5e6bf39859a5b0084c9b..e7fde4fc816150d5ba9eafa77332ff5818e81569 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/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 -9.81 0 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
index 6ae275b9c6984906db32d7c105a0759deee38ace..b24d9319ca49a66191c4f05e2a1771b24f3dbbeb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    thermalPhaseChangeTwoPhaseSystem;
+type            thermalPhaseChangeTwoPhaseSystem;
 
-phases (gas liquid);
+phases          (gas liquid);
 
 phaseChange on;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
index 3eef2cd17303812cb5b0ac3cdd7afffdaa63d759..3562b17e6196b67565d07a6dad572f2c950dbf3f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,7 +25,6 @@ thermoType
     energy          sensibleInternalEnergy;
 }
 
-
 mixture
 {
     specie
@@ -37,7 +35,6 @@ mixture
     {
         rho        1;
     }
-
     thermodynamics
     {
         Hf          0;
@@ -52,4 +49,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
index d79dcd913ffbacba9305073761f025518e624f45..5e208f3b81b2478c4c21a433b6973103a4efc36c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas
index 96439d22c1784ee6f67f868971989e6e73e53093..4b39baf3b2dfc5aa3a6dfde362bcb2b7eb68d1dd 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel continuousGasKEpsilon;
+    RASModel        continuousGasKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid
index 1723136da1e993de49c58649018662c136eeb9f3..6394672b0c47fac543f6d6e2daa25a821e07d76d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel LaheyKEpsilon;
+    RASModel        LaheyKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict
index 641cb72e8c6e57aa8f6bd76626a4861ff33411fb..e18b9855804385f223c7774de426c0bcb83a0650 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict
@@ -74,4 +74,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict
index 9074c1616176e59e675b874c5ac5699f3a9715d5..e5d1da0aee73e0628c2183ef52debced53176198 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ maxCo           0.05;
 
 maxDeltaT       0.001;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes
index 0d04392f34d9d72b0cb1a647720b92240071788c..45792d588758aaf802aaf827bf251cc6ef2258a0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
index e49bc468c8de590ec986b7da2200a85a15ebc39f..8d57ef102800d76efe40f5829e9be0506d2ad343 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun
index 12347ec8dd1ecb1fb8106ede3efb40b146159f70..5628375500e96387c6be41b9e6ea9c41ea6bec3b 100755
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun
@@ -3,13 +3,11 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-application=$(getApplication)
-
 restore0Dir
 
 runApplication blockMesh
 
-runApplication $application
+runApplication $(getApplication)
 
 if notTest "$@"
 then
@@ -19,7 +17,7 @@ then
     foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000'
     foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000'
     foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue'
-    runApplication -a $application
+    runApplication -a $(getApplication)
 fi
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g
index 722ae9f25b88128dce5d5e6bf39859a5b0084c9b..e7fde4fc816150d5ba9eafa77332ff5818e81569 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/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 -9.81 0 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties
index 3d37e4c3aa0357c99d5f2e91196820b7b992e481..e5991d57113a78c2ca5c5987bdd95f20f997932e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    thermalPhaseChangeTwoPhaseSystem;
+type            thermalPhaseChangeTwoPhaseSystem;
 
-phases (gas liquid);
+phases          (gas liquid);
 
 phaseChange on;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas
index 0ff2a3a94389fd1da605981dd0caacad4521a150..20d71d1779e0c2f1859ab0383bb2741a7a4d24c9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid
index 15f549059b7c98aceea5478c050abea7687cf897..f23806f61b7f3ddc1a4f2f82f2ffd6d2cca0acc3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas
index b46742f8d53d50372c5ab477dfefc2c147863725..310273ba2eee1d776c1e94aa033f984ab02b73ae 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;//RAS;
+simulationType      laminar;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid
index fe2526b31f649fd820e320c2dfb9c32027b78446..2485a891040fe69d6a59673b8d429ee570e8e3f2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict
index 103be411db895ad859a84cad6406a61a89e35d62..1817e5b2f79f4433b4232ba58f96d0c2932d9508 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict
@@ -74,4 +74,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict
index f51b2ca2fc88b3c2e7061b588abefc9dd748e93d..1610fe8a2825015a7a84683b40c2cc701be2584d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ maxCo           0.05;
 
 maxDeltaT       0.001;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes
index fd5b1fc43581e971dbe239feaf4741cd4c187b7a..0d4cae164b80e01dc6db85b26e96d2a246e05d2c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution
index 42b711b9d5f5c4e70e47edeca98097122c87a47a..0aa45f71d72b8f9b0e71eac6d8f91f1c416d4781 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g
index 722ae9f25b88128dce5d5e6bf39859a5b0084c9b..e7fde4fc816150d5ba9eafa77332ff5818e81569 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/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 -9.81 0 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
index 4b21150355983a58bd328afa0856bad6f50efd59..9b291997af4392d282e3b88d3625cef8cb5dd48b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    thermalPhaseChangeTwoPhaseSystem;
+type            thermalPhaseChangeTwoPhaseSystem;
 
-phases (gas liquid);
+phases          (gas liquid);
 
 
 phaseChange on;
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
index 3eef2cd17303812cb5b0ac3cdd7afffdaa63d759..3562b17e6196b67565d07a6dad572f2c950dbf3f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,7 +25,6 @@ thermoType
     energy          sensibleInternalEnergy;
 }
 
-
 mixture
 {
     specie
@@ -37,7 +35,6 @@ mixture
     {
         rho        1;
     }
-
     thermodynamics
     {
         Hf          0;
@@ -52,4 +49,5 @@ mixture
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
index cec4c5cb249b243eb441d5b76bf62f2141e95448..ae6d1cc95e365956f1fdbd70f4439a424c29e9a0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas
index 96439d22c1784ee6f67f868971989e6e73e53093..4b39baf3b2dfc5aa3a6dfde362bcb2b7eb68d1dd 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel continuousGasKEpsilon;
+    RASModel        continuousGasKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid
index 1723136da1e993de49c58649018662c136eeb9f3..6394672b0c47fac543f6d6e2daa25a821e07d76d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel LaheyKEpsilon;
+    RASModel        LaheyKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict
index 641cb72e8c6e57aa8f6bd76626a4861ff33411fb..e18b9855804385f223c7774de426c0bcb83a0650 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict
@@ -74,4 +74,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict
index 9074c1616176e59e675b874c5ac5699f3a9715d5..e5d1da0aee73e0628c2183ef52debced53176198 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ maxCo           0.05;
 
 maxDeltaT       0.001;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
index e442b5081c93b0ca244084bb53d204fa2d4943c8..a694bd386ed3ef7841afb6bd8daaed0bbb627cd0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
index b7d30b839f7f055c8a1b9e07db6bb915414450ac..346d93a661ebab0997ff43a4370913bc81ff40fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
index a615fd23897ccdc59a709061d1430d85c4c3e6df..53136e4bf61a160a1c398fdf5d883ffcea761eff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
index 530900776d4c712b0bc2aafed738bab4515c7b9e..d2b959be9cb79752bcea6afc55ac8fe8e3ff0a25 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
index 66852186553b237d726858a9ff54337bf1c95c20..3b3372ae19b446649539d0276d7eaa5c04eb8694 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
index 7b4a40024c647354db11ff92df21b77d2f8547d3..bdf3f8ab05fe0ee053f0fa7a25a2d75121a16b85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index 9c5e94d3056a8b816e647efeb547eb28947f2156..8b7e8a690ae92763f66d2b8b5bb60d95de2beaed 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/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/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 53ac1bb584bdbbd65a653a0da860a9baca62d59b..de63d8da24d6d3949c019fca83d57a7afeab997d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 18361e9eb893d646c3b4c1f55e67858bc9914e31..2fd57ff2406cadae6a12549c226c4bc69d94ff08 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index c599ab3c29d7a161f3e0bef1e08d59a4c9d2edd3..83f441238664a230da03e7cf3b04e5cc80b9e869 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas
index 0a8ab30aa7ca7a932b8f5398669fef9d886760a4..48f5010bcd35eb4d72ed6c6d3800f16ce3e35f7b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas
index 6760af998d1a584c44dae82617019b453d042492..2b03b5646ffce2d493aaec5ee7992268acdee932 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid
index 4248a7177a025eace749e5ac01e81f4cd96d61fd..f6e95dc81aeee05318b05882f5ebcd02f3c89eae 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas
index 88693a1054067982653fe2bc6560520a6f17a525..f423ab29a9d5057565a7b96162f549c5635e3e91 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid
index 88b1a8a680ce5593ed2ccb06431bdf1c38750144..463aad80b8acbededdadd8ee4dc7b078d19deedb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas
index 3b967ee69fdba9d0913e3ebc0c6a0a7854bcdc25..f262a310be73bf71cbb11f845cae52061d08a45d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.gas;
 }
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid
index 7e55204663767f98c0ae6c2ee8e1d0cfd45a05a2..e0d43d0689998fbcceb17bc1577fac5757115643 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.liquid;
 }
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault
index f2020aab0fead0f4fda763ec7047a3fecb37826a..2ea725e800ac259fcb479beef565c93316c1f0fa 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas
index f77d2a5ffb38b419864ad9fb5941119569e5d8c2..7218c62b24ed46f54be0df5ee1377327427e7a10 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid
index a72dd480671fd680a7640e51f3cabf3432369773..2911e0b85b107f16572fdf7fef50ea8617b65d16 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas
index 248c8f354f942785f2e3ec13252db5f4a5451942..fa61e0270058574f765388f155c11175982e36d2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid
index 350319fc1569842de5fbcbe2ec89a05254436da1..0e78f27f7bfe5a5385cb292f34d0010328638636 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh
index 7b4a40024c647354db11ff92df21b77d2f8547d3..bdf3f8ab05fe0ee053f0fa7a25a2d75121a16b85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
index 671d1cd514f02c7c079885a8b8f34445a9664dd1..92a8ce697b9f16876ea177103fc049df9730166c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    interfaceCompositionPhaseChangeTwoPhaseSystem;
+type            interfaceCompositionPhaseChangeTwoPhaseSystem;
 
-phases (gas liquid);
+phases          (gas liquid);
 
 gas
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
index 9e7fbf633c409b46d534dbeda320849c571f5c86..45534d4b748ce1d5cfee4d7e2658fbae05994d7f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
index 03811b4311a86a3d4bba220aef3f37115423eefb..05d791c8aace378847d2df3b5ee55e2293ddc594 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
index 6cfe8c8570b79ce27220ef2728d0b87b258e86d4..459e5286233351fa544e5741d0b7fea6a7060c04 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
index 1ebede1a7d23d2fed2692b5fbf16c65e9f9f1ece..c21588291f8292e24ac9dc513f805c955e93fcd8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
index f6b622ae73f5dc531f7f67f2561a0a7e3967cff3..a29b21ef2a7210740f477c621b889adc59e96876 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
@@ -81,4 +81,5 @@ totalMass
     #};
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
index 2931fb8c28bc1b7b538c7e98d4e9bd6e8dd9d851..69fc3f5ad5682c3f52bd95a05ecbbcfc4b953561 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
index feb6127cd1db3f501e20be6fcef7c17f1f6a3c8b..f65004969b2fee2ae926218a24f0f64c2d2b2a07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 6 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
index 390862e3e5b890a45121b7efe24e5020502879e2..ee012645c7af2d04e10e248b1b471d4c3f228674 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
index 506c004f118bbe95bf064b803c07fa8132a92629..36fdcf3a57d5b3b367b02f65759466c47a706613 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
index 7e64c3bf2f1d17b01822ad02411524d37c2f396a..0f1a198a18d779827438ca8121c530091c290f19 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas
index bbdc013faa91b36475282f0ab8bf0b49d3c574d7..10dd745ad8cd5a1dc083cb858092ea7c276d40ee 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid
index d7046512a4f8ad818fb1b9057f027e8061e569c2..0bcd9b0ac887e92203b50a38a72aefa216c80d26 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas
index de73b974317630b40800a59cba7e32709b5ea0a7..7f2aa3d45e923cf799e4220a2334250286a98e47 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.gas;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid
index 0256a38094ca604d30b24ce73e7e3077c5cb687a..65b0c16265db069f5beda91d289af9c23d0fabe4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.liquid;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas
index ed580d914e8b2159baffe1f79c97c90d133bb685..c33de2a5cf25821472ae04eddb99f0f54c8fadb9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid
index a72dd480671fd680a7640e51f3cabf3432369773..2911e0b85b107f16572fdf7fef50ea8617b65d16 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh
index 7b4a40024c647354db11ff92df21b77d2f8547d3..bdf3f8ab05fe0ee053f0fa7a25a2d75121a16b85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas
index 7df851ba5f50b7a9340311783e73f16776714078..f71550abf9b4b0e878b4f58a172572334199a1b0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid
index cfb853eefd04b4070b481c4b024e8aff33bdd336..96c4a3909d3d18bccfbf0436423d074ea4b68f0d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
index 9ad007f3d931dcc3f34196cbe44b11ae38e2b5b8..f0b86557ca967bcbca8d6b84315dd027e83b0cf6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type    interfaceCompositionPhaseChangeTwoPhaseSystem;
+type            interfaceCompositionPhaseChangeTwoPhaseSystem;
 
-phases (gas liquid);
+phases          (gas liquid);
 
 gas
 {
@@ -239,4 +238,5 @@ turbulentDispersion
 // Minimum allowable pressure
 pMin            10000;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
index 3cc5bdda070ff24138f2dcdca3e3887cdd0da5ec..ea0191e64a3c98dfe81fca0b153a4541298516f3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
index 589f93401483d5d15096c6695ed237b705a5e389..00c73cf9c21a5830f526d3bc2210ac9f2f3c52b2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
index 6cfe8c8570b79ce27220ef2728d0b87b258e86d4..459e5286233351fa544e5741d0b7fea6a7060c04 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
index 1ebede1a7d23d2fed2692b5fbf16c65e9f9f1ece..c21588291f8292e24ac9dc513f805c955e93fcd8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
index 2931fb8c28bc1b7b538c7e98d4e9bd6e8dd9d851..69fc3f5ad5682c3f52bd95a05ecbbcfc4b953561 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
index 390862e3e5b890a45121b7efe24e5020502879e2..ee012645c7af2d04e10e248b1b471d4c3f228674 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
index a863e0d11e35c3fc77bda6be3a078c0089a1e6fb..f644d001c50cc27a28df07943978f53f87c61196 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
index fac6fa54b6f9fa62093466d3a0bfe129a318950a..a09f0be1f9b5bdc47ba2fed5364543cfc864e181 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
index a615fd23897ccdc59a709061d1430d85c4c3e6df..53136e4bf61a160a1c398fdf5d883ffcea761eff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
index 6bfdcc8562c4ce0608f9524d7e268284c20ee562..310cceef69d1ed0ea4cbdad147aeb109c6a30e13 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
index 66852186553b237d726858a9ff54337bf1c95c20..3b3372ae19b446649539d0276d7eaa5c04eb8694 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
index fccdd791c2800f837426304e3bbee0e7daeee976..ecaf091b68a7c97abee55cce65271fc476bc209b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
index 7b4a40024c647354db11ff92df21b77d2f8547d3..bdf3f8ab05fe0ee053f0fa7a25a2d75121a16b85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
index f0ca95ec47b0ae58347418dd2702ff63ad09421b..ebe94a492f17d623fc82134cb112f13385c89af3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/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/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 8d50b638008107a1350cdc899d5917254b8ae6fb..86b5b90e50106fda8547d037f70d40870f02fee6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
index 7f65754aaa5112ee2d18fa50fa75ab07a9097573..023a2231e91974594a9979ccfd6b33d99e14a41e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
index d5e55c6b53f396a8e477fc3baed5f8ea932b6091..ccc28d4d2081979d6ca9281644cad772cd960dae 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
index 1bf14ee7d522ebb290a7af6b30cd79cb734f7c45..fcfe1978deb74c4b9e76f63bcaf44d075cdaf8db 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
index 8e0fc09a5cf42c92aee06c5f22a445bd745ff137..86dbc850dfcf5f8d56ecfd370df7e42756517bfd 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
index 180fa8b93271151e624056e1295a2016de1e2adc..43bbfdedd853de6e0f963bef89a960775746bf68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
index 7256909c00579fc45744395fc39af0e87e371407..096fda3316b6b108be66fae435b2e55446d0e5a2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
index 95768a2ad943d810f26ced901181c14ff5ab2a9f..d0a28a0e08bbded3e38aa98524a3397c7e7013f9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
index 5e112f5504c547603a7c2035d538d093dbf9c348..f4735f18be01b787ba1def3c149b52e642773a74 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
index e577438533e15a557b439b43da93dfdb10a0ab9c..7517e447eb12ffcf98270b722cbbf78817280795 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
index 558732e5165734538972a6b227cbfbe000711886..d961694df64bc0afc99e35e60f26a8af13bea44a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
index 68b4991c4414878e9e4d3bf7163df279acf43086..c2132b8a95ad702d1f8d602d59db8b1278a72409 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
index 1b10a505f2306ae417219c2888261458b373e096..6ffe68b928c3c0be4d8c32a0fdb6ba9707711990 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
index 30dda230590a3e0cef48c6b461971a4ce03232eb..cfecbc4e15169d952d57f85ef24b75f496317e74 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
index 26f16a7a0655a60115ce63ce6f48d4a620314528..6e4e249ddbeed1a25d37f329cb92367ab9c904eb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
index 53585d65e35bc83550894e535238abeab0424b92..e738541e58aa19a208be4b74cbee4f10301736d9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
index b3c029611870e8eed20c2c9a4b2aa2d2fb915d1e..c12331bf0ce39b893654331db287dbdafff4b769 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (particles air);
+phases          (particles air);
 
 particles
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
index 008c2cdb27e9a703a841dae3570d24dfd4f18add..4d509cfaa67849ccae5fc616be0ff28ba61f5e4a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/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/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
index a375e1d2616fbec43ec7e202ff68ae2b85509307..c482e250f51431aa90000d7f4247fb5b3466aeb2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel phasePressure;
+    RASModel        phasePressure;
 
     turbulence      on;
+
     printCoeffs     on;
 
     kineticTheoryCoeffs
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
index 3f4b950a99bee0bbfd824456d720a705b9d43ce5..fe125cf9f29d12c47ca4664a1d4ab57a4748579e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
@@ -63,4 +63,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 24158570bbaac45bc6f4b3ad2364cabb4a6afb15..6eebee01de06034a6248d6be033cf5de634b0c6a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.9;
 
 maxDeltaT       1e-05;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index db0d456678b8384cfec9b3dd0a7b1c264b70ab7b..e7d4b0b6d752e8586bc2c5fd5075741c2cdedd70 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,4 +58,5 @@ snGradSchemes
     bounded     uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
index b3f0284add158ea68e0ea499961cac289cd2e5cc..c54079a9a614e6685e646de6157c974254322580 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
index f966cac17a7d4d21b03c13b703a521ec3f7ad604..a1702dc32420902a88db965db4bf57d7c5bc5d6f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air
index b6d8f0682fa542ad0b94546079bda5af802c0f58..ab662c35521620ee1733419c3a294075c3f03ed2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water
index 0bdfea276468ff64f749106662b9dc26b5b50cc8..ebc718b99a1441b46aeb3a8d9790810533811e2e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air
index ccb142caab6d45b77ce6f1b993502ab86fe0a271..79397cbfb9b60b0b742f4ca666d49c7e36783fec 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water
index c79fe162496760cac920a380b9657aeaee090a59..f879a1499688318bdf39ce49f72d5ba5ab00657b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
index 6daa3acf184e347645291140738a65a1df65429b..8b8651d9d6e88be425c4601df9733a53a64051e6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p
index d141024fc7a74531dcf378ea867769a4513f4e06..208351ec49a92361e5ccd8d659639061c6312f73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
index 669812196cc451df6def76d435cd0f69ea275d64..a193418e5b091823167b3f6295d753abfec9903f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
index 2c152ab3781c2e10c6c21a9d3df788665527ae21..f535d94ef0d06ed8f9aad6c0de2b119b2cc52fe3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
index 12d532ff3a1b74c2e824d722f1b62c3676156796..0b763caeccd5ec11965fa82a26f3b2f9b51a09ae 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/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/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
index f44b866e89df6a98bb0b7ec042019203ab2b0688..e5b9149678bd7e35f8c7f7ac1b5225c7ba222a20 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
@@ -55,4 +55,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
index d2dc6b1e6ac9c9580e0f46f03180ee88b59a486e..020e5cb9206f8dc157d76554bec27c1552d6ccb3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
index c8d8292eccc86896b1e20aadb208e923a3af854b..7e06ead07ff145e5b6723ac83de3fe75597c1676 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
index c599ab3c29d7a161f3e0bef1e08d59a4c9d2edd3..83f441238664a230da03e7cf3b04e5cc80b9e869 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
index 16cbf883dccba434704d0d43c70b0808467975fd..2eb10a18f00f244395b83f9d78176fb521a522d0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
index d614baf4e7aaed0383765f6a3c4216086e8a0c75..0b68ffd259c1672b814503307c5131c13a88fce7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
index 40b638f90e90f1db4702e7fb1ad9f6baae5df440..595db950a49eefbb1dddbfd83ef6555073e7d623 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
index ba293edd3df6a6a8c2aa49f6e60a6851b7542883..2494e439c30f0ea3c9504753f90e73bbbc2e17ff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
index eebc0e51a4506714773a272fb5443749ffbc1633..9887ac49d7e50a8b3acd142847835bc099cf2e0e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
index e8b8ecee4c596e4bc0aae130d87c7568c926eda4..d8c634a70aa09dbe8dbe555da389cadd6758c722 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
index 13065b36c2c5b01057ef851922cd299e8b7fbc10..1b1b035a495a045f9ff58144e1cc175f829a9904 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
index 04c19179b01f0dc3eb8dff628d48b019344cc460..6dae330d93a5e9c9ada7dd757c5b2237ae256e7e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
index 9d3d4a8a37e9f2de5d1b14d969c7074a55fe5d96..3dd269fcca7f96dd15fc232114a62ac4ae1183d2 100755
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
@@ -4,7 +4,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
-
 runApplication blockMesh
 
 runApplication topoSet
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index d16670a97af07bf65d1bee2155d625e69141c08d..bdb9fdd668b1e7737b7e3c3510da9dac9c90debb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,4 +27,5 @@ MRF1
     omega     constant 10.472;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 7b8f76bee720c828b8ee6f5592684dd18733025d..297a1adf24dec86fc1420581357bdd1763a1e67a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type basicTwoPhaseSystem;
+type            basicTwoPhaseSystem;
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/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/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index 2157f9b16be2ca268911ec5c869fe5e61bb08474..bdf1935a36c78b4b4b76e00b3966eee0612bac04 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index e1939c5964e94d80463f47cb03c8763575095b4a..47f50d3cc86205de3c9c182807be81caad4df94d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index e104e67f5df1d4a49b72166d3e5afe00e3e154f0..10cf9222a4ce3226e3547ff214a4b14d80cbcd28 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index 403e370591760a67ca21e33f8251ffcb572c6684..b7cf8da47c752a2f5b319eec203dabc50c4de827 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam
index 216ed8bc7c9f685e46f270e15ac166f7be5c1415..a49c30d964d079791c17a70eb885d42a50528ed6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water
index 4e2cfb3acc601044a190d9cb76531eea1072f219..24e07257fe1664bc65128478bb92e3ac5bbcd15a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam
index 76cb2cceafc7f33c709868f3f003b2cc2ce87b72..d98b91e7d24704e1df2e0d45c7fd46f59c4b01a4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.steam;
 }
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water
index 2cda9a6a48407b1f6c98d24bf4a45c52d32f1b0d..f2d6e078a9b2bd9744cf3eed06a92457283e2067 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water
index 05ea8d419d2bab8bb7e43febae2499c4f24048ba..802b3c786aef22db6b6a15a7ff4426718be5ef68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p
index 3d75fefffd272ba90a4950372a233d8bd6e67113..c8e9a8c120cc897b69ebdb3ed34ccc024bfc181a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh
index af8a28b597245406ca6cb9959d2d3675c6b1a273..2c8bb5c4198addcfcc5c549d18bb29b65a51c2ce 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam
index 2b0543c10263ae7939403ba5ecf05838a804657f..69a16efa1e62cf0d3dd96ea91b4570d68264ba41 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water
index 17b7dcc56f31562506a76159d679bdcb5647d371..0c9d979846a897070260fb9bba3b8b9d7a63c14b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
index f24eead15a49ead941144eb21a283f553f93f54a..f14237acfe6f839128b9fc431c4accedf584ae75 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
index 8262110a3474eed2794af988cb44e0676485c853..4a3c040d4be65148fb131ed47e4db33f393df400 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
@@ -10,17 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type thermalPhaseChangeTwoPhaseSystem;
+type            thermalPhaseChangeTwoPhaseSystem;
 
-phases (steam water);
-
-phaseChange on;
+phases          (steam water);
 
+phaseChange     on;
 
 steam
 {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
index fffee0d852eaf65f009c29583d3da37f468cce51..0f125539c467becc428f34cf9e953681491bf1ae 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.steam;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
index aa51c3453bcd8d7297a8cd4a478c20562ec37c08..8e2a63bbe3c3d47c8c72224d43185897db4cae3c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
index 7ef0c3156c9aadb87694c7fccd81f150f9a5b203..50f0a256d4b473a2fd27d642aa6886981919efde 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.steam;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
index 2a61f4e2623182695d6f8e75a057f3192e95a148..b35b311b2df085fce347928d41b7ab42ea7c5005 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
index 9f5f0cbfc7b55faf3a730894520f2f325aed3db6..c86b0cbe18130c0fabf0267fe8b4560438f6e126 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.1;
 
 maxDeltaT       1e-2;
 
-
 functions
 {
     timeStepping
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
index 54b2c746d464689c6ec5f9b34e7c8f3d62e3f6e5..43d62438eac4695bd1f9739ecf038e71a708c7ac 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
index a966d6cc0633f8954120db5174e2cb667de168ae..27772b7dd1cea34a7a9c2d0b231b8ed56dcff290 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
index 72a61dd0aa50b58065f024124c802c825bf38720..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/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 -9.81 0);
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
index 202c09c4213ae96937e82b66552a42c2334f5b0c..4753fe47e09f4b3a663a5e0882c03bbfbcb3f4dc 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34,4 +33,5 @@ water
     rho             990;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
index c8a742266c5afbdf71d7ed1bacff42aa8239d6ad..1250cdb661ef8f1ddab1c14fe66db461473ec2a7 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
@@ -85,4 +85,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
index a1e7acf25cf6e491f681c3d0d392ac7f4cd6faee..0b6f8c24343c7542a3128316b8e64dc32d04e701 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,4 +52,5 @@ maxAlphaCo      0.5;
 
 maxDeltaT       1;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
index 71387c56d58133de404fda3d4788895145be9528..38f09dcfa5e34073a6fcb0c3ab632415cea46cb1 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,4 +49,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
index 8b24d4d3a79e11c2e47acee0661d0be18a9275ca..578ca0bc0a5ba0d6f5cea12497f8a7ce22e2625f 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
index b1853057e4b9915f375224e64d576dd5bf27bcb6..c8460cf80f691d364ac14c0c32c59080052d561d 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
@@ -33,4 +33,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
index 6032ad1ac4d55a081ec837f8c690f91cf32fa96f..c080ee403c512cef2b5bc3ff3021aad74e0868de 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
index cacd6a90e510ad19ec669ac28cc7e5d42eb8ae77..37ea845c8625a026f0c4c619c047d5899a1ec5d0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
index e61ad817e2699a748fd7ab181917b3760b5d4ba4..929954cbe28983590801845e9166f5fb5fff4826 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
index 327fc03a8250e20534efb0956e9d5095345e555f..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -25,12 +25,14 @@ boundaryField
         type               fixedValue;
         value              $internalField;
     }
+
     outlet
     {
         type               pressureInletOutletVelocity;
         phi                phi.air;
         value              $internalField;
     }
+
     walls
     {
         type               fixedValue;
@@ -38,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
index 40673aace0ecdca1d41ffff1831d204de7634b31..deacc8487aff5580bc8f5a76e46c71d10f571513 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
index 66a25708a4cd63f6ae3b2e3963d79688225d0ae0..d19fdd9d9a217a172186a24d19759d6584529c1c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
index cb196f22d10a7913fbbb4cea9f13d52b50480bd5..6e47993706cdaea4d382df542ef22de64deea08f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
index 2eb1e2a0d4d3f3c246a5fb2ffa45cf9fced5a9b7..377487dd86941c1f0f7d780ca317fbfdf57fd609 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
index f509276173c64dd41d33952fc5e3bfdd046093bb..908647e470b238ce341812dc3d39a472bc57dd39 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
index afc6763cc71b1106c13512646d2adf369ad45cd4..c7661d353cdeaecfe9c5d066e1d7eff99292cd96 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
index 45b2fc985595fe462a328d9e6ca35979358b9cff..e6dd5f650887411d29dff9d6ac31133e4ae7c49f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
index e1d74901ae285edb9b80bfb190f0288ce59ccb3f..d4c2051fff1040f4b17d3ed560bfa5c5e8e2bbcb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
index 243f8fe5badec2638e2a85e7b4f6de9a0918589d..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
@@ -25,11 +25,13 @@ boundaryField
         type               calculated;
         value              $internalField;
     }
+
     outlet
     {
         type               calculated;
         value              $internalField;
     }
+
     walls
     {
         type               calculated;
@@ -37,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
index 2318093c178f14bd81c9f1e9c3ad94545e292393..f974014f4bac26d528a5d190dc0a38187905fbe8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
@@ -25,12 +25,14 @@ boundaryField
         type            fixedFluxPressure;
         value           $internalField;
     }
+
     outlet
     {
         type            prghPressure;
         p               $internalField;
         value           $internalField;
     }
+
     walls
     {
         type            fixedFluxPressure;
@@ -38,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
index 40ee2ee74f49cfbd5768d18da6a264e6c442fccd..7c946289d89ca7322ee3fce838e6e380995e7fd8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
index 301bdcb24f3cab4b1cf50aed850b1d8d051ee7a4..8d0cda0bfc844090019ee79adedef55ba22acfa7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LES;
+simulationType      LES;
 
 LES
 {
-    LESModel continuousGasKEqn; //Smagorinsky;
+    LESModel        continuousGasKEqn; //Smagorinsky;
 
     turbulence      on;
+
     printCoeffs     on;
 
     delta           cubeRootVol;
@@ -31,4 +31,5 @@ LES
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
index 4e6cf043f17e6e46230221da7763cfb7edae00d1..4c8e2d44713585c0203594fd01baa033da758963 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LES;
+simulationType      LES;
 
 LES
 {
-    LESModel NicenoKEqn; //SmagorinskyZhang;
+    LESModel        NicenoKEqn; //SmagorinskyZhang;
 
     turbulence      on;
+
     printCoeffs     on;
 
     delta           cubeRootVol;
@@ -31,4 +31,5 @@ LES
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 13ca5d4d332372bf003cb071cb13dce07c732588..d2b8014ffd4d2ecf588858e2a8fc50a0820e76df 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
index b033569ba06d8f80b918b7c465980070439b8d64..be017664b185e65084f42e75bc0c35a8c017fd9d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
index abaf322d71bf0a6968096ce9d3bdfea5786862fd..86da0e3d6fe752b990c15f6069a371a3abd8d76b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
index c6978c03c6c70bd0909bc9072b9bc3f93f1e100d..c080ee403c512cef2b5bc3ff3021aad74e0868de 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
index e80e066a6412d7c90ceb28e3d2999e578bcb07e9..37ea845c8625a026f0c4c619c047d5899a1ec5d0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
index e61ad817e2699a748fd7ab181917b3760b5d4ba4..929954cbe28983590801845e9166f5fb5fff4826 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
index 40673aace0ecdca1d41ffff1831d204de7634b31..deacc8487aff5580bc8f5a76e46c71d10f571513 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
index 66a25708a4cd63f6ae3b2e3963d79688225d0ae0..d19fdd9d9a217a172186a24d19759d6584529c1c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
index cb196f22d10a7913fbbb4cea9f13d52b50480bd5..6e47993706cdaea4d382df542ef22de64deea08f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
index 2eb1e2a0d4d3f3c246a5fb2ffa45cf9fced5a9b7..377487dd86941c1f0f7d780ca317fbfdf57fd609 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
index ed997e66f26cf3c3366dbf0a49430772cf8c2c35..ab54129f90ac9f5547bc26766985a9be7d77cd62 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
index f509276173c64dd41d33952fc5e3bfdd046093bb..908647e470b238ce341812dc3d39a472bc57dd39 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
index afc6763cc71b1106c13512646d2adf369ad45cd4..c7661d353cdeaecfe9c5d066e1d7eff99292cd96 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
index 36ca416eb65eff90c7ce863869c58cf3d1c21cfb..f9a90c083ee00b1515cc18fdad795b434eaeed14 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
index 45b2fc985595fe462a328d9e6ca35979358b9cff..e6dd5f650887411d29dff9d6ac31133e4ae7c49f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
index e1d74901ae285edb9b80bfb190f0288ce59ccb3f..d4c2051fff1040f4b17d3ed560bfa5c5e8e2bbcb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
index 7353100e19459219ab8e0a56ce1e23adb8f7071f..f974014f4bac26d528a5d190dc0a38187905fbe8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
index 40ee2ee74f49cfbd5768d18da6a264e6c442fccd..7c946289d89ca7322ee3fce838e6e380995e7fd8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
index df20e46d48b5e292be1dafd8cc8c4b69389af572..f578ff10b3ebb365e66e136a42315a584345498d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel mixtureKEpsilon; //continuousGasKEpsilon;
+    RASModel        mixtureKEpsilon; //continuousGasKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 
     // mixtureKEpsilonCoeffs
@@ -31,4 +31,5 @@ RAS
     // }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
index f283e236b012f5de1c66ecda58de1761cb2810dc..9737bd8cffb186b9b6f5b45d973a37b811e989b7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
@@ -10,19 +10,20 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel mixtureKEpsilon; //LaheyKEpsilon;
+    RASModel        mixtureKEpsilon; //LaheyKEpsilon;
 
     turbulence      on;
+
     printCoeffs     on;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index d45b5d7d17358cd955f28d13ec0e51c9203facd9..2211518ee324e893303a2a91de35d92b93ef9f3a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
index 4e1b0f9280e6ec757986abf895a77c273241d3c1..895a4a2979fd6571a25b592bf7f02603f37c44aa 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
index 97fb26c90fe785fe24ee8e93ecc33062e8224686..bdbd5373c6be94f682a78ffbccab4bbb09fe660a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
index e47454421d72a222a643bbe51b8e7a5837d5fc40..fcfe1978deb74c4b9e76f63bcaf44d075cdaf8db 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
index bf79c58b221559da3d569ba62aea1f484fee1fce..86dbc850dfcf5f8d56ecfd370df7e42756517bfd 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
index 180fa8b93271151e624056e1295a2016de1e2adc..43bbfdedd853de6e0f963bef89a960775746bf68 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
index 7256909c00579fc45744395fc39af0e87e371407..096fda3316b6b108be66fae435b2e55446d0e5a2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
index 95768a2ad943d810f26ced901181c14ff5ab2a9f..d0a28a0e08bbded3e38aa98524a3397c7e7013f9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
index 2d2a97f803b7bcf785779b3bd7013feaa83c1e52..df8ef22135ffbca3c540d961f80e951e9852974e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
index 5e112f5504c547603a7c2035d538d093dbf9c348..f4735f18be01b787ba1def3c149b52e642773a74 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
index 40673aace0ecdca1d41ffff1831d204de7634b31..deacc8487aff5580bc8f5a76e46c71d10f571513 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
index e577438533e15a557b439b43da93dfdb10a0ab9c..7517e447eb12ffcf98270b722cbbf78817280795 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
index 558732e5165734538972a6b227cbfbe000711886..d961694df64bc0afc99e35e60f26a8af13bea44a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
index 68b4991c4414878e9e4d3bf7163df279acf43086..c2132b8a95ad702d1f8d602d59db8b1278a72409 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
index b3f57d9ba2d610c3652ebbe46987b5e6608c54e5..6ffe68b928c3c0be4d8c32a0fdb6ba9707711990 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
index 3efa9ccb4ae993b88a52ee37d02427ed4fabcc90..cfecbc4e15169d952d57f85ef24b75f496317e74 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
index 3042c4dad7fbc22387633fb36d6c978dc493e1c7..6e4e249ddbeed1a25d37f329cb92367ab9c904eb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
index 7e2df5ed7bbf5d7a21fc1710f809a8f8e367db2c..a8f9f43d2d1eb70b06286d0fc73af5f55410654e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
index 9b9d70a747788ba0339b4923b8cf96ab1c714437..cbae9be888f966e72a44ed7d54b30b2e69bead7c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (particles air);
+phases          (particles air);
 
 particles
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
index 008c2cdb27e9a703a841dae3570d24dfd4f18add..4d509cfaa67849ccae5fc616be0ff28ba61f5e4a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
index 35f95b28d3e820282a0685e363304232db137878..66dfd3a5431463c8c0172a48d0923c987385afcc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
@@ -10,34 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kEpsilon;
+    RASModel        kEpsilon;
 
     turbulence      on;
-    printCoeffs     on;
-}
-
-LES
-{
-    LESModel Smagorinsky;
 
-    turbulence      on;
     printCoeffs     on;
-
-    delta cubeRootVol;
-
-    cubeRootVolCoeffs
-    {
-        deltaCoeff 1;
-    }
 }
 
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 21d51a46a62118b64068a9ccb55cf08d2df98b1f..86245e5a591a2bb4ff2af29a8aebc893420ed72c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel kineticTheory;
+    RASModel        kineticTheory;
 
     turbulence      on;
+
     printCoeffs     on;
 
     kineticTheoryCoeffs
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
index 3f4b950a99bee0bbfd824456d720a705b9d43ce5..fe125cf9f29d12c47ca4664a1d4ab57a4748579e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
@@ -63,4 +63,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index f59db6da43bec8542bae7106c0a30e8e14abdf1f..32b008d13fb8eec2f02aa9ad45eba70c4a0263cb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.9;
 
 maxDeltaT       1e-05;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
index c9a4f98ffec3c5e239a6ce65e4206fb62594a0f8..68c349e250792f0125673c60c381d93e77ab5b89 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,4 +64,5 @@ snGradSchemes
     bounded     uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
index 6338c143e20f56ace550d99594be329e31f63838..0e66125fd0d4ea11970cc4c0c4c8e57a808fc140 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
index f966cac17a7d4d21b03c13b703a521ec3f7ad604..a1702dc32420902a88db965db4bf57d7c5bc5d6f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
index c6978c03c6c70bd0909bc9072b9bc3f93f1e100d..c080ee403c512cef2b5bc3ff3021aad74e0868de 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
index e80e066a6412d7c90ceb28e3d2999e578bcb07e9..37ea845c8625a026f0c4c619c047d5899a1ec5d0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
index e61ad817e2699a748fd7ab181917b3760b5d4ba4..929954cbe28983590801845e9166f5fb5fff4826 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
index 7353100e19459219ab8e0a56ce1e23adb8f7071f..f974014f4bac26d528a5d190dc0a38187905fbe8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index 4351fb4fa209db7fcc61e2b1e9e77b527a075352..d1b36e3ec89306718a8695a41880526d0decb780 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/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/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index 494027bfaf198173f879bf77654befbb1719c2d8..c634104b1489737a95f2ae521699fc0468564ad3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index c76666aa5d49f7336b06210cd280eab429289007..cb86fa21480d82b88ec627985609c052cbae8472 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-
 functions
 {
     add1
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 18361e9eb893d646c3b4c1f55e67858bc9914e31..2fd57ff2406cadae6a12549c226c4bc69d94ff08 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index a12918f027d5407cb9421b4f504f556cf13922aa..de5c84d09dbc813a1de837efcc4ebc8348c55046 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
index c6978c03c6c70bd0909bc9072b9bc3f93f1e100d..c080ee403c512cef2b5bc3ff3021aad74e0868de 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
index e80e066a6412d7c90ceb28e3d2999e578bcb07e9..37ea845c8625a026f0c4c619c047d5899a1ec5d0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
index e61ad817e2699a748fd7ab181917b3760b5d4ba4..929954cbe28983590801845e9166f5fb5fff4826 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
index fc6afe0e3b76bd0147b940035ea47cd49096e70b..2b7d0bd201be020a5b77e8c4d87f566582fd2dd1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
index af7581240ad98897cead9d5c7c004d77d7145738..fe3f790990e2a5a5326ee8341dad20d559895b5c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
index 7f8e2c067a9c08a69ac3af039c8dc52d65642230..61b70148d0ead048a29d7ed16c90c3bdca3b5764 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
index 315057f525ca9e4c9989e99d2d71024f370da39f..6896e39d3d84df5ef20faa77998686815c238a9e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
index 1010a94b067e94f51460555501f9deeb2337ae03..b88d0d3e9fd5f5ba04dd36d9493936da67c10bc5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
index 7353100e19459219ab8e0a56ce1e23adb8f7071f..f974014f4bac26d528a5d190dc0a38187905fbe8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
@@ -40,4 +40,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
index bbdb0409003749da3985524dd0757d2b9a3d8562..5b35c1be5cbef82247492a8d827a06a8c84d5d45 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..43664e1622dadc530849cbd9b769dcf395660b16 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;
+simulationType laminar;
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 13ca5d4d332372bf003cb071cb13dce07c732588..ab175ed78986f4f87131963cd56345eb81d4386a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
index 7f65754aaa5112ee2d18fa50fa75ab07a9097573..023a2231e91974594a9979ccfd6b33d99e14a41e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
index 52dc6f0c6a01fd91bac0a6c3b20f87a9b5a92bdf..21d2c1558a23f12d07617a5183ed20f891c05e1c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
index 1bf14ee7d522ebb290a7af6b30cd79cb734f7c45..fcfe1978deb74c4b9e76f63bcaf44d075cdaf8db 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
index 8e0fc09a5cf42c92aee06c5f22a445bd745ff137..86dbc850dfcf5f8d56ecfd370df7e42756517bfd 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
index 180fa8b93271151e624056e1295a2016de1e2adc..43bbfdedd853de6e0f963bef89a960775746bf68 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
index 7256909c00579fc45744395fc39af0e87e371407..096fda3316b6b108be66fae435b2e55446d0e5a2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
index 95768a2ad943d810f26ced901181c14ff5ab2a9f..d0a28a0e08bbded3e38aa98524a3397c7e7013f9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
index 5e112f5504c547603a7c2035d538d093dbf9c348..f4735f18be01b787ba1def3c149b52e642773a74 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
index e577438533e15a557b439b43da93dfdb10a0ab9c..7517e447eb12ffcf98270b722cbbf78817280795 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
index 558732e5165734538972a6b227cbfbe000711886..d961694df64bc0afc99e35e60f26a8af13bea44a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
index 68b4991c4414878e9e4d3bf7163df279acf43086..c2132b8a95ad702d1f8d602d59db8b1278a72409 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
@@ -46,4 +46,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
index 1b10a505f2306ae417219c2888261458b373e096..6ffe68b928c3c0be4d8c32a0fdb6ba9707711990 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
index 30dda230590a3e0cef48c6b461971a4ce03232eb..cfecbc4e15169d952d57f85ef24b75f496317e74 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
index 26f16a7a0655a60115ce63ce6f48d4a620314528..6e4e249ddbeed1a25d37f329cb92367ab9c904eb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
index 895f07bd6b1e076aa9bad750ccdd5f8d2826a504..a8f9f43d2d1eb70b06286d0fc73af5f55410654e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
@@ -45,4 +45,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
index e5564f85d3914a0d1fad53525940d3ea4d65c39a..4707fc5d17a9cc92d70837a90bdac543044d5ec8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (particles air);
+phases          (particles air);
 
 particles
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
index 008c2cdb27e9a703a841dae3570d24dfd4f18add..4d509cfaa67849ccae5fc616be0ff28ba61f5e4a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/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/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
index a375e1d2616fbec43ec7e202ff68ae2b85509307..c482e250f51431aa90000d7f4247fb5b3466aeb2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@@ -10,18 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel phasePressure;
+    RASModel        phasePressure;
 
     turbulence      on;
+
     printCoeffs     on;
 
     kineticTheoryCoeffs
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 4239af11f71a5b422ada5d989158e10c2f04a65a..9d32f169760d970dca6d6bcac5a9baa778da764b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +50,6 @@ maxCo           0.9;
 
 maxDeltaT       1e-05;
 
-
 functions
 {
     fieldAverage1
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index db0d456678b8384cfec9b3dd0a7b1c264b70ab7b..e7d4b0b6d752e8586bc2c5fd5075741c2cdedd70 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,4 +58,5 @@ snGradSchemes
     bounded     uncorrected;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
index b3f0284add158ea68e0ea499961cac289cd2e5cc..922ef688767020a9fb4bc17b8c328f0c76e07b62 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,9 +20,7 @@ solvers
     {
         nAlphaCorr      1;
         nAlphaSubCycles 2;
-
         smoothLimiter   0.1;
-
         implicitPhasePressure yes;
         solver          smoothSolver;
         smoother        symGaussSeidel;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
index f966cac17a7d4d21b03c13b703a521ec3f7ad604..a1702dc32420902a88db965db4bf57d7c5bc5d6f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air
index b6d8f0682fa542ad0b94546079bda5af802c0f58..ab662c35521620ee1733419c3a294075c3f03ed2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water
index 0bdfea276468ff64f749106662b9dc26b5b50cc8..ebc718b99a1441b46aeb3a8d9790810533811e2e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air
index ccb142caab6d45b77ce6f1b993502ab86fe0a271..79397cbfb9b60b0b742f4ca666d49c7e36783fec 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.air;
 }
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water
index c79fe162496760cac920a380b9657aeaee090a59..f879a1499688318bdf39ce49f72d5ba5ab00657b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U.water;
 }
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
index 6daa3acf184e347645291140738a65a1df65429b..8b8651d9d6e88be425c4601df9733a53a64051e6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p
index d141024fc7a74531dcf378ea867769a4513f4e06..208351ec49a92361e5ccd8d659639061c6312f73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p
@@ -33,4 +33,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
index 669812196cc451df6def76d435cd0f69ea275d64..a193418e5b091823167b3f6295d753abfec9903f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
@@ -34,4 +34,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
index 2c152ab3781c2e10c6c21a9d3df788665527ae21..f535d94ef0d06ed8f9aad6c0de2b119b2cc52fe3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
index f1bc4074439b4ca6b9c386f02fee54472285a0a6..28b07d0b8775454e4fb6f1314f165492290a396a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
index 8eb8479a8489e62edf96db03bbcf9b0750634a6c..af27e88875d73496794a448ca946357312a1c5dc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/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/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
index f44b866e89df6a98bb0b7ec042019203ab2b0688..e5b9149678bd7e35f8c7f7ac1b5225c7ba222a20 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
@@ -55,4 +55,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
index b243e883869bc49d4c5d9d3e49a3303adb3f06eb..219e5aad70b7621d96770a45f47e2fb3286118ce 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
index c8d8292eccc86896b1e20aadb208e923a3af854b..7e06ead07ff145e5b6723ac83de3fe75597c1676 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
index a12918f027d5407cb9421b4f504f556cf13922aa..de5c84d09dbc813a1de837efcc4ebc8348c55046 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
index f3aba1fb4b6758f903c7cb6b48505367ac5be53b..ace0fe69f440ada7232e8a5843474f8916ab0d68 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
index 16cbf883dccba434704d0d43c70b0808467975fd..2eb10a18f00f244395b83f9d78176fb521a522d0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
index d614baf4e7aaed0383765f6a3c4216086e8a0c75..0b68ffd259c1672b814503307c5131c13a88fce7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
index 40b638f90e90f1db4702e7fb1ad9f6baae5df440..595db950a49eefbb1dddbfd83ef6555073e7d623 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
index ba293edd3df6a6a8c2aa49f6e60a6851b7542883..2494e439c30f0ea3c9504753f90e73bbbc2e17ff 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
index eebc0e51a4506714773a272fb5443749ffbc1633..9887ac49d7e50a8b3acd142847835bc099cf2e0e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
index e8b8ecee4c596e4bc0aae130d87c7568c926eda4..d8c634a70aa09dbe8dbe555da389cadd6758c722 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
index 13065b36c2c5b01057ef851922cd299e8b7fbc10..1b1b035a495a045f9ff58144e1cc175f829a9904 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
index 04c19179b01f0dc3eb8dff628d48b019344cc460..6dae330d93a5e9c9ada7dd757c5b2237ae256e7e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
index 47696a0072b230a5ee4b6007181699dd1d9728c7..3b515c89770e7710313d104822fbbbd5285d8217 100755
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
@@ -4,7 +4,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
-
 runApplication blockMesh
 
 runApplication topoSet
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index d16670a97af07bf65d1bee2155d625e69141c08d..bdb9fdd668b1e7737b7e3c3510da9dac9c90debb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,4 +27,5 @@ MRF1
     omega     constant 10.472;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
index 4b5a9eea4c56d899c5a02e93cb3133f01446d046..5934e5cfd7cb0125f3647e6ffffc5dc690d0f6d2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 0804552921f6765bf29fd83b25716e7d8c3b4bc0..39f00ee3dfd9ae548932e52b45cf70dcc1bc69f3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (air water);
+phases          (air water);
 
 air
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index e2562237dc958887a8181a7f1bc7152ba1345c08..5db8359e5fa18be71cb3ada133793ed70ce3652b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c882329e2a266586cb57ba26724b7cb4bb98e31b..c7707da005896d439bca8bda3db98a58771b5302 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index 505b4f52735648aca3221753cbaf8923c4e6ad25..68b704d33fbdb85eaf3c598d7637559a272b7245 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/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/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 77b41ae6d0ea47cdfb62cf91a8e84f8dd0663ee5..eec15770ca8a42323abf93be489eeaa6250817a5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index 1388e3a51178c677edb5a492b406411826f6257f..701e3331419a66a01099688340ff0ae47ce759f8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index e1939c5964e94d80463f47cb03c8763575095b4a..47f50d3cc86205de3c9c182807be81caad4df94d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index a2b7e84fdf25fb4a65388f631f0fd5a31cb6e90b..af5b30e925956962dd865d5562a1808b61320494 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index 403e370591760a67ca21e33f8251ffcb572c6684..ef51cdb1736e7be4004dc8b25c8e4a6acfaad771 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,4 +25,5 @@ actions
     }
 );
 
+
 // ************************************************************************* //