Attention une mise à jour du service Gitlab va être effectuée le mardi 18 janvier (et non lundi 17 comme annoncé précédemment) entre 18h00 et 18h30. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes.

Commit e0420347 authored by COULAUD Olivier's avatar COULAUD Olivier
Browse files

Remove ../ in include files

Change WARNING in STATUS (debug)
Remove value 0, 1 to FParticleType enum
parent 741d8f8c
...@@ -23,7 +23,7 @@ endif(SCALFMM_USE_BLAS) ...@@ -23,7 +23,7 @@ endif(SCALFMM_USE_BLAS)
if(SCALFMM_USE_FFT) if(SCALFMM_USE_FFT)
set(GENERIC_SOURCE_FILES ${GENERIC_SOURCE_FILES} UniformInterpolationFMM LagrangeInterpolationAdaptiveFMM ) set(GENERIC_SOURCE_FILES ${GENERIC_SOURCE_FILES} UniformInterpolationFMM LagrangeInterpolationAdaptiveFMM )
else() else()
message(WARNING " &&&&&&&&&&&&&&&&&&&& SCALFMM_USE_FFT ${SCALFMM_USE_FFT}") message(STATUS " &&&&&&&&&&&&&&&&&&&& SCALFMM_USE_FFT ${SCALFMM_USE_FFT}")
endif(SCALFMM_USE_FFT) endif(SCALFMM_USE_FFT)
if(SCALFMM_USE_MPI) if(SCALFMM_USE_MPI)
......
...@@ -6,8 +6,10 @@ ...@@ -6,8 +6,10 @@
* @brief The FParticleType enum is to make a difference between Target and Source (Tsm) * @brief The FParticleType enum is to make a difference between Target and Source (Tsm)
*/ */
enum class FParticleType { enum class FParticleType {
FParticleTypeSource = 0, FParticleTypeSource,
FParticleTypeTarget = 1 FParticleTypeTarget
// FParticleTypeSource = 0,
// FParticleTypeTarget = 1
}; };
#endif // FPARTICLETYPE_HPP #endif // FPARTICLETYPE_HPP
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#include "../Utils/FTic.hpp" #include "../Utils/FTic.hpp"
#include "../Containers/FOctree.hpp" #include "Containers/FOctree.hpp"
#include "../Containers/FVector.hpp" #include "Containers/FVector.hpp"
#include "../Utils/FAlgorithmTimers.hpp" #include "Utils/FAlgorithmTimers.hpp"
#include "../Utils/FEnv.hpp" #include "Utils/FEnv.hpp"
#include "FCoreCommon.hpp" #include "FCoreCommon.hpp"
#include "FP2PExclusion.hpp" #include "FP2PExclusion.hpp"
...@@ -28,10 +28,11 @@ ...@@ -28,10 +28,11 @@
#endif #endif
#undef priority_if_supported #undef priority_if_supported
#ifdef OPENMP_SUPPORT_PRIORITY #ifdef OPENMP_SUPPORT_PRIORITY
#define priority_if_supported(x) priority(x) #define priority_if_supported(x) priority(x)
enum FFmmAlgorithmOmp4_Priorities{ enum class FFmmAlgorithmOmp4_Priorities{
FFmmAlgorithmOmp4_Prio_P2M = 9, FFmmAlgorithmOmp4_Prio_P2M = 9,
FFmmAlgorithmOmp4_Prio_M2M = 8, FFmmAlgorithmOmp4_Prio_M2M = 8,
FFmmAlgorithmOmp4_Prio_M2L_High = 7, FFmmAlgorithmOmp4_Prio_M2L_High = 7,
...@@ -41,7 +42,6 @@ enum FFmmAlgorithmOmp4_Priorities{ ...@@ -41,7 +42,6 @@ enum FFmmAlgorithmOmp4_Priorities{
FFmmAlgorithmOmp4_Prio_L2P = 3, FFmmAlgorithmOmp4_Prio_L2P = 3,
FFmmAlgorithmOmp4_Prio_P2P_Small = 2 FFmmAlgorithmOmp4_Prio_P2P_Small = 2
}; };
#else #else
#define priority_if_supported(x) #define priority_if_supported(x)
#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