Merge branch 'development' into massive_star_screening

AMReX-Astro · Nov 30, 2023 · c69205d · c69205d
2 parents 9de5fb8 + 2d523e8
commit c69205d
Show file tree

Hide file tree

Showing 9 changed files with 114,774 additions and 49,210 deletions.
diff --git a/Exec/radiation_tests/Rad2Tshock/ci-benchmarks/Rad2TShock-1d.out b/Exec/radiation_tests/Rad2Tshock/ci-benchmarks/Rad2TShock-1d.out
@@ -37,5 +37,5 @@
  magmom                       1.2327065163e-07       1.4587103381e-07
  angular_momentum_x                          0                      0
  angular_momentum_y                          0                      0
- angular_momentum_z                          0                      0
+ angular_momentum_z                         -0                     -0
 
diff --git a/Exec/science/Detonation/problem_initialize.H b/Exec/science/Detonation/problem_initialize.H
@@ -16,7 +16,7 @@ void problem_initialize ()
     problem::in14 = network_spec_index("nitrogen-14");
     problem::io16 = network_spec_index("oxygen-16");
 
-    if (problem::ihe4 < 0 || problem::ic12 < 0 || problem::in14 < 0 || problem::io16 < 0) {
+    if (problem::ihe4 < 0 || problem::ic12 < 0 || problem::io16 < 0) {
         amrex::Error("ERROR: species indices not found");
     }
 
@@ -51,9 +51,15 @@ void problem_initialize ()
     }
 
     problem::xn[problem::ic12] = amrex::max(problem::cfrac, problem::smallx);
-    problem::xn[problem::in14] = amrex::max(problem::nfrac, problem::smallx);
     problem::xn[problem::io16] = amrex::max(problem::ofrac, problem::smallx);
-    problem::xn[problem::ihe4] = 1.0_rt - problem::cfrac - problem::nfrac - problem::ofrac - (NumSpec - 3) * problem::smallx;
+
+    if (problem::in14 >= 0) {
+       problem::xn[problem::in14] = amrex::max(problem::nfrac, problem::smallx);
+       problem::xn[problem::ihe4] = 1.0_rt - problem::cfrac - problem::nfrac - problem::ofrac - (NumSpec - 3) * problem::smallx;
+    }
+    else {
+       problem::xn[problem::ihe4] = 1.0_rt - problem::cfrac - problem::ofrac - (NumSpec - 2) * problem::smallx;
+    }
 
     // Set the ambient material
 

diff --git a/Exec/science/massive_star/15m_500_sec.aprox19.hse.10.00km b/Exec/science/massive_star/15m_500_sec.aprox19.hse.10.00km
diff --git a/Exec/science/massive_star/15m_500_sec.aprox19.hse.10.0km b/Exec/science/massive_star/15m_500_sec.aprox19.hse.10.0km
diff --git a/Exec/science/massive_star/15m_500_sec.aprox19.hse.20.00km b/Exec/science/massive_star/15m_500_sec.aprox19.hse.20.00km
diff --git a/Exec/science/massive_star/15m_500_sec.aprox19.hse.20.0km b/Exec/science/massive_star/15m_500_sec.aprox19.hse.20.0km
diff --git a/Exec/science/massive_star/15m_500_sec.aprox19.hse.5.00km b/Exec/science/massive_star/15m_500_sec.aprox19.hse.5.00km
diff --git a/Exec/science/massive_star/inputs_2d.nse b/Exec/science/massive_star/inputs_2d.nse
@@ -83,7 +83,7 @@ castro.max_subcycles = 16
 
 # problem initialization
 
-problem.model_name =  "15m_500_sec.aprox19.hse.10.0km"
+problem.model_name =  "15m_500_sec.aprox19.hse.10.00km"
 
 problem.perturb_model = 1
 problem.velpert_amplitude = 5.e6

diff --git a/Source/driver/_cpp_parameters b/Source/driver/_cpp_parameters
@@ -550,9 +550,6 @@ sponge_timescale             Real         -1.0                SPONGE
 # category: parallelization
 #-----------------------------------------------------------------------------
 
-# determines whether we use accelerators for specific loops
-do_acc                       int          -1
-
 bndry_func_thread_safe       int           1