Update GMGPolar usage

docker/gyselalibxx_env/Dockerfile

@@ -59,7 +59,7 @@ RUN chmod +x /bin/bash_run \
  && git clone --branch develop --depth 1 https://github.com/kokkos/kokkos-tools.git \
  && git clone --branch v0.2.0 --depth 1 https://gitlab.com/cines/code.gysela/libkoliop \
  && git clone --branch v0.15.0 --depth 1 https://github.com/CExA-project/ddc.git \
- && git clone --branch v2.3.1 --depth 1 https://github.com/SciCompMod/GMGPolar.git \
+ && git clone --branch main --depth 1 https://github.com/SciCompMod/GMGPolar.git \
  && export Kokkos_ROOT=/opt/serial/Kokkos \
  && export KokkosFFT_ROOT=/opt/serial/KokkosFFT \
  && export KokkosKernels_ROOT=/opt/serial/KokkosKernels \

src/pde_solvers/gmg_polar_poisson_like_solver.hpp

@@ -91,37 +91,45 @@ class HomogeneousDirichletBoundaryConditions
  *        DensityProfileCoefficients concept.
  * @tparam EvaluatorType A 2D evaluator for the representation described by IdxRangeCoeff.
  */
-template <class EvaluatorType, class IdxRangeCoeff, class CoordRTheta>
 class PolarPoissonLikeCoefficients
 {
-    using DConstCoeffRTheta = DConstField<IdxRangeCoeff>;
+    using SpanType = Kokkos::
+            View<double**, Kokkos::LayoutRight, Kokkos::DefaultExecutionSpace::memory_space>;
+    using ViewType = Kokkos::
+            View<const double**, Kokkos::LayoutRight, Kokkos::DefaultExecutionSpace::memory_space>;
 
 private:
-    EvaluatorType m_evaluator;
-    DConstCoeffRTheta m_coeff_alpha;
-    DConstCoeffRTheta m_coeff_beta;
+    SpanType m_alpha;
+    SpanType m_beta;
 
 public:
     /// Build the class instance
-    PolarPoissonLikeCoefficients(
-            EvaluatorType evaluator,
-            DConstCoeffRTheta coeff_alpha,
-            DConstCoeffRTheta coeff_beta)
-        : m_evaluator(evaluator)
-        , m_coeff_alpha(coeff_alpha)
-        , m_coeff_beta(coeff_beta)
+    PolarPoissonLikeCoefficients(int nr, int ntheta)
+        : m_alpha("alpha", nr, ntheta)
+        , m_beta("beta", nr, ntheta)
     {
     }
 
+    /**
+     * @brief Rebuild the internal representations of α and β from grid values.
+     * @param[in] alpha Values of α at the grid interpolation points.
+     * @param[in] beta  Values of β at the grid interpolation points.
+     */
+    void update_coefficients(ViewType alpha, ViewType beta)
+    {
+        Kokkos::deep_copy(m_alpha, alpha);
+        Kokkos::deep_copy(m_beta, beta);
+    }
+
     /// The coefficient alpha in the Poisson-like equation
-    KOKKOS_INLINE_FUNCTION double alpha(const double& r, const double& theta) const
+    KOKKOS_INLINE_FUNCTION double alpha(int i_r, int i_theta) const
     {
-        return m_evaluator(CoordRTheta(r, theta), m_coeff_alpha);
+        return m_alpha(i_r, i_theta);
     }
     /// The coefficient beta in the Poisson-like equation
-    KOKKOS_INLINE_FUNCTION double beta(const double& r, const double& theta) const
+    KOKKOS_INLINE_FUNCTION double beta(int i_r, int i_theta) const
     {
-        return m_evaluator(CoordRTheta(r, theta), m_coeff_beta);
+        return m_beta(i_r, i_theta);
     }
 
     /// Required for the concept, only used in custom mesh generation (refinement_radius); not needed here.
@@ -132,6 +140,7 @@ class PolarPoissonLikeCoefficients
     }
 };
 
