From 0177c7dd59b3a0be669d520d8652a3d60435a370 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 17 Mar 2020 20:15:17 +0000 Subject: [PATCH] functionObjects::fieldAverage: Simplified the controls Rather than specifying the controls per field it is simpler to use a single set of controls for all the fields in the list and use separate instances of the fieldAverage functionObject for different control sets: Example of function object specification setting all the optional parameters: fieldAverage1 { type fieldAverage; libs ("libfieldFunctionObjects.so"); writeControl writeTime; restartOnRestart false; restartOnOutput false; periodicRestart false; restartPeriod 0.002; base time; window 10.0; windowName w1; mean yes; prime2Mean yes; fields (U p); } This allows for a simple specification with the optional prime2Mean entry using #includeFunc fieldAverage(U, p, prime2Mean = yes) or if the prime2Mean is not needed just #includeFunc fieldAverage(U, p) --- .../postProcessing/fields/fieldAverage | 3 + .../field/fieldAverage/fieldAverage.C | 36 ++++- .../field/fieldAverage/fieldAverage.H | 95 ++++++++++--- .../fieldAverageItem/fieldAverageItem.C | 63 +-------- .../fieldAverageItem/fieldAverageItem.H | 127 ++++-------------- .../fieldAverageItem/fieldAverageItemIO.C | 71 ++++------ .../fieldAverage/fieldAverageTemplates.C | 15 +-- .../LES/pitzDaily/system/controlDict | 18 +-- .../LES/channel395/system/controlDict | 18 +-- .../pisoFoam/LES/pitzDaily/system/controlDict | 18 +-- .../LES/pitzDailyMapped/system/controlDict | 18 +-- .../LES/throttle/system/controlDict | 12 +- .../LES/throttle3D/system/controlDict | 12 +- .../bubbleColumn/system/controlDict | 13 +- .../RAS/fluidisedBed/system/controlDict | 13 +- .../laminar/bubbleColumn/system/controlDict | 13 +- .../system/controlDict | 23 ++-- .../system/controlDict | 24 ++-- .../LES/bubbleColumn/system/controlDict | 13 +- .../system/controlDict | 13 +- .../RAS/fluidisedBed/system/controlDict | 13 +- .../laminar/bubbleColumn/system/controlDict | 13 +- .../bubbleColumnIATE/system/controlDict | 13 +- .../laminar/fluidisedBed/system/controlDict | 13 +- .../LES/bubbleColumn/system/controlDict | 13 +- .../RAS/bubbleColumn/system/controlDict | 13 +- .../RAS/fluidisedBed/system/controlDict | 13 +- .../laminar/bubbleColumn/system/controlDict | 13 +- .../bubbleColumnIATE/system/controlDict | 13 +- .../laminar/fluidisedBed/system/controlDict | 13 +- 30 files changed, 213 insertions(+), 535 deletions(-) diff --git a/etc/caseDicts/postProcessing/fields/fieldAverage b/etc/caseDicts/postProcessing/fields/fieldAverage index 1689646ca0..acba139033 100644 --- a/etc/caseDicts/postProcessing/fields/fieldAverage +++ b/etc/caseDicts/postProcessing/fields/fieldAverage @@ -12,6 +12,9 @@ Description #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" +mean yes; +prime2Mean no; + fields (); // ************************************************************************* // diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.C b/src/functionObjects/field/fieldAverage/fieldAverage.C index ff8898715d..6c916dd5e7 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverage.C +++ b/src/functionObjects/field/fieldAverage/fieldAverage.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 "fieldAverage.H" -#include "volFields.H" #include "fieldAverageItem.H" #include "addToRunTimeSelectionTable.H" @@ -40,6 +39,20 @@ namespace functionObjects } +template<> +const char* Foam::NamedEnum +< + Foam::functionObjects::fieldAverage::baseType, + 2 +>::names[] = { "iteration", "time"}; + +const Foam::NamedEnum +< + Foam::functionObjects::fieldAverage::baseType, + 2 +> Foam::functionObjects::fieldAverage::baseTypeNames_; + + // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void Foam::functionObjects::fieldAverage::resetFields() @@ -293,6 +306,9 @@ Foam::functionObjects::fieldAverage::fieldAverage periodicRestart_(false), restartPeriod_(great), initialised_(false), + base_(baseType::iter), + window_(-1.0), + windowName_(""), faItems_(), totalIter_(), totalTime_(), @@ -321,7 +337,21 @@ bool Foam::functionObjects::fieldAverage::read(const dictionary& dict) dict.readIfPresent("restartOnRestart", restartOnRestart_); dict.readIfPresent("restartOnOutput", restartOnOutput_); dict.readIfPresent("periodicRestart", periodicRestart_); - dict.lookup("fields") >> faItems_; + + mean_ = dict.lookupOrDefault("mean", true); + prime2Mean_ = dict.lookupOrDefault("prime2Mean", false); + base_ = baseTypeNames_ + [ + dict.lookupOrDefault("base", "time") + ]; + window_ = dict.lookupOrDefault("window", -1); + windowName_ = dict.lookupOrDefault("windowName", ""); + + faItems_ = PtrList + ( + dict.lookup("fields"), + fieldAverageItem::iNew(*this) + ); if (periodicRestart_) { diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.H b/src/functionObjects/field/fieldAverage/fieldAverage.H index 5ef49cfaa1..27516fe8f5 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverage.H +++ b/src/functionObjects/field/fieldAverage/fieldAverage.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 @@ -61,30 +61,21 @@ Description type fieldAverage; libs ("libfieldFunctionObjects.so"); - writeControl writeTime; + writeControl writeTime; restartOnRestart false; restartOnOutput false; periodicRestart false; restartPeriod 0.002; - fields - ( - U - { - mean on; - prime2Mean on; - base time; - window 10.0; - windowName w1; - } - p - { - mean on; - prime2Mean on; - base time; - } - ); + base time; + window 10.0; + windowName w1; + + mean yes; + prime2Mean yes; + + fields (U p); } \endverbatim @@ -99,7 +90,6 @@ Usage fields | list of fields and averaging options | yes | \endtable - Note To employ the \c prime2Mean option, the \c mean option must be selected. @@ -137,6 +127,17 @@ class fieldAverage : public fvMeshFunctionObject { + +public: + + //- Enumeration defining the averaging base type + enum class baseType + { + iter, + time + }; + + protected: // Protected data @@ -159,9 +160,27 @@ protected: //- Initialised flag bool initialised_; + //- Averaging base type names + static const NamedEnum baseTypeNames_; + + //- Averaging base type + baseType base_; + + //- Averaging window - defaults to -1 for 'all iters/time' + scalar window_; + + //- Averaging window name - defaults to 'window' + word windowName_; + + //- Compute mean flag + Switch mean_; + + //- Compute prime-squared mean flag + Switch prime2Mean_; + //- List of field average items, describing what averages to be // calculated and output - List faItems_; + PtrList faItems_; // Counters @@ -259,6 +278,9 @@ protected: public: + friend class fieldAverageItem; + + //- Runtime type information TypeName("fieldAverage"); @@ -283,6 +305,37 @@ public: // Member Functions + // Access + + //- Return averaging base type name + const word base() const + { + return baseTypeNames_[base_]; + } + + //- Return true if base is iter + Switch iterBase() const + { + return base_ == baseType::iter; + } + + //- Return true if base is time + Switch timeBase() const + { + return base_ == baseType::time; + } + + scalar window() const + { + return window_; + } + + const word& windowName() const + { + return windowName_; + } + + //- Read the field average data virtual bool read(const dictionary&); diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C index 022ad37d2f..2b12520e8e 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C +++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.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 @@ -37,19 +37,6 @@ const Foam::word Foam::functionObjects::fieldAverageItem::prime2MeanExt "Prime2Mean" ); -template<> -const char* Foam::NamedEnum -< - Foam::functionObjects::fieldAverageItem::baseType, - 2 ->::names[] = { "iteration", "time"}; - -const Foam::NamedEnum -< - Foam::functionObjects::fieldAverageItem::baseType, - 2 -> Foam::functionObjects::fieldAverageItem::baseTypeNames_; - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -59,26 +46,7 @@ Foam::functionObjects::fieldAverageItem::fieldAverageItem() mean_(0), meanFieldName_("unknown"), prime2Mean_(0), - prime2MeanFieldName_("unknown"), - base_(baseType::iter), - window_(-1.0), - windowName_("") -{} - - -Foam::functionObjects::fieldAverageItem::fieldAverageItem -( - const fieldAverageItem& faItem -) -: - fieldName_(faItem.fieldName_), - mean_(faItem.mean_), - meanFieldName_(faItem.meanFieldName_), - prime2Mean_(faItem.prime2Mean_), - prime2MeanFieldName_(faItem.prime2MeanFieldName_), - base_(faItem.base_), - window_(faItem.window_), - windowName_(faItem.windowName_) + prime2MeanFieldName_("unknown") {} @@ -88,31 +56,4 @@ Foam::functionObjects::fieldAverageItem::~fieldAverageItem() {} -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -void Foam::functionObjects::fieldAverageItem::operator= -( - const fieldAverageItem& rhs -) -{ - // Check for assignment to self - if (this == &rhs) - { - FatalErrorInFunction - << "Attempted assignment to self" << nl - << abort(FatalError); - } - - // Set updated values - fieldName_ = rhs.fieldName_; - mean_ = rhs.mean_; - meanFieldName_ = rhs.meanFieldName_; - prime2Mean_ = rhs.prime2Mean_; - prime2MeanFieldName_ = rhs.prime2MeanFieldName_; - base_ = rhs.base_; - window_ = rhs.window_; - windowName_ = rhs.windowName_; -} - - // ************************************************************************* // diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H index ee8a824dc6..d7aea4552a 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H +++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H @@ -60,14 +60,11 @@ namespace Foam // Forward declaration of classes class Istream; -class Ostream; namespace functionObjects { -// Forward declaration of friend functions and operators -class fieldAverageItem; -Istream& operator>>(Istream&, fieldAverageItem&); +class fieldAverage; /*---------------------------------------------------------------------------*\ Class fieldAverageItem Declaration @@ -75,18 +72,6 @@ Istream& operator>>(Istream&, fieldAverageItem&); class fieldAverageItem { -public: - - //- Enumeration defining the averaging base type - enum class baseType - { - iter, - time - }; - - -private: - // Private Data //- Field name @@ -104,18 +89,6 @@ private: //- Name of prime-squared mean field word prime2MeanFieldName_; - //- Averaging base type names - static const NamedEnum baseTypeNames_; - - //- Averaging base type - baseType base_; - - //- Averaging window - defaults to -1 for 'all iters/time' - scalar window_; - - //- Averaging window name - defaults to 'window' - word windowName_; - public: @@ -135,11 +108,36 @@ public: //- Construct null fieldAverageItem(); - //- Construct from Istream - fieldAverageItem(Istream&); + //- Construct from Istream for given fieldAverage + fieldAverageItem(const fieldAverage& fa, Istream& is); //- Copy constructor - fieldAverageItem(const fieldAverageItem&); + fieldAverageItem(const fieldAverageItem&) = default; + + //- Clone function + autoPtr clone() const + { + return autoPtr(new fieldAverageItem(*this)); + } + + //- Class used for the read-construction of + // PtrLists of fieldAverageItem + class iNew + { + const fieldAverage& fa_; + + public: + + iNew(const fieldAverage& fa) + : + fa_(fa) + {} + + autoPtr operator()(Istream& is) const + { + return autoPtr(new fieldAverageItem(fa_, is)); + } + }; //- Destructor @@ -191,73 +189,6 @@ public: { return prime2MeanFieldName_; } - - //- Return averaging base type name - const word base() const - { - return baseTypeNames_[base_]; - } - - //- Return true if base is iter - Switch iterBase() const - { - return base_ == baseType::iter; - } - - //- Return true if base is time - Switch timeBase() const - { - return base_ == baseType::time; - } - - scalar window() const - { - return window_; - } - - const word& windowName() const - { - return windowName_; - } - - - // Member Operators - - void operator=(const fieldAverageItem&); - - - // Friend Operators - - friend bool operator== - ( - const fieldAverageItem& a, - const fieldAverageItem& b - ) - { - return - a.fieldName_ == b.fieldName_ - && a.mean_ == b.mean_ - && a.meanFieldName_ == b.meanFieldName_ - && a.prime2Mean_ == b.prime2Mean_ - && a.prime2MeanFieldName_ == b.prime2MeanFieldName_ - && a.base_ == b.base_ - && a.window_ == b.window_ - && a.windowName_ == b.windowName_; - } - - friend bool operator!= - ( - const fieldAverageItem& a, - const fieldAverageItem& b - ) - { - return !(a == b); - } - - - // IOstream Operators - - friend Istream& operator>>(Istream&, fieldAverageItem&); }; diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C index fb7467f4ce..dd81ad86b4 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C +++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C @@ -24,32 +24,21 @@ License \*---------------------------------------------------------------------------*/ #include "fieldAverageItem.H" -#include "dictionaryEntry.H" -#include "IOobject.H" +#include "fieldAverage.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::functionObjects::fieldAverageItem::fieldAverageItem(Istream& is) +Foam::functionObjects::fieldAverageItem::fieldAverageItem +( + const fieldAverage& fa, + Istream& is +) : fieldName_("unknown"), - mean_(0), + mean_(false), meanFieldName_("unknown"), - prime2Mean_(0), - prime2MeanFieldName_("unknown"), - base_(baseType::iter), - window_(-1.0) -{ - is >> *this; -} - - -// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // - -Foam::Istream& Foam::functionObjects::operator>> -( - Istream& is, - fieldAverageItem& faItem -) + prime2Mean_(false), + prime2MeanFieldName_("unknown") { is.check ( @@ -58,7 +47,7 @@ Foam::Istream& Foam::functionObjects::operator>> ); token fieldNameToken(is); - faItem.fieldName_ = fieldNameToken.wordToken(); + fieldName_ = fieldNameToken.wordToken(); token nextToken(is); is.putBack(nextToken); @@ -67,44 +56,36 @@ Foam::Istream& Foam::functionObjects::operator>> { 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", ""); + mean_ = entry.lookupOrDefault("mean", fa.mean_); + prime2Mean_ = + entry.lookupOrDefault("prime2Mean", fa.prime2Mean_); } else { - faItem.mean_ = true; - faItem.prime2Mean_ = false; - faItem.base_ = faItem.baseTypeNames_["time"]; - faItem.window_ = -1; - faItem.windowName_ = ""; + mean_ = fa.mean_; + prime2Mean_ = fa.prime2Mean_; } - faItem.meanFieldName_ = IOobject::groupName + meanFieldName_ = IOobject::groupName ( - IOobject::member(faItem.fieldName_) + fieldAverageItem::meanExt, - IOobject::group(faItem.fieldName_) + IOobject::member(fieldName_) + fieldAverageItem::meanExt, + IOobject::group(fieldName_) ); - faItem.prime2MeanFieldName_ = IOobject::groupName + prime2MeanFieldName_ = IOobject::groupName ( - IOobject::member(faItem.fieldName_) + fieldAverageItem::prime2MeanExt, - IOobject::group(faItem.fieldName_) + IOobject::member(fieldName_) + fieldAverageItem::prime2MeanExt, + IOobject::group(fieldName_) ); - if ((faItem.window_ > 0) && (faItem.windowName_ != "")) + if ((fa.window_ > 0) && (fa.windowName_ != "")) { - faItem.meanFieldName_ = - faItem.meanFieldName_ + "_" + faItem.windowName_; + meanFieldName_ = + meanFieldName_ + "_" + fa.windowName_; - faItem.prime2MeanFieldName_ = - faItem.prime2MeanFieldName_ + "_" + faItem.windowName_; + prime2MeanFieldName_ = + prime2MeanFieldName_ + "_" + fa.windowName_; } - - return is; } diff --git a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C index d502180980..c21cad19d2 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C +++ b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,6 @@ License #include "fieldAverageItem.H" #include "volFields.H" #include "surfaceFields.H" -#include "OFstream.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -202,7 +201,7 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType scalar dt = obr_.time().deltaTValue(); scalar Dt = totalTime_[fieldi]; - if (faItems_[fieldi].iterBase()) + if (iterBase()) { dt = 1; Dt = scalar(totalIter_[fieldi]); @@ -210,9 +209,9 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType scalar beta = dt/Dt; - if (faItems_[fieldi].window() > 0) + if (window() > 0) { - const scalar w = faItems_[fieldi].window(); + const scalar w = window(); if (Dt - dt >= w) { @@ -262,7 +261,7 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType scalar dt = obr_.time().deltaTValue(); scalar Dt = totalTime_[fieldi]; - if (faItems_[fieldi].iterBase()) + if (iterBase()) { dt = 1; Dt = scalar(totalIter_[fieldi]); @@ -270,9 +269,9 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType scalar beta = dt/Dt; - if (faItems_[fieldi].window() > 0) + if (window() > 0) { - const scalar w = faItems_[fieldi].window(); + const scalar w = window(); if (Dt - dt >= w) { diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict index 7ed78ff1d6..43d58122b0 100644 --- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict @@ -51,23 +51,7 @@ maxCo 0.5; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U - { - prime2Mean on; - } - - p - { - prime2Mean on; - } - ); - } + #includeFunc fieldAverage(U, p, prime2Mean = yes) } // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict index 7f462384aa..aa1901c16b 100644 --- a/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict @@ -47,23 +47,7 @@ runTimeModifiable true; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U - { - prime2Mean yes; - } - - p - { - prime2Mean yes; - } - ); - } + #includeFunc fieldAverage(U, p, prime2Mean = yes) } // ************************************************************************* // diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict index da270d3ac3..3d2b7c8989 100644 --- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict +++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict @@ -72,23 +72,7 @@ functions } - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U - { - prime2Mean yes; - } - - p - { - prime2Mean yes; - } - ); - } + #includeFunc fieldAverage(U, p, prime2Mean = yes) surfaceSampling { diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict index 92c99b7888..7ffcc5a402 100644 --- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict +++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict @@ -72,23 +72,7 @@ functions } - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U - { - prime2Mean yes; - } - - p - { - prime2Mean yes; - } - ); - } + #includeFunc fieldAverage(U, p, prime2Mean = yes) surfaceSampling { diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict index 1072f104fd..e1eeb90f6c 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict @@ -51,17 +51,7 @@ maxAcousticCo 50; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U - p - alpha.vapour - ); - } + #includeFunc fieldAverage(U, p, alpha.vapour) } diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict index 502c6d6e79..4f0c687731 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict @@ -51,17 +51,7 @@ maxAcousticCo 50; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U - p - alpha.vapour - ); - } + #includeFunc fieldAverage(U, p, alpha.vapour) } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict index da949e232b..76dc40fbe1 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/system/controlDict index e7e46a007b..5553272e0e 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 0.01; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.particles - U.air - alpha.particles - p - ); - } + #includeFunc fieldAverage(U.particles, U.air, alpha.particles, p) } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict index 9eee1b498c..bd28fbead7 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/system/controlDict index 925fa04665..6740784f66 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/system/controlDict @@ -53,20 +53,15 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air1 - U.air2 - U.water - alpha.air1 - alpha.air2 - p - ); - } + #includeFunc fieldAverage + ( + U.air1, + U.air2, + U.water, + alpha.air1, + alpha.air2, + p + ) } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/controlDict index d874a33565..4ae95cbb01 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/controlDict @@ -53,21 +53,15 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air1 - U.air2 - U.water - alpha.air1 - alpha.air2 - p - ); - } - + #includeFunc fieldAverage + ( + U.air1, + U.air2, + U.water, + alpha.air1, + alpha.air2, + p + ) numberDensity { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict index 4b13f832e0..60563fe0e9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict index 786254c7e9..39701b6957 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) numberDensity { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict index 1f00d21639..aeb79b5bfd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 0.01; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.particles - U.air - alpha.particles - p - ); - } + #includeFunc fieldAverage(U.particles, U.air, alpha.particles, p) } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict index 4b13f832e0..60563fe0e9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict index 4b13f832e0..60563fe0e9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict index 449a1a3803..4dd17004cf 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1e-05; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.particles - U.air - alpha.particles - p - ); - } + #includeFunc fieldAverage(U.particles, U.air, alpha.particles, p) } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict index af2f303d07..41ed081f61 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict index af2f303d07..41ed081f61 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict index 242fc30fe9..30b21a26b9 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1e-05; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.particles - U.air - alpha.particles - p - ); - } + #includeFunc fieldAverage(U.particles, U.air, alpha.particles, p) } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict index af2f303d07..41ed081f61 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict index af2f303d07..41ed081f61 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.air - U.water - alpha.air - p - ); - } + #includeFunc fieldAverage(U.air, U.water, alpha.air, p) } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict index 2ed439a829..6ee416f408 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict @@ -53,18 +53,7 @@ maxDeltaT 1e-05; functions { - fieldAverage1 - { - #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" - - fields - ( - U.particles - U.air - alpha.particles - p - ); - } + #includeFunc fieldAverage(U.particles, U.air, alpha.particles, p) }