diff --git a/interfaces/burn_type.H b/interfaces/burn_type.H index 0f9f0d9b8b..8edafe7710 100644 --- a/interfaces/burn_type.H +++ b/interfaces/burn_type.H @@ -34,8 +34,6 @@ const int net_ienuc = NumSpec + 1; // RHS of the network, regardless of Strang or SDC typedef amrex::Array1D YdotNetArray1D; -#ifdef SIMPLIFIED_SDC - // these indices represent the order that the conserved state comes // into the ODE integration from the hydro code. // @@ -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 @@ -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. @@ -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. @@ -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; @@ -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; } @@ -297,7 +287,6 @@ void burn_to_eos (const BurnT& burn_state, T& eos_state) } -#ifdef SIMPLIFIED_SDC template AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void sdc_burn_to_eos (const BurnT& state, T& eos_state) @@ -365,7 +354,6 @@ void normalize_abundances_sdc_burn (BurnT& state) #endif } -#endif template AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE