Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
fc4fae17
Commit
fc4fae17
authored
Jan 21, 2014
by
BRAMAS Berenger
Browse files
Replace all SCALFMM_ by ScalFMM_, it would have been easier to name the project SCALFMM maybe
parent
052f0557
Changes
10
Hide whitespace changes
Inline
Side-by-side
Addons/FmmApi/Src/ScalfmmApiCore.cpp
View file @
fc4fae17
...
...
@@ -23,7 +23,7 @@
#include "../../Src/Components/FBasicKernels.hpp"
#ifdef S
CAL
FMM_USE_MPI
#ifdef S
cal
FMM_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 S
CAL
FMM_USE_MPI
#ifdef S
cal
FMM_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 S
CAL
FMM_USE_MPI
#ifdef S
cal
FMM_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 S
CAL
FMM_USE_MPI
#ifdef S
cal
FMM_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 S
CAL
FMM_USE_MPI
#ifdef S
cal
FMM_USE_MPI
case
FMMCORE_MPI_COMMUNICATOR
:
*
(
MPI_Comm
*
)
value
=
corehandle
->
config
.
mpiCom
;
break
;
...
...
Src/Utils/FLog.cpp
View file @
fc4fae17
...
...
@@ -24,5 +24,5 @@ FLog FLog::Controller;
#endif // S
CAL
FMM_USE_DEBUG
#endif // S
cal
FMM_USE_DEBUG
Src/Utils/FLog.hpp
View file @
fc4fae17
...
...
@@ -179,7 +179,7 @@ public:
};
#endif //S
CAL
FMM_USE_DEBUG
#endif //S
cal
FMM_USE_DEBUG
#endif //FDEBUG_HPP
...
...
Src/Utils/FMemStats.cpp
View file @
fc4fae17
...
...
@@ -19,7 +19,7 @@ FMemStats FMemStats::controler;
#include <cstdio>
#ifdef S
CAL
FMM_USE_MEM_STATS
#ifdef S
cal
FMM_USE_MEM_STATS
// Regular scalar new
void
*
operator
new
(
std
::
size_t
n
)
throw
(
std
::
bad_alloc
)
{
...
...
Src/Utils/FMemStats.h
View file @
fc4fae17
...
...
@@ -27,7 +27,7 @@
* and give simple stats like max, total used, current used
*/
#ifdef S
CAL
FMM_USE_MEM_STATS
#ifdef S
cal
FMM_USE_MEM_STATS
#include <new>
#include <stdexcept>
#warning You are using meme stats
...
...
@@ -67,7 +67,7 @@ private:
currentAllocated
-=
size
;
}
#ifdef S
CAL
FMM_USE_MEM_STATS
#ifdef S
cal
FMM_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 S
CAL
FMM_USE_MEM_STATS
#ifdef S
cal
FMM_USE_MEM_STATS
return
true
;
#else
return
false
;
...
...
Src/Utils/FTrace.cpp
View file @
fc4fae17
...
...
@@ -14,12 +14,12 @@
// "http://www.gnu.org/licenses".
// ===================================================================================
#include "FTrace.hpp"
#ifdef S
CAL
FMM_USE_TRACE
#ifdef S
cal
FMM_USE_TRACE
#if !defined (S
CAL
FMM_USE_ITAC) && !defined (S
CAL
FMM_USE_EZTRACE)
#if !defined (S
cal
FMM_USE_ITAC) && !defined (S
cal
FMM_USE_EZTRACE)
int
FTrace
::
Deep
=
0
;
FTic
FTrace
::
TimeSinceBegining
;
#endif
#endif // S
CAL
FMM_USE_TRACE
#endif // S
cal
FMM_USE_TRACE
Src/Utils/FTrace.hpp
View file @
fc4fae17
...
...
@@ -34,7 +34,7 @@
* </code>
*/
#ifndef S
CAL
FMM_USE_TRACE
#ifndef S
cal
FMM_USE_TRACE
#define FTRACE( X )
...
...
@@ -56,7 +56,7 @@
#define FTRACE( X ) X
#ifdef S
CAL
FMM_USE_ITAC
#ifdef S
cal
FMM_USE_ITAC
#include <VT.h>
...
...
@@ -85,7 +85,7 @@
};
#else
#ifdef S
CAL
FMM_USE_EZTRACE
#ifdef S
cal
FMM_USE_EZTRACE
#include <eztrace.h>
...
...
@@ -219,11 +219,11 @@
friend
class
FFunction
;
};
#endif //S
CAL
FMM_USE_EZTRACE
#endif //S
cal
FMM_USE_EZTRACE
#endif //S
CAL
FMM_USE_ITAC
#endif //S
cal
FMM_USE_ITAC
#endif //S
CAL
FMM_USE_TRACE
#endif //S
cal
FMM_USE_TRACE
#endif //FTRACE_HPP
...
...
Tests/Utils/testDebug.cpp
View file @
fc4fae17
...
...
@@ -17,7 +17,7 @@
/**
* In this file we show how to use the debug module.
* Warning, in FGlobal.hpp (included in FLog.hpp) S
CAL
FMM_USE_DEBUG might be undefined.
* Warning, in FGlobal.hpp (included in FLog.hpp) S
cal
FMM_USE_DEBUG might be undefined.
*/
int
main
(
void
){
...
...
UTests/utestSphericalDirect.cpp
View file @
fc4fae17
...
...
@@ -214,7 +214,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> {
OctreeClass
,
FmmClass
>
(
false
);
}
#ifdef S
CAL
FMM_USE_BLAS
#ifdef S
cal
FMM_USE_BLAS
/** Blas */
void
TestSphericalBlas
(){
typedef
FSphericalCell
CellClass
;
...
...
@@ -256,7 +256,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> {
void
SetTests
(){
AddTest
(
&
TestSphericalDirect
::
TestSpherical
,
"Test Spherical Kernel"
);
AddTest
(
&
TestSphericalDirect
::
TestRotation
,
"Test Rotation Spherical Kernel"
);
#ifdef S
CAL
FMM_USE_BLAS
#ifdef S
cal
FMM_USE_BLAS
AddTest
(
&
TestSphericalDirect
::
TestSphericalBlas
,
"Test Spherical Blas Kernel"
);
AddTest
(
&
TestSphericalDirect
::
TestSphericalBlockBlas
,
"Test Spherical Block Blas Kernel"
);
#endif
...
...
UTests/utestSphericalDirectDebug.cpp
View file @
fc4fae17
...
...
@@ -283,7 +283,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> {
OctreeClass
,
FmmClass
>
(
false
);
}
#ifdef S
CAL
FMM_USE_BLAS
#ifdef S
cal
FMM_USE_BLAS
/** Blas */
void
TestSphericalBlas
(){
typedef
FSphericalCell
CellClass
;
...
...
@@ -325,7 +325,7 @@ class TestSphericalDirect : public FUTester<TestSphericalDirect> {
void
SetTests
(){
AddTest
(
&
TestSphericalDirect
::
TestSpherical
,
"Test Spherical Kernel"
);
//AddTest(&TestSphericalDirect::TestRotation,"Test Rotation Spherical Kernel");
#ifdef S
CAL
FMM_USE_BLAS
#ifdef S
cal
FMM_USE_BLAS
//AddTest(&TestSphericalDirect::TestSphericalBlas,"Test Spherical Blas Kernel");
//AddTest(&TestSphericalDirect::TestSphericalBlockBlas,"Test Spherical Block Blas Kernel");
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment