From 2832bb574891b10169cd138b110522e2bbbd31ea Mon Sep 17 00:00:00 2001
From: berenger-bramas <berenger-bramas@2616d619-271b-44dc-8df4-d4a8f33a7222>
Date: Mon, 13 Feb 2012 13:04:02 +0000
Subject: [PATCH] Remove an Error in the find interaction list.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@380 2616d619-271b-44dc-8df4-d4a8f33a7222
---
Src/Containers/FOctree.hpp | 6 +++---
Src/Core/FFmmAlgorithmThread.hpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Src/Containers/FOctree.hpp b/Src/Containers/FOctree.hpp
index 074441f25..738b4ed92 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 d243b7881..cefe978bc 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);
}
--
GitLab