Rename is_field_v -> is_vector_field_v

Fixes #381 See merge request gysela-developpers/gyselalibxx!737 --------------------------------------------
gyselax · Oct 22, 2024 · 441ff9b · 441ff9b
1 parent 0c10faa
commit 441ff9b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 20 deletions.
diff --git a/src/data_types/vector_field.hpp b/src/data_types/vector_field.hpp
@@ -20,7 +20,7 @@ template <
         class NDTag,
         class LayoutStridedPolicy,
         class MemorySpace>
-inline constexpr bool enable_field<
+inline constexpr bool enable_vector_field<
         VectorField<ElementType, IdxRangeType, NDTag, LayoutStridedPolicy, MemorySpace>> = true;
 
 template <
@@ -38,7 +38,7 @@ template <
         class NDTag,
         class LayoutStridedPolicy,
         class MemorySpace>
-inline constexpr bool enable_borrowed_field<
+inline constexpr bool enable_borrowed_vector_field<
         VectorField<ElementType, IdxRangeType, NDTag, LayoutStridedPolicy, MemorySpace>> = true;
 
 

diff --git a/src/data_types/vector_field_common.hpp b/src/data_types/vector_field_common.hpp
@@ -9,26 +9,27 @@ template <class FieldType, class NDTypeSeq>
 class VectorFieldCommon;
 
 template <class T>
-inline constexpr bool enable_field = false;
+inline constexpr bool enable_vector_field = false;
 
 template <class T>
-inline constexpr bool enable_borrowed_field = false;
+inline constexpr bool enable_borrowed_vector_field = false;
 
 template <class T>
-inline constexpr bool is_field_v = enable_field<std::remove_const_t<std::remove_reference_t<T>>>;
+inline constexpr bool is_vector_field_v
+        = enable_vector_field<std::remove_const_t<std::remove_reference_t<T>>>;
 
 template <class T>
