From e273893a50df6be777f6a66b7f871bcbe89e5ae3 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 7 Apr 2010 14:19:11 +0200 Subject: [PATCH 01/13] ENH: add separate printNotes() method to argList --- src/OpenFOAM/global/argList/argList.C | 34 ++++++++++++++++----------- src/OpenFOAM/global/argList/argList.H | 3 +++ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C index fb567c113b..0640d3d731 100644 --- a/src/OpenFOAM/global/argList/argList.C +++ b/src/OpenFOAM/global/argList/argList.C @@ -750,6 +750,25 @@ Foam::argList::~argList() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +void Foam::argList::printNotes() const +{ + // output notes directly - no automatic text wrapping + if (!notes.empty()) + { + Info<< nl; + for + ( + SLList::const_iterator iter = notes.begin(); + iter != notes.end(); + ++iter + ) + { + Info<< iter().c_str() << nl; + } + } +} + + void Foam::argList::printUsage() const { Info<< "\nUsage: " << executable_ << " [OPTIONS]"; @@ -819,20 +838,7 @@ void Foam::argList::printUsage() const ); - // output notes directly - no automatic text wrapping - if (!notes.empty()) - { - Info<< nl; - for - ( - SLList::const_iterator iter = notes.begin(); - iter != notes.end(); - ++iter - ) - { - Info<< iter().c_str() << nl; - } - } + printNotes(); Info<< nl <<"Using OpenFOAM-" << Foam::FOAMversion diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H index 3e9785ebe4..c36955d5ce 100644 --- a/src/OpenFOAM/global/argList/argList.H +++ b/src/OpenFOAM/global/argList/argList.H @@ -329,6 +329,9 @@ public: // Print + //- Print notes (if any) + void printNotes() const; + //- Print usage void printUsage() const; From ec284e38187ba6695c2c2af47294f0d20349cad8 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 7 Apr 2010 14:24:18 +0200 Subject: [PATCH 02/13] BUG: DynamicList copy constructor was explicit --- src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H index 2e70a2c4f8..0efe82bed6 100644 --- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H +++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -101,7 +101,7 @@ public: explicit inline DynamicList(const label); //- Construct copy. - explicit inline DynamicList + inline DynamicList ( const DynamicList& ); @@ -116,7 +116,7 @@ public: //- Construct by transferring the parameter contents explicit inline DynamicList(const Xfer >&); - //- Construct from Istream. Size set to size of read list. + //- Construct from Istream. Size set to size of list read. explicit DynamicList(Istream&); From 10141f907b05588c7098b6b1513e1599f8d68bdc Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 9 Apr 2010 12:23:25 +0200 Subject: [PATCH 03/13] 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 3e186c89e2..072446c13e 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 7d9ab1f656..6bbea73895 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 aa304a259f..fbe59b234c 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 0af8ff7c9a..bc60d51a34 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 635cefc4e8..c4bc0c06b4 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 79e443d105..50ad0c8fb2 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 6ab5661f2a..8f38405c93 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 113d97d8b8..0a1db60830 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 d53cf7983e..cbdd0fa528 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 cf92f926cc..f6c06606b0 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 83c46d5907..bb1f85d968 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 2e26dcc5d6..eb3d186313 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 44ba6548b4..8873dac0fc 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 86186d7b44..8a87135b11 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 57334dbe9a..c08545dcf3 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 736a5c8d08..4254eedfd2 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 fbef5b4915..9e767ae769 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 c2f8d5f887..bdde68c8e8 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 d31fcef49d..9c39bad098 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 72db9f8a33..06075847a2 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 37b2b36fb4..47d0f806e6 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 af10b7080b..87ef54be3f 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 af10b7080b..7e266e9d7d 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 12fcd77c42..391380b8c2 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 12fcd77c42..391380b8c2 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 12fcd77c42..391380b8c2 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 0fcde57ac5..8447f2c8ac 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 a9f783f78a..0f9427f030 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 14d31e3a80..f40c1e9438 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; } ); } } - // ************************************************************************* // From 3fef72510eb49e72e2964e89430065354b7aab96 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 9 Apr 2010 13:12:35 +0200 Subject: [PATCH 04/13] STYLE: use switch value for 'writeCompression' in controlDict's - simpler/clearer to use "on/off" instead of "compressed/uncompressed" --- .../field/fieldAverage/controlDict | 4 +-- .../field/fieldValues/controlDict | 4 +-- .../residualControl/controlDict | 4 +-- .../timeActivatedFileUpdate/controlDict | 4 +-- .../DNS/dnsFoam/boxTurb16/system/controlDict | 4 +-- .../laplacianFoam/flange/system/controlDict | 4 +-- .../potentialFoam/cylinder/system/controlDict | 4 +-- .../pitzDaily/system/controlDict | 4 +-- .../pitzDaily/system/controlDict | 4 +-- .../XiFoam/les/pitzDaily/system/controlDict | 4 +-- .../XiFoam/les/pitzDaily3D/system/controlDict | 4 +-- .../moriyoshiHomogeneous/system/controlDict | 4 +-- .../dieselFoam/aachenBomb/system/controlDict | 4 +-- .../engineFoam/kivaTest/system/controlDict | 4 +-- .../kivaTest/system/controlDict.1st | 4 +-- .../kivaTest/system/controlDict.2nd | 4 +-- .../les/smallPoolFire2D/system/controlDict | 4 +-- .../ras/counterFlowFlame2D/system/controlDict | 4 +-- .../LadenburgJet60psi/system/controlDict | 2 +- .../biconic25-55Run35/system/controlDict | 2 +- .../forwardStep/system/controlDict | 4 +-- .../obliqueShock/system/controlDict | 4 +-- .../shockTube/system/controlDict | 4 +-- .../wedge15Ma5/system/controlDict | 4 +-- .../angledDuct/system/controlDict | 4 +-- .../les/pitzDaily/system/controlDict | 4 +-- .../rhoPisoFoam/ras/cavity/system/controlDict | 4 +-- .../mixerVessel2D/system/controlDict | 4 +-- .../angledDuctExplicit/system/controlDict | 4 +-- .../angledDuctImplicit/system/controlDict | 4 +-- .../squareBend/system/controlDict | 4 +-- .../forwardStep/system/controlDict | 4 +-- .../rhoSonicFoam/shockTube/system/controlDict | 4 +-- .../shockTube/system/controlDict | 4 +-- .../wedge15Ma5/system/controlDict | 4 +-- .../laminar/forwardStep/system/controlDict | 4 +-- .../laminar/shockTube/system/controlDict | 4 +-- .../ras/nacaAirfoil/system/controlDict | 4 +-- .../sonicFoam/ras/prism/system/controlDict | 4 +-- .../decompressionTank/system/controlDict | 4 +-- .../freeSpacePeriodic/system/controlDict | 4 +-- .../freeSpaceStream/system/controlDict | 4 +-- .../supersonicCorner/system/controlDict | 4 +-- .../dsmcFoam/wedge15Ma5/system/controlDict | 4 +-- .../periodicCubeArgon/system/controlDict | 4 +-- .../periodicCubeWater/system/controlDict | 4 +-- .../mdFoam/nanoNozzle/system/controlDict | 4 +-- .../chargedWire/system/controlDict | 4 +-- .../mhdFoam/hartmann/system/controlDict | 4 +-- .../europeanCall/system/controlDict | 4 +-- .../hotRoom/system/controlDict | 4 +-- .../hotRoom/system/controlDict | 4 +-- .../iglooWithFridges/system/controlDict | 4 +-- .../hotRoom/system/controlDict | 4 +-- .../buoyantCavity/system/controlDict | 4 +-- .../hotRoom/system/controlDict | 4 +-- .../hotRadiationRoom/system/controlDict | 4 +-- .../hotRadiationRoomFvDOM/system/controlDict | 4 +-- .../multiRegionHeater/system/controlDict | 4 +-- .../system/controlDict | 4 +-- .../mixerVessel2D/system/controlDict | 4 +-- .../pitzDaily/system/controlDict | 4 +-- .../boundaryLaunderSharma/system/controlDict | 4 +-- .../boundaryWallFunctions/system/controlDict | 4 +-- .../system/controlDict | 4 +-- .../channelFoam/channel395/system/controlDict | 4 +-- .../icoFoam/cavity/system/controlDict | 4 +-- .../icoFoam/cavityClipped/system/controlDict | 4 +-- .../icoFoam/cavityGrade/system/controlDict | 4 +-- .../icoFoam/elbow/system/controlDict | 4 +-- .../offsetCylinder/system/controlDict | 4 +-- .../movingCone/system/controlDict | 4 +-- .../pimpleFoam/t-junction/system/controlDict | 4 +-- .../pisoFoam/les/pitzDaily/system/controlDict | 4 +-- .../pitzDailyDirectMapped/system/controlDict | 4 +-- .../pisoFoam/ras/cavity/system/controlDict | 4 +-- .../angledDuctExplicit/system/controlDict | 4 +-- .../angledDuctImplicit/system/controlDict | 4 +-- .../squareBump/system/controlDict | 7 ++-- .../simpleFoam/airFoil2D/system/controlDict | 4 +-- .../simpleFoam/motorBike/system/controlDict | 4 +-- .../simpleFoam/pitzDaily/system/controlDict | 4 +-- .../pitzDailyExptInlet/system/controlDict | 4 +-- .../simpleSRFFoam/mixer/system/controlDict | 4 +-- .../simplifiedSiwek/system/controlDict | 4 +-- .../filter/system/controlDict | 4 +-- .../parcelInBox/system/controlDict | 4 +-- .../verticalChannel/system/controlDict | 4 +-- .../multipleBoxes/system/controlDict | 4 +-- .../panel/system/controlDict | 4 +-- .../evaporationTest/system/controlDict | 4 +-- .../simplifiedSiwek/system/controlDict | 4 +-- .../SnakeRiverCanyon/system/controlDict | 4 +-- .../bubbleColumn/system/controlDict | 4 +-- .../les/throttle/system/controlDict | 6 ++-- .../les/throttle3D/system/controlDict | 6 ++-- .../ras/throttle/system/controlDict | 6 ++-- .../les/depthCharge2D/system/controlDict | 4 +-- .../les/depthCharge3D/system/controlDict | 4 +-- .../damBreakWithObstacle/system/controlDict | 4 +-- .../ras/floatingObject/system/controlDict | 4 +-- .../ras/sloshingTank2D/system/controlDict | 4 +-- .../ras/sloshingTank2D3DoF/system/controlDict | 4 +-- .../ras/sloshingTank3D/system/controlDict | 4 +-- .../ras/sloshingTank3D3DoF/system/controlDict | 4 +-- .../ras/sloshingTank3D6DoF/system/controlDict | 4 +-- .../ras/testTubeMixer/system/controlDict | 4 +-- .../mixerVessel2D/system/controlDict | 4 +-- .../laminar/damBreak/system/controlDict | 4 +-- .../les/nozzleFlow2D/system/controlDict | 4 +-- .../interFoam/ras/damBreak/system/controlDict | 6 ++-- .../laminar/damBreak/system/controlDict | 4 +-- .../cavitatingBullet/system/controlDict | 33 +++++++++---------- .../laminar/damBreak4phase/system/controlDict | 4 +-- .../damBreak4phaseFine/system/controlDict | 4 +-- .../settlingFoam/ras/dahl/system/controlDict | 4 +-- .../ras/tank3D/system/controlDict | 4 +-- .../twoPhaseEulerFoam/bed/system/controlDict | 4 +-- .../twoPhaseEulerFoam/bed2/system/controlDict | 4 +-- .../bubbleColumn/system/controlDict | 4 +-- .../plateHole/system/controlDict | 4 +-- .../beamEndLoad/system/controlDict | 4 +-- .../beamEndLoad/system/controlDict.org | 4 +-- 123 files changed, 263 insertions(+), 265 deletions(-) diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict index 072446c13e..70187fad00 100644 --- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict +++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict @@ -36,13 +36,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict index 6bbea73895..5971b3be0e 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/controlDict +++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/src/postProcessing/functionObjects/residualControl/controlDict b/src/postProcessing/functionObjects/residualControl/controlDict index bc60d51a34..ff6db56aba 100644 --- a/src/postProcessing/functionObjects/residualControl/controlDict +++ b/src/postProcessing/functionObjects/residualControl/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict index c4bc0c06b4..06ade1c964 100644 --- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict +++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict index 3ec1280094..529a966486 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict +++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; graphFormat raw; diff --git a/tutorials/basic/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict index cca0701813..8311c5deb6 100644 --- a/tutorials/basic/laplacianFoam/flange/system/controlDict +++ b/tutorials/basic/laplacianFoam/flange/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict index 0caf916eca..afa091f846 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/controlDict +++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict index 0caf916eca..afa091f846 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict +++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict index b406e85ce2..e7eda1d5fc 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict index 50ad0c8fb2..87dbaa3ad3 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict index 8f38405c93..b23a2829ba 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict index 443097f403..903a8989d7 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict index 43fa1de205..ed8ef41f8b 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict @@ -37,7 +37,7 @@ writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -47,7 +47,7 @@ adjustTimeStep yes; maxCo 0.1; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict index 8da8d6cb37..295291738f 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st index 8da8d6cb37..295291738f 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd index f42bfbc115..34a2d50b06 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict index aa179ea085..b2ef1f85d9 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict @@ -36,7 +36,7 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -44,7 +44,7 @@ timePrecision 6; graphFormat raw; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict index d8eadc979c..82360ae4d7 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict index 041eb98faa..ca419cca9d 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict @@ -37,7 +37,7 @@ writeFormat ascii; writePrecision 15; -writeCompression uncompressed; +writeCompression off; timeFormat general; diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict index 11ef1e4f4d..99b934db51 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict @@ -37,7 +37,7 @@ writeFormat ascii; writePrecision 15; -writeCompression uncompressed; +writeCompression off; timeFormat general; diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict index eb4fe54194..d0a8d7d4d2 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict index e4dca7f65f..d31d83f2fa 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict @@ -37,7 +37,7 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -45,7 +45,7 @@ timePrecision 6; graphFormat raw; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict index 4446eb55c2..f06597be29 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict index 8dc253af75..46c2cd2dd4 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict index 4e53754bf7..cbda6c7e8b 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict index 0a1db60830..ee66ef78e6 100644 --- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict +++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict index f7c5890f48..5207df21bb 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict index b79e14b234..1c2666f2ef 100644 --- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict +++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict index 10de02b0d7..ee1997640a 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict @@ -37,7 +37,7 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -45,7 +45,7 @@ timePrecision 6; graphFormat raw; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict index 88d62b98cc..fc5b4b95bc 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict @@ -37,7 +37,7 @@ writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -45,7 +45,7 @@ timePrecision 6; graphFormat raw; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict b/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict index 49ae3f8a17..d64bc59993 100644 --- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict +++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict @@ -37,7 +37,7 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -45,7 +45,7 @@ timePrecision 6; graphFormat raw; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict index 467752f0ef..a1706f5b3a 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict index 229b6c7046..7e56115737 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict index 4609dc364a..98545e5953 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict index 711c877178..2538fb4a58 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict index 2243969127..9a331d0afe 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict index 113b703349..b146e22489 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict index cbdd0fa528..9e4c9487fa 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict index a9f43fbb9e..b67a03963c 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict +++ b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict index 2f43908bcf..8b219f140b 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict index f6c06606b0..d67f3c119c 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict index bb1f85d968..26b01f238a 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict index eb3d186313..abee5850f1 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict index 8873dac0fc..31f6cf1b8d 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict @@ -38,13 +38,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict index 4e7379793c..6846736f6b 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict @@ -36,13 +36,13 @@ writeFormat ascii; writePrecision 12; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict index 4c457aca58..dda6c1a4de 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict @@ -36,13 +36,13 @@ writeFormat ascii; writePrecision 12; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict index 6f3bab47af..708791f4ec 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict @@ -36,13 +36,13 @@ writeFormat ascii; writePrecision 12; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict index ff30dab3ea..bf764fc1e0 100644 --- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict +++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict index ba9f94e16e..3a20fa96d5 100644 --- a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict +++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/financial/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict index 5f82f054df..ce4e3a02f6 100644 --- a/tutorials/financial/financialFoam/europeanCall/system/controlDict +++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; graphFormat raw; diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict index a2bd31228b..53d1882a04 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict index ee44e2cc05..7110aa11fb 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict index 85273a5e8e..9ed612f7fd 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict index f27c341a65..11e3efe957 100644 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict index aecc274b4b..e250c63939 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict @@ -36,13 +36,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict index 86ff949dd9..e2e21ebece 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict index 6733a15023..7528e1c6c3 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict index 58fd12acff..ed46d31ca4 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict @@ -37,13 +37,13 @@ writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict index 3e22a4695d..f3709cd001 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 7; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; maxCo 0.3; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict index c29fededa3..ed44768bff 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict @@ -38,13 +38,13 @@ writeFormat ascii; writePrecision 7; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; maxCo 0.3; diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict index 2eaccf5916..95adb71e42 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict index 733efddbc0..9ac6b42a1a 100644 --- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict +++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict @@ -37,12 +37,12 @@ writeFormat ascii; writePrecision 12; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 12; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict index d66c8b5c05..65ab5dd49a 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; graphFormat raw; diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict index d66c8b5c05..65ab5dd49a 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; graphFormat raw; diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict index 7bf69941d9..0f67e68096 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict @@ -44,13 +44,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; graphFormat raw; diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict index 8a87135b11..3f087960b9 100644 --- a/tutorials/incompressible/channelFoam/channel395/system/controlDict +++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/tutorials/incompressible/icoFoam/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/system/controlDict index 0e0ad67efd..9010dcf8be 100644 --- a/tutorials/incompressible/icoFoam/cavity/system/controlDict +++ b/tutorials/incompressible/icoFoam/cavity/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict index e205e75c4d..43e86aee43 100644 --- a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict +++ b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict index 853fdc3f1c..4fdb6f820f 100644 --- a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict +++ b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/icoFoam/elbow/system/controlDict b/tutorials/incompressible/icoFoam/elbow/system/controlDict index ab4cee61e1..68280b0306 100644 --- a/tutorials/incompressible/icoFoam/elbow/system/controlDict +++ b/tutorials/incompressible/icoFoam/elbow/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict index 4627c47f66..70c54bacd9 100644 --- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict +++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict index fac973c9f9..a4dca3b050 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict @@ -37,13 +37,13 @@ writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict index c08545dcf3..f1c8b83674 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict index 4254eedfd2..d7180759a2 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict index 9e767ae769..ca81fc41e9 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict index 16d26899f3..07e5c1bcbf 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict +++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict index b82034e8a2..f94e18ff29 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict @@ -37,7 +37,7 @@ writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -45,7 +45,7 @@ timePrecision 6; graphFormat raw; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict index f718e03fc7..4e89e54565 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict @@ -37,7 +37,7 @@ writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -45,7 +45,7 @@ timePrecision 6; graphFormat raw; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict index c53ead2bb0..5de491639a 100644 --- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict +++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict @@ -18,7 +18,7 @@ application shallowWaterFoam; startFrom startTime; -startTime 0; +startTime 0; stopAt endTime; @@ -36,13 +36,12 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable no; - +runTimeModifiable false; // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict index af1b95f6e8..0a6d85ef3d 100644 --- a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict +++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict index eeb1d43a1d..dfa7573fbf 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict +++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict @@ -38,12 +38,12 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict index bdde68c8e8..d33d4c5131 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; functions { diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict index 7bb078570d..9b2e71312a 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict index cc885d2f1d..ba975ce4f2 100644 --- a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict +++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict index d056865b15..2ee23fd83a 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict index 76bb2b6b31..b5f8df21a7 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict index 64c9c37c8d..5d37d10cfd 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict @@ -35,13 +35,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict index 9c39bad098..b8bb30c409 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict @@ -35,13 +35,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict index 716a16a4c7..334ea70503 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict index 9388ecb3fb..2b196db829 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict index 0042f56ab8..acd78c5fec 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict index 66ed78d824..d8831846bc 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 10; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict index e75261300e..2fe8e5ce8f 100644 --- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict +++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict index afa89fb133..90c84c37bd 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict index 06075847a2..f39b9c294f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict @@ -37,13 +37,13 @@ writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; -runTimeModifiable yes; +runTimeModifiable true; -adjustTimeStep on; +adjustTimeStep yes; maxCo 0.5; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict index 47d0f806e6..0dc91c672b 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict @@ -37,13 +37,13 @@ writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; -runTimeModifiable yes; +runTimeModifiable true; -adjustTimeStep on; +adjustTimeStep yes; maxCo 0.5; diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict index 3b505dc3ee..8ff1145ed4 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; -runTimeModifiable yes; +runTimeModifiable true; -adjustTimeStep on; +adjustTimeStep yes; maxCo 0.5; diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict index 6037f2ab1b..03d21ada4b 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 8; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 10; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict index 6037f2ab1b..03d21ada4b 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 8; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 10; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict index 86169f2135..7be42fc88c 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict index b58fa81303..7cb0f3acba 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 12; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict index 87ef54be3f..f826ebd757 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict index 7e266e9d7d..2f82526c4e 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict index 391380b8c2..996904416f 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict index 391380b8c2..996904416f 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict index 391380b8c2..996904416f 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict index 8c4c00f816..a1010335ea 100644 --- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict index 8360e0fd1c..f666f4e386 100644 --- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict index 27a45f9555..aaf742a02c 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict index ad766b12a9..3100d3b915 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 8; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict index cee98fd455..4ddbc2e00b 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict @@ -37,15 +37,15 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; -adjustTimeStep on; +adjustTimeStep yes; maxCo 0.2; diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict index a6f556508b..0290419bea 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict index 8be2ec910a..6262dc6bde 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict @@ -14,37 +14,36 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application interPhaseChangeFoam; +application interPhaseChangeFoam; -startFrom latestTime; +startFrom latestTime; -startTime 0; +startTime 0; -stopAt endTime; +stopAt endTime; -endTime 0.05; +endTime 0.05; -deltaT 1e-8; +deltaT 1e-8; -writeControl adjustableRunTime; +writeControl adjustableRunTime; -writeInterval 0.001; +writeInterval 0.001; -purgeWrite 0; +purgeWrite 0; -writeFormat ascii; +writeFormat ascii; -writePrecision 6; +writePrecision 6; -writeCompression uncompressed; +writeCompression off; -timeFormat general; +timeFormat general; -runTimeModifiable yes; +runTimeModifiable true; -adjustTimeStep on; - -maxCo 1.0; +adjustTimeStep yes; +maxCo 1.0; // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict index c945fe73bf..3e99c4a69c 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict index c945fe73bf..3e99c4a69c 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict index ef409e071a..3a40815c14 100644 --- a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict +++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict index b6d0e5c258..b81abb5a4f 100644 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict index 8447f2c8ac..1e206833e2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict @@ -37,13 +37,13 @@ writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable on; +runTimeModifiable true; adjustTimeStep yes; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict index 0f9427f030..0319c356ca 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable on; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict index f40c1e9438..4a5f547a9b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict @@ -37,13 +37,13 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; adjustTimeStep no; diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict index b808ad2692..ffee5741cb 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict @@ -37,7 +37,7 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression off; timeFormat general; @@ -45,7 +45,7 @@ timePrecision 6; graphFormat raw; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict index 473dcfc797..daa78b5501 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict @@ -35,13 +35,13 @@ purgeWrite 0; writeFormat ascii; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org index b11b030388..70ff5e2110 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org @@ -33,13 +33,13 @@ purgeWrite 0; writeFormat ascii; -writeCompression uncompressed; +writeCompression off; timeFormat general; timePrecision 6; -runTimeModifiable yes; +runTimeModifiable true; // ************************************************************************* // From 16a16090dbddd6168dd6f021f4d347f0ebcd3666 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 9 Apr 2010 13:42:00 +0200 Subject: [PATCH 05/13] ENH: invert logic of residualControl check to allow dictionary entry. - lets the user specify controls like this: maxResiduals { p 5e-4; U 1e-3; "(k|epsilon|omega)" 1e-3; } --- .../residualControl/controlDict | 13 +++++---- .../residualControl/residualControl.C | 29 ++++++++----------- .../residualControl/residualControl.H | 16 +++++----- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/postProcessing/functionObjects/residualControl/controlDict b/src/postProcessing/functionObjects/residualControl/controlDict index ff6db56aba..46b53abce5 100644 --- a/src/postProcessing/functionObjects/residualControl/controlDict +++ b/src/postProcessing/functionObjects/residualControl/controlDict @@ -1,4 +1,4 @@ -*--------------------------------*- C++ -*----------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | @@ -55,10 +55,13 @@ functions outputInterval 1; maxResiduals - ( - ( p 5e-4 ) - ( U 1e-3 ) - ); + { + p 5e-4; + U 1e-3; + + // possibly check turbulence fields + "(k|epsilon|omega)" 1e-3; + } } } diff --git a/src/postProcessing/functionObjects/residualControl/residualControl.C b/src/postProcessing/functionObjects/residualControl/residualControl.C index aed8e38dc1..a7ad2233cf 100644 --- a/src/postProcessing/functionObjects/residualControl/residualControl.C +++ b/src/postProcessing/functionObjects/residualControl/residualControl.C @@ -24,40 +24,35 @@ License \*---------------------------------------------------------------------------*/ #include "residualControl.H" -#include "dictionary.H" #include "fvMesh.H" #include "Time.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(residualControl, 0); -} +defineTypeNameAndDebug(Foam::residualControl, 0); // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -bool Foam::residualControl::checkCriteria(const bool output) const +bool Foam::residualControl::checkCriteria(const bool verbose) const { bool achieved = true; const fvMesh& mesh = static_cast(obr_); const dictionary& solverDict = mesh.solverPerformanceDict(); - forAll(maxResiduals_, i) + + forAllConstIter(dictionary, solverDict, iter) { - const word& variableName = maxResiduals_[i].first(); - if (solverDict.found(variableName)) + const word& variableName = iter().keyword(); + scalar maxResidual; + + if (maxResiduals_.readIfPresent(variableName, maxResidual)) { - const scalar maxResidual = maxResiduals_[i].second(); - - const lduMatrix::solverPerformance - sp(solverDict.lookup(variableName)); - - const scalar eqnResidual = sp.initialResidual(); + const scalar eqnResidual = + lduMatrix::solverPerformance(iter().stream()).initialResidual(); achieved = achieved && (eqnResidual < maxResidual); - if (output) + if (verbose) { Info<< " " << variableName << ": requested max residual = " << maxResidual @@ -121,7 +116,7 @@ void Foam::residualControl::read(const dictionary& dict) { if (active_) { - dict.lookup("maxResiduals") >> maxResiduals_; + maxResiduals_ = dict.subDict("maxResiduals"); } } diff --git a/src/postProcessing/functionObjects/residualControl/residualControl.H b/src/postProcessing/functionObjects/residualControl/residualControl.H index c222019298..691fb08928 100644 --- a/src/postProcessing/functionObjects/residualControl/residualControl.H +++ b/src/postProcessing/functionObjects/residualControl/residualControl.H @@ -37,8 +37,8 @@ SourceFiles #ifndef residualControl_H #define residualControl_H +#include "dictionary.H" #include "pointFieldFwd.H" -#include "Tuple2.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,8 +69,8 @@ protected: //- On/off switch - on if obr_ is an fvMesh object bool active_; - //- List of variable name vs max residual - List > maxResiduals_; + //- Dictionary of variable names vs max residual + dictionary maxResiduals_; //- Flag to indicate whether convergence criteria have been met bool criteriaSatisfied_; @@ -79,7 +79,7 @@ protected: // Protected Member Functions //- Perform residual control checks - bool checkCriteria(const bool output) const; + bool checkCriteria(const bool verbose) const; //- Disallow default bitwise copy construct residualControl(const residualControl&); @@ -113,7 +113,7 @@ public: // Member Functions - //- Return name of the system call set + //- Return name of the residual criteria check name virtual const word& name() const { return name_; @@ -122,13 +122,13 @@ public: //- Read the system calls virtual void read(const dictionary&); - //- Execute the "executeCalls" at each time-step + //- Check the residual criteria at each time-step virtual void execute(); - //- Execute the "endCalls" at the final time-loop + //- Report residual criteria check at the final time-loop virtual void end(); - //- Write, execute the "writeCalls" + //- Write, not used virtual void write(); //- Update for changes of mesh From 50616e6fc8750694453fd31dc67831979511a4ac Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 9 Apr 2010 12:43:17 +0100 Subject: [PATCH 06/13] motorBike tutorial: improved the schemes. --- .../motorBike/constant/polyMesh/boundary | 210 +++++++++--------- .../simpleFoam/motorBike/system/controlDict | 4 +- .../simpleFoam/motorBike/system/fvSchemes | 8 +- 3 files changed, 109 insertions(+), 113 deletions(-) diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary index 3c2a064fff..7407d3a47d 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary +++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary @@ -21,433 +21,433 @@ FoamFile { type patch; nFaces 320; - startFace 1016673; + startFace 955219; } inlet { type patch; nFaces 64; - startFace 1016993; + startFace 955539; } outlet { type patch; nFaces 64; - startFace 1017057; + startFace 955603; } lowerWall { type wall; nFaces 5330; - startFace 1017121; + startFace 955667; } upperWall { type patch; nFaces 160; - startFace 1022451; + startFace 960997; } motorBike_frt-fairing:001%1 { type wall; - nFaces 6626; - startFace 1022611; + nFaces 6595; + startFace 961157; } motorBike_windshield:002%2 { type wall; nFaces 50; - startFace 1029237; + startFace 967752; } motorBike_rr-wh-rim:005%5 { type wall; - nFaces 181; - startFace 1029287; + nFaces 178; + startFace 967802; } motorBike_rr-wh-rim:010%10 { type wall; nFaces 340; - startFace 1029468; + startFace 967980; } motorBike_fr-wh-rim:011%11 { type wall; nFaces 474; - startFace 1029808; + startFace 968320; } motorBike_fr-wh-brake-disk:012%12 { type wall; nFaces 54; - startFace 1030282; + startFace 968794; } motorBike_frame:016-shadow%13 { type wall; - nFaces 131; - startFace 1030336; + nFaces 128; + startFace 968848; } motorBike_rear-susp:014%14 { type wall; - nFaces 1073; - startFace 1030467; + nFaces 1080; + startFace 968976; } motorBike_rear-susp:014-shadow%15 { type wall; - nFaces 159; - startFace 1031540; + nFaces 149; + startFace 970056; } motorBike_frame:016%16 { type wall; - nFaces 20; - startFace 1031699; + nFaces 30; + startFace 970205; } motorBike_rr-wh-rim:005-shadow%17 { type wall; - nFaces 25; - startFace 1031719; + nFaces 27; + startFace 970235; } motorBike_rr-wh-chain-hub:022%22 { type wall; nFaces 141; - startFace 1031744; + startFace 970262; } motorBike_rearseat%24 { type wall; nFaces 432; - startFace 1031885; + startFace 970403; } motorBike_frt-fairing%25 { type wall; nFaces 626; - startFace 1032317; + startFace 970835; } motorBike_windshield%26 { type wall; - nFaces 428; - startFace 1032943; + nFaces 432; + startFace 971461; } motorBike_headlights%27 { type wall; nFaces 161; - startFace 1033371; + startFace 971893; } motorBike_driversseat%28 { type wall; nFaces 367; - startFace 1033532; + startFace 972054; } motorBike_rear-body%29 { type wall; nFaces 2076; - startFace 1033899; + startFace 972421; } motorBike_fuel-tank%30 { type wall; nFaces 912; - startFace 1035975; + startFace 974497; } motorBike_exhaust%31 { type wall; - nFaces 2391; - startFace 1036887; + nFaces 2390; + startFace 975409; } motorBike_rr-wh-rim%32 { type wall; nFaces 1430; - startFace 1039278; + startFace 977799; } motorBike_fr-mud-guard%33 { type wall; - nFaces 767; - startFace 1040708; + nFaces 758; + startFace 979229; } motorBike_fr-wh-rim%34 { type wall; - nFaces 592; - startFace 1041475; + nFaces 591; + startFace 979987; } motorBike_fr-wh-brake-disk%35 { type wall; - nFaces 533; - startFace 1042067; + nFaces 534; + startFace 980578; } motorBike_fr-brake-caliper%36 { type wall; nFaces 164; - startFace 1042600; + startFace 981112; } motorBike_fr-wh-tyre%37 { type wall; - nFaces 1118; - startFace 1042764; + nFaces 1116; + startFace 981276; } motorBike_hbars%38 { type wall; nFaces 535; - startFace 1043882; + startFace 982392; } motorBike_fr-forks%39 { type wall; - nFaces 1144; - startFace 1044417; + nFaces 1143; + startFace 982927; } motorBike_chain%40 { type wall; nFaces 474; - startFace 1045561; + startFace 984070; } motorBike_rr-wh-tyre%41 { type wall; - nFaces 1785; - startFace 1046035; + nFaces 1786; + startFace 984544; } motorBike_square-dial%42 { type wall; nFaces 6; - startFace 1047820; + startFace 986330; } motorBike_round-dial%43 { type wall; - nFaces 18; - startFace 1047826; + nFaces 17; + startFace 986336; } motorBike_dial-holder%44 { type wall; nFaces 87; - startFace 1047844; + startFace 986353; } motorBike_rear-susp%45 { type wall; - nFaces 1787; - startFace 1047931; + nFaces 1786; + startFace 986440; } motorBike_rear-brake-lights%46 { type wall; nFaces 54; - startFace 1049718; + startFace 988226; } motorBike_rear-light-bracket%47 { type wall; nFaces 163; - startFace 1049772; + startFace 988280; } motorBike_frame%48 { type wall; nFaces 2040; - startFace 1049935; + startFace 988443; } motorBike_rear-mud-guard%49 { type wall; - nFaces 804; - startFace 1051975; + nFaces 798; + startFace 990483; } motorBike_rear-susp-spring-damp%50 { type wall; - nFaces 125; - startFace 1052779; + nFaces 124; + startFace 991281; } motorBike_fairing-inner-plate%51 { type wall; nFaces 446; - startFace 1052904; + startFace 991405; } motorBike_clutch-housing%52 { type wall; - nFaces 966; - startFace 1053350; + nFaces 964; + startFace 991851; } motorBike_radiator%53 { type wall; - nFaces 48; - startFace 1054316; + nFaces 58; + startFace 992815; } motorBike_water-pipe%54 { type wall; nFaces 103; - startFace 1054364; + startFace 992873; } motorBike_water-pump%55 { type wall; nFaces 74; - startFace 1054467; + startFace 992976; } motorBike_engine%56 { type wall; - nFaces 2384; - startFace 1054541; + nFaces 2389; + startFace 993050; } motorBike_rear-shock-link%57 { type wall; - nFaces 29; - startFace 1056925; + nFaces 28; + startFace 995439; } motorBike_rear-brake-fluid-pot-bracket%58 { type wall; nFaces 59; - startFace 1056954; + startFace 995467; } motorBike_rear-brake-fluid-pot%59 { type wall; nFaces 53; - startFace 1057013; + startFace 995526; } motorBike_footpeg%60 { type wall; nFaces 87; - startFace 1057066; + startFace 995579; } motorBike_rr-wh-chain-hub%61 { type wall; - nFaces 145; - startFace 1057153; + nFaces 143; + startFace 995666; } motorBike_rear-brake-caliper%62 { type wall; nFaces 142; - startFace 1057298; + startFace 995809; } motorBike_rider-helmet%65 { type wall; nFaces 583; - startFace 1057440; + startFace 995951; } motorBike_rider-visor%66 { type wall; nFaces 95; - startFace 1058023; + startFace 996534; } motorBike_rider-boots%67 { type wall; nFaces 1025; - startFace 1058118; + startFace 996629; } motorBike_rider-gloves%68 { type wall; nFaces 320; - startFace 1059143; + startFace 997654; } motorBike_rider-body%69 { type wall; nFaces 4555; - startFace 1059463; + startFace 997974; } motorBike_frame:0%70 { type wall; nFaces 37; - startFace 1064018; + startFace 1002529; } motorBike_frt-fairing:001-shadow%74 { type wall; - nFaces 1274; - startFace 1064055; + nFaces 1301; + startFace 1002566; } motorBike_windshield-shadow%75 { type wall; - nFaces 101; - startFace 1065329; + nFaces 97; + startFace 1003867; } motorBike_fr-mud-guard-shadow%81 { type wall; - nFaces 129; - startFace 1065430; + nFaces 140; + startFace 1003964; } motorBike_fr-wh-brake-disk-shadow%83 { type wall; - nFaces 77; - startFace 1065559; + nFaces 76; + startFace 1004104; } motorBike_rear-mud-guard-shadow%84 { type wall; - nFaces 138; - startFace 1065636; + nFaces 137; + startFace 1004180; } motorBike_rear-susp-spring-damp-shadow%85 { type wall; nFaces 15; - startFace 1065774; + startFace 1004317; } motorBike_radiator-shadow%86 { type wall; - nFaces 12; - startFace 1065789; + nFaces 4; + startFace 1004332; } motorBike_rear-shock-link-shadow%87 { type wall; - nFaces 7; - startFace 1065801; + nFaces 8; + startFace 1004336; } motorBike_rear-brake-fluid-pot-bracket-shadow%88 { type wall; - nFaces 6; - startFace 1065808; + nFaces 5; + startFace 1004344; } motorBike_rr-wh-chain-hub-shadow%89 { type wall; - nFaces 24; - startFace 1065814; + nFaces 27; + startFace 1004349; } ) diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict index eeb1d43a1d..6782799bf2 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict +++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict @@ -18,13 +18,13 @@ libs ("libincompressibleRASModels.so"); application simpleFoam; -startFrom latestTime; +startFrom startTime; startTime 0; stopAt endTime; -endTime 500; +endTime 1000; deltaT 1; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes index 7297493347..b83088fb0e 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes +++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes @@ -24,7 +24,6 @@ gradSchemes default Gauss linear; grad(p) Gauss linear; grad(U) Gauss linear; - //grad(U) cellLimited Gauss linear 1; } divSchemes @@ -38,20 +37,17 @@ divSchemes laplacianSchemes { - default Gauss linear corrected; - //default Gauss linear limited 0.5; - //default Gauss linear limited 0.333; + default Gauss linear limited 0.333; } interpolationSchemes { default linear; - interpolate(U) linear; } snGradSchemes { - default corrected; + default limited 0.333; } fluxRequired From 30dc12f140a3726593b0c1c918433b84bca211d3 Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 9 Apr 2010 12:43:55 +0100 Subject: [PATCH 07/13] pitzDaily tutorial: Added functionObject convergence check. --- .../simpleFoam/pitzDaily/system/controlDict | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict index c2f8d5f887..74997d27c3 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict @@ -47,6 +47,22 @@ runTimeModifiable yes; functions ( + convergenceChecks + { + type residualControl; + functionObjectLibs ( "libresidualControl.so" ); + outputControl timeStep; + outputInterval 1; + + maxResiduals + ( + (p 1e-2) + (U 1e-3) + (k 1e-3) + (epsilon 1e-3) + ); + } + streamLines { type streamLine; @@ -87,24 +103,6 @@ functions end (-0.0205 0.0251 0.00001); nPoints 10; } - -// cloudCoeffs -// { -// type cloud; -// axis x; -// -// points -// ( -// (-0.0205936225239282 0.0144729199524163 0.00001) -// ); -// } - -// triSurfaceMeshPointSetCoeffs -// { -// type triSurfaceMeshPointSet; -// axis distance; -// surface twoTri.stl; -// } } ); From f8ea34bc5930dc2edbf85a8290c48463bce3e15d Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 9 Apr 2010 12:45:13 +0100 Subject: [PATCH 08/13] Time: Moved functionObject execution from "++" to "loop" This change allows functionObjects to cleanly terminate the code e.g. on convergence. --- src/OpenFOAM/db/Time/Time.C | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index 8e18dc7861..36bccb3911 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -518,11 +518,28 @@ bool Foam::Time::loop() if (running) { - operator++(); + if (!subCycling_) + { + readModifiedObjects(); + + if (timeIndex_ == startTimeIndex_) + { + functionObjects_.start(); + } + else + { + functionObjects_.execute(); + } + } // Check update the "running" status following the "++" operation // to take into account possible side-effects from functionObjects running = run(); + + if (running) + { + operator++(); + } } return running; @@ -667,20 +684,6 @@ Foam::Time& Foam::Time::operator+=(const scalar deltaT) Foam::Time& Foam::Time::operator++() { - if (!subCycling_) - { - readModifiedObjects(); - - if (timeIndex_ == startTimeIndex_) - { - functionObjects_.start(); - } - else - { - functionObjects_.execute(); - } - } - deltaT0_ = deltaTSave_; deltaTSave_ = deltaT_; From a30f977dc5a4a5c9951e1fef587128e574a44272 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 9 Apr 2010 14:09:42 +0200 Subject: [PATCH 09/13] STYLE: avoid namespace { ... } in functionObject source code --- .../writeRegisteredObject.C | 5 +-- .../field/fieldMinMax/fieldMinMax.C | 5 +-- .../field/fieldValues/cellSource/cellSource.C | 39 ++++++++----------- .../field/fieldValues/faceSource/faceSource.C | 38 ++++++++---------- .../field/readFields/readFields.C | 5 +-- .../field/streamLine/streamLineParticle.C | 5 ++- .../streamLine/streamLineParticleCloud.C | 2 +- .../forces/forceCoeffs/forceCoeffs.C | 5 +-- .../functionObjects/forces/forces/forces.C | 6 +-- .../fixedAxis/fixedAxis.C | 5 ++- .../fixedLine/fixedLine.C | 5 ++- .../fixedOrientation/fixedOrientation.C | 5 ++- .../fixedPlane/fixedPlane.C | 5 ++- .../fixedPoint/fixedPoint.C | 5 ++- .../linearAxialAngularSpring.C | 5 ++- .../linearSpring/linearSpring.C | 5 ++- .../sphericalAngularSpring.C | 5 ++- .../tabulatedAxialAngularSpring.C | 5 ++- .../functionObjects/systemCall/systemCall.C | 5 +-- .../abortCalculation/abortCalculation.C | 6 +-- .../utilities/dsmcFields/dsmcFields.C | 5 +-- .../utilities/staticPressure/staticPressure.C | 6 +-- .../timeActivatedFileUpdate.C | 5 +-- .../sampledSurface/isoSurface/isoSurface.C | 6 +-- .../isoSurface/isoSurfaceCell.C | 6 +-- 25 files changed, 83 insertions(+), 111 deletions(-) diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C index e9357407de..12cb6d197d 100644 --- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C +++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C @@ -29,10 +29,7 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(writeRegisteredObject, 0); -} +defineTypeNameAndDebug(Foam::writeRegisteredObject, 0); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C index f23441d467..b013114ee7 100644 --- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C +++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C @@ -31,10 +31,7 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(fieldMinMax, 0); -} +defineTypeNameAndDebug(Foam::fieldMinMax, 0); template<> diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C index f722119859..a741c4560c 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C +++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C @@ -30,31 +30,27 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam +defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0); + +template<> +const char* Foam::NamedEnum:: +names[] = { - namespace fieldValues - { - defineTypeNameAndDebug(cellSource, 0); - } + "cellZone" +}; - template<> - const char* NamedEnum:: - names[] = {"cellZone"}; +const Foam::NamedEnum + Foam::fieldValues::cellSource::sourceTypeNames_; - const NamedEnum - fieldValues::cellSource::sourceTypeNames_; +template<> +const char* Foam::NamedEnum:: +names[] = +{ + "none", "sum", "volAverage", "volIntegrate", "weightedAverage" +}; - template<> - const char* NamedEnum:: - names[] = - { - "none", "sum", "volAverage", "volIntegrate", "weightedAverage" - }; - - const NamedEnum - fieldValues::cellSource::operationTypeNames_; - -} +const Foam::NamedEnum + Foam::fieldValues::cellSource::operationTypeNames_; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -238,4 +234,3 @@ void Foam::fieldValues::cellSource::write() // ************************************************************************* // - diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C index 219200ea70..ebcf487b7d 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C +++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C @@ -34,31 +34,27 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam +defineTypeNameAndDebug(Foam::fieldValues::faceSource, 0); + +template<> +const char* Foam::NamedEnum:: +names[] = { - namespace fieldValues - { - defineTypeNameAndDebug(faceSource, 0); - } + "faceZone", "patch" +}; - template<> - const char* NamedEnum:: - names[] = {"faceZone", "patch"}; +const Foam::NamedEnum + Foam::fieldValues::faceSource::sourceTypeNames_; - const NamedEnum - fieldValues::faceSource::sourceTypeNames_; +template<> +const char* Foam::NamedEnum:: +names[] = +{ + "none", "sum", "areaAverage", "areaIntegrate", "weightedAverage" +}; - template<> - const char* NamedEnum:: - names[] = - { - "none", "sum", "areaAverage", "areaIntegrate", "weightedAverage" - }; - - const NamedEnum - fieldValues::faceSource::operationTypeNames_; - -} +const Foam::NamedEnum + Foam::fieldValues::faceSource::operationTypeNames_; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C index 17b46f1a52..e4ae72660a 100644 --- a/src/postProcessing/functionObjects/field/readFields/readFields.C +++ b/src/postProcessing/functionObjects/field/readFields/readFields.C @@ -28,10 +28,7 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(readFields, 0); -} +defineTypeNameAndDebug(Foam::readFields, 0); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C index 1a2a101b37..9174e35781 100644 --- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C +++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C @@ -31,14 +31,17 @@ License namespace Foam { defineTypeNameAndDebug(streamLineParticle, 0); + defineParticleTypeNameAndDebug(streamLineParticle, 0); + defineTemplateTypeNameAndDebugWithName ( IOField, "vectorFieldField", 0 ); -}; +} + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C index 12278502d0..095b08ee42 100644 --- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C +++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C @@ -30,7 +30,7 @@ License namespace Foam { defineTemplateTypeNameAndDebug(Cloud, 0); -}; +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C index 3b8ee51eae..d7acd9ad4c 100644 --- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C +++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C @@ -30,10 +30,7 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(forceCoeffs, 0); -} +defineTypeNameAndDebug(Foam::forceCoeffs, 0); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C index c58ab692f1..844366eefb 100644 --- a/src/postProcessing/functionObjects/forces/forces/forces.C +++ b/src/postProcessing/functionObjects/forces/forces/forces.C @@ -39,10 +39,8 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(forces, 0); -} +defineTypeNameAndDebug(Foam::forces, 0); + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C index d750bb3a7f..becacd749c 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C @@ -34,14 +34,15 @@ namespace Foam namespace sixDoFRigidBodyMotionConstraints { defineTypeNameAndDebug(fixedAxis, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionConstraint, fixedAxis, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C index 877706a163..b2e88aa657 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C @@ -34,14 +34,15 @@ namespace Foam namespace sixDoFRigidBodyMotionConstraints { defineTypeNameAndDebug(fixedLine, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionConstraint, fixedLine, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C index ea5f0e54c2..6a6839b9be 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C @@ -34,14 +34,15 @@ namespace Foam namespace sixDoFRigidBodyMotionConstraints { defineTypeNameAndDebug(fixedOrientation, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionConstraint, fixedOrientation, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C index e8b4dcb61e..38544533ce 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C @@ -34,14 +34,15 @@ namespace Foam namespace sixDoFRigidBodyMotionConstraints { defineTypeNameAndDebug(fixedPlane, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionConstraint, fixedPlane, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C index abe67667a9..c1a35d85c0 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C @@ -34,14 +34,15 @@ namespace Foam namespace sixDoFRigidBodyMotionConstraints { defineTypeNameAndDebug(fixedPoint, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionConstraint, fixedPoint, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C index 14c364b351..704d48fe3e 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C @@ -35,14 +35,15 @@ namespace Foam namespace sixDoFRigidBodyMotionRestraints { defineTypeNameAndDebug(linearAxialAngularSpring, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionRestraint, linearAxialAngularSpring, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C index 5fb6dfc3fe..2a1edc1c55 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C @@ -34,14 +34,15 @@ namespace Foam namespace sixDoFRigidBodyMotionRestraints { defineTypeNameAndDebug(linearSpring, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionRestraint, linearSpring, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C index 00953da36f..df10f1e8ef 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C @@ -34,14 +34,15 @@ namespace Foam namespace sixDoFRigidBodyMotionRestraints { defineTypeNameAndDebug(sphericalAngularSpring, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionRestraint, sphericalAngularSpring, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C index b4022f987a..285eb7ac10 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C @@ -36,14 +36,15 @@ namespace Foam namespace sixDoFRigidBodyMotionRestraints { defineTypeNameAndDebug(tabulatedAxialAngularSpring, 0); + addToRunTimeSelectionTable ( sixDoFRigidBodyMotionRestraint, tabulatedAxialAngularSpring, dictionary ); -}; -}; +} +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C index bcafbf4bf0..7d477cb413 100644 --- a/src/postProcessing/functionObjects/systemCall/systemCall.C +++ b/src/postProcessing/functionObjects/systemCall/systemCall.C @@ -29,10 +29,7 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(systemCall, 0); -} +defineTypeNameAndDebug(Foam::systemCall, 0); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C index 775ac861bf..9cd6a2af07 100644 --- a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C +++ b/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C @@ -31,10 +31,8 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(abortCalculation, 0); -} +defineTypeNameAndDebug(Foam::abortCalculation, 0); + // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C index 9eac0dbfa7..99d825fdcd 100644 --- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C +++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C @@ -34,10 +34,7 @@ using namespace Foam::constant; // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(dsmcFields, 0); -} +defineTypeNameAndDebug(Foam::dsmcFields, 0); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C index f0977a0226..94c62f968b 100644 --- a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C +++ b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C @@ -29,10 +29,8 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(staticPressure, 0); -} +defineTypeNameAndDebug(Foam::staticPressure, 0); + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C index 838b15b176..c7d7b5006f 100644 --- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C +++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C @@ -30,10 +30,7 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(timeActivatedFileUpdate, 0); -} +defineTypeNameAndDebug(Foam::timeActivatedFileUpdate, 0); // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C index f3c801faf6..405065906f 100644 --- a/src/sampling/sampledSurface/isoSurface/isoSurface.C +++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C @@ -36,10 +36,8 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(isoSurface, 0); -} +defineTypeNameAndDebug(Foam::isoSurface, 0); + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C index 177c42253f..822c668f8f 100644 --- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C +++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C @@ -34,10 +34,8 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(isoSurfaceCell, 0); -} +defineTypeNameAndDebug(Foam::isoSurfaceCell, 0); + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // From f7b0b7ca71c6b1a4291b9f43355ba15f02eb9a5f Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 9 Apr 2010 16:55:47 +0200 Subject: [PATCH 10/13] STYLE: drop 'getopt' in favour of hand-rolled option parsing - improves flexibility and allows more consistent long options --- bin/foamLog | 339 ++++++++---------- bin/foamUpdateCaseFileHeader | 109 +++--- tutorials/Alltest | 59 +-- .../biconic25-55Run35/sampleCone | 28 +- 4 files changed, 259 insertions(+), 276 deletions(-) diff --git a/bin/foamLog b/bin/foamLog index a5d2ecf254..e0e316784d 100755 --- a/bin/foamLog +++ b/bin/foamLog @@ -31,35 +31,36 @@ # Bugs # -solution singularity not handled #------------------------------------------------------------------------------ +Script=${0##*/} +toolsDir=${0%/*}/tools -PROGDIR=`dirname $0` -PROGNAME=`basename $0` -DBFILE=${PROGNAME}.db +usage() { + while [ "$#" -ge 1 ]; do echo "$1"; shift; done + cat < + -list lists but does not extract + -n create single column files with the extracted data only + -quiet quiet operation + -help print the usage -Usage: $PROGNAME [-n][-s] - extracts xy files from log - $PROGNAME -l - lists but does not extract - $PROGNAME -h - for a help message +$Script - extracts xy files from OpenFOAM logs. USAGE + exit 1 } +#------------------------------------------------------------------------------ printHelp() { -printUsage -cat <_, for every specified, for every occurrence inside @@ -79,7 +80,7 @@ separated with '/' : Column 2 is the extended regular expression (egrep) to select the line. Column 3 is the string (fgrep) to select the column inside the line. The value taken will be the first (non-space)word after this column. -The database ($PROGNAME.db) will taken from these locations: +The database ($Script.db) will taken from these locations: . $HOME/.OpenFOAM/$WM_PROJECT_VERSION @@ -87,61 +88,97 @@ The database ($PROGNAME.db) will taken from these locations: $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION $WM_PROJECT_INST_DIR/site $WM_PROJECT_DIR/etc - $PROGDIR/tools + $toolsDir -Option -s suppresses the default information and only prints the extracted +Option -q suppresses the default information and only prints the extracted variables. +----------------------------------------------------------------------------- +HELP -LABHELP +usage } -# The various places to be searched: -for i in \ - . \ - $HOME/.OpenFOAM/$WM_PROJECT_VERSION \ - $HOME/.OpenFOAM \ - $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION \ - $WM_PROJECT_INST_DIR/site \ - $WM_PROJECT_DIR/etc \ - $PROGDIR/tools \ - ; +timeName=Time +unset listOpt quietOpt + +# parse options +while [ "$#" -gt 0 ] do - if [ -r $i/$DBFILE ] - then - DBFILE="$i/$DBFILE" + case "$1" in + -h | -help) + printHelp + exit 0 + ;; + -n) + unset timeName + shift + ;; + -l | -list) + listOpt=true + shift + ;; + -q | -quiet | -s | -silent) + quietOpt=true + shift + ;; + -*) + usage "unknown option: '$*'" + ;; + *) break - fi + ;; + esac done +# find the database file +DBFILE=$Script.db +[ -f $DBFILE ] || DBFILE=`foamEtcFile $Script.db` || DBFILE=$toolsDir/$Script.db -myEcho() { - if [ "$VERBOSE" ] - then - echo "$*" - fi +# need the database file +[ -f $DBFILE ] || { + echo "$Script: Cannot read database $DBFILE" + exit 1 } +# single logFile +if [ $# -eq 1 ] +then + LOG=$1 + [ -r "$LOG" ] && [ -f "$LOG" ] || usage "Cannot read log $LOG" +else + usage +fi + + +myEcho() +{ + [ "$quietOpt" = true ] || echo "$*" +} + + # getSolvedVars logFile # Prints names of all 'solved for' variables in the log file. -getSolvedVars() { +getSolvedVars() +{ fgrep ' Solving for ' $1 | fgrep ',' | sed -e 's/.* Solving for \([^,]*\)[,:].*/\1/' | sort -u } # getQueries dbFile queryName # Gets regular expressions for a certain queryName from the database -getQueries() { - if [ ! -f "$1" ] - then - echo "Cannot find dbFile $1" - exit 1 - fi - +getQueries() +{ + dbFile=$1 queryName=$2 - LINEQ=`grep -v '^#' $1 | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $2}'` - NUMQ=`grep -v '^#' $1 | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $3}'` + [ -f "$dbFile" ] || { + echo "Cannot find dbFile $dbFile" + exit 1 + } + + LINEQ=`grep -v '^#' $dbFile | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $2}'` + NUMQ=`grep -v '^#' $dbFile | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $3}'` #echo "For $queryName found line selection /$LINEQ/ , column selection /$NUMQ/" 1>&2 #if [ ! "$LINEQ" -o ! "$NUMQ" ] @@ -153,14 +190,16 @@ getQueries() { # getDbQueryList dbFile # Echoes list of possible queries -getDbQueryList() { +getDbQueryList() +{ grep -v '^#' $1 | grep '[^ \t]' | awk -F '/' '{print $1}' } # getSolveQueryList logFile # Echoes list of queries from "solved for" variables in log file -getSolveQueryList() { +getSolveQueryList() +{ solvedVars=`getSolvedVars $1` for var in $solvedVars @@ -174,7 +213,8 @@ getSolveQueryList() { # getAllQueries dbFile logFile # Gets all queries from database and from logfile -getAllQueries() { +getAllQueries() +{ #-- All solved for queries from log file queries=`getSolveQueryList $2` @@ -208,107 +248,33 @@ getAllQueries() { # Main #----------------------------- -# sort arguments -TIMENAME='Time' -VERBOSE='yes' -LISTONLY='' - -while getopts nslh flags -do - case $flags in - n) - TIMENAME="" - ;; - h) - printHelp - exit 0 - ;; - s) - VERBOSE="" - ;; - l) - LISTONLY='yes' - ;; - \?) - printUsage - exit 1 - ;; - esac -done - - -# Shift options -shift `expr $OPTIND - 1` - -if [ ! -f $DBFILE ] +if [ "$listOpt" = true ] then - echo "$PROGNAME: Cannot read database $DBFILE" - exit 1 -fi - -if [ "$LISTONLY" ] -then - if [ $# -ne 1 ] - then - printUsage - exit 1 - fi - LOG=$1; - if [ ! -r $LOG ] - then - echo "$PROGNAME: Cannot read log $LOG" - exit 1 - fi getAllQueries $DBFILE $LOG exit 0 fi -if [ $# -ne 1 ] -then - printUsage - exit 1 -fi +caseDir=. +outputDir=$caseDir/logs -CASEDIR=. -LOG=$1 -if [ ! -r $LOG ] -then - echo "$PROGNAME: Cannot read log $LOG" +[ -d "$caseDir" ] || { + echo "$Script: Cannot read $caseDir" exit 1 -fi +} QUERYNAMES=`getAllQueries $DBFILE $LOG` - -if [ ! "$CASEDIR" ] -then - printUsage - exit 1 -fi - -if [ ! -d "$CASEDIR" ] -then - echo "$PROGNAME: Cannot read $CASEDIR" - exit 1 -fi - -if [ ! -f "$LOG" ] -then - echo "$PROGNAME: Cannot read log file $LOG" - exit 1 -fi - - -#-- Make logs dir in case directory and put awk file there. - -mkdir -p $CASEDIR/logs -AWKFILE=$CASEDIR/logs/$PROGNAME.awk +# +# Make logs dir in case directory and place awk file there +# +mkdir -p $outputDir +AWKFILE=$outputDir/$Script.awk myEcho "Using:" myEcho " log : $LOG" myEcho " database : $DBFILE" myEcho " awk file : $AWKFILE" -myEcho " files to : $CASEDIR/logs" +myEcho " files to : $outputDir" myEcho "" @@ -316,22 +282,25 @@ myEcho "" # Generate Awk program #----------------------------- -#-- header +rm -f $AWKFILE 2> /dev/null +cat << AWK_CONTENTS > $AWKFILE +# header +BEGIN { + Iteration=0 + resetCounters() +} -rm -f $AWKFILE; touch $AWKFILE -echo "BEGIN {" >> $AWKFILE -echo " Iteration=0" >> $AWKFILE -echo " resetCounters()" >> $AWKFILE -echo "}" >> $AWKFILE +# reset counters used for variable postfix +function resetCounters() { +AWK_CONTENTS +# ---------- -echo "" >> $AWKFILE -echo "# reset counters used for variable postfix" >> $AWKFILE -echo "function resetCounters() {" >> $AWKFILE for queryName in $QUERYNAMES do varName=${queryName}Cnt echo " ${varName}=0" >> $AWKFILE done + echo " # Reset counters for general Solving for extraction" >> $AWKFILE echo " for (varName in subIter)" >> $AWKFILE echo " {" >> $AWKFILE @@ -341,10 +310,9 @@ echo "}" >> $AWKFILE echo "" >> $AWKFILE -cat <