diff --git a/utilities/postprocessPhasicFlow/ProcessField.hpp b/utilities/postprocessPhasicFlow/ProcessField.hpp index 33619111..01841ebc 100644 --- a/utilities/postprocessPhasicFlow/ProcessField.hpp +++ b/utilities/postprocessPhasicFlow/ProcessField.hpp @@ -49,7 +49,6 @@ public: TypeInfoTemplate11("ProcessField", T); - ProcessField( const dictionary& dict, pointRectCell& pToCell, diff --git a/utilities/postprocessPhasicFlow/fieldOperations.hpp b/utilities/postprocessPhasicFlow/fieldOperations.hpp index 92647561..80eb82f8 100644 --- a/utilities/postprocessPhasicFlow/fieldOperations.hpp +++ b/utilities/postprocessPhasicFlow/fieldOperations.hpp @@ -46,9 +46,9 @@ uniquePtr> sumOp( pointField_H& field, pointRectCell& poin { for(int32 k=0; k-1) + while(n != cellMapper::NoPos) { res += f[n]; n = iterator.getNext(n); @@ -80,10 +80,10 @@ uniquePtr> sumMaksOp( pointField_H& field, pointRectCell& for(int32 k=0; k-1) + while(n!= cellMapper::NoPos) { if(mask(n)) diff --git a/utilities/postprocessPhasicFlow/pointRectCell.hpp b/utilities/postprocessPhasicFlow/pointRectCell.hpp index 7916fb4c..764cab4a 100644 --- a/utilities/postprocessPhasicFlow/pointRectCell.hpp +++ b/utilities/postprocessPhasicFlow/pointRectCell.hpp @@ -101,7 +101,6 @@ public: map_.build(points, activeMask); auto iterator = map_.getCellIterator(); - for(int32 i=0; i-1) + uint32 n = iterator.start(i,j,k); + while( n!= cellMapper::NoPos) { res+=1; n = iterator.getNext(n); diff --git a/utilities/postprocessPhasicFlow/processField.cpp b/utilities/postprocessPhasicFlow/processField.cpp index b01840a9..d06f71a0 100644 --- a/utilities/postprocessPhasicFlow/processField.cpp +++ b/utilities/postprocessPhasicFlow/processField.cpp @@ -35,7 +35,7 @@ pFlow::processField::processField( processedFieldName_(dict.name()), operation_(dict.getVal("operation")), includeMaskType_(dict.getVal("includeMask")), - threshold_(dict.getValOrSet("threshold", 1)) + threshold_(dict.getValOrSetMax("threshold", 1)) { if(!processField::getFieldType( @@ -50,8 +50,7 @@ pFlow::processField::processField( auto& incDict = dict_.subDictOrCreate(includeMaskType_+"Info"); includeMask_ = includeMask::create(incDict, includeMaskType_, timeFolder_); - - + } bool pFlow::processField::getFieldType(