use copy_cons_to_burn_type for simplified-SDC (#2603)

AMReX-Astro · Oct 7, 2023 · c9604bf · c9604bf
1 parent cfdaee1
commit c9604bf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/Source/reactions/Castro_react.cpp b/Source/reactions/Castro_react.cpp
@@ -5,6 +5,7 @@
 #ifdef MODEL_PARSER
 #include <model_parser.H>
 #endif
+#include <sdc_cons_to_burn.H>
 
 using std::string;
 using namespace amrex;
@@ -583,24 +584,9 @@ Castro::react_state(Real time, Real dt)
             }
 
             // Feed in the old-time state data.
+            // this also sets burn_state.{rho,T}
 
-            burn_state.y[SRHO] = U_old(i,j,k,URHO);
-            burn_state.y[SMX] = U_old(i,j,k,UMX);
-            burn_state.y[SMY] = U_old(i,j,k,UMY);
-            burn_state.y[SMZ] = U_old(i,j,k,UMZ);
-            burn_state.y[SEDEN] = U_old(i,j,k,UEDEN);
-            burn_state.y[SEINT] = U_old(i,j,k,UEINT);
-            for (int n = 0; n < NumSpec; n++) {
-                burn_state.y[SFS+n] = U_old(i,j,k,UFS+n);
-            }
-#if NAUX_NET > 0
-            for (int n = 0; n < NumAux; n++) {
-                burn_state.y[SFX+n] = U_old(i,j,k,UFX+n);
-            }
-#endif
-
-            // we need an initial T guess for the EOS
-            burn_state.T = U_old(i,j,k,UTEMP);
+            copy_cons_to_burn_type(i, j, k, U_old, burn_state);
 
             burn_state.T_fixed = -1.e30_rt;
 
@@ -629,8 +615,6 @@ Castro::react_state(Real time, Real dt)
             }
 #endif
 
-            burn_state.rho = burn_state.y[SRHO];
-
             // Don't burn if we're outside of the relevant (rho, T) range.
 
             if (U_old(i,j,k,UTEMP) < castro::react_T_min || U_old(i,j,k,UTEMP) > castro::react_T_max ||

diff --git a/Source/reactions/Make.package b/Source/reactions/Make.package
@@ -2,6 +2,7 @@
 # this is included when USE_REACT = TRUE
 
 CEXE_headers += Castro_react.H
+CEXE_headers += sdc_const_to_burn.H
 
 CEXE_sources += Castro_react.cpp
 CEXE_headers += Castro_react_util.H
diff --git a/Source/sdc/sdc_cons_to_burn.H → Source/reactions/sdc_cons_to_burn.H b/Source/sdc/sdc_cons_to_burn.H → Source/reactions/sdc_cons_to_burn.H
diff --git a/Source/sdc/Make.package b/Source/sdc/Make.package
@@ -1,5 +1,4 @@
 CEXE_headers += Castro_sdc.H
-CEXE_headers += sdc_const_to_burn.H
 
 CEXE_sources += sdc_util.cpp