diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
index f2c9898422d7ac498c6ae02f8d02939020ad8875..ed502c40f6475c6cde74096b35cb37477a0909a7 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
@@ -57,7 +57,7 @@ functions
         type            surfaces;
         surfaceFormat   boundaryData;
         writeControl    timeStep;
-        writeInterval   10;
+        writeInterval   100;
         interpolationScheme cell;
         fields
         (
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..94f799b4624d65cdc005bcfd0a69460c5105b288
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+#------------------------------------------------------------------------------
+
+(cd steadyState && ./Allclean)
+
+(cd transient && ./Allclean)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
index a33cc4cb3803efe106d4695c762bdf63557d4822..5e577cba00e96873102f5e3822664fc7e243bed4 100755
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
@@ -1,6 +1,5 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
 (cd steadyState && ./Allrun)
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..fb1f3847301c377e02e12439ba58cbf303af3ef9
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
index 7d5ae7836871e799720b077e77e776100421141c..7617e7e91dd92aab660563bc67ff31eecaebfc74 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
@@ -31,11 +31,10 @@ vertices
 
 blocks
 (
-    hex (0 1 2 3 4 5 6 7) (200 160 80) simpleGrading (1 ((0.5 0.5 100)(0.5 0.5 0.01)) 1)
+    hex (0 1 2 3 4 5 6 7) (200 160 80)
+    simpleGrading (1 ((0.5 0.5 100)(0.5 0.5 0.01)) 1)
 );
 
-
-
 edges #codeStream
 {
     codeInclude
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
index 8fc20ec2de93ef2518997d64d73d7eb5dedca097..4b38d441a4bfbeb673006581c78a1e23e91c153f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
@@ -105,12 +105,17 @@ functions
     {
         type            sets;
         libs            (sampling);
-        writeControl    writeTime;
-        timeStart       1500.5; // approx 2x flow-throughs
-
         interpolationScheme cellPoint;
+        setFormat       raw;
+        executeControl  onEnd;
+        writeControl    onEnd;
 
-        setFormat raw;
+        fields
+        (
+            U
+            columnAverage:columnAverage(UMean)
+            columnAverage:columnAverage(UPrime2Mean)
+        );
 
         sets
         (
@@ -185,14 +190,6 @@ functions
                 end             (0.224 1 0.063);
             }
         );
-
-
-        fields
-        (
-            U
-            columnAverage:columnAverage(UMean)
-            columnAverage:columnAverage(UPrime2Mean)
-        );
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
index 3ee1dd39d079cba82e4bade0ca256c887fb25542..c0a54d302aa59414438ef8d0e87e68a66d78f3a8 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs (turbulenceModelSchemes);
+libs            (turbulenceModelSchemes);
 
 application     pimpleFoam;
 
@@ -54,6 +54,7 @@ functions
         libs            (fieldFunctionObjects);
         fields          (U p);
     }
+
     DESField
     {
         // Mandatory entries
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
index b79002dc8e2997740fe3018bd2867d366dde53d5..119306db68dd20c33ca8088dc04c5cfb7bdb42ec 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
@@ -16,7 +16,7 @@ FoamFile
 
 type            sets;
 libs            (sampling);
-writeControl    writeTime;
+writeControl    onEnd;
 interpolationScheme cellPoint;
 setFormat       raw;
 
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
index 26381a9396d5dc97ca0c791103e358d147e14d97..bd6fc7ab66e58eb2d6805a8d5532378adef73524 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
@@ -80,8 +80,8 @@ functions
         log             true;
         timeStart       100;
         timeEnd         1000;
-        executeControl  timeStep;
-        executeInterval 1;
+        executeControl  runTime;
+        executeInterval 10;
     }
 
     curlePoint
@@ -108,8 +108,8 @@ functions
         log             true;
         timeStart       100;
         timeEnd         1000;
-        executeControl  timeStep;
-        executeInterval 1;
+        executeControl  runTime;
+        executeInterval 10;
     }
 
     cuttingPlane
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
index bc4fce46745100fdcfe976b048084f833ed3acad..14a680f0e7c4d50f455b772c5f83558a09e01a3d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
@@ -18,7 +18,7 @@ ensightWrite
 
     overwrite   true;
 
