From 2059fa7d75cd0557755b2797405e8864e897e07e Mon Sep 17 00:00:00 2001 From: Edoardo Zoni <59625522+EZoni@users.noreply.github.com> Date: Mon, 26 Jul 2021 18:32:45 -0700 Subject: RZ PSATD: Multi-J Algorithm (#2111) * RZ PSATD: Implement Multi-J Algorithm * Implement J_linear_in_time Option * Reduce Style Changes * Move Copy/Zero/Scale Functions to SpectralFieldDataRZ * Remove Unused Member m_n_rz_azimuthal_modes from SpectralSolverRZ * Fix CI -Werror Warnings * Implement Same Changes of #2116, Cleaning * Fix Bug: Pass Correct dt to SpectralSolverRZ * Add CI Test * CI Test: Set random_theta = 0, Update Benchmark * Remove random_theta from Inputs * Update Benchmark of multi_J_rz_psatd --- .../SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.H | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.H') diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.H index 4987e88d7..07c4d8142 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.H +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.H @@ -21,7 +21,11 @@ class PsatdAlgorithmRZ : public SpectralBaseAlgorithmRZ const SpectralFieldIndex& spectral_index, int const n_rz_azimuthal_modes, int const norder_z, bool const nodal, amrex::Real const dt_step, - bool const update_with_rho); + bool const update_with_rho, + const bool time_averaging, + const bool J_linear_in_time, + const bool dive_cleaning, + const bool divb_cleaning); // Redefine functions from base class virtual void pushSpectralFields(SpectralFieldDataRZ & f) override final; @@ -67,6 +71,10 @@ class PsatdAlgorithmRZ : public SpectralBaseAlgorithmRZ // Note that dt is saved to use in InitializeSpectralCoefficients amrex::Real m_dt; bool m_update_with_rho; + bool m_time_averaging; + bool m_J_linear_in_time; + bool m_dive_cleaning; + bool m_divb_cleaning; SpectralRealCoefficients C_coef, S_ck_coef, X1_coef, X2_coef, X3_coef; }; -- cgit v1.2.3