Merge branch 'development' into add_cubic_interp

AMReX-Astro · Nov 29, 2023 · 4ee0e7a · 4ee0e7a
2 parents 755ee13 + 352b5aa
commit 4ee0e7a
Show file tree

Hide file tree

Showing 8 changed files with 114,765 additions and 49,207 deletions.
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.20.0km"
+problem.model_name =  "15m_500_sec.aprox19.hse.20.00km"
 
 problem.perturb_model = 1
 problem.velpert_amplitude = 5.e6

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

diff --git a/Source/driver/_cpp_parameters b/Source/driver/_cpp_parameters
@@ -558,9 +558,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