xfygogo
/
phasicFlow
mirror of https://github.com/PhasicFlow/phasicFlow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from PhasicFlow/solvers 

replace action by operation in postprocessPhasicFlow
This commit is contained in:
PhasicFlow 2022-10-10 12:54:52 +03:30 committed by GitHub
parent 5a8c5a028c e83eeffd7b
commit 7188e6b6f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utilities/postprocessPhasicFlow/ProcessField.H
View File

@ -103,25 +103,25 @@ public:
rectMeshField_H<real> denomerator( this->mesh(), real{} ); rectMeshField_H<real> denomerator( this->mesh(), real{} );
if(action() == "sum") if(operation() == "sum")
{ {
denomerator = rectMeshField_H<real>(this->mesh(), static_cast<real>(1.0)); 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)); pointField_H<real> oneFld(field_.pStruct(), static_cast<real>(1.0), static_cast<real>(1.0));
denomerator = sumOp(oneFld, this->pointToCell()); 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)); pointField_H<real> oneFld(field_.pStruct(), static_cast<real>(1.0), static_cast<real>(1.0));
denomerator = sumMaksOp(oneFld, this->pointToCell(), incMask); denomerator = sumMaksOp(oneFld, this->pointToCell(), incMask);
}else }else
{ {
fatalErrorInFunction<<"action is not known: "<< action()<<endl; fatalErrorInFunction<<"operation is not known: "<< operation()<<endl;
fatalExit; fatalExit;
} }

2
utilities/postprocessPhasicFlow/processField.C
View File

@ -33,7 +33,7 @@ pFlow::processField::processField(
pointToCell_(pToCell), pointToCell_(pToCell),
timeFolder_(rep), timeFolder_(rep),
processedFieldName_(dict.name()), processedFieldName_(dict.name()),
action_(dict.getVal<word>("action")), operation_(dict.getVal<word>("operation")),
includeMaskType_(dict.getVal<word>("includeMask")), includeMaskType_(dict.getVal<word>("includeMask")),
threshold_(dict.getValOrSet<int32>("threshold", 1)) threshold_(dict.getValOrSet<int32>("threshold", 1))
{ {

6
utilities/postprocessPhasicFlow/processField.H
View File

@ -50,7 +50,7 @@ protected:
word fieldType_; word fieldType_;
word action_; word operation_;
word includeMaskType_; word includeMaskType_;
@ -125,9 +125,9 @@ public:
return fieldName_ == "uniformField"; return fieldName_ == "uniformField";
} }
const word& action()const const word& operation()const
{ {
return action_; return operation_;
} }
auto& timeFolder() auto& timeFolder()