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

3
src/functionObjects/field/ddt/ddt.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) 2017-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -74,6 +74,7 @@ Foam::functionObjects::ddt::ddt
:
fieldExpression(name, runTime, dict)
{
setResultName(typeName);
read(dict);
}

6
src/functionObjects/field/div/div.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) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -63,7 +63,9 @@ Foam::functionObjects::div::div
)
:
fieldExpression(name, runTime, dict)
{}
{
setResultName(typeName);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //

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);

12
src/functionObjects/field/fieldsExpression/fieldsExpression.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,20 +41,20 @@ namespace functionObjects
void Foam::functionObjects::fieldsExpression::setResultName
(
const word& typeName,
const wordList& defaultArgs
const word& functionName,
const wordList& defaultFieldNames
)
{
if (fieldNames_.empty())
{
fieldNames_ = defaultArgs;
fieldNames_ = defaultFieldNames;
}
if (resultName_.empty())
{
if (!fieldNames_.empty())
{
resultName_ = typeName + '(' + fieldNames_[0];
resultName_ = functionName + '(' + fieldNames_[0];
for (label i=1; i<fieldNames_.size(); i++)
{
resultName_ += ',' + fieldNames_[i];
@ -63,7 +63,7 @@ void Foam::functionObjects::fieldsExpression::setResultName
}
else
{
resultName_ = typeName;
resultName_ = functionName;
}
}
}

4
src/functionObjects/field/fieldsExpression/fieldsExpression.H
View File

@ -70,8 +70,8 @@ protected:
void setResultName
(
const word& typeName,
const wordList& defaultArg = wordList::null()
const word& functionName,
const wordList& defaultFieldNames = wordList::null()
);
//- Call 'calcFieldType' for the given functionObject

3
src/functionObjects/field/grad/grad.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) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,6 +62,7 @@ Foam::functionObjects::grad::grad
:
fieldExpression(name, runTime, dict)
{
setResultName(typeName);
read(dict);
}

1
src/functionObjects/field/log/log.C
View File

@ -99,6 +99,7 @@ Foam::functionObjects::log::log
clipValue_(0),
checkDimensions_(true)
{
setResultName(typeName);
read(dict);
}

3
src/functionObjects/field/mag/mag.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) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -65,6 +65,7 @@ Foam::functionObjects::mag::mag
:
fieldExpression(name, runTime, dict)
{
setResultName(typeName);
read(dict);
}

3
src/functionObjects/field/magSqr/magSqr.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
@ -65,6 +65,7 @@ Foam::functionObjects::magSqr::magSqr
:
fieldExpression(name, runTime, dict)
{
setResultName(typeName);
read(dict);
}

3
src/functionObjects/field/randomise/randomise.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
@ -65,6 +65,7 @@ Foam::functionObjects::randomise::randomise
:
fieldExpression(name, runTime, dict)
{
setResultName(typeName);
read(dict);
}

9
src/functionObjects/field/scale/scale.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) 2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -66,6 +66,7 @@ Foam::functionObjects::scale::scale
fieldExpression(name, runTime, dict),
scale_(0)
{
setResultName(typeName);
read(dict);
}
@ -81,12 +82,6 @@ Foam::functionObjects::scale::~scale()
bool Foam::functionObjects::scale::read(const dictionary& dict)
{
fieldExpression::read(dict);
if (resultName_.empty())
{
resultName_ = "scale(" + fieldName_ + ")";
}
dict.lookup("scale") >> scale_;
return true;