Commit 6dd55d3c authored by berenger-bramas's avatar berenger-bramas
Browse files

In the threaded Fmm I forgot to use the data store on leafs :

const FTreeCoordinate& coord = octreeIterator.getCurrentGlobalCoordinate();
to split leafs (I was using the Morton Index To TreeCoordinate
but now the leafs contains this information).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@117 2616d619-271b-44dc-8df4-d4a8f33a7222
parent ad06ddeb
...@@ -332,9 +332,7 @@ public: ...@@ -332,9 +332,7 @@ public:
do{ do{
//iterArray[leafs] = octreeIterator; //iterArray[leafs] = octreeIterator;
++leafs; ++leafs;
const MortonIndex index = octreeIterator.getCurrentGlobalIndex(); const FTreeCoordinate& coord = octreeIterator.getCurrentGlobalCoordinate();
FTreeCoordinate coord;
coord.setPositionFromMorton(index, LeafIndex);
const int shapePosition = (coord.getX()%3)*9 + (coord.getY()%3)*3 + (coord.getZ()%3); const int shapePosition = (coord.getX()%3)*9 + (coord.getY()%3)*3 + (coord.getZ()%3);
leafsDataArray[startPosAtShape[shapePosition]].index = octreeIterator.getCurrentGlobalIndex(); leafsDataArray[startPosAtShape[shapePosition]].index = octreeIterator.getCurrentGlobalIndex();
......
...@@ -838,9 +838,6 @@ public: ...@@ -838,9 +838,6 @@ public:
for(int idxLeaf = this->leafLeft ; idxLeaf <= this->leafRight ; ++idxLeaf){ for(int idxLeaf = this->leafLeft ; idxLeaf <= this->leafRight ; ++idxLeaf){
iterArray[idxLeaf] = octreeIterator; iterArray[idxLeaf] = octreeIterator;
//const MortonIndex index = octreeIterator.getCurrentGlobalIndex();
//FTreeCoordinate coord;
//coord.setPositionFromMorton(index, LeafIndex);
const FTreeCoordinate& coord = octreeIterator.getCurrentCell()->getCoordinate(); const FTreeCoordinate& coord = octreeIterator.getCurrentCell()->getCoordinate();
const int shape = (coord.getX()%3)*9 + (coord.getY()%3)*3 + (coord.getZ()%3); const int shape = (coord.getX()%3)*9 + (coord.getY()%3)*3 + (coord.getZ()%3);
shapeType[idxLeaf-this->leafLeft] = shape; shapeType[idxLeaf-this->leafLeft] = shape;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment