TUT: reduce the number of postProcessing files

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
         (

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)
+
+#------------------------------------------------------------------------------

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)

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
+
+#------------------------------------------------------------------------------

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

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)
-        );
     }
 }
 

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

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;
 

tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict

@@ -80,8 +80,8 @@ functions
         log             true;
         timeStart       100;
         timeEnd         1000;
-        executeControl  timeStep;
+        executeControl  runTime;
-        executeInterval 1;
+        executeInterval 10;
     }
 
     curlePoint
@@ -108,8 +108,8 @@ functions
         log             true;
         timeStart       100;
         timeEnd         1000;
-        executeControl  timeStep;
+        executeControl  runTime;
-        executeInterval 1;
+        executeInterval 10;
     }
 
     cuttingPlane

tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite

@@ -18,7 +18,7 @@ ensightWrite
 
     overwrite   true;
 
-    writeControl writeTime;
+    writeControl onEnd;
 
     consecutive false;
 }

tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization

@@ -11,7 +11,7 @@
 // Timing
 _visualization
 {
-    writeControl    writeTime;
+    writeControl    onEnd;
 
     // enabled         true;
 

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;
 

tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict

@@ -99,7 +99,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
 
         interpolationScheme cellPoint;
 

tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample

@@ -1,7 +1,7 @@
 type            sets;
 libs            (sampling);
 
-writeControl    writeTime;
+writeControl    onEnd;
 
 interpolationScheme cellPoint;
 

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.

tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict

@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
         surfaceFormat   raw;
         fields
         (

tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict

@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
         surfaceFormat   raw;
         fields
         (

tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict

@@ -75,7 +75,7 @@ functions
     {
         type            surfaces;
         libs            (sampling);
-        writeControl    writeTime;
+        writeControl    onEnd;
         surfaceFormat   raw;
         fields
         (

tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict

@@ -59,11 +59,17 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
-        writeInterval   1;
 
         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
-        );
     }
 }
 

tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict

@@ -59,11 +59,17 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
-        writeInterval   1;
 
         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
         );
     }
 }

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
-        );
     }
 }
 

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;
+        writeControl    onEnd;
-        writeInterval   1;
 
         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
-        );
     }
 }
 

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;

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;

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;
+        writeControl    onEnd;
-        writeInterval   1;
 
         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
-        );
     }
 }
 

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;
+        writeControl    onEnd;
-        writeInterval   1;
 
         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
-        );
     }
 }
 

tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict

@@ -59,11 +59,17 @@ functions
         type            sets;
         libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
-        writeInterval   1;
 
         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
-        );
     }
 }
 

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;
+        writeControl    onEnd;
-        writeInterval   1;
 
         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
-        );
     }
 }
 

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);
     }
 }
 

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;

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);
     }
 }
 

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;

tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict

@@ -57,10 +57,9 @@ functions
     lineMOVING
     {
         type            sets;
-        libs (sampling);
+        libs            (sampling);
         enabled         true;
-        writeControl    writeTime;
+        writeControl    onEnd;
-        outputInterval  1;
 
         interpolationScheme cellPoint;
         setFormat       raw;
@@ -68,21 +67,20 @@ functions
         (
             line1
             {
-                type uniform;
+                type    uniform;
-                axis distance;
+                axis    distance;
                 start   ( 1.33 0.004 0.0 );
                 end     ( 1.33 0.004 0.6 );
                 nPoints 101;
             }
             line2
             {
-                type uniform;
+                type    uniform;
-                axis distance;
+                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;
+        writeControl    onEnd;
-        outputInterval  1;
 
         interpolationScheme cellPoint;
         setFormat       raw;
@@ -106,16 +103,16 @@ functions
         (
             line3
             {
-                type uniform;
+                type    uniform;
-                axis distance;
+                axis    distance;
                 start   ( 5.33 0.004 0.0 );
                 end     ( 5.33 0.004 0.6 );
                 nPoints 101;
             }
             line4
             {
-                type uniform;
+                type    uniform;
-                axis distance;
+                axis    distance;
                 start   ( 5.66 0.004 0.0 );
                 end     ( 5.66 0.004 0.6 );
                 nPoints 101;

tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U

@@ -37,4 +37,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water

@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh

@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      dynamicMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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;
 
+
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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
         (

tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict

@@ -23,4 +23,5 @@ coeffs
     n           (1 3 2);
 }
 
+
 // ************************************************************************* //

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;
 }
 
+
 // ************************************************************************* //

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;

tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U

@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water

@@ -49,4 +49,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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
 {

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties

@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

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

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict

@@ -86,4 +86,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //

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;
+        writeControl    onEnd;
-        writeInterval   1;
 
         interpolationScheme cellPoint;
         setFormat       raw;
@@ -108,7 +105,6 @@ functions
                 end     ( 7.5 0.005 1.0 );
                 nPoints 1001;
             }
-
             line6
             {
                 type    uniform;

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict

@@ -23,4 +23,5 @@ coeffs
     n           (2 1 1);
 }
 
+
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict

@@ -116,10 +116,8 @@ functions
         log             true;
         timeStart       0;
         timeEnd         1000;
-        executeControl  timeStep;
+        executeControl  onEnd;
-        executeInterval 1;
+        writeControl    onEnd;
-        writeControl    writeTime;
-        writeInterval   -1;
     }
 }
 

tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict

@@ -55,11 +55,10 @@ functions
 
     minMax
     {
-        type    fieldMinMax;
+        type            fieldMinMax;
-        libs    (fieldFunctionObjects);
+        libs            (fieldFunctionObjects);
-
-        writeControl    writeTime;
         fields          (U);
+        writeControl    writeTime;
     }
 }
 

tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso

@@ -2,11 +2,10 @@
 
 sampleIso
 {
-    type    surfaces;
+    type            surfaces;
-    libs    (sampling);
+    libs            (sampling);
-
-    writeControl    writeTime;
     surfaceFormat   vtk;
+    writeControl    writeTime;
     fields          (U k epsilon nut);
 
     surfaces

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

tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes

@@ -2,11 +2,10 @@
 
 samplePlanes
 {
-    type    surfaces;
+    type            surfaces;
-    libs    (sampling);
+    libs            (sampling);
-
-    writeControl    writeTime;
     surfaceFormat   vtk;
+    writeControl    writeTime;
     fields          (U k epsilon nut);
 
     surfaces