From c6736e9376180fce82648957cca881e572f7d1a4 Mon Sep 17 00:00:00 2001 From: berenger-bramas <berenger-bramas@2616d619-271b-44dc-8df4-d4a8f33a7222> Date: Mon, 6 Feb 2012 14:24:29 +0000 Subject: [PATCH] Update the octree arranger. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@349 2616d619-271b-44dc-8df4-d4a8f33a7222 --- Src/Arranger/FOctreeArranger.hpp | 6 +++--- Src/Arranger/FOctreeArrangerProc.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Src/Arranger/FOctreeArranger.hpp b/Src/Arranger/FOctreeArranger.hpp index 263d5342c..924acbb97 100644 --- a/Src/Arranger/FOctreeArranger.hpp +++ b/Src/Arranger/FOctreeArranger.hpp @@ -43,19 +43,19 @@ public: while(partPos.getX() < min.getX()){ partPos.incX(boxWidth); } - while(partPos.getX() > max.getX()){ + while(partPos.getX() >= max.getX()){ partPos.incX(-boxWidth); } while(partPos.getY() < min.getY()){ partPos.incY(boxWidth); } - while(partPos.getY() > max.getY()){ + while(partPos.getY() >= max.getY()){ partPos.incY(-boxWidth); } while(partPos.getZ() < min.getZ()){ partPos.incZ(boxWidth); } - while(partPos.getZ() > max.getZ()){ + while(partPos.getZ() >= max.getZ()){ partPos.incZ(-boxWidth); } iter.data().setPosition(partPos); diff --git a/Src/Arranger/FOctreeArrangerProc.hpp b/Src/Arranger/FOctreeArrangerProc.hpp index 5d0feccc0..9989991ad 100644 --- a/Src/Arranger/FOctreeArrangerProc.hpp +++ b/Src/Arranger/FOctreeArrangerProc.hpp @@ -94,19 +94,19 @@ public: while(partPos.getX() < min.getX()){ partPos.incX(boxWidth); } - while(partPos.getX() > max.getX()){ + while(partPos.getX() >= max.getX()){ partPos.incX(-boxWidth); } while(partPos.getY() < min.getY()){ partPos.incY(boxWidth); } - while(partPos.getY() > max.getY()){ + while(partPos.getY() >= max.getY()){ partPos.incY(-boxWidth); } while(partPos.getZ() < min.getZ()){ partPos.incZ(boxWidth); } - while(partPos.getZ() > max.getZ()){ + while(partPos.getZ() >= max.getZ()){ partPos.incZ(-boxWidth); } iter.data().setPosition(partPos); -- GitLab