diff --git a/src/functionObjects/field/CourantNo/CourantNo.C b/src/functionObjects/field/CourantNo/CourantNo.C index 8e2202c057..6ec91d1a28 100644 --- a/src/functionObjects/field/CourantNo/CourantNo.C +++ b/src/functionObjects/field/CourantNo/CourantNo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,9 +112,8 @@ Foam::functionObjects::CourantNo::CourantNo const dictionary& dict ) : - fieldExpression(name, runTime, dict, "phi") + fieldExpression(name, runTime, dict, "Co", "phi") { - setResultName("Co", "phi"); read(dict); } diff --git a/src/functionObjects/field/Lambda2/Lambda2.C b/src/functionObjects/field/Lambda2/Lambda2.C index cbba786fbd..eab2077b9c 100644 --- a/src/functionObjects/field/Lambda2/Lambda2.C +++ b/src/functionObjects/field/Lambda2/Lambda2.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,10 +83,8 @@ Foam::functionObjects::Lambda2::Lambda2 const dictionary& dict ) : - fieldExpression(name, runTime, dict, "U") -{ - setResultName(typeName, "U"); -} + fieldExpression(name, runTime, dict, typeName, "U") +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/MachNo/MachNo.C b/src/functionObjects/field/MachNo/MachNo.C index f7f9a78c48..882c35a352 100644 --- a/src/functionObjects/field/MachNo/MachNo.C +++ b/src/functionObjects/field/MachNo/MachNo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,10 +82,8 @@ Foam::functionObjects::MachNo::MachNo const dictionary& dict ) : - fieldExpression(name, runTime, dict, "U") -{ - setResultName("Ma", "U"); -} + fieldExpression(name, runTime, dict, "Ma", "U") +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/PecletNo/PecletNo.C b/src/functionObjects/field/PecletNo/PecletNo.C index 5714a42a46..441faa7889 100644 --- a/src/functionObjects/field/PecletNo/PecletNo.C +++ b/src/functionObjects/field/PecletNo/PecletNo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,10 +90,8 @@ Foam::functionObjects::PecletNo::PecletNo const dictionary& dict ) : - fieldExpression(name, runTime, dict, "phi") -{ - setResultName("Pe", "phi"); -} + fieldExpression(name, runTime, dict, "Pe", "phi") +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/Q/Q.C b/src/functionObjects/field/Q/Q.C index 047934bcad..6d79b04c82 100644 --- a/src/functionObjects/field/Q/Q.C +++ b/src/functionObjects/field/Q/Q.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,10 +77,8 @@ Foam::functionObjects::Q::Q const dictionary& dict ) : - fieldExpression(name, runTime, dict, "U") -{ - setResultName(typeName, "U"); -} + fieldExpression(name, runTime, dict, typeName, "U") +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.C b/src/functionObjects/field/blendingFactor/blendingFactor.C index 2c6f41cfb0..9b76f3b4f5 100644 --- a/src/functionObjects/field/blendingFactor/blendingFactor.C +++ b/src/functionObjects/field/blendingFactor/blendingFactor.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,7 +60,7 @@ Foam::functionObjects::blendingFactor::blendingFactor const dictionary& dict ) : - fieldExpression(name, runTime, dict) + fieldExpression(name, runTime, dict, typeName) { read(dict); } @@ -76,8 +76,6 @@ Foam::functionObjects::blendingFactor::~blendingFactor() bool Foam::functionObjects::blendingFactor::read(const dictionary& dict) { - fieldExpression::read(dict); - phiName_ = dict.lookupOrDefault("phi", "phi"); resultName_ = "blendingFactor:" + fieldName_; diff --git a/src/functionObjects/field/components/components.C b/src/functionObjects/field/components/components.C index a7b26961c8..c9a351bbcc 100644 --- a/src/functionObjects/field/components/components.C +++ b/src/functionObjects/field/components/components.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,10 +62,8 @@ Foam::functionObjects::components::components const dictionary& dict ) : - fieldExpression(name, runTime, dict) -{ - read(dict); -} + fieldExpression(name, runTime, dict, typeName) +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/ddt/ddt.C b/src/functionObjects/field/ddt/ddt.C index 0909fba34f..138f0153c2 100644 --- a/src/functionObjects/field/ddt/ddt.C +++ b/src/functionObjects/field/ddt/ddt.C @@ -72,11 +72,8 @@ Foam::functionObjects::ddt::ddt const dictionary& dict ) : - fieldExpression(name, runTime, dict) -{ - setResultName(typeName); - read(dict); -} + fieldExpression(name, runTime, dict, typeName) +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/div/div.C b/src/functionObjects/field/div/div.C index aead880845..93adf716f3 100644 --- a/src/functionObjects/field/div/div.C +++ b/src/functionObjects/field/div/div.C @@ -62,10 +62,8 @@ Foam::functionObjects::div::div const dictionary& dict ) : - fieldExpression(name, runTime, dict) -{ - setResultName(typeName); -} + fieldExpression(name, runTime, dict, typeName) +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/enstrophy/enstrophy.C b/src/functionObjects/field/enstrophy/enstrophy.C index 82d2d79b8c..e7332d4d66 100644 --- a/src/functionObjects/field/enstrophy/enstrophy.C +++ b/src/functionObjects/field/enstrophy/enstrophy.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,10 +75,8 @@ Foam::functionObjects::enstrophy::enstrophy const dictionary& dict ) : - fieldExpression(name, runTime, dict, "U") -{ - setResultName(typeName, "U"); -} + fieldExpression(name, runTime, dict, typeName, "U") +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/fieldExpression/fieldExpression.C b/src/functionObjects/field/fieldExpression/fieldExpression.C index 8b2fda1e69..fe9dd0b33a 100644 --- a/src/functionObjects/field/fieldExpression/fieldExpression.C +++ b/src/functionObjects/field/fieldExpression/fieldExpression.C @@ -37,28 +37,6 @@ namespace functionObjects } -// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // - -void Foam::functionObjects::fieldExpression::setResultName -( - const word& functionName, - const word& defaultFieldName -) -{ - if (resultName_.empty()) - { - if (defaultFieldName.empty() || fieldName_ != defaultFieldName) - { - resultName_ = functionName + '(' + fieldName_ + ')'; - } - else - { - resultName_ = functionName; - } - } -} - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::functionObjects::fieldExpression::fieldExpression @@ -66,16 +44,21 @@ Foam::functionObjects::fieldExpression::fieldExpression const word& name, const Time& runTime, const dictionary& dict, - const word& fieldName, - const word& resultName + const word& functionName, + const word& defaultFieldName ) : fvMeshFunctionObject(name, runTime, dict), - fieldName_(fieldName), - resultName_(resultName) -{ - read(dict); -} + fieldName_(dict.lookupOrDefault("field", defaultFieldName)), + resultName_ + ( + dict.found("result") + ? dict.lookup("result") + : (defaultFieldName.empty() || fieldName_ != defaultFieldName) + ? word(functionName + '(' + fieldName_ + ')') + : functionName + ) +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // @@ -88,18 +71,6 @@ Foam::functionObjects::fieldExpression::~fieldExpression() bool Foam::functionObjects::fieldExpression::read(const dictionary& dict) { - fvMeshFunctionObject::read(dict); - - if (fieldName_.empty() || dict.found("field")) - { - dict.lookup("field") >> fieldName_; - } - - if (dict.found("result")) - { - dict.lookup("result") >> resultName_; - } - return true; } diff --git a/src/functionObjects/field/fieldExpression/fieldExpression.H b/src/functionObjects/field/fieldExpression/fieldExpression.H index 20e7b3dacb..7dbe79ba16 100644 --- a/src/functionObjects/field/fieldExpression/fieldExpression.H +++ b/src/functionObjects/field/fieldExpression/fieldExpression.H @@ -70,12 +70,6 @@ protected: virtual bool calc() = 0; - void setResultName - ( - const word& functionName, - const word& defaultFieldName = word::null - ); - template bool foundObject(const word& name); @@ -94,8 +88,8 @@ public: const word& name, const Time& runTime, const dictionary& dict, - const word& fieldName = word::null, - const word& resultName = word::null + const word& functionName, + const word& defaultFieldName = word::null ); //- Disallow default bitwise copy construction diff --git a/src/functionObjects/field/flowType/flowType.C b/src/functionObjects/field/flowType/flowType.C index 5051ac30ed..a5e346bb96 100644 --- a/src/functionObjects/field/flowType/flowType.C +++ b/src/functionObjects/field/flowType/flowType.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,10 +87,8 @@ Foam::functionObjects::flowType::flowType const dictionary& dict ) : - fieldExpression(name, runTime, dict, "U") -{ - setResultName(typeName, "U"); -} + fieldExpression(name, runTime, dict, typeName, "U") +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/grad/grad.C b/src/functionObjects/field/grad/grad.C index e8d65e9359..de21feb075 100644 --- a/src/functionObjects/field/grad/grad.C +++ b/src/functionObjects/field/grad/grad.C @@ -60,11 +60,8 @@ Foam::functionObjects::grad::grad const dictionary& dict ) : - fieldExpression(name, runTime, dict) -{ - setResultName(typeName); - read(dict); -} + fieldExpression(name, runTime, dict, typeName) +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/log/log.C b/src/functionObjects/field/log/log.C index b0ae3b292a..e2452084f3 100644 --- a/src/functionObjects/field/log/log.C +++ b/src/functionObjects/field/log/log.C @@ -94,12 +94,11 @@ Foam::functionObjects::log::log const dictionary& dict ) : - fieldExpression(name, runTime, dict), + fieldExpression(name, runTime, dict, typeName), clip_(false), clipValue_(0), checkDimensions_(true) { - setResultName(typeName); read(dict); } @@ -114,13 +113,6 @@ Foam::functionObjects::log::~log() bool Foam::functionObjects::log::read(const dictionary& dict) { - fieldExpression::read(dict); - - if (resultName_.empty()) - { - resultName_ = "log(" + fieldName_ + ")"; - } - if (dict.found("clip")) { clip_ = true; diff --git a/src/functionObjects/field/mag/mag.C b/src/functionObjects/field/mag/mag.C index f75feb7f54..6f512192ef 100644 --- a/src/functionObjects/field/mag/mag.C +++ b/src/functionObjects/field/mag/mag.C @@ -63,11 +63,8 @@ Foam::functionObjects::mag::mag const dictionary& dict ) : - fieldExpression(name, runTime, dict) -{ - setResultName(typeName); - read(dict); -} + fieldExpression(name, runTime, dict, typeName) +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/magSqr/magSqr.C b/src/functionObjects/field/magSqr/magSqr.C index f2554961b7..ce4de177cc 100644 --- a/src/functionObjects/field/magSqr/magSqr.C +++ b/src/functionObjects/field/magSqr/magSqr.C @@ -63,11 +63,8 @@ Foam::functionObjects::magSqr::magSqr const dictionary& dict ) : - fieldExpression(name, runTime, dict) -{ - setResultName(typeName); - read(dict); -} + fieldExpression(name, runTime, dict, typeName) +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C index bfce469f31..bbecabc87a 100644 --- a/src/functionObjects/field/pressure/pressure.C +++ b/src/functionObjects/field/pressure/pressure.C @@ -189,7 +189,7 @@ Foam::functionObjects::pressure::pressure const dictionary& dict ) : - fieldExpression(name, runTime, dict, "p"), + fieldExpression(name, runTime, dict, typeName, "p"), UName_("U"), rhoName_("rho"), calcTotal_(false), diff --git a/src/functionObjects/field/randomise/randomise.C b/src/functionObjects/field/randomise/randomise.C index c093e8557d..6d164b3520 100644 --- a/src/functionObjects/field/randomise/randomise.C +++ b/src/functionObjects/field/randomise/randomise.C @@ -63,9 +63,8 @@ Foam::functionObjects::randomise::randomise const dictionary& dict ) : - fieldExpression(name, runTime, dict) + fieldExpression(name, runTime, dict, typeName) { - setResultName(typeName); read(dict); } @@ -80,8 +79,6 @@ Foam::functionObjects::randomise::~randomise() bool Foam::functionObjects::randomise::read(const dictionary& dict) { - fieldExpression::read(dict); - dict.lookup("magPerturbation") >> magPerturbation_; return true; diff --git a/src/functionObjects/field/scale/scale.C b/src/functionObjects/field/scale/scale.C index 820103f3aa..32401147d5 100644 --- a/src/functionObjects/field/scale/scale.C +++ b/src/functionObjects/field/scale/scale.C @@ -63,10 +63,9 @@ Foam::functionObjects::scale::scale const dictionary& dict ) : - fieldExpression(name, runTime, dict), + fieldExpression(name, runTime, dict, typeName), scale_(0) { - setResultName(typeName); read(dict); } @@ -81,7 +80,6 @@ Foam::functionObjects::scale::~scale() bool Foam::functionObjects::scale::read(const dictionary& dict) { - fieldExpression::read(dict); dict.lookup("scale") >> scale_; return true; diff --git a/src/functionObjects/field/streamFunction/streamFunction.C b/src/functionObjects/field/streamFunction/streamFunction.C index dbd3c5d6be..09d2b1dd87 100644 --- a/src/functionObjects/field/streamFunction/streamFunction.C +++ b/src/functionObjects/field/streamFunction/streamFunction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -434,10 +434,8 @@ Foam::functionObjects::streamFunction::streamFunction const dictionary& dict ) : - fieldExpression(name, runTime, dict, "phi") + fieldExpression(name, runTime, dict, typeName, "phi") { - setResultName("streamFunction", "phi"); - label nD = mesh_.nGeometricD(); if (nD != 2) diff --git a/src/functionObjects/field/vorticity/vorticity.C b/src/functionObjects/field/vorticity/vorticity.C index 7f924c1df5..bfcb790604 100644 --- a/src/functionObjects/field/vorticity/vorticity.C +++ b/src/functionObjects/field/vorticity/vorticity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,10 +75,8 @@ Foam::functionObjects::vorticity::vorticity const dictionary& dict ) : - fieldExpression(name, runTime, dict, "U") -{ - setResultName(typeName, "U"); -} + fieldExpression(name, runTime, dict, typeName, "U") +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //