diff --git a/Src/Containers/FOctree.hpp b/Src/Containers/FOctree.hpp index 074441f25a294f888842405166774e823fe826d5..738b4ed92da71ed7db8257035aed5576ee4ce64f 100644 --- a/Src/Containers/FOctree.hpp +++ b/Src/Containers/FOctree.hpp @@ -798,9 +798,9 @@ public: // For each child for(int idxCousin = 0 ; idxCousin < 8 ; ++idxCousin){ if(cells[idxCousin]){ - const int xdiff = workingCell.getX() - ((otherParent.getX()<<1) | ( (idxCousin>>2) & 1)); - const int ydiff = workingCell.getY() - ((otherParent.getY()<<1) | ( (idxCousin>>1) & 1)); - const int zdiff = workingCell.getZ() - ((otherParent.getZ()<<1) | (idxCousin&1)); + const int xdiff = ((otherParent.getX()<<1) | ( (idxCousin>>2) & 1)) - workingCell.getX(); + const int ydiff = ((otherParent.getY()<<1) | ( (idxCousin>>1) & 1)) - workingCell.getY(); + const int zdiff = ((otherParent.getZ()<<1) | (idxCousin&1)) - workingCell.getZ(); // Test if it is a direct neighbor if(FMath::Abs(xdiff) > 1 || FMath::Abs(ydiff) > 1 || FMath::Abs(zdiff) > 1){ diff --git a/Src/Core/FFmmAlgorithmThread.hpp b/Src/Core/FFmmAlgorithmThread.hpp index d243b7881cc8104318fc6f1bbdc8af7018e55df6..cefe978bc317629012d97cc2d6e572502b1d7149 100644 --- a/Src/Core/FFmmAlgorithmThread.hpp +++ b/Src/Core/FFmmAlgorithmThread.hpp @@ -281,10 +281,10 @@ private: octreeIterator = avoidGotoLeftIterator; FDEBUG(computationCounter.tic()); -#pragma omp parallel + #pragma omp parallel { KernelClass * const myThreadkernels = kernels[omp_get_thread_num()]; -#pragma omp for nowait + #pragma omp for nowait for(int idxCell = 0 ; idxCell < numberOfCells ; ++idxCell){ myThreadkernels->L2L( iterArray[idxCell].getCurrentCell() , iterArray[idxCell].getCurrentChild(), idxLevel); }