Fixes that allow wdmerger to run with the NSE table

AMReX-Astro · Sep 8, 2023 · ed2353d · ed2353d
1 parent f6adf9d
commit ed2353d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/Exec/science/wdmerger/problem_initialize_state_data.H b/Exec/science/wdmerger/problem_initialize_state_data.H
@@ -64,6 +64,9 @@ void problem_initialize_state_data (int i, int j, int k,
         for (int n = 0; n < NumSpec; ++n) {
             zone_state.xn[n] = interpolate_3d(pos, dx, model::ispec + n, problem::nsub, 0);
         }
+#ifdef AUX_THERMO
+        set_aux_comp_from_X(zone_state);
+#endif
 
         eos(eos_input_rt, zone_state);
 
@@ -79,6 +82,9 @@ void problem_initialize_state_data (int i, int j, int k,
         for (int n = 0; n < NumSpec; ++n) {
             zone_state.xn[n] = interpolate_3d(pos, dx, model::ispec + n, problem::nsub, 1);
         }
+#ifdef AUX_THERMO
+        set_aux_comp_from_X(zone_state);
+#endif
 
         eos(eos_input_rt, zone_state);
 
@@ -91,6 +97,9 @@ void problem_initialize_state_data (int i, int j, int k,
         for (int n = 0; n < NumSpec; ++n) {
             zone_state.xn[n] = ambient::ambient_state[UFS+n] / ambient::ambient_state[URHO];
         }
+#ifdef AUX_THERMO
+        set_aux_comp_from_X(zone_state);
+#endif
 
     }
 
@@ -101,6 +110,11 @@ void problem_initialize_state_data (int i, int j, int k,
     for (int n = 0; n < NumSpec; ++n) {
         state(i,j,k,UFS+n) = zone_state.rho * zone_state.xn[n];
     }
+#ifdef NAUX_NET > 0
+    for (int n = 0; n < NumAux; ++n) {
+        state(i,j,k,UFX+n) = zone_state.rho * zone_state.aux[n];
+    }
+#endif
 
     // Set the velocities in each direction to zero by default.
 

diff --git a/Exec/science/wdmerger/wdmerger_util.cpp b/Exec/science/wdmerger/wdmerger_util.cpp
@@ -378,6 +378,9 @@ void set_small ()
     for (int n = 0; n < NumSpec; ++n) {
         eos_state.xn[n] = ambient::ambient_state[UFS+n] / ambient::ambient_state[URHO];
     }
+#ifdef AUX_THERMO
+    set_aux_comp_from_X(eos_state);
+#endif
 
     eos(eos_input_rt, eos_state);
 
@@ -536,10 +539,8 @@ void binary_setup ()
     for (int n = 0; n < NumSpec; ++n) {
         eos_state.xn[n] = ambient::ambient_state[UFS+n] / ambient::ambient_state[URHO];
     }
-#if NAUX_NET > 0
-    for (int n = 0; n < NumAux; ++n) {
-        eos_state.aux[n] = ambient::ambient_state[UFX+n] / ambient::ambient_state[URHO];
-    }
+#ifdef AUX_THERMO
+    set_aux_comp_from_X(eos_state);
 #endif
 
     eos(eos_input_rt, eos_state);

diff --git a/Util/model_parser_cxx/model_parser.H b/Util/model_parser_cxx/model_parser.H
@@ -293,6 +293,9 @@ void establish_hse (Real& mass_want, Real& central_density_want, Real& radius,
         for (int n = 0; n < NumSpec; ++n) {
             eos_state.xn[n] = model.state(0, model::ispec + n);
         }
+#ifdef AUX_THERMO
+        set_aux_comp_from_X(eos_state);
+#endif
 
         eos(eos_input_rt, eos_state);
 
@@ -346,6 +349,9 @@ void establish_hse (Real& mass_want, Real& central_density_want, Real& radius,
                     eos_state.xn[n] = model.state(i, model::ispec + n);
                 }
             }
+#ifdef AUX_THERMO
+            set_aux_comp_from_X(eos_state);
+#endif
 
             Real g = -C::Gconst * M_enclosed / (std::pow(rl, 2));