Commit 48395d23 authored by Quentin Khan's avatar Quentin Khan

Change fackLevel to fakeLevel in FFmmAlgorithmPeriodic

parent 737e0443
......@@ -314,7 +314,7 @@ protected:
FLOG(computationCounter.tac());
} while(octreeIterator.moveRight());
FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ", " << octreeIterator.getCurrentCell()->getLevel() << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << (idxLevel + offsetRealTree) << ", " << octreeIterator.getCurrentCell()->getLevel() << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
avoidGotoLeftIterator.moveUp();
octreeIterator = avoidGotoLeftIterator;// equal octreeIterator.moveUp(); octreeIterator.gotoLeft();
}
......@@ -343,7 +343,7 @@ protected:
// for each levels
for(int idxLevel = 1 ; idxLevel < OctreeHeight ; ++idxLevel ){
FLOG(FTic counterTimeLevel);
const int fackLevel = idxLevel + offsetRealTree;
const int fakeLevel = idxLevel + offsetRealTree;
const int separationCriteria = (idxLevel != OctreeHeight-1 ? 1 : leafLevelSeperationCriteria);
// for each cells
do{
......@@ -378,12 +378,12 @@ protected:
counter);
FLOG(computationCounter.tac());
} while(octreeIterator.moveRight());
FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ", " << octreeIterator.getCurrentCell()->getLevel() << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << fakeLevel << ", " << octreeIterator.getCurrentCell()->getLevel() << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
avoidGotoLeftIterator.moveDown();
octreeIterator = avoidGotoLeftIterator;
FLOG(computationCounter.tic());
kernels->finishedLevelM2L(fackLevel);
kernels->finishedLevelM2L(fakeLevel);
FLOG(computationCounter.tac());
}
FLOG( FLog::Controller << "\tFinished (@Downward Pass (M2L) = " << counterTime.tacAndElapsed() << "s)\n" );
......@@ -433,7 +433,7 @@ protected:
FLOG(computationCounter.tac());
} while(octreeIterator.moveRight());
FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ", " << octreeIterator.getCurrentCell()->getLevel() << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << (idxLevel + offsetRealTree) << ", " << octreeIterator.getCurrentCell()->getLevel() << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
avoidGotoLeftIterator.moveDown();
octreeIterator = avoidGotoLeftIterator;
}
......
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