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