Commit 10141f90 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: use dict entry for function objects in controlDict

parent 31aaddf4
......@@ -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
......
......@@ -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
);
}
);
}
// ************************************************************************* //
......@@ -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
);
}
);
}
// ************************************************************************* //
......@@ -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 )
);
}
);
}
// ************************************************************************* //
......@@ -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" )
);
}
}
......
......@@ -57,6 +57,7 @@ functions
functionObjectLibs ( "libfieldFunctionObjects.so" );
enabled true;
outputControl outputTime;
fields
(
U
......@@ -76,5 +77,4 @@ functions
}
}
// ************************************************************************* //
......@@ -57,6 +57,7 @@ functions
functionObjectLibs ( "libfieldFunctionObjects.so" );
enabled true;
outputControl outputTime;
fields
(
U
......@@ -76,5 +77,4 @@ functions
}
}
// ************************************************************************* //
......@@ -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
}
}
// ************************************************************************* //
......@@ -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
}
}
// ************************************************************************* //
......@@ -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;
}
);
}
);
}
// ************************************************************************* //
......@@ -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;
}
);
}
);
}
// ************************************************************************* //
......@@ -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;
}
);
}
);
}
// ************************************************************************* //
......@@ -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