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.

Sign up for GitHub

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

Jump to bottom

Remove simplified SDC ifdefs in burn_type #1232

Merged
merged 3 commits into from
Jun 24, 2023
Merged

Remove simplified SDC ifdefs in burn_type #1232

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f8b5d5
Remove simplified SDC ifdefs in burn_type
maxpkatz Jun 19, 2023
3ed9194
Merge branch 'development' into merge_burn_type_sdc
maxpkatz Jun 23, 2023
31decb6
Merge branch 'development' into merge_burn_type_sdc
zingale Jun 24, 2023
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
12 changes: 0 additions & 12 deletions interfaces/burn_type.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ const int net_ienuc = NumSpec + 1;
// RHS of the network, regardless of Strang or SDC
typedef amrex::Array1D<Real, 1, neqs> YdotNetArray1D;

#ifdef SIMPLIFIED_SDC

// these indices represent the order that the conserved state comes
// into the ODE integration from the hydro code.
//
Expand All @@ -57,8 +55,6 @@ const int SEDEN = SMZ+1;
const int SVAR = SEDEN+1;
const int SVAR_EVOLVE = SFX;

#endif

// this is the data type of the dense Jacobian that the network wants.
// it is not the same size as the Jacobian that VODE cares about when
// we are doing simplified-SDC
Expand Down Expand Up @@ -105,8 +101,6 @@ struct burn_t

// now come the bits that we need for SDC or Strang evolution

#ifdef SIMPLIFIED_SDC

// y is the input conserved state. We will keep this state updated
// in time as we integrate, such that upon output it will be the
// final conserved state.
Expand All @@ -125,8 +119,6 @@ struct burn_t
int sdc_iter;
int num_sdc_iters;

#endif

// for drive_initial_convection, we will fix T during the
// integration to a passed in value. We will interpret a positive
// T_fixed as setting this feature.
Expand Down Expand Up @@ -189,7 +181,6 @@ std::ostream& operator<< (std::ostream& o, burn_t const& burn_state)
o << std::endl;
#endif

#ifdef SIMPLIFIED_SDC
o << "y[SRHO] = " << burn_state.y[SRHO] << std::endl;
o << "y[SEINT] = " << burn_state.y[SEINT] << std::endl;

Expand Down Expand Up @@ -222,7 +213,6 @@ std::ostream& operator<< (std::ostream& o, burn_t const& burn_state)
o << burn_state.ydot_a[SFX+n] << " ";
}
o << std::endl;
#endif
#endif
return o;
}
Expand Down Expand Up @@ -297,7 +287,6 @@ void burn_to_eos (const BurnT& burn_state, T& eos_state)
}


#ifdef SIMPLIFIED_SDC
template <typename BurnT, typename T>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
void sdc_burn_to_eos (const BurnT& state, T& eos_state)
Expand Down Expand Up @@ -365,7 +354,6 @@ void normalize_abundances_sdc_burn (BurnT& state)
#endif

}
#endif

template <typename BurnT>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
Expand Down