diff --git a/Exec/science/flame_wave/ci-benchmarks/job_info_params.txt b/Exec/science/flame_wave/ci-benchmarks/job_info_params.txt index 127b5bcb64..252b98a482 100644 --- a/Exec/science/flame_wave/ci-benchmarks/job_info_params.txt +++ b/Exec/science/flame_wave/ci-benchmarks/job_info_params.txt @@ -54,9 +54,9 @@ castro.plm_limiter = 2 castro.hybrid_riemann = 0 castro.riemann_solver = 0 - castro.cg_maxiter = 12 - castro.cg_tol = 1e-05 - castro.cg_blend = 2 + castro.riemann_shock_maxiter = 12 + castro.riemann_pstar_tol = 1e-05 + castro.riemann_cg_blend = 2 castro.use_flattening = 1 castro.transverse_use_eos = 0 castro.transverse_reset_density = 1 diff --git a/Exec/science/wdmerger/inputs b/Exec/science/wdmerger/inputs index 5def509a0d..f9b22104b2 100644 --- a/Exec/science/wdmerger/inputs +++ b/Exec/science/wdmerger/inputs @@ -188,7 +188,7 @@ castro.riemann_solver = 0 # For the CG Riemann solver, we need to tell the solver not to quit when # the iterations don't converge, but instead to do additional bisection iteration. -castro.cg_blend = 2 +castro.riemann_cg_blend = 2 # Use a lagged predictor estimate of the source terms in the hydro castro.source_term_predictor = 1 diff --git a/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor b/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor index 2ff2712602..a7028d1544 100644 --- a/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor +++ b/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor @@ -200,7 +200,7 @@ castro.riemann_solver = 0 # For the CG Riemann solver, we need to tell the solver not to quit when # the iterations don't converge, but instead to do additional bisection iteration. -castro.cg_blend = 2 +castro.riemann_cg_blend = 2 # Use a lagged predictor estimate of the source terms in the hydro castro.source_term_predictor = 1 diff --git a/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor_simp_sdc b/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor_simp_sdc index db97ad3dac..6316753695 100644 --- a/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor_simp_sdc +++ b/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor_simp_sdc @@ -206,7 +206,7 @@ castro.riemann_solver = 0 # For the CG Riemann solver, we need to tell the solver not to quit when # the iterations don't converge, but instead to do additional bisection iteration. -castro.cg_blend = 2 +castro.riemann_cg_blend = 2 # Use a lagged predictor estimate of the source terms in the hydro castro.source_term_predictor = 1 diff --git a/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor_strang b/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor_strang index a57a028d0d..b56d9ba2a5 100644 --- a/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor_strang +++ b/Exec/science/wdmerger/tests/he_double_det/inputs_pakmor_strang @@ -206,7 +206,7 @@ castro.riemann_solver = 0 # For the CG Riemann solver, we need to tell the solver not to quit when # the iterations don't converge, but instead to do additional bisection iteration. -castro.cg_blend = 2 +castro.riemann_cg_blend = 2 # Use a lagged predictor estimate of the source terms in the hydro castro.source_term_predictor = 1 diff --git a/Exec/science/wdmerger/tests/he_double_det/inputs_scaling b/Exec/science/wdmerger/tests/he_double_det/inputs_scaling index 03c95c1636..990c81fd2a 100644 --- a/Exec/science/wdmerger/tests/he_double_det/inputs_scaling +++ b/Exec/science/wdmerger/tests/he_double_det/inputs_scaling @@ -203,7 +203,7 @@ castro.riemann_solver = 0 # For the CG Riemann solver, we need to tell the solver not to quit when # the iterations don't converge, but instead to do additional bisection iteration. -castro.cg_blend = 2 +castro.riemann_cg_blend = 2 # Use a lagged predictor estimate of the source terms in the hydro castro.source_term_predictor = 1 diff --git a/Exec/science/wdmerger/tests/wdmerger_collision/inputs_2d_collision b/Exec/science/wdmerger/tests/wdmerger_collision/inputs_2d_collision index 8a2bca0293..60a7db22d6 100644 --- a/Exec/science/wdmerger/tests/wdmerger_collision/inputs_2d_collision +++ b/Exec/science/wdmerger/tests/wdmerger_collision/inputs_2d_collision @@ -153,7 +153,7 @@ castro.riemann_solver = 0 # For the CG Riemann solver, we need to tell the solver not to quit when # the iterations don't converge, but instead to do additional bisection iteration. -castro.cg_blend = 2 +castro.riemann_cg_blend = 2 # Use a lagged predictor estimate of the source terms in the hydro castro.source_term_predictor = 1 diff --git a/Exec/science/wdmerger/tests/wdmerger_collision_1D/inputs b/Exec/science/wdmerger/tests/wdmerger_collision_1D/inputs index 6dcabf249c..9f40085682 100644 --- a/Exec/science/wdmerger/tests/wdmerger_collision_1D/inputs +++ b/Exec/science/wdmerger/tests/wdmerger_collision_1D/inputs @@ -142,7 +142,7 @@ castro.riemann_solver = 0 # For the CG Riemann solver, we need to tell the solver not to quit when # the iterations don't converge, but instead to do additional bisection iteration. -castro.cg_blend = 2 +castro.riemann_cg_blend = 2 # Use a lagged predictor estimate of the source terms in the hydro castro.source_term_predictor = 1 diff --git a/Exec/science/wdmerger/tests/wdmerger_retry/inputs_test_wdmerger_retry b/Exec/science/wdmerger/tests/wdmerger_retry/inputs_test_wdmerger_retry index 0d63ab606c..a6eef171b3 100644 --- a/Exec/science/wdmerger/tests/wdmerger_retry/inputs_test_wdmerger_retry +++ b/Exec/science/wdmerger/tests/wdmerger_retry/inputs_test_wdmerger_retry @@ -133,7 +133,7 @@ castro.riemann_solver = 0 # For the CG Riemann solver, we need to tell the solver not to quit when # the iterations don't converge, but instead to do additional bisection iteration. -castro.cg_blend = 2 +castro.riemann_cg_blend = 2 # Use a lagged predictor estimate of the source terms in the hydro castro.source_term_predictor = 1