Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove sdc_solve_for_rhoe #2572

Merged
merged 27 commits into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
32f09b5
move SDC-specific routiens into Source/sdc
zingale Sep 18, 2023
8795437
Merge branch 'development' of github.com:amrex-astro/Castro into deve…
zingale Sep 18, 2023
30862ec
move the Newton solver into its own header
zingale Sep 18, 2023
fcf55d9
start removing density from the reacting system
zingale Sep 18, 2023
1ebc26d
the Newton stuff compiles now
zingale Sep 18, 2023
27f8b32
this builds and runs
zingale Sep 18, 2023
426b621
fix codespell
zingale Sep 18, 2023
c3a4c40
Merge branch 'development' into sdc_cleaning_III
zingale Sep 19, 2023
2298fce
some vode work
zingale Sep 19, 2023
243e09b
Merge branch 'development' into sdc_cleaning
zingale Sep 19, 2023
af5f653
Merge branch 'sdc_cleaning' into sdc_cleaning_II
zingale Sep 19, 2023
a16e3bb
Merge branch 'sdc_cleaning_II' into sdc_cleaning_III
zingale Sep 19, 2023
074590d
some more cleaning
zingale Sep 19, 2023
0ca5370
Merge branch 'development' into sdc_cleaning_II
zingale Sep 19, 2023
7097f1c
Merge branch 'sdc_cleaning_II' into sdc_cleaning_III
zingale Sep 19, 2023
e19d77b
I think this is how it should be now for VODE
zingale Sep 19, 2023
06919ca
Merge branch 'development' into sdc_cleaning_III
zingale Sep 21, 2023
893c1cb
fix
zingale Sep 21, 2023
f9be052
fix
zingale Sep 21, 2023
bbaf405
Merge branch 'development' into sdc_cleaning_III
zingale Sep 21, 2023
5a7b886
Merge branch 'development' into sdc_cleaning_III
zingale Sep 21, 2023
8cfb5be
update benchmark
zingale Sep 21, 2023
3b7d2f0
fix loop
zingale Sep 22, 2023
e4d61ac
remove sdc_solve_for_rhoe
zingale Sep 22, 2023
69b1534
Merge branch 'development' into sdc_cleaning_V
zingale Sep 22, 2023
df52113
Merge branch 'development' into sdc_cleaning_V
zingale Sep 22, 2023
d81903f
Merge branch 'development' into sdc_cleaning_V
zingale Sep 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Docs/source/sdc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``.


Expand Down
1 change: 0 additions & 1 deletion Exec/reacting_tests/bubble_convergence/inputs_2d.128
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Exec/reacting_tests/bubble_convergence/inputs_2d.256
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Exec/reacting_tests/bubble_convergence/inputs_2d.32
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Exec/reacting_tests/bubble_convergence/inputs_2d.512
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Exec/reacting_tests/bubble_convergence/inputs_2d.64
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 0 additions & 1 deletion Exec/science/Detonation/nse_runs/inputs.template.true_sdc
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
1 change: 0 additions & 1 deletion Exec/science/flame/inputs.1d.sdc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions Source/driver/_cpp_parameters
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down