Align the constructors of the different DiscreteDomain

CExA-project · Jan 9, 2025 · b42bf03 · b42bf03
1 parent b06383d
commit b42bf03
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/include/ddc/discrete_domain.hpp b/include/ddc/discrete_domain.hpp
@@ -264,10 +264,9 @@ class DiscreteDomain<>
 
     KOKKOS_DEFAULTED_FUNCTION constexpr DiscreteDomain() = default;
 
-    // Construct a DiscreteDomain from a reordered copy of `domain`
-    template <class... ODDims>
-    KOKKOS_FUNCTION constexpr explicit DiscreteDomain(
-            [[maybe_unused]] DiscreteDomain<ODDims...> const& domain)
+    /// Construct a DiscreteDomain by copies and merge of domains
+    template <class... DDoms, class = std::enable_if_t<(is_discrete_domain_v<DDoms> && ...)>>
+    KOKKOS_FUNCTION constexpr explicit DiscreteDomain([[maybe_unused]] DDoms const&... domains)
     {
     }
 

diff --git a/tests/splines/batched_2d_spline_builder.cpp b/tests/splines/batched_2d_spline_builder.cpp
@@ -189,8 +189,7 @@ void Batched2dSplineTest()
     // The following line creates a discrete domain over all dimensions (DDims...) where we immediately
     // remove the dimensions DDimI1 and DDimI2.
     ddc::remove_dims_of_t<ddc::DiscreteDomain<DDims...>, DDimI1, DDimI2> const dom_vals_tmp(
-            ddc::DiscreteDomain<DDims...>(
-                    ddc::DiscreteDomain<DDims>(DElem<DDims>(0), DVect<DDims>(ncells))...));
+            ddc::DiscreteDomain<DDims>(DElem<DDims>(0), DVect<DDims>(ncells))...);
     ddc::DiscreteDomain<DDims...> const
             dom_vals(dom_vals_tmp, interpolation_domain1, interpolation_domain2);
 

diff --git a/tests/splines/batched_spline_builder.cpp b/tests/splines/batched_spline_builder.cpp
@@ -186,8 +186,7 @@ void BatchedSplineTest()
     // The following line creates a discrete domain over all dimensions (DDims...) where we immediately
     // remove the dimension DDimI.
     ddc::remove_dims_of_t<ddc::DiscreteDomain<DDims...>, DDimI> const dom_vals_tmp(
-            ddc::DiscreteDomain<DDims...>(
-                    ddc::DiscreteDomain<DDims>(DElem<DDims>(0), DVect<DDims>(ncells))...));
+            ddc::DiscreteDomain<DDims>(DElem<DDims>(0), DVect<DDims>(ncells))...);
     ddc::DiscreteDomain<DDims...> const dom_vals(dom_vals_tmp, interpolation_domain);
 
 #if defined(BC_HERMITE)

diff --git a/tests/splines/extrapolation_rule.cpp b/tests/splines/extrapolation_rule.cpp
@@ -177,8 +177,7 @@ void ExtrapolationRuleSplineTest()
     // The following line creates a discrete domain over all dimensions (DDims...) where we immediately
     // remove the dimensions DDimI1 and DDimI2.
     ddc::remove_dims_of_t<ddc::DiscreteDomain<DDims...>, DDimI1, DDimI2> const dom_vals_tmp(
-            ddc::DiscreteDomain<DDims...>(
-                    ddc::DiscreteDomain<DDims>(DElem<DDims>(0), DVect<DDims>(ncells))...));
+            ddc::DiscreteDomain<DDims>(DElem<DDims>(0), DVect<DDims>(ncells))...);
     ddc::DiscreteDomain<DDims...> const dom_vals(dom_vals_tmp, interpolation_domain);
 
     // Create a SplineBuilder over BSplines<I> and batched along other dimensions using some boundary conditions