Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
e0420347
Commit
e0420347
authored
Mar 13, 2018
by
COULAUD Olivier
Browse files
Remove ../ in include files
Change WARNING in STATUS (debug) Remove value 0, 1 to FParticleType enum
parent
741d8f8c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Examples/CMakeLists.txt
View file @
e0420347
...
...
@@ -23,7 +23,7 @@ endif(SCALFMM_USE_BLAS)
if
(
SCALFMM_USE_FFT
)
set
(
GENERIC_SOURCE_FILES
${
GENERIC_SOURCE_FILES
}
UniformInterpolationFMM LagrangeInterpolationAdaptiveFMM
)
else
()
message
(
WARNING
" &&&&&&&&&&&&&&&&&&&& SCALFMM_USE_FFT
${
SCALFMM_USE_FFT
}
"
)
message
(
STATUS
" &&&&&&&&&&&&&&&&&&&& SCALFMM_USE_FFT
${
SCALFMM_USE_FFT
}
"
)
endif
(
SCALFMM_USE_FFT
)
if
(
SCALFMM_USE_MPI
)
...
...
Src/Components/FParticleType.hpp
View file @
e0420347
...
...
@@ -6,8 +6,10 @@
* @brief The FParticleType enum is to make a difference between Target and Source (Tsm)
*/
enum
class
FParticleType
{
FParticleTypeSource
=
0
,
FParticleTypeTarget
=
1
FParticleTypeSource
,
FParticleTypeTarget
// FParticleTypeSource = 0,
// FParticleTypeTarget = 1
};
#endif // FPARTICLETYPE_HPP
Src/Core/FFmmAlgorithmOmp4.hpp
View file @
e0420347
...
...
@@ -12,10 +12,10 @@
#include
"../Utils/FTic.hpp"
#include
"
../
Containers/FOctree.hpp"
#include
"
../
Containers/FVector.hpp"
#include
"
../
Utils/FAlgorithmTimers.hpp"
#include
"
../
Utils/FEnv.hpp"
#include
"Containers/FOctree.hpp"
#include
"Containers/FVector.hpp"
#include
"Utils/FAlgorithmTimers.hpp"
#include
"Utils/FEnv.hpp"
#include
"FCoreCommon.hpp"
#include
"FP2PExclusion.hpp"
...
...
@@ -28,10 +28,11 @@
#endif
#undef priority_if_supported
#ifdef OPENMP_SUPPORT_PRIORITY
#define priority_if_supported(x) priority(x)
enum
FFmmAlgorithmOmp4_Priorities
{
enum
class
FFmmAlgorithmOmp4_Priorities
{
FFmmAlgorithmOmp4_Prio_P2M
=
9
,
FFmmAlgorithmOmp4_Prio_M2M
=
8
,
FFmmAlgorithmOmp4_Prio_M2L_High
=
7
,
...
...
@@ -41,7 +42,6 @@ enum FFmmAlgorithmOmp4_Priorities{
FFmmAlgorithmOmp4_Prio_L2P
=
3
,
FFmmAlgorithmOmp4_Prio_P2P_Small
=
2
};
#else
#define priority_if_supported(x)
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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