diff --git a/etc/caseDicts/postProcessing/fields/fieldAverage.cfg b/etc/caseDicts/postProcessing/fields/fieldAverage.cfg new file mode 100644 index 0000000000..d49d9c07c7 --- /dev/null +++ b/etc/caseDicts/postProcessing/fields/fieldAverage.cfg @@ -0,0 +1,15 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ + +type fieldAverage; +functionObjectLibs ("libfieldFunctionObjects.so"); + +timeStart 0; +writeControl writeTime; + +// ************************************************************************* // diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H index 88e6460fb2..ee8a824dc6 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H +++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,9 +30,9 @@ Description \verbatim { - mean on; - prime2Mean on; - base time; // iteration + mean on; // (default = on) + prime2Mean on; // (default = off) + base time; // time or iteration (default = time) window 200; // optional averaging window windowName w1; // optional window name (default = "") } @@ -68,7 +68,6 @@ namespace functionObjects // Forward declaration of friend functions and operators class fieldAverageItem; Istream& operator>>(Istream&, fieldAverageItem&); -Ostream& operator<<(Ostream&, const fieldAverageItem&); /*---------------------------------------------------------------------------*\ Class fieldAverageItem Declaration @@ -259,7 +258,6 @@ public: // IOstream Operators friend Istream& operator>>(Istream&, fieldAverageItem&); - friend Ostream& operator<<(Ostream&, const fieldAverageItem&); }; diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C index a2ff2847f7..fb7467f4ce 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C +++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "fieldAverageItem.H" -#include "IOstreams.H" #include "dictionaryEntry.H" #include "IOobject.H" @@ -40,38 +39,7 @@ Foam::functionObjects::fieldAverageItem::fieldAverageItem(Istream& is) base_(baseType::iter), window_(-1.0) { - is.check - ( - "Foam::functionObjects::fieldAverageItem::fieldAverageItem" - "(Foam::Istream&)" - ); - - const dictionaryEntry entry(dictionary::null, is); - - fieldName_ = entry.keyword(); - entry.lookup("mean") >> mean_; - entry.lookup("prime2Mean") >> prime2Mean_; - base_ = baseTypeNames_[entry.lookup("base")]; - window_ = entry.lookupOrDefault("window", -1.0); - windowName_ = entry.lookupOrDefault("windowName", ""); - - meanFieldName_ = IOobject::groupName - ( - IOobject::member(fieldName_) + meanExt, - IOobject::group(fieldName_) - ); - - prime2MeanFieldName_ = IOobject::groupName - ( - IOobject::member(fieldName_) + prime2MeanExt, - IOobject::group(fieldName_) - ); - - if ((window_ > 0) && (windowName_ != "")) - { - meanFieldName_ = meanFieldName_ + "_" + windowName_; - prime2MeanFieldName_ = prime2MeanFieldName_ + "_" + windowName_; - } + is >> *this; } @@ -89,14 +57,31 @@ Foam::Istream& Foam::functionObjects::operator>> "(Foam::Istream&, Foam::functionObjects::fieldAverageItem&)" ); - const dictionaryEntry entry(dictionary::null, is); + token fieldNameToken(is); + faItem.fieldName_ = fieldNameToken.wordToken(); - faItem.fieldName_ = entry.keyword(); - entry.lookup("mean") >> faItem.mean_; - entry.lookup("prime2Mean") >> faItem.prime2Mean_; - faItem.base_ = faItem.baseTypeNames_[entry.lookup("base")]; - faItem.window_ = entry.lookupOrDefault("window", -1.0); - faItem.windowName_ = entry.lookupOrDefault("windowName", ""); + token nextToken(is); + is.putBack(nextToken); + + if (nextToken.isPunctuation() && nextToken.pToken() == token::BEGIN_BLOCK) + { + const dictionary entry(dictionary::null, is); + + faItem.mean_ = entry.lookupOrDefault("mean", true); + faItem.prime2Mean_ = entry.lookupOrDefault("prime2Mean", false); + faItem.base_ = + faItem.baseTypeNames_[entry.lookupOrDefault("base", "time")]; + faItem.window_ = entry.lookupOrDefault("window", -1); + faItem.windowName_ = entry.lookupOrDefault("windowName", ""); + } + else + { + faItem.mean_ = true; + faItem.prime2Mean_ = false; + faItem.base_ = faItem.baseTypeNames_["time"]; + faItem.window_ = -1; + faItem.windowName_ = ""; + } faItem.meanFieldName_ = IOobject::groupName ( @@ -118,48 +103,9 @@ Foam::Istream& Foam::functionObjects::operator>> faItem.prime2MeanFieldName_ = faItem.prime2MeanFieldName_ + "_" + faItem.windowName_; } + return is; } -Foam::Ostream& Foam::functionObjects::operator<< -( - Ostream& os, - const fieldAverageItem& faItem -) -{ - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Foam::Ostream&, const Foam::functionObjects::fieldAverageItem&)" - ); - - os << faItem.fieldName_ << nl << token::BEGIN_BLOCK << nl; - - writeEntry(os, "mean", faItem.mean_); - writeEntry(os, "prime2Mean", faItem.prime2Mean_); - writeEntry(os, "base", faItem.baseTypeNames_[faItem.base_]); - - if (faItem.window_ > 0) - { - writeEntry(os, "window", faItem.window_); - - if (faItem.windowName_ != "") - { - writeEntry(os, "windowName", faItem.windowName_); - } - } - - os << token::END_BLOCK << nl; - - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Foam::Ostream&, const Foam::functionObjects::fieldAverageItem&)" - ); - - return os; -} - - // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict index 57d6b6e8f4..7ed78ff1d6 100644 --- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict @@ -53,24 +53,18 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" fields ( U { - mean on; prime2Mean on; - base time; } p { - mean on; prime2Mean on; - base time; } ); } diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict index 3c8269fad8..9c8e03d2b2 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict @@ -51,68 +51,22 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" fields ( rhoN - { - mean on; - prime2Mean off; - base time; - } rhoM - { - mean on; - prime2Mean off; - base time; - } dsmcRhoN - { - mean on; - prime2Mean off; - base time; - } momentum - { - mean on; - prime2Mean off; - base time; - } linearKE - { - mean on; - prime2Mean off; - base time; - } internalE - { - mean on; - prime2Mean off; - base time; - } iDof - { - mean on; - prime2Mean off; - base time; - } q - { - mean on; - prime2Mean off; - base time; - } fD - { - mean on; - prime2Mean off; - base time; - } ); } + dsmcFields1 { type dsmcFields; diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict index b7cfe073cb..0679cd2ca4 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict @@ -51,69 +51,23 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" restartOnOutput off; fields ( rhoN - { - mean on; - prime2Mean off; - base time; - } rhoM - { - mean on; - prime2Mean off; - base time; - } dsmcRhoN - { - mean on; - prime2Mean off; - base time; - } momentum - { - mean on; - prime2Mean off; - base time; - } linearKE - { - mean on; - prime2Mean off; - base time; - } internalE - { - mean on; - prime2Mean off; - base time; - } iDof - { - mean on; - prime2Mean off; - base time; - } q - { - mean on; - prime2Mean off; - base time; - } fD - { - mean on; - prime2Mean off; - base time; - } ); } + dsmcFields1 { type dsmcFields; diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict index cb979b847a..a8dd6b355c 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict @@ -51,66 +51,19 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" fields ( rhoN - { - mean on; - prime2Mean off; - base time; - } rhoM - { - mean on; - prime2Mean off; - base time; - } dsmcRhoN - { - mean on; - prime2Mean off; - base time; - } momentum - { - mean on; - prime2Mean off; - base time; - } linearKE - { - mean on; - prime2Mean off; - base time; - } internalE - { - mean on; - prime2Mean off; - base time; - } iDof - { - mean on; - prime2Mean off; - base time; - } q - { - mean on; - prime2Mean off; - base time; - } fD - { - mean on; - prime2Mean off; - base time; - } ); } diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict index 00f1eec563..a118247348 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict @@ -51,66 +51,19 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" fields ( rhoN - { - mean on; - prime2Mean off; - base time; - } rhoM - { - mean on; - prime2Mean off; - base time; - } dsmcRhoN - { - mean on; - prime2Mean off; - base time; - } momentum - { - mean on; - prime2Mean off; - base time; - } linearKE - { - mean on; - prime2Mean off; - base time; - } internalE - { - mean on; - prime2Mean off; - base time; - } iDof - { - mean on; - prime2Mean off; - base time; - } q - { - mean on; - prime2Mean off; - base time; - } fD - { - mean on; - prime2Mean off; - base time; - } ); } diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict index 309bbb1830..7f462384aa 100644 --- a/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict @@ -49,24 +49,18 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" fields ( U { - mean on; - prime2Mean on; - base time; + prime2Mean yes; } p { - mean on; - prime2Mean on; - base time; + prime2Mean yes; } ); } diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict index 047663fc99..da270d3ac3 100644 --- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict +++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict @@ -74,24 +74,18 @@ functions fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" fields ( U { - mean on; - prime2Mean on; - base time; + prime2Mean yes; } p { - mean on; - prime2Mean on; - base time; + prime2Mean yes; } ); } diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict index aa7fab4503..92c99b7888 100644 --- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict +++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict @@ -74,24 +74,18 @@ functions fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" fields ( U { - mean on; - prime2Mean on; - base time; + prime2Mean yes; } p { - mean on; - prime2Mean on; - base time; + prime2Mean yes; } ); } diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict index 9c4f3118d1..1072f104fd 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict @@ -53,31 +53,13 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } - alpha.vapour - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict index ac393e12b2..502c6d6e79 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict @@ -53,31 +53,13 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } - alpha.vapour - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict index 12ba05d107..da949e232b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/system/controlDict index 96ef840b81..e7e46a007b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.particles - { - mean on; - prime2Mean off; - base time; - } - U.air - { - mean on; - prime2Mean off; - base time; - } - alpha.particles - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict index 3b6d45e338..9eee1b498c 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/system/controlDict index ea31be5929..925fa04665 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/system/controlDict @@ -55,52 +55,16 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air1 - { - mean on; - prime2Mean off; - base time; - } - U.air2 - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air1 - { - mean on; - prime2Mean off; - base time; - } - alpha.air2 - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/controlDict index 624ce2770d..d874a33565 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/controlDict @@ -55,52 +55,16 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air1 - { - mean on; - prime2Mean off; - base time; - } - U.air2 - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air1 - { - mean on; - prime2Mean off; - base time; - } - alpha.air2 - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict index 780f5abcf4..4b13f832e0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict index 780f5abcf4..4b13f832e0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict index 5adbbd9a25..786254c7e9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict index e2b8f9e4f1..1f00d21639 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.particles - { - mean on; - prime2Mean off; - base time; - } - U.air - { - mean on; - prime2Mean off; - base time; - } - alpha.particles - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict index 780f5abcf4..4b13f832e0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict index 780f5abcf4..4b13f832e0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict index ccaa8a817c..449a1a3803 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.particles - { - mean on; - prime2Mean off; - base time; - } - U.air - { - mean on; - prime2Mean off; - base time; - } - alpha.particles - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict index 584c49630e..af2f303d07 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict index 584c49630e..af2f303d07 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict index d5b21f0c94..242fc30fe9 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.particles - { - mean on; - prime2Mean off; - base time; - } - U.air - { - mean on; - prime2Mean off; - base time; - } - alpha.particles - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict index 584c49630e..af2f303d07 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict index 584c49630e..af2f303d07 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.air - { - mean on; - prime2Mean off; - base time; - } - U.water - { - mean on; - prime2Mean off; - base time; - } - alpha.air - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict index 0455dcbe06..2ed439a829 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict @@ -55,38 +55,14 @@ functions { fieldAverage1 { - type fieldAverage; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" + fields ( U.particles - { - mean on; - prime2Mean off; - base time; - } - U.air - { - mean on; - prime2Mean off; - base time; - } - alpha.particles - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } ); } }