Commit 6a76f66e authored by BRAMAS Berenger's avatar BRAMAS Berenger

use FLog instead of FDebug

parent 6dc92ced
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FLog.hpp"
/** /**
* @author Berenger Bramas (berenger.bramas@inria.fr) * @author Berenger Bramas (berenger.bramas@inria.fr)
...@@ -126,7 +126,7 @@ public: ...@@ -126,7 +126,7 @@ public:
virtual void P2PRemote(const FTreeCoordinate& /*inLeafPosition*/, virtual void P2PRemote(const FTreeCoordinate& /*inLeafPosition*/,
ContainerClass* const FRestrict /*targets*/, const ContainerClass* const FRestrict /*sources*/, ContainerClass* const FRestrict /*targets*/, const ContainerClass* const FRestrict /*sources*/,
ContainerClass* const /*directNeighborsParticles*/[27], const int /*size*/) { ContainerClass* const /*directNeighborsParticles*/[27], const int /*size*/) {
FLOG( FDebug::Controller.write("Warning, P2P remote is used but not implemented!").write(FDebug::Flush) ); FLOG( FLog::Controller.write("Warning, P2P remote is used but not implemented!").write(FLog::Flush) );
} }
}; };
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define FABSTRACTLEAF_HPP #define FABSTRACTLEAF_HPP
#include "../Utils/FPoint.hpp" #include "../Utils/FPoint.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FLog.hpp"
/** /**
* @author Berenger Bramas (berenger.bramas@inria.fr) * @author Berenger Bramas (berenger.bramas@inria.fr)
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
*/ */
template<typename... Args> template<typename... Args>
void push(const FPoint& /*inParticlePosition*/, Args ... /*args*/){ void push(const FPoint& /*inParticlePosition*/, Args ... /*args*/){
FLOG( FDebug::Controller.write("Warning, push is not implemented!").write(FDebug::Flush) ); FLOG( FLog::Controller.write("Warning, push is not implemented!").write(FLog::Flush) );
} }
/** /**
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define FABSTRACTPARTICLECONTAINER_HPP #define FABSTRACTPARTICLECONTAINER_HPP
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FLog.hpp"
/* forward declaration to avoid include */ /* forward declaration to avoid include */
class FPoint; class FPoint;
...@@ -45,7 +45,7 @@ public: ...@@ -45,7 +45,7 @@ public:
*/ */
template<typename... Args> template<typename... Args>
void push(const FPoint& /*inParticlePosition*/, Args ... /*args*/){ void push(const FPoint& /*inParticlePosition*/, Args ... /*args*/){
FLOG( FDebug::Controller.write("Warning, push is not implemented!").write(FDebug::Flush) ); FLOG( FLog::Controller.write("Warning, push is not implemented!").write(FLog::Flush) );
} }
}; };
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "FTreeCoordinate.hpp" #include "FTreeCoordinate.hpp"
#include "FBlockAllocator.hpp" #include "FBlockAllocator.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FGlobalPeriodic.hpp" #include "../Utils/FGlobalPeriodic.hpp"
#include "../Utils/FPoint.hpp" #include "../Utils/FPoint.hpp"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FTrace.hpp" #include "../Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
fassert(tree, "tree cannot be null", __LINE__, __FILE__); fassert(tree, "tree cannot be null", __LINE__, __FILE__);
fassert(kernels, "kernels cannot be null", __LINE__, __FILE__); fassert(kernels, "kernels cannot be null", __LINE__, __FILE__);
FLOG(FDebug::Controller << "FFmmAlgorithm\n"); FLOG(FLog::Controller << "FFmmAlgorithm\n");
} }
/** Default destructor */ /** Default destructor */
...@@ -92,7 +92,7 @@ private: ...@@ -92,7 +92,7 @@ private:
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Bottom Pass\n").write(FDebug::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -108,8 +108,8 @@ private: ...@@ -108,8 +108,8 @@ private:
FLOG(computationCounter.tac()); FLOG(computationCounter.tac());
} while(octreeIterator.moveRight()); } while(octreeIterator.moveRight());
FLOG( FDebug::Controller << "\tFinished (@Bottom Pass (P2M) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Bottom Pass (P2M) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" );
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -119,7 +119,7 @@ private: ...@@ -119,7 +119,7 @@ private:
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Upward Pass\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -146,12 +146,12 @@ private: ...@@ -146,12 +146,12 @@ private:
avoidGotoLeftIterator.moveUp(); avoidGotoLeftIterator.moveUp();
octreeIterator = avoidGotoLeftIterator; octreeIterator = avoidGotoLeftIterator;
FLOG( FDebug::Controller << "\t\t>> Level " << idxLevel << " = " << counterTimeLevel.tacAndElapsed() << "s\n" ); FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << " = " << counterTimeLevel.tacAndElapsed() << "s\n" );
} }
FLOG( FDebug::Controller << "\tFinished (@Upward Pass (M2M) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Upward Pass (M2M) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" );
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -162,7 +162,7 @@ private: ...@@ -162,7 +162,7 @@ private:
void transferPass(){ void transferPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Downward Pass (M2L)\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -192,10 +192,10 @@ private: ...@@ -192,10 +192,10 @@ private:
avoidGotoLeftIterator.moveDown(); avoidGotoLeftIterator.moveDown();
octreeIterator = avoidGotoLeftIterator; octreeIterator = avoidGotoLeftIterator;
FLOG( FDebug::Controller << "\t\t>> Level " << idxLevel << " = " << counterTimeLevel.tacAndElapsed() << "s\n" ); FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << " = " << counterTimeLevel.tacAndElapsed() << "s\n" );
} }
FLOG( FDebug::Controller << "\tFinished (@Downward Pass (M2L) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Downward Pass (M2L) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" );
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -205,7 +205,7 @@ private: ...@@ -205,7 +205,7 @@ private:
/** L2L */ /** L2L */
void downardPass(){ void downardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Downward Pass (L2L)\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter ); FLOG(FTic computationCounter );
...@@ -229,11 +229,11 @@ private: ...@@ -229,11 +229,11 @@ private:
avoidGotoLeftIterator.moveDown(); avoidGotoLeftIterator.moveDown();
octreeIterator = avoidGotoLeftIterator; octreeIterator = avoidGotoLeftIterator;
FLOG( FDebug::Controller << "\t\t>> Level " << idxLevel << " = " << counterTimeLevel.tacAndElapsed() << "s\n" ); FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << " = " << counterTimeLevel.tacAndElapsed() << "s\n" );
} }
FLOG( FDebug::Controller << "\tFinished (@Downward Pass (L2L) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Downward Pass (L2L) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" );
} }
...@@ -245,7 +245,7 @@ private: ...@@ -245,7 +245,7 @@ private:
/** P2P */ /** P2P */
void directPass(){ void directPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Direct Pass\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounterL2P); FLOG(FTic computationCounterL2P);
FLOG(FTic computationCounterP2P); FLOG(FTic computationCounterP2P);
...@@ -270,9 +270,9 @@ private: ...@@ -270,9 +270,9 @@ private:
} while(octreeIterator.moveRight()); } while(octreeIterator.moveRight());
FLOG( FDebug::Controller << "\tFinished (@Direct Pass (L2P + P2P) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Direct Pass (L2P + P2P) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation L2P : " << computationCounterL2P.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation L2P : " << computationCounterL2P.cumulated() << " s\n" );
FLOG( FDebug::Controller << "\t\t Computation P2P : " << computationCounterP2P.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation P2P : " << computationCounterP2P.cumulated() << " s\n" );
} }
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FGlobalPeriodic.hpp" #include "../Utils/FGlobalPeriodic.hpp"
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FTrace.hpp" #include "../Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
#include "../Utils/FMemUtils.hpp" #include "../Utils/FMemUtils.hpp"
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
fassert(tree, "tree cannot be null", __LINE__, __FILE__); fassert(tree, "tree cannot be null", __LINE__, __FILE__);
fassert(-1 <= inUpperLevel, "inUpperLevel cannot be < -1", __LINE__, __FILE__); fassert(-1 <= inUpperLevel, "inUpperLevel cannot be < -1", __LINE__, __FILE__);
FLOG(FDebug::Controller << "FFmmAlgorithmPeriodic\n"); FLOG(FLog::Controller << "FFmmAlgorithmPeriodic\n");
} }
/** Default destructor */ /** Default destructor */
...@@ -111,7 +111,7 @@ public: ...@@ -111,7 +111,7 @@ public:
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Bottom Pass\n").write(FDebug::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -127,8 +127,8 @@ public: ...@@ -127,8 +127,8 @@ public:
FLOG(computationCounter.tac()); FLOG(computationCounter.tac());
} while(octreeIterator.moveRight()); } while(octreeIterator.moveRight());
FLOG( FDebug::Controller << "\tFinished (@Bottom Pass (P2M) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Bottom Pass (P2M) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" );
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -138,7 +138,7 @@ public: ...@@ -138,7 +138,7 @@ public:
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Upward Pass\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -164,12 +164,12 @@ public: ...@@ -164,12 +164,12 @@ public:
avoidGotoLeftIterator.moveUp(); avoidGotoLeftIterator.moveUp();
octreeIterator = avoidGotoLeftIterator;// equal octreeIterator.moveUp(); octreeIterator.gotoLeft(); octreeIterator = avoidGotoLeftIterator;// equal octreeIterator.moveUp(); octreeIterator.gotoLeft();
FLOG( FDebug::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" ); FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
} }
FLOG( FDebug::Controller << "\tFinished (@Upward Pass (M2M) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Upward Pass (M2M) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" );
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -180,7 +180,7 @@ public: ...@@ -180,7 +180,7 @@ public:
void transferPass(){ void transferPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Downward Pass (M2L)\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -206,10 +206,10 @@ public: ...@@ -206,10 +206,10 @@ public:
FLOG(computationCounter.tic()); FLOG(computationCounter.tic());
kernels->finishedLevelM2L(fackLevel); kernels->finishedLevelM2L(fackLevel);
FLOG(computationCounter.tac()); FLOG(computationCounter.tac());
FLOG( FDebug::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" ); FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
} }
FLOG( FDebug::Controller << "\tFinished (@Downward Pass (M2L) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Downward Pass (M2L) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" );
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -219,7 +219,7 @@ public: ...@@ -219,7 +219,7 @@ public:
void downardPass(){ // second L2L void downardPass(){ // second L2L
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Downward Pass (L2L)\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter ); FLOG(FTic computationCounter );
...@@ -241,11 +241,11 @@ public: ...@@ -241,11 +241,11 @@ public:
avoidGotoLeftIterator.moveDown(); avoidGotoLeftIterator.moveDown();
octreeIterator = avoidGotoLeftIterator; octreeIterator = avoidGotoLeftIterator;
FLOG( FDebug::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" ); FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << "(" << fackLevel << ") = " << counterTimeLevel.tacAndElapsed() << "s\n" );
} }
FLOG( FDebug::Controller << "\tFinished (@Downward Pass (L2L) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Downward Pass (L2L) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation : " << computationCounter.cumulated() << " s\n" );
} }
...@@ -257,7 +257,7 @@ public: ...@@ -257,7 +257,7 @@ public:
/** P2P */ /** P2P */
void directPass(){ void directPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Direct Pass\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounterL2P); FLOG(FTic computationCounterL2P);
FLOG(FTic computationCounterP2P); FLOG(FTic computationCounterP2P);
...@@ -334,9 +334,9 @@ public: ...@@ -334,9 +334,9 @@ public:
} while(octreeIterator.moveRight()); } while(octreeIterator.moveRight());
FLOG( FDebug::Controller << "\tFinished (@Direct Pass (L2P + P2P) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Direct Pass (L2P + P2P) = " << counterTime.tacAndElapsed() << "s)\n" );
FLOG( FDebug::Controller << "\t\t Computation L2P : " << computationCounterL2P.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation L2P : " << computationCounterL2P.cumulated() << " s\n" );
FLOG( FDebug::Controller << "\t\t Computation P2P : " << computationCounterP2P.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation P2P : " << computationCounterP2P.cumulated() << " s\n" );
} }
...@@ -561,12 +561,12 @@ public: ...@@ -561,12 +561,12 @@ public:
*/ */
void processPeriodicLevels(){ void processPeriodicLevels(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Periodic Pass\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Periodic Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
// If nb level == -1 nothing to do // If nb level == -1 nothing to do
if( nbLevelsAboveRoot == -1 ){ if( nbLevelsAboveRoot == -1 ){
FLOG( FDebug::Controller << "\tFinished (@Periodic = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Periodic = " << counterTime.tacAndElapsed() << "s)\n" );
return; return;
} }
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
...@@ -599,7 +599,7 @@ public: ...@@ -599,7 +599,7 @@ public:
// put result in level 1 // put result in level 1
kernels->L2L( &rootDown, octreeIterator.getCurrentBox(), 3); kernels->L2L( &rootDown, octreeIterator.getCurrentBox(), 3);
FLOG( FDebug::Controller << "\tFinished (@Periodic = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Periodic = " << counterTime.tacAndElapsed() << "s)\n" );
return; return;
} }
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
...@@ -1195,7 +1195,7 @@ public: ...@@ -1195,7 +1195,7 @@ public:
delete[] cellsYZAxis; delete[] cellsYZAxis;
delete[] cellsXZAxis; delete[] cellsXZAxis;
FLOG( FDebug::Controller << "\tFinished (@Periodic = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Periodic = " << counterTime.tacAndElapsed() << "s)\n" );
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FTrace.hpp" #include "../Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
...@@ -68,7 +68,7 @@ public: ...@@ -68,7 +68,7 @@ public:
this->kernels[idxThread] = new KernelClass(*inKernels); this->kernels[idxThread] = new KernelClass(*inKernels);
} }
FLOG(FDebug::Controller << "FFmmAlgorithmSectionTask (Max Thread " << omp_get_max_threads() << ")\n"); FLOG(FLog::Controller << "FFmmAlgorithmSectionTask (Max Thread " << omp_get_max_threads() << ")\n");
} }
/** Default destructor */ /** Default destructor */
...@@ -120,7 +120,7 @@ private: ...@@ -120,7 +120,7 @@ private:
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Bottom Pass\n").write(FDebug::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
typename OctreeClass::Iterator octreeIterator(tree); typename OctreeClass::Iterator octreeIterator(tree);
...@@ -139,7 +139,7 @@ private: ...@@ -139,7 +139,7 @@ private:
#pragma omp taskwait #pragma omp taskwait
FLOG( FDebug::Controller << "\tFinished (@Bottom Pass (P2M) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Bottom Pass (P2M) = " << counterTime.tacAndElapsed() << "s)\n" );
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -149,7 +149,7 @@ private: ...@@ -149,7 +149,7 @@ private:
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) ); FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FDebug::Controller.write("\tStart Upward Pass\n").write(FDebug::Flush); ); FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
// Start from leal level - 1 // Start from leal level - 1
...@@ -176,11 +176,11 @@ private: ...@@ -176,11 +176,11 @@ private:
octreeIterator = avoidGotoLeftIterator;// equal octreeIterator.moveUp(); octreeIterator.gotoLeft(); octreeIterator = avoidGotoLeftIterator;// equal octreeIterator.moveUp(); octreeIterator.gotoLeft();
#pragma omp taskwait #pragma omp taskwait
FLOG( FDebug::Controller << "\t\t>> Level " << idxLevel << " = " << counterTimeLevel.tacAndElapsed() << "s\n" ); FLOG( FLog::Controller << "\t\t>> Level " << idxLevel << " = " << counterTimeLevel.tacAndElapsed() << "s\n" );
} }
FLOG( FDebug::Controller << "\tFinished (@Upward Pass (M2M) = " << counterTime.tacAndElapsed() << "s)\n" ); FLOG( FLog::Controller << "\tFinished (@Upward Pass (M2M) = " << counterTime.tacAndElapsed() << "s)\n" );
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -191,7 +191,7 @@ private: ...@@ -191,7 +191,7 @@ private:
void transferPass(){