From 93faf28a9f2aa7d6eb1edd41da99e1fc9f25594c Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 28 Aug 2017 17:57:45 +0200 Subject: [PATCH] use checkPeriodicCells flag from particleCloud --- .../locateModel/engineSearchIB/engineSearchIB.C | 9 +++------ .../locateModel/engineSearchIB/engineSearchIB.H | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C index 3e79047e..e1876bb7 100644 --- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C +++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C @@ -67,12 +67,8 @@ engineSearchIB::engineSearchIB engineSearch(dict.subDict(typeName + "Props"),sm), propsDict_(dict.subDict(typeName + "Props")), zSplit_(readLabel(propsDict_.lookup("zSplit"))), - xySplit_(readLabel(propsDict_.lookup("xySplit"))), - checkPeriodicCells_(false) + xySplit_(readLabel(propsDict_.lookup("xySplit"))) { - - if(propsDict_.found("checkPeriodicCells")) checkPeriodicCells_=true; - } @@ -93,6 +89,7 @@ label engineSearchIB::findCell int size ) const { + bool checkPeriodicCells(particleCloud_.checkPeriodicCells()); const boundBox& globalBb = particleCloud_.mesh().bounds(); vector position; @@ -145,7 +142,7 @@ label engineSearchIB::findCell altStartPos=findSingleCell(pos,oldID); //particleCloud_.mesh().findCell(pos);// //check for periodic domains - if(checkPeriodicCells_) + if(checkPeriodicCells) { for(int iDir=0;iDir<3;iDir++) { diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H index 5a7bda5f..7faf6785 100644 --- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H +++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H @@ -63,7 +63,6 @@ private: const label xySplit_; - bool checkPeriodicCells_; public: