Skip to content

GitLab

S
ScalFMM
Commit 0ca11347 authored by COULAUD Olivier's avatar COULAUD Olivier
Browse files
Options

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/scalfmm/scalfmm

parents de9be7c4 15db427b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 874 deletions
CMakeLists.txt
View file @ 0ca11347
...@@ -44,7 +44,6 @@ MESSAGE(STATUS " CXX ${CMAKE_CXX_COMPILER_ID}" ) ...@@ -44,7 +44,6 @@ MESSAGE(STATUS " CXX ${CMAKE_CXX_COMPILER_ID}" )
# Options # Options
OPTION( ScalFMM_USE_BLAS "Set to ON to build ScaFMM with BLAS" OFF ) OPTION( ScalFMM_USE_BLAS "Set to ON to build ScaFMM with BLAS" OFF )
OPTION( ScalFMM_USE_FFT "Set to ON to build ScaFMM with FFTW" OFF ) OPTION( ScalFMM_USE_FFT "Set to ON to build ScaFMM with FFTW" OFF )
OPTION( ScalFMM_USE_TRACE "Set to ON to print trace or use itac trace" OFF )
OPTION( ScalFMM_BUILD_TESTS "Set to ON to build functionalities Tests" OFF ) OPTION( ScalFMM_BUILD_TESTS "Set to ON to build functionalities Tests" OFF )
OPTION( ScalFMM_BUILD_UTESTS "Set to ON to build UTests" OFF ) OPTION( ScalFMM_BUILD_UTESTS "Set to ON to build UTests" OFF )
OPTION( ScalFMM_BUILD_DEBUG "Set to ON to build in Debug" OFF ) OPTION( ScalFMM_BUILD_DEBUG "Set to ON to build in Debug" OFF )
...@@ -95,7 +94,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") ...@@ -95,7 +94,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
#-Wshadow -Wpointer-arith -Wcast-qual -Wconversion -Wall -Wnosign-conversion ") #-Wshadow -Wpointer-arith -Wcast-qual -Wconversion -Wall -Wnosign-conversion ")
else() else()
# NOT INTEL # NOT INTEL
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -Wzero-as-null-pointer-constant") if(NOT ${ScalFMM_USE_MPI})
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -Wzero-as-null-pointer-constant")
endif()
SET(AVX_FLAGS "-mtune=native -march=native") SET(AVX_FLAGS "-mtune=native -march=native")
IF (APPLE) IF (APPLE)
SET(SSE_FLAGS "-msse3 -mfpmath=sse") # -mtune=native -march=native SET(SSE_FLAGS "-msse3 -mfpmath=sse") # -mtune=native -march=native
...@@ -160,16 +161,7 @@ if( ScalFMM_ATTACHE_SOURCE ) ...@@ -160,16 +161,7 @@ if( ScalFMM_ATTACHE_SOURCE )
# ADD_DEFINITIONS(-g) # ADD_DEFINITIONS(-g)
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -g") SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -g")
endif(ScalFMM_ATTACHE_SOURCE) endif(ScalFMM_ATTACHE_SOURCE)
##############################################################################
# Trace #
##############################################################################
MESSAGE( STATUS "ScalFMM_USE_TRACE = ${ScalFMM_USE_TRACE}" )
if( ScalFMM_USE_TRACE )
OPTION( ScalFMM_USE_ITAC "Set to ON to use itac trace" OFF )
if( ScaLFMM_USE_ITAC )
ADD_DEFINITIONS(-I$VT_ROOT/include -trace)
endif()
endif()
############################################################################## ##############################################################################
# Blas option # # Blas option #
############################################################################## ##############################################################################
......
Src/AdaptiveTree/FAdaptChebSymKernel.hpp
View file @ 0ca11347
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
// =================================================================================== // ===================================================================================
#include "Utils/FGlobal.hpp" #include "Utils/FGlobal.hpp"
#include "Utils/FTrace.hpp"
#include "Utils/FPoint.hpp" #include "Utils/FPoint.hpp"
#include "Adaptative/FAdaptiveCell.hpp" #include "Adaptative/FAdaptiveCell.hpp"
......
Src/AdaptiveTree/FAdaptSeqAlgorithm.hpp
View file @ 0ca11347
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "Utils/FGlobal.hpp" #include "Utils/FGlobal.hpp"
#include "Utils/FAssert.hpp" #include "Utils/FAssert.hpp"
#include "Utils/FLog.hpp" #include "Utils/FLog.hpp"
#include "Utils/FTrace.hpp"
#include "Utils/FTic.hpp" #include "Utils/FTic.hpp"
#include "Containers/FOctree.hpp" #include "Containers/FOctree.hpp"
...@@ -70,9 +70,7 @@ public: ...@@ -70,9 +70,7 @@ public:
* To execute the fmm algorithm * To execute the fmm algorithm
* Call this function to run the complete algorithm * Call this function to run the complete algorithm
*/ */
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){ void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
if(operationsToProceed & FFmmP2M) bottomPass(); if(operationsToProceed & FFmmP2M) bottomPass();
if(operationsToProceed & FFmmM2M) upwardPass(); if(operationsToProceed & FFmmM2M) upwardPass();
...@@ -90,8 +88,7 @@ private: ...@@ -90,8 +88,7 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -125,8 +122,7 @@ private: ...@@ -125,8 +122,7 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -205,9 +201,7 @@ private: ...@@ -205,9 +201,7 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** M2L */ /** M2L */
void transferPass(){ void transferPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::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);
...@@ -299,8 +293,7 @@ private: ...@@ -299,8 +293,7 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** L2L */ /** L2L */
void downardPass(){ void downardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::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 );
...@@ -360,8 +353,7 @@ private: ...@@ -360,8 +353,7 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** P2P */ /** P2P */
void directPass(){ void directPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounterL2P); FLOG(FTic computationCounterL2P);
......
Src/AdaptiveTree/FAdaptUnifKernel.hpp
View file @ 0ca11347
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
// =================================================================================== // ===================================================================================
#include "Utils/FGlobal.hpp" #include "Utils/FGlobal.hpp"
#include "Utils/FTrace.hpp"
#include "Utils/FPoint.hpp" #include "Utils/FPoint.hpp"
#include "Adaptative/FAdaptiveCell.hpp" #include "Adaptative/FAdaptiveCell.hpp"
......
Src/Components/FTestKernels.hpp
View file @ 0ca11347
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "FAbstractKernels.hpp" #include "FAbstractKernels.hpp"
#include "../Containers/FOctree.hpp" #include "../Containers/FOctree.hpp"
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FTrace.hpp"
/** /**
......
Src/Core/FFmmAlgorithm.hpp
View file @ 0ca11347
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp" #include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
#include "../Containers/FOctree.hpp" #include "../Containers/FOctree.hpp"
...@@ -71,8 +71,6 @@ public: ...@@ -71,8 +71,6 @@ public:
* Call this function to run the complete algorithm * Call this function to run the complete algorithm
*/ */
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){ void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
if(operationsToProceed & FFmmP2M) bottomPass(); if(operationsToProceed & FFmmP2M) bottomPass();
if(operationsToProceed & FFmmM2M) upwardPass(); if(operationsToProceed & FFmmM2M) upwardPass();
...@@ -91,7 +89,6 @@ private: ...@@ -91,7 +89,6 @@ private:
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -118,7 +115,6 @@ private: ...@@ -118,7 +115,6 @@ private:
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -160,8 +156,6 @@ private: ...@@ -160,8 +156,6 @@ private:
/** M2L */ /** M2L */
void transferPass(){ void transferPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::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);
...@@ -204,7 +198,6 @@ private: ...@@ -204,7 +198,6 @@ private:
/** L2L */ /** L2L */
void downardPass(){ void downardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::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 );
...@@ -244,7 +237,6 @@ private: ...@@ -244,7 +237,6 @@ private:
/** P2P */ /** P2P */
void directPass(){ void directPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounterL2P); FLOG(FTic computationCounterL2P);
......
Src/Core/FFmmAlgorithmPeriodic.hpp
View file @ 0ca11347
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "../Utils/FGlobalPeriodic.hpp" #include "../Utils/FGlobalPeriodic.hpp"
#include "../Utils/FAssert.hpp" #include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
#include "../Utils/FMemUtils.hpp" #include "../Utils/FMemUtils.hpp"
...@@ -69,7 +69,6 @@ public: ...@@ -69,7 +69,6 @@ public:
*/ */
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){ void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
FAssertLF(kernels, "kernels cannot be null"); FAssertLF(kernels, "kernels cannot be null");
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
if(operationsToProceed & FFmmP2M) bottomPass(); if(operationsToProceed & FFmmP2M) bottomPass();
...@@ -93,7 +92,6 @@ public: ...@@ -93,7 +92,6 @@ public:
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -120,7 +118,6 @@ public: ...@@ -120,7 +118,6 @@ public:
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -161,8 +158,6 @@ public: ...@@ -161,8 +158,6 @@ public:
/** M2L L2L */ /** M2L L2L */
void transferPass(){ void transferPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::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);
...@@ -201,7 +196,6 @@ public: ...@@ -201,7 +196,6 @@ public:
void downardPass(){ // second L2L void downardPass(){ // second L2L
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::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 );
...@@ -239,7 +233,6 @@ public: ...@@ -239,7 +233,6 @@ public:
/** P2P */ /** P2P */
void directPass(){ void directPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounterL2P); FLOG(FTic computationCounterL2P);
...@@ -513,7 +506,6 @@ public: ...@@ -513,7 +506,6 @@ public:
* Finally the L2L * Finally the L2L
*/ */
void processPeriodicLevels(){ void processPeriodicLevels(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Periodic Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Periodic Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
......
Src/Core/FFmmAlgorithmSectionTask.hpp
View file @ 0ca11347
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp" #include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
#include "../Containers/FOctree.hpp" #include "../Containers/FOctree.hpp"
...@@ -84,7 +84,6 @@ public: ...@@ -84,7 +84,6 @@ public:
* Call this function to run the complete algorithm * Call this function to run the complete algorithm
*/ */
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){ void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
#pragma omp parallel #pragma omp parallel
{ {
...@@ -119,7 +118,6 @@ private: ...@@ -119,7 +118,6 @@ private:
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -148,7 +146,6 @@ private: ...@@ -148,7 +146,6 @@ private:
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -189,8 +186,6 @@ private: ...@@ -189,8 +186,6 @@ private:
/** M2L L2L */ /** M2L L2L */
void transferPass(){ void transferPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -241,7 +236,6 @@ private: ...@@ -241,7 +236,6 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
void downardPass(){ // second L2L void downardPass(){ // second L2L
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -280,7 +274,6 @@ private: ...@@ -280,7 +274,6 @@ private:
/** P2P */ /** P2P */
void directPass(){ void directPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
...@@ -330,7 +323,6 @@ private: ...@@ -330,7 +323,6 @@ private:
} }
void L2PPass(){ void L2PPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart L2P Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart L2P Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
......
Src/Core/FFmmAlgorithmTask.hpp
View file @ 0ca11347
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp" #include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
#include "../Containers/FOctree.hpp" #include "../Containers/FOctree.hpp"
...@@ -84,7 +84,6 @@ public: ...@@ -84,7 +84,6 @@ public:
* Call this function to run the complete algorithm * Call this function to run the complete algorithm
*/ */
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){ void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
if(operationsToProceed & FFmmP2M) bottomPass(); if(operationsToProceed & FFmmP2M) bottomPass();
...@@ -104,7 +103,6 @@ private: ...@@ -104,7 +103,6 @@ private:
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -138,7 +136,6 @@ private: ...@@ -138,7 +136,6 @@ private:
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -185,7 +182,6 @@ private: ...@@ -185,7 +182,6 @@ private:
/** M2L L2L */ /** M2L L2L */
void transferPass(){ void transferPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -241,7 +237,6 @@ private: ...@@ -241,7 +237,6 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
void downardPass(){ // second L2L void downardPass(){ // second L2L
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -286,7 +281,6 @@ private: ...@@ -286,7 +281,6 @@ private:
/** P2P */ /** P2P */
void directPass(){ void directPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); ); FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime); FLOG(FTic counterTime);
FLOG(FTic computationCounter); FLOG(FTic computationCounter);
......
Src/Core/FFmmAlgorithmThread.hpp
View file @ 0ca11347
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "../Utils/FAssert.hpp" #include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp" #include "../Utils/FLog.hpp"
#include "../Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
...@@ -92,7 +92,6 @@ public: ...@@ -92,7 +92,6 @@ public:
* Call this function to run the complete algorithm * Call this function to run the complete algorithm
*/ */
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){ void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
for(int idxShape = 0 ; idxShape < SizeShape ; ++idxShape){ for(int idxShape = 0 ; idxShape < SizeShape ; ++idxShape){
this->shapeLeaf[idxShape] = 0; this->shapeLeaf[idxShape] = 0;
...@@ -132,7 +131,6 @@ private: ...@@ -132,7 +131,6 @@ private:
/** P2M */ /** P2M */
void bottomPass(){ void bottomPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) ); FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime); FLOG(FTic counterTime);
...@@ -169,7 +167,6 @@ private: ...@@ -169,7 +167,6 @@ private:
/** M2M */ /** M2M */
void upwardPass(){ void upwardPass(){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );