Commit 61fcc94b authored by berenger-bramas's avatar berenger-bramas

Change the comment in the files.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@276 2616d619-271b-44dc-8df4-d4a8f33a7222
parent e862a0be
...@@ -13,7 +13,7 @@ OPTION( SCALFMM_USE_TRACE "Set to ON to print trace or use itac trace" OFF ) ...@@ -13,7 +13,7 @@ OPTION( SCALFMM_USE_TRACE "Set to ON to print trace or use itac trace" OFF )
OPTION( SCALFMM_BUILD_TESTS "Set to ON to build fonctionnalities Tests" ON ) OPTION( SCALFMM_BUILD_TESTS "Set to ON to build fonctionnalities Tests" ON )
OPTION( SCALFMM_BUILD_UTESTS "Set to ON to build UTests" ON ) OPTION( SCALFMM_BUILD_UTESTS "Set to ON to build UTests" ON )
OPTION( SCALFMM_BUILD_DEBUG "Set to ON to build in Debug" OFF ) OPTION( SCALFMM_BUILD_DEBUG "Set to ON to build in Debug" OFF )
OPTION( SCALFMM_USE_MEM_STATS "Set to ON to profile memory" ON ) OPTION( SCALFMM_USE_MEM_STATS "Set to ON to profile memory" OFF )
# MPI option has to be set before project # MPI option has to be set before project
...@@ -28,6 +28,9 @@ project(scalfmm CXX) ...@@ -28,6 +28,9 @@ project(scalfmm CXX)
MESSAGE( STATUS "SCALFMM_BUILD_DEBUG = ${SCALFMM_BUILD_DEBUG}" ) MESSAGE( STATUS "SCALFMM_BUILD_DEBUG = ${SCALFMM_BUILD_DEBUG}" )
if( SCALFMM_BUILD_DEBUG ) if( SCALFMM_BUILD_DEBUG )
SET(CMAKE_BUILD_TYPE Debug) SET(CMAKE_BUILD_TYPE Debug)
ADD_DEFINITIONS(-O0)
else()
ADD_DEFINITIONS(-O2)
endif() endif()
# Trace # Trace
...@@ -51,7 +54,7 @@ if( SCALFMM_USE_CBLAS ) ...@@ -51,7 +54,7 @@ if( SCALFMM_USE_CBLAS )
endif() endif()
# Compile option # Compile option
ADD_DEFINITIONS(-O2 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wconversion) ADD_DEFINITIONS(-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wconversion)
CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake
${CMAKE_BINARY_DIR}/Src/ScalFmmConfig.h ) ${CMAKE_BINARY_DIR}/Src/ScalFmmConfig.h )
......
#ifndef FABSTRACTCELL_HPP #ifndef FABSTRACTCELL_HPP
#define FABSTRACTCELL_HPP #define FABSTRACTCELL_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
...@@ -83,4 +83,4 @@ public: ...@@ -83,4 +83,4 @@ public:
#endif //FABSTRACTCELL_HPP #endif //FABSTRACTCELL_HPP
// [--LICENSE--] // [--END--]
#ifndef FABSTRACTKERNELS_HPP #ifndef FABSTRACTKERNELS_HPP
#define FABSTRACTKERNELS_HPP #define FABSTRACTKERNELS_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
...@@ -97,4 +97,4 @@ public: ...@@ -97,4 +97,4 @@ public:
#endif //FABSTRACTKERNELS_HPP #endif //FABSTRACTKERNELS_HPP
// [--LICENSE--] // [--END--]
#ifndef FABSTRACTLEAF_HPP #ifndef FABSTRACTLEAF_HPP
#define FABSTRACTLEAF_HPP #define FABSTRACTLEAF_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
/** /**
...@@ -47,4 +47,4 @@ public: ...@@ -47,4 +47,4 @@ public:
#endif //FABSTRACTLEAF_HPP #endif //FABSTRACTLEAF_HPP
// [--LICENSE--] // [--END--]
#ifndef FABSTRACTPARTICLE_HPP #ifndef FABSTRACTPARTICLE_HPP
#define FABSTRACTPARTICLE_HPP #define FABSTRACTPARTICLE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
/* forward declaration to avoid include */ /* forward declaration to avoid include */
class F3DPosition; class F3DPosition;
...@@ -38,4 +38,4 @@ public: ...@@ -38,4 +38,4 @@ public:
#endif //FABSTRACTPARTICLE_HPP #endif //FABSTRACTPARTICLE_HPP
// [--LICENSE--] // [--END--]
#ifndef FBASICCELL_HPP #ifndef FBASICCELL_HPP
#define FBASICCELL_HPP #define FBASICCELL_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Extensions/FExtendPosition.hpp" #include "../Extensions/FExtendPosition.hpp"
#include "../Extensions/FExtendMortonIndex.hpp" #include "../Extensions/FExtendMortonIndex.hpp"
...@@ -27,4 +27,4 @@ public: ...@@ -27,4 +27,4 @@ public:
#endif //FBASICCELL_HPP #endif //FBASICCELL_HPP
// [--LICENSE--] // [--END--]
#ifndef FBASICKERNELS_HPP #ifndef FBASICKERNELS_HPP
#define FBASICKERNELS_HPP #define FBASICKERNELS_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "FAbstractKernels.hpp" #include "FAbstractKernels.hpp"
...@@ -65,4 +65,4 @@ public: ...@@ -65,4 +65,4 @@ public:
#endif //FBASICKERNELS_HPP #endif //FBASICKERNELS_HPP
// [--LICENSE--] // [--END--]
#ifndef FBASICPARTICLE_HPP #ifndef FBASICPARTICLE_HPP
#define FBASICPARTICLE_HPP #define FBASICPARTICLE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Extensions/FExtendPosition.hpp" #include "../Extensions/FExtendPosition.hpp"
...@@ -25,4 +25,4 @@ public: ...@@ -25,4 +25,4 @@ public:
#endif //FBASICPARTICLE_HPP #endif //FBASICPARTICLE_HPP
// [--LICENSE--] // [--END--]
#ifndef FFmaPARTICLE_HPP #ifndef FFmaPARTICLE_HPP
#define FFmaPARTICLE_HPP #define FFmaPARTICLE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "FBasicParticle.hpp" #include "FBasicParticle.hpp"
#include "../Extensions/FExtendPhysicalValue.hpp" #include "../Extensions/FExtendPhysicalValue.hpp"
...@@ -23,4 +23,4 @@ public: ...@@ -23,4 +23,4 @@ public:
#endif //FFmaPARTICLE_HPP #endif //FFmaPARTICLE_HPP
// [--LICENSE--] // [--END--]
#ifndef FSIMPLELEAF_HPP #ifndef FSIMPLELEAF_HPP
#define FSIMPLELEAF_HPP #define FSIMPLELEAF_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "FAbstractLeaf.hpp" #include "FAbstractLeaf.hpp"
...@@ -50,4 +50,4 @@ public: ...@@ -50,4 +50,4 @@ public:
#endif //FSIMPLELEAF_HPP #endif //FSIMPLELEAF_HPP
// [--LICENSE--] // [--END--]
#ifndef FTESTCELL_HPP #ifndef FTESTCELL_HPP
#define FTESTCELL_HPP #define FTESTCELL_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "FBasicCell.hpp" #include "FBasicCell.hpp"
...@@ -45,4 +45,4 @@ public: ...@@ -45,4 +45,4 @@ public:
#endif //FTESTCELL_HPP #endif //FTESTCELL_HPP
// [--LICENSE--] // [--END--]
#ifndef FTESTKERNELS_HPP #ifndef FTESTKERNELS_HPP
#define FTESTKERNELS_HPP #define FTESTKERNELS_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include <iostream> #include <iostream>
...@@ -194,4 +194,4 @@ void ValidateFMMAlgo(OctreeClass* const tree){ ...@@ -194,4 +194,4 @@ void ValidateFMMAlgo(OctreeClass* const tree){
#endif //FTESTKERNELS_HPP #endif //FTESTKERNELS_HPP
// [--LICENSE--] // [--END--]
#ifndef FTESTPARTICLE_HPP #ifndef FTESTPARTICLE_HPP
#define FTESTPARTICLE_HPP #define FTESTPARTICLE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "FBasicParticle.hpp" #include "FBasicParticle.hpp"
...@@ -38,4 +38,4 @@ public: ...@@ -38,4 +38,4 @@ public:
#endif //FTESTPARTICLE_HPP #endif //FTESTPARTICLE_HPP
// [--LICENSE--] // [--END--]
#ifndef FTYPEDLEAF_HPP #ifndef FTYPEDLEAF_HPP
#define FTYPEDLEAF_HPP #define FTYPEDLEAF_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "FAbstractLeaf.hpp" #include "FAbstractLeaf.hpp"
...@@ -54,4 +54,4 @@ public: ...@@ -54,4 +54,4 @@ public:
#endif //FTYPEDLEAF_HPP #endif //FTYPEDLEAF_HPP
// [--LICENSE--] // [--END--]
#ifndef FBOOLARRAY_HPP #ifndef FBOOLARRAY_HPP
#define FBOOLARRAY_HPP #define FBOOLARRAY_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
// To get memcpy // To get memcpy
#include <cstring> #include <cstring>
...@@ -102,4 +102,4 @@ public : ...@@ -102,4 +102,4 @@ public :
#endif //FBOOLARRAY_HPP #endif //FBOOLARRAY_HPP
// [--LICENSE--] // [--END--]
#ifndef FLIST_HPP #ifndef FLIST_HPP
#define FLIST_HPP #define FLIST_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
...@@ -284,4 +284,4 @@ public: ...@@ -284,4 +284,4 @@ public:
}; };
#endif //FLIST_HPP #endif //FLIST_HPP
// [--LICENSE--] // [--END--]
#ifndef FOCTREE_HPP #ifndef FOCTREE_HPP
#define FOCTREE_HPP #define FOCTREE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "FSubOctree.hpp" #include "FSubOctree.hpp"
...@@ -1005,4 +1005,4 @@ public: ...@@ -1005,4 +1005,4 @@ public:
}; };
#endif //FOCTREE_HPP #endif //FOCTREE_HPP
// [--LICENSE--] // [--END--]
#ifndef FSUBOCTREE_HPP #ifndef FSUBOCTREE_HPP
#define FSUBOCTREE_HPP #define FSUBOCTREE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/F3DPosition.hpp" #include "../Utils/F3DPosition.hpp"
...@@ -199,16 +199,19 @@ public: ...@@ -199,16 +199,19 @@ public:
* Delete cells arrays and allocated cells * Delete cells arrays and allocated cells
*/ */
virtual ~FAbstractSubOctree(){ virtual ~FAbstractSubOctree(){
long cellsAtlevel = 8; long mostRight = rightLeafIndex;
for( int indexLevel = 0 ; indexLevel < this->subOctreeHeight ; ++indexLevel ){ long mostLeft = leftLeafIndex;
for( int indexCells = 0 ; indexCells < cellsAtlevel ; ++indexCells ){
for( int indexLevel = this->subOctreeHeight - 1 ; indexLevel >= 0 ; --indexLevel ){
for( long indexCells = mostLeft ; indexCells <= mostRight ; ++indexCells ){
if(this->cells[indexLevel][indexCells]){ if(this->cells[indexLevel][indexCells]){
delete this->cells[indexLevel][indexCells]; //delete this->cells[indexLevel][indexCells];
} }
} }
delete [] this->cells[indexLevel]; delete [] this->cells[indexLevel];
cellsAtlevel <<= 3; // => * 8 >> 8^indexLevel mostLeft >>= 3;
mostRight >>= 3;
} }
delete [] this->cells; delete [] this->cells;
...@@ -561,4 +564,4 @@ public: ...@@ -561,4 +564,4 @@ public:
#endif //FSUBOCTREE_HPP #endif //FSUBOCTREE_HPP
// [--LICENSE--] // [--END--]
#ifndef FTREECOORDINATE_HPP #ifndef FTREECOORDINATE_HPP
#define FTREECOORDINATE_HPP #define FTREECOORDINATE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
...@@ -194,4 +194,4 @@ public: ...@@ -194,4 +194,4 @@ public:
#endif //FTREECOORDINATE_HPP #endif //FTREECOORDINATE_HPP
// [--LICENSE--] // [--END--]
#ifndef FVECTOR_HPP #ifndef FVECTOR_HPP
#define FVECTOR_HPP #define FVECTOR_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
......
#ifndef FFMMALGORITHM_HPP #ifndef FFMMALGORITHM_HPP
#define FFMMALGORITHM_HPP #define FFMMALGORITHM_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
...@@ -243,4 +243,4 @@ private: ...@@ -243,4 +243,4 @@ private:
#endif //FFMMALGORITHM_HPP #endif //FFMMALGORITHM_HPP
// [--LICENSE--] // [--END--]
#ifndef FFMMALGORITHMPERIODIC_HPP #ifndef FFMMALGORITHMPERIODIC_HPP
#define FFMMALGORITHMPERIODIC_HPP #define FFMMALGORITHMPERIODIC_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
......
#ifndef FFMMALGORITHMTASK_HPP #ifndef FFMMALGORITHMTASK_HPP
#define FFMMALGORITHMTASK_HPP #define FFMMALGORITHMTASK_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
...@@ -329,4 +329,4 @@ private: ...@@ -329,4 +329,4 @@ private:
#endif //FFMMALGORITHMTASK_HPP #endif //FFMMALGORITHMTASK_HPP
// [--LICENSE--] // [--END--]
#ifndef FFMMALGORITHMTHREAD_HPP #ifndef FFMMALGORITHMTHREAD_HPP
#define FFMMALGORITHMTHREAD_HPP #define FFMMALGORITHMTHREAD_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FDebug.hpp"
...@@ -400,4 +400,4 @@ private: ...@@ -400,4 +400,4 @@ private:
#endif //FFMMALGORITHMTHREAD_HPP #endif //FFMMALGORITHMTHREAD_HPP
// [--LICENSE--] // [--END--]
#ifndef FFMMALGORITHMTHREADPROC_HPP #ifndef FFMMALGORITHMTHREADPROC_HPP
#define FFMMALGORITHMTHREADPROC_HPP #define FFMMALGORITHMTHREADPROC_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FDebug.hpp"
...@@ -1311,4 +1311,4 @@ private: ...@@ -1311,4 +1311,4 @@ private:
#endif //FFMMALGORITHMTHREAD_HPP #endif //FFMMALGORITHMTHREAD_HPP
// [--LICENSE--] // [--END--]
#ifndef FFmmAlgorithmThreadProcPeriodicPERIODIC_HPP #ifndef FFmmAlgorithmThreadProcPeriodicPERIODIC_HPP
#define FFmmAlgorithmThreadProcPeriodicPERIODIC_HPP #define FFmmAlgorithmThreadProcPeriodicPERIODIC_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FDebug.hpp"
...@@ -1499,4 +1499,4 @@ private: ...@@ -1499,4 +1499,4 @@ private:
#endif //FFMMALGORITHMTHREAD_HPP #endif //FFMMALGORITHMTHREAD_HPP
// [--LICENSE--] // [--END--]
#ifndef FFMMALGORITHMTHREADTSM_HPP #ifndef FFMMALGORITHMTHREADTSM_HPP
#define FFMMALGORITHMTHREADTSM_HPP #define FFMMALGORITHMTHREADTSM_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FDebug.hpp"
...@@ -353,4 +353,4 @@ public: ...@@ -353,4 +353,4 @@ public:
#endif //FFMMALGORITHMTHREADTSM_HPP #endif //FFMMALGORITHMTHREADTSM_HPP
// [--LICENSE--] // [--END--]
#ifndef FFMMALGORITHMTSM_HPP #ifndef FFMMALGORITHMTSM_HPP
#define FFMMALGORITHMTSM_HPP #define FFMMALGORITHMTSM_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FAssertable.hpp" #include "../Utils/FAssertable.hpp"
#include "../Utils/FDebug.hpp" #include "../Utils/FDebug.hpp"
...@@ -282,4 +282,4 @@ public: ...@@ -282,4 +282,4 @@ public:
#endif //FFMMALGORITHMTSM_HPP #endif //FFMMALGORITHMTSM_HPP
// [--LICENSE--] // [--END--]
#ifndef FEXTENDCELLTYPE_HPP #ifndef FEXTENDCELLTYPE_HPP
#define FEXTENDCELLTYPE_HPP #define FEXTENDCELLTYPE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
/** /**
...@@ -62,4 +62,4 @@ public: ...@@ -62,4 +62,4 @@ public:
#endif //FEXTENDCELLTYPE_HPP #endif //FEXTENDCELLTYPE_HPP
// [--LICENSE--] // [--END--]
#ifndef FEXTENDCOORDINATE_HPP #ifndef FEXTENDCOORDINATE_HPP
#define FEXTENDCOORDINATE_HPP #define FEXTENDCOORDINATE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../Containers/FTreeCoordinate.hpp"
...@@ -53,4 +53,4 @@ public: ...@@ -53,4 +53,4 @@ public:
#endif //FEXTENDCOORDINATE_HPP #endif //FEXTENDCOORDINATE_HPP
// [--LICENSE--] // [--END--]
#ifndef FEXTENDFORCES_HPP #ifndef FEXTENDFORCES_HPP
#define FEXTENDFORCES_HPP #define FEXTENDFORCES_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/F3DPosition.hpp" #include "../Utils/F3DPosition.hpp"
...@@ -54,4 +54,4 @@ public: ...@@ -54,4 +54,4 @@ public:
#endif //FEXTENDFORCES_HPP #endif //FEXTENDFORCES_HPP
// [--LICENSE--] // [--END--]
#ifndef FEXTENDMORTONINDEX_HPP #ifndef FEXTENDMORTONINDEX_HPP
#define FEXTENDMORTONINDEX_HPP #define FEXTENDMORTONINDEX_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../Containers/FTreeCoordinate.hpp"
...@@ -46,4 +46,4 @@ public: ...@@ -46,4 +46,4 @@ public:
#endif //FEXTENDMORTONINDEX_HPP #endif //FEXTENDMORTONINDEX_HPP
// [--LICENSE--] // [--END--]
#ifndef FEXTENDPARTICLETYPE_HPP #ifndef FEXTENDPARTICLETYPE_HPP
#define FEXTENDPARTICLETYPE_HPP #define FEXTENDPARTICLETYPE_HPP
// /!\ Please, you must read the license at the bottom of this page // [--License--]
/** /**
...@@ -77,4 +77,4 @@ public: ...@@ -77,4 +77,4 @@ public:
#endif //FEXTENDPARTICLETYPE_HPP #endif //FEXTENDPARTICLETYPE_HPP
// [--LICENSE--]