-inline constexpr bool is_borrowed_field_v
-        = is_field_v<
-                  T> && (std::is_lvalue_reference_v<T> || enable_borrowed_field<std::remove_cv_t<std::remove_reference_t<T>>>);
+inline constexpr bool is_borrowed_vector_field_v
+        = is_vector_field_v<
+                  T> && (std::is_lvalue_reference_v<T> || enable_borrowed_vector_field<std::remove_cv_t<std::remove_reference_t<T>>>);
 
 namespace ddcHelper {
 
 template <
         class FieldDst,
         class FieldSrc,
         std::enable_if_t<
-                is_borrowed_field_v<FieldDst> && is_borrowed_field_v<FieldSrc>,
+                is_borrowed_vector_field_v<FieldDst> && is_borrowed_vector_field_v<FieldSrc>,
                 bool> = true>
 auto deepcopy(FieldDst&& dst, FieldSrc&& src)
 {

diff --git a/src/data_types/vector_field_mem.hpp b/src/data_types/vector_field_mem.hpp
@@ -20,7 +20,7 @@ class VectorFieldMem;
 
 template <class ElementType, class IdxRangeType, class DimSeq, class MemSpace>
 inline constexpr bool
-        enable_field<VectorFieldMem<ElementType, IdxRangeType, DimSeq, MemSpace>> = true;
+        enable_vector_field<VectorFieldMem<ElementType, IdxRangeType, DimSeq, MemSpace>> = true;
 
 template <class ElementType, class IdxRangeType, class DimSeq, class Allocator>
 inline constexpr bool enable_data_access_methods<

diff --git a/src/timestepper/crank_nicolson.hpp b/src/timestepper/crank_nicolson.hpp
@@ -134,7 +134,7 @@ class CrankNicolson : public ITimeStepper<FieldMem, DerivFieldMem, ExecSpace>
             dy_calculator(m_k_new, y);
 
             // Calculation of step
-            if constexpr (is_field_v<DerivFieldMem>) {
+            if constexpr (is_vector_field_v<DerivFieldMem>) {
                 ddc::parallel_for_each(
                         exec_space,
                         get_idx_range(m_k_total),
@@ -210,7 +210,7 @@ class CrankNicolson : public ITimeStepper<FieldMem, DerivFieldMem, ExecSpace>
 private:
     void copy(ValField copy_to, ValConstField copy_from) const
     {
-        if constexpr (is_field_v<ValField>) {
+        if constexpr (is_vector_field_v<ValField>) {
             ddcHelper::deepcopy(copy_to, copy_from);
         } else {
             ddc::parallel_deepcopy(copy_to, copy_from);

diff --git a/src/timestepper/itimestepper.hpp b/src/timestepper/itimestepper.hpp
@@ -18,8 +18,8 @@ template <
         class ExecSpace = Kokkos::DefaultExecutionSpace>
 class ITimeStepper
 {
-    static_assert(ddc::is_chunk_v<FieldMem> or is_field_v<FieldMem>);
-    static_assert(ddc::is_chunk_v<DerivFieldMem> or is_field_v<DerivFieldMem>);
+    static_assert(ddc::is_chunk_v<FieldMem> or is_vector_field_v<FieldMem>);
+    static_assert(ddc::is_chunk_v<DerivFieldMem> or is_vector_field_v<DerivFieldMem>);
 
     static_assert(std::is_same_v<
                   typename FieldMem::discrete_domain_type,

diff --git a/src/timestepper/rk2.hpp b/src/timestepper/rk2.hpp
@@ -92,7 +92,7 @@ class RK2 : public ITimeStepper<FieldMem, DerivFieldMem, ExecSpace>
         ValField y_prime(y_prime_alloc);
 
         // Save initial conditions
-        if constexpr (is_field_v<FieldMem>) {
+        if constexpr (is_vector_field_v<FieldMem>) {
             ddcHelper::deepcopy(y_prime, y);
         } else {
             ddc::parallel_deepcopy(y_prime, y);

diff --git a/src/timestepper/rk3.hpp b/src/timestepper/rk3.hpp
@@ -119,7 +119,7 @@ class RK3 : public ITimeStepper<FieldMem, DerivFieldMem, ExecSpace>
 
         // --------- Calculate k3 ------------
         // Calculation of step
-        if constexpr (is_field_v<DerivFieldMem>) {
+        if constexpr (is_vector_field_v<DerivFieldMem>) {
             ddc::parallel_for_each(
                     exec_space,
                     get_idx_range(k_total),
@@ -148,7 +148,7 @@ class RK3 : public ITimeStepper<FieldMem, DerivFieldMem, ExecSpace>
 
         // --------- Update y ------------
         // Calculation of step
-        if constexpr (is_field_v<DerivFieldMem>) {
+        if constexpr (is_vector_field_v<DerivFieldMem>) {
             ddc::parallel_for_each(
                     exec_space,
                     get_idx_range(k_total),
@@ -173,7 +173,7 @@ class RK3 : public ITimeStepper<FieldMem, DerivFieldMem, ExecSpace>
 private:
     void copy(ValField copy_to, ValConstField copy_from) const
     {
-        if constexpr (is_field_v<ValField>) {
+        if constexpr (is_vector_field_v<ValField>) {
             ddcHelper::deepcopy(copy_to, copy_from);
         } else {
             ddc::parallel_deepcopy(copy_to, copy_from);

diff --git a/src/timestepper/rk4.hpp b/src/timestepper/rk4.hpp
@@ -141,7 +141,7 @@ class RK4 : public ITimeStepper<FieldMem, DerivFieldMem, ExecSpace>
 
         // --------- Update y ------------
         // Calculation of step
-        if constexpr (is_field_v<DerivFieldMem>) {
+        if constexpr (is_vector_field_v<DerivFieldMem>) {
             ddc::parallel_for_each(
                     exec_space,
                     get_idx_range(k_total),
@@ -166,7 +166,7 @@ class RK4 : public ITimeStepper<FieldMem, DerivFieldMem, ExecSpace>
 private:
     void copy(ValField copy_to, ValConstField copy_from) const
     {
-        if constexpr (is_field_v<ValField>) {
+        if constexpr (is_vector_field_v<ValField>) {
             ddcHelper::deepcopy(copy_to, copy_from);
         } else {
             ddc::parallel_deepcopy(copy_to, copy_from);