songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: blendingFactor function object - always include field name in result name

Browse Source
This commit is contained in:
Andrew Heather 2016-12-16 14:25:58 +00:00
parent 267903077b
commit a956e0f73a
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/functionObjects/field/blendingFactor/blendingFactor.C
View File

@ -79,7 +79,7 @@ Foam::functionObjects::blendingFactor::blendingFactor
{
read(dict);
writeFileHeader(file());
setResultName(typeName, fieldName_);
setResultName(typeName, "");
tmp<volScalarField> indicatorPtr
(
@ -113,24 +113,28 @@ Foam::functionObjects::blendingFactor::~blendingFactor()
bool Foam::functionObjects::blendingFactor::read(const dictionary& dict)
{
fieldExpression::read(dict);
writeFile::read(dict);
phiName_ = dict.lookupOrDefault<word>("phi", "phi");
tolerance_ = 0.001;
if
(
dict.readIfPresent("tolerance", tolerance_)
&& (tolerance_ < 0 || tolerance_ > 1)
)
if (fieldExpression::read(dict) && writeFile::read(dict))
{
FatalErrorInFunction
<< "tolerance must be in the range 0 to 1. Supplied value: "
<< tolerance_ << exit(FatalError);
}
phiName_ = dict.lookupOrDefault<word>("phi", "phi");
return true;
tolerance_ = 0.001;
if
(
dict.readIfPresent("tolerance", tolerance_)
&& (tolerance_ < 0 || tolerance_ > 1)
)
{
FatalErrorInFunction
<< "tolerance must be in the range 0 to 1. Supplied value: "
<< tolerance_ << exit(FatalError);
}
return true;
}
else
{
return false;
}
}