+
 } // namespace GMGPolarTools
 
 /**
@@ -167,17 +176,12 @@ class GMGPolarPoissonLikeSolver
     using CoeffRThetaMem = DFieldMem<IdxRangeCoeff>;
 
     using DomainGeometry = GMGPolarTools::MappingToDomainGeometry<ToPhysicalMapping>;
-    using DensityCoeffs = GMGPolarTools::
-            PolarPoissonLikeCoefficients<EvaluatorType, IdxRangeCoeff, Coord<R, Theta>>;
+    using DensityCoeffs = GMGPolarTools::PolarPoissonLikeCoefficients;
 
 private:
     DomainGeometry const m_domain_geom;
-    BuilderType const& m_builder;
-    EvaluatorType const& m_evaluator;
-    ExtrapolationType const m_extrapolation_rule;
-    CoeffRThetaMem m_coeff_alpha;
-    CoeffRThetaMem m_coeff_beta;
-    DensityCoeffs const m_density_coeffs;
+    gmgpolar::ExtrapolationType const m_extrapolation_rule;
+    DensityCoeffs m_density_coeffs;
     int m_max_iterations;
     double m_absTol;
     double m_relTol;
@@ -194,28 +198,24 @@ class GMGPolarPoissonLikeSolver
      *
      * @param[in] to_physical The mapping from the logical to the physical domain.
      * @param[in] interpolator An interpolator to construct and evaluate the coefficients of the interpolation.
-     * @param[in] extrapolation_rule A parameter to pass extrapolation rule to GMGPolar, default ExtrapolationType::NONE.
+     * @param[in] extrapolation_rule A parameter to pass extrapolation rule to GMGPolar, default gmgpolar::ExtrapolationType::NONE.
      * @param[in] max_iterations The maximum number of iterations that the solver should carry out.
      * @param[in] absTol The absolute tolerance for the convergence of the solver.
      * @param[in] relTol The relative tolerance for the convergence of the solver.
      */
     GMGPolarPoissonLikeSolver(
             ToPhysicalMapping to_physical,
             InterpolatorType const& interpolator,
-            ExtrapolationType const extrapolation_rule = ExtrapolationType::NONE,
+            gmgpolar::ExtrapolationType const extrapolation_rule
+            = gmgpolar::ExtrapolationType::NONE,
             std::optional<int> max_iterations = std::nullopt,
             std::optional<double> absTol = std::nullopt,
             std::optional<double> relTol = std::nullopt)
         : m_domain_geom(to_physical)
-        , m_builder(interpolator.get_builder())
-        , m_evaluator(interpolator.get_evaluator())
         , m_extrapolation_rule(extrapolation_rule)
-        , m_coeff_alpha(get_spline_idx_range(m_builder))
-        , m_coeff_beta(get_spline_idx_range(m_builder))
         , m_density_coeffs(
-                  m_evaluator,
-                  get_const_field(m_coeff_alpha),
-                  get_const_field(m_coeff_beta))
+                  IdxRangeR(builder.interpolation_domain()).size(),
+                  IdxRangeTheta(builder.interpolation_domain()).size())
         , m_max_iterations(max_iterations.value_or(100))
         , m_absTol(absTol.value_or(1e-10))
         , m_relTol(relTol.value_or(1e-6))
@@ -238,15 +238,15 @@ class GMGPolarPoissonLikeSolver
     }
 
     /**
-     * @brief Rebuild the internal spline representations of α and β from grid values.
+     * @brief Rebuild the internal representations of α and β from grid values.
      * @param[in] alpha Values of α at the grid interpolation points.
      * @param[in] beta  Values of β at the grid interpolation points.
      */
     void update_coefficients(DConstField<IdxRangeRTheta> alpha, DConstField<IdxRangeRTheta> beta)
             override
     {
-        m_builder(get_field(m_coeff_alpha), get_const_field(alpha));
-        m_builder(get_field(m_coeff_beta), get_const_field(beta));
+        m_density_coeffs
+                .update_coefficients(alpha.allocation_kokkos_view(), beta.allocation_kokkos_view());
 
         // --- Create GMGPolar solver for the selected geometry and coefficients --- //
         m_solver = std::make_unique<gmgpolar::GMGPolar<