fix the CJ detonation utility

AMReX-Astro · Jan 5, 2025 · f208637 · f208637
1 parent bc1ccfa
commit f208637
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/util/cj_detonation/GNUmakefile b/util/cj_detonation/GNUmakefile
@@ -21,7 +21,7 @@ MICROPHYSICS_HOME  := ../..
 EOS_DIR     := helmholtz
 
 # This sets the network directory
-NETWORK_DIR := aprox13
+NETWORK_DIR := subch_simple
 
 CONDUCTIVITY_DIR := stellar
 

diff --git a/util/cj_detonation/_parameters b/util/cj_detonation/_parameters
@@ -1,3 +1,5 @@
+@namespace: cj
+
 smallx     real   1.e-10
 
 small_temp    real       1.e5

diff --git a/util/cj_detonation/inputs b/util/cj_detonation/inputs
@@ -1 +1,2 @@
-amr.probin_file = probin
+cj.smallx = 1.e-10
+
diff --git a/util/cj_detonation/main.cpp b/util/cj_detonation/main.cpp
@@ -11,9 +11,8 @@ using namespace amrex;
 #include <network.H>
 #include <cj_det.H>
 #include <unit_test.H>
-#ifndef NEW_NETWORK_IMPLEMENTATION
+#include <actual_network.H>
 #include <actual_rhs.H>
-#endif
 
 using namespace unit_test_rp;
 
@@ -37,11 +36,11 @@ int main(int argc, char *argv[]) {
   for (int i = 0; i < probin_file_length; i++)
     probin_file_name[i] = probin_file[i];
 
-  init_unit_test(probin_file_name.dataPtr(), &probin_file_length);
+  init_unit_test();
 
   // C++ EOS initialization (must be done after Fortran eos_init and
   // init_extern_parameters)
-  eos_init(small_temp, small_dens);
+  eos_init(cj_rp::small_temp, cj_rp::small_dens);
 
   // C++ Network, RHS, screening, rates initialization
 
@@ -60,9 +59,9 @@ int main(int argc, char *argv[]) {
   eos_state_fuel.rho = 1.e7_rt;
   eos_state_fuel.T = 1.e8_rt;
   for (int n = 0; n < NumSpec; n++) {
-      eos_state_fuel.xn[n] = smallx;
+      eos_state_fuel.xn[n] = cj_rp::smallx;
   }
-  eos_state_fuel.xn[0] = 1.0_rt - (NumSpec - 1) * smallx;
+  eos_state_fuel.xn[0] = 1.0_rt - (NumSpec - 1) * cj_rp::smallx;
 
   eos(eos_input_rt, eos_state_fuel);
 
@@ -71,9 +70,9 @@ int main(int argc, char *argv[]) {
 
   eos_t eos_state_ash = eos_state_fuel;
   for (int n = 0; n < NumSpec; n++) {
-      eos_state_ash.xn[n] = smallx;
+      eos_state_ash.xn[n] = cj_rp::smallx;
   }
-  eos_state_ash.xn[NumSpec-1] = 1.0_rt - (NumSpec - 1) * smallx;
+  eos_state_ash.xn[NumSpec-1] = 1.0_rt - (NumSpec - 1) * cj_rp::smallx;
 
   // get the q value -- we need the change in molar fractions
   Array1D<Real, 1, NumSpec> dymol;

diff --git a/util/cj_detonation/probin b/util/cj_detonation/probin