ENH: volRegion and volFieldValue - updated output name if operating on all cells

This commit is contained in:
Andrew Heather
2017-06-01 17:26:12 +01:00
parent 0a49f3efc7
commit f431a328d2
2 changed files with 15 additions and 5 deletions

View File

@ -83,6 +83,7 @@ Foam::functionObjects::volRegion::volRegion
? regionTypeNames_.read(dict.lookup("regionType")) ? regionTypeNames_.read(dict.lookup("regionType"))
: vrtAll : vrtAll
), ),
regionName_(polyMesh::defaultRegion),
regionID_(-1) regionID_(-1)
{ {
read(dict); read(dict);

View File

@ -217,12 +217,17 @@ bool Foam::functionObjects::fieldValues::volFieldValue::writeValues
if (Pstream::master()) if (Pstream::master())
{ {
word outName = fieldName + '_' + regionTypeNames_[regionType_];
if (this->volRegion::regionName_ != polyMesh::defaultRegion)
{
outName = outName + '-' + this->volRegion::regionName_;
}
IOField<Type> IOField<Type>
( (
IOobject IOobject
( (
fieldName + '_' + regionTypeNames_[regionType_] outName,
+ '-' + volRegion::regionName_,
obr_.time().timeName(), obr_.time().timeName(),
obr_, obr_,
IOobject::NO_READ, IOobject::NO_READ,
@ -241,13 +246,17 @@ bool Foam::functionObjects::fieldValues::volFieldValue::writeValues
file()<< tab << result; file()<< tab << result;
Log << " " << operationTypeNames_[operation_] Log << " " << operationTypeNames_[operation_]
<< "(" << volRegion::regionName_ << ") of " << fieldName << "(" << this->volRegion::regionName_ << ") of " << fieldName
<< " = " << result << endl; << " = " << result << endl;
// Write state/results information // Write state/results information
const word& opName = operationTypeNames_[operation_]; const word& opName = operationTypeNames_[operation_];
word resultName = word outName = fieldName;
opName + '(' + volRegion::regionName_ + ',' + fieldName + ')'; if (this->volRegion::regionName_ != polyMesh::defaultRegion)
{
outName = this->volRegion::regionName_ + ',' + outName;
}
word resultName = opName + '(' + outName + ')';
this->setResult(resultName, result); this->setResult(resultName, result);
} }