From 0604ad9a61e01faef0f7d5f3792709a06bff6958 Mon Sep 17 00:00:00 2001
From: Emily Bourne <emily.bourne@epfl.ch>
Date: Mon, 25 Mar 2024 13:45:10 +0000
Subject: [PATCH] Remove unused arguments in geometryRTheta

Closes #191

See merge request gysela-developpers/gyselalibxx!417

--------------------------------------------

Co-authored-by: Pauline Vidal <pavi@nb-pavi-1.ipp.mpg.de>
---
 simulations/geometryRTheta/diocotron/diocotron.cpp  |  1 -
 src/geometryRTheta/time_solver/bsl_predcorr.hpp     | 13 ++-----------
 .../bsl_predcorr_second_order_explicit.hpp          |  5 +----
 .../bsl_predcorr_second_order_implicit.hpp          |  5 +----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/simulations/geometryRTheta/diocotron/diocotron.cpp b/simulations/geometryRTheta/diocotron/diocotron.cpp
index e79d01f6f..9a2d6a1a5 100644
--- a/simulations/geometryRTheta/diocotron/diocotron.cpp
+++ b/simulations/geometryRTheta/diocotron/diocotron.cpp
@@ -222,7 +222,6 @@ int main(int argc, char** argv)
     // --- Predictor corrector operator ---------------------------------------------------------------
 #if defined(PREDCORR)
     BslPredCorrRP predcorr_operator(
-            advection_domain,
             mapping,
             advection_operator,
             builder,
diff --git a/src/geometryRTheta/time_solver/bsl_predcorr.hpp b/src/geometryRTheta/time_solver/bsl_predcorr.hpp
index 3a6eec324..021b8990d 100644
--- a/src/geometryRTheta/time_solver/bsl_predcorr.hpp
+++ b/src/geometryRTheta/time_solver/bsl_predcorr.hpp
@@ -52,18 +52,14 @@
  *
  * @tparam Mapping
  *      A Curvilinear2DToCartesian class or one of its child classes.
- * @tparam AdvectionDomain
- *      An AdvectionDomain class.
  * @tparam FootFinder
  *      A IFootFinder class.
  *
  */
-template <class Mapping, class AdvectionDomain, class FootFinder>
+template <class Mapping, class FootFinder>
 class BslPredCorrRP : public ITimeSolverRP
 {
 private:
-    AdvectionDomain const& m_advection_domain;
-
     Mapping const& m_mapping;
 
     BslAdvectionRP<FootFinder, Mapping> const& m_advection_solver;
@@ -78,9 +74,6 @@ class BslPredCorrRP : public ITimeSolverRP
     /**
      * @brief Instantiate a BslPredCorrRP.
      *
-     * @param[in] advection_domain
-     *      An AdvectionDomain object which gives the information
-     *      in which domain we advect.
      * @param[in] mapping
      *      The mapping function from the logical domain to the
      *      physical domain.
@@ -96,14 +89,12 @@ class BslPredCorrRP : public ITimeSolverRP
      *      potential.
      */
     BslPredCorrRP(
-            AdvectionDomain const& advection_domain,
             Mapping const& mapping,
             BslAdvectionRP<FootFinder, Mapping> const& advection_solver,
             SplineRPBuilder const& builder,
             SplineRPEvaluator const& rhs_evaluator,
             PolarSplineFEMPoissonSolver const& poisson_solver)
-        : m_advection_domain(advection_domain)
-        , m_mapping(mapping)
+        : m_mapping(mapping)
         , m_advection_solver(advection_solver)
         , m_poisson_solver(poisson_solver)
         , m_builder(builder)
diff --git a/src/geometryRTheta/time_solver/bsl_predcorr_second_order_explicit.hpp b/src/geometryRTheta/time_solver/bsl_predcorr_second_order_explicit.hpp
index 62d73894f..61f2ab73f 100644
--- a/src/geometryRTheta/time_solver/bsl_predcorr_second_order_explicit.hpp
+++ b/src/geometryRTheta/time_solver/bsl_predcorr_second_order_explicit.hpp
@@ -71,8 +71,6 @@ class BslExplicitPredCorrRP : public ITimeSolverRP
     using EulerMethod = Euler<FieldRP<CoordRP>, VectorDFieldRP<RDimX, RDimY>>;
 
 
-    AdvectionDomain const& m_advection_domain;
-
     Mapping const& m_mapping;
 
     BslAdvectionRP<SplineFootFinder<EulerMethod, AdvectionDomain>, Mapping> const&
@@ -123,8 +121,7 @@ class BslExplicitPredCorrRP : public ITimeSolverRP
             SplineRPEvaluator const& rhs_evaluator,
             PolarSplineFEMPoissonSolver const& poisson_solver,
             SplineRPEvaluator const& advection_evaluator)
-        : m_advection_domain(advection_domain)
-        , m_mapping(mapping)
+        : m_mapping(mapping)
         , m_advection_solver(advection_solver)
         , m_euler(grid)
         , m_find_feet(m_euler, advection_domain, builder, advection_evaluator)
diff --git a/src/geometryRTheta/time_solver/bsl_predcorr_second_order_implicit.hpp b/src/geometryRTheta/time_solver/bsl_predcorr_second_order_implicit.hpp
index 6efd7244e..168eb399e 100644
--- a/src/geometryRTheta/time_solver/bsl_predcorr_second_order_implicit.hpp
+++ b/src/geometryRTheta/time_solver/bsl_predcorr_second_order_implicit.hpp
@@ -71,8 +71,6 @@ class BslImplicitPredCorrRP : public ITimeSolverRP
 private:
     using EulerMethod = Euler<FieldRP<CoordRP>, VectorDFieldRP<RDimX, RDimY>>;
 
-    AdvectionDomain const& m_advection_domain;
-
     Mapping const& m_mapping;
 
     BslAdvectionRP<SplineFootFinder<EulerMethod, AdvectionDomain>, Mapping> const&
@@ -123,8 +121,7 @@ class BslImplicitPredCorrRP : public ITimeSolverRP
             SplineRPEvaluator const& rhs_evaluator,
             PolarSplineFEMPoissonSolver const& poisson_solver,
             SplineRPEvaluator const& advection_evaluator)
-        : m_advection_domain(advection_domain)
-        , m_mapping(mapping)
+        : m_mapping(mapping)
         , m_advection_solver(advection_solver)
         , m_euler(grid)
         , m_foot_finder(m_euler, advection_domain, builder, advection_evaluator)