Use operator() instead of rhs_f function in SourceTerms

CMakeLists.txt

@@ -24,7 +24,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Set compiler flags
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -pedantic -Wno-unused -Wno-psabi")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wpedantic -Wno-unused -Wno-psabi -Wfloat-conversion")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -mtune=generic -Wno-psabi")
 
 # Set coverage compiler flags - must come before any targets are defined

include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h

@@ -4,15 +4,17 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_Poisson_CircularGeometry : public SourceTerm
 {
 public:
-    CartesianR2_Poisson_CircularGeometry() = default;
-    explicit CartesianR2_Poisson_CircularGeometry(double Rmax);
+    explicit CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax);
     virtual ~CartesianR2_Poisson_CircularGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax = 1.3;
 };

include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h

@@ -4,16 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_Poisson_CzarnyGeometry : public SourceTerm
 {
 public:
-    CartesianR2_Poisson_CzarnyGeometry() = default;
-    explicit CartesianR2_Poisson_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e);
+    explicit CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon,
+                                                double ellipticity_e);
     virtual ~CartesianR2_Poisson_CzarnyGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax                         = 1.3;
     const double inverse_aspect_ratio_epsilon = 0.3;
     const double ellipticity_e                = 1.4;

include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h

@@ -4,16 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_Poisson_ShafranovGeometry : public SourceTerm
 {
 public:
-    CartesianR2_Poisson_ShafranovGeometry() = default;
-    explicit CartesianR2_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta);
+    explicit CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa,
+                                                   double shift_delta);
     virtual ~CartesianR2_Poisson_ShafranovGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax             = 1.3;
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;

include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h

@@ -4,15 +4,17 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_SonnendruckerGyro_CircularGeometry : public SourceTerm
 {
 public:
-    CartesianR2_SonnendruckerGyro_CircularGeometry() = default;
-    explicit CartesianR2_SonnendruckerGyro_CircularGeometry(double Rmax);
+    explicit CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax);
     virtual ~CartesianR2_SonnendruckerGyro_CircularGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax = 1.3;
 };

include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h

@@ -4,17 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_SonnendruckerGyro_CzarnyGeometry : public SourceTerm
 {
 public:
-    CartesianR2_SonnendruckerGyro_CzarnyGeometry() = default;
-    explicit CartesianR2_SonnendruckerGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon,
-                                                          double ellipticity_e);
+    explicit CartesianR2_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax,
+                                                          double inverse_aspect_ratio_epsilon, double ellipticity_e);
     virtual ~CartesianR2_SonnendruckerGyro_CzarnyGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax                         = 1.3;
     const double inverse_aspect_ratio_epsilon = 0.3;
     const double ellipticity_e                = 1.4;

include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h

@@ -4,16 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_SonnendruckerGyro_ShafranovGeometry : public SourceTerm
 {
 public:
-    CartesianR2_SonnendruckerGyro_ShafranovGeometry() = default;
-    explicit CartesianR2_SonnendruckerGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta);
+    explicit CartesianR2_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax,
+                                                             double elongation_kappa, double shift_delta);
     virtual ~CartesianR2_SonnendruckerGyro_ShafranovGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax             = 1.3;
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;

include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h

@@ -4,15 +4,17 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_Sonnendrucker_CircularGeometry : public SourceTerm
 {
 public:
-    CartesianR2_Sonnendrucker_CircularGeometry() = default;
-    explicit CartesianR2_Sonnendrucker_CircularGeometry(double Rmax);
+    explicit CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax);
     virtual ~CartesianR2_Sonnendrucker_CircularGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax = 1.3;
 };

include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h

@@ -4,17 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_Sonnendrucker_CzarnyGeometry : public SourceTerm
 {
 public:
-    CartesianR2_Sonnendrucker_CzarnyGeometry() = default;
-    explicit CartesianR2_Sonnendrucker_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon,
-                                                      double ellipticity_e);
+    explicit CartesianR2_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax,
+                                                      double inverse_aspect_ratio_epsilon, double ellipticity_e);
     virtual ~CartesianR2_Sonnendrucker_CzarnyGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax                         = 1.3;
     const double inverse_aspect_ratio_epsilon = 0.3;
     const double ellipticity_e                = 1.4;

include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h

@@ -4,16 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_Sonnendrucker_ShafranovGeometry : public SourceTerm
 {
 public:
-    CartesianR2_Sonnendrucker_ShafranovGeometry() = default;
-    explicit CartesianR2_Sonnendrucker_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta);
+    explicit CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa,
+                                                         double shift_delta);
     virtual ~CartesianR2_Sonnendrucker_ShafranovGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax             = 1.3;
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;

include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h

@@ -4,15 +4,17 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_ZoniGyro_CircularGeometry : public SourceTerm
 {
 public:
-    CartesianR2_ZoniGyro_CircularGeometry() = default;
-    explicit CartesianR2_ZoniGyro_CircularGeometry(double Rmax);
+    explicit CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax);
     virtual ~CartesianR2_ZoniGyro_CircularGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax = 1.3;
 };

include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h

@@ -4,17 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_ZoniGyro_CzarnyGeometry : public SourceTerm
 {
 public:
-    CartesianR2_ZoniGyro_CzarnyGeometry() = default;
-    explicit CartesianR2_ZoniGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon,
-                                                 double ellipticity_e);
+    explicit CartesianR2_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax,
+                                                 double inverse_aspect_ratio_epsilon, double ellipticity_e);
     virtual ~CartesianR2_ZoniGyro_CzarnyGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax                         = 1.3;
     const double inverse_aspect_ratio_epsilon = 0.3;
     const double ellipticity_e                = 1.4;

include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h

@@ -4,16 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_ZoniGyro_ShafranovGeometry : public SourceTerm
 {
 public:
-    CartesianR2_ZoniGyro_ShafranovGeometry() = default;
-    explicit CartesianR2_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta);
+    explicit CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa,
+                                                    double shift_delta);
     virtual ~CartesianR2_ZoniGyro_ShafranovGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax             = 1.3;
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;

include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h

@@ -4,15 +4,17 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_ZoniShiftedGyro_CircularGeometry : public SourceTerm
 {
 public:
-    CartesianR2_ZoniShiftedGyro_CircularGeometry() = default;
-    explicit CartesianR2_ZoniShiftedGyro_CircularGeometry(double Rmax);
+    explicit CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax);
     virtual ~CartesianR2_ZoniShiftedGyro_CircularGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax = 1.3;
 };

include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h

@@ -4,17 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm
 {
 public:
-    CartesianR2_ZoniShiftedGyro_CzarnyGeometry() = default;
-    explicit CartesianR2_ZoniShiftedGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon,
-                                                        double ellipticity_e);
+    explicit CartesianR2_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax,
+                                                        double inverse_aspect_ratio_epsilon, double ellipticity_e);
     virtual ~CartesianR2_ZoniShiftedGyro_CzarnyGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax                         = 1.3;
     const double inverse_aspect_ratio_epsilon = 0.3;
     const double ellipticity_e                = 1.4;

include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h

@@ -4,16 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm
 {
 public:
-    CartesianR2_ZoniShiftedGyro_ShafranovGeometry() = default;
-    explicit CartesianR2_ZoniShiftedGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta);
+    explicit CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa,
+                                                           double shift_delta);
     virtual ~CartesianR2_ZoniShiftedGyro_ShafranovGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax             = 1.3;
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;

include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h

@@ -4,15 +4,17 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_ZoniShifted_CircularGeometry : public SourceTerm
 {
 public:
-    CartesianR2_ZoniShifted_CircularGeometry() = default;
-    explicit CartesianR2_ZoniShifted_CircularGeometry(double Rmax);
+    explicit CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax);
     virtual ~CartesianR2_ZoniShifted_CircularGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax = 1.3;
 };

include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h

@@ -4,17 +4,19 @@
 
 #include "../sourceTerm.h"
 
+#include "../../PolarGrid/polargrid.h"
+
 class CartesianR2_ZoniShifted_CzarnyGeometry : public SourceTerm
 {
 public:
-    CartesianR2_ZoniShifted_CzarnyGeometry() = default;
-    explicit CartesianR2_ZoniShifted_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon,
-                                                    double ellipticity_e);
+    explicit CartesianR2_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax,
+                                                    double inverse_aspect_ratio_epsilon, double ellipticity_e);
     virtual ~CartesianR2_ZoniShifted_CzarnyGeometry() = default;
 
-    double rhs_f(double r, double theta) const override;
+    double operator()(std::size_t i_r, std::size_t i_theta) const override;
 
 private:
+    PolarGrid const& grid_;
     const double Rmax                         = 1.3;
     const double inverse_aspect_ratio_epsilon = 0.3;
     const double ellipticity_e                = 1.4;