diff --git a/Docs/source/sdc.rst b/Docs/source/sdc.rst index 9e187fb638..656391cedb 100644 --- a/Docs/source/sdc.rst +++ b/Docs/source/sdc.rst @@ -47,7 +47,7 @@ The options that affect the nonlinear solve are: ``integrator.atol_spec``, ``integrator.rtol_enuc``, ``integrator.atol_enuc``. -In all cases, the type of Jacobian (analytic or numerical) is determined by + In all cases, the type of Jacobian (analytic or numerical) is determined by ``integrator.jacobian``. diff --git a/Exec/reacting_tests/bubble_convergence/inputs_2d.128 b/Exec/reacting_tests/bubble_convergence/inputs_2d.128 index 9730fc68bc..011a0f71f4 100644 --- a/Exec/reacting_tests/bubble_convergence/inputs_2d.128 +++ b/Exec/reacting_tests/bubble_convergence/inputs_2d.128 @@ -29,7 +29,6 @@ castro.sdc_order=4 castro.time_integration_method=2 castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1 castro.grav_source_type = 2 diff --git a/Exec/reacting_tests/bubble_convergence/inputs_2d.256 b/Exec/reacting_tests/bubble_convergence/inputs_2d.256 index 0f05fc09e2..3749f3be4c 100644 --- a/Exec/reacting_tests/bubble_convergence/inputs_2d.256 +++ b/Exec/reacting_tests/bubble_convergence/inputs_2d.256 @@ -29,7 +29,6 @@ castro.sdc_order=4 castro.time_integration_method=2 castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1 castro.grav_source_type = 2 diff --git a/Exec/reacting_tests/bubble_convergence/inputs_2d.32 b/Exec/reacting_tests/bubble_convergence/inputs_2d.32 index fb40d3f8cd..10fe20a1e0 100644 --- a/Exec/reacting_tests/bubble_convergence/inputs_2d.32 +++ b/Exec/reacting_tests/bubble_convergence/inputs_2d.32 @@ -29,7 +29,6 @@ castro.sdc_order=4 castro.time_integration_method=2 castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1 castro.grav_source_type = 2 diff --git a/Exec/reacting_tests/bubble_convergence/inputs_2d.512 b/Exec/reacting_tests/bubble_convergence/inputs_2d.512 index e717a67029..0f713945c9 100644 --- a/Exec/reacting_tests/bubble_convergence/inputs_2d.512 +++ b/Exec/reacting_tests/bubble_convergence/inputs_2d.512 @@ -29,7 +29,6 @@ castro.sdc_order=4 castro.time_integration_method=2 castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1 castro.grav_source_type = 2 diff --git a/Exec/reacting_tests/bubble_convergence/inputs_2d.64 b/Exec/reacting_tests/bubble_convergence/inputs_2d.64 index ac40a4202d..9dcf39921a 100644 --- a/Exec/reacting_tests/bubble_convergence/inputs_2d.64 +++ b/Exec/reacting_tests/bubble_convergence/inputs_2d.64 @@ -29,7 +29,6 @@ castro.sdc_order=4 castro.time_integration_method=2 castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1 castro.grav_source_type = 2 diff --git a/Exec/reacting_tests/bubble_convergence/job_scripts/cori.bubble_convergence.slurm b/Exec/reacting_tests/bubble_convergence/job_scripts/cori.bubble_convergence.slurm index 338d95804c..17b1c11b56 100644 --- a/Exec/reacting_tests/bubble_convergence/job_scripts/cori.bubble_convergence.slurm +++ b/Exec/reacting_tests/bubble_convergence/job_scripts/cori.bubble_convergence.slurm @@ -21,7 +21,6 @@ castro.sdc_order=4 castro.time_integration_method=2 castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1" srun ${CASTRO_EXEC} inputs_2d.64 ${RUNPARAMS} amr.plot_file=bubble_64_sdc4_plt &> 64.out diff --git a/Exec/reacting_tests/reacting_convergence/convergence_sdc.sh b/Exec/reacting_tests/reacting_convergence/convergence_sdc.sh index 33ec438eeb..bc386635c9 100755 --- a/Exec/reacting_tests/reacting_convergence/convergence_sdc.sh +++ b/Exec/reacting_tests/reacting_convergence/convergence_sdc.sh @@ -10,7 +10,6 @@ RUNPARAMS=" castro.sdc_order=2 castro.time_integration_method=2 castro.ppm_type=0 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1 castro.use_retry=0" diff --git a/Exec/reacting_tests/reacting_convergence/convergence_sdc4.sh b/Exec/reacting_tests/reacting_convergence/convergence_sdc4.sh index d92f2d2ca4..3ed7435fd0 100755 --- a/Exec/reacting_tests/reacting_convergence/convergence_sdc4.sh +++ b/Exec/reacting_tests/reacting_convergence/convergence_sdc4.sh @@ -11,7 +11,6 @@ castro.sdc_order=4 castro.time_integration_method=2 castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1 castro.use_retry=0" diff --git a/Exec/reacting_tests/reacting_convergence/job_scripts/cori.reacting_convergence.slurm b/Exec/reacting_tests/reacting_convergence/job_scripts/cori.reacting_convergence.slurm index 7e5c47b934..51bbbdb0b2 100644 --- a/Exec/reacting_tests/reacting_convergence/job_scripts/cori.reacting_convergence.slurm +++ b/Exec/reacting_tests/reacting_convergence/job_scripts/cori.reacting_convergence.slurm @@ -26,7 +26,6 @@ castro.sdc_order=4 castro.time_integration_method=2 castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=1" srun ${CASTRO_EXEC} inputs.64 amr.plot_file=react_converge_64_sdc4_plt ${RUNPARAMS} diff --git a/Exec/science/Detonation/nse_runs/inputs.template.true_sdc b/Exec/science/Detonation/nse_runs/inputs.template.true_sdc index 7df08de75d..8994b19c11 100644 --- a/Exec/science/Detonation/nse_runs/inputs.template.true_sdc +++ b/Exec/science/Detonation/nse_runs/inputs.template.true_sdc @@ -38,7 +38,6 @@ castro.sdc_quadrature = @@SDC_QUADRATURE@@ castro.limit_fourth_order=1 castro.use_reconstructed_gamma1=1 -castro.sdc_solve_for_rhoe=1 castro.sdc_solver=2 diff --git a/Exec/science/flame/inputs.1d.sdc b/Exec/science/flame/inputs.1d.sdc index 7f4344bdb4..8c4a6af130 100644 --- a/Exec/science/flame/inputs.1d.sdc +++ b/Exec/science/flame/inputs.1d.sdc @@ -25,7 +25,6 @@ castro.do_react = 1 castro.time_integration_method = 2 castro.sdc_order = 4 -castro.sdc_solve_for_rhoe = 1 castro.sdc_solver = 1 castro.sdc_solver_relax_factor = 1 diff --git a/Source/driver/_cpp_parameters b/Source/driver/_cpp_parameters index c719801de0..6b0f006485 100644 --- a/Source/driver/_cpp_parameters +++ b/Source/driver/_cpp_parameters @@ -267,9 +267,6 @@ sdc_extra int 0 # which SDC nonlinear solver to use? 1 = Newton, 2 = VODE, 3 = VODE for first iter sdc_solver int 1 -# do we solve for (rho e) or (rho E) in the SDC nonlinear solve? -sdc_solve_for_rhoe int 1 - # for 2-d axisymmetry, do we include the geometry source terms from Bernand-Champmartin? use_axisymmetric_geom_source int 1