diff --git a/Docs/source/ode_integrators.rst b/Docs/source/ode_integrators.rst index 1aa3a0765..f4911a4e8 100644 --- a/Docs/source/ode_integrators.rst +++ b/Docs/source/ode_integrators.rst @@ -70,10 +70,6 @@ Presently, allowed integrators are: * ``3`` : ROS2S method, a 2nd order, stiff-accurate method :cite:`ros2s`. - * ``4`` : ROS2 method, a 2nd order, L-stable method :cite:`ros2`. - - * ``5`` : Rosenbrock-Euler, a first-order method. - Here the "P" suffix refers to methods developed to satisfy the stiff accuracy conditions of :cite:`Prothero1974` (ROS2S also satisfies these). diff --git a/integration/Rosenbrock/_parameters b/integration/Rosenbrock/_parameters index 680d7962f..90121d0c7 100644 --- a/integration/Rosenbrock/_parameters +++ b/integration/Rosenbrock/_parameters @@ -8,9 +8,7 @@ X_reject_buffer real 1.0 # 0 = Rodas5P 8-stage method from DifferentialEquations.jl # 1 = Rodas4P 6-stage method from DifferentialEquations.jl # 2 = Rodas3P 5-stage method from DifferentialEquations.jl -# 3 = existing 3-stage ROS2S tableau -# 4 = Verwer et al. (1999) 2-stage ROS2 tableau -# 5 = Rosenbrock-Euler 1-stage method +# 3 = ROS2S 3-stage method from Hamkar et al. (2012) rosenbrock_tableau int 0 # H211b timestep controller parameters diff --git a/integration/Rosenbrock/rosenbrock_integrator.H b/integration/Rosenbrock/rosenbrock_integrator.H index 6c8311808..535bad586 100644 --- a/integration/Rosenbrock/rosenbrock_integrator.H +++ b/integration/Rosenbrock/rosenbrock_integrator.H @@ -597,12 +597,6 @@ int rosenbrock_integrator (BurnT& state, rosenbrock_t()>& if (integrator_rp::rosenbrock_tableau == 3) { return rosenbrock_integrator(state, rstate); } - if (integrator_rp::rosenbrock_tableau == 4) { - return rosenbrock_integrator(state, rstate); - } - if (integrator_rp::rosenbrock_tableau == 5) { - return rosenbrock_integrator(state, rstate); - } return rosenbrock_integrator(state, rstate); } diff --git a/integration/Rosenbrock/rosenbrock_tableau.H b/integration/Rosenbrock/rosenbrock_tableau.H index c4a2fd839..5cf2e42cc 100644 --- a/integration/Rosenbrock/rosenbrock_tableau.H +++ b/integration/Rosenbrock/rosenbrock_tableau.H @@ -66,47 +66,6 @@ struct ros2s_tableau { } }; -struct ros2_tableau { - static constexpr int stages = 2; - static constexpr amrex::Real gamma = 1.7071067811865475_rt; - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real ct (const int i) { - (void) i; - return 1.0_rt; - } - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real a (const int i, const int j) { - if (i == 2 && j == 1) { - return 0.585786437626905_rt; - } - return 0.0_rt; - } - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real c (const int i, const int j) { - if (i == 2 && j == 1) { - return -1.1715728752538102_rt; - } - return 0.0_rt; - } - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real b (const int i) { - if (i == 1) { - return 0.8786796564403575_rt; - } - return 0.2928932188134525_rt; - } - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real e (const int i) { - (void) i; - return 0.2928932188134525_rt; - } -}; - struct rodas3p_tableau { static constexpr int stages = 5; static constexpr amrex::Real gamma = 1.0_rt / 3.0_rt; @@ -530,43 +489,6 @@ struct rodas4p_tableau { } }; -struct rosenbrock_euler_tableau { - static constexpr int stages = 1; - static constexpr amrex::Real gamma = 1.0_rt; - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real ct (const int i) { - (void) i; - return 0.0_rt; - } - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real a (const int i, const int j) { - (void) i; - (void) j; - return 0.0_rt; - } - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real c (const int i, const int j) { - (void) i; - (void) j; - return 0.0_rt; - } - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real b (const int i) { - (void) i; - return 1.0_rt; - } - - AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - static constexpr amrex::Real e (const int i) { - (void) i; - return 1.0_rt; - } -}; - using coefficients = rodas5p_tableau; }