-    writeControl writeTime;
+    writeControl onEnd;
 
     consecutive false;
 }
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
index 56476c469dc9de082d8ec18df5b160a76c4a767f..94f3ddf56258e679a68af17c7731e6e522465f15 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
@@ -11,7 +11,7 @@
 // Timing
 _visualization
 {
-    writeControl    writeTime;
+    writeControl    onEnd;
 
     // enabled         true;
 
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
index fa2ae2cdd69b6981c1adca45ac9ac891268e3db0..a3ed4352a49e96549766b48ecbe4cee85804361b 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,7 +68,6 @@ functions
             (0.1524 0.0253 0)
             (0.1778 0.0253 0)
         );
-
     }
 
     fieldAverage1
@@ -101,7 +99,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
 
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
index 06518a1ad5b914d057bf725db59b9218a60d6040..e404a0fb5f79784f9a8833a5a94fe4187c58bd50 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
@@ -99,7 +99,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
 
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample
index 485c9900329aef2bb8a74bbcadff4858c4e36d6a..5b1a16fa6688e3e1dea3d3e98db4eabbcac72a48 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample
@@ -1,7 +1,7 @@
 type            sets;
 libs            (sampling);
 
-writeControl    writeTime;
+writeControl    onEnd;
 
 interpolationScheme cellPoint;
 
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun
index 7be851a4cf82766f0d5978500b65889b490d94bd..4a8c98ea2f2f3b3712659e35d1bb29f806806134 100755
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun
@@ -11,7 +11,6 @@ cd "${0%/*}" || exit                                # Run from this directory
     runApplication snappyHexMesh -overwrite
     runApplication renumberMesh -overwrite
     runApplication createPatch -overwrite
-
 )
 
 # Make a 2D mesh by extruding a patch and solve to steady state.
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
index 82757258457a95f8d43b621b4a117c3b2e198bf1..2f8c4acac30c5109f6475d897526d23c6710a558 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
index 6a6c59d18d24e7387b887e08a91bcdd25bd9dff2..f363f85909170b15ba2e7ca9e3b1ddb78d02905e 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
index 6a6c59d18d24e7387b887e08a91bcdd25bd9dff2..f363f85909170b15ba2e7ca9e3b1ddb78d02905e 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
index 1da8e0814ea40a4154c58d5eed4d729aa7232ca3..94d8d33b8504f25caba69117e583d34e5394efcc 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
@@ -59,11 +59,17 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        writeInterval   1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields
+        (
+            U
+            alpha.water
+        );
 
         sets
         (
@@ -107,7 +113,6 @@ functions
                 end     ( 7.5 0.005 0.8 );
                 nPoints 1001;
             }
-
             line6
             {
                 type    uniform;
@@ -133,12 +138,6 @@ functions
                 nPoints 1001;
             }
         );
-
-        fixedLocations  false;
-        fields
-        (
-            U alpha.water
-        );
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
index a679cdd8880bd0aeeb0662b8b29ecdb98b1beab2..9e4fa497fc123973c37a9288c3e3beb2e190c543 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
@@ -59,11 +59,17 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        writeInterval   1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields
+        (
+            U alpha.water
+        );
+
         sets
         (
             line1
@@ -74,14 +80,6 @@ functions
                 end     ( 7.9253 19.8599 30.0 );
                 nPoints 1001;
             }
-
-        );
-
-        fixedLocations  false;
-
-        fields
-        (
-            U alpha.water
         );
     }
 }
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
index 8e70940bf43fc08b676081848d4b4edc3fa6e692..28f23bc0c8f3733c7b46e912968e6309b6988183 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
@@ -60,10 +60,20 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields
+        (
+            p
+            p_rgh
+            U
+            alpha.water
+        );
+
         sets
         (
             s1
@@ -147,13 +157,6 @@ functions
                 nPoints 101;
             }
         );
