Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some more true-SDC simplication #1340

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions integration/RKC/rkc_type.H
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions integration/VODE/vode_type.H
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
19 changes: 1 addition & 18 deletions integration/integrator_data.H
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -49,13 +38,7 @@ constexpr int integrator_neqs ()
if constexpr (has_energy<BurnT>::value) {
int_neqs += 1;
}
#endif

#ifdef SIMPLIFIED_SDC
int_neqs = SVAR_EVOLVE;
#endif

#ifdef TRUE_SDC
#else
int_neqs = NumSpec + 1;
#endif

Expand Down