STYLE: use dict entry for function objects in controlDict

src/postProcessing/functionObjects/field/fieldValues/controlDict

@@ -46,7 +46,7 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     faceObj1
     {
         type            faceSource;
@@ -60,6 +60,7 @@ functions
 //        source          faceZone;
 //        sourceName      f0;
         operation       areaAverage;
+
         fields
         (
             p
@@ -79,6 +80,7 @@ functions
         source          faceZone;
         sourceName      f0;
         operation       sum;
+
         fields
         (
             phi
@@ -96,13 +98,13 @@ functions
         source          cellZone;
         sourceName      c0;
         operation       volAverage;
+
         fields
         (
             p
             U
         );
     }
-);
+}
-
 
 // ************************************************************************* //

src/postProcessing/functionObjects/field/readFields/postProcessingDict

@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 functions
-(
+{
     readFields1
     {
         type            readFields;
@@ -24,11 +24,13 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
         fields
         (
             interpolateU
         );
     }
+
     faceObj2
     {
         type            faceSource;
@@ -41,12 +43,12 @@ functions
         source          faceZone;
         sourceName      f0;
         operation       areaAverage;
+
         fields
         (
             interpolateU
         );
     }
-);
+}
-
 
 // ************************************************************************* //

src/postProcessing/functionObjects/residualControl/controlDict

@@ -45,9 +45,8 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-
 functions
-(
+{
     convergenceChecks
     {
         type            residualControl;
@@ -61,7 +60,6 @@ functions
             ( U         1e-3 )
         );
     }
-);
+}
-
 
 // ************************************************************************* //

src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict

@@ -54,6 +54,7 @@ functions
         outputControl   timeStep;
         outputInterval  1;
         fileToUpdate    "$FOAM_CASE/system/fvSolution";
+
         timeVsFile
         (
             ( -1   "$FOAM_CASE/system/fvSolution.0"  )

tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict

@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -76,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict

@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -76,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict

@@ -49,7 +49,6 @@ adjustTimeStep  no;
 
 maxCo           0.5;
 
-
 functions
 {
     fieldAverage1
@@ -58,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -77,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict

@@ -53,10 +53,12 @@ functions
         functionObjectLibs ( "libforces.so" );
         outputControl   timeStep;
         outputInterval  1;
+
         patches
         (
             WALL10
         );
+
         pName       p;
         UName       U;
         log         true;
@@ -71,5 +73,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict

@@ -48,12 +48,12 @@ runTimeModifiable yes;
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
         type            dsmcFields;
-        enabled   on;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
+        enabled         true;
         outputControl   outputTime;
     }
     fieldAverage1
@@ -62,6 +62,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
         resetOnOutput   off;
+
         fields
         (
             rhoN
@@ -120,7 +121,6 @@ functions
             }
         );
     }
-);
+}
-
 
 // ************************************************************************* //

tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict

@@ -48,12 +48,12 @@ runTimeModifiable yes;
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
         type            dsmcFields;
-        enabled   on;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
+        enabled         true;
         outputControl   outputTime;
     }
     fieldAverage1
@@ -62,6 +62,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
         resetOnOutput   off;
+
         fields
         (
             rhoN
@@ -120,7 +121,6 @@ functions
             }
         );
     }
-);
+}
-
 
 // ************************************************************************* //

tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict

@@ -48,12 +48,12 @@ runTimeModifiable yes;
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
         type            dsmcFields;
-        enabled   on;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
+        enabled         true;
         outputControl   outputTime;
     }
     fieldAverage1
@@ -62,6 +62,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
         resetOnOutput   off;
+
         fields
         (
             rhoN
@@ -120,7 +121,6 @@ functions
             }
         );
     }
-);
+}
-
 
 // ************************************************************************* //

tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict

@@ -49,12 +49,12 @@ runTimeModifiable yes;
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
         type            dsmcFields;
-        enabled   on;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
+        enabled         true;
         outputControl   outputTime;
     }
 
@@ -64,6 +64,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
         resetOnOutput   off;
+
         fields
         (
             rhoN
@@ -126,7 +127,7 @@ functions
     forces1
     {
         type            forces;
-        enabled     on;
+        enabled         true;
         functionObjectLibs ( "libforces.so" );
         outputControl   outputTime;
         patches         ( obstacle );
@@ -135,7 +136,6 @@ functions
         CofR            ( 0 0 0 );
         log             on;
     }
-);
+}
-
 
 // ************************************************************************* //

tutorials/incompressible/channelFoam/channel395/system/controlDict

@@ -53,6 +53,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U

tutorials/incompressible/pimpleFoam/t-junction/system/controlDict

@@ -58,6 +58,17 @@ functions
         functionObjectLibs ( "libsampling.so" );
         // Name of the directory for probe data
         name            probes;
+
+        // Write at same frequency as fields
+        outputControl   outputTime;
+        outputInterval  1;
+
+        // Fields to be probed
+        fields
+        (
+            p U
+        );
+
         probeLocations
         (
             ( 1e-06 0 0.01 )        // at inlet
@@ -65,15 +76,7 @@ functions
             ( 0.21 0.20999 0.01 )   // at outlet2
             ( 0.21 0 0.01 )         // at central block
         );
-
-        // Fields to be probed
-        fields ( p U );
-
-        // Write at same frequency as fields
-        outputControl   outputTime;
-        outputInterval  1;
     }
 }
 
-
 // ************************************************************************* //

tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict

@@ -54,6 +54,12 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -65,10 +71,6 @@ functions
             ( 0.1778 0.0253 0 )
         );
 
-        fields
-        (
-            p
-        );
     }
 
     fieldAverage1
@@ -77,6 +79,7 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -96,5 +99,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict

@@ -54,6 +54,12 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -64,10 +70,6 @@ functions
             ( 0.1524 0.0253 0 )
             ( 0.1778 0.0253 0 )
         );
-        fields
-        (
-            p
-        );
     }
 
     fieldAverage1
@@ -76,6 +78,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U

tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict

@@ -46,7 +46,7 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     streamLines
     {
         type            streamLine;
@@ -106,6 +106,6 @@ functions
 //            surface     twoTri.stl;
 //        }
     }
-);
+}
 
 // ************************************************************************* //

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict

@@ -63,6 +63,7 @@ functions
         sourceName      outlet;
         operation       weightedAverage;
         weightField     phi;
+
         fields
         (
             H2O
@@ -71,5 +72,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict

@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -83,5 +84,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict

@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -83,5 +84,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict

@@ -59,15 +59,17 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 
     wallPressure
@@ -77,6 +79,7 @@ functions
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
+
         fields
         (
             p
@@ -94,5 +97,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict

@@ -59,24 +59,27 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 
     wallPressure
     {
         type            surfaces;
-        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
+        functionObjectLibs ("libsampling.so");
+
         fields
         (
             p
@@ -94,5 +97,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict

@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict

@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict

@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict

@@ -58,6 +58,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
@@ -91,5 +92,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict

@@ -58,6 +58,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
@@ -91,5 +92,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //

tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict

@@ -58,6 +58,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
@@ -91,5 +92,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //