From c25da83140cf62d130abcb36638bfd59f342ff66 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 16:07:43 +0100 Subject: [PATCH 01/15] Remove unused constructor --- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.h | 1 - .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_CircularGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- 68 files changed, 67 insertions(+), 68 deletions(-) diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h index a467e308..8b9f5fa6 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR2_Poisson_CircularGeometry : public SourceTerm { public: - CartesianR2_Poisson_CircularGeometry() = default; explicit CartesianR2_Poisson_CircularGeometry(double Rmax); virtual ~CartesianR2_Poisson_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h index c88efc1d..f4542b0d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h @@ -7,7 +7,7 @@ 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); virtual ~CartesianR2_Poisson_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h index ec5fea84..4a49bc40 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_Poisson_ShafranovGeometry : public SourceTerm { public: - CartesianR2_Poisson_ShafranovGeometry() = default; + explicit CartesianR2_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_Poisson_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h index a9697801..71c4177b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - CartesianR2_SonnendruckerGyro_CircularGeometry() = default; + explicit CartesianR2_SonnendruckerGyro_CircularGeometry(double Rmax); virtual ~CartesianR2_SonnendruckerGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h index 66acb388..079a5fdc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ 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); virtual ~CartesianR2_SonnendruckerGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h index 5e431cc6..dff0fa05 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - CartesianR2_SonnendruckerGyro_ShafranovGeometry() = default; + explicit CartesianR2_SonnendruckerGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_SonnendruckerGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h index e4fab6e5..9909988c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_Sonnendrucker_CircularGeometry : public SourceTerm { public: - CartesianR2_Sonnendrucker_CircularGeometry() = default; + explicit CartesianR2_Sonnendrucker_CircularGeometry(double Rmax); virtual ~CartesianR2_Sonnendrucker_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h index 285cea22..affe90f8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h @@ -7,7 +7,7 @@ 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); virtual ~CartesianR2_Sonnendrucker_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h index 1581c44b..4a763e27 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - CartesianR2_Sonnendrucker_ShafranovGeometry() = default; + explicit CartesianR2_Sonnendrucker_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_Sonnendrucker_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h index 255bfbfd..90ff26ef 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_ZoniGyro_CircularGeometry : public SourceTerm { public: - CartesianR2_ZoniGyro_CircularGeometry() = default; + explicit CartesianR2_ZoniGyro_CircularGeometry(double Rmax); virtual ~CartesianR2_ZoniGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h index d359a57e..bef7ed2e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ 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); virtual ~CartesianR2_ZoniGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h index 598007b2..7a12497a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - CartesianR2_ZoniGyro_ShafranovGeometry() = default; + explicit CartesianR2_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_ZoniGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h index 02e8e36a..2530fb2f 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - CartesianR2_ZoniShiftedGyro_CircularGeometry() = default; + explicit CartesianR2_ZoniShiftedGyro_CircularGeometry(double Rmax); virtual ~CartesianR2_ZoniShiftedGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h index 3bef4fbe..fb2c29da 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ 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); virtual ~CartesianR2_ZoniShiftedGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h index c27fa256..2514bee8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - CartesianR2_ZoniShiftedGyro_ShafranovGeometry() = default; + explicit CartesianR2_ZoniShiftedGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_ZoniShiftedGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h index b7cd5a67..212d2cef 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_ZoniShifted_CircularGeometry : public SourceTerm { public: - CartesianR2_ZoniShifted_CircularGeometry() = default; + explicit CartesianR2_ZoniShifted_CircularGeometry(double Rmax); virtual ~CartesianR2_ZoniShifted_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h index 51d2d09f..f2c11eb3 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h @@ -7,7 +7,7 @@ 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); virtual ~CartesianR2_ZoniShifted_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h index 8b4b7712..e49b6cd6 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - CartesianR2_ZoniShifted_ShafranovGeometry() = default; + explicit CartesianR2_ZoniShifted_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_ZoniShifted_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h index 5ef10fbf..c3f4b5b3 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_Zoni_CircularGeometry : public SourceTerm { public: - CartesianR2_Zoni_CircularGeometry() = default; + explicit CartesianR2_Zoni_CircularGeometry(double Rmax); virtual ~CartesianR2_Zoni_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h index 60e05865..3071d921 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_Zoni_CzarnyGeometry : public SourceTerm { public: - CartesianR2_Zoni_CzarnyGeometry() = default; + explicit CartesianR2_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_Zoni_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h index dfe49922..f6521035 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR2_Zoni_ShafranovGeometry : public SourceTerm { public: - CartesianR2_Zoni_ShafranovGeometry() = default; + explicit CartesianR2_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_Zoni_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h index fdeace8b..279dcc74 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Poisson_CircularGeometry : public SourceTerm { public: - CartesianR6_Poisson_CircularGeometry() = default; + explicit CartesianR6_Poisson_CircularGeometry(double Rmax); virtual ~CartesianR6_Poisson_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h index 5f788eda..1525d092 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Poisson_CzarnyGeometry : public SourceTerm { public: - CartesianR6_Poisson_CzarnyGeometry() = default; + explicit CartesianR6_Poisson_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Poisson_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h index e437d28d..8dd07003 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Poisson_ShafranovGeometry : public SourceTerm { public: - CartesianR6_Poisson_ShafranovGeometry() = default; + explicit CartesianR6_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Poisson_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h index 03a40d2e..49ba585c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - CartesianR6_SonnendruckerGyro_CircularGeometry() = default; + explicit CartesianR6_SonnendruckerGyro_CircularGeometry(double Rmax); virtual ~CartesianR6_SonnendruckerGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h index fbba8664..3a783370 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: - CartesianR6_SonnendruckerGyro_CzarnyGeometry() = default; + explicit CartesianR6_SonnendruckerGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_SonnendruckerGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h index 11b3c41d..f3239010 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - CartesianR6_SonnendruckerGyro_ShafranovGeometry() = default; + explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_SonnendruckerGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h index ec1d4621..f419699d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Sonnendrucker_CircularGeometry : public SourceTerm { public: - CartesianR6_Sonnendrucker_CircularGeometry() = default; + explicit CartesianR6_Sonnendrucker_CircularGeometry(double Rmax); virtual ~CartesianR6_Sonnendrucker_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h index b63902cc..6ef9cbb0 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: - CartesianR6_Sonnendrucker_CzarnyGeometry() = default; + explicit CartesianR6_Sonnendrucker_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Sonnendrucker_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h index 79180d92..465db6a7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - CartesianR6_Sonnendrucker_ShafranovGeometry() = default; + explicit CartesianR6_Sonnendrucker_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Sonnendrucker_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h index 5445bdfa..c0e24a70 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniGyro_CircularGeometry : public SourceTerm { public: - CartesianR6_ZoniGyro_CircularGeometry() = default; + explicit CartesianR6_ZoniGyro_CircularGeometry(double Rmax); virtual ~CartesianR6_ZoniGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h index 9735b714..654e4c31 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniGyro_CzarnyGeometry : public SourceTerm { public: - CartesianR6_ZoniGyro_CzarnyGeometry() = default; + explicit CartesianR6_ZoniGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h index 8b8ac616..f8d933dd 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - CartesianR6_ZoniGyro_ShafranovGeometry() = default; + explicit CartesianR6_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h index 099648ae..dc8678db 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - CartesianR6_ZoniShiftedGyro_CircularGeometry() = default; + explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(double Rmax); virtual ~CartesianR6_ZoniShiftedGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h index 06fb1f14..244a89de 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - CartesianR6_ZoniShiftedGyro_CzarnyGeometry() = default; + explicit CartesianR6_ZoniShiftedGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniShiftedGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h index 65e18bd4..1de46ecf 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - CartesianR6_ZoniShiftedGyro_ShafranovGeometry() = default; + explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniShiftedGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h index 280d1789..64212be1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniShifted_CircularGeometry : public SourceTerm { public: - CartesianR6_ZoniShifted_CircularGeometry() = default; + explicit CartesianR6_ZoniShifted_CircularGeometry(double Rmax); virtual ~CartesianR6_ZoniShifted_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h index 30d11bef..78f8a57a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniShifted_CzarnyGeometry : public SourceTerm { public: - CartesianR6_ZoniShifted_CzarnyGeometry() = default; + explicit CartesianR6_ZoniShifted_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniShifted_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h index 4b5fc472..27195cd1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - CartesianR6_ZoniShifted_ShafranovGeometry() = default; + explicit CartesianR6_ZoniShifted_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniShifted_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h index 93840b23..5eaa41c8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Zoni_CircularGeometry : public SourceTerm { public: - CartesianR6_Zoni_CircularGeometry() = default; + explicit CartesianR6_Zoni_CircularGeometry(double Rmax); virtual ~CartesianR6_Zoni_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h index a102dbc2..7c6346de 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Zoni_CzarnyGeometry : public SourceTerm { public: - CartesianR6_Zoni_CzarnyGeometry() = default; + explicit CartesianR6_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Zoni_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h index 847d6682..fce0dfd7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h @@ -7,7 +7,7 @@ class CartesianR6_Zoni_ShafranovGeometry : public SourceTerm { public: - CartesianR6_Zoni_ShafranovGeometry() = default; + explicit CartesianR6_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Zoni_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h index cdcf3f92..b9c07642 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Poisson_CircularGeometry : public SourceTerm { public: - PolarR6_Poisson_CircularGeometry() = default; + explicit PolarR6_Poisson_CircularGeometry(double Rmax); virtual ~PolarR6_Poisson_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h index cd066ac8..422bf915 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Poisson_CzarnyGeometry : public SourceTerm { public: - PolarR6_Poisson_CzarnyGeometry() = default; + explicit PolarR6_Poisson_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Poisson_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h index 98723842..c6feeea3 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Poisson_ShafranovGeometry : public SourceTerm { public: - PolarR6_Poisson_ShafranovGeometry() = default; + explicit PolarR6_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Poisson_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h index a32abb6f..70ad7c6c 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class PolarR6_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - PolarR6_SonnendruckerGyro_CircularGeometry() = default; + explicit PolarR6_SonnendruckerGyro_CircularGeometry(double Rmax); virtual ~PolarR6_SonnendruckerGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h index 295c01c2..bae34c21 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ class PolarR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: - PolarR6_SonnendruckerGyro_CzarnyGeometry() = default; + explicit PolarR6_SonnendruckerGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_SonnendruckerGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h index 09440a9c..a21bb507 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class PolarR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - PolarR6_SonnendruckerGyro_ShafranovGeometry() = default; + explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_SonnendruckerGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h index 9557e614..b757b01d 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Sonnendrucker_CircularGeometry : public SourceTerm { public: - PolarR6_Sonnendrucker_CircularGeometry() = default; + explicit PolarR6_Sonnendrucker_CircularGeometry(double Rmax); virtual ~PolarR6_Sonnendrucker_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h index e237860d..662a6ed7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: - PolarR6_Sonnendrucker_CzarnyGeometry() = default; + explicit PolarR6_Sonnendrucker_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Sonnendrucker_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h index 9821ecc9..524f032f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - PolarR6_Sonnendrucker_ShafranovGeometry() = default; + explicit PolarR6_Sonnendrucker_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Sonnendrucker_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h index 12bb7b0d..9dac91e3 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniGyro_CircularGeometry : public SourceTerm { public: - PolarR6_ZoniGyro_CircularGeometry() = default; + explicit PolarR6_ZoniGyro_CircularGeometry(double Rmax); virtual ~PolarR6_ZoniGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h index 1f24acc4..35ab57fc 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniGyro_CzarnyGeometry : public SourceTerm { public: - PolarR6_ZoniGyro_CzarnyGeometry() = default; + explicit PolarR6_ZoniGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h index bd07d64d..375d3107 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - PolarR6_ZoniGyro_ShafranovGeometry() = default; + explicit PolarR6_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h index 409f4bd2..490a77dc 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - PolarR6_ZoniShiftedGyro_CircularGeometry() = default; + explicit PolarR6_ZoniShiftedGyro_CircularGeometry(double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h index 6398edf9..fe0e6fb7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniShiftedGyro_CulhamGeometry : public SourceTerm { public: - PolarR6_ZoniShiftedGyro_CulhamGeometry() = default; + explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CulhamGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h index 357d7507..dabcfd11 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - PolarR6_ZoniShiftedGyro_CzarnyGeometry() = default; + explicit PolarR6_ZoniShiftedGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniShiftedGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h index 79cbcef5..741d0ff6 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - PolarR6_ZoniShiftedGyro_ShafranovGeometry() = default; + explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniShiftedGyro_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h index f24a2be0..a50809c6 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniShifted_CircularGeometry : public SourceTerm { public: - PolarR6_ZoniShifted_CircularGeometry() = default; + explicit PolarR6_ZoniShifted_CircularGeometry(double Rmax); virtual ~PolarR6_ZoniShifted_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h index 5c917b73..e3dc36af 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniShifted_CzarnyGeometry : public SourceTerm { public: - PolarR6_ZoniShifted_CzarnyGeometry() = default; + explicit PolarR6_ZoniShifted_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniShifted_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h index e380d8e4..6eb3f85d 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h @@ -7,7 +7,7 @@ class PolarR6_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - PolarR6_ZoniShifted_ShafranovGeometry() = default; + explicit PolarR6_ZoniShifted_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniShifted_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h index 84171adf..56c09aac 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Zoni_CircularGeometry : public SourceTerm { public: - PolarR6_Zoni_CircularGeometry() = default; + explicit PolarR6_Zoni_CircularGeometry(double Rmax); virtual ~PolarR6_Zoni_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h index f0a1891d..63f71a15 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Zoni_CzarnyGeometry : public SourceTerm { public: - PolarR6_Zoni_CzarnyGeometry() = default; + explicit PolarR6_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Zoni_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h index 4dac8754..907e7956 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h @@ -7,7 +7,7 @@ class PolarR6_Zoni_ShafranovGeometry : public SourceTerm { public: - PolarR6_Zoni_ShafranovGeometry() = default; + explicit PolarR6_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Zoni_ShafranovGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h index 78b4fb31..09669fa2 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h @@ -7,7 +7,7 @@ class Refined_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - Refined_ZoniShiftedGyro_CircularGeometry() = default; + explicit Refined_ZoniShiftedGyro_CircularGeometry(double Rmax); virtual ~Refined_ZoniShiftedGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h index d670e0b3..f3fe32ee 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h @@ -7,7 +7,7 @@ class Refined_ZoniShiftedGyro_CulhamGeometry : public SourceTerm { public: - Refined_ZoniShiftedGyro_CulhamGeometry() = default; + explicit Refined_ZoniShiftedGyro_CulhamGeometry(double Rmax); virtual ~Refined_ZoniShiftedGyro_CulhamGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h index ef92c26d..0c960ade 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h @@ -7,7 +7,7 @@ class Refined_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - Refined_ZoniShiftedGyro_CzarnyGeometry() = default; + explicit Refined_ZoniShiftedGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~Refined_ZoniShiftedGyro_CzarnyGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h index 6f84f9cd..d09ef591 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h @@ -7,7 +7,7 @@ class Refined_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - Refined_ZoniShiftedGyro_ShafranovGeometry() = default; + explicit Refined_ZoniShiftedGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); virtual ~Refined_ZoniShiftedGyro_ShafranovGeometry() = default; From 2400598a6c39973a1be0630c982ed2017a71e3c3 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 16:23:51 +0100 Subject: [PATCH 02/15] Save PolarGrid in anlytical SourceTerms to get coordinates from indices --- .../cartesianR2_Poisson_CircularGeometry.h | 3 +- .../cartesianR2_Poisson_CzarnyGeometry.h | 3 +- .../cartesianR2_Poisson_ShafranovGeometry.h | 3 +- ...ianR2_SonnendruckerGyro_CircularGeometry.h | 3 +- ...esianR2_SonnendruckerGyro_CzarnyGeometry.h | 3 +- ...anR2_SonnendruckerGyro_ShafranovGeometry.h | 3 +- ...rtesianR2_Sonnendrucker_CircularGeometry.h | 3 +- ...cartesianR2_Sonnendrucker_CzarnyGeometry.h | 3 +- ...tesianR2_Sonnendrucker_ShafranovGeometry.h | 3 +- .../cartesianR2_ZoniGyro_CircularGeometry.h | 3 +- .../cartesianR2_ZoniGyro_CzarnyGeometry.h | 3 +- .../cartesianR2_ZoniGyro_ShafranovGeometry.h | 3 +- ...esianR2_ZoniShiftedGyro_CircularGeometry.h | 3 +- ...rtesianR2_ZoniShiftedGyro_CzarnyGeometry.h | 3 +- ...sianR2_ZoniShiftedGyro_ShafranovGeometry.h | 3 +- ...cartesianR2_ZoniShifted_CircularGeometry.h | 3 +- .../cartesianR2_ZoniShifted_CzarnyGeometry.h | 3 +- ...artesianR2_ZoniShifted_ShafranovGeometry.h | 3 +- .../cartesianR2_Zoni_CircularGeometry.h | 3 +- .../cartesianR2_Zoni_CzarnyGeometry.h | 3 +- .../cartesianR2_Zoni_ShafranovGeometry.h | 3 +- .../cartesianR6_Poisson_CircularGeometry.h | 3 +- .../cartesianR6_Poisson_CzarnyGeometry.h | 3 +- .../cartesianR6_Poisson_ShafranovGeometry.h | 3 +- ...ianR6_SonnendruckerGyro_CircularGeometry.h | 3 +- ...esianR6_SonnendruckerGyro_CzarnyGeometry.h | 3 +- ...anR6_SonnendruckerGyro_ShafranovGeometry.h | 3 +- ...rtesianR6_Sonnendrucker_CircularGeometry.h | 3 +- ...cartesianR6_Sonnendrucker_CzarnyGeometry.h | 3 +- ...tesianR6_Sonnendrucker_ShafranovGeometry.h | 3 +- .../cartesianR6_ZoniGyro_CircularGeometry.h | 3 +- .../cartesianR6_ZoniGyro_CzarnyGeometry.h | 3 +- .../cartesianR6_ZoniGyro_ShafranovGeometry.h | 3 +- ...esianR6_ZoniShiftedGyro_CircularGeometry.h | 3 +- ...rtesianR6_ZoniShiftedGyro_CzarnyGeometry.h | 3 +- ...sianR6_ZoniShiftedGyro_ShafranovGeometry.h | 3 +- ...cartesianR6_ZoniShifted_CircularGeometry.h | 3 +- .../cartesianR6_ZoniShifted_CzarnyGeometry.h | 3 +- ...artesianR6_ZoniShifted_ShafranovGeometry.h | 3 +- .../cartesianR6_Zoni_CircularGeometry.h | 3 +- .../cartesianR6_Zoni_CzarnyGeometry.h | 3 +- .../cartesianR6_Zoni_ShafranovGeometry.h | 3 +- .../polarR6_Poisson_CircularGeometry.h | 3 +- .../polarR6_Poisson_CzarnyGeometry.h | 3 +- .../polarR6_Poisson_ShafranovGeometry.h | 3 +- ...larR6_SonnendruckerGyro_CircularGeometry.h | 3 +- ...polarR6_SonnendruckerGyro_CzarnyGeometry.h | 3 +- ...arR6_SonnendruckerGyro_ShafranovGeometry.h | 3 +- .../polarR6_Sonnendrucker_CircularGeometry.h | 3 +- .../polarR6_Sonnendrucker_CzarnyGeometry.h | 3 +- .../polarR6_Sonnendrucker_ShafranovGeometry.h | 3 +- .../polarR6_ZoniGyro_CircularGeometry.h | 3 +- .../polarR6_ZoniGyro_CzarnyGeometry.h | 3 +- .../polarR6_ZoniGyro_ShafranovGeometry.h | 3 +- ...polarR6_ZoniShiftedGyro_CircularGeometry.h | 3 +- .../polarR6_ZoniShiftedGyro_CulhamGeometry.h | 3 +- .../polarR6_ZoniShiftedGyro_CzarnyGeometry.h | 3 +- ...olarR6_ZoniShiftedGyro_ShafranovGeometry.h | 3 +- .../polarR6_ZoniShifted_CircularGeometry.h | 3 +- .../polarR6_ZoniShifted_CzarnyGeometry.h | 3 +- .../polarR6_ZoniShifted_ShafranovGeometry.h | 3 +- .../polarR6_Zoni_CircularGeometry.h | 3 +- .../SourceTerms/polarR6_Zoni_CzarnyGeometry.h | 3 +- .../polarR6_Zoni_ShafranovGeometry.h | 3 +- ...refined_ZoniShiftedGyro_CircularGeometry.h | 3 +- .../refined_ZoniShiftedGyro_CulhamGeometry.h | 3 +- .../refined_ZoniShiftedGyro_CzarnyGeometry.h | 3 +- ...efined_ZoniShiftedGyro_ShafranovGeometry.h | 3 +- src/ConfigParser/select_test_case.cpp | 138 +++++++++--------- 69 files changed, 205 insertions(+), 137 deletions(-) diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h index 8b9f5fa6..bcc0b05e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h @@ -7,11 +7,12 @@ class CartesianR2_Poisson_CircularGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h index f4542b0d..b85ce808 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_Poisson_CzarnyGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double inverse_aspect_ratio_epsilon = 0.3; const double ellipticity_e = 1.4; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h index 4a49bc40..d69c15fa 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_Poisson_ShafranovGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h index 71c4177b..318ce7cd 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR2_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h index 079a5fdc..0865ec40 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR2_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR2_SonnendruckerGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double inverse_aspect_ratio_epsilon = 0.3; const double ellipticity_e = 1.4; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h index dff0fa05..2da6c5fa 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h index 9909988c..4b59f4d9 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR2_Sonnendrucker_CircularGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h index affe90f8..6b9de7c9 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR2_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR2_Sonnendrucker_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double inverse_aspect_ratio_epsilon = 0.3; const double ellipticity_e = 1.4; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h index 4a763e27..d32b5cf5 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h index 90ff26ef..62b03177 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR2_ZoniGyro_CircularGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h index bef7ed2e..9246a4bf 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR2_ZoniGyro_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR2_ZoniGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double inverse_aspect_ratio_epsilon = 0.3; const double ellipticity_e = 1.4; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h index 7a12497a..cbad7475 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h index 2530fb2f..83a215e9 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR2_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h index fb2c29da..a5c740f7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR2_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR2_ZoniShiftedGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double inverse_aspect_ratio_epsilon = 0.3; const double ellipticity_e = 1.4; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h index 2514bee8..4e392342 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h index 212d2cef..de4b1d17 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR2_ZoniShifted_CircularGeometry : public SourceTerm { public: - 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h index f2c11eb3..95697245 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR2_ZoniShifted_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR2_ZoniShifted_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + 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; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double inverse_aspect_ratio_epsilon = 0.3; const double ellipticity_e = 1.4; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h index e49b6cd6..1604964a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR2_ZoniShifted_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_ZoniShifted_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h index c3f4b5b3..b19b1ed2 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR2_Zoni_CircularGeometry : public SourceTerm { public: - explicit CartesianR2_Zoni_CircularGeometry(double Rmax); + explicit CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Zoni_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h index 3071d921..498947d2 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_Zoni_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR2_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_Zoni_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h index f6521035..4f12f636 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR2_Zoni_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR2_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_Zoni_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h index 279dcc74..f032ed5c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR6_Poisson_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_Poisson_CircularGeometry(double Rmax); + explicit CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Poisson_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h index 1525d092..fea67027 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_Poisson_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR6_Poisson_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Poisson_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h index 8dd07003..a5f9ef00 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_Poisson_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR6_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Poisson_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h index 49ba585c..b48d52d1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR6_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_SonnendruckerGyro_CircularGeometry(double Rmax); + explicit CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_SonnendruckerGyro_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h index 3a783370..9f4a37af 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR6_SonnendruckerGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit CartesianR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_SonnendruckerGyro_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h index f3239010..348027c1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_SonnendruckerGyro_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h index f419699d..fc06d1b8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR6_Sonnendrucker_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_Sonnendrucker_CircularGeometry(double Rmax); + explicit CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Sonnendrucker_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h index 6ef9cbb0..778279b7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR6_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR6_Sonnendrucker_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit CartesianR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Sonnendrucker_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h index 465db6a7..0f4c475c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR6_Sonnendrucker_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Sonnendrucker_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h index c0e24a70..79359a24 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR6_ZoniGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniGyro_CircularGeometry(double Rmax); + explicit CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniGyro_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h index 654e4c31..efe853ba 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR6_ZoniGyro_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit CartesianR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniGyro_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h index f8d933dd..4afbda57 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniGyro_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h index dc8678db..0c962466 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(double Rmax); + explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShiftedGyro_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h index 244a89de..c6e99dc3 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniShiftedGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit CartesianR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniShiftedGyro_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h index 1de46ecf..0796c002 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniShiftedGyro_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h index 64212be1..4ff7ae75 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR6_ZoniShifted_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniShifted_CircularGeometry(double Rmax); + explicit CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShifted_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h index 78f8a57a..48d2a2bf 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h @@ -8,13 +8,14 @@ class CartesianR6_ZoniShifted_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniShifted_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit CartesianR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniShifted_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h index 27195cd1..6e92740c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniShifted_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniShifted_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h index 5eaa41c8..7913fe49 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h @@ -8,11 +8,12 @@ class CartesianR6_Zoni_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_Zoni_CircularGeometry(double Rmax); + explicit CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Zoni_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h index 7c6346de..d7062836 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_Zoni_CzarnyGeometry : public SourceTerm { public: - explicit CartesianR6_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Zoni_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h index fce0dfd7..8e1874a7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h @@ -8,12 +8,13 @@ class CartesianR6_Zoni_ShafranovGeometry : public SourceTerm { public: - explicit CartesianR6_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Zoni_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h index b9c07642..a3c2fab3 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h @@ -8,11 +8,12 @@ class PolarR6_Poisson_CircularGeometry : public SourceTerm { public: - explicit PolarR6_Poisson_CircularGeometry(double Rmax); + explicit PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Poisson_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h index 422bf915..94dbc971 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h @@ -8,12 +8,13 @@ class PolarR6_Poisson_CzarnyGeometry : public SourceTerm { public: - explicit PolarR6_Poisson_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Poisson_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h index c6feeea3..f3901d30 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h @@ -8,12 +8,13 @@ class PolarR6_Poisson_ShafranovGeometry : public SourceTerm { public: - explicit PolarR6_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Poisson_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h index 70ad7c6c..9d184468 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class PolarR6_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - explicit PolarR6_SonnendruckerGyro_CircularGeometry(double Rmax); + explicit PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_SonnendruckerGyro_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h index bae34c21..13808633 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class PolarR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: - explicit PolarR6_SonnendruckerGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit PolarR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_SonnendruckerGyro_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h index a21bb507..465750c8 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class PolarR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_SonnendruckerGyro_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h index b757b01d..599f3733 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h @@ -8,11 +8,12 @@ class PolarR6_Sonnendrucker_CircularGeometry : public SourceTerm { public: - explicit PolarR6_Sonnendrucker_CircularGeometry(double Rmax); + explicit PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Sonnendrucker_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h index 662a6ed7..943fe307 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h @@ -8,13 +8,14 @@ class PolarR6_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: - explicit PolarR6_Sonnendrucker_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit PolarR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Sonnendrucker_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h index 524f032f..78e211b4 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h @@ -8,12 +8,13 @@ class PolarR6_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - explicit PolarR6_Sonnendrucker_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Sonnendrucker_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h index 9dac91e3..7c8de68a 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class PolarR6_ZoniGyro_CircularGeometry : public SourceTerm { public: - explicit PolarR6_ZoniGyro_CircularGeometry(double Rmax); + explicit PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniGyro_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h index 35ab57fc..ae808a09 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h @@ -8,12 +8,13 @@ class PolarR6_ZoniGyro_CzarnyGeometry : public SourceTerm { public: - explicit PolarR6_ZoniGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniGyro_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h index 375d3107..00006f1c 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class PolarR6_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - explicit PolarR6_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniGyro_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h index 490a77dc..aa872bc8 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class PolarR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShiftedGyro_CircularGeometry(double Rmax); + explicit PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h index fe0e6fb7..7cf8cf1f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h @@ -8,11 +8,12 @@ class PolarR6_ZoniShiftedGyro_CulhamGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(double Rmax); + explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CulhamGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h index dabcfd11..8bf8a14c 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class PolarR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShiftedGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit PolarR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniShiftedGyro_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h index 741d0ff6..1375995d 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class PolarR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniShiftedGyro_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h index a50809c6..224aa021 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h @@ -8,11 +8,12 @@ class PolarR6_ZoniShifted_CircularGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShifted_CircularGeometry(double Rmax); + explicit PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShifted_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h index e3dc36af..76662cf7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h @@ -8,12 +8,13 @@ class PolarR6_ZoniShifted_CzarnyGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShifted_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniShifted_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h index 6eb3f85d..aedf7b88 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h @@ -8,12 +8,13 @@ class PolarR6_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShifted_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniShifted_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h index 56c09aac..4e5babed 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h @@ -8,11 +8,12 @@ class PolarR6_Zoni_CircularGeometry : public SourceTerm { public: - explicit PolarR6_Zoni_CircularGeometry(double Rmax); + explicit PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Zoni_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h index 63f71a15..f2a4c412 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h @@ -8,12 +8,13 @@ class PolarR6_Zoni_CzarnyGeometry : public SourceTerm { public: - explicit PolarR6_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Zoni_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h index 907e7956..8c8518f9 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h @@ -8,12 +8,13 @@ class PolarR6_Zoni_ShafranovGeometry : public SourceTerm { public: - explicit PolarR6_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Zoni_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h index 09669fa2..f19e7741 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h @@ -8,11 +8,12 @@ class Refined_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - explicit Refined_ZoniShiftedGyro_CircularGeometry(double Rmax); + explicit Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CircularGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h index f3fe32ee..241b3726 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h @@ -8,11 +8,12 @@ class Refined_ZoniShiftedGyro_CulhamGeometry : public SourceTerm { public: - explicit Refined_ZoniShiftedGyro_CulhamGeometry(double Rmax); + explicit Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CulhamGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; }; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h index 0c960ade..134ba8f1 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h @@ -8,13 +8,14 @@ class Refined_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - explicit Refined_ZoniShiftedGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, + explicit Refined_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~Refined_ZoniShiftedGyro_CzarnyGeometry() = default; double rhs_f(double r, double 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; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h index d09ef591..e3b2f016 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h @@ -8,12 +8,13 @@ class Refined_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - explicit Refined_ZoniShiftedGyro_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta); + explicit Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~Refined_ZoniShiftedGyro_ShafranovGeometry() = default; double rhs_f(double r, double theta) const override; private: + PolarGrid const& grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/src/ConfigParser/select_test_case.cpp b/src/ConfigParser/select_test_case.cpp index 821afe02..a8103935 100644 --- a/src/ConfigParser/select_test_case.cpp +++ b/src/ConfigParser/select_test_case.cpp @@ -177,15 +177,15 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -194,10 +194,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -206,10 +206,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -224,17 +224,17 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -243,10 +243,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -256,11 +256,11 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (beta_type) { case BetaCoeff::ZERO: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -275,16 +275,16 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -293,10 +293,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -305,11 +305,11 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -332,15 +332,15 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -349,10 +349,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -361,10 +361,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -379,17 +379,17 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -398,10 +398,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -411,11 +411,11 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (beta_type) { case BetaCoeff::ZERO: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -430,16 +430,16 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -448,10 +448,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -460,11 +460,11 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -487,15 +487,15 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -504,10 +504,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -516,10 +516,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -534,16 +534,16 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -552,10 +552,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -564,11 +564,11 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -583,15 +583,15 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (alpha_type) { case AlphaCoeff::POISSON: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -600,10 +600,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -612,10 +612,10 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -631,7 +631,7 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta for configuration.\n"); @@ -656,7 +656,7 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta for configuration.\n"); @@ -674,7 +674,7 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble switch (beta_type) { case BetaCoeff::ALPHA_INVERSE: source_term_ = - std::make_unique(Rmax, kappa_eps, delta_e); + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta for configuration.\n"); @@ -691,7 +691,7 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta for configuration.\n"); @@ -708,7 +708,7 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(Rmax); + source_term_ = std::make_unique(grid_, Rmax); break; default: throw std::runtime_error("Invalid beta for configuration.\n"); @@ -727,4 +727,4 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble default: throw std::runtime_error("Invalid problem.\n"); } -} \ No newline at end of file +} From be3443c2676963fad2766a0855da0f01ea87d999 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 16:35:20 +0100 Subject: [PATCH 03/15] Use operator() instead of rhs_f function to make it interoperable with Kokkos Vector --- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_CircularGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h | 2 +- .../cartesianR2_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_CircularGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h | 2 +- .../cartesianR6_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Zoni_CircularGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- include/InputFunctions/sourceTerm.h | 2 +- src/GMGPolar/build_rhs_f.cpp | 4 ++-- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR2_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../cartesianR2_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR6_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../cartesianR6_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp | 2 +- .../polarR6_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../polarR6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Zoni_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- 138 files changed, 139 insertions(+), 139 deletions(-) diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h index bcc0b05e..8a6fd95a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h @@ -10,7 +10,7 @@ class CartesianR2_Poisson_CircularGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h index b85ce808..a213a51e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Poisson_CzarnyGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h index d69c15fa..efa8c92c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Poisson_ShafranovGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h index 318ce7cd..6dbf3590 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_SonnendruckerGyro_CircularGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h index 0865ec40..a5c5b628 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_SonnendruckerGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h index 2da6c5fa..88e7c1e8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_SonnendruckerGyro_ShafranovGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h index 4b59f4d9..91a75bff 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Sonnendrucker_CircularGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h index 6b9de7c9..28bb4939 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_Sonnendrucker_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_Sonnendrucker_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h index d32b5cf5..922adbaf 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Sonnendrucker_ShafranovGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h index 62b03177..224cf3bc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniGyro_CircularGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h index 9246a4bf..8116d1a7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_ZoniGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h index cbad7475..f7163311 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniGyro_ShafranovGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h index 83a215e9..8bced083 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniShiftedGyro_CircularGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h index a5c740f7..f14dc501 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_ZoniShiftedGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h index 4e392342..e1fee350 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h index de4b1d17..fef1d427 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniShifted_CircularGeometry : public SourceTerm 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()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h index 95697245..2b46b5af 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniShifted_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_ZoniShifted_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h index 1604964a..66f92f32 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniShifted_ShafranovGeometry : public SourceTerm explicit CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_ZoniShifted_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h index b19b1ed2..410b3b23 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Zoni_CircularGeometry : public SourceTerm explicit CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Zoni_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h index 498947d2..7f107492 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Zoni_CzarnyGeometry : public SourceTerm explicit CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_Zoni_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h index 4f12f636..c7ce8b60 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Zoni_ShafranovGeometry : public SourceTerm explicit CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_Zoni_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h index f032ed5c..75f5637d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Poisson_CircularGeometry : public SourceTerm explicit CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Poisson_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h index fea67027..5df61255 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Poisson_CzarnyGeometry : public SourceTerm explicit CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Poisson_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h index a5f9ef00..7737111a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Poisson_ShafranovGeometry : public SourceTerm explicit CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Poisson_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h index b48d52d1..986ae717 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_SonnendruckerGyro_CircularGeometry : public SourceTerm explicit CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_SonnendruckerGyro_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h index 9f4a37af..12d42634 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_SonnendruckerGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h index 348027c1..cb99c186 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_SonnendruckerGyro_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h index fc06d1b8..d29c443d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Sonnendrucker_CircularGeometry : public SourceTerm explicit CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Sonnendrucker_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h index 778279b7..d196544a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_Sonnendrucker_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_Sonnendrucker_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h index 0f4c475c..e4177c8f 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Sonnendrucker_ShafranovGeometry : public SourceTerm explicit CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Sonnendrucker_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h index 79359a24..64851566 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniGyro_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniGyro_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h index efe853ba..17838023 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_ZoniGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h index 4afbda57..616b0885 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniGyro_ShafranovGeometry : public SourceTerm explicit CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniGyro_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h index 0c962466..8ecc78a9 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShiftedGyro_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h index c6e99dc3..0f7e006f 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_ZoniShiftedGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h index 0796c002..81a2b2fc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniShiftedGyro_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h index 4ff7ae75..a4fcfddc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniShifted_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShifted_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h index 48d2a2bf..6c07242e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniShifted_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_ZoniShifted_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h index 6e92740c..616a801a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniShifted_ShafranovGeometry : public SourceTerm explicit CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniShifted_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h index 7913fe49..061b2b77 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Zoni_CircularGeometry : public SourceTerm explicit CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Zoni_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h index d7062836..685345e8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Zoni_CzarnyGeometry : public SourceTerm explicit CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Zoni_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h index 8e1874a7..39cc8fd0 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Zoni_ShafranovGeometry : public SourceTerm explicit CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Zoni_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h index a3c2fab3..5bad9615 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Poisson_CircularGeometry : public SourceTerm explicit PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Poisson_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h index 94dbc971..d0e385a1 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Poisson_CzarnyGeometry : public SourceTerm explicit PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Poisson_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h index f3901d30..73b0e3a6 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Poisson_ShafranovGeometry : public SourceTerm explicit PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Poisson_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h index 9d184468..80e97728 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_SonnendruckerGyro_CircularGeometry : public SourceTerm explicit PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_SonnendruckerGyro_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h index 13808633..e2a65406 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class PolarR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_SonnendruckerGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h index 465750c8..57da5e5f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_SonnendruckerGyro_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h index 599f3733..9bdb1140 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Sonnendrucker_CircularGeometry : public SourceTerm explicit PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Sonnendrucker_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h index 943fe307..0cda7f76 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ class PolarR6_Sonnendrucker_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_Sonnendrucker_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h index 78e211b4..4ecc8528 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Sonnendrucker_ShafranovGeometry : public SourceTerm explicit PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Sonnendrucker_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h index 7c8de68a..5c086f71 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniGyro_CircularGeometry : public SourceTerm explicit PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniGyro_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h index ae808a09..45a19a44 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniGyro_CzarnyGeometry : public SourceTerm explicit PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h index 00006f1c..08561564 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniGyro_ShafranovGeometry : public SourceTerm explicit PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniGyro_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h index aa872bc8..d1ceb4a4 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h index 7cf8cf1f..d9a6cb85 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShiftedGyro_CulhamGeometry : public SourceTerm explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CulhamGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h index 8bf8a14c..7ba7b0fc 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class PolarR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_ZoniShiftedGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h index 1375995d..5cc2f3b7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniShiftedGyro_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h index 224aa021..8ac2ba9a 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShifted_CircularGeometry : public SourceTerm explicit PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShifted_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h index 76662cf7..c0654e4b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShifted_CzarnyGeometry : public SourceTerm explicit PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniShifted_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h index aedf7b88..8805ffc8 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShifted_ShafranovGeometry : public SourceTerm explicit PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniShifted_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h index 4e5babed..66a84052 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Zoni_CircularGeometry : public SourceTerm explicit PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Zoni_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h index f2a4c412..361204b1 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Zoni_CzarnyGeometry : public SourceTerm explicit PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Zoni_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h index 8c8518f9..607edad0 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Zoni_ShafranovGeometry : public SourceTerm explicit PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Zoni_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h index f19e7741..5050062e 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class Refined_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CircularGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h index 241b3726..46d4df33 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h @@ -11,7 +11,7 @@ class Refined_ZoniShiftedGyro_CulhamGeometry : public SourceTerm explicit Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CulhamGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h index 134ba8f1..8c7e56bf 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class Refined_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~Refined_ZoniShiftedGyro_CzarnyGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h index e3b2f016..70cc9f82 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class Refined_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm explicit Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~Refined_ZoniShiftedGyro_ShafranovGeometry() = default; - double rhs_f(double r, double theta) const override; + double operator()(double r, double theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/sourceTerm.h b/include/InputFunctions/sourceTerm.h index 5d005d9e..382cada6 100644 --- a/include/InputFunctions/sourceTerm.h +++ b/include/InputFunctions/sourceTerm.h @@ -6,5 +6,5 @@ class SourceTerm SourceTerm() = default; virtual ~SourceTerm() = default; - virtual double rhs_f(double r, double theta) const = 0; + virtual double operator()(double r, double theta) const = 0; }; diff --git a/src/GMGPolar/build_rhs_f.cpp b/src/GMGPolar/build_rhs_f.cpp index c97b640e..3ae9d749 100644 --- a/src/GMGPolar/build_rhs_f.cpp +++ b/src/GMGPolar/build_rhs_f.cpp @@ -18,7 +18,7 @@ void GMGPolar::build_rhs_f(const Level& level, Vector rhs_f, const Bound double theta = grid.theta(i_theta); if ((0 < i_r && i_r < grid.nr() - 1) || (i_r == 0 && !DirBC_Interior_)) { - rhs_f[grid.index(i_r, i_theta)] = source_term.rhs_f(r, theta); + rhs_f[grid.index(i_r, i_theta)] = source_term(r, theta); } else if (i_r == 0 && DirBC_Interior_) { rhs_f[grid.index(i_r, i_theta)] = boundary_conditions.u_D_Interior(r, theta); @@ -39,7 +39,7 @@ void GMGPolar::build_rhs_f(const Level& level, Vector rhs_f, const Bound for (int i_r = grid.numberSmootherCircles(); i_r < grid.nr(); i_r++) { double r = grid.radius(i_r); if ((0 < i_r && i_r < grid.nr() - 1) || (i_r == 0 && !DirBC_Interior_)) { - rhs_f[grid.index(i_r, i_theta)] = source_term.rhs_f(r, theta); + rhs_f[grid.index(i_r, i_theta)] = source_term(r, theta); } else if (i_r == 0 && DirBC_Interior_) { rhs_f[grid.index(i_r, i_theta)] = boundary_conditions.u_D_Interior(r, theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp index b801c850..b27f26fc 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(doubl { } -double CartesianR2_Poisson_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR2_Poisson_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp index 9a333901..5867247b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(double Rm initializeGeometry(); } -double CartesianR2_Poisson_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR2_Poisson_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp index dc353da2..7e7931b6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(dou { } -double CartesianR2_Poisson_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR2_Poisson_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp index 546a5a9f..decdf245 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_Ci { } -double CartesianR2_SonnendruckerGyro_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR2_SonnendruckerGyro_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp index ec19612b..f3e2f24a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR2_SonnendruckerGyro_CzarnyGeometry::CartesianR2_SonnendruckerGyro_Czar initializeGeometry(); } -double CartesianR2_SonnendruckerGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR2_SonnendruckerGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp index a0cdfc93..59b5ef4d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_S { } -double CartesianR2_SonnendruckerGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR2_SonnendruckerGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp index c772f1ef..4a783e0e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGe { } -double CartesianR2_Sonnendrucker_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR2_Sonnendrucker_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp index 174e9bd1..b3b57f4c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR2_Sonnendrucker_CzarnyGeometry::CartesianR2_Sonnendrucker_CzarnyGeomet initializeGeometry(); } -double CartesianR2_Sonnendrucker_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR2_Sonnendrucker_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp index c65bf4e9..c9352753 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_Shafranov { } -double CartesianR2_Sonnendrucker_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR2_Sonnendrucker_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp index cf048209..02d20215 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(dou { } -double CartesianR2_ZoniGyro_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniGyro_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp index ea66057d..04c48c6c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR2_ZoniGyro_CzarnyGeometry::CartesianR2_ZoniGyro_CzarnyGeometry(double initializeGeometry(); } -double CartesianR2_ZoniGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp index eae49e84..1af5b958 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(d { } -double CartesianR2_ZoniGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp index a95c6da1..30a4b8f6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_Circul { } -double CartesianR2_ZoniShiftedGyro_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniShiftedGyro_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp index 75de65fe..b4391545 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR2_ZoniShiftedGyro_CzarnyGeometry::CartesianR2_ZoniShiftedGyro_CzarnyGe initializeGeometry(); } -double CartesianR2_ZoniShiftedGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniShiftedGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp index c159b747..5e10f169 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_Shafr { } -double CartesianR2_ZoniShiftedGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniShiftedGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp index 1c5fb43b..5942cf4b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeomet { } -double CartesianR2_ZoniShifted_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniShifted_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp index 6a04448f..c2675869 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR2_ZoniShifted_CzarnyGeometry::CartesianR2_ZoniShifted_CzarnyGeometry(d initializeGeometry(); } -double CartesianR2_ZoniShifted_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniShifted_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp index 0b6a9753..bc5c2d5a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeom { } -double CartesianR2_ZoniShifted_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR2_ZoniShifted_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp index bfea1fa6..de5b2eeb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(double Rmax { } -double CartesianR2_Zoni_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR2_Zoni_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp index 84077fb0..3fa56e6e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(double Rmax, do initializeGeometry(); } -double CartesianR2_Zoni_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR2_Zoni_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp index 07558c05..aa3f2506 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(double Rm { } -double CartesianR2_Zoni_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR2_Zoni_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp index 648715ea..1e5b1247 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(doubl { } -double CartesianR6_Poisson_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR6_Poisson_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp index b9df6250..37e8f767 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(double Rm initializeGeometry(); } -double CartesianR6_Poisson_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR6_Poisson_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp index 4bf8ab26..5882dacc 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(dou { } -double CartesianR6_Poisson_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR6_Poisson_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp index 3883e3b3..474db79a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_Ci { } -double CartesianR6_SonnendruckerGyro_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR6_SonnendruckerGyro_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp index 0098f7c0..f64bed0e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR6_SonnendruckerGyro_CzarnyGeometry::CartesianR6_SonnendruckerGyro_Czar initializeGeometry(); } -double CartesianR6_SonnendruckerGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR6_SonnendruckerGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp index aab47f60..559d5165 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_S { } -double CartesianR6_SonnendruckerGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR6_SonnendruckerGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp index 6302dcff..939f78a3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGe { } -double CartesianR6_Sonnendrucker_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR6_Sonnendrucker_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp index ad40bc2e..c3993d7c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR6_Sonnendrucker_CzarnyGeometry::CartesianR6_Sonnendrucker_CzarnyGeomet initializeGeometry(); } -double CartesianR6_Sonnendrucker_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR6_Sonnendrucker_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp index 30676c8e..508565ad 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_Shafranov { } -double CartesianR6_Sonnendrucker_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR6_Sonnendrucker_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp index cf3b22fb..03d0e3be 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(dou { } -double CartesianR6_ZoniGyro_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniGyro_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp index a0520cd9..79909f47 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR6_ZoniGyro_CzarnyGeometry::CartesianR6_ZoniGyro_CzarnyGeometry(double initializeGeometry(); } -double CartesianR6_ZoniGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp index df58c6f3..b96c9b8d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(d { } -double CartesianR6_ZoniGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp index 3c627cd3..678c1529 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_Circul { } -double CartesianR6_ZoniShiftedGyro_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniShiftedGyro_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp index fb6bc182..661554cf 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR6_ZoniShiftedGyro_CzarnyGeometry::CartesianR6_ZoniShiftedGyro_CzarnyGe initializeGeometry(); } -double CartesianR6_ZoniShiftedGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniShiftedGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 1ad8e174..877feece 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_Shafr { } -double CartesianR6_ZoniShiftedGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniShiftedGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp index f5cae1e1..3b30e0b9 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeomet { } -double CartesianR6_ZoniShifted_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniShifted_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp index 40d4befc..ad8c514d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR6_ZoniShifted_CzarnyGeometry::CartesianR6_ZoniShifted_CzarnyGeometry(d initializeGeometry(); } -double CartesianR6_ZoniShifted_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniShifted_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp index 5ad406d0..4f907c37 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeom { } -double CartesianR6_ZoniShifted_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR6_ZoniShifted_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp index 4c44d58a..9818197f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(double Rmax { } -double CartesianR6_Zoni_CircularGeometry::rhs_f(double r, double theta) const +double CartesianR6_Zoni_CircularGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp index f546a226..8665d08b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(double Rmax, do initializeGeometry(); } -double CartesianR6_Zoni_CzarnyGeometry::rhs_f(double r, double theta) const +double CartesianR6_Zoni_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp index a1d85e55..7318a1f3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(double Rm { } -double CartesianR6_Zoni_ShafranovGeometry::rhs_f(double r, double theta) const +double CartesianR6_Zoni_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp index 81abe5f8..646da0c7 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(double Rmax) { } -double PolarR6_Poisson_CircularGeometry::rhs_f(double r, double theta) const +double PolarR6_Poisson_CircularGeometry::operator()(double r, double theta) const { return (-pow((r / Rmax), 4.0)) * (14.7456 * (r / Rmax) * pow(((r / Rmax) - 1.0), 5.0) * cos(11.0 * theta) + 1.0 * (r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp index f882e349..04d0834f 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(double Rmax, doub initializeGeometry(); } -double PolarR6_Poisson_CzarnyGeometry::rhs_f(double r, double theta) const +double PolarR6_Poisson_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp index c23acfa2..e085c819 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(double Rmax { } -double PolarR6_Poisson_ShafranovGeometry::rhs_f(double r, double theta) const +double PolarR6_Poisson_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp index 35738e29..7289bd3e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGe { } -double PolarR6_SonnendruckerGyro_CircularGeometry::rhs_f(double r, double theta) const +double PolarR6_SonnendruckerGyro_CircularGeometry::operator()(double r, double theta) const { return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * cos(11.0 * theta) / (0.452961672473868 - 0.348432055749129 * atan(14.4444444444444 * (r / Rmax) - 11.1111111111111)) - diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp index 348164e7..3e4bb5a3 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ PolarR6_SonnendruckerGyro_CzarnyGeometry::PolarR6_SonnendruckerGyro_CzarnyGeomet initializeGeometry(); } -double PolarR6_SonnendruckerGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double PolarR6_SonnendruckerGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp index a47509da..2c5e6e9b 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_Shafranov { } -double PolarR6_SonnendruckerGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double PolarR6_SonnendruckerGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp index da832fc0..4dc01de2 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(d { } -double PolarR6_Sonnendrucker_CircularGeometry::rhs_f(double r, double theta) const +double PolarR6_Sonnendrucker_CircularGeometry::operator()(double r, double theta) const { return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp index 9500fa43..6c874419 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ PolarR6_Sonnendrucker_CzarnyGeometry::PolarR6_Sonnendrucker_CzarnyGeometry(doubl initializeGeometry(); } -double PolarR6_Sonnendrucker_CzarnyGeometry::rhs_f(double r, double theta) const +double PolarR6_Sonnendrucker_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp index 79d07cac..dc6dc064 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry { } -double PolarR6_Sonnendrucker_ShafranovGeometry::rhs_f(double r, double theta) const +double PolarR6_Sonnendrucker_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp index 05744358..8641ddc7 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(double Rmax { } -double PolarR6_ZoniGyro_CircularGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniGyro_CircularGeometry::operator()(double r, double theta) const { return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * exp(tanh(10.0 * (r / Rmax) - 5.0)) * cos(11.0 * theta) - diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp index c006ad4f..1495e99c 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(double Rmax, do initializeGeometry(); } -double PolarR6_ZoniGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp index 04201499..7cbcc1a2 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(double Rm { } -double PolarR6_ZoniGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp index 84d3dbaa..bc0e1702 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeomet { } -double PolarR6_ZoniShiftedGyro_CircularGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniShiftedGyro_CircularGeometry::operator()(double r, double theta) const { return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * exp(tanh(20.0 * (r / Rmax) - 14.0)) * cos(11.0 * theta) - diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp index d79abacf..8636f220 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(d { } -double PolarR6_ZoniShiftedGyro_CulhamGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniShiftedGyro_CulhamGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 798f3ff9..afce37ae 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ PolarR6_ZoniShiftedGyro_CzarnyGeometry::PolarR6_ZoniShiftedGyro_CzarnyGeometry(d initializeGeometry(); } -double PolarR6_ZoniShiftedGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniShiftedGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp index ae718480..6624cdc1 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeom { } -double PolarR6_ZoniShiftedGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniShiftedGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp index 27a512e7..a3ed8eca 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(doubl { } -double PolarR6_ZoniShifted_CircularGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniShifted_CircularGeometry::operator()(double r, double theta) const { return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp index 5a16d935..f15384a3 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(double Rm initializeGeometry(); } -double PolarR6_ZoniShifted_CzarnyGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniShifted_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp index 277790e0..a1f7545e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(dou { } -double PolarR6_ZoniShifted_ShafranovGeometry::rhs_f(double r, double theta) const +double PolarR6_ZoniShifted_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp index 9acc93ac..dd13c293 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(double Rmax) { } -double PolarR6_Zoni_CircularGeometry::rhs_f(double r, double theta) const +double PolarR6_Zoni_CircularGeometry::operator()(double r, double theta) const { return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp index 95a364b9..f7edc722 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(double Rmax, double inv initializeGeometry(); } -double PolarR6_Zoni_CzarnyGeometry::rhs_f(double r, double theta) const +double PolarR6_Zoni_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp index 112afc13..cf72d0d2 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp @@ -7,7 +7,7 @@ PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(double Rmax, doub { } -double PolarR6_Zoni_ShafranovGeometry::rhs_f(double r, double theta) const +double PolarR6_Zoni_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp index 47c53cde..f924498a 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeomet { } -double Refined_ZoniShiftedGyro_CircularGeometry::rhs_f(double r, double theta) const +double Refined_ZoniShiftedGyro_CircularGeometry::operator()(double r, double theta) const { return 1.0 * (((-3.33823779536505e-15) * ((r / Rmax) * (r / Rmax)) - 0.0 * (r / Rmax) - 0.0 + diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp index 0abfe8ed..1d5404ae 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp @@ -5,7 +5,7 @@ Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(d { } -double Refined_ZoniShiftedGyro_CulhamGeometry::rhs_f(double r, double theta) const +double Refined_ZoniShiftedGyro_CulhamGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp index 31831d9c..8d67fcc1 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ Refined_ZoniShiftedGyro_CzarnyGeometry::Refined_ZoniShiftedGyro_CzarnyGeometry(d initializeGeometry(); } -double Refined_ZoniShiftedGyro_CzarnyGeometry::rhs_f(double r, double theta) const +double Refined_ZoniShiftedGyro_CzarnyGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp index 8a778d3b..b838fd32 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeom { } -double Refined_ZoniShiftedGyro_ShafranovGeometry::rhs_f(double r, double theta) const +double Refined_ZoniShiftedGyro_ShafranovGeometry::operator()(double r, double theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); From 1cfd7b57d310ee04f1a9146e1b188edd79c11cb2 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 16:38:02 +0100 Subject: [PATCH 04/15] Save grid --- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp | 4 ++-- .../cartesianR2_SonnendruckerGyro_CircularGeometry.cpp | 4 ++-- .../cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR2_Sonnendrucker_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp | 4 ++-- .../cartesianR2_Sonnendrucker_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp | 4 ++-- .../cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp | 4 ++-- .../cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp | 4 ++-- .../cartesianR6_SonnendruckerGyro_CircularGeometry.cpp | 4 ++-- .../cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR6_Sonnendrucker_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp | 4 ++-- .../cartesianR6_Sonnendrucker_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp | 4 ++-- .../cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp | 4 ++-- .../cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Poisson_CircularGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp | 4 ++-- .../polarR6_SonnendruckerGyro_CircularGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp | 4 ++-- .../polarR6_SonnendruckerGyro_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Zoni_CircularGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp | 4 ++-- .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp | 4 ++-- .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp | 4 ++-- .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp | 4 ++-- .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp | 4 ++-- 68 files changed, 130 insertions(+), 130 deletions(-) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp index b27f26fc..7ea78ce6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h" -CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp index 5867247b..cc896f88 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp @@ -5,9 +5,9 @@ void CartesianR2_Poisson_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, +CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp index 7e7931b6..4c63a08d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h" -CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, +CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp index decdf245..6d913335 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h" -CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp index f3e2f24a..65f5f1d2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp @@ -7,7 +7,7 @@ void CartesianR2_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() CartesianR2_SonnendruckerGyro_CzarnyGeometry::CartesianR2_SonnendruckerGyro_CzarnyGeometry( double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp index 59b5ef4d..87497c33 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_ShafranovGeometry( double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp index 4a783e0e..7b9440ac 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h" -CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp index b3b57f4c..f75cdfa6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void CartesianR2_Sonnendrucker_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR2_Sonnendrucker_CzarnyGeometry::CartesianR2_Sonnendrucker_CzarnyGeometry(double Rmax, +CartesianR2_Sonnendrucker_CzarnyGeometry::CartesianR2_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp index c9352753..9aa9fc61 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h" -CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_ShafranovGeometry(double Rmax, +CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp index 02d20215..30f457a4 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h" -CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp index 04c48c6c..3e4ee64f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void CartesianR2_ZoniGyro_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR2_ZoniGyro_CzarnyGeometry::CartesianR2_ZoniGyro_CzarnyGeometry(double Rmax, +CartesianR2_ZoniGyro_CzarnyGeometry::CartesianR2_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp index 1af5b958..a7523176 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h" -CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, +CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp index 30a4b8f6..f1d6b215 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h" -CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp index b4391545..e2d41495 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -7,7 +7,7 @@ void CartesianR2_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() CartesianR2_ZoniShiftedGyro_CzarnyGeometry::CartesianR2_ZoniShiftedGyro_CzarnyGeometry( double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp index 5e10f169..2f7a0029 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h" -CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_ShafranovGeometry(double Rmax, +CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp index 5942cf4b..912dfc74 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h" -CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp index c2675869..c55bf9f0 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void CartesianR2_ZoniShifted_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR2_ZoniShifted_CzarnyGeometry::CartesianR2_ZoniShifted_CzarnyGeometry(double Rmax, +CartesianR2_ZoniShifted_CzarnyGeometry::CartesianR2_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp index bc5c2d5a..02b022c3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h" -CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeometry(double Rmax, +CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp index de5b2eeb..289cc089 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h" -CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp index 3fa56e6e..44280f2c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp @@ -5,9 +5,9 @@ void CartesianR2_Zoni_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, +CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp index aa3f2506..300e6d9a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h" -CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, +CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp index 1e5b1247..85e78caf 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h" -CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp index 37e8f767..d598005b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp @@ -5,9 +5,9 @@ void CartesianR6_Poisson_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, +CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp index 5882dacc..e1c41ab2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h" -CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, +CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp index 474db79a..8e6151f6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h" -CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp index f64bed0e..30396671 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -7,7 +7,7 @@ void CartesianR6_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() CartesianR6_SonnendruckerGyro_CzarnyGeometry::CartesianR6_SonnendruckerGyro_CzarnyGeometry( double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp index 559d5165..86d5f004 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_ShafranovGeometry( double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp index 939f78a3..15c71d1e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h" -CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp index c3993d7c..a888d288 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void CartesianR6_Sonnendrucker_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR6_Sonnendrucker_CzarnyGeometry::CartesianR6_Sonnendrucker_CzarnyGeometry(double Rmax, +CartesianR6_Sonnendrucker_CzarnyGeometry::CartesianR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp index 508565ad..b58b949f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h" -CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_ShafranovGeometry(double Rmax, +CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp index 03d0e3be..c331acaf 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h" -CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp index 79909f47..157d5709 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void CartesianR6_ZoniGyro_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR6_ZoniGyro_CzarnyGeometry::CartesianR6_ZoniGyro_CzarnyGeometry(double Rmax, +CartesianR6_ZoniGyro_CzarnyGeometry::CartesianR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp index b96c9b8d..f3dba70f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h" -CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, +CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp index 678c1529..34a7a94b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h" -CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 661554cf..4dcd45bc 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -7,7 +7,7 @@ void CartesianR6_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() CartesianR6_ZoniShiftedGyro_CzarnyGeometry::CartesianR6_ZoniShiftedGyro_CzarnyGeometry( double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 877feece..56c7411b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h" -CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_ShafranovGeometry(double Rmax, +CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp index 3b30e0b9..bf9b22f2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h" -CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp index ad8c514d..3882c447 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void CartesianR6_ZoniShifted_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR6_ZoniShifted_CzarnyGeometry::CartesianR6_ZoniShifted_CzarnyGeometry(double Rmax, +CartesianR6_ZoniShifted_CzarnyGeometry::CartesianR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp index 4f907c37..4f5195ae 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h" -CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeometry(double Rmax, +CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp index 9818197f..2648ffc6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h" -CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(double Rmax) - : Rmax(Rmax) +CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp index 8665d08b..0f87b8ea 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp @@ -5,9 +5,9 @@ void CartesianR6_Zoni_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, +CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp index 7318a1f3..2b59c418 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h" -CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, +CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp index 646da0c7..ddf22524 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h" -PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(double Rmax) - : Rmax(Rmax) +PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp index 04d0834f..126b26ed 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp @@ -5,9 +5,9 @@ void PolarR6_Poisson_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, +PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp index e085c819..3b259a79 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h" -PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(double Rmax, double elongation_kappa, +PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp index 7289bd3e..a8c34734 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h" -PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp index 3e4bb5a3..802dbd61 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void PolarR6_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_SonnendruckerGyro_CzarnyGeometry::PolarR6_SonnendruckerGyro_CzarnyGeometry(double Rmax, +PolarR6_SonnendruckerGyro_CzarnyGeometry::PolarR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp index 2c5e6e9b..41b7ab8c 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h" -PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_ShafranovGeometry(double Rmax, +PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp index 4dc01de2..bd5ffd7a 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h" -PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(double Rmax) - : Rmax(Rmax) +PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp index 6c874419..0a86a87e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void PolarR6_Sonnendrucker_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_Sonnendrucker_CzarnyGeometry::PolarR6_Sonnendrucker_CzarnyGeometry(double Rmax, +PolarR6_Sonnendrucker_CzarnyGeometry::PolarR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp index dc6dc064..1b1d6ca9 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h" -PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry(double Rmax, double elongation_kappa, +PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp index 8641ddc7..30da5a4a 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h" -PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp index 1495e99c..f4530cbc 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp @@ -5,9 +5,9 @@ void PolarR6_ZoniGyro_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, +PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp index 7cbcc1a2..4c8e0d15 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h" -PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(double Rmax, double elongation_kappa, +PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp index bc0e1702..7fb6279a 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h" -PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp index 8636f220..0f539798 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h" -PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(double Rmax) - : Rmax(Rmax) +PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp index afce37ae..689127a8 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void PolarR6_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_ZoniShiftedGyro_CzarnyGeometry::PolarR6_ZoniShiftedGyro_CzarnyGeometry(double Rmax, +PolarR6_ZoniShiftedGyro_CzarnyGeometry::PolarR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 6624cdc1..93222cbe 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h" -PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeometry(double Rmax, +PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp index a3ed8eca..2667239b 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h" -PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(double Rmax) - : Rmax(Rmax) +PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp index f15384a3..d7e6b110 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp @@ -5,9 +5,9 @@ void PolarR6_ZoniShifted_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, +PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp index a1f7545e..f0b9667e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h" -PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(double Rmax, double elongation_kappa, +PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp index dd13c293..1e666ddb 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h" -PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(double Rmax) - : Rmax(Rmax) +PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp index f7edc722..e66c2cda 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp @@ -5,9 +5,9 @@ void PolarR6_Zoni_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(double Rmax, double inverse_aspect_ratio_epsilon, +PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp index cf72d0d2..80b8a3d4 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h" -PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) +PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp index f924498a..5d4dc6a9 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h" -Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeometry(double Rmax) - : Rmax(Rmax) +Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp index 1d5404ae..16cf20d2 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h" -Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(double Rmax) - : Rmax(Rmax) +Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax) + : grid_(grid) , Rmax(Rmax) { } diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp index 8d67fcc1..8019f7c8 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -5,10 +5,10 @@ void Refined_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -Refined_ZoniShiftedGyro_CzarnyGeometry::Refined_ZoniShiftedGyro_CzarnyGeometry(double Rmax, +Refined_ZoniShiftedGyro_CzarnyGeometry::Refined_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp index b838fd32..2faa8016 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,9 +1,9 @@ #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h" -Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeometry(double Rmax, +Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : Rmax(Rmax) + : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { From cb87239ecf45d9f305766d7ed54b63b294f7417c Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 16:39:50 +0100 Subject: [PATCH 05/15] Pass i_r and i_theta not coordinates to SourceTerm --- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_CircularGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- include/InputFunctions/sourceTerm.h | 2 +- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Zoni_CircularGeometry.cpp | 2 +- src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- 137 files changed, 137 insertions(+), 137 deletions(-) diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h index 8a6fd95a..fe8f2e1c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h @@ -10,7 +10,7 @@ class CartesianR2_Poisson_CircularGeometry : public SourceTerm explicit CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Poisson_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h index a213a51e..5e483288 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Poisson_CzarnyGeometry : public SourceTerm explicit CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_Poisson_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h index efa8c92c..a25c5139 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Poisson_ShafranovGeometry : public SourceTerm explicit CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_Poisson_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h index 6dbf3590..7f34b6ba 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_SonnendruckerGyro_CircularGeometry : public SourceTerm explicit CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_SonnendruckerGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h index a5c5b628..7dd92fc3 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_SonnendruckerGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h index 88e7c1e8..d5e8fb3b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_SonnendruckerGyro_ShafranovGeometry : public SourceTerm explicit CartesianR2_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_SonnendruckerGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h index 91a75bff..d6cca090 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Sonnendrucker_CircularGeometry : public SourceTerm explicit CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Sonnendrucker_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h index 28bb4939..aa70823e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_Sonnendrucker_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_Sonnendrucker_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h index 922adbaf..dc07fab2 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Sonnendrucker_ShafranovGeometry : public SourceTerm explicit CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_Sonnendrucker_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h index 224cf3bc..db340ae1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniGyro_CircularGeometry : public SourceTerm explicit CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h index 8116d1a7..2b2c294a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_ZoniGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h index f7163311..23bd6727 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniGyro_ShafranovGeometry : public SourceTerm explicit CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_ZoniGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h index 8bced083..08fdd28b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniShiftedGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h index f14dc501..c281d9b8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_ZoniShiftedGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h index e1fee350..7499e0c6 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm explicit CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_ZoniShiftedGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h index fef1d427..8fa570c2 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniShifted_CircularGeometry : public SourceTerm explicit CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniShifted_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h index 2b46b5af..c0cfa431 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniShifted_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_ZoniShifted_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h index 66f92f32..21daf716 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_ZoniShifted_ShafranovGeometry : public SourceTerm explicit CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_ZoniShifted_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h index 410b3b23..816f4f36 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Zoni_CircularGeometry : public SourceTerm explicit CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Zoni_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h index 7f107492..9d0cffbe 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Zoni_CzarnyGeometry : public SourceTerm explicit CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_Zoni_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h index c7ce8b60..8fa31b26 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR2_Zoni_ShafranovGeometry : public SourceTerm explicit CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR2_Zoni_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h index 75f5637d..e2fe8fcf 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Poisson_CircularGeometry : public SourceTerm explicit CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Poisson_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h index 5df61255..d2f57aeb 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Poisson_CzarnyGeometry : public SourceTerm explicit CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Poisson_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h index 7737111a..20f167aa 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Poisson_ShafranovGeometry : public SourceTerm explicit CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Poisson_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h index 986ae717..fa07af3e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_SonnendruckerGyro_CircularGeometry : public SourceTerm explicit CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_SonnendruckerGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h index 12d42634..dba1fb60 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_SonnendruckerGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h index cb99c186..02db0584 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_SonnendruckerGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h index d29c443d..a56843af 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Sonnendrucker_CircularGeometry : public SourceTerm explicit CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Sonnendrucker_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h index d196544a..a47553ab 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_Sonnendrucker_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_Sonnendrucker_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h index e4177c8f..63590989 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Sonnendrucker_ShafranovGeometry : public SourceTerm explicit CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Sonnendrucker_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h index 64851566..d516ae69 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniGyro_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h index 17838023..bf1f280c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_ZoniGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h index 616b0885..7c70433a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniGyro_ShafranovGeometry : public SourceTerm explicit CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h index 8ecc78a9..5f3fbada 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShiftedGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h index 0f7e006f..c64621d2 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_ZoniShiftedGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h index 81a2b2fc..267bba74 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniShiftedGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h index a4fcfddc..16490f9c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniShifted_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShifted_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h index 6c07242e..9d3a1354 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniShifted_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_ZoniShifted_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h index 616a801a..de2a628b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_ZoniShifted_ShafranovGeometry : public SourceTerm explicit CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_ZoniShifted_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h index 061b2b77..d0e57ebe 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Zoni_CircularGeometry : public SourceTerm explicit CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Zoni_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h index 685345e8..0b3cd59d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Zoni_CzarnyGeometry : public SourceTerm explicit CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Zoni_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h index 39cc8fd0..527bce07 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h @@ -11,7 +11,7 @@ class CartesianR6_Zoni_ShafranovGeometry : public SourceTerm explicit CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~CartesianR6_Zoni_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h index 5bad9615..7daedd5b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Poisson_CircularGeometry : public SourceTerm explicit PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Poisson_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h index d0e385a1..9c484e20 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Poisson_CzarnyGeometry : public SourceTerm explicit PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Poisson_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h index 73b0e3a6..0d32607d 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Poisson_ShafranovGeometry : public SourceTerm explicit PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Poisson_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h index 80e97728..af84a9a1 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_SonnendruckerGyro_CircularGeometry : public SourceTerm explicit PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_SonnendruckerGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h index e2a65406..1215ecf4 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class PolarR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_SonnendruckerGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h index 57da5e5f..195c3fee 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_SonnendruckerGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h index 9bdb1140..ceae0f93 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Sonnendrucker_CircularGeometry : public SourceTerm explicit PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Sonnendrucker_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h index 0cda7f76..594c98cc 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ class PolarR6_Sonnendrucker_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_Sonnendrucker_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h index 4ecc8528..4c687716 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Sonnendrucker_ShafranovGeometry : public SourceTerm explicit PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Sonnendrucker_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h index 5c086f71..4591b7a6 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniGyro_CircularGeometry : public SourceTerm explicit PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h index 45a19a44..39c465ff 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniGyro_CzarnyGeometry : public SourceTerm explicit PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h index 08561564..22331d99 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniGyro_ShafranovGeometry : public SourceTerm explicit PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h index d1ceb4a4..14da6dda 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h index d9a6cb85..d43d71b9 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShiftedGyro_CulhamGeometry : public SourceTerm explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CulhamGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h index 7ba7b0fc..6496d1b4 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class PolarR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_ZoniShiftedGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h index 5cc2f3b7..4fa09506 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniShiftedGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h index 8ac2ba9a..a82181f0 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShifted_CircularGeometry : public SourceTerm explicit PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShifted_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h index c0654e4b..98b7ee56 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShifted_CzarnyGeometry : public SourceTerm explicit PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniShifted_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h index 8805ffc8..212ab12b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_ZoniShifted_ShafranovGeometry : public SourceTerm explicit PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_ZoniShifted_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h index 66a84052..aff4166d 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Zoni_CircularGeometry : public SourceTerm explicit PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Zoni_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h index 361204b1..5df66613 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Zoni_CzarnyGeometry : public SourceTerm explicit PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Zoni_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h index 607edad0..6676180e 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h @@ -11,7 +11,7 @@ class PolarR6_Zoni_ShafranovGeometry : public SourceTerm explicit PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~PolarR6_Zoni_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h index 5050062e..7874be95 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h @@ -11,7 +11,7 @@ class Refined_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CircularGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h index 46d4df33..bca88ec7 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h @@ -11,7 +11,7 @@ class Refined_ZoniShiftedGyro_CulhamGeometry : public SourceTerm explicit Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CulhamGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h index 8c7e56bf..bff07149 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ class Refined_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~Refined_ZoniShiftedGyro_CzarnyGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h index 70cc9f82..4468a420 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h @@ -11,7 +11,7 @@ class Refined_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm explicit Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); virtual ~Refined_ZoniShiftedGyro_ShafranovGeometry() = default; - double operator()(double r, double theta) const override; + double operator()(int i_r, int i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/sourceTerm.h b/include/InputFunctions/sourceTerm.h index 382cada6..810d1562 100644 --- a/include/InputFunctions/sourceTerm.h +++ b/include/InputFunctions/sourceTerm.h @@ -6,5 +6,5 @@ class SourceTerm SourceTerm() = default; virtual ~SourceTerm() = default; - virtual double operator()(double r, double theta) const = 0; + virtual double operator()(int i_r, int i_theta) const = 0; }; diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp index 7ea78ce6..fe53553c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(Polar { } -double CartesianR2_Poisson_CircularGeometry::operator()(double r, double theta) const +double CartesianR2_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp index cc896f88..1e66d703 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(PolarGrid initializeGeometry(); } -double CartesianR2_Poisson_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR2_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp index 4c63a08d..e3309e4f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(Pol { } -double CartesianR2_Poisson_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR2_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp index 6d913335..2dbd2d67 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_Ci { } -double CartesianR2_SonnendruckerGyro_CircularGeometry::operator()(double r, double theta) const +double CartesianR2_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp index 65f5f1d2..6d3ae628 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR2_SonnendruckerGyro_CzarnyGeometry::CartesianR2_SonnendruckerGyro_Czar initializeGeometry(); } -double CartesianR2_SonnendruckerGyro_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR2_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp index 87497c33..aab1628a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_S { } -double CartesianR2_SonnendruckerGyro_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR2_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp index 7b9440ac..36c8577f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGe { } -double CartesianR2_Sonnendrucker_CircularGeometry::operator()(double r, double theta) const +double CartesianR2_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp index f75cdfa6..24330aaa 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR2_Sonnendrucker_CzarnyGeometry::CartesianR2_Sonnendrucker_CzarnyGeomet initializeGeometry(); } -double CartesianR2_Sonnendrucker_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR2_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp index 9aa9fc61..d8a79682 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_Shafranov { } -double CartesianR2_Sonnendrucker_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR2_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp index 30f457a4..092904fe 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(Pol { } -double CartesianR2_ZoniGyro_CircularGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp index 3e4ee64f..c8d82d97 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR2_ZoniGyro_CzarnyGeometry::CartesianR2_ZoniGyro_CzarnyGeometry(PolarGr initializeGeometry(); } -double CartesianR2_ZoniGyro_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp index a7523176..75dbb2e2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(P { } -double CartesianR2_ZoniGyro_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp index f1d6b215..bca3c599 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_Circul { } -double CartesianR2_ZoniShiftedGyro_CircularGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp index e2d41495..2a50ac01 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR2_ZoniShiftedGyro_CzarnyGeometry::CartesianR2_ZoniShiftedGyro_CzarnyGe initializeGeometry(); } -double CartesianR2_ZoniShiftedGyro_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp index 2f7a0029..f13a9120 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_Shafr { } -double CartesianR2_ZoniShiftedGyro_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp index 912dfc74..46c32cce 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeomet { } -double CartesianR2_ZoniShifted_CircularGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp index c55bf9f0..899c434d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR2_ZoniShifted_CzarnyGeometry::CartesianR2_ZoniShifted_CzarnyGeometry(P initializeGeometry(); } -double CartesianR2_ZoniShifted_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp index 02b022c3..1657a707 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeom { } -double CartesianR2_ZoniShifted_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR2_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp index 289cc089..8f923b4d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(PolarGrid c { } -double CartesianR2_Zoni_CircularGeometry::operator()(double r, double theta) const +double CartesianR2_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp index 44280f2c..ca319b36 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(PolarGrid const initializeGeometry(); } -double CartesianR2_Zoni_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR2_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp index 300e6d9a..7b1f06ac 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid { } -double CartesianR2_Zoni_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR2_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp index 85e78caf..49aff205 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(Polar { } -double CartesianR6_Poisson_CircularGeometry::operator()(double r, double theta) const +double CartesianR6_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp index d598005b..89d9bcf0 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(PolarGrid initializeGeometry(); } -double CartesianR6_Poisson_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR6_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp index e1c41ab2..6901e81d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(Pol { } -double CartesianR6_Poisson_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR6_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp index 8e6151f6..2cfa40ab 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_Ci { } -double CartesianR6_SonnendruckerGyro_CircularGeometry::operator()(double r, double theta) const +double CartesianR6_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp index 30396671..ac9ae05f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR6_SonnendruckerGyro_CzarnyGeometry::CartesianR6_SonnendruckerGyro_Czar initializeGeometry(); } -double CartesianR6_SonnendruckerGyro_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR6_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp index 86d5f004..89d5296d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_S { } -double CartesianR6_SonnendruckerGyro_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR6_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp index 15c71d1e..d511593d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGe { } -double CartesianR6_Sonnendrucker_CircularGeometry::operator()(double r, double theta) const +double CartesianR6_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp index a888d288..9044b7c9 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR6_Sonnendrucker_CzarnyGeometry::CartesianR6_Sonnendrucker_CzarnyGeomet initializeGeometry(); } -double CartesianR6_Sonnendrucker_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR6_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp index b58b949f..95c1c790 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_Shafranov { } -double CartesianR6_Sonnendrucker_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR6_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp index c331acaf..e09152fa 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(Pol { } -double CartesianR6_ZoniGyro_CircularGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp index 157d5709..f640ace1 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR6_ZoniGyro_CzarnyGeometry::CartesianR6_ZoniGyro_CzarnyGeometry(PolarGr initializeGeometry(); } -double CartesianR6_ZoniGyro_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp index f3dba70f..cf5ba256 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(P { } -double CartesianR6_ZoniGyro_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp index 34a7a94b..cc370abb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_Circul { } -double CartesianR6_ZoniShiftedGyro_CircularGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 4dcd45bc..1530d813 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR6_ZoniShiftedGyro_CzarnyGeometry::CartesianR6_ZoniShiftedGyro_CzarnyGe initializeGeometry(); } -double CartesianR6_ZoniShiftedGyro_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 56c7411b..94bc2b4c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_Shafr { } -double CartesianR6_ZoniShiftedGyro_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp index bf9b22f2..55ea4ecc 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeomet { } -double CartesianR6_ZoniShifted_CircularGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp index 3882c447..cf5f6b4c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR6_ZoniShifted_CzarnyGeometry::CartesianR6_ZoniShifted_CzarnyGeometry(P initializeGeometry(); } -double CartesianR6_ZoniShifted_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp index 4f5195ae..3b7eb310 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeom { } -double CartesianR6_ZoniShifted_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR6_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp index 2648ffc6..09583c49 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp @@ -5,7 +5,7 @@ CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(PolarGrid c { } -double CartesianR6_Zoni_CircularGeometry::operator()(double r, double theta) const +double CartesianR6_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp index 0f87b8ea..1252f97c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(PolarGrid const initializeGeometry(); } -double CartesianR6_Zoni_CzarnyGeometry::operator()(double r, double theta) const +double CartesianR6_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp index 2b59c418..3a2bbfdf 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid { } -double CartesianR6_Zoni_ShafranovGeometry::operator()(double r, double theta) const +double CartesianR6_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp index ddf22524..2add2566 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(PolarGrid con { } -double PolarR6_Poisson_CircularGeometry::operator()(double r, double theta) const +double PolarR6_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const { return (-pow((r / Rmax), 4.0)) * (14.7456 * (r / Rmax) * pow(((r / Rmax) - 1.0), 5.0) * cos(11.0 * theta) + 1.0 * (r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp index 126b26ed..9b7b866e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(PolarGrid const& initializeGeometry(); } -double PolarR6_Poisson_CzarnyGeometry::operator()(double r, double theta) const +double PolarR6_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp index 3b259a79..01395ceb 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid c { } -double PolarR6_Poisson_ShafranovGeometry::operator()(double r, double theta) const +double PolarR6_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp index a8c34734..5f73c5df 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGe { } -double PolarR6_SonnendruckerGyro_CircularGeometry::operator()(double r, double theta) const +double PolarR6_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const { return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * cos(11.0 * theta) / (0.452961672473868 - 0.348432055749129 * atan(14.4444444444444 * (r / Rmax) - 11.1111111111111)) - diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp index 802dbd61..a0a93ad7 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ PolarR6_SonnendruckerGyro_CzarnyGeometry::PolarR6_SonnendruckerGyro_CzarnyGeomet initializeGeometry(); } -double PolarR6_SonnendruckerGyro_CzarnyGeometry::operator()(double r, double theta) const +double PolarR6_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp index 41b7ab8c..c1636a72 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_Shafranov { } -double PolarR6_SonnendruckerGyro_ShafranovGeometry::operator()(double r, double theta) const +double PolarR6_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp index bd5ffd7a..ca0cc1fc 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(P { } -double PolarR6_Sonnendrucker_CircularGeometry::operator()(double r, double theta) const +double PolarR6_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const { return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp index 0a86a87e..e6258166 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ PolarR6_Sonnendrucker_CzarnyGeometry::PolarR6_Sonnendrucker_CzarnyGeometry(Polar initializeGeometry(); } -double PolarR6_Sonnendrucker_CzarnyGeometry::operator()(double r, double theta) const +double PolarR6_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp index 1b1d6ca9..92289ec3 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry { } -double PolarR6_Sonnendrucker_ShafranovGeometry::operator()(double r, double theta) const +double PolarR6_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp index 30da5a4a..ed2a74bd 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(PolarGrid c { } -double PolarR6_ZoniGyro_CircularGeometry::operator()(double r, double theta) const +double PolarR6_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const { return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * exp(tanh(10.0 * (r / Rmax) - 5.0)) * cos(11.0 * theta) - diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp index f4530cbc..74f5bc14 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const initializeGeometry(); } -double PolarR6_ZoniGyro_CzarnyGeometry::operator()(double r, double theta) const +double PolarR6_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp index 4c8e0d15..fd7b0781 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid { } -double PolarR6_ZoniGyro_ShafranovGeometry::operator()(double r, double theta) const +double PolarR6_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp index 7fb6279a..0798124e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeomet { } -double PolarR6_ZoniShiftedGyro_CircularGeometry::operator()(double r, double theta) const +double PolarR6_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const { return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * exp(tanh(20.0 * (r / Rmax) - 14.0)) * cos(11.0 * theta) - diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp index 0f539798..4718385f 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(P { } -double PolarR6_ZoniShiftedGyro_CulhamGeometry::operator()(double r, double theta) const +double PolarR6_ZoniShiftedGyro_CulhamGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 689127a8..bbb04da0 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ PolarR6_ZoniShiftedGyro_CzarnyGeometry::PolarR6_ZoniShiftedGyro_CzarnyGeometry(P initializeGeometry(); } -double PolarR6_ZoniShiftedGyro_CzarnyGeometry::operator()(double r, double theta) const +double PolarR6_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 93222cbe..be41ddc4 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeom { } -double PolarR6_ZoniShiftedGyro_ShafranovGeometry::operator()(double r, double theta) const +double PolarR6_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp index 2667239b..6a3e19f5 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(Polar { } -double PolarR6_ZoniShifted_CircularGeometry::operator()(double r, double theta) const +double PolarR6_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const { return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp index d7e6b110..66764f7b 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid initializeGeometry(); } -double PolarR6_ZoniShifted_CzarnyGeometry::operator()(double r, double theta) const +double PolarR6_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp index f0b9667e..ae3eb0a9 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp @@ -8,7 +8,7 @@ PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(Pol { } -double PolarR6_ZoniShifted_ShafranovGeometry::operator()(double r, double theta) const +double PolarR6_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp index 1e666ddb..35e0abbe 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp @@ -5,7 +5,7 @@ PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(PolarGrid const& gr { } -double PolarR6_Zoni_CircularGeometry::operator()(double r, double theta) const +double PolarR6_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const { return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp index e66c2cda..f8e5864b 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp @@ -14,7 +14,7 @@ PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, initializeGeometry(); } -double PolarR6_Zoni_CzarnyGeometry::operator()(double r, double theta) const +double PolarR6_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp index 80b8a3d4..a10edd92 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp @@ -7,7 +7,7 @@ PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& { } -double PolarR6_Zoni_ShafranovGeometry::operator()(double r, double theta) const +double PolarR6_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp index 5d4dc6a9..608ef5e4 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp @@ -5,7 +5,7 @@ Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeomet { } -double Refined_ZoniShiftedGyro_CircularGeometry::operator()(double r, double theta) const +double Refined_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const { return 1.0 * (((-3.33823779536505e-15) * ((r / Rmax) * (r / Rmax)) - 0.0 * (r / Rmax) - 0.0 + diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp index 16cf20d2..72e873d4 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp @@ -5,7 +5,7 @@ Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(P { } -double Refined_ZoniShiftedGyro_CulhamGeometry::operator()(double r, double theta) const +double Refined_ZoniShiftedGyro_CulhamGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp index 8019f7c8..ecc7ae97 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ Refined_ZoniShiftedGyro_CzarnyGeometry::Refined_ZoniShiftedGyro_CzarnyGeometry(P initializeGeometry(); } -double Refined_ZoniShiftedGyro_CzarnyGeometry::operator()(double r, double theta) const +double Refined_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp index 2faa8016..0f2d7481 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeom { } -double Refined_ZoniShiftedGyro_ShafranovGeometry::operator()(double r, double theta) const +double Refined_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); From 2a61e30a46d1917c4658a720b634925eda90ce44 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 16:46:40 +0100 Subject: [PATCH 06/15] Get r and theta from index --- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h | 4 ++-- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h | 4 ++-- .../cartesianR2_SonnendruckerGyro_CircularGeometry.h | 1 - .../cartesianR2_SonnendruckerGyro_CzarnyGeometry.h | 5 ++--- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.h | 4 ++-- .../cartesianR2_Sonnendrucker_CircularGeometry.h | 1 - .../cartesianR2_Sonnendrucker_CzarnyGeometry.h | 5 ++--- .../cartesianR2_Sonnendrucker_ShafranovGeometry.h | 4 ++-- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h | 1 - .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h | 5 ++--- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h | 4 ++-- .../cartesianR2_ZoniShiftedGyro_CircularGeometry.h | 1 - .../cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h | 5 ++--- .../cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h | 4 ++-- .../cartesianR2_ZoniShifted_CircularGeometry.h | 1 - .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h | 5 ++--- .../cartesianR2_ZoniShifted_ShafranovGeometry.h | 4 ++-- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.h | 1 - .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h | 4 ++-- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h | 4 ++-- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.h | 1 - .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h | 4 ++-- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h | 4 ++-- .../cartesianR6_SonnendruckerGyro_CircularGeometry.h | 1 - .../cartesianR6_SonnendruckerGyro_CzarnyGeometry.h | 5 ++--- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.h | 4 ++-- .../cartesianR6_Sonnendrucker_CircularGeometry.h | 1 - .../cartesianR6_Sonnendrucker_CzarnyGeometry.h | 5 ++--- .../cartesianR6_Sonnendrucker_ShafranovGeometry.h | 4 ++-- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h | 1 - .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h | 5 ++--- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h | 4 ++-- .../cartesianR6_ZoniShiftedGyro_CircularGeometry.h | 1 - .../cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h | 5 ++--- .../cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h | 4 ++-- .../cartesianR6_ZoniShifted_CircularGeometry.h | 1 - .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h | 5 ++--- .../cartesianR6_ZoniShifted_ShafranovGeometry.h | 4 ++-- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.h | 1 - .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h | 4 ++-- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h | 4 ++-- .../SourceTerms/polarR6_Poisson_CircularGeometry.h | 1 - .../SourceTerms/polarR6_Poisson_CzarnyGeometry.h | 4 ++-- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.h | 4 ++-- .../polarR6_SonnendruckerGyro_CircularGeometry.h | 1 - .../polarR6_SonnendruckerGyro_CzarnyGeometry.h | 5 ++--- .../polarR6_SonnendruckerGyro_ShafranovGeometry.h | 4 ++-- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h | 1 - .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h | 5 ++--- .../polarR6_Sonnendrucker_ShafranovGeometry.h | 4 ++-- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.h | 1 - .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h | 4 ++-- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h | 4 ++-- .../polarR6_ZoniShiftedGyro_CircularGeometry.h | 1 - .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h | 1 - .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h | 5 ++--- .../polarR6_ZoniShiftedGyro_ShafranovGeometry.h | 4 ++-- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.h | 1 - .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h | 4 ++-- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h | 4 ++-- .../SourceTerms/polarR6_Zoni_CircularGeometry.h | 1 - .../SourceTerms/polarR6_Zoni_CzarnyGeometry.h | 4 ++-- .../SourceTerms/polarR6_Zoni_ShafranovGeometry.h | 4 ++-- .../refined_ZoniShiftedGyro_CircularGeometry.h | 1 - .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h | 1 - .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h | 5 ++--- .../refined_ZoniShiftedGyro_ShafranovGeometry.h | 4 ++-- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp | 5 ++++- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp | 8 ++++++-- .../cartesianR2_Poisson_ShafranovGeometry.cpp | 8 ++++++-- .../cartesianR2_SonnendruckerGyro_CircularGeometry.cpp | 8 ++++++-- .../cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp | 5 ++++- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp | 5 ++++- .../cartesianR2_Sonnendrucker_CircularGeometry.cpp | 8 ++++++-- .../cartesianR2_Sonnendrucker_CzarnyGeometry.cpp | 5 ++++- .../cartesianR2_Sonnendrucker_ShafranovGeometry.cpp | 8 ++++++-- .../cartesianR2_ZoniGyro_CircularGeometry.cpp | 5 ++++- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp | 5 ++++- .../cartesianR2_ZoniGyro_ShafranovGeometry.cpp | 8 ++++++-- .../cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp | 8 ++++++-- .../cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp | 5 ++++- .../cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp | 8 ++++++-- .../cartesianR2_ZoniShifted_CircularGeometry.cpp | 5 ++++- .../cartesianR2_ZoniShifted_CzarnyGeometry.cpp | 5 ++++- .../cartesianR2_ZoniShifted_ShafranovGeometry.cpp | 5 ++++- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp | 5 ++++- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp | 8 ++++++-- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp | 9 ++++++--- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp | 5 ++++- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp | 8 ++++++-- .../cartesianR6_Poisson_ShafranovGeometry.cpp | 8 ++++++-- .../cartesianR6_SonnendruckerGyro_CircularGeometry.cpp | 8 ++++++-- .../cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp | 5 ++++- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp | 5 ++++- .../cartesianR6_Sonnendrucker_CircularGeometry.cpp | 8 ++++++-- .../cartesianR6_Sonnendrucker_CzarnyGeometry.cpp | 5 ++++- .../cartesianR6_Sonnendrucker_ShafranovGeometry.cpp | 8 ++++++-- .../cartesianR6_ZoniGyro_CircularGeometry.cpp | 5 ++++- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp | 5 ++++- .../cartesianR6_ZoniGyro_ShafranovGeometry.cpp | 8 ++++++-- .../cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp | 8 ++++++-- .../cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 5 ++++- .../cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 8 ++++++-- .../cartesianR6_ZoniShifted_CircularGeometry.cpp | 5 ++++- .../cartesianR6_ZoniShifted_CzarnyGeometry.cpp | 5 ++++- .../cartesianR6_ZoniShifted_ShafranovGeometry.cpp | 5 ++++- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp | 5 ++++- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp | 8 ++++++-- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp | 9 ++++++--- .../SourceTerms/polarR6_Poisson_CircularGeometry.cpp | 5 ++++- .../SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp | 8 ++++++-- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp | 9 ++++++--- .../polarR6_SonnendruckerGyro_CircularGeometry.cpp | 8 ++++++-- .../polarR6_SonnendruckerGyro_CzarnyGeometry.cpp | 5 ++++- .../polarR6_SonnendruckerGyro_ShafranovGeometry.cpp | 8 ++++++-- .../polarR6_Sonnendrucker_CircularGeometry.cpp | 5 ++++- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp | 5 ++++- .../polarR6_Sonnendrucker_ShafranovGeometry.cpp | 8 ++++++-- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp | 5 ++++- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp | 8 ++++++-- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp | 9 ++++++--- .../polarR6_ZoniShiftedGyro_CircularGeometry.cpp | 5 ++++- .../polarR6_ZoniShiftedGyro_CulhamGeometry.cpp | 5 ++++- .../polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 5 ++++- .../polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 5 ++++- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp | 5 ++++- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp | 8 ++++++-- .../polarR6_ZoniShifted_ShafranovGeometry.cpp | 8 ++++++-- .../SourceTerms/polarR6_Zoni_CircularGeometry.cpp | 5 ++++- .../SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp | 9 ++++++--- .../SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp | 8 ++++++-- .../refined_ZoniShiftedGyro_CircularGeometry.cpp | 5 ++++- .../refined_ZoniShiftedGyro_CulhamGeometry.cpp | 5 ++++- .../refined_ZoniShiftedGyro_CzarnyGeometry.cpp | 5 ++++- .../refined_ZoniShiftedGyro_ShafranovGeometry.cpp | 5 ++++- 135 files changed, 422 insertions(+), 229 deletions(-) diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h index 5e483288..2791efb0 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_Poisson_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h index a25c5139..6523e813 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_Poisson_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h index 7f34b6ba..c51b90bd 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR2_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_SonnendruckerGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h index 7dd92fc3..2eb7cc1e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR2_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR2_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h index d5e8fb3b..ccd951af 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR2_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h index d6cca090..2631d62d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR2_Sonnendrucker_CircularGeometry : public SourceTerm { public: - explicit CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Sonnendrucker_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h index aa70823e..fa55b3c1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR2_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR2_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h index dc07fab2..c90c528c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h index db340ae1..eeeda7e7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR2_ZoniGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h index 2b2c294a..d5ea611c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR2_ZoniGyro_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR2_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h index 23bd6727..1f8243d4 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h index 08fdd28b..f1cfc6e5 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR2_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniShiftedGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h index c281d9b8..0744f107 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR2_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR2_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h index 7499e0c6..16c43f76 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h index 8fa570c2..1f03af21 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR2_ZoniShifted_CircularGeometry : public SourceTerm { public: - explicit CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniShifted_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h index c0cfa431..9e53428b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR2_ZoniShifted_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR2_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, 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 operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h index 21daf716..be1d0cda 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~CartesianR2_ZoniShifted_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h index 816f4f36..87f7ca87 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR2_Zoni_CircularGeometry : public SourceTerm { public: - explicit CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Zoni_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h index 9d0cffbe..33315e54 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_Zoni_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, + double ellipticity_e); virtual ~CartesianR2_Zoni_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h index 8fa31b26..b694cf27 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR2_Zoni_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~CartesianR2_Zoni_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h index e2fe8fcf..acb5a9bc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR6_Poisson_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Poisson_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h index d2f57aeb..1323d6f0 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_Poisson_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, + double ellipticity_e); virtual ~CartesianR6_Poisson_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h index 20f167aa..7930c02b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_Poisson_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~CartesianR6_Poisson_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h index fa07af3e..6883a525 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR6_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_SonnendruckerGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h index dba1fb60..44b9ac66 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit CartesianR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_SonnendruckerGyro_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h index 02db0584..ea8f0d63 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta); virtual ~CartesianR6_SonnendruckerGyro_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h index a56843af..e404e70b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR6_Sonnendrucker_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Sonnendrucker_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h index a47553ab..548c61b6 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR6_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit CartesianR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Sonnendrucker_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h index 63590989..e2431c2e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~CartesianR6_Sonnendrucker_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h index d516ae69..4e7a17c6 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR6_ZoniGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h index bf1f280c..77c5ef1d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR6_ZoniGyro_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit CartesianR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniGyro_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h index 7c70433a..1f88232a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~CartesianR6_ZoniGyro_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h index 5f3fbada..2594c9c0 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShiftedGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h index c64621d2..4e2a95ad 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit CartesianR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniShiftedGyro_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h index 267bba74..2d3f5d44 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~CartesianR6_ZoniShiftedGyro_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h index 16490f9c..b516abe1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR6_ZoniShifted_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShifted_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h index 9d3a1354..a25e5e3c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h @@ -7,9 +7,8 @@ class CartesianR6_ZoniShifted_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit CartesianR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniShifted_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h index de2a628b..a0bd4813 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~CartesianR6_ZoniShifted_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h index d0e57ebe..ff3ac3c4 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h @@ -7,7 +7,6 @@ class CartesianR6_Zoni_CircularGeometry : public SourceTerm { public: - explicit CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Zoni_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h index 0b3cd59d..59a3ae2a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_Zoni_CzarnyGeometry : public SourceTerm { public: - - explicit CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, + double ellipticity_e); virtual ~CartesianR6_Zoni_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h index 527bce07..6f418620 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h @@ -7,8 +7,8 @@ class CartesianR6_Zoni_ShafranovGeometry : public SourceTerm { public: - - explicit CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~CartesianR6_Zoni_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h index 7daedd5b..71e3795a 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h @@ -7,7 +7,6 @@ class PolarR6_Poisson_CircularGeometry : public SourceTerm { public: - explicit PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Poisson_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h index 9c484e20..7de8e7e3 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h @@ -7,8 +7,8 @@ class PolarR6_Poisson_CzarnyGeometry : public SourceTerm { public: - - explicit PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, + double ellipticity_e); virtual ~PolarR6_Poisson_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h index 0d32607d..d4b5dda9 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h @@ -7,8 +7,8 @@ class PolarR6_Poisson_ShafranovGeometry : public SourceTerm { public: - - explicit PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~PolarR6_Poisson_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h index af84a9a1..ca020ad2 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class PolarR6_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: - explicit PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_SonnendruckerGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h index 1215ecf4..8d606983 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class PolarR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: - - explicit PolarR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit PolarR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_SonnendruckerGyro_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h index 195c3fee..c2686620 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class PolarR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: - - explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~PolarR6_SonnendruckerGyro_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h index ceae0f93..956fc34a 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h @@ -7,7 +7,6 @@ class PolarR6_Sonnendrucker_CircularGeometry : public SourceTerm { public: - explicit PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Sonnendrucker_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h index 594c98cc..57a8c284 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h @@ -7,9 +7,8 @@ class PolarR6_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: - - explicit PolarR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit PolarR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Sonnendrucker_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h index 4c687716..b0d44d8d 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h @@ -7,8 +7,8 @@ class PolarR6_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: - - explicit PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~PolarR6_Sonnendrucker_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h index 4591b7a6..aaddd971 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class PolarR6_ZoniGyro_CircularGeometry : public SourceTerm { public: - explicit PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h index 39c465ff..40f843be 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h @@ -7,8 +7,8 @@ class PolarR6_ZoniGyro_CzarnyGeometry : public SourceTerm { public: - - explicit PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, + double ellipticity_e); virtual ~PolarR6_ZoniGyro_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h index 22331d99..eb21e8b8 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class PolarR6_ZoniGyro_ShafranovGeometry : public SourceTerm { public: - - explicit PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~PolarR6_ZoniGyro_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h index 14da6dda..d0e9a559 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class PolarR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h index d43d71b9..4b7a3c4f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h @@ -7,7 +7,6 @@ class PolarR6_ZoniShiftedGyro_CulhamGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CulhamGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h index 6496d1b4..edb66153 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class PolarR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - - explicit PolarR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit PolarR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniShiftedGyro_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h index 4fa09506..29b30238 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class PolarR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - - explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~PolarR6_ZoniShiftedGyro_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h index a82181f0..68358d65 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h @@ -7,7 +7,6 @@ class PolarR6_ZoniShifted_CircularGeometry : public SourceTerm { public: - explicit PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShifted_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h index 98b7ee56..036712a7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h @@ -7,8 +7,8 @@ class PolarR6_ZoniShifted_CzarnyGeometry : public SourceTerm { public: - - explicit PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, + double ellipticity_e); virtual ~PolarR6_ZoniShifted_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h index 212ab12b..8c3fc9a7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h @@ -7,8 +7,8 @@ class PolarR6_ZoniShifted_ShafranovGeometry : public SourceTerm { public: - - explicit PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~PolarR6_ZoniShifted_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h index aff4166d..716e6139 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h @@ -7,7 +7,6 @@ class PolarR6_Zoni_CircularGeometry : public SourceTerm { public: - explicit PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Zoni_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h index 5df66613..463c9ee2 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h @@ -7,8 +7,8 @@ class PolarR6_Zoni_CzarnyGeometry : public SourceTerm { public: - - explicit PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); + explicit PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, + double ellipticity_e); virtual ~PolarR6_Zoni_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h index 6676180e..5706e430 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h @@ -7,8 +7,8 @@ class PolarR6_Zoni_ShafranovGeometry : public SourceTerm { public: - - explicit PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~PolarR6_Zoni_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h index 7874be95..1de0c5e2 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h @@ -7,7 +7,6 @@ class Refined_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: - explicit Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CircularGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h index bca88ec7..06d4dc50 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h @@ -7,7 +7,6 @@ class Refined_ZoniShiftedGyro_CulhamGeometry : public SourceTerm { public: - explicit Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CulhamGeometry() = default; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h index bff07149..1c185efa 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h @@ -7,9 +7,8 @@ class Refined_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: - - explicit Refined_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e); + explicit Refined_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~Refined_ZoniShiftedGyro_CzarnyGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h index 4468a420..42afd571 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h @@ -7,8 +7,8 @@ class Refined_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: - - explicit Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); + explicit Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, + double shift_delta); virtual ~Refined_ZoniShiftedGyro_ShafranovGeometry() = default; double operator()(int i_r, int i_theta) const override; diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp index fe53553c..efb0f3ca 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h" CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR2_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 8.0 * M_PI * (r / Rmax) * sin_theta * cos(2.0 * M_PI * (r / Rmax) * sin_theta) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp index 1e66d703..900b83da 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp @@ -5,9 +5,11 @@ void CartesianR2_Poisson_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, +CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +18,8 @@ CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(PolarGrid double CartesianR2_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp index e3309e4f..0725e535 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp @@ -1,8 +1,10 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h" -CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, +CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +12,8 @@ CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(Pol double CartesianR2_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-(2.0 * shift_delta * (r / Rmax) * (elongation_kappa - 1.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp index 2dbd2d67..99fddac3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp @@ -1,12 +1,16 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h" -CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) +CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, + double Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR2_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (1.0 - (r / Rmax) * (r / Rmax)) * sin(2.0 * M_PI * (r / Rmax) * sin_theta) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp index 6d3ae628..b960627e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp @@ -7,7 +7,8 @@ void CartesianR2_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() CartesianR2_SonnendruckerGyro_CzarnyGeometry::CartesianR2_SonnendruckerGyro_CzarnyGeometry( double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +17,8 @@ CartesianR2_SonnendruckerGyro_CzarnyGeometry::CartesianR2_SonnendruckerGyro_Czar double CartesianR2_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp index aab1628a..062148ab 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -2,7 +2,8 @@ CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_ShafranovGeometry( double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +11,8 @@ CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_S double CartesianR2_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (1.0 - (r / Rmax) * (r / Rmax)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp index 36c8577f..72c38e00 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp @@ -1,12 +1,16 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h" -CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) +CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, + double Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR2_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-((r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp index 24330aaa..4b947c42 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void CartesianR2_Sonnendrucker_CzarnyGeometry::initializeGeometry() CartesianR2_Sonnendrucker_CzarnyGeometry::CartesianR2_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ CartesianR2_Sonnendrucker_CzarnyGeometry::CartesianR2_Sonnendrucker_CzarnyGeomet double CartesianR2_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp index d8a79682..24787933 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp @@ -1,9 +1,11 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h" -CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, +CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, + double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +13,8 @@ CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_Shafranov double CartesianR2_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-(2.0 * shift_delta * (r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp index 092904fe..ed63e4dd 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h" CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR2_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (1.0 - (r / Rmax) * (r / Rmax)) * exp(tanh(10.0 * (r / Rmax) - 5.0)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp index c8d82d97..64d91007 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void CartesianR2_ZoniGyro_CzarnyGeometry::initializeGeometry() CartesianR2_ZoniGyro_CzarnyGeometry::CartesianR2_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ CartesianR2_ZoniGyro_CzarnyGeometry::CartesianR2_ZoniGyro_CzarnyGeometry(PolarGr double CartesianR2_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp index 75dbb2e2..fd687c4c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp @@ -1,8 +1,10 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h" -CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, +CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +12,8 @@ CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(P double CartesianR2_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (1.0 - (r / Rmax) * (r / Rmax)) * exp(tanh(10.0 * (r / Rmax) - 5.0)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp index bca3c599..7031b0be 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,12 +1,16 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h" -CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) +CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, + double Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR2_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (1.0 - (r / Rmax) * (r / Rmax)) * exp(tanh(20.0 * (r / Rmax) - 14.0)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp index 2a50ac01..89f870c5 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -7,7 +7,8 @@ void CartesianR2_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() CartesianR2_ZoniShiftedGyro_CzarnyGeometry::CartesianR2_ZoniShiftedGyro_CzarnyGeometry( double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +17,8 @@ CartesianR2_ZoniShiftedGyro_CzarnyGeometry::CartesianR2_ZoniShiftedGyro_CzarnyGe double CartesianR2_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp index f13a9120..d4a48508 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,9 +1,11 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h" -CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, +CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, + double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +13,8 @@ CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_Shafr double CartesianR2_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (1.0 - (r / Rmax) * (r / Rmax)) * exp(tanh(20.0 * (r / Rmax) - 14.0)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp index 46c32cce..b127d60c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h" CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR2_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-((r / Rmax) * (20.0 * pow(tanh(20.0 * (r / Rmax) - 14.0), 2.0) - 20.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp index 899c434d..78e2ed6d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void CartesianR2_ZoniShifted_CzarnyGeometry::initializeGeometry() CartesianR2_ZoniShifted_CzarnyGeometry::CartesianR2_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ CartesianR2_ZoniShifted_CzarnyGeometry::CartesianR2_ZoniShifted_CzarnyGeometry(P double CartesianR2_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp index 1657a707..0732d1a1 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp @@ -3,7 +3,8 @@ CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +12,8 @@ CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeom double CartesianR2_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-(2.0 * shift_delta * (r / Rmax) * (elongation_kappa - 1.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp index 8f923b4d..19e5ab5d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h" CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR2_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-((r / Rmax) * (10.0 * pow(tanh(10.0 * (r / Rmax) - 5.0), 2.0) - 10.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp index ca319b36..1f6f2df4 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp @@ -5,9 +5,11 @@ void CartesianR2_Zoni_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, +CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +18,8 @@ CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(PolarGrid const double CartesianR2_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp index 7b1f06ac..c12a0b7b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp @@ -1,8 +1,9 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h" -CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, - double shift_delta) - : grid_(grid) , Rmax(Rmax) +CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +11,8 @@ CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid double CartesianR2_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-(2.0 * shift_delta * (r / Rmax) * (elongation_kappa - 1.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp index 49aff205..440738b4 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h" CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR6_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-((-1.6384) * (M_PI * M_PI) * (r / Rmax) * pow(((r / Rmax) - 1.0), 6.0) * pow(((r / Rmax) + 1.0), 6.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp index 89d9bcf0..0c1fef5c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp @@ -5,9 +5,11 @@ void CartesianR6_Poisson_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, +CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +18,8 @@ CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(PolarGrid double CartesianR6_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp index 6901e81d..ffbd90bb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp @@ -1,8 +1,10 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h" -CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, +CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +12,8 @@ CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(Pol double CartesianR6_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-(2.0 * shift_delta * (r / Rmax) * (elongation_kappa - 1.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp index 2cfa40ab..41ca2b12 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp @@ -1,12 +1,16 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h" -CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) +CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, + double Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR6_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow(((r / Rmax) - 1.0), 6.0) * pow(((r / Rmax) + 1.0), 6.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp index ac9ae05f..e7f0d27c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -7,7 +7,8 @@ void CartesianR6_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() CartesianR6_SonnendruckerGyro_CzarnyGeometry::CartesianR6_SonnendruckerGyro_CzarnyGeometry( double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +17,8 @@ CartesianR6_SonnendruckerGyro_CzarnyGeometry::CartesianR6_SonnendruckerGyro_Czar double CartesianR6_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp index 89d5296d..18bb5514 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -2,7 +2,8 @@ CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_ShafranovGeometry( double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +11,8 @@ CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_S double CartesianR6_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow(((r / Rmax) - 1.0), 6.0) * pow(((r / Rmax) + 1.0), 6.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp index d511593d..8bbc8a4d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp @@ -1,12 +1,16 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h" -CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) +CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, + double Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR6_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-((r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp index 9044b7c9..d0796f1a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void CartesianR6_Sonnendrucker_CzarnyGeometry::initializeGeometry() CartesianR6_Sonnendrucker_CzarnyGeometry::CartesianR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ CartesianR6_Sonnendrucker_CzarnyGeometry::CartesianR6_Sonnendrucker_CzarnyGeomet double CartesianR6_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp index 95c1c790..48319ef7 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp @@ -1,9 +1,11 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h" -CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, +CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, + double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +13,8 @@ CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_Shafranov double CartesianR6_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-(2.0 * shift_delta * (r / Rmax) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp index e09152fa..c8ff0a37 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h" CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR6_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow(((r / Rmax) - 1.0), 6.0) * pow(((r / Rmax) + 1.0), 6.0) * exp(tanh(10.0 * (r / Rmax) - 5.0)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp index f640ace1..8b169b75 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void CartesianR6_ZoniGyro_CzarnyGeometry::initializeGeometry() CartesianR6_ZoniGyro_CzarnyGeometry::CartesianR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ CartesianR6_ZoniGyro_CzarnyGeometry::CartesianR6_ZoniGyro_CzarnyGeometry(PolarGr double CartesianR6_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp index cf5ba256..3c7d93fc 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,8 +1,10 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h" -CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, +CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +12,8 @@ CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(P double CartesianR6_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow(((r / Rmax) - 1.0), 6.0) * pow(((r / Rmax) + 1.0), 6.0) * exp(tanh(10.0 * (r / Rmax) - 5.0)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp index cc370abb..82fe10eb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,12 +1,16 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h" -CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) +CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, + double Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR6_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow(((r / Rmax) - 1.0), 6.0) * pow(((r / Rmax) + 1.0), 6.0) * exp(tanh(20.0 * (r / Rmax) - 14.0)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 1530d813..c17e94b4 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -7,7 +7,8 @@ void CartesianR6_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() CartesianR6_ZoniShiftedGyro_CzarnyGeometry::CartesianR6_ZoniShiftedGyro_CzarnyGeometry( double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +17,8 @@ CartesianR6_ZoniShiftedGyro_CzarnyGeometry::CartesianR6_ZoniShiftedGyro_CzarnyGe double CartesianR6_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 94bc2b4c..cf2eb11a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,9 +1,11 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h" -CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, +CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, + double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +13,8 @@ CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_Shafr double CartesianR6_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow(((r / Rmax) - 1.0), 6.0) * pow(((r / Rmax) + 1.0), 6.0) * exp(tanh(20.0 * (r / Rmax) - 14.0)) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp index 55ea4ecc..eb98077c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h" CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR6_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-((r / Rmax) * (20.0 * pow(tanh(20.0 * (r / Rmax) - 14.0), 2.0) - 20.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp index cf5f6b4c..c09da7e0 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void CartesianR6_ZoniShifted_CzarnyGeometry::initializeGeometry() CartesianR6_ZoniShifted_CzarnyGeometry::CartesianR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ CartesianR6_ZoniShifted_CzarnyGeometry::CartesianR6_ZoniShifted_CzarnyGeometry(P double CartesianR6_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp index 3b7eb310..471ce542 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp @@ -3,7 +3,8 @@ CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +12,8 @@ CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeom double CartesianR6_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-(2.0 * shift_delta * (r / Rmax) * (elongation_kappa - 1.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp index 09583c49..e6896fa2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h" CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double CartesianR6_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-((r / Rmax) * (10.0 * pow(tanh(10.0 * (r / Rmax) - 5.0), 2.0) - 10.0) * diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp index 1252f97c..6ba877d3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp @@ -5,9 +5,11 @@ void CartesianR6_Zoni_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, +CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +18,8 @@ CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(PolarGrid const double CartesianR6_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp index 3a2bbfdf..075d82df 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp @@ -1,8 +1,9 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h" -CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, - double shift_delta) - : grid_(grid) , Rmax(Rmax) +CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +11,8 @@ CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid double CartesianR6_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-(2.0 * shift_delta * (r / Rmax) * (elongation_kappa - 1.0) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp index 2add2566..7bf9e414 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h" PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double PolarR6_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); return (-pow((r / Rmax), 4.0)) * (14.7456 * (r / Rmax) * pow(((r / Rmax) - 1.0), 5.0) * cos(11.0 * theta) + 1.0 * (r / Rmax) * (12.288 * (r / Rmax) * pow(((r / Rmax) - 1.0), 4.0) * cos(11.0 * theta) + diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp index 9b7b866e..81900acb 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp @@ -5,9 +5,11 @@ void PolarR6_Poisson_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, +PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +18,8 @@ PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(PolarGrid const& double PolarR6_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp index 01395ceb..02966727 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp @@ -1,8 +1,9 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h" -PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, - double shift_delta) - : grid_(grid) , Rmax(Rmax) +PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +11,8 @@ PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid c double PolarR6_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-pow((r / Rmax), 4.0)) * diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp index 5f73c5df..7a7b45e2 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp @@ -1,12 +1,16 @@ #include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h" -PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) +PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, + double Rmax) + : grid_(grid) + , Rmax(Rmax) { } double PolarR6_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * cos(11.0 * theta) / (0.452961672473868 - 0.348432055749129 * atan(14.4444444444444 * (r / Rmax) - 11.1111111111111)) - pow((r / Rmax), 4.0) * diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp index a0a93ad7..789f0561 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void PolarR6_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() PolarR6_SonnendruckerGyro_CzarnyGeometry::PolarR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ PolarR6_SonnendruckerGyro_CzarnyGeometry::PolarR6_SonnendruckerGyro_CzarnyGeomet double PolarR6_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp index c1636a72..96d747b2 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,9 +1,11 @@ #include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h" -PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, +PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, + double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +13,8 @@ PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_Shafranov double PolarR6_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * cos(11.0 * theta) / diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp index ca0cc1fc..bbaaa160 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h" PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double PolarR6_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * (0.452961672473868 - 0.348432055749129 * atan(14.4444444444444 * (r / Rmax) - 11.1111111111111)) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp index e6258166..7b7b0824 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void PolarR6_Sonnendrucker_CzarnyGeometry::initializeGeometry() PolarR6_Sonnendrucker_CzarnyGeometry::PolarR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ PolarR6_Sonnendrucker_CzarnyGeometry::PolarR6_Sonnendrucker_CzarnyGeometry(Polar double PolarR6_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp index 92289ec3..81f959ff 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp @@ -1,8 +1,10 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h" -PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, +PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +12,8 @@ PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry double PolarR6_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-pow((r / Rmax), 4.0)) * diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp index ed2a74bd..f0d34b49 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h" PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double PolarR6_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * exp(tanh(10.0 * (r / Rmax) - 5.0)) * cos(11.0 * theta) - pow((r / Rmax), 4.0) * diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp index 74f5bc14..6327072e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp @@ -5,9 +5,11 @@ void PolarR6_ZoniGyro_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, +PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +18,8 @@ PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const double PolarR6_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp index fd7b0781..c4727363 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,8 +1,9 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h" -PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, - double shift_delta) - : grid_(grid) , Rmax(Rmax) +PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +11,8 @@ PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid double PolarR6_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * exp(tanh(10.0 * (r / Rmax) - 5.0)) * diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp index 0798124e..97bcbc7e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h" PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double PolarR6_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * exp(tanh(20.0 * (r / Rmax) - 14.0)) * cos(11.0 * theta) - pow((r / Rmax), 4.0) * diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp index 4718385f..349b4389 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h" PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double PolarR6_ZoniShiftedGyro_CulhamGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * cos(11.0 * theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp index bbb04da0..f0a7852a 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void PolarR6_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() PolarR6_ZoniShiftedGyro_CzarnyGeometry::PolarR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ PolarR6_ZoniShiftedGyro_CzarnyGeometry::PolarR6_ZoniShiftedGyro_CzarnyGeometry(P double PolarR6_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp index be41ddc4..35310492 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -3,7 +3,8 @@ PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +12,8 @@ PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeom double PolarR6_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 0.4096 * pow((r / Rmax), 6.0) * pow(((r / Rmax) - 1.0), 6.0) * exp(tanh(20.0 * (r / Rmax) - 14.0)) * diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp index 6a3e19f5..54c976aa 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h" PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double PolarR6_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * (12.288 * (r / Rmax) * pow(((r / Rmax) - 1.0), 4.0) * cos(11.0 * theta) + diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp index 66764f7b..d269e7b7 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp @@ -5,9 +5,11 @@ void PolarR6_ZoniShifted_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, +PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +18,8 @@ PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid double PolarR6_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp index ae3eb0a9..7dbdcad0 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp @@ -1,8 +1,10 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h" -PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, +PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -10,6 +12,8 @@ PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(Pol double PolarR6_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-pow((r / Rmax), 4.0)) * diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp index 35e0abbe..9041fc68 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h" PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double PolarR6_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); return (-pow((r / Rmax), 4.0)) * ((r / Rmax) * (12.288 * (r / Rmax) * pow(((r / Rmax) - 1.0), 4.0) * cos(11.0 * theta) + diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp index f8e5864b..c58e99f4 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp @@ -5,9 +5,10 @@ void PolarR6_Zoni_CzarnyGeometry::initializeGeometry() factor_xi = 1.0 / sqrt(1.0 - inverse_aspect_ratio_epsilon * inverse_aspect_ratio_epsilon / 4.0); } -PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, - double ellipticity_e) - : grid_(grid) , Rmax(Rmax) +PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, + double inverse_aspect_ratio_epsilon, double ellipticity_e) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -16,6 +17,8 @@ PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double PolarR6_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp index a10edd92..ab646547 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp @@ -1,7 +1,9 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h" -PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) +PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, + double elongation_kappa, double shift_delta) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -9,6 +11,8 @@ PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& double PolarR6_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return (-pow((r / Rmax), 4.0)) * diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp index 608ef5e4..f188ca2b 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h" Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double Refined_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); return 1.0 * (((-3.33823779536505e-15) * ((r / Rmax) * (r / Rmax)) - 0.0 * (r / Rmax) - 0.0 + exp((-3333.33333333333) * pow(((r / Rmax) - 0.9), 2.0))) * diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp index 72e873d4..252c21ec 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,12 +1,15 @@ #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h" Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) { } double Refined_ZoniShiftedGyro_CulhamGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return ((-3.33823779536505e-15) * ((r / Rmax) * (r / Rmax)) - 0.0 * (r / Rmax) - 0.0 + diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp index ecc7ae97..d5607750 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -8,7 +8,8 @@ void Refined_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() Refined_ZoniShiftedGyro_CzarnyGeometry::Refined_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) , ellipticity_e(ellipticity_e) { @@ -17,6 +18,8 @@ Refined_ZoniShiftedGyro_CzarnyGeometry::Refined_ZoniShiftedGyro_CzarnyGeometry(P double Refined_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); double temp = diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp index 0f2d7481..c32000d3 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -3,7 +3,8 @@ Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) - : grid_(grid) , Rmax(Rmax) + : grid_(grid) + , Rmax(Rmax) , elongation_kappa(elongation_kappa) , shift_delta(shift_delta) { @@ -11,6 +12,8 @@ Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeom double Refined_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const { + double r = grid_.radius(i_r); + double theta = grid_.theta(i_theta); double sin_theta = std::sin(theta); double cos_theta = std::cos(theta); return 1.0 * From 8939e313c3c26d4925d0b9bc5f42ce2c0ad432c1 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 16:51:25 +0100 Subject: [PATCH 07/15] Add include --- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h | 2 ++ .../cartesianR2_SonnendruckerGyro_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h | 2 ++ .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR2_Zoni_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Poisson_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h | 2 ++ .../cartesianR6_SonnendruckerGyro_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h | 2 ++ .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Zoni_CircularGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h | 2 ++ .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h | 2 ++ .../SourceTerms/polarR6_Poisson_CircularGeometry.h | 2 ++ .../InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h | 2 ++ .../SourceTerms/polarR6_Poisson_ShafranovGeometry.h | 2 ++ .../SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h | 2 ++ .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h | 2 ++ .../SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h | 2 ++ .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h | 2 ++ .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h | 2 ++ .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h | 2 ++ .../InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h | 2 ++ .../InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h | 2 ++ .../InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h | 2 ++ .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h | 2 ++ .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h | 2 ++ .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h | 2 ++ .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h | 2 ++ 68 files changed, 136 insertions(+) diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h index fe8f2e1c..ec0bcbeb 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Poisson_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h index 2791efb0..3aca0a13 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Poisson_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h index 6523e813..772f2abd 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Poisson_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h index c51b90bd..b17d9b5d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h index 2eb7cc1e..fb4c81f0 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h index ccd951af..b3663780 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h index 2631d62d..17062355 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Sonnendrucker_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h index fa55b3c1..08dffc99 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h index c90c528c..023bc973 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h index eeeda7e7..85e56d1b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h index d5ea611c..c1553b43 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h index 1f8243d4..e8d1b6fc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h index f1cfc6e5..38c68151 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h index 0744f107..61553bfa 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h index 16c43f76..92b6a016 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h index 1f03af21..83c13c76 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniShifted_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h index 9e53428b..0837b71f 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniShifted_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h index be1d0cda..e0b4f372 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_ZoniShifted_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h index 87f7ca87..6213cbcc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Zoni_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h index 33315e54..853ce353 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Zoni_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h index b694cf27..162bbb67 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR2_Zoni_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h index acb5a9bc..c450f18f 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Poisson_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h index 1323d6f0..acb41618 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Poisson_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h index 7930c02b..01ef4e2a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Poisson_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h index 6883a525..b5b7400a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h index 44b9ac66..b0f57c42 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h index ea8f0d63..9a967c90 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h index e404e70b..8b7bec79 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Sonnendrucker_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h index 548c61b6..28a25a2e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h index e2431c2e..f764697d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h index 4e7a17c6..7b26744e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h index 77c5ef1d..c56c39c3 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h index 1f88232a..db95ceef 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h index 2594c9c0..f3580110 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h index 4e2a95ad..6f032505 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h index 2d3f5d44..be801cf0 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h index b516abe1..c782d6d5 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniShifted_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h index a25e5e3c..7f282a96 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniShifted_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h index a0bd4813..9017e926 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_ZoniShifted_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h index ff3ac3c4..21f4afcc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Zoni_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h index 59a3ae2a..9ad686be 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Zoni_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h index 6f418620..53cfbeaa 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class CartesianR6_Zoni_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h index 71e3795a..2d951421 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Poisson_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h index 7de8e7e3..0bf13e7d 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Poisson_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h index d4b5dda9..571dc61e 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Poisson_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h index ca020ad2..e3592954 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_SonnendruckerGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h index 8d606983..4c9f6760 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h index c2686620..7cfb331b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h index 956fc34a..317a8ffc 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Sonnendrucker_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h index 57a8c284..eb0610c5 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Sonnendrucker_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h index b0d44d8d..36ede867 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Sonnendrucker_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h index aaddd971..c5a10eab 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h index 40f843be..0bcd9c3e 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h index eb21e8b8..30b69e92 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h index d0e9a559..b0b2114b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h index 4b7a3c4f..04d8c758 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniShiftedGyro_CulhamGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h index edb66153..bafb862b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h index 29b30238..d02e00c9 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h index 68358d65..2eea6192 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniShifted_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h index 036712a7..b65662c8 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniShifted_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h index 8c3fc9a7..a5b62249 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_ZoniShifted_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h index 716e6139..b89789d4 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Zoni_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h index 463c9ee2..ab8ac182 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Zoni_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h index 5706e430..b6bba170 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class PolarR6_Zoni_ShafranovGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h index 1de0c5e2..dda14dc3 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class Refined_ZoniShiftedGyro_CircularGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h index 06d4dc50..09bd4e52 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class Refined_ZoniShiftedGyro_CulhamGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h index 1c185efa..5a80ab01 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class Refined_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm { public: diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h index 42afd571..719d0fc2 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h @@ -4,6 +4,8 @@ #include "../sourceTerm.h" +#include "../../PolarGrid/polargrid.h" + class Refined_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm { public: From de150d07931950c138572c162fd3466774302d55 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 16:54:31 +0100 Subject: [PATCH 08/15] Missing arguments --- .../cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp index b960627e..06bea17d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ void CartesianR2_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() } CartesianR2_SonnendruckerGyro_CzarnyGeometry::CartesianR2_SonnendruckerGyro_CzarnyGeometry( - double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) + PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp index 062148ab..a72dfc1e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h" CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_ShafranovGeometry( - double Rmax, double elongation_kappa, double shift_delta) + PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp index 89f870c5..13fc0237 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ void CartesianR2_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() } CartesianR2_ZoniShiftedGyro_CzarnyGeometry::CartesianR2_ZoniShiftedGyro_CzarnyGeometry( - double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) + PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp index e7f0d27c..ca19bac2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ void CartesianR6_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() } CartesianR6_SonnendruckerGyro_CzarnyGeometry::CartesianR6_SonnendruckerGyro_CzarnyGeometry( - double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) + PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp index 18bb5514..c1e7e2ff 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h" CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_ShafranovGeometry( - double Rmax, double elongation_kappa, double shift_delta) + PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) , Rmax(Rmax) , elongation_kappa(elongation_kappa) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp index c17e94b4..fd1f8307 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ void CartesianR6_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() } CartesianR6_ZoniShiftedGyro_CzarnyGeometry::CartesianR6_ZoniShiftedGyro_CzarnyGeometry( - double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) + PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) , Rmax(Rmax) , inverse_aspect_ratio_epsilon(inverse_aspect_ratio_epsilon) From 396cbaabc1a5f9a430cd6601db4b707570716f18 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 17:11:55 +0100 Subject: [PATCH 09/15] Update initialisation --- src/convergence_order.cpp | 7 +- src/strong_scaling.cpp | 7 +- src/weak_scaling.cpp | 7 +- tests/DirectSolver/directSolverNoMumps.cpp | 182 ++++++++++-------- .../extrapolated_smoother.cpp | 126 ++++++------ tests/GMGPolar/convergence_order.cpp | 22 ++- tests/GMGPolar/solve_tests.cpp | 2 +- tests/Residual/residual.cpp | 8 +- tests/Smoother/smoother.cpp | 126 ++++++------ 9 files changed, 278 insertions(+), 209 deletions(-) diff --git a/src/convergence_order.cpp b/src/convergence_order.cpp index 4425a1ab..1c6c4389 100644 --- a/src/convergence_order.cpp +++ b/src/convergence_order.cpp @@ -57,7 +57,6 @@ int main(int argc, char* argv[]) ShafranovGeometry domain_geometry(Rmax, elongation_kappa, shift_delta); ZoniGyroCoefficients coefficients(Rmax, alpha_jump); PolarR6_Boundary_ShafranovGeometry boundary_conditions(Rmax, elongation_kappa, shift_delta); - PolarR6_ZoniGyro_ShafranovGeometry source_term(Rmax, elongation_kappa, shift_delta); PolarR6_ShafranovGeometry exact_solution(Rmax, elongation_kappa, shift_delta); /* Example 2: Cartesian Solution -> Lower Order 3.5 */ @@ -65,7 +64,6 @@ int main(int argc, char* argv[]) // CzarnyGeometry domain_geometry(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); // SonnendruckerGyroCoefficients coefficients(Rmax, alpha_jump); // CartesianR2_Boundary_CzarnyGeometry boundary_conditions(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); - // CartesianR2_SonnendruckerGyro_CzarnyGeometry source_term(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); // CartesianR2_CzarnyGeometry exact_solution(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); /* Example 3: Refined Solution -> Lower Order 3.5 */ @@ -73,7 +71,6 @@ int main(int argc, char* argv[]) // ShafranovGeometry domain_geometry(Rmax, elongation_kappa, shift_delta); // ZoniShiftedGyroCoefficients coefficients(Rmax, alpha_jump); // Refined_Boundary_ShafranovGeometry boundary_conditions(Rmax, elongation_kappa, shift_delta); - // Refined_ZoniShiftedGyro_ShafranovGeometry source_term(Rmax, elongation_kappa, shift_delta); // Refined_ShafranovGeometry exact_solution(Rmax, elongation_kappa, shift_delta); std::vector table_nr(MAX_DIVIDE_BY_2); @@ -94,6 +91,10 @@ int main(int argc, char* argv[]) splitting_radius); GMGPolar solver(grid, domain_geometry, coefficients); + PolarR6_ZoniGyro_ShafranovGeometry source_term(grid, Rmax, elongation_kappa, shift_delta); + // CartesianR2_SonnendruckerGyro_CzarnyGeometry source_term(grid, Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); + // Refined_ZoniShiftedGyro_ShafranovGeometry source_term(grid, Rmax, elongation_kappa, shift_delta); + solver.verbose(verbose); solver.paraview(paraview); diff --git a/src/strong_scaling.cpp b/src/strong_scaling.cpp index 351cfcc0..a13c06cd 100644 --- a/src/strong_scaling.cpp +++ b/src/strong_scaling.cpp @@ -23,7 +23,6 @@ void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) // ShafranovGeometry domain_geometry(Rmax, elongation_kappa, shift_delta); // ZoniGyroCoefficients coefficients(Rmax, alpha_jump); // PolarR6_Boundary_ShafranovGeometry boundary_conditions(Rmax, elongation_kappa, shift_delta); - // PolarR6_ZoniGyro_ShafranovGeometry source_term(Rmax, elongation_kappa, shift_delta); // PolarR6_ShafranovGeometry exact_solution(Rmax, elongation_kappa, shift_delta); /* Example 2: Cartesian Solution -> Lower Order 3.5 */ @@ -31,7 +30,6 @@ void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) CzarnyGeometry domain_geometry(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); SonnendruckerGyroCoefficients coefficients(Rmax, alpha_jump); CartesianR2_Boundary_CzarnyGeometry boundary_conditions(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); - CartesianR2_SonnendruckerGyro_CzarnyGeometry source_term(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); CartesianR2_CzarnyGeometry exact_solution(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); /* Example 3: Refined Solution -> Lower Order 3.5 */ @@ -39,7 +37,6 @@ void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) // ShafranovGeometry domain_geometry(Rmax, elongation_kappa, shift_delta); // ZoniShiftedGyroCoefficients coefficients(Rmax, alpha_jump); // Refined_Boundary_ShafranovGeometry boundary_conditions(Rmax, elongation_kappa, shift_delta); - // Refined_ZoniShiftedGyro_ShafranovGeometry source_term(Rmax, elongation_kappa, shift_delta); // Refined_ShafranovGeometry exact_solution(Rmax, elongation_kappa, shift_delta); std::string geometry_string = ""; @@ -94,6 +91,10 @@ void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) PolarGrid grid(R0, Rmax, nr_exp, ntheta_exp, refinement_radius, anisotropic_factor, divideBy2, splitting_radius); GMGPolar solver(grid, domain_geometry, coefficients); + // PolarR6_ZoniGyro_ShafranovGeometry source_term(grid, Rmax, elongation_kappa, shift_delta); + CartesianR2_SonnendruckerGyro_CzarnyGeometry source_term(grid, Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); + // Refined_ZoniShiftedGyro_ShafranovGeometry source_term(grid, Rmax, elongation_kappa, shift_delta); + solver.verbose(verbose); solver.paraview(paraview); diff --git a/src/weak_scaling.cpp b/src/weak_scaling.cpp index cccd5f50..8616dd97 100644 --- a/src/weak_scaling.cpp +++ b/src/weak_scaling.cpp @@ -22,7 +22,6 @@ void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) // ShafranovGeometry domain_geometry(Rmax, elongation_kappa, shift_delta); // ZoniGyroCoefficients coefficients(Rmax, alpha_jump); // PolarR6_Boundary_ShafranovGeometry boundary_conditions(Rmax, elongation_kappa, shift_delta); - // PolarR6_ZoniGyro_ShafranovGeometry source_term(Rmax, elongation_kappa, shift_delta); // PolarR6_ShafranovGeometry exact_solution(Rmax, elongation_kappa, shift_delta); /* Example 2: Cartesian Solution -> Lower Order 3.5 */ @@ -30,7 +29,6 @@ void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) CzarnyGeometry domain_geometry(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); SonnendruckerGyroCoefficients coefficients(Rmax, alpha_jump); CartesianR2_Boundary_CzarnyGeometry boundary_conditions(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); - CartesianR2_SonnendruckerGyro_CzarnyGeometry source_term(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); CartesianR2_CzarnyGeometry exact_solution(Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); /* Example 3: Refined Solution -> Lower Order 3.5 */ @@ -38,7 +36,6 @@ void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) // ShafranovGeometry domain_geometry(Rmax, elongation_kappa, shift_delta); // ZoniShiftedGyroCoefficients coefficients(Rmax, alpha_jump); // Refined_Boundary_ShafranovGeometry boundary_conditions(Rmax, elongation_kappa, shift_delta); - // Refined_ZoniShiftedGyro_ShafranovGeometry source_term(Rmax, elongation_kappa, shift_delta); // Refined_ShafranovGeometry exact_solution(Rmax, elongation_kappa, shift_delta); std::string geometry_string = ""; @@ -93,6 +90,10 @@ void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) PolarGrid grid(R0, Rmax, nr_exp, ntheta_exp, refinement_radius, anisotropic_factor, divideBy2, splitting_radius); GMGPolar solver(grid, domain_geometry, coefficients); + // PolarR6_ZoniGyro_ShafranovGeometry source_term(grid, Rmax, elongation_kappa, shift_delta); + CartesianR2_SonnendruckerGyro_CzarnyGeometry source_term(grid, Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); + // Refined_ZoniShiftedGyro_ShafranovGeometry source_term(grid, Rmax, elongation_kappa, shift_delta); + solver.verbose(verbose); solver.paraview(paraview); diff --git a/tests/DirectSolver/directSolverNoMumps.cpp b/tests/DirectSolver/directSolverNoMumps.cpp index 49207283..da29b564 100644 --- a/tests/DirectSolver/directSolverNoMumps.cpp +++ b/tests/DirectSolver/directSolverNoMumps.cpp @@ -75,13 +75,13 @@ TEST(DirectSolverTestNoMumps, directSolver_DirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -90,10 +90,11 @@ TEST(DirectSolverTestNoMumps, directSolver_DirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, false); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU directSolverGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -130,13 +131,13 @@ TEST(DirectSolverTestNoMumps, directSolver_AcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -145,10 +146,11 @@ TEST(DirectSolverTestNoMumps, directSolver_AcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU directSolverGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -189,22 +191,23 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverDirBC_Inter CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = true; int maxOpenMPThreads = 1; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -234,22 +237,23 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverDirBC_Interio CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = true; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -279,22 +283,23 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverAcrossOrigi CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 1; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -324,22 +329,23 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverAcrossOrigin_ CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -375,22 +381,23 @@ TEST(DirectSolverTestNoMumps_ShafranovGeometry, DirectSolverDirBC_Interior_Shafr ShafranovGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.4837 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -422,22 +429,23 @@ TEST(DirectSolverTestNoMumps_ShafranovGeometry, DirectSolverAcrossOrigin_Shafran ShafranovGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.4837 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -473,23 +481,24 @@ TEST(DirectSolverTestNoMumps_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGe CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -521,23 +530,24 @@ TEST(DirectSolverTestNoMumps_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeom CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -571,21 +581,22 @@ TEST(DirectSolverTestNoMumps_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGe CulhamGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = true; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -615,21 +626,22 @@ TEST(DirectSolverTestNoMumps_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeom CulhamGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -671,22 +683,23 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 1; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -716,22 +729,23 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 1; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -762,22 +776,23 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverDirBC_ CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = true; int maxOpenMPThreads = 1; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -807,22 +822,23 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverDirBC_In CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = true; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -852,22 +868,23 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverAcross CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 1; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -897,22 +914,23 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverAcrossOr CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -948,22 +966,23 @@ TEST(DirectSolverTakeCustomLUTest_ShafranovGeometry, DirectSolverDirBC_Interior_ ShafranovGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.4837 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -995,22 +1014,23 @@ TEST(DirectSolverTakeCustomLUTest_ShafranovGeometry, DirectSolverAcrossOrigin_Sh ShafranovGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.4837 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1046,23 +1066,24 @@ TEST(DirectSolverTakeCustomLUTest_CzarnyGeometry, DirectSolverDirBC_Interior_Cza CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1094,23 +1115,24 @@ TEST(DirectSolverTakeCustomLUTest_CzarnyGeometry, DirectSolverAcrossOrigin_Czarn CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1144,21 +1166,22 @@ TEST(DirectSolverTakeCustomLUTest_CulhamGeometry, DirectSolverDirBC_Interior_Cul CulhamGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = true; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1188,21 +1211,22 @@ TEST(DirectSolverTakeCustomLUTest_CulhamGeometry, DirectSolverAcrossOrigin_Culha CulhamGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 16; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1242,22 +1266,23 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 1; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1287,22 +1312,23 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh CircularGeometry domain_geometry(Rmax); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); - bool DirBC_Interior = false; int maxOpenMPThreads = 1; bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); + DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); diff --git a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp index 90729ec6..ae67a997 100644 --- a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp +++ b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp @@ -57,13 +57,13 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_DirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -72,10 +72,11 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_DirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); ExtrapolatedSmootherGive smootherGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -117,13 +118,13 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_AcossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -132,10 +133,11 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_AcossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); ExtrapolatedSmootherGive smootherGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -179,13 +181,13 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -193,10 +195,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -263,13 +266,13 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -277,10 +280,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -347,13 +351,13 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -361,10 +365,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -433,13 +438,13 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -447,10 +452,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -518,13 +524,13 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior_Smal CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -532,10 +538,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior_Smal bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -603,13 +610,13 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior_Smalle CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -617,10 +624,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior_Smalle bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -688,13 +696,13 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin_Smalle CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -702,10 +710,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin_Smalle bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -771,13 +780,13 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin_Smallest CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -785,10 +794,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin_Smallest bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -857,13 +867,13 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -871,10 +881,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -943,13 +954,13 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -957,10 +968,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1027,13 +1039,13 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -1041,10 +1053,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1111,13 +1124,13 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -1125,10 +1138,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1194,13 +1208,13 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior_ CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -1208,10 +1222,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior_ bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1277,13 +1292,13 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior_Sm CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -1291,10 +1306,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior_Sm bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1360,13 +1376,13 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin_Sm CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -1374,10 +1390,11 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin_Sm bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1443,13 +1460,13 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin_Smal CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -1457,10 +1474,11 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin_Smal bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::IMPLICIT_EXTRAPOLATION, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); diff --git a/tests/GMGPolar/convergence_order.cpp b/tests/GMGPolar/convergence_order.cpp index 145d21b0..5271212f 100644 --- a/tests/GMGPolar/convergence_order.cpp +++ b/tests/GMGPolar/convergence_order.cpp @@ -212,12 +212,6 @@ void test_convergence(double non_uniformity) double delta_e = 1.4; CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - const double alpha_jump = 0.0; // Unused value - typename TestFixture::DensityProfileCoefficients coefficients(Rmax, alpha_jump); - typename TestFixture::BoundaryConditions boundary_conditions(Rmax, kappa_eps, delta_e); - typename TestFixture::SourceTerm source_term(Rmax, kappa_eps, delta_e); - typename TestFixture::ExactSolution solution(Rmax, kappa_eps, delta_e); - // For extrapolation, we need a uniform refinement std::vector non_uniform_radii = get_non_uniform_points(1e-8, Rmax, n_r / 2 + 1, non_uniformity); std::vector non_uniform_angles = get_non_uniform_points(0.0, 2 * M_PI, n_angles / 2 + 1, non_uniformity); @@ -228,12 +222,22 @@ void test_convergence(double non_uniformity) std::vector radii_refined = refine(radii); std::vector angles_refined = refine(angles); + PolarGrid grid(radii, angles); + PolarGrid grid_refined(radii_refined, angles_refined); + + const double alpha_jump = 0.0; // Unused value + typename TestFixture::DensityProfileCoefficients coefficients(Rmax, alpha_jump); + typename TestFixture::BoundaryConditions boundary_conditions(Rmax, kappa_eps, delta_e); + typename TestFixture::SourceTerm source_term(grid, Rmax, kappa_eps, delta_e); + typename TestFixture::SourceTerm source_term_refined(grid_refined, Rmax, kappa_eps, delta_e); + typename TestFixture::ExactSolution solution(Rmax, kappa_eps, delta_e); + auto [euclid_error, inf_error] = - get_gmgpolar_error(PolarGrid(radii, angles), domain_geometry, coefficients, boundary_conditions, source_term, + get_gmgpolar_error(grid, domain_geometry, coefficients, boundary_conditions, source_term, solution, TestFixture::extrapolation); auto [euclid_error_refined, inf_error_refined] = - get_gmgpolar_error(PolarGrid(radii_refined, angles_refined), domain_geometry, coefficients, boundary_conditions, - source_term, solution, TestFixture::extrapolation); + get_gmgpolar_error(grid_refined, domain_geometry, coefficients, boundary_conditions, + source_term_refined, solution, TestFixture::extrapolation); double euclid_order = log(euclid_error / euclid_error_refined) / log(2); double inf_order = log(inf_error / inf_error_refined) / log(2); diff --git a/tests/GMGPolar/solve_tests.cpp b/tests/GMGPolar/solve_tests.cpp index 7a69eb0f..c4009f8b 100644 --- a/tests/GMGPolar/solve_tests.cpp +++ b/tests/GMGPolar/solve_tests.cpp @@ -529,7 +529,7 @@ void run_gmgpolar() typename TestFixture::DensityProfileCoefficients profile_coefficients(TestFixture::Rmax, 0.0); typename TestFixture::BoundaryConditions boundary_conditions(TestFixture::Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); - typename TestFixture::SourceTerm source_term(TestFixture::Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); + typename TestFixture::SourceTerm source_term(grid, TestFixture::Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); typename TestFixture::ExactSolution exact_solution(TestFixture::Rmax, inverse_aspect_ratio_epsilon, ellipticity_e); GMGPolar solver(grid, domain, profile_coefficients); diff --git a/tests/Residual/residual.cpp b/tests/Residual/residual.cpp index 7522f8c3..46011723 100644 --- a/tests/Residual/residual.cpp +++ b/tests/Residual/residual.cpp @@ -56,8 +56,6 @@ TEST(OperatorATest, applyA_DirBC_Interior) std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -70,6 +68,8 @@ TEST(OperatorATest, applyA_DirBC_Interior) auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, false); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); ResidualGive residualGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -112,8 +112,6 @@ TEST(OperatorATest, applyA_AcrossOrigin) std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -126,6 +124,8 @@ TEST(OperatorATest, applyA_AcrossOrigin) auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, false); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); ResidualGive residualGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); diff --git a/tests/Smoother/smoother.cpp b/tests/Smoother/smoother.cpp index 40ea3003..1ab5bfe3 100644 --- a/tests/Smoother/smoother.cpp +++ b/tests/Smoother/smoother.cpp @@ -55,13 +55,13 @@ TEST(SmootherTest, smoother_DirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -70,10 +70,11 @@ TEST(SmootherTest, smoother_DirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); SmootherGive smootherGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -114,13 +115,13 @@ TEST(SmootherTest, smoother_AcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -129,10 +130,11 @@ TEST(SmootherTest, smoother_AcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); SmootherGive smootherGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -176,13 +178,13 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -190,10 +192,11 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -255,13 +258,13 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -269,10 +272,11 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -334,13 +338,13 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -348,10 +352,11 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -413,13 +418,13 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -427,10 +432,11 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -491,13 +497,13 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -505,10 +511,11 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior_SmallestGrid) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -569,13 +576,13 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -583,10 +590,11 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior_SmallestGrid) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -647,13 +655,13 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -661,10 +669,11 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin_SmallestGrid) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -725,13 +734,13 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -739,10 +748,11 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin_SmallestGrid) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = false; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -806,13 +816,13 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -820,10 +830,11 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -885,13 +896,13 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -899,10 +910,11 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -964,13 +976,13 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -978,10 +990,11 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1043,13 +1056,13 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -1057,10 +1070,11 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1121,13 +1135,13 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -1135,10 +1149,11 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior_SmallestGrid) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1199,13 +1214,13 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -1213,10 +1228,11 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior_SmallestGrid) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1277,13 +1293,13 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -1291,10 +1307,11 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin_SmallestGrid) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1355,13 +1372,13 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); + auto grid = std::make_unique(radii, angles); + double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -1369,10 +1386,11 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin_SmallestGrid) bool cache_density_rpofile_coefficients = true; bool cache_domain_geometry = true; - auto grid = std::make_unique(radii, angles); auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); From 3a190a9d35a85f83187cfcba8f49fceb99ae188a Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 17:46:51 +0100 Subject: [PATCH 10/15] Prefer std::size_t --- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h | 2 +- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_CircularGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h | 2 +- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h | 2 +- .../InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h | 2 +- include/InputFunctions/sourceTerm.h | 2 +- .../SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../SourceTerms/polarR6_Zoni_CircularGeometry.cpp | 2 +- src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp | 2 +- .../SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- .../SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- 137 files changed, 137 insertions(+), 137 deletions(-) diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h index ec0bcbeb..92cc7500 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_Poisson_CircularGeometry : public SourceTerm explicit CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Poisson_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h index 3aca0a13..4ceafc86 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_Poisson_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_Poisson_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h index 772f2abd..c9c829fb 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_Poisson_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR2_Poisson_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h index b17d9b5d..a6dd8ba4 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_SonnendruckerGyro_CircularGeometry : public SourceTerm explicit CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_SonnendruckerGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h index fb4c81f0..bf2585f8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_SonnendruckerGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h index b3663780..2e7c7495 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_SonnendruckerGyro_ShafranovGeometry : public SourceTerm double elongation_kappa, double shift_delta); virtual ~CartesianR2_SonnendruckerGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h index 17062355..8ef2d3a7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_Sonnendrucker_CircularGeometry : public SourceTerm explicit CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Sonnendrucker_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h index 08dffc99..5b6d2dc4 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_Sonnendrucker_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_Sonnendrucker_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h index 023bc973..28e75aba 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_Sonnendrucker_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR2_Sonnendrucker_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h index 85e56d1b..7fb72da6 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniGyro_CircularGeometry : public SourceTerm explicit CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h index c1553b43..f37061bf 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_ZoniGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_ZoniGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h index e8d1b6fc..f0ccebb5 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_ZoniGyro_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR2_ZoniGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h index 38c68151..603cc7fc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniShiftedGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h index 61553bfa..66204c6a 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_ZoniShiftedGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h index 92b6a016..c9a8393e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR2_ZoniShiftedGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h index 83c13c76..b9f4236e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_ZoniShifted_CircularGeometry : public SourceTerm explicit CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_ZoniShifted_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h index 0837b71f..3a682580 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_ZoniShifted_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR2_ZoniShifted_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h index e0b4f372..c60f11d8 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_ZoniShifted_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR2_ZoniShifted_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h index 6213cbcc..c763e6b3 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR2_Zoni_CircularGeometry : public SourceTerm explicit CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR2_Zoni_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h index 853ce353..25596679 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_Zoni_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR2_Zoni_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h index 162bbb67..a2a3d5ff 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR2_Zoni_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR2_Zoni_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h index c450f18f..de145f72 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_Poisson_CircularGeometry : public SourceTerm explicit CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Poisson_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h index acb41618..1a0f7743 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_Poisson_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_Poisson_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h index 01ef4e2a..bab604b9 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_Poisson_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR6_Poisson_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h index b5b7400a..9b83913f 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_SonnendruckerGyro_CircularGeometry : public SourceTerm explicit CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_SonnendruckerGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h index b0f57c42..03ebd62b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_SonnendruckerGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h index 9a967c90..0af32921 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm double elongation_kappa, double shift_delta); virtual ~CartesianR6_SonnendruckerGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h index 8b7bec79..fcf9e660 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_Sonnendrucker_CircularGeometry : public SourceTerm explicit CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Sonnendrucker_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h index 28a25a2e..91c3d813 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_Sonnendrucker_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_Sonnendrucker_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h index f764697d..f87e24cf 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_Sonnendrucker_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR6_Sonnendrucker_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h index 7b26744e..9000eb6c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniGyro_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h index c56c39c3..0398223f 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_ZoniGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h index db95ceef..467a6f6d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_ZoniGyro_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR6_ZoniGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h index f3580110..7f735dc1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShiftedGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h index 6f032505..b7443c06 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniShiftedGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h index be801cf0..3c8ce41e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR6_ZoniShiftedGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h index c782d6d5..ddd8a5b6 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_ZoniShifted_CircularGeometry : public SourceTerm explicit CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_ZoniShifted_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h index 7f282a96..53bb2160 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_ZoniShifted_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~CartesianR6_ZoniShifted_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h index 9017e926..bec36bc6 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_ZoniShifted_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR6_ZoniShifted_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h index 21f4afcc..c660c209 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h @@ -12,7 +12,7 @@ class CartesianR6_Zoni_CircularGeometry : public SourceTerm explicit CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~CartesianR6_Zoni_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h index 9ad686be..64c9ed4c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_Zoni_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~CartesianR6_Zoni_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h index 53cfbeaa..860fcd96 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h @@ -13,7 +13,7 @@ class CartesianR6_Zoni_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~CartesianR6_Zoni_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h index 2d951421..cb62750f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h @@ -12,7 +12,7 @@ class PolarR6_Poisson_CircularGeometry : public SourceTerm explicit PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Poisson_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h index 0bf13e7d..d2395e53 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h @@ -13,7 +13,7 @@ class PolarR6_Poisson_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_Poisson_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h index 571dc61e..2da921c4 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h @@ -13,7 +13,7 @@ class PolarR6_Poisson_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~PolarR6_Poisson_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h index e3592954..153b3c12 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class PolarR6_SonnendruckerGyro_CircularGeometry : public SourceTerm explicit PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_SonnendruckerGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h index 4c9f6760..43533ddd 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class PolarR6_SonnendruckerGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_SonnendruckerGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h index 7cfb331b..265e1029 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class PolarR6_SonnendruckerGyro_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~PolarR6_SonnendruckerGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h index 317a8ffc..ca937cd5 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h @@ -12,7 +12,7 @@ class PolarR6_Sonnendrucker_CircularGeometry : public SourceTerm explicit PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Sonnendrucker_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h index eb0610c5..abe57421 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h @@ -13,7 +13,7 @@ class PolarR6_Sonnendrucker_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_Sonnendrucker_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h index 36ede867..86332104 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h @@ -13,7 +13,7 @@ class PolarR6_Sonnendrucker_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~PolarR6_Sonnendrucker_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h index c5a10eab..a7d6bf7b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class PolarR6_ZoniGyro_CircularGeometry : public SourceTerm explicit PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h index 0bcd9c3e..0a5d87e7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class PolarR6_ZoniGyro_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_ZoniGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h index 30b69e92..5bf5e1c1 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class PolarR6_ZoniGyro_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~PolarR6_ZoniGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h index b0b2114b..ce1176d0 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class PolarR6_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h index 04d8c758..5ed4d3c8 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h @@ -12,7 +12,7 @@ class PolarR6_ZoniShiftedGyro_CulhamGeometry : public SourceTerm explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShiftedGyro_CulhamGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h index bafb862b..edaff8e3 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class PolarR6_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~PolarR6_ZoniShiftedGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h index d02e00c9..8bcc218f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class PolarR6_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~PolarR6_ZoniShiftedGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h index 2eea6192..92bbc214 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h @@ -12,7 +12,7 @@ class PolarR6_ZoniShifted_CircularGeometry : public SourceTerm explicit PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_ZoniShifted_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h index b65662c8..7eec04bb 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h @@ -13,7 +13,7 @@ class PolarR6_ZoniShifted_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_ZoniShifted_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h index a5b62249..f2420f9f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h @@ -13,7 +13,7 @@ class PolarR6_ZoniShifted_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~PolarR6_ZoniShifted_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h index b89789d4..b4993ce8 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h @@ -12,7 +12,7 @@ class PolarR6_Zoni_CircularGeometry : public SourceTerm explicit PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~PolarR6_Zoni_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h index ab8ac182..6f204a60 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h @@ -13,7 +13,7 @@ class PolarR6_Zoni_CzarnyGeometry : public SourceTerm double ellipticity_e); virtual ~PolarR6_Zoni_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h index b6bba170..b7b020f8 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h @@ -13,7 +13,7 @@ class PolarR6_Zoni_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~PolarR6_Zoni_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h index dda14dc3..a729340d 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h @@ -12,7 +12,7 @@ class Refined_ZoniShiftedGyro_CircularGeometry : public SourceTerm explicit Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CircularGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h index 09bd4e52..b11ce702 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h @@ -12,7 +12,7 @@ class Refined_ZoniShiftedGyro_CulhamGeometry : public SourceTerm explicit Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); virtual ~Refined_ZoniShiftedGyro_CulhamGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h index 5a80ab01..75bacf59 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h @@ -13,7 +13,7 @@ class Refined_ZoniShiftedGyro_CzarnyGeometry : public SourceTerm double inverse_aspect_ratio_epsilon, double ellipticity_e); virtual ~Refined_ZoniShiftedGyro_CzarnyGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h index 719d0fc2..026caae3 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h @@ -13,7 +13,7 @@ class Refined_ZoniShiftedGyro_ShafranovGeometry : public SourceTerm double shift_delta); virtual ~Refined_ZoniShiftedGyro_ShafranovGeometry() = default; - double operator()(int i_r, int i_theta) const override; + double operator()(std::size_t i_r, std::size_t i_theta) const override; private: PolarGrid const& grid_; diff --git a/include/InputFunctions/sourceTerm.h b/include/InputFunctions/sourceTerm.h index 810d1562..96f544aa 100644 --- a/include/InputFunctions/sourceTerm.h +++ b/include/InputFunctions/sourceTerm.h @@ -6,5 +6,5 @@ class SourceTerm SourceTerm() = default; virtual ~SourceTerm() = default; - virtual double operator()(int i_r, int i_theta) const = 0; + virtual double operator()(std::size_t i_r, std::size_t i_theta) const = 0; }; diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp index efb0f3ca..4919d98a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp @@ -6,7 +6,7 @@ CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(Polar { } -double CartesianR2_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Poisson_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp index 900b83da..fdb129c1 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(PolarGrid initializeGeometry(); } -double CartesianR2_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Poisson_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp index 0725e535..e395dd49 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(Pol { } -double CartesianR2_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Poisson_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp index 99fddac3..4ce2b440 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp @@ -7,7 +7,7 @@ CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_Ci { } -double CartesianR2_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_SonnendruckerGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp index 06bea17d..a4c9e4f1 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR2_SonnendruckerGyro_CzarnyGeometry::CartesianR2_SonnendruckerGyro_Czar initializeGeometry(); } -double CartesianR2_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_SonnendruckerGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp index a72dfc1e..9b47817e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_S { } -double CartesianR2_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_SonnendruckerGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp index 72c38e00..fc82badd 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp @@ -7,7 +7,7 @@ CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGe { } -double CartesianR2_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Sonnendrucker_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp index 4b947c42..81ffcc9b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR2_Sonnendrucker_CzarnyGeometry::CartesianR2_Sonnendrucker_CzarnyGeomet initializeGeometry(); } -double CartesianR2_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Sonnendrucker_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp index 24787933..6eeb5aee 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp @@ -11,7 +11,7 @@ CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_Shafranov { } -double CartesianR2_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Sonnendrucker_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp index ed63e4dd..448862d2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp @@ -6,7 +6,7 @@ CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(Pol { } -double CartesianR2_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp index 64d91007..66009f5b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR2_ZoniGyro_CzarnyGeometry::CartesianR2_ZoniGyro_CzarnyGeometry(PolarGr initializeGeometry(); } -double CartesianR2_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp index fd687c4c..7754b649 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(P { } -double CartesianR2_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp index 7031b0be..f7653022 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp @@ -7,7 +7,7 @@ CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_Circul { } -double CartesianR2_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniShiftedGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp index 13fc0237..58068ca1 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR2_ZoniShiftedGyro_CzarnyGeometry::CartesianR2_ZoniShiftedGyro_CzarnyGe initializeGeometry(); } -double CartesianR2_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniShiftedGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp index d4a48508..e019d50f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -11,7 +11,7 @@ CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_Shafr { } -double CartesianR2_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniShiftedGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp index b127d60c..5d5abe67 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp @@ -6,7 +6,7 @@ CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeomet { } -double CartesianR2_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniShifted_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp index 78e2ed6d..3485a87c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR2_ZoniShifted_CzarnyGeometry::CartesianR2_ZoniShifted_CzarnyGeometry(P initializeGeometry(); } -double CartesianR2_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniShifted_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp index 0732d1a1..e8335bc2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeom { } -double CartesianR2_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_ZoniShifted_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp index 19e5ab5d..ca27473b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp @@ -6,7 +6,7 @@ CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(PolarGrid c { } -double CartesianR2_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Zoni_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp index 1f6f2df4..6dd6f313 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(PolarGrid const initializeGeometry(); } -double CartesianR2_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Zoni_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp index c12a0b7b..73a4a666 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid { } -double CartesianR2_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR2_Zoni_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp index 440738b4..1d6372a9 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp @@ -6,7 +6,7 @@ CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(Polar { } -double CartesianR6_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Poisson_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp index 0c1fef5c..22258835 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(PolarGrid initializeGeometry(); } -double CartesianR6_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Poisson_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp index ffbd90bb..68c9b942 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(Pol { } -double CartesianR6_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Poisson_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp index 41ca2b12..991fd192 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp @@ -7,7 +7,7 @@ CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_Ci { } -double CartesianR6_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_SonnendruckerGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp index ca19bac2..70969494 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR6_SonnendruckerGyro_CzarnyGeometry::CartesianR6_SonnendruckerGyro_Czar initializeGeometry(); } -double CartesianR6_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_SonnendruckerGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp index c1e7e2ff..87be80e7 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_S { } -double CartesianR6_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_SonnendruckerGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp index 8bbc8a4d..d196ba09 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp @@ -7,7 +7,7 @@ CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGe { } -double CartesianR6_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Sonnendrucker_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp index d0796f1a..d1368b36 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR6_Sonnendrucker_CzarnyGeometry::CartesianR6_Sonnendrucker_CzarnyGeomet initializeGeometry(); } -double CartesianR6_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Sonnendrucker_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp index 48319ef7..d2699bbd 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp @@ -11,7 +11,7 @@ CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_Shafranov { } -double CartesianR6_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Sonnendrucker_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp index c8ff0a37..f049e296 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp @@ -6,7 +6,7 @@ CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(Pol { } -double CartesianR6_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp index 8b169b75..dbd536a3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR6_ZoniGyro_CzarnyGeometry::CartesianR6_ZoniGyro_CzarnyGeometry(PolarGr initializeGeometry(); } -double CartesianR6_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp index 3c7d93fc..98e378ec 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(P { } -double CartesianR6_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp index 82fe10eb..53fbcaaa 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -7,7 +7,7 @@ CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_Circul { } -double CartesianR6_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniShiftedGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp index fd1f8307..8c1edfb4 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ CartesianR6_ZoniShiftedGyro_CzarnyGeometry::CartesianR6_ZoniShiftedGyro_CzarnyGe initializeGeometry(); } -double CartesianR6_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniShiftedGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp index cf2eb11a..4d5dcb56 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -11,7 +11,7 @@ CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_Shafr { } -double CartesianR6_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniShiftedGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp index eb98077c..b1fbb43d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp @@ -6,7 +6,7 @@ CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeomet { } -double CartesianR6_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniShifted_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp index c09da7e0..8a14899f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR6_ZoniShifted_CzarnyGeometry::CartesianR6_ZoniShifted_CzarnyGeometry(P initializeGeometry(); } -double CartesianR6_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniShifted_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp index 471ce542..664b7208 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeom { } -double CartesianR6_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_ZoniShifted_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp index e6896fa2..68ecffc0 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp @@ -6,7 +6,7 @@ CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(PolarGrid c { } -double CartesianR6_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Zoni_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp index 6ba877d3..4efdd032 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(PolarGrid const initializeGeometry(); } -double CartesianR6_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Zoni_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp index 075d82df..aeb9d4ed 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid { } -double CartesianR6_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const +double CartesianR6_Zoni_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp index 7bf9e414..145e4bac 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp @@ -6,7 +6,7 @@ PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(PolarGrid con { } -double PolarR6_Poisson_CircularGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Poisson_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp index 81900acb..863cdac9 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(PolarGrid const& initializeGeometry(); } -double PolarR6_Poisson_CzarnyGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Poisson_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp index 02966727..67496448 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid c { } -double PolarR6_Poisson_ShafranovGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Poisson_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp index 7a7b45e2..60c3cc12 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp @@ -7,7 +7,7 @@ PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGe { } -double PolarR6_SonnendruckerGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double PolarR6_SonnendruckerGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp index 789f0561..219d5470 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ PolarR6_SonnendruckerGyro_CzarnyGeometry::PolarR6_SonnendruckerGyro_CzarnyGeomet initializeGeometry(); } -double PolarR6_SonnendruckerGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double PolarR6_SonnendruckerGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp index 96d747b2..23ac7aa7 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -11,7 +11,7 @@ PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_Shafranov { } -double PolarR6_SonnendruckerGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double PolarR6_SonnendruckerGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp index bbaaa160..701d4b62 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp @@ -6,7 +6,7 @@ PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(P { } -double PolarR6_Sonnendrucker_CircularGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Sonnendrucker_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp index 7b7b0824..e2c0cb22 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ PolarR6_Sonnendrucker_CzarnyGeometry::PolarR6_Sonnendrucker_CzarnyGeometry(Polar initializeGeometry(); } -double PolarR6_Sonnendrucker_CzarnyGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Sonnendrucker_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp index 81f959ff..e912dbef 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry { } -double PolarR6_Sonnendrucker_ShafranovGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Sonnendrucker_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp index f0d34b49..ddef297c 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp @@ -6,7 +6,7 @@ PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(PolarGrid c { } -double PolarR6_ZoniGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp index 6327072e..e19c1470 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const initializeGeometry(); } -double PolarR6_ZoniGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp index c4727363..98268057 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid { } -double PolarR6_ZoniGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp index 97bcbc7e..5be3dc70 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -6,7 +6,7 @@ PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeomet { } -double PolarR6_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniShiftedGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp index 349b4389..c3d0dfc7 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp @@ -6,7 +6,7 @@ PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(P { } -double PolarR6_ZoniShiftedGyro_CulhamGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniShiftedGyro_CulhamGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp index f0a7852a..5dd99e19 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ PolarR6_ZoniShiftedGyro_CzarnyGeometry::PolarR6_ZoniShiftedGyro_CzarnyGeometry(P initializeGeometry(); } -double PolarR6_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniShiftedGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 35310492..af9867d5 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeom { } -double PolarR6_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniShiftedGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp index 54c976aa..d218f6f2 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp @@ -6,7 +6,7 @@ PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(Polar { } -double PolarR6_ZoniShifted_CircularGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniShifted_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp index d269e7b7..5db6c59c 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid initializeGeometry(); } -double PolarR6_ZoniShifted_CzarnyGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniShifted_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp index 7dbdcad0..a4381cd5 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(Pol { } -double PolarR6_ZoniShifted_ShafranovGeometry::operator()(int i_r, int i_theta) const +double PolarR6_ZoniShifted_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp index 9041fc68..84f318e1 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp @@ -6,7 +6,7 @@ PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(PolarGrid const& gr { } -double PolarR6_Zoni_CircularGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Zoni_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp index c58e99f4..33165b7b 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp @@ -15,7 +15,7 @@ PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, initializeGeometry(); } -double PolarR6_Zoni_CzarnyGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Zoni_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp index ab646547..02a4143b 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp @@ -9,7 +9,7 @@ PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& { } -double PolarR6_Zoni_ShafranovGeometry::operator()(int i_r, int i_theta) const +double PolarR6_Zoni_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp index f188ca2b..8703aa2c 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp @@ -6,7 +6,7 @@ Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeomet { } -double Refined_ZoniShiftedGyro_CircularGeometry::operator()(int i_r, int i_theta) const +double Refined_ZoniShiftedGyro_CircularGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp index 252c21ec..b73a7184 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp @@ -6,7 +6,7 @@ Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(P { } -double Refined_ZoniShiftedGyro_CulhamGeometry::operator()(int i_r, int i_theta) const +double Refined_ZoniShiftedGyro_CulhamGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp index d5607750..5a1f289a 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -16,7 +16,7 @@ Refined_ZoniShiftedGyro_CzarnyGeometry::Refined_ZoniShiftedGyro_CzarnyGeometry(P initializeGeometry(); } -double Refined_ZoniShiftedGyro_CzarnyGeometry::operator()(int i_r, int i_theta) const +double Refined_ZoniShiftedGyro_CzarnyGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp index c32000d3..e8d48fe7 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -10,7 +10,7 @@ Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeom { } -double Refined_ZoniShiftedGyro_ShafranovGeometry::operator()(int i_r, int i_theta) const +double Refined_ZoniShiftedGyro_ShafranovGeometry::operator()(std::size_t i_r, std::size_t i_theta) const { double r = grid_.radius(i_r); double theta = grid_.theta(i_theta); From 2789188f35772758c4ab1cde7bf09631948a3b91 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 17 Dec 2025 17:47:22 +0100 Subject: [PATCH 11/15] Clang formatting --- src/ConfigParser/select_test_case.cpp | 70 ++++++--- tests/DirectSolver/directSolverNoMumps.cpp | 148 +++++++++--------- .../extrapolated_smoother.cpp | 36 ++--- tests/GMGPolar/convergence_order.cpp | 9 +- tests/Smoother/smoother.cpp | 36 ++--- 5 files changed, 158 insertions(+), 141 deletions(-) diff --git a/src/ConfigParser/select_test_case.cpp b/src/ConfigParser/select_test_case.cpp index a8103935..f1951c9a 100644 --- a/src/ConfigParser/select_test_case.cpp +++ b/src/ConfigParser/select_test_case.cpp @@ -233,8 +233,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = - std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique( + grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -243,10 +243,12 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -259,8 +261,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = - std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, + kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -280,7 +282,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = @@ -296,7 +299,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -305,7 +309,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = @@ -388,8 +393,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = - std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique( + grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -398,10 +403,12 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -414,8 +421,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = - std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = std::make_unique(grid_, Rmax, + kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -435,7 +442,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = @@ -451,7 +459,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -460,7 +469,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = @@ -539,7 +549,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = @@ -555,7 +566,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -564,7 +576,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: source_term_ = @@ -588,10 +601,12 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::SONNENDRUCKER: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -612,10 +627,12 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ZERO: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta.\n"); @@ -691,7 +708,8 @@ void ConfigParser::selectTestCase(GeometryType geometry_type, ProblemType proble case AlphaCoeff::ZONI_SHIFTED: switch (beta_type) { case BetaCoeff::ALPHA_INVERSE: - source_term_ = std::make_unique(grid_, Rmax, kappa_eps, delta_e); + source_term_ = + std::make_unique(grid_, Rmax, kappa_eps, delta_e); break; default: throw std::runtime_error("Invalid beta for configuration.\n"); diff --git a/tests/DirectSolver/directSolverNoMumps.cpp b/tests/DirectSolver/directSolverNoMumps.cpp index da29b564..8463764e 100644 --- a/tests/DirectSolver/directSolverNoMumps.cpp +++ b/tests/DirectSolver/directSolverNoMumps.cpp @@ -75,7 +75,7 @@ TEST(DirectSolverTestNoMumps, directSolver_DirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -131,7 +131,7 @@ TEST(DirectSolverTestNoMumps, directSolver_AcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -191,7 +191,7 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverDirBC_Inter CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -206,8 +206,8 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverDirBC_Inter auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -237,7 +237,7 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverDirBC_Interio CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -252,8 +252,8 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverDirBC_Interio auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -283,7 +283,7 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverAcrossOrigi CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -298,8 +298,8 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, SequentialDirectSolverAcrossOrigi auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -329,7 +329,7 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverAcrossOrigin_ CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -344,8 +344,8 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, ParallelDirectSolverAcrossOrigin_ auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -381,7 +381,7 @@ TEST(DirectSolverTestNoMumps_ShafranovGeometry, DirectSolverDirBC_Interior_Shafr ShafranovGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.4837 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); @@ -429,7 +429,7 @@ TEST(DirectSolverTestNoMumps_ShafranovGeometry, DirectSolverAcrossOrigin_Shafran ShafranovGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.4837 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); @@ -481,7 +481,7 @@ TEST(DirectSolverTestNoMumps_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGe CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -530,7 +530,7 @@ TEST(DirectSolverTestNoMumps_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeom CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -581,22 +581,22 @@ TEST(DirectSolverTestNoMumps_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGe CulhamGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - bool DirBC_Interior = true; - int maxOpenMPThreads = 16; - bool cache_density_rpofile_coefficients = true; - bool cache_domain_geometry = false; + bool DirBC_Interior = true; + int maxOpenMPThreads = 16; + bool cache_density_rpofile_coefficients = true; + bool cache_domain_geometry = false; auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -626,22 +626,22 @@ TEST(DirectSolverTestNoMumps_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeom CulhamGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - bool DirBC_Interior = false; - int maxOpenMPThreads = 16; - bool cache_density_rpofile_coefficients = true; - bool cache_domain_geometry = false; + bool DirBC_Interior = false; + int maxOpenMPThreads = 16; + bool cache_density_rpofile_coefficients = true; + bool cache_domain_geometry = false; auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -683,7 +683,7 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -698,8 +698,8 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -729,7 +729,7 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -744,8 +744,8 @@ TEST(DirectSolverTestNoMumps_CircularGeometry, DirectSolverAcrossOriginHigherPre auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGiveCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -776,7 +776,7 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverDirBC_ CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -791,8 +791,8 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverDirBC_ auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -822,7 +822,7 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverDirBC_In CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -837,8 +837,8 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverDirBC_In auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -868,7 +868,7 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverAcross CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -883,8 +883,8 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, SequentialDirectSolverAcross auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -914,7 +914,7 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverAcrossOr CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -929,8 +929,8 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, ParallelDirectSolverAcrossOr auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -966,7 +966,7 @@ TEST(DirectSolverTakeCustomLUTest_ShafranovGeometry, DirectSolverDirBC_Interior_ ShafranovGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.4837 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); @@ -1014,7 +1014,7 @@ TEST(DirectSolverTakeCustomLUTest_ShafranovGeometry, DirectSolverAcrossOrigin_Sh ShafranovGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.4837 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); @@ -1066,7 +1066,7 @@ TEST(DirectSolverTakeCustomLUTest_CzarnyGeometry, DirectSolverDirBC_Interior_Cza CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1115,7 +1115,7 @@ TEST(DirectSolverTakeCustomLUTest_CzarnyGeometry, DirectSolverAcrossOrigin_Czarn CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1166,22 +1166,22 @@ TEST(DirectSolverTakeCustomLUTest_CulhamGeometry, DirectSolverDirBC_Interior_Cul CulhamGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - bool DirBC_Interior = true; - int maxOpenMPThreads = 16; - bool cache_density_rpofile_coefficients = true; - bool cache_domain_geometry = true; + bool DirBC_Interior = true; + int maxOpenMPThreads = 16; + bool cache_density_rpofile_coefficients = true; + bool cache_domain_geometry = true; auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1211,22 +1211,22 @@ TEST(DirectSolverTakeCustomLUTest_CulhamGeometry, DirectSolverAcrossOrigin_Culha CulhamGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - bool DirBC_Interior = false; - int maxOpenMPThreads = 16; - bool cache_density_rpofile_coefficients = true; - bool cache_domain_geometry = true; + bool DirBC_Interior = false; + int maxOpenMPThreads = 16; + bool cache_density_rpofile_coefficients = true; + bool cache_domain_geometry = true; auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1266,7 +1266,7 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -1281,8 +1281,8 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1312,7 +1312,7 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh CircularGeometry domain_geometry(Rmax); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.66 * Rmax; std::unique_ptr coefficients = @@ -1327,8 +1327,8 @@ TEST(DirectSolverTakeCustomLUTest_CircularGeometry, DirectSolverAcrossOriginHigh auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); - std::unique_ptr source_term = std::make_unique(level.grid(), Rmax); - + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTakeCustomLU solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); diff --git a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp index ae67a997..e4a8a922 100644 --- a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp +++ b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp @@ -57,7 +57,7 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_DirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -118,7 +118,7 @@ TEST(ExtrapolatedSmootherTest, extrapolatedSmoother_AcossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -181,7 +181,7 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -266,7 +266,7 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -351,7 +351,7 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -438,7 +438,7 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -524,7 +524,7 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherDirBC_Interior_Smal CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -610,7 +610,7 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherDirBC_Interior_Smalle CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -696,7 +696,7 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherAcrossOrigin_Smalle CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -780,7 +780,7 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherAcrossOrigin_Smallest CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -867,7 +867,7 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -954,7 +954,7 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1039,7 +1039,7 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1124,7 +1124,7 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1208,7 +1208,7 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeDirBC_Interior_ CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1292,7 +1292,7 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeDirBC_Interior_Sm CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1376,7 +1376,7 @@ TEST(ExtrapolatedSmootherTest, SequentialExtrapolatedSmootherTakeAcrossOrigin_Sm CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1460,7 +1460,7 @@ TEST(ExtrapolatedSmootherTest, ParallelExtrapolatedSmootherTakeAcrossOrigin_Smal CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = diff --git a/tests/GMGPolar/convergence_order.cpp b/tests/GMGPolar/convergence_order.cpp index 5271212f..57f9b40e 100644 --- a/tests/GMGPolar/convergence_order.cpp +++ b/tests/GMGPolar/convergence_order.cpp @@ -232,12 +232,11 @@ void test_convergence(double non_uniformity) typename TestFixture::SourceTerm source_term_refined(grid_refined, Rmax, kappa_eps, delta_e); typename TestFixture::ExactSolution solution(Rmax, kappa_eps, delta_e); - auto [euclid_error, inf_error] = - get_gmgpolar_error(grid, domain_geometry, coefficients, boundary_conditions, source_term, - solution, TestFixture::extrapolation); + auto [euclid_error, inf_error] = get_gmgpolar_error(grid, domain_geometry, coefficients, boundary_conditions, + source_term, solution, TestFixture::extrapolation); auto [euclid_error_refined, inf_error_refined] = - get_gmgpolar_error(grid_refined, domain_geometry, coefficients, boundary_conditions, - source_term_refined, solution, TestFixture::extrapolation); + get_gmgpolar_error(grid_refined, domain_geometry, coefficients, boundary_conditions, source_term_refined, + solution, TestFixture::extrapolation); double euclid_order = log(euclid_error / euclid_error_refined) / log(2); double inf_order = log(inf_error / inf_error_refined) / log(2); diff --git a/tests/Smoother/smoother.cpp b/tests/Smoother/smoother.cpp index 1ab5bfe3..9b697f3d 100644 --- a/tests/Smoother/smoother.cpp +++ b/tests/Smoother/smoother.cpp @@ -55,7 +55,7 @@ TEST(SmootherTest, smoother_DirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -115,7 +115,7 @@ TEST(SmootherTest, smoother_AcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -178,7 +178,7 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -258,7 +258,7 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -338,7 +338,7 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -418,7 +418,7 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -497,7 +497,7 @@ TEST(SmootherTest, SequentialSmootherDirBC_Interior_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -576,7 +576,7 @@ TEST(SmootherTest, ParallelSmootherDirBC_Interior_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -655,7 +655,7 @@ TEST(SmootherTest, SequentialSmootherAcrossOrigin_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -734,7 +734,7 @@ TEST(SmootherTest, ParallelSmootherAcrossOrigin_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -816,7 +816,7 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -896,7 +896,7 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -976,7 +976,7 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1056,7 +1056,7 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1135,7 +1135,7 @@ TEST(SmootherTest, SequentialSmootherTakeDirBC_Interior_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1214,7 +1214,7 @@ TEST(SmootherTest, ParallelSmootherTakeDirBC_Interior_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1293,7 +1293,7 @@ TEST(SmootherTest, SequentialSmootherTakeAcrossOrigin_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = @@ -1372,7 +1372,7 @@ TEST(SmootherTest, ParallelSmootherTakeAcrossOrigin_SmallestGrid) CzarnyGeometry domain_geometry(Rmax, kappa_eps, delta_e); - auto grid = std::make_unique(radii, angles); + auto grid = std::make_unique(radii, angles); double alpha_jump = 0.678 * Rmax; std::unique_ptr coefficients = From f4631e294ad89e4b38e2c838a6a749ace9b27809 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Thu, 18 Dec 2025 10:34:42 +0100 Subject: [PATCH 12/15] Sign warnings --- .../DirectSolver-COO-MUMPS-Give/applySymmetryShift.cpp | 2 +- .../DirectSolver-COO-MUMPS-Take/applySymmetryShift.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DirectSolver/DirectSolver-COO-MUMPS-Give/applySymmetryShift.cpp b/src/DirectSolver/DirectSolver-COO-MUMPS-Give/applySymmetryShift.cpp index e729c530..4cdcdf40 100644 --- a/src/DirectSolver/DirectSolver-COO-MUMPS-Give/applySymmetryShift.cpp +++ b/src/DirectSolver/DirectSolver-COO-MUMPS-Give/applySymmetryShift.cpp @@ -123,7 +123,7 @@ void DirectSolverGive::applySymmetryShiftOuterBoundary(Vector x) const // clang-format off void DirectSolverGive::applySymmetryShift(Vector x) const { - assert(x.size() == grid_.numberOfNodes()); + assert(x.size() == static_cast(grid_.numberOfNodes())); assert(grid_.nr() >= 4); if (num_omp_threads_ == 1) { diff --git a/src/DirectSolver/DirectSolver-COO-MUMPS-Take/applySymmetryShift.cpp b/src/DirectSolver/DirectSolver-COO-MUMPS-Take/applySymmetryShift.cpp index e78ee456..b6384f07 100644 --- a/src/DirectSolver/DirectSolver-COO-MUMPS-Take/applySymmetryShift.cpp +++ b/src/DirectSolver/DirectSolver-COO-MUMPS-Take/applySymmetryShift.cpp @@ -80,7 +80,7 @@ void DirectSolverTake::applySymmetryShiftOuterBoundary(Vector x) const void DirectSolverTake::applySymmetryShift(Vector x) const { - assert(x.size() == grid_.numberOfNodes()); + assert(x.size() == static_cast(grid_.numberOfNodes())); assert(grid_.nr() >= 4); if (num_omp_threads_ == 1) { From ff20c8c00ea9432945cb126b33e6a0c61e565694 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Thu, 18 Dec 2025 10:34:56 +0100 Subject: [PATCH 13/15] Update initialisation --- tests/DirectSolver/directSolver.cpp | 88 +++++++++++++++++------------ 1 file changed, 52 insertions(+), 36 deletions(-) diff --git a/tests/DirectSolver/directSolver.cpp b/tests/DirectSolver/directSolver.cpp index 84e8c5a3..c08674bd 100644 --- a/tests/DirectSolver/directSolver.cpp +++ b/tests/DirectSolver/directSolver.cpp @@ -82,8 +82,6 @@ TEST(DirectSolverTest, directSolver_DirBC_Interior) std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -96,6 +94,8 @@ TEST(DirectSolverTest, directSolver_DirBC_Interior) auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, false); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTake directSolverGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -137,8 +137,6 @@ TEST(DirectSolverTest, directSolver_AcrossOrigin) std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -151,6 +149,8 @@ TEST(DirectSolverTest, directSolver_AcrossOrigin) auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGive directSolverGive_operator(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -196,7 +196,6 @@ TEST(DirectSolverTest_CircularGeometry, SequentialDirectSolverDirBC_Interior_Cir std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -207,6 +206,8 @@ TEST(DirectSolverTest_CircularGeometry, SequentialDirectSolverDirBC_Interior_Cir auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -241,7 +242,6 @@ TEST(DirectSolverTest_CircularGeometry, ParallelDirectSolverDirBC_Interior_Circu std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -252,6 +252,8 @@ TEST(DirectSolverTest_CircularGeometry, ParallelDirectSolverDirBC_Interior_Circu auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -286,7 +288,6 @@ TEST(DirectSolverTest_CircularGeometry, SequentialDirectSolverAcrossOrigin_Circu std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -297,6 +298,8 @@ TEST(DirectSolverTest_CircularGeometry, SequentialDirectSolverAcrossOrigin_Circu auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -331,7 +334,6 @@ TEST(DirectSolverTest_CircularGeometry, ParallelDirectSolverAcrossOrigin_Circula std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -342,6 +344,8 @@ TEST(DirectSolverTest_CircularGeometry, ParallelDirectSolverAcrossOrigin_Circula auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -381,8 +385,6 @@ TEST(DirectSolverTest_ShafranovGeometry, DirectSolverDirBC_Interior_ShafranovGeo std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -393,6 +395,8 @@ TEST(DirectSolverTest_ShafranovGeometry, DirectSolverDirBC_Interior_ShafranovGeo auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -428,8 +432,6 @@ TEST(DirectSolverTest_ShafranovGeometry, DirectSolverAcrossOrigin_ShafranovGeome std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -440,6 +442,8 @@ TEST(DirectSolverTest_ShafranovGeometry, DirectSolverAcrossOrigin_ShafranovGeome auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -480,8 +484,6 @@ TEST(DirectSolverTest_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGeometry) std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -492,6 +494,8 @@ TEST(DirectSolverTest_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGeometry) auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -528,8 +532,6 @@ TEST(DirectSolverTest_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeometry) std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -540,6 +542,8 @@ TEST(DirectSolverTest_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeometry) auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -577,7 +581,6 @@ TEST(DirectSolverTest_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGeometry) std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -588,6 +591,8 @@ TEST(DirectSolverTest_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGeometry) auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -621,7 +626,6 @@ TEST(DirectSolverTest_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeometry) std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -632,6 +636,8 @@ TEST(DirectSolverTest_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeometry) auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -678,7 +684,6 @@ TEST(DirectSolverTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecision_ std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -689,6 +694,8 @@ TEST(DirectSolverTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecision_ auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -723,7 +730,6 @@ TEST(DirectSolverTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecision2 std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -734,6 +740,8 @@ TEST(DirectSolverTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecision2 auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverGive solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -769,7 +777,6 @@ TEST(DirectSolverTakeTest_CircularGeometry, SequentialDirectSolverDirBC_Interior std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = true; int maxOpenMPThreads = 1; @@ -780,6 +787,8 @@ TEST(DirectSolverTakeTest_CircularGeometry, SequentialDirectSolverDirBC_Interior auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -814,7 +823,6 @@ TEST(DirectSolverTakeTest_CircularGeometry, ParallelDirectSolverDirBC_Interior_C std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -825,6 +833,8 @@ TEST(DirectSolverTakeTest_CircularGeometry, ParallelDirectSolverDirBC_Interior_C auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -859,7 +869,6 @@ TEST(DirectSolverTakeTest_CircularGeometry, SequentialDirectSolverAcrossOrigin_C std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -870,6 +879,8 @@ TEST(DirectSolverTakeTest_CircularGeometry, SequentialDirectSolverAcrossOrigin_C auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -904,7 +915,6 @@ TEST(DirectSolverTakeTest_CircularGeometry, ParallelDirectSolverAcrossOrigin_Cir std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -915,6 +925,8 @@ TEST(DirectSolverTakeTest_CircularGeometry, ParallelDirectSolverAcrossOrigin_Cir auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -954,8 +966,6 @@ TEST(DirectSolverTakeTest_ShafranovGeometry, DirectSolverDirBC_Interior_Shafrano std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -966,6 +976,8 @@ TEST(DirectSolverTakeTest_ShafranovGeometry, DirectSolverDirBC_Interior_Shafrano auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1001,8 +1013,6 @@ TEST(DirectSolverTakeTest_ShafranovGeometry, DirectSolverAcrossOrigin_ShafranovG std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -1013,6 +1023,8 @@ TEST(DirectSolverTakeTest_ShafranovGeometry, DirectSolverAcrossOrigin_ShafranovG auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1053,8 +1065,6 @@ TEST(DirectSolverTakeTest_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGeome std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -1065,6 +1075,8 @@ TEST(DirectSolverTakeTest_CzarnyGeometry, DirectSolverDirBC_Interior_CzarnyGeome auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1101,8 +1113,6 @@ TEST(DirectSolverTakeTest_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeometr std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax, kappa_eps, delta_e); - std::unique_ptr source_term = - std::make_unique(Rmax, kappa_eps, delta_e); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -1113,6 +1123,8 @@ TEST(DirectSolverTakeTest_CzarnyGeometry, DirectSolverAcrossOrigin_CzarnyGeometr auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax, kappa_eps, delta_e); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1150,7 +1162,6 @@ TEST(DirectSolverTakeTest_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGeome std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = true; int maxOpenMPThreads = 16; @@ -1161,6 +1172,8 @@ TEST(DirectSolverTakeTest_CulhamGeometry, DirectSolverDirBC_Interior_CulhamGeome auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1194,7 +1207,6 @@ TEST(DirectSolverTakeTest_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeometr std::unique_ptr coefficients = std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 16; @@ -1205,6 +1217,8 @@ TEST(DirectSolverTakeTest_CulhamGeometry, DirectSolverAcrossOrigin_CulhamGeometr auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1249,7 +1263,6 @@ TEST(DirectSolverTakeTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecis std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -1260,6 +1273,8 @@ TEST(DirectSolverTakeTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecis auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); @@ -1294,7 +1309,6 @@ TEST(DirectSolverTakeTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecis std::make_unique(Rmax, alpha_jump); std::unique_ptr boundary_conditions = std::make_unique(Rmax); - std::unique_ptr source_term = std::make_unique(Rmax); bool DirBC_Interior = false; int maxOpenMPThreads = 1; @@ -1305,6 +1319,8 @@ TEST(DirectSolverTakeTest_CircularGeometry, DirectSolverAcrossOriginHigherPrecis auto levelCache = std::make_unique(*grid, *coefficients, domain_geometry, cache_density_rpofile_coefficients, cache_domain_geometry); Level level(0, std::move(grid), std::move(levelCache), ExtrapolationType::NONE, 0); + std::unique_ptr source_term = + std::make_unique(level.grid(), Rmax); DirectSolverTake solver_op(level.grid(), level.levelCache(), domain_geometry, *coefficients, DirBC_Interior, maxOpenMPThreads); From 943e8510b7c9665b69e3eebbcce08c6f57f188e1 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Thu, 18 Dec 2025 16:03:39 +0100 Subject: [PATCH 14/15] Add warning that would have caught this failure --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47cad7d8..1295c057 100755 --- a/CMakeLists.txt +++ b/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 From 69bc47176fe1ce85a60cb7a817f39cafe208793f Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Thu, 18 Dec 2025 16:04:03 +0100 Subject: [PATCH 15/15] Correct arguments --- src/GMGPolar/build_rhs_f.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GMGPolar/build_rhs_f.cpp b/src/GMGPolar/build_rhs_f.cpp index 3ae9d749..3f5e45a6 100644 --- a/src/GMGPolar/build_rhs_f.cpp +++ b/src/GMGPolar/build_rhs_f.cpp @@ -18,7 +18,7 @@ void GMGPolar::build_rhs_f(const Level& level, Vector rhs_f, const Bound double theta = grid.theta(i_theta); if ((0 < i_r && i_r < grid.nr() - 1) || (i_r == 0 && !DirBC_Interior_)) { - rhs_f[grid.index(i_r, i_theta)] = source_term(r, theta); + rhs_f[grid.index(i_r, i_theta)] = source_term(i_r, i_theta); } else if (i_r == 0 && DirBC_Interior_) { rhs_f[grid.index(i_r, i_theta)] = boundary_conditions.u_D_Interior(r, theta); @@ -39,7 +39,7 @@ void GMGPolar::build_rhs_f(const Level& level, Vector rhs_f, const Bound for (int i_r = grid.numberSmootherCircles(); i_r < grid.nr(); i_r++) { double r = grid.radius(i_r); if ((0 < i_r && i_r < grid.nr() - 1) || (i_r == 0 && !DirBC_Interior_)) { - rhs_f[grid.index(i_r, i_theta)] = source_term(r, theta); + rhs_f[grid.index(i_r, i_theta)] = source_term(i_r, i_theta); } else if (i_r == 0 && DirBC_Interior_) { rhs_f[grid.index(i_r, i_theta)] = boundary_conditions.u_D_Interior(r, theta);