zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

functionObject::fieldExpression: Corrected construction of the result field name

Browse Source
This commit is contained in:
Henry Weller
2019-11-28 19:03:05 +00:00
parent a2bb959e23
commit ffb65bcee5
12 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/functionObjects/field/fieldExpression/fieldExpression.C
View File

@ -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
@ -41,24 +41,19 @@ namespace functionObjects
void Foam::functionObjects::fieldExpression::setResultName
(
const word& typeName,
const word& defaultArg
const word& functionName,
const word& defaultFieldName
)
{
if (fieldName_.empty())
{
fieldName_ = defaultArg;
}
if (resultName_.empty())
{
if (fieldName_ != defaultArg)
if (defaultFieldName.empty() || fieldName_ != defaultFieldName)
{
resultName_ = typeName + '(' + fieldName_ + ')';
resultName_ = functionName + '(' + fieldName_ + ')';
}
else
{
resultName_ = typeName;
resultName_ = functionName;
}
}
}

6
src/functionObjects/field/fieldExpression/fieldExpression.H
View File

@ -70,7 +70,11 @@ protected:
virtual bool calc() = 0;
void setResultName(const word& typeName, const word& defaultArg);
void setResultName
(
const word& functionName,
const word& defaultFieldName = word::null
);
template<class Type>
bool foundObject(const word& name);