update the separation criteria control

bc5a1b38 · BRAMAS Berenger · 2ad103ba · bc5a1b38 · bc5a1b38
Commit bc5a1b38 authored Apr 28, 2015 by BRAMAS Berenger
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Src/Containers/FOctree.hpp Src/Containers/FOctree.hpp +1 -1

Src/Containers/FTreeCoordinate.hpp Src/Containers/FTreeCoordinate.hpp +2 -2

No files found.
--- a/Src/Containers/FOctree.hpp
+++ b/Src/Containers/FOctree.hpp
@@ -968,7 +968,7 @@ public:
                for(int idxY = startY ; idxY <= endY ; ++idxY){
                    for(int idxZ = startZ ; idxZ <= endZ ; ++idxZ){
                        // if we are not on the current cell
-                        if( idxX || idxY || idxZ ){
+                        if(neighSeparation<1 || idxX || idxY || idxZ ){
                            const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ);
                            FTreeCoordinate otherParentInBox(otherParent);

--- a/Src/Containers/FTreeCoordinate.hpp
+++ b/Src/Containers/FTreeCoordinate.hpp
@@ -363,7 +363,7 @@ public:
                    if(!FMath::Between(parentCell.getZ() + idxZ,0,limite)) continue;
                    // if we are not on the current cell
-                    if( idxX || idxY || idxZ ){
+                    if(neighSeparation<1 || idxX || idxY || idxZ ){
                        const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ);
                        const MortonIndex mortonOther = otherParent.getMortonIndex(inLevel-1);
@@ -408,7 +408,7 @@ public:
                    if(!FMath::Between(parentCell.getZ() + idxZ,0,limite)) continue;
                    // if we are not on the current cell
-                    if( idxX || idxY || idxZ ){
+                    if(neighSeparation<1 || idxX || idxY || idxZ ){
                        const FTreeCoordinate otherParent(parentCell.getX() + idxX,parentCell.getY() + idxY,parentCell.getZ() + idxZ);
                        const MortonIndex mortonOther = otherParent.getMortonIndex(inLevel-1);