From 10141f907b05588c7098b6b1513e1599f8d68bdc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 9 Apr 2010 12:23:25 +0200
Subject: [PATCH] STYLE: use dict entry for function objects in controlDict
---
.../field/fieldAverage/controlDict | 6 +-
.../field/fieldValues/controlDict | 8 +-
.../field/readFields/postProcessingDict | 8 +-
.../residualControl/controlDict | 16 ++--
.../timeActivatedFileUpdate/controlDict | 17 ++--
.../XiFoam/les/pitzDaily/system/controlDict | 2 +-
.../XiFoam/les/pitzDaily3D/system/controlDict | 2 +-
.../les/pitzDaily/system/controlDict | 3 +-
.../ras/nacaAirfoil/system/controlDict | 9 +-
.../freeSpacePeriodic/system/controlDict | 72 ++++++++--------
.../freeSpaceStream/system/controlDict | 72 ++++++++--------
.../supersonicCorner/system/controlDict | 72 ++++++++--------
.../dsmcFoam/wedge15Ma5/system/controlDict | 86 +++++++++----------
.../channelFoam/channel395/system/controlDict | 1 +
.../pimpleFoam/t-junction/system/controlDict | 23 ++---
.../pisoFoam/les/pitzDaily/system/controlDict | 12 +--
.../pitzDailyDirectMapped/system/controlDict | 11 ++-
.../simpleFoam/pitzDaily/system/controlDict | 16 ++--
.../verticalChannel/system/controlDict | 2 +-
.../les/throttle/system/controlDict | 2 +-
.../les/throttle3D/system/controlDict | 2 +-
.../ras/sloshingTank2D/system/controlDict | 12 +--
.../ras/sloshingTank2D3DoF/system/controlDict | 14 +--
.../ras/sloshingTank3D/system/controlDict | 11 +--
.../ras/sloshingTank3D3DoF/system/controlDict | 11 +--
.../ras/sloshingTank3D6DoF/system/controlDict | 11 +--
.../twoPhaseEulerFoam/bed/system/controlDict | 26 +++---
.../twoPhaseEulerFoam/bed2/system/controlDict | 26 +++---
.../bubbleColumn/system/controlDict | 26 +++---
29 files changed, 299 insertions(+), 280 deletions(-)
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index 3e186c89e28..072446c13e5 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -49,16 +49,16 @@ functions
fieldAverage1
{
// Type of functionObject
- type fieldAverage;
+ type fieldAverage;
// Where to load it from (if not already in solver)
functionObjectLibs ("libfieldAverage.so");
// Function object enabled flag
- enabled true;
+ enabled true;
// When to output the average fields
- outputControl outputTime;
+ outputControl outputTime;
// Fields to be averaged - runTime modifiable
fields
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index 7d9ab1f6565..6bbea738955 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/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
);
}
-);
-
+}
// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/readFields/postProcessingDict b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
index aa304a259f9..fbe59b234c8 100644
--- a/src/postProcessing/functionObjects/field/readFields/postProcessingDict
+++ b/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
);
}
-);
-
+}
// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/residualControl/controlDict b/src/postProcessing/functionObjects/residualControl/controlDict
index 0af8ff7c9a3..bc60d51a349 100644
--- a/src/postProcessing/functionObjects/residualControl/controlDict
+++ b/src/postProcessing/functionObjects/residualControl/controlDict
@@ -45,23 +45,21 @@ timePrecision 6;
runTimeModifiable yes;
-
functions
-(
+{
convergenceChecks
{
- type residualControl;
+ type residualControl;
functionObjectLibs ( "libresidualControl.so" );
- outputControl timeStep;
- outputInterval 1;
+ outputControl timeStep;
+ outputInterval 1;
maxResiduals
(
- (p 5e-4)
- (U 1e-3)
+ ( p 5e-4 )
+ ( U 1e-3 )
);
}
-);
-
+}
// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
index 635cefc4e8f..c4bc0c06b4a 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
@@ -49,17 +49,18 @@ functions
{
fileUpdate1
{
- type timeActivatedFileUpdate;
+ type timeActivatedFileUpdate;
functionObjectLibs ("libutilityFunctionObjects.so");
- outputControl timeStep;
- outputInterval 1;
- fileToUpdate "$FOAM_CASE/system/fvSolution";
+ outputControl timeStep;
+ outputInterval 1;
+ fileToUpdate "$FOAM_CASE/system/fvSolution";
+
timeVsFile
(
- (-1 "$FOAM_CASE/system/fvSolution.0")
- (0.10 "$FOAM_CASE/system/fvSolution.10")
- (0.20 "$FOAM_CASE/system/fvSolution.20")
- (0.35 "$FOAM_CASE/system/fvSolution.35")
+ ( -1 "$FOAM_CASE/system/fvSolution.0" )
+ ( 0.10 "$FOAM_CASE/system/fvSolution.10" )
+ ( 0.20 "$FOAM_CASE/system/fvSolution.20" )
+ ( 0.35 "$FOAM_CASE/system/fvSolution.35" )
);
}
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index 79e443d105e..50ad0c8fb2c 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ b/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
}
}
-
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index 6ab5661f2a5..8f38405c937 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ b/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
}
}
-
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index 113d97d8b8d..0a1db60830b 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/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
}
}
-
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index d53cf7983e6..cbdd0fa528a 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -49,14 +49,16 @@ functions
{
forces
{
- type forceCoeffs;
+ type forceCoeffs;
functionObjectLibs ( "libforces.so" );
- outputControl timeStep;
- outputInterval 1;
+ outputControl timeStep;
+ outputInterval 1;
+
patches
(
WALL10
);
+
pName p;
UName U;
log true;
@@ -71,5 +73,4 @@ functions
}
}
-
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index cf92f926ccd..f6c06606b01 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -48,79 +48,79 @@ runTimeModifiable yes;
adjustTimeStep no;
functions
-(
+{
dsmcFields1
{
- type dsmcFields;
- enabled on;
+ type dsmcFields;
functionObjectLibs ( "libutilityFunctionObjects.so" );
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
}
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- outputControl outputTime;
- resetOnOutput off;
+ outputControl outputTime;
+ resetOnOutput off;
+
fields
(
rhoN
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
rhoM
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
dsmcRhoN
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
momentum
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
linearKE
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
internalE
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
iDof
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
q
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
fD
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
-);
-
+}
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 83c46d5907e..bb1f85d9687 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -48,79 +48,79 @@ runTimeModifiable yes;
adjustTimeStep no;
functions
-(
+{
dsmcFields1
{
- type dsmcFields;
- enabled on;
+ type dsmcFields;
functionObjectLibs ( "libutilityFunctionObjects.so" );
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
}
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- outputControl outputTime;
- resetOnOutput off;
+ outputControl outputTime;
+ resetOnOutput off;
+
fields
(
rhoN
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
rhoM
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
dsmcRhoN
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
momentum
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
linearKE
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
internalE
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
iDof
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
q
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
fD
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
-);
-
+}
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 2e26dcc5d60..eb3d186313b 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -48,79 +48,79 @@ runTimeModifiable yes;
adjustTimeStep no;
functions
-(
+{
dsmcFields1
{
- type dsmcFields;
- enabled on;
+ type dsmcFields;
functionObjectLibs ( "libutilityFunctionObjects.so" );
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
}
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- outputControl outputTime;
- resetOnOutput off;
+ outputControl outputTime;
+ resetOnOutput off;
+
fields
(
rhoN
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
rhoM
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
dsmcRhoN
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
momentum
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
linearKE
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
internalE
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
iDof
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
q
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
fD
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
-);
-
+}
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 44ba6548b4f..8873dac0fcb 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -49,93 +49,93 @@ runTimeModifiable yes;
adjustTimeStep no;
functions
-(
+{
dsmcFields1
{
- type dsmcFields;
- enabled on;
+ type dsmcFields;
functionObjectLibs ( "libutilityFunctionObjects.so" );
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
}
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- outputControl outputTime;
- resetOnOutput off;
+ outputControl outputTime;
+ resetOnOutput off;
+
fields
(
rhoN
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
rhoM
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
dsmcRhoN
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
momentum
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
linearKE
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
internalE
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
iDof
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
q
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
fD
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
forces1
{
- type forces;
- enabled on;
+ type forces;
+ enabled true;
functionObjectLibs ( "libforces.so" );
- outputControl outputTime;
- patches ( obstacle );
+ outputControl outputTime;
+ patches ( obstacle );
directForceDensity true;
- fDName fDMean;
- CofR ( 0 0 0 );
- log on;
+ fDName fDMean;
+ CofR ( 0 0 0 );
+ log on;
}
-);
-
+}
// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict
index 86186d7b443..8a87135b11a 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict
@@ -53,6 +53,7 @@ functions
functionObjectLibs ( "libfieldFunctionObjects.so" );
enabled true;
outputControl outputTime;
+
fields
(
U
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
index 57334dbe9ae..c08545dcf38 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -53,11 +53,22 @@ functions
{
probes
{
- type probes;
+ type probes;
// Where to load it from
functionObjectLibs ( "libsampling.so" );
// Name of the directory for probe data
- name probes;
+ 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;
}
}
-
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 736a5c8d08a..4254eedfd28 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/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
}
}
-
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
index fbef5b4915d..9e767ae7690 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
+++ b/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
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index c2f8d5f887d..bdde68c8e89 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -46,25 +46,25 @@ timePrecision 6;
runTimeModifiable yes;
functions
-(
+{
streamLines
{
- type streamLine;
+ type streamLine;
// Where to load it from (if not already in solver)
functionObjectLibs ("libOpenFOAM.so" "libfieldFunctionObjects.so");
// Output every
- outputControl outputTime;
+ outputControl outputTime;
//outputInterval 10;
- setFormat vtk;//gnuplot;//xmgr; //raw; //gnuplot; //jplot;
+ setFormat vtk;//gnuplot;//xmgr; //raw; //gnuplot; //jplot;
// Velocity field to use for tracking.
U U;
// Tracked forwards (+U) or backwards (-U)
- trackForward true;
+ trackForward true;
// Names of fields to sample. Should contain above velocity field!
fields (p k U);
@@ -73,10 +73,10 @@ functions
lifeTime 1000;
// Cloud name to use
- cloudName particleTracks;
+ cloudName particleTracks;
// Seeding method. See the sampleSets in sampleDict.
- seedSampleSet uniform; //cloud;//triSurfaceMeshPointSet;
+ seedSampleSet uniform; //cloud;//triSurfaceMeshPointSet;
uniformCoeffs
{
@@ -106,6 +106,6 @@ functions
// surface twoTri.stl;
// }
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
index d31fcef49d8..9c39bad098a 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
@@ -63,6 +63,7 @@ functions
sourceName outlet;
operation weightedAverage;
weightField phi;
+
fields
(
H2O
@@ -71,5 +72,4 @@ functions
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 72db9f8a33d..06075847a2a 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/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
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index 37b2b36fb4d..47d0f806e68 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/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
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index af10b7080bf..87ef54be3ff 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/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
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index af10b7080bf..7e266e9d7db 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/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
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 12fcd77c422..391380b8c2e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/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
- );
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 12fcd77c422..391380b8c2e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/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
- );
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 12fcd77c422..391380b8c2e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/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
- );
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 0fcde57ac55..8447f2c8ac8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -58,38 +58,38 @@ functions
type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
outputControl outputTime;
+
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index a9f783f78a7..0f9427f0302 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -58,38 +58,38 @@ functions
type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
outputControl outputTime;
+
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index 14d31e3a80c..f40c1e9438d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -58,38 +58,38 @@ functions
type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
outputControl outputTime;
+
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
}
-
// ************************************************************************* //
--
GitLab