Merge pull request #3274 from psychocoderHPC/topic-constexprContVecto…

…rInstance refactor `ConstVector`
ComputationalRadiationPhysics · Jun 30, 2020 · fe322db · fe322db
2 parents 41e6321 + 79616f2
commit fe322db
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/include/pmacc/math/ConstVector.hpp b/include/pmacc/math/ConstVector.hpp
@@ -57,7 +57,7 @@ namespace PMACC_JOIN(pmacc_static_const_storage,id)                            \
     namespace PMACC_JOIN(pmacc_static_const_vector_host,id)                    \
     {                                                                          \
         /* store all values in a const C array on host*/                       \
-        const Type PMACC_JOIN(Name,_data)[]={__VA_ARGS__};                     \
+        constexpr Type PMACC_JOIN(Name,_data)[]={__VA_ARGS__};                 \
     } /* namespace pmacc_static_const_vector_host + id  */                     \
     /* select host or device namespace depending on __CUDA_ARCH__ compiler flag*/ \
     PMACC_USING_STATIC_CONST_VECTOR_NAMESPACE(id);                             \
@@ -108,7 +108,7 @@ namespace PMACC_JOIN(pmacc_static_const_storage,id)                            \
     namespace PMACC_JOIN(pmacc_static_const_vector_host,id)                    \
     {                                                                          \
         /* create const instance on host*/                                     \
-        const PMACC_JOIN(Name,_t) Name;                                        \
+        constexpr PMACC_JOIN(Name,_t) Name;                                    \
     } /* namespace pmacc_static_const_vector_host + id  */                     \
 } /* namespace pmacc_static_const_storage + id */
 

diff --git a/include/pmacc/math/vector/Vector.hpp b/include/pmacc/math/vector/Vector.hpp
@@ -48,6 +48,10 @@ struct Vector_components
     static constexpr int dim = T_Dim;
     using type = T_Type;
 
+    HDINLINE
+    constexpr Vector_components()
+    {}
+
     /*align full vector*/
     PMACC_ALIGN(v[dim], type);
 
@@ -139,34 +143,36 @@ struct Vector : private T_Storage<T_Type, T_dim>, protected T_Accessor, protecte
         using type = const typename F::type&;
     };
 
-    HDINLINE Vector()
+    HDINLINE
+    constexpr Vector()
     {}
 
     HDINLINE
-    Vector(const type x)
+    constexpr Vector(const type x)
     {
         PMACC_CASSERT_MSG(math_Vector__constructor_is_only_allowed_for_DIM1,dim == 1);
         (*this)[0] = x;
     }
 
     HDINLINE
-    Vector(const type x, const type y)
+    constexpr Vector(const type x, const type y)
     {
         PMACC_CASSERT_MSG(math_Vector__constructor_is_only_allowed_for_DIM2,dim == 2);
         (*this)[0] = x;
         (*this)[1] = y;
     }
 
     HDINLINE
-    Vector(const type x, const type y, const type z)
+    constexpr Vector(const type x, const type y, const type z)
     {
         PMACC_CASSERT_MSG(math_Vector__constructor_is_only_allowed_for_DIM3,dim == 3);
         (*this)[0] = x;
         (*this)[1] = y;
         (*this)[2] = z;
     }
 
-    HDINLINE Vector(const This& other)
+    HDINLINE
+    constexpr Vector(const This& other)
     {
         detail::CopyElementWise<Storage::isConst>()(*this,other);
     }
@@ -176,7 +182,8 @@ struct Vector : private T_Storage<T_Type, T_dim>, protected T_Accessor, protecte
     typename T_OtherAccessor,
     typename T_OtherNavigator,
     template <typename, int> class T_OtherStorage>
-    HDINLINE explicit Vector(const Vector<
+    HDINLINE
+    explicit Vector(const Vector<
                              T_OtherType,
                              dim,
                              T_OtherAccessor,