Commit fc4fae17 authored by BRAMAS Berenger's avatar BRAMAS Berenger

Replace all SCALFMM_ by ScalFMM_, it would have been easier to name the project SCALFMM maybe

parent 052f0557
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "../../Src/Components/FBasicKernels.hpp" #include "../../Src/Components/FBasicKernels.hpp"
#ifdef SCALFMM_USE_MPI #ifdef ScalFMM_USE_MPI
#include "../../Src/Utils/FMpi.hpp" #include "../../Src/Utils/FMpi.hpp"
#endif #endif
...@@ -283,7 +283,7 @@ struct ScalFmmCoreHandle { ...@@ -283,7 +283,7 @@ struct ScalFmmCoreHandle {
int treeHeight; // hombre de niveaux de l'arbre (int) int treeHeight; // hombre de niveaux de l'arbre (int)
FReal boxWidth; // taille de la boîte racine (FReal) FReal boxWidth; // taille de la boîte racine (FReal)
FReal boxCenter[3]; // position du centre de la boîte racine (FReal[3]) 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) MPI_Comm mpiCom; // communicateur MPI (MPI_Comm)
#endif #endif
int nbThreads; // nombre de threads (int) int nbThreads; // nombre de threads (int)
...@@ -319,7 +319,7 @@ int FmmCore_isParameterUsed(void */*fmmCore*/, int *name, int *flag){ ...@@ -319,7 +319,7 @@ int FmmCore_isParameterUsed(void */*fmmCore*/, int *name, int *flag){
case FMMCORE_ROOT_BOX_WIDTH : case FMMCORE_ROOT_BOX_WIDTH :
case FMMCORE_ROOT_BOX_CENTER : case FMMCORE_ROOT_BOX_CENTER :
case FMMCORE_TREE_HEIGHT : case FMMCORE_TREE_HEIGHT :
#ifdef SCALFMM_USE_MPI #ifdef ScalFMM_USE_MPI
case FMMCORE_MPI_COMMUNICATOR: case FMMCORE_MPI_COMMUNICATOR:
#endif #endif
case FMMCORE_THREADS_NUMBER: case FMMCORE_THREADS_NUMBER:
...@@ -358,7 +358,7 @@ int FmmCore_setParameter(void *fmmCore, int *name, void*value){ ...@@ -358,7 +358,7 @@ int FmmCore_setParameter(void *fmmCore, int *name, void*value){
case FMMCORE_ROOT_BOX_CENTER : case FMMCORE_ROOT_BOX_CENTER :
memcpy(corehandle->config.boxCenter, value, sizeof(FReal)*3); memcpy(corehandle->config.boxCenter, value, sizeof(FReal)*3);
break; break;
#ifdef SCALFMM_USE_MPI #ifdef ScalFMM_USE_MPI
case FMMCORE_MPI_COMMUNICATOR: case FMMCORE_MPI_COMMUNICATOR:
corehandle->config.mpiCom = *(MPI_Comm*)value; corehandle->config.mpiCom = *(MPI_Comm*)value;
break; break;
...@@ -403,7 +403,7 @@ int FmmCore_getParameter(void *fmmCore, int *name, void*value){ ...@@ -403,7 +403,7 @@ int FmmCore_getParameter(void *fmmCore, int *name, void*value){
case FMMCORE_ROOT_BOX_CENTER : case FMMCORE_ROOT_BOX_CENTER :
memcpy(value,corehandle->config.boxCenter, sizeof(FReal)*3); memcpy(value,corehandle->config.boxCenter, sizeof(FReal)*3);
break; break;
#ifdef SCALFMM_USE_MPI #ifdef ScalFMM_USE_MPI
case FMMCORE_MPI_COMMUNICATOR: case FMMCORE_MPI_COMMUNICATOR:
*(MPI_Comm*)value = corehandle->config.mpiCom; *(MPI_Comm*)value = corehandle->config.mpiCom;
break; break;
......
...@@ -24,5 +24,5 @@ FLog FLog::Controller; ...@@ -24,5 +24,5 @@ FLog FLog::Controller;
#endif // SCALFMM_USE_DEBUG #endif // ScalFMM_USE_DEBUG
...@@ -179,7 +179,7 @@ public: ...@@ -179,7 +179,7 @@ public:
}; };
#endif //SCALFMM_USE_DEBUG #endif //ScalFMM_USE_DEBUG
#endif //FDEBUG_HPP #endif //FDEBUG_HPP
......
...@@ -19,7 +19,7 @@ FMemStats FMemStats::controler; ...@@ -19,7 +19,7 @@ FMemStats FMemStats::controler;
#include <cstdio> #include <cstdio>
#ifdef SCALFMM_USE_MEM_STATS #ifdef ScalFMM_USE_MEM_STATS
// Regular scalar new // Regular scalar new
void* operator new(std::size_t n) throw(std::bad_alloc) void* operator new(std::size_t n) throw(std::bad_alloc)
{ {
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* and give simple stats like max, total used, current used * and give simple stats like max, total used, current used
*/ */
#ifdef SCALFMM_USE_MEM_STATS #ifdef ScalFMM_USE_MEM_STATS
#include <new> #include <new>
#include <stdexcept> #include <stdexcept>
#warning You are using meme stats #warning You are using meme stats
...@@ -67,7 +67,7 @@ private: ...@@ -67,7 +67,7 @@ private:
currentAllocated -= size; 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(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, std::nothrow_t const&) throw();
friend void* operator new[](size_t n) throw(std::bad_alloc); friend void* operator new[](size_t n) throw(std::bad_alloc);
...@@ -114,7 +114,7 @@ public: ...@@ -114,7 +114,7 @@ public:
/** To know if mem stat has been enabled */ /** To know if mem stat has been enabled */
bool isUsed() const { bool isUsed() const {
#ifdef SCALFMM_USE_MEM_STATS #ifdef ScalFMM_USE_MEM_STATS
return true; return true;
#else #else
return false; return false;
......
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
// "http://www.gnu.org/licenses". // "http://www.gnu.org/licenses".
// =================================================================================== // ===================================================================================
#include "FTrace.hpp" #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; int FTrace::Deep = 0;
FTic FTrace::TimeSinceBegining; FTic FTrace::TimeSinceBegining;
#endif #endif
#endif // SCALFMM_USE_TRACE #endif // ScalFMM_USE_TRACE
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
* </code> * </code>
*/ */
#ifndef SCALFMM_USE_TRACE #ifndef ScalFMM_USE_TRACE
#define FTRACE( X ) #define FTRACE( X )
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#define FTRACE( X ) X #define FTRACE( X ) X
#ifdef SCALFMM_USE_ITAC #ifdef ScalFMM_USE_ITAC
#include <VT.h> #include <VT.h>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
}; };
#else #else
#ifdef SCALFMM_USE_EZTRACE #ifdef ScalFMM_USE_EZTRACE
#include <eztrace.h> #include <eztrace.h>
...@@ -219,11 +219,11 @@ ...@@ -219,11 +219,11 @@
friend class FFunction; 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 #endif //FTRACE_HPP
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/** /**
* In this file we show how to use the debug module. * 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){ int main(void){
......
...@@ -214,7 +214,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> { ...@@ -214,7 +214,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> {
OctreeClass, FmmClass>(false); OctreeClass, FmmClass>(false);
} }
#ifdef SCALFMM_USE_BLAS #ifdef ScalFMM_USE_BLAS
/** Blas */ /** Blas */
void TestSphericalBlas(){ void TestSphericalBlas(){
typedef FSphericalCell CellClass; typedef FSphericalCell CellClass;
...@@ -256,7 +256,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> { ...@@ -256,7 +256,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> {
void SetTests(){ void SetTests(){
AddTest(&TestSphericalDirect::TestSpherical,"Test Spherical Kernel"); AddTest(&TestSphericalDirect::TestSpherical,"Test Spherical Kernel");
AddTest(&TestSphericalDirect::TestRotation,"Test Rotation 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::TestSphericalBlas,"Test Spherical Blas Kernel");
AddTest(&TestSphericalDirect::TestSphericalBlockBlas,"Test Spherical Block Blas Kernel"); AddTest(&TestSphericalDirect::TestSphericalBlockBlas,"Test Spherical Block Blas Kernel");
#endif #endif
......
...@@ -283,7 +283,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> { ...@@ -283,7 +283,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> {
OctreeClass, FmmClass>(false); OctreeClass, FmmClass>(false);
} }
#ifdef SCALFMM_USE_BLAS #ifdef ScalFMM_USE_BLAS
/** Blas */ /** Blas */
void TestSphericalBlas(){ void TestSphericalBlas(){
typedef FSphericalCell CellClass; typedef FSphericalCell CellClass;
...@@ -325,7 +325,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> { ...@@ -325,7 +325,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> {
void SetTests(){ void SetTests(){
AddTest(&TestSphericalDirect::TestSpherical,"Test Spherical Kernel"); AddTest(&TestSphericalDirect::TestSpherical,"Test Spherical Kernel");
//AddTest(&TestSphericalDirect::TestRotation,"Test Rotation 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::TestSphericalBlas,"Test Spherical Blas Kernel");
//AddTest(&TestSphericalDirect::TestSphericalBlockBlas,"Test Spherical Block Blas Kernel"); //AddTest(&TestSphericalDirect::TestSphericalBlockBlas,"Test Spherical Block Blas Kernel");
#endif #endif
......
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