Merge pull request #41 from PhasicFlow/solvers
replace action by operation in postprocessPhasicFlow
This commit is contained in:
commit
7188e6b6f1
|
@ -103,25 +103,25 @@ public:
|
|||
|
||||
rectMeshField_H<real> denomerator( this->mesh(), real{} );
|
||||
|
||||
if(action() == "sum")
|
||||
if(operation() == "sum")
|
||||
{
|
||||
denomerator = rectMeshField_H<real>(this->mesh(), static_cast<real>(1.0));
|
||||
|
||||
}else if(action() == "average")
|
||||
}else if(operation() == "average")
|
||||
{
|
||||
|
||||
pointField_H<real> oneFld(field_.pStruct(), static_cast<real>(1.0), static_cast<real>(1.0));
|
||||
|
||||
denomerator = sumOp(oneFld, this->pointToCell());
|
||||
|
||||
}else if(action() == "averageMask")
|
||||
}else if(operation() == "averageMask")
|
||||
{
|
||||
pointField_H<real> oneFld(field_.pStruct(), static_cast<real>(1.0), static_cast<real>(1.0));
|
||||
|
||||
denomerator = sumMaksOp(oneFld, this->pointToCell(), incMask);
|
||||
}else
|
||||
{
|
||||
fatalErrorInFunction<<"action is not known: "<< action()<<endl;
|
||||
fatalErrorInFunction<<"operation is not known: "<< operation()<<endl;
|
||||
fatalExit;
|
||||
}
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ pFlow::processField::processField(
|
|||
pointToCell_(pToCell),
|
||||
timeFolder_(rep),
|
||||
processedFieldName_(dict.name()),
|
||||
action_(dict.getVal<word>("action")),
|
||||
operation_(dict.getVal<word>("operation")),
|
||||
includeMaskType_(dict.getVal<word>("includeMask")),
|
||||
threshold_(dict.getValOrSet<int32>("threshold", 1))
|
||||
{
|
||||
|
|
|
@ -50,7 +50,7 @@ protected:
|
|||
|
||||
word fieldType_;
|
||||
|
||||
word action_;
|
||||
word operation_;
|
||||
|
||||
word includeMaskType_;
|
||||
|
||||
|
@ -125,9 +125,9 @@ public:
|
|||
return fieldName_ == "uniformField";
|
||||
}
|
||||
|
||||
const word& action()const
|
||||
const word& operation()const
|
||||
{
|
||||
return action_;
|
||||
return operation_;
|
||||
}
|
||||
|
||||
auto& timeFolder()
|
||||
|
|
Loading…
Reference in New Issue