diff --git a/include/ConfigParser/config_parser.h b/include/ConfigParser/config_parser.h index e8ac97d5..d67a8aac 100644 --- a/include/ConfigParser/config_parser.h +++ b/include/ConfigParser/config_parser.h @@ -46,7 +46,7 @@ class ConfigParser bool cacheDensityProfileCoefficients() const; bool cacheDomainGeometry() const; - const PolarGrid& grid() const; + const PolarGrid& grid() const; // Full Multigrid Method bool FMG() const; @@ -96,7 +96,7 @@ class ConfigParser bool cache_density_profile_coefficients_; bool cache_domain_geometry_; // Grid configuration - PolarGrid grid_; + PolarGrid grid_; // Multigrid settings ExtrapolationType extrapolation_; int max_levels_; diff --git a/include/GMGPolar/gmgpolar.h b/include/GMGPolar/gmgpolar.h index da97eb82..da8fa07b 100644 --- a/include/GMGPolar/gmgpolar.h +++ b/include/GMGPolar/gmgpolar.h @@ -142,7 +142,7 @@ class GMGPolar : public IGMGPolar // Public due to cuda restrictions public: template - void build_rhs_f(const Level& level, HostVector rhs_f, + void build_rhs_f(const Level& level, Vector rhs_f, const BoundaryConditions& boundary_conditions, const SourceTerm& source_term); void discretize_rhs_f(const Level& level, HostVector rhs_f); diff --git a/include/GMGPolar/setup.h b/include/GMGPolar/setup.h index 28ef0a57..8f87ed57 100644 --- a/include/GMGPolar/setup.h +++ b/include/GMGPolar/setup.h @@ -339,10 +339,10 @@ void GMGPolar::discretize_rhs_f( template template void GMGPolar::build_rhs_f( - const Level& level, HostVector rhs_f, + const Level& level, Vector rhs_f, const BoundaryConditions& boundary_conditions, const SourceTerm& source_term) { - const PolarGrid grid(level.grid()); + const PolarGrid& grid(level.grid()); assert(std::ssize(rhs_f) == grid.numberOfNodes()); const bool DirBC_Interior = DirBC_Interior_; @@ -352,7 +352,7 @@ void GMGPolar::build_rhs_f( // ----------------------------------------- // Kokkos::parallel_for( "build_rhs_f: Circular", - Kokkos::MDRangePolicy>( + Kokkos::MDRangePolicy>( {0, 0}, {grid.numberSmootherCircles(), grid.ntheta()}), KOKKOS_LAMBDA(const int i_r, const int i_theta) { const double radius = grid.radius(i_r); @@ -373,8 +373,8 @@ void GMGPolar::build_rhs_f( // --------------------------------------- // Kokkos::parallel_for( "build_rhs_f: Radial", - Kokkos::MDRangePolicy>({0, grid.numberSmootherCircles()}, - {grid.ntheta(), grid.nr()}), + Kokkos::MDRangePolicy>({0, grid.numberSmootherCircles()}, + {grid.ntheta(), grid.nr()}), KOKKOS_LAMBDA(const int i_theta, const int i_r) { const double radius = grid.radius(i_r); const double theta = grid.theta(i_theta); diff --git a/include/GMGPolar/solver.h b/include/GMGPolar/solver.h index a2013c78..fbb3d9ef 100644 --- a/include/GMGPolar/solver.h +++ b/include/GMGPolar/solver.h @@ -13,7 +13,10 @@ void GMGPolar::solve(const BoundaryC /* ------------------------------------- */ /* Build rhs_f on Level 0 (finest Level) */ /* ------------------------------------- */ - build_rhs_f(levels_[0], levels_[0].rhs(), boundary_conditions, source_term); + HostVector rhs_f_host = levels_[0].rhs(); + auto rhs_f = Kokkos::create_mirror_view_and_copy(DefaultMemorySpace(), rhs_f_host); + build_rhs_f(levels_[0], rhs_f, boundary_conditions, source_term); + Kokkos::deep_copy(rhs_f_host, rhs_f); /* ---------------- */ /* Discretize rhs_f */ diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h index 8615d395..c4adb8f9 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_Poisson_CircularGeometry { public: - explicit CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Poisson_CircularGeometry(const CartesianR2_Poisson_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h index 659d5ef2..3880344d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_Poisson_CzarnyGeometry { public: - explicit CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Poisson_CzarnyGeometry(const CartesianR2_Poisson_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 70d5c8bc..0ae654e7 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_Poisson_ShafranovGeometry { public: - explicit CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Poisson_ShafranovGeometry(const CartesianR2_Poisson_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_Poisson_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 ef18431b..25a8a97f 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_SonnendruckerGyro_CircularGeometry { public: - explicit CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR2_SonnendruckerGyro_CircularGeometry(const CartesianR2_SonnendruckerGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h index 5902b6e3..5ad32854 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_SonnendruckerGyro_CzarnyGeometry { public: - explicit CartesianR2_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR2_SonnendruckerGyro_CzarnyGeometry(const CartesianR2_SonnendruckerGyro_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_SonnendruckerGyro_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 5757857f..f486be53 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_SonnendruckerGyro_ShafranovGeometry { public: - explicit CartesianR2_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR2_SonnendruckerGyro_ShafranovGeometry(const CartesianR2_SonnendruckerGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_SonnendruckerGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 4e6bea76..a22868d4 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_Sonnendrucker_CircularGeometry { public: - explicit CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Sonnendrucker_CircularGeometry(const CartesianR2_Sonnendrucker_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h index 6395fbfa..3b949279 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_Sonnendrucker_CzarnyGeometry { public: - explicit CartesianR2_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Sonnendrucker_CzarnyGeometry(const CartesianR2_Sonnendrucker_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_Sonnendrucker_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 91dddb1a..51ebaedc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_Sonnendrucker_ShafranovGeometry { public: - explicit CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Sonnendrucker_ShafranovGeometry(const CartesianR2_Sonnendrucker_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_Sonnendrucker_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 1dd1fb75..7ce692e2 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_ZoniGyro_CircularGeometry { public: - explicit CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniGyro_CircularGeometry(const CartesianR2_ZoniGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h index 75a2cbc5..068afc4c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_ZoniGyro_CzarnyGeometry { public: - explicit CartesianR2_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniGyro_CzarnyGeometry(const CartesianR2_ZoniGyro_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 80797ef6..7299bc2c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_ZoniGyro_ShafranovGeometry { public: - explicit CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniGyro_ShafranovGeometry(const CartesianR2_ZoniGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_ZoniGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 f9833a04..9074036c 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_ZoniShiftedGyro_CircularGeometry { public: - explicit CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniShiftedGyro_CircularGeometry(const CartesianR2_ZoniShiftedGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h index ca42fc2a..79c508bc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_ZoniShiftedGyro_CzarnyGeometry { public: - explicit CartesianR2_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniShiftedGyro_CzarnyGeometry(const CartesianR2_ZoniShiftedGyro_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_ZoniShiftedGyro_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 8ae48280..f404a282 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_ZoniShiftedGyro_ShafranovGeometry { public: - explicit CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniShiftedGyro_ShafranovGeometry(const CartesianR2_ZoniShiftedGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_ZoniShiftedGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 15861016..81080b67 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_ZoniShifted_CircularGeometry { public: - explicit CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniShifted_CircularGeometry(const CartesianR2_ZoniShifted_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h index 900b2906..2f17a5e5 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_ZoniShifted_CzarnyGeometry { public: - explicit CartesianR2_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniShifted_CzarnyGeometry(const CartesianR2_ZoniShifted_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_ZoniShifted_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 4a8436c3..d3b23eeb 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR2_ZoniShifted_ShafranovGeometry { public: - explicit CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR2_ZoniShifted_ShafranovGeometry(const CartesianR2_ZoniShifted_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR2_ZoniShifted_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 bb6b58a7..84734f6e 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h @@ -12,13 +12,13 @@ namespace gmgpolar class CartesianR2_Zoni_CircularGeometry { public: - explicit CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Zoni_CircularGeometry(const CartesianR2_Zoni_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h index d28a8735..30216afc 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_Zoni_CzarnyGeometry { public: - explicit CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Zoni_CzarnyGeometry(const CartesianR2_Zoni_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 cc89ad11..ea2fa882 100644 --- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR2_Zoni_ShafranovGeometry { public: - explicit CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR2_Zoni_ShafranovGeometry(const CartesianR2_Zoni_ShafranovGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 e8aafa57..d58f773b 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_Poisson_CircularGeometry { public: - explicit CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Poisson_CircularGeometry(const CartesianR6_Poisson_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h index 4d953037..b184ad03 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_Poisson_CzarnyGeometry { public: - explicit CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Poisson_CzarnyGeometry(const CartesianR6_Poisson_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 1f24ef61..53c8ebcb 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_Poisson_ShafranovGeometry { public: - explicit CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Poisson_ShafranovGeometry(const CartesianR6_Poisson_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_Poisson_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 53275532..fa81c530 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_SonnendruckerGyro_CircularGeometry { public: - explicit CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR6_SonnendruckerGyro_CircularGeometry(const CartesianR6_SonnendruckerGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h index b08fe9cd..62db34fe 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_SonnendruckerGyro_CzarnyGeometry { public: - explicit CartesianR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR6_SonnendruckerGyro_CzarnyGeometry(const CartesianR6_SonnendruckerGyro_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_SonnendruckerGyro_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 49f4248c..6908e305 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_SonnendruckerGyro_ShafranovGeometry { public: - explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR6_SonnendruckerGyro_ShafranovGeometry(const CartesianR6_SonnendruckerGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_SonnendruckerGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 1ae22336..860587da 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_Sonnendrucker_CircularGeometry { public: - explicit CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Sonnendrucker_CircularGeometry(const CartesianR6_Sonnendrucker_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h index 7e6f0e7a..f879cc67 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_Sonnendrucker_CzarnyGeometry { public: - explicit CartesianR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Sonnendrucker_CzarnyGeometry(const CartesianR6_Sonnendrucker_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_Sonnendrucker_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 261dcc72..3395d942 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_Sonnendrucker_ShafranovGeometry { public: - explicit CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Sonnendrucker_ShafranovGeometry(const CartesianR6_Sonnendrucker_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_Sonnendrucker_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 c1280a6a..63677bbe 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_ZoniGyro_CircularGeometry { public: - explicit CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniGyro_CircularGeometry(const CartesianR6_ZoniGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h index 996a2cba..007f6056 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_ZoniGyro_CzarnyGeometry { public: - explicit CartesianR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniGyro_CzarnyGeometry(const CartesianR6_ZoniGyro_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 ce4a2412..6fc906a1 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_ZoniGyro_ShafranovGeometry { public: - explicit CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniGyro_ShafranovGeometry(const CartesianR6_ZoniGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_ZoniGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 cdbaec71..c3766a59 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_ZoniShiftedGyro_CircularGeometry { public: - explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniShiftedGyro_CircularGeometry(const CartesianR6_ZoniShiftedGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h index d97e04ac..c4793982 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_ZoniShiftedGyro_CzarnyGeometry { public: - explicit CartesianR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniShiftedGyro_CzarnyGeometry(const CartesianR6_ZoniShiftedGyro_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_ZoniShiftedGyro_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 d598b031..13c5891d 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_ZoniShiftedGyro_ShafranovGeometry { public: - explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniShiftedGyro_ShafranovGeometry(const CartesianR6_ZoniShiftedGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_ZoniShiftedGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 401b244e..afd7aa25 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_ZoniShifted_CircularGeometry { public: - explicit CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniShifted_CircularGeometry(const CartesianR6_ZoniShifted_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h index 25714d98..d34f0f74 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_ZoniShifted_CzarnyGeometry { public: - explicit CartesianR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniShifted_CzarnyGeometry(const CartesianR6_ZoniShifted_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_ZoniShifted_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 61b22e46..2c1fc9f9 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class CartesianR6_ZoniShifted_ShafranovGeometry { public: - explicit CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR6_ZoniShifted_ShafranovGeometry(const CartesianR6_ZoniShifted_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class CartesianR6_ZoniShifted_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 410547cc..125d0819 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h @@ -12,13 +12,13 @@ namespace gmgpolar class CartesianR6_Zoni_CircularGeometry { public: - explicit CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Zoni_CircularGeometry(const CartesianR6_Zoni_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h index bfcd8c31..546cc5e5 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_Zoni_CzarnyGeometry { public: - explicit CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Zoni_CzarnyGeometry(const CartesianR6_Zoni_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 bd2aec72..f5d9d273 100644 --- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class CartesianR6_Zoni_ShafranovGeometry { public: - explicit CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION CartesianR6_Zoni_ShafranovGeometry(const CartesianR6_Zoni_ShafranovGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 fd705e8b..d7d45269 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h @@ -12,13 +12,13 @@ namespace gmgpolar class PolarR6_Poisson_CircularGeometry { public: - explicit PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION PolarR6_Poisson_CircularGeometry(const PolarR6_Poisson_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h index 7200d410..0cab1a17 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_Poisson_CzarnyGeometry { public: - explicit PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION PolarR6_Poisson_CzarnyGeometry(const PolarR6_Poisson_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 b92ce580..93e7bc59 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_Poisson_ShafranovGeometry { public: - explicit PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION PolarR6_Poisson_ShafranovGeometry(const PolarR6_Poisson_ShafranovGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 8be29b20..ddc5e879 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_SonnendruckerGyro_CircularGeometry { public: - explicit PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION PolarR6_SonnendruckerGyro_CircularGeometry(const PolarR6_SonnendruckerGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h index 87966eec..9dbd022f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class PolarR6_SonnendruckerGyro_CzarnyGeometry { public: - explicit PolarR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_SonnendruckerGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION PolarR6_SonnendruckerGyro_CzarnyGeometry(const PolarR6_SonnendruckerGyro_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class PolarR6_SonnendruckerGyro_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 27d6888c..d42cfafa 100644 --- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class PolarR6_SonnendruckerGyro_ShafranovGeometry { public: - explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION PolarR6_SonnendruckerGyro_ShafranovGeometry(const PolarR6_SonnendruckerGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class PolarR6_SonnendruckerGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 72d130d8..a3b03a92 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_Sonnendrucker_CircularGeometry { public: - explicit PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION PolarR6_Sonnendrucker_CircularGeometry(const PolarR6_Sonnendrucker_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h index 17f8e982..0eb4469d 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class PolarR6_Sonnendrucker_CzarnyGeometry { public: - explicit PolarR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION PolarR6_Sonnendrucker_CzarnyGeometry(const PolarR6_Sonnendrucker_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class PolarR6_Sonnendrucker_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 36f78293..e08b9aee 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class PolarR6_Sonnendrucker_ShafranovGeometry { public: - explicit PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION PolarR6_Sonnendrucker_ShafranovGeometry(const PolarR6_Sonnendrucker_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class PolarR6_Sonnendrucker_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 7c2f944b..7c82f3a7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h @@ -12,13 +12,13 @@ namespace gmgpolar class PolarR6_ZoniGyro_CircularGeometry { public: - explicit PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniGyro_CircularGeometry(const PolarR6_ZoniGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h index b42ba165..5fbca18b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_ZoniGyro_CzarnyGeometry { public: - explicit PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniGyro_CzarnyGeometry(const PolarR6_ZoniGyro_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 97826d73..fae59ec7 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_ZoniGyro_ShafranovGeometry { public: - explicit PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniGyro_ShafranovGeometry(const PolarR6_ZoniGyro_ShafranovGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 74fc9204..594ccf1e 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_ZoniShiftedGyro_CircularGeometry { public: - explicit PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniShiftedGyro_CircularGeometry(const PolarR6_ZoniShiftedGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h index 52c4b8af..2f972f82 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_ZoniShiftedGyro_CulhamGeometry { public: - explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); + explicit PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniShiftedGyro_CulhamGeometry(const PolarR6_ZoniShiftedGyro_CulhamGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h index f5e86b7f..9dddd3f1 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class PolarR6_ZoniShiftedGyro_CzarnyGeometry { public: - explicit PolarR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniShiftedGyro_CzarnyGeometry(const PolarR6_ZoniShiftedGyro_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class PolarR6_ZoniShiftedGyro_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 0f5d2323..88ce7ae4 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class PolarR6_ZoniShiftedGyro_ShafranovGeometry { public: - explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniShiftedGyro_ShafranovGeometry(const PolarR6_ZoniShiftedGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class PolarR6_ZoniShiftedGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 074c02a6..fabc7e70 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_ZoniShifted_CircularGeometry { public: - explicit PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniShifted_CircularGeometry(const PolarR6_ZoniShifted_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h index d948d80a..7f68c2f9 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_ZoniShifted_CzarnyGeometry { public: - explicit PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniShifted_CzarnyGeometry(const PolarR6_ZoniShifted_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 bc49f926..e708fc0b 100644 --- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class PolarR6_ZoniShifted_ShafranovGeometry { public: - explicit PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION PolarR6_ZoniShifted_ShafranovGeometry(const PolarR6_ZoniShifted_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class PolarR6_ZoniShifted_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 af358d9e..52064c5f 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h @@ -12,13 +12,13 @@ namespace gmgpolar class PolarR6_Zoni_CircularGeometry { public: - explicit PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION PolarR6_Zoni_CircularGeometry(const PolarR6_Zoni_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h index 2e30ca33..43b0053c 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_Zoni_CzarnyGeometry { public: - explicit PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION PolarR6_Zoni_CzarnyGeometry(const PolarR6_Zoni_CzarnyGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 8844048d..9aa3eb97 100644 --- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class PolarR6_Zoni_ShafranovGeometry { public: - explicit PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION PolarR6_Zoni_ShafranovGeometry(const PolarR6_Zoni_ShafranovGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 d9b4e430..48c0d277 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class Refined_ZoniShiftedGyro_CircularGeometry { public: - explicit Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); + explicit Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION Refined_ZoniShiftedGyro_CircularGeometry(const Refined_ZoniShiftedGyro_CircularGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h index 0663636d..381f66b2 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h @@ -12,14 +12,14 @@ namespace gmgpolar class Refined_ZoniShiftedGyro_CulhamGeometry { public: - explicit Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); + explicit Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax); KOKKOS_DEFAULTED_FUNCTION Refined_ZoniShiftedGyro_CulhamGeometry(const Refined_ZoniShiftedGyro_CulhamGeometry&) = default; KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; }; } // namespace gmgpolar diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h index d19d705a..bbc2a6ef 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class Refined_ZoniShiftedGyro_CzarnyGeometry { public: - explicit Refined_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, + explicit Refined_ZoniShiftedGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e); KOKKOS_DEFAULTED_FUNCTION Refined_ZoniShiftedGyro_CzarnyGeometry(const Refined_ZoniShiftedGyro_CzarnyGeometry&) = default; @@ -20,7 +20,7 @@ class Refined_ZoniShiftedGyro_CzarnyGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid 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 c70ae3b7..a965fd6e 100644 --- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h +++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h @@ -12,7 +12,7 @@ namespace gmgpolar class Refined_ZoniShiftedGyro_ShafranovGeometry { public: - explicit Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, + explicit Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta); KOKKOS_DEFAULTED_FUNCTION Refined_ZoniShiftedGyro_ShafranovGeometry(const Refined_ZoniShiftedGyro_ShafranovGeometry&) = default; @@ -20,7 +20,7 @@ class Refined_ZoniShiftedGyro_ShafranovGeometry KOKKOS_FUNCTION double operator()(std::size_t i_r, std::size_t i_theta) const; private: - PolarGrid grid_; + PolarGrid grid_; const double Rmax = 1.3; const double elongation_kappa = 0.3; const double shift_delta = 0.2; diff --git a/src/ConfigParser/config_parser.cpp b/src/ConfigParser/config_parser.cpp index 2b3e2339..0bd47515 100644 --- a/src/ConfigParser/config_parser.cpp +++ b/src/ConfigParser/config_parser.cpp @@ -353,7 +353,7 @@ bool ConfigParser::cacheDomainGeometry() const return cache_domain_geometry_; } -const PolarGrid& ConfigParser::grid() const +const PolarGrid& ConfigParser::grid() const { return grid_; } diff --git a/src/ConfigParser/select_test_case.cpp b/src/ConfigParser/select_test_case.cpp index 3df4396e..e6a51af0 100644 --- a/src/ConfigParser/select_test_case.cpp +++ b/src/ConfigParser/select_test_case.cpp @@ -6,7 +6,7 @@ std::unique_ptr ConfigParser::solver() const { // Create local aliases so the class doesn't need to be captured by the lamda // These are references, not copies. - const PolarGrid& grid = grid_; + const PolarGrid grid(grid_); // Create a solver specialized to the active domain geometry. return std::visit( diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp index 8b464102..5a3ff1b7 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" using namespace gmgpolar; -CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, +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 e10225a1..56dc2709 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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, +CartesianR2_Poisson_CzarnyGeometry::CartesianR2_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp index 5e769e39..e34349c3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h" using namespace gmgpolar; -CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, +CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp index c611cfad..fc7938c3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 775a4b9e..cd7f8b06 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( - PolarGrid const& grid, 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 d056302f..ae3379cb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_ShafranovGeometry( - PolarGrid const& grid, 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_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp index 4fc1c6f3..25192a31 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 f8dd98ee..c6da7088 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp @@ -7,7 +7,7 @@ void CartesianR2_Sonnendrucker_CzarnyGeometry::initializeGeometry() } CartesianR2_Sonnendrucker_CzarnyGeometry::CartesianR2_Sonnendrucker_CzarnyGeometry( - PolarGrid const& grid, 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_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp index 7063001f..03e1e599 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_ShafranovGeometry( - PolarGrid const& grid, 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_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp index 0633e669..83f2e96c 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" using namespace gmgpolar; -CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, +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 a8e2ecfd..2c42fb84 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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(PolarGrid const& grid, +CartesianR2_ZoniGyro_CzarnyGeometry::CartesianR2_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp index 37f7c2bb..79d14510 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp @@ -1,9 +1,8 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h" using namespace gmgpolar; -CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, - double Rmax, double elongation_kappa, - double shift_delta) +CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry( + 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_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp index ccbbb839..6900a0ef 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 794a4003..2a33444d 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( - PolarGrid const& grid, 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_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp index 1056e53e..33983510 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_ShafranovGeometry( - PolarGrid const& grid, 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_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp index a11fdbfa..5d4c6d4c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 7e054a59..57229bb3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp @@ -6,10 +6,8 @@ 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(PolarGrid const& grid, - double Rmax, - double inverse_aspect_ratio_epsilon, - double ellipticity_e) +CartesianR2_ZoniShifted_CzarnyGeometry::CartesianR2_ZoniShifted_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) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp index c3c9bb76..85055eca 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeometry( - PolarGrid const& grid, 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_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp index aaa7d4e8..492026df 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" using namespace gmgpolar; -CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, +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 8dd52b66..497847a9 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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, +CartesianR2_Zoni_CzarnyGeometry::CartesianR2_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp index fc7f2aa2..1285e8fc 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h" using namespace gmgpolar; -CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, +CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp index 692b7da3..a56b5f0a 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" using namespace gmgpolar; -CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, +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 ee65fe53..5572f89d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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, +CartesianR6_Poisson_CzarnyGeometry::CartesianR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp index d466d42f..d1fecec0 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h" using namespace gmgpolar; -CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, +CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp index 0b9322b1..bb809277 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 1bfbf0f2..19ac487f 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( - PolarGrid const& grid, 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 b1b3c23c..e949f335 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_ShafranovGeometry( - PolarGrid const& grid, 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_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp index 29e1b806..c34a0d86 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 75232b68..87942dec 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp @@ -7,7 +7,7 @@ void CartesianR6_Sonnendrucker_CzarnyGeometry::initializeGeometry() } CartesianR6_Sonnendrucker_CzarnyGeometry::CartesianR6_Sonnendrucker_CzarnyGeometry( - PolarGrid const& grid, 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_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp index 98d0a94d..1009f86f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_ShafranovGeometry( - PolarGrid const& grid, 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_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp index 3ec6a94e..3ab019af 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" using namespace gmgpolar; -CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, +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 78df10bf..d167fb85 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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(PolarGrid const& grid, +CartesianR6_ZoniGyro_CzarnyGeometry::CartesianR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp index 7b752a15..36771894 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,9 +1,8 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h" using namespace gmgpolar; -CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, - double Rmax, double elongation_kappa, - double shift_delta) +CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry( + 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_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp index 45d6178c..d101388e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 229ee967..8269430d 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( - PolarGrid const& grid, 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_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp index a32ec7c7..f004f6a8 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_ShafranovGeometry( - PolarGrid const& grid, 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_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp index 32068308..b0851c7a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 4f1d57fa..d00d65be 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp @@ -6,10 +6,8 @@ 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(PolarGrid const& grid, - double Rmax, - double inverse_aspect_ratio_epsilon, - double ellipticity_e) +CartesianR6_ZoniShifted_CzarnyGeometry::CartesianR6_ZoniShifted_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) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp index 8a221a4e..aa2921e1 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeometry( - PolarGrid const& grid, 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_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp index dd3fd3cd..695f96f2 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" using namespace gmgpolar; -CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, +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 5dea2418..1390b6ff 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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, +CartesianR6_Zoni_CzarnyGeometry::CartesianR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp index 0d5ca758..ba1fb5d8 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h" using namespace gmgpolar; -CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, +CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp index d23e94e9..53dacb52 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" using namespace gmgpolar; -PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, +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 342cb5db..d4cdffa1 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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, +PolarR6_Poisson_CzarnyGeometry::PolarR6_Poisson_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp index 4cf30756..709636f0 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h" using namespace gmgpolar; -PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, +PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp index 7f480aa1..ecab732f 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 ac41f080..66640e6e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -7,7 +7,7 @@ void PolarR6_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() } PolarR6_SonnendruckerGyro_CzarnyGeometry::PolarR6_SonnendruckerGyro_CzarnyGeometry( - PolarGrid const& grid, 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/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp index e9acecd3..b65d0d0e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_ShafranovGeometry( - PolarGrid const& grid, 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/polarR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp index 383a5228..d568779e 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h" using namespace gmgpolar; -PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, - double 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 61087b7b..34cf0bef 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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(PolarGrid const& grid, +PolarR6_Sonnendrucker_CzarnyGeometry::PolarR6_Sonnendrucker_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp index 5d76a168..59af2f9b 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry( - PolarGrid const& grid, 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/polarR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp index e0a5c7ab..30dcff50 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" using namespace gmgpolar; -PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, +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 c7ec3ca3..b11f5496 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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, +PolarR6_ZoniGyro_CzarnyGeometry::PolarR6_ZoniGyro_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp index 4ebb9ea0..2383ba13 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h" using namespace gmgpolar; -PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, +PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp index 1972fff3..8e596e53 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 00a78b55..0a9ad995 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h" using namespace gmgpolar; -PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, - double 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 d123f468..6b8f97da 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -6,10 +6,8 @@ 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(PolarGrid const& grid, - double Rmax, - double inverse_aspect_ratio_epsilon, - double ellipticity_e) +PolarR6_ZoniShiftedGyro_CzarnyGeometry::PolarR6_ZoniShiftedGyro_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) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 15f20191..26613d77 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeometry( - PolarGrid const& grid, 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/polarR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp index a84b4db7..d964831e 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" using namespace gmgpolar; -PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, +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 6afadd19..47d6833b 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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, +PolarR6_ZoniShifted_CzarnyGeometry::PolarR6_ZoniShifted_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp index c40b9019..372f1633 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp @@ -1,7 +1,7 @@ #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h" using namespace gmgpolar; -PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, +PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp index 2729ebe7..ecd4e2d0 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" using namespace gmgpolar; -PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double 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 670a1060..fe7786e8 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp @@ -6,7 +6,7 @@ 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, +PolarR6_Zoni_CzarnyGeometry::PolarR6_Zoni_CzarnyGeometry(PolarGrid const& grid, double Rmax, double inverse_aspect_ratio_epsilon, double ellipticity_e) : grid_(grid) , Rmax(Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp index 13fae9ca..9961214e 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" using namespace gmgpolar; -PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, +PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) : grid_(grid) , Rmax(Rmax) diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp index 32650546..167d6351 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeometry( - PolarGrid const& grid, double Rmax) + 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 12fecae9..66ad8d89 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,8 +1,8 @@ #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h" using namespace gmgpolar; -Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, - double 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 e3c9188f..128f987f 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -6,10 +6,8 @@ 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(PolarGrid const& grid, - double Rmax, - double inverse_aspect_ratio_epsilon, - double ellipticity_e) +Refined_ZoniShiftedGyro_CzarnyGeometry::Refined_ZoniShiftedGyro_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) diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp index 0f58ee1c..9993b7f0 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -2,7 +2,7 @@ using namespace gmgpolar; Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeometry( - PolarGrid const& grid, 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/convergence_order.cpp b/src/convergence_order.cpp index 6540636b..cd68040a 100644 --- a/src/convergence_order.cpp +++ b/src/convergence_order.cpp @@ -85,9 +85,10 @@ int main(int argc, char* argv[]) for (divideBy2 = 0; divideBy2 < MAX_DIVIDE_BY_2; divideBy2++) { double refinement_radius = alpha_jump; std::optional splitting_radius = std::nullopt; - PolarGrid grid(R0, Rmax, nr_exp, ntheta_exp, refinement_radius, anisotropic_factor, - divideBy2, splitting_radius); - GMGPolar solver(grid, domain_geometry, coefficients); + PolarGrid grid_host(R0, Rmax, nr_exp, ntheta_exp, refinement_radius, anisotropic_factor, + divideBy2, splitting_radius); + PolarGrid grid(grid_host); + GMGPolar solver(grid_host, 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); diff --git a/src/main.cpp b/src/main.cpp index e8e535f8..bda8e623 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,8 +20,9 @@ int main(int argc, char* argv[]) // Get the types of the domain geometry and the density profile coefficients using DG = std::decay_t; using DC = std::decay_t; + PolarGrid grid(parser.grid()); // Create GMGPolar solver for the selected geometry and coefficient types - GMGPolar solver(parser.grid(), domain_geometry, density_profile_coeffs); + GMGPolar solver(grid, domain_geometry, density_profile_coeffs); // --- General solver output and visualization settings --- // solver.verbose(parser.verbose()); // Enable/disable verbose output diff --git a/src/strong_scaling.cpp b/src/strong_scaling.cpp index ae354e5d..cd4423a9 100644 --- a/src/strong_scaling.cpp +++ b/src/strong_scaling.cpp @@ -83,9 +83,10 @@ void runTest(int divideBy2, std::ostream& outfile) double refinement_radius = alpha_jump; std::optional splitting_radius = std::nullopt; - PolarGrid grid(R0, Rmax, nr_exp, ntheta_exp, refinement_radius, anisotropic_factor, divideBy2, - splitting_radius); - GMGPolar solver(grid, domain_geometry, coefficients); + PolarGrid grid_host(R0, Rmax, nr_exp, ntheta_exp, refinement_radius, anisotropic_factor, + divideBy2, splitting_radius); + PolarGrid grid(grid_host); + GMGPolar solver(grid_host, 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); diff --git a/src/weak_scaling.cpp b/src/weak_scaling.cpp index 62512c63..2dcd5bce 100644 --- a/src/weak_scaling.cpp +++ b/src/weak_scaling.cpp @@ -83,9 +83,10 @@ void runTest(int divideBy2, std::ostream& outfile) double refinement_radius = alpha_jump; std::optional splitting_radius = std::nullopt; - PolarGrid grid(R0, Rmax, nr_exp, ntheta_exp, refinement_radius, anisotropic_factor, divideBy2, - splitting_radius); - GMGPolar solver(grid, domain_geometry, coefficients); + PolarGrid grid_host(R0, Rmax, nr_exp, ntheta_exp, refinement_radius, anisotropic_factor, + divideBy2, splitting_radius); + PolarGrid grid(grid_host); + GMGPolar solver(grid_host, 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); diff --git a/tests/ConfigParser/config_parser.cpp b/tests/ConfigParser/config_parser.cpp index 31b1f7a1..90e7e517 100644 --- a/tests/ConfigParser/config_parser.cpp +++ b/tests/ConfigParser/config_parser.cpp @@ -169,7 +169,7 @@ TEST_P(ConfigParserTest, ParseAllGeometryAndProblemCombinations) EXPECT_EQ(parser.cacheDomainGeometry(), cacheDomainGeometry); // Grid - const PolarGrid& grid = parser.grid(); + const PolarGrid grid(parser.grid()); EXPECT_NE(&grid, nullptr); EXPECT_DOUBLE_EQ(grid.radius(0), R0); EXPECT_DOUBLE_EQ(grid.radius(grid.nr() - 1), Rmax); diff --git a/tests/GMGPolar/convergence_order.cpp b/tests/GMGPolar/convergence_order.cpp index 1d6a06fd..d85d9573 100644 --- a/tests/GMGPolar/convergence_order.cpp +++ b/tests/GMGPolar/convergence_order.cpp @@ -224,8 +224,10 @@ 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); + PolarGrid grid_host(radii, angles); + PolarGrid grid_refined_host(radii_refined, angles_refined); + 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); @@ -234,10 +236,10 @@ 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, + auto [euclid_error, inf_error] = get_gmgpolar_error(grid_host, 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, + get_gmgpolar_error(grid_refined_host, domain_geometry, coefficients, boundary_conditions, source_term_refined, solution, TestFixture::extrapolation); double euclid_order = log(euclid_error / euclid_error_refined) / log(2); diff --git a/tests/GMGPolar/pcg_tests.cpp b/tests/GMGPolar/pcg_tests.cpp index cf58fa2f..ad05bd60 100644 --- a/tests/GMGPolar/pcg_tests.cpp +++ b/tests/GMGPolar/pcg_tests.cpp @@ -630,9 +630,11 @@ TYPED_TEST_SUITE(PCGTestCase, gmgpolar_test_suite); template void run_gmgpolar() { - PolarGrid grid(TestFixture::R0, TestFixture::Rmax, TestFixture::nrExp, TestFixture::nthetaExp, - TestFixture::refinementRadius, TestFixture::anisotropicFactor, - TestFixture::divideBy2); + PolarGrid grid_host(TestFixture::R0, TestFixture::Rmax, TestFixture::nrExp, + TestFixture::nthetaExp, TestFixture::refinementRadius, + TestFixture::anisotropicFactor, TestFixture::divideBy2); + + PolarGrid grid(grid_host); const double inverse_aspect_ratio_epsilon = 0.3; const double ellipticity_e = 1.4; @@ -644,7 +646,7 @@ void run_gmgpolar() 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); + GMGPolar solver(grid_host, domain, profile_coefficients); bool paraview = false; int preSmoothingSteps = 1; diff --git a/tests/GMGPolar/solve_tests.cpp b/tests/GMGPolar/solve_tests.cpp index 632b2263..0cdf54ca 100644 --- a/tests/GMGPolar/solve_tests.cpp +++ b/tests/GMGPolar/solve_tests.cpp @@ -639,9 +639,11 @@ TYPED_TEST_SUITE(GMGPolarTestCase, gmgpolar_test_suite); template void run_gmgpolar() { - PolarGrid grid(TestFixture::R0, TestFixture::Rmax, TestFixture::nrExp, TestFixture::nthetaExp, - TestFixture::refinementRadius, TestFixture::anisotropicFactor, - TestFixture::divideBy2); + PolarGrid grid_host(TestFixture::R0, TestFixture::Rmax, TestFixture::nrExp, + TestFixture::nthetaExp, TestFixture::refinementRadius, + TestFixture::anisotropicFactor, TestFixture::divideBy2); + + PolarGrid grid(grid_host); const double inverse_aspect_ratio_epsilon = 0.3; const double ellipticity_e = 1.4; @@ -653,7 +655,7 @@ void run_gmgpolar() 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); + GMGPolar solver(grid_host, domain, profile_coefficients); bool paraview = false; int preSmoothingSteps = 1;