-
-        fixedLocations  false;
-
-        fields
-        (
-            p p_rgh U alpha.water
-        );
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
index 62de4ebb1ebdaa1a46edd6c0db9886acb0cf79e1..b49f2b2ec6063cd15801bd9142e183aa9b131a09 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     line
@@ -60,11 +59,17 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        writeInterval   1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields
+        (
+            U alpha.water
+        );
+
         sets
         (
             line1
@@ -107,7 +112,6 @@ functions
                 end     ( 7.5 0.01 1.5 );
                 nPoints 1001;
             }
-
             line6
             {
                 type    uniform;
@@ -117,12 +121,6 @@ functions
                 nPoints 1001;
             }
         );
-
-        fixedLocations  false;
-        fields
-        (
-            U alpha.water
-        );
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
index 9389a10a7b610fa00ea80775876270ab3b1f8c5f..6f60258c9907c5b72064a38be13d065ff2c8a402 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
@@ -59,7 +59,7 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
index 52c0e356a0901896dd159c82dbd64f9e08044f70..6e3a0a44e72ed13e1f2611fc33a2921c7bae67b6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
@@ -59,7 +59,7 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
index ddb56a5171b4c5cecf76104cbd2335276b9c8ce1..4133bbef9538ff17d1dc415e5008bfce54979e4e 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     line
@@ -60,11 +59,18 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        writeInterval   1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields
+        (
+            U
+            alpha.water
+        );
+
         sets
         (
             line1
@@ -107,7 +113,6 @@ functions
                 end     ( 7.5 0.02 0.75 );
                 nPoints 1001;
             }
-
             line6
             {
                 type    uniform;
@@ -133,12 +138,6 @@ functions
                 nPoints 1001;
             }
         );
-
-        fixedLocations  false;
-        fields
-        (
-            U alpha.water
-        );
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
index f25a7a25077a613ac1aca4c8169191c4a345a46b..59316cb5d6c26283515a526f81c363ef49565d97 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     line
@@ -60,11 +59,18 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        writeInterval   1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields
+        (
+            U
+            alpha.water
+        );
+
         sets
         (
             line1
@@ -107,7 +113,6 @@ functions
                 end     ( 7.5 0.02 0.55 );
                 nPoints 1001;
             }
-
             line6
             {
                 type    uniform;
@@ -133,12 +138,6 @@ functions
                 nPoints 1001;
             }
         );
-
-        fixedLocations  false;
-        fields
-        (
-            U alpha.water
-        );
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
index a99c2d74d0cad08c1ed831f20bbbdf55d16054f4..ec2badabfb189e067aacc7d05bc7c58abbfd7f6a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
@@ -59,11 +59,17 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        writeInterval   1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields
+        (
+            U
+            alpha.water
+        );
 
         sets
         (
@@ -107,7 +113,6 @@ functions
                 end     ( 5 0.005 0.8 );
                 nPoints 1001;
             }
-
             line6
             {
                 type    uniform;
@@ -133,13 +138,6 @@ functions
                 nPoints 1001;
             }
         );
-
-        fixedLocations  false;
-
-        fields
-        (
-            U alpha.water
-        );
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
index 2a978090c3da535b84e7e0579d3628fe32a0b4a3..81bb0ab9a655e58a459e696a2b3000164d429483 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     line
@@ -60,11 +59,18 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        writeInterval   1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields
+        (
+            U
+            alpha.water
+        );
+
         sets
         (
             line1
@@ -107,7 +113,6 @@ functions
                 end     ( 7.5 0.005 1.0 );
                 nPoints 1001;
             }
-
             line6
             {
                 type    uniform;
@@ -149,12 +154,6 @@ functions
                 nPoints 1001;
             }
         );
-
-        fixedLocations  false;
-        fields
-        (
-            U alpha.water
-        );
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
index e5297bac7454a175a6c82661c814462c3a6b2b04..0dfcaaa7611b60916c7c3217fcbc02f7cdda919c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
@@ -59,10 +59,13 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields          (alpha.water);
 
         sets
         (
@@ -129,10 +132,6 @@ functions
                 nPoints         1001;
             }
         );
-
-        fixedLocations  false;
-
-        fields          (alpha.water);
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
index 6f6f1820778d0ae65a08e76b034f3e48a3fa6568..7d7ae721c439c3247041f9b15bb3101713c1a90f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     line
@@ -60,7 +59,7 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
index 8547c84721bfb5be9adfc4b2481e27325426e29a..5c4178951618e578d851353d82f252afe2ef8186 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo      0.65;
 
 maxDeltaT       0.05;
 
