diff --git a/Addons/FmmApi/Src/ScalfmmApiCore.cpp b/Addons/FmmApi/Src/ScalfmmApiCore.cpp index 18da57d73ba536dd0e2d052edd4d336618a3de3a..d63b38803c284ee1f78ebb6e56baa83f07efae7d 100755 --- a/Addons/FmmApi/Src/ScalfmmApiCore.cpp +++ b/Addons/FmmApi/Src/ScalfmmApiCore.cpp @@ -23,7 +23,7 @@ #include "../../Src/Components/FBasicKernels.hpp" -#ifdef SCALFMM_USE_MPI +#ifdef ScalFMM_USE_MPI #include "../../Src/Utils/FMpi.hpp" #endif @@ -283,7 +283,7 @@ struct ScalFmmCoreHandle { int treeHeight; // hombre de niveaux de l'arbre (int) FReal boxWidth; // taille de la boîte racine (FReal) FReal boxCenter[3]; // position du centre de la boîte racine (FReal[3]) -#ifdef SCALFMM_USE_MPI +#ifdef ScalFMM_USE_MPI MPI_Comm mpiCom; // communicateur MPI (MPI_Comm) #endif int nbThreads; // nombre de threads (int) @@ -319,7 +319,7 @@ int FmmCore_isParameterUsed(void */*fmmCore*/, int *name, int *flag){ case FMMCORE_ROOT_BOX_WIDTH : case FMMCORE_ROOT_BOX_CENTER : case FMMCORE_TREE_HEIGHT : -#ifdef SCALFMM_USE_MPI +#ifdef ScalFMM_USE_MPI case FMMCORE_MPI_COMMUNICATOR: #endif case FMMCORE_THREADS_NUMBER: @@ -358,7 +358,7 @@ int FmmCore_setParameter(void *fmmCore, int *name, void*value){ case FMMCORE_ROOT_BOX_CENTER : memcpy(corehandle->config.boxCenter, value, sizeof(FReal)*3); break; -#ifdef SCALFMM_USE_MPI +#ifdef ScalFMM_USE_MPI case FMMCORE_MPI_COMMUNICATOR: corehandle->config.mpiCom = *(MPI_Comm*)value; break; @@ -403,7 +403,7 @@ int FmmCore_getParameter(void *fmmCore, int *name, void*value){ case FMMCORE_ROOT_BOX_CENTER : memcpy(value,corehandle->config.boxCenter, sizeof(FReal)*3); break; -#ifdef SCALFMM_USE_MPI +#ifdef ScalFMM_USE_MPI case FMMCORE_MPI_COMMUNICATOR: *(MPI_Comm*)value = corehandle->config.mpiCom; break; diff --git a/Src/Utils/FLog.cpp b/Src/Utils/FLog.cpp index d238c89fd94fedc0eae1073957223ef620a34f60..43881eba3f0f8ff58a2427037ccd89ad01179611 100755 --- a/Src/Utils/FLog.cpp +++ b/Src/Utils/FLog.cpp @@ -24,5 +24,5 @@ FLog FLog::Controller; -#endif // SCALFMM_USE_DEBUG +#endif // ScalFMM_USE_DEBUG diff --git a/Src/Utils/FLog.hpp b/Src/Utils/FLog.hpp index 6b22e319c58e39a73f48a12d399fbbba7b1c80ce..45efb0b129e57f9db7ec98137495f39cacfbf538 100755 --- a/Src/Utils/FLog.hpp +++ b/Src/Utils/FLog.hpp @@ -179,7 +179,7 @@ public: }; -#endif //SCALFMM_USE_DEBUG +#endif //ScalFMM_USE_DEBUG #endif //FDEBUG_HPP diff --git a/Src/Utils/FMemStats.cpp b/Src/Utils/FMemStats.cpp index e989c9ba9f4c6aca8d52449fb7e87cbeb853cbd4..dc74bf53aa05ed1f3798018f812b03e349f0800e 100755 --- a/Src/Utils/FMemStats.cpp +++ b/Src/Utils/FMemStats.cpp @@ -19,7 +19,7 @@ FMemStats FMemStats::controler; #include -#ifdef SCALFMM_USE_MEM_STATS +#ifdef ScalFMM_USE_MEM_STATS // Regular scalar new void* operator new(std::size_t n) throw(std::bad_alloc) { diff --git a/Src/Utils/FMemStats.h b/Src/Utils/FMemStats.h index 219559701b850ce365bfcf3cb03183fcc881f54b..d0a4b2ddff8b2ff793d88659f7385b2b27176a52 100755 --- a/Src/Utils/FMemStats.h +++ b/Src/Utils/FMemStats.h @@ -27,7 +27,7 @@ * and give simple stats like max, total used, current used */ -#ifdef SCALFMM_USE_MEM_STATS +#ifdef ScalFMM_USE_MEM_STATS #include #include #warning You are using meme stats @@ -67,7 +67,7 @@ private: currentAllocated -= size; } -#ifdef SCALFMM_USE_MEM_STATS +#ifdef ScalFMM_USE_MEM_STATS friend void* operator new(std::size_t n) throw(std::bad_alloc); friend void* operator new(size_t n, std::nothrow_t const&) throw(); friend void* operator new[](size_t n) throw(std::bad_alloc); @@ -114,7 +114,7 @@ public: /** To know if mem stat has been enabled */ bool isUsed() const { -#ifdef SCALFMM_USE_MEM_STATS +#ifdef ScalFMM_USE_MEM_STATS return true; #else return false; diff --git a/Src/Utils/FTrace.cpp b/Src/Utils/FTrace.cpp index d5c6fb048b758372e032f04a6aaa6d7120b702eb..25628e4bba1d324195fda5c33195ba7bce4b0a83 100755 --- a/Src/Utils/FTrace.cpp +++ b/Src/Utils/FTrace.cpp @@ -14,12 +14,12 @@ // "http://www.gnu.org/licenses". // =================================================================================== #include "FTrace.hpp" -#ifdef SCALFMM_USE_TRACE +#ifdef ScalFMM_USE_TRACE -#if !defined (SCALFMM_USE_ITAC) && !defined (SCALFMM_USE_EZTRACE) +#if !defined (ScalFMM_USE_ITAC) && !defined (ScalFMM_USE_EZTRACE) int FTrace::Deep = 0; FTic FTrace::TimeSinceBegining; #endif -#endif // SCALFMM_USE_TRACE +#endif // ScalFMM_USE_TRACE diff --git a/Src/Utils/FTrace.hpp b/Src/Utils/FTrace.hpp index 05fc61ac5cab9138239e08c68f1b662f21e9ed62..d814f05ff1ae4c9de6a0a62b306294fe3395f1f1 100755 --- a/Src/Utils/FTrace.hpp +++ b/Src/Utils/FTrace.hpp @@ -34,7 +34,7 @@ * */ -#ifndef SCALFMM_USE_TRACE +#ifndef ScalFMM_USE_TRACE #define FTRACE( X ) @@ -56,7 +56,7 @@ #define FTRACE( X ) X - #ifdef SCALFMM_USE_ITAC + #ifdef ScalFMM_USE_ITAC #include @@ -85,7 +85,7 @@ }; #else - #ifdef SCALFMM_USE_EZTRACE + #ifdef ScalFMM_USE_EZTRACE #include @@ -219,11 +219,11 @@ friend class FFunction; }; - #endif //SCALFMM_USE_EZTRACE + #endif //ScalFMM_USE_EZTRACE - #endif //SCALFMM_USE_ITAC + #endif //ScalFMM_USE_ITAC -#endif //SCALFMM_USE_TRACE +#endif //ScalFMM_USE_TRACE #endif //FTRACE_HPP diff --git a/Tests/Utils/testDebug.cpp b/Tests/Utils/testDebug.cpp index 51bfaa90960ce9a8b82beb939d7b39f2aa874d11..629954e01f1f756a238a9666ffbdc7b78fd1e748 100755 --- a/Tests/Utils/testDebug.cpp +++ b/Tests/Utils/testDebug.cpp @@ -17,7 +17,7 @@ /** * In this file we show how to use the debug module. -* Warning, in FGlobal.hpp (included in FLog.hpp) SCALFMM_USE_DEBUG might be undefined. +* Warning, in FGlobal.hpp (included in FLog.hpp) ScalFMM_USE_DEBUG might be undefined. */ int main(void){ diff --git a/UTests/utestSphericalDirect.cpp b/UTests/utestSphericalDirect.cpp index b8b4d5f9f521fedcdb99a4e5c7a6e1e1cac2827c..ccc12fb6757a86881464f117d016cbe80bc837ef 100755 --- a/UTests/utestSphericalDirect.cpp +++ b/UTests/utestSphericalDirect.cpp @@ -214,7 +214,7 @@ class TestSphericalDirect : public FUTester { OctreeClass, FmmClass>(false); } -#ifdef SCALFMM_USE_BLAS +#ifdef ScalFMM_USE_BLAS /** Blas */ void TestSphericalBlas(){ typedef FSphericalCell CellClass; @@ -256,7 +256,7 @@ class TestSphericalDirect : public FUTester { void SetTests(){ AddTest(&TestSphericalDirect::TestSpherical,"Test Spherical Kernel"); AddTest(&TestSphericalDirect::TestRotation,"Test Rotation Spherical Kernel"); -#ifdef SCALFMM_USE_BLAS +#ifdef ScalFMM_USE_BLAS AddTest(&TestSphericalDirect::TestSphericalBlas,"Test Spherical Blas Kernel"); AddTest(&TestSphericalDirect::TestSphericalBlockBlas,"Test Spherical Block Blas Kernel"); #endif diff --git a/UTests/utestSphericalDirectDebug.cpp b/UTests/utestSphericalDirectDebug.cpp index f1904e8756da2377364098f31c30c7dc17cd4e63..f2983bd4307f5c56d5a2b8195655f50e5e80d765 100755 --- a/UTests/utestSphericalDirectDebug.cpp +++ b/UTests/utestSphericalDirectDebug.cpp @@ -283,7 +283,7 @@ class TestSphericalDirect : public FUTester { OctreeClass, FmmClass>(false); } -#ifdef SCALFMM_USE_BLAS +#ifdef ScalFMM_USE_BLAS /** Blas */ void TestSphericalBlas(){ typedef FSphericalCell CellClass; @@ -325,7 +325,7 @@ class TestSphericalDirect : public FUTester { void SetTests(){ AddTest(&TestSphericalDirect::TestSpherical,"Test Spherical Kernel"); //AddTest(&TestSphericalDirect::TestRotation,"Test Rotation Spherical Kernel"); -#ifdef SCALFMM_USE_BLAS +#ifdef ScalFMM_USE_BLAS //AddTest(&TestSphericalDirect::TestSphericalBlas,"Test Spherical Blas Kernel"); //AddTest(&TestSphericalDirect::TestSphericalBlockBlas,"Test Spherical Block Blas Kernel"); #endif