Merge branch 'sync_ddc' into 'main'

Sync ddc See merge request gysela-developpers/gyselalibxx!689
gyselax · Sep 20, 2024 · 994aa0b · 994aa0b
1 parent d8393b0
commit 994aa0b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/pde_solvers/fem_1d_poisson_solver.hpp b/src/pde_solvers/fem_1d_poisson_solver.hpp
@@ -384,7 +384,7 @@ class FEM1DPoissonSolver
                 = bspline_full_idx_range.take_first(IdxStep<FEMBSplines>(nbasis));
 
         host_t<FEMBSplinesCoeffMem> int_vals(idx_range_bspline);
-        ddc::discrete_space<InputBSplines>().integrals(get_field(int_vals));
+        ddc::integrals(Kokkos::DefaultHostExecutionSpace(), get_field(int_vals));
 
         for (IdxFEMBSplines const ix : idx_range_bspline) {
             int const i = (ix - first_bspline_idx).value();

diff --git a/vendor/ddc b/vendor/ddc
diff --git a/vendor/sll/include/sll/polar_bsplines.hpp b/vendor/sll/include/sll/polar_bsplines.hpp
@@ -688,8 +688,8 @@ void PolarBSplines<BSplinesR, BSplinesTheta, C>::Impl<DDim, MemorySpace>::integr
     ddc::ChunkSpan r_integrals = r_integrals_alloc.span_view();
     ddc::ChunkSpan theta_integrals = theta_integrals_alloc.span_view();
 
-    r_bspl_space.integrals(r_integrals);
-    theta_bspl_space.integrals(theta_integrals);
+    ddc::integrals(Kokkos::DefaultHostExecutionSpace(), r_integrals);
+    ddc::integrals(Kokkos::DefaultHostExecutionSpace(), theta_integrals);
 
     ddc::for_each(singular_idx_range<DDim>(), [&](auto k) {
         int_vals.singular_spline_coef(k) = ddc::transform_reduce(