Commit b2a42238 authored by COULAUD Olivier's avatar COULAUD Olivier

minor changes

	  const in constexpr
	 @param in @tparam for template in doxygen files
....
parent bb99ff87
...@@ -29,6 +29,6 @@ using FInterpolationKernel = FUnifKernel<FReal, ...@@ -29,6 +29,6 @@ using FInterpolationKernel = FUnifKernel<FReal,
GroupContainerClass, GroupContainerClass,
MatrixKernelClass, MatrixKernelClass,
ORDER> ; ORDER> ;
const std::string interpolationType="Uniform interpolation"; constexpr std::string interpolationType="Uniform interpolation";
#include "sharedMemoryInterpolationFMM.hpp" #include "sharedMemoryInterpolationFMM.hpp"
...@@ -9,15 +9,15 @@ ...@@ -9,15 +9,15 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp" #include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp" #include "Utils/FLog.hpp"
#include "../Utils/FEnv.hpp" #include "Utils/FEnv.hpp"
#include "Utils/FAlgorithmTimers.hpp" #include "Utils/FAlgorithmTimers.hpp"
#include "../Utils/FTic.hpp" #include "Utils/FTic.hpp"
#include "../Utils/FAlgorithmTimers.hpp" #include "Utils/FAlgorithmTimers.hpp"
#include "../Containers/FOctree.hpp" #include "Containers/FOctree.hpp"
#include "../Containers/FVector.hpp" #include "Containers/FVector.hpp"
#include "FCoreCommon.hpp" #include "FCoreCommon.hpp"
#include "FP2PExclusion.hpp" #include "FP2PExclusion.hpp"
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
* @author Berenger Bramas (berenger.bramas@inria.fr) * @author Berenger Bramas (berenger.bramas@inria.fr)
* @class FFmmAlgorithmTask * @class FFmmAlgorithmTask
* @brief * @brief
*
* Please read the license * Please read the license
* *
* This class is a basic FMM algorithm * This class is a basic FMM algorithm
...@@ -38,9 +39,9 @@ ...@@ -38,9 +39,9 @@
template<class OctreeClass, class CellClass, class ContainerClass, class KernelClass, class LeafClass, class P2PExclusionClass = FP2PMiddleExclusion> template<class OctreeClass, class CellClass, class ContainerClass, class KernelClass, class LeafClass, class P2PExclusionClass = FP2PMiddleExclusion>
class FFmmAlgorithmTask : public FAbstractAlgorithm, public FAlgorithmTimers { class FFmmAlgorithmTask : public FAbstractAlgorithm, public FAlgorithmTimers {
using multipole_t = typename CellClass::multipole_t; using multipole_t = typename CellClass::multipole_t;
using local_expansion_t = typename CellClass::local_expansion_t; using local_expansion_t = typename CellClass::local_expansion_t;
using symbolic_data_t = CellClass; using symbolic_data_t = CellClass;
OctreeClass* const tree; //< The octree to work on OctreeClass* const tree; //< The octree to work on
KernelClass** kernels; //< The kernels KernelClass** kernels; //< The kernels
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* Please read the license * Please read the license
* *
* This class defines a cell used in the Chebyshev based FMM. * This class defines a cell used in the Chebyshev based FMM.
* @param NVALS is the number of right hand side. * @tparam NVALS is the number of right hand side.
*/ */
template <class FReal, int ORDER, int NRHS = 1, int NLHS = 1, int NVALS = 1> template <class FReal, int ORDER, int NRHS = 1, int NLHS = 1, int NVALS = 1>
class FChebCell : public FBasicCell, public FAbstractSendable class FChebCell : public FBasicCell, public FAbstractSendable
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* PB: Beware! This class does not support yet the storage of the compressed * PB: Beware! This class does not support yet the storage of the compressed
* expansions used in the low rank version of the Chebyshev FMM algorithm. * expansions used in the low rank version of the Chebyshev FMM algorithm.
* *
* @param NVALS is the number of right hand side. * @tparam NVALS is the number of right hand side.
*/ */
template <class FReal, int ORDER, int NRHS = 1, int NLHS = 1, int NVALS = 1> template <class FReal, int ORDER, int NRHS = 1, int NLHS = 1, int NVALS = 1>
class FInterpCell : public FBasicCell, public FAbstractSendable class FInterpCell : public FBasicCell, public FAbstractSendable
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
* PB: This class also contains the storage and accessors for the transformed * PB: This class also contains the storage and accessors for the transformed
* expansion (in Fourier space, i.e. complex valued). * expansion (in Fourier space, i.e. complex valued).
* *
* @param NVALS is the number of right hand side. * @tparam NVALS is the number of right hand side.
*/ */
template < class FReal, int ORDER, int NRHS = 1, int NLHS = 1, int NVALS = 1> template < class FReal, int ORDER, int NRHS = 1, int NLHS = 1, int NVALS = 1>
class FUnifCell : public FBasicCell, public FAbstractSendable class FUnifCell : public FBasicCell, public FAbstractSendable
{ {
static const int VectorSize = TensorTraits<ORDER>::nnodes; static const int VectorSize = TensorTraits<ORDER>::nnodes;
static const int TransformedVectorSize = (2*ORDER-1)*(2*ORDER-1)*(2*ORDER-1); static const int TransformedVectorSize = (2*ORDER-1)*(2*ORDER-1)*(2*ORDER-1);
public: public:
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
} }
}; };
using multipole_t = exp_impl<class multipole_tag, NRHS>; using multipole_t = exp_impl<class multipole_tag, NRHS>;
using local_expansion_t = exp_impl<class local_expansion_tag, NLHS>; using local_expansion_t = exp_impl<class local_expansion_tag, NLHS>;
multipole_t m_data {}; multipole_t m_data {};
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#else #else
#define POSIX #define POSIX
#endif #endif
///////////////////////////////////////////////////////
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
// Types // Types
...@@ -37,7 +37,7 @@ typedef long long int FSize; ...@@ -37,7 +37,7 @@ typedef long long int FSize;
// Restrict // Restrict
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
static const int MaxTreeHeight = 20; static constexpr int MaxTreeHeight = 20;
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
......
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