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

This commit is contained in:
Andrew Heather
2016-12-16 14:25:58 +00:00
parent 267903077b
commit a956e0f73a

View File

@ -79,7 +79,7 @@ Foam::functionObjects::blendingFactor::blendingFactor
{
read(dict);
writeFileHeader(file());
setResultName(typeName, fieldName_);
setResultName(typeName, "");
tmp<volScalarField> indicatorPtr
(
@ -113,9 +113,8 @@ Foam::functionObjects::blendingFactor::~blendingFactor()
bool Foam::functionObjects::blendingFactor::read(const dictionary& dict)
{
fieldExpression::read(dict);
writeFile::read(dict);
if (fieldExpression::read(dict) && writeFile::read(dict))
{
phiName_ = dict.lookupOrDefault<word>("phi", "phi");
tolerance_ = 0.001;
@ -131,6 +130,11 @@ bool Foam::functionObjects::blendingFactor::read(const dictionary& dict)
}
return true;
}
else
{
return false;
}
}