Merge branch 'development' into nse_neutrinos

AMReX-Astro · Oct 28, 2023 · 6c383c6 · 6c383c6
2 parents 45a185e + 6f60462
commit 6c383c6
Show file tree

Hide file tree

Showing 3 changed files with 296 additions and 248 deletions.
diff --git a/integration/_parameters b/integration/_parameters
@@ -77,3 +77,6 @@ sdc_burn_tol_factor          real         1.d0
 # for Strang, this simply means scaling e by the initial energy?
 scale_system              integer         0
 
+# for the NSE update predictor-corrector, how many iterations
+# do we take to get the new time NSE state
+nse_iters                 integer         3
diff --git a/integration/nse_update_simplified_sdc.H b/integration/nse_update_simplified_sdc.H
@@ -118,7 +118,7 @@ void sdc_nse_burn(BurnT& state, const Real dt) {
         rho_aux_new[n] = state.y[SFX+n] + dt * state.ydot_a[SFX+n] + dt * aux_source[n];
     }
 
-    for (int iter = 0; iter < 3; iter++) {
+    for (int iter = 0; iter < integrator_rp::nse_iters; iter++) {
 
         // update (rho e)^{n+1} based on the new energy generation rate
         rhoe_new = state.y[SEINT] + dt * state.ydot_a[SEINT] + dt * rho_enucdot;
@@ -301,7 +301,7 @@ void sdc_nse_burn(BurnT& state, const Real dt) {
 
     burn_t nse_state;
 
-    for (int iter = 0; iter < 3; iter++) {
+    for (int iter = 0; iter < integrator_rp::nse_iters; iter++) {
 
         // update (rho e)^{n+1} based on the new energy generation rate
         rhoe_new = state.y[SEINT] + dt * state.ydot_a[SEINT] + dt * rho_enucdot;