From d098295498baefc050289b2989f51e24c896ba0f Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sat, 23 Sep 2023 09:18:35 -0400 Subject: [PATCH] some more true-SDC simplication we can basically do what simplified-SDC does now --- integration/RKC/rkc_type.H | 3 --- integration/VODE/vode_type.H | 4 +--- integration/integrator_data.H | 19 +------------------ 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/integration/RKC/rkc_type.H b/integration/RKC/rkc_type.H index 0d0d07f443..2a31f74858 100644 --- a/integration/RKC/rkc_type.H +++ b/integration/RKC/rkc_type.H @@ -26,9 +26,6 @@ struct rkc_t { // Tolerances amrex::Real rtol_spec, atol_spec; amrex::Real rtol_enuc, atol_enuc; -#ifdef TRUE_SDC - amrex::Real rtol_dens, atol_dens; -#endif // RKC had an info array with 4 elements diff --git a/integration/VODE/vode_type.H b/integration/VODE/vode_type.H index e164c89139..ce37e163ec 100644 --- a/integration/VODE/vode_type.H +++ b/integration/VODE/vode_type.H @@ -139,9 +139,7 @@ struct dvode_t // Tolerances Real rtol_spec, atol_spec; Real rtol_enuc, atol_enuc; -#ifdef TRUE_SDC - Real rtol_dens, atol_dens; -#endif + // Local time and integration end time amrex::Real t, tout; diff --git a/integration/integrator_data.H b/integration/integrator_data.H index 5f64ca7e07..2d2d599803 100644 --- a/integration/integrator_data.H +++ b/integration/integrator_data.H @@ -5,18 +5,7 @@ // Define the size of the ODE system that VODE will integrate -#ifdef STRANG -const int INT_NEQS = NumSpec + 1; -#endif - -#ifdef SIMPLIFIED_SDC -const int INT_NEQS = SVAR_EVOLVE; -#endif - -#ifdef TRUE_SDC const int INT_NEQS = NumSpec + 1; -#endif - // We will use this parameter to determine if a given species // abundance is unreasonably small or large (each X must satisfy @@ -49,13 +38,7 @@ constexpr int integrator_neqs () if constexpr (has_energy::value) { int_neqs += 1; } -#endif - -#ifdef SIMPLIFIED_SDC - int_neqs = SVAR_EVOLVE; -#endif - -#ifdef TRUE_SDC +#else int_neqs = NumSpec + 1; #endif