-
 functions
 {
     line
@@ -60,10 +59,13 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
+        fixedLocations  false;
+
+        fields          (alpha.water);
 
         sets
         (
@@ -130,10 +132,6 @@ functions
                 nPoints         1001;
             }
         );
-
-        fixedLocations  false;
-
-        fields          (alpha.water);
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
index e5297bac7454a175a6c82661c814462c3a6b2b04..7ba2686db03c88adb1ada512f45bd1b59e326b90 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
@@ -59,7 +59,7 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
index 686e0ab678c816c3f9ce949ada39797970032e5a..b5bfe00939ea4eb5863a25bd32bbee1183607c77 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
@@ -57,10 +57,9 @@ functions
     lineMOVING
     {
         type            sets;
-        libs (sampling);
+        libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        outputInterval  1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
@@ -68,21 +67,20 @@ functions
         (
             line1
             {
-                type uniform;
-                axis distance;
+                type    uniform;
+                axis    distance;
                 start   ( 1.33 0.004 0.0 );
                 end     ( 1.33 0.004 0.6 );
                 nPoints 101;
             }
             line2
             {
-                type uniform;
-                axis distance;
+                type    uniform;
+                axis    distance;
                 start   ( 3.33 0.004 0.0 );
                 end     ( 3.33 0.004 0.6 );
                 nPoints 101;
             }
-
         );
 
         fixedLocations  false;
@@ -95,10 +93,9 @@ functions
     lineFIXED
     {
         type            sets;
-        libs (sampling);
+        libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        outputInterval  1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
@@ -106,16 +103,16 @@ functions
         (
             line3
             {
-                type uniform;
-                axis distance;
+                type    uniform;
+                axis    distance;
                 start   ( 5.33 0.004 0.0 );
                 end     ( 5.33 0.004 0.6 );
                 nPoints 101;
             }
             line4
             {
-                type uniform;
-                axis distance;
+                type    uniform;
+                axis    distance;
                 start   ( 5.66 0.004 0.0 );
                 end     ( 5.66 0.004 0.6 );
                 nPoints 101;
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
index f4400b92b9fb41fa94cea5d85edc20204c46e9d5..8aae30e0ed6c630e073bdf2ccd2d29c385123731 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
@@ -37,4 +37,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
index be5471701ce99b5127c455b5d5f1cbd9b6b1fa8c..aca52b40d6cdf639706b6754265a0584803fc6f8 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
index 2e5c06a4581b7fe5471c14d641a1616f7496e81b..8eaf0a1284acf878756303f385d920744147ee1d 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
index 5c1363c36f186c1e372991fbe46b5bbd68078656..a79cc4085dfec1089665403ee5548ac371e4fade 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties
index a0163959c37cddbf761ea244e775f6f89cf90a1e..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/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/interIsoFoam/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
index 3e8d8ea54577501f505dc013cd6c93cbc6b881ea..67a1ac561e8fc3e15d8eeaf7c3cf1dc80870cd09 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/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
 {
     probes
@@ -77,7 +75,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
         surfaceFormat   raw;
         fields
         (
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
index df13f4e670707bcb89e06456400826778d225b07..d569ffffc01e6d0b8527cd6799c00b49fa9b194c 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (1 3 2);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes
index b19cf748eaef9aca80abac02140f407528651e92..057df3add783434d427e0be1ea1b8cc5678ea9a8 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/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/interIsoFoam/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
index 13dfd7118ea9e79356c807b41e863df199a42525..413adf60cae15eb3c07cb3f51970dcfacc275c01 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +67,6 @@ solvers
             smoother        DICGaussSeidel;
             nPreSweeps      2;
         }
-
         tolerance       2e-09;
         relTol          0;
         maxIter         20;
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
index 39cff1bf12c499544a880157eba4ccbac1fc5de2..a09f27caa04daa40edb3bb8f1637353a31aa5c50 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
index 7bc6acf72cc6226111031d4fa632a8f11cf5dc73..424ae008701e1333a87b3f288d947f8050e1d4b9 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
index 62552cce513fde7d39c2c430b0994ae3e1b6e20b..841420a68788dd753513a876a3de54ca02e27178 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/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/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/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/interIsoFoam/waveExampleStreamFunction/constant/waveProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
index 88b372c23dc7b21635f4e5d6a18da943b4d42ebc..86e96553c43ef84a811f5c6e01b059021f48ef0b 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      waveProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ inlet
 
     waveAngle       0.0;
 
-    rampTime        3.017;//6.034;
+    rampTime        3.017;
 
     activeAbsorption yes;
 
@@ -64,7 +63,6 @@ inlet
         2.7580059e-004
         2.2810557e-004
     );
-
 }
 
 outlet
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
index 5177f8d76badbf130d09c4b92ae1b923ceecc73a..0eb3b2b67ac621def833fb6f3098f3892178a15f 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict
index ef0ef886092e4d2f73051f086f1fa3fb6f9cf0f4..6c88a52a1586292231f82fd615fca5221b491d44 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/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       0.5;
 
-
 functions
 {
     line
@@ -61,8 +59,7 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
-        writeInterval   1;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
         setFormat       raw;
@@ -108,7 +105,6 @@ functions
                 end     ( 7.5 0.005 1.0 );
                 nPoints 1001;
             }
-
             line6
             {
                 type    uniform;
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
index 5b9e2ac730d30da37a0adc119e64e9c47ea475cc..cb9dc6c025cee39f2219fe482975b4b38a47ae06 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
index ea39fef94f6708c22108445fe9cc592c1c016b6c..0df413c31bb10ab7f065e3e8095ec429343aec40 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict
index ad53914da368090cb57757517021f35900caf667..7c6ac00b785555fa57ce72d9ebe53a4ea297affe 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/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/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 2211518ee324e893303a2a91de35d92b93ef9f3a..b03b4ca9b969ec4f7db17309b6e17ccf9afc4c74 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -116,10 +116,8 @@ functions
         log             true;
         timeStart       0;
         timeEnd         1000;
-        executeControl  timeStep;
-        executeInterval 1;
-        writeControl    writeTime;
-        writeInterval   -1;
+        executeControl  onEnd;
+        writeControl    onEnd;
     }
 }
 
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
index 6651c2562e3a958bfc4a30923967da8d6e2a6e2c..5694a979025ccb3f0784a6e28ebbb0e04d042249 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
@@ -55,11 +55,10 @@ functions
 
     minMax
     {
-        type    fieldMinMax;
-        libs    (fieldFunctionObjects);
-
-        writeControl    writeTime;
+        type            fieldMinMax;
+        libs            (fieldFunctionObjects);
         fields          (U);
+        writeControl    writeTime;
     }
 }
 
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso
index 8a5e63946b67c42fbecd735d07cd5d57828cf9b8..5ff86f23b1d0d53d5bb3bb18d7bc7a3d8bc706a0 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso
@@ -2,11 +2,10 @@
 
 sampleIso
 {
-    type    surfaces;
-    libs    (sampling);
-
-    writeControl    writeTime;
+    type            surfaces;
+    libs            (sampling);
     surfaceFormat   vtk;
+    writeControl    writeTime;
     fields          (U k epsilon nut);
 
     surfaces
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines
index ac6817a667335cf37488d4f11f9143bc8228652c..76b64051c99484fea7777d3b5869cc9d7fa9eedd 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines
@@ -10,7 +10,7 @@ _sampler
     libs                    (sampling);
     setFormat               raw;
     interpolationScheme     cell;
-    writeControl            writeTime;
+    writeControl            onEnd;
     enabled                 false;
 
     sets
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes
index d2b8986df9e2d0e5eddf9b523436de50fa2166ad..a1756ba5abd40ff33b7c1843a4ebae754bee0ef7 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes
@@ -2,11 +2,10 @@
 
 samplePlanes
 {
-    type    surfaces;
-    libs    (sampling);
-
-    writeControl    writeTime;
+    type            surfaces;
+    libs            (sampling);
     surfaceFormat   vtk;
+    writeControl    writeTime;
     fields          (U k epsilon nut);
 
     surfaces