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.

Sign up for GitHub

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 density from the true SDC reaction system #2560

Merged
merged 23 commits into from
Sep 22, 2023
Merged

remove density from the true SDC reaction system #2560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 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
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
88 changes: 44 additions & 44 deletions Exec/reacting_tests/reacting_convergence/ci-benchmarks/react_converge_128_true_sdc.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,58 @@
time = 0.000901
variables minimum value maximum value
density 499999.99996 1003267.4037
xmom -1.64054094e+12 1.64054094e+12
ymom -1.64054094e+12 1.64054094e+12
xmom -1.6405409458e+12 1.6405409458e+12
ymom -1.6405409458e+12 1.6405409458e+12
zmom 0 0
rho_E 2.263117857e+22 7.0166374851e+22
rho_e 2.263117857e+22 7.0166358897e+22
Temp 300032898.05 454530914.06
rho_He4 499997.75752 1002591.9748
rho_C12 2.2423384483 675.42858349
rho_O16 5.0001038346e-05 0.00023067858795
rho_E 2.263117857e+22 7.0166374758e+22
rho_e 2.263117857e+22 7.0166358804e+22
Temp 300032898.05 454530912.93
rho_He4 499997.75752 1002591.9749
rho_C12 2.2423384483 675.42842495
rho_O16 5.0001038346e-05 0.00023067823575
rho_Fe56 4.9999999996e-05 0.00010032674037
rho_enuc 1.4565745423e+21 4.5249954871e+23
density_sdc_source -544925.79275 78513.247889
xmom_sdc_source -1.8266340469e+15 1.8266340469e+15
ymom_sdc_source -1.8266340469e+15 1.8266340469e+15
rho_enuc 1.4565745423e+21 4.5249964745e+23
density_sdc_source -544925.80758 78513.247869
xmom_sdc_source -1.8266340546e+15 1.8266340546e+15
ymom_sdc_source -1.8266340546e+15 1.8266340546e+15
zmom_sdc_source 0 0
rho_E_sdc_source -6.1992456785e+22 7.5781242406e+21
rho_e_sdc_source -6.1984065959e+22 6.3082607681e+21
rho_E_sdc_source -6.1992501236e+22 7.5781242663e+21
rho_e_sdc_source -6.1984110404e+22 6.3082607836e+21
Temp_sdc_source 0 0
rho_He4_sdc_source -543231.29383 78510.973919
rho_C12_sdc_source -1694.4890575 10.073635142
rho_O16_sdc_source -0.0098093776861 7.1506350196e-06
rho_Fe56_sdc_source -5.4492579275e-05 7.8513247889e-06
pressure 1.4155320805e+22 4.2608130858e+22
kineng 6.7398897838e-15 1.6647276226e+18
soundspeed 212069503.63 257404342.21
rho_He4_sdc_source -543231.23569 78510.973875
rho_C12_sdc_source -1694.5620221 10.07378628
rho_O16_sdc_source -0.0098098270645 7.1506434889e-06
rho_Fe56_sdc_source -5.4492580758e-05 7.8513247869e-06
pressure 1.4155320805e+22 4.2608130805e+22
kineng 2.4519179612e-13 1.6647276308e+18
soundspeed 212069503.63 257404342.05
Gamma_1 1.5601126452 1.5885713572
MachNumber 7.7424457878e-19 0.0086982771596
entropy 348439780.9 349209883.57
magvort 0 0.00018541051835
divu -0.1163387912 0.55816306007
eint_E 4.5262357143e+16 6.9937847678e+16
eint_e 4.5262357143e+16 6.9937843728e+16
MachNumber 4.669869489e-18 0.008698277168
entropy 348439780.9 349209883.38
magvort 0 0.00018541051834
divu -0.11633879117 0.55816307483
eint_E 4.5262357143e+16 6.9937847586e+16
eint_e 4.5262357143e+16 6.9937843636e+16
logden 5.6989700043 6.0014167022
StateErr_0 499999.99996 1003267.4037
StateErr_1 300032898.05 454530914.06
StateErr_2 0.9993267708 0.99999551512
X(He4) 0.9993267708 0.99999551512
X(C12) 4.484676897e-06 0.00067322887298
X(O16) 1.000020767e-10 2.2992732257e-10
StateErr_1 300032898.05 454530912.93
StateErr_2 0.99932677096 0.99999551512
X(He4) 0.99932677096 0.99999551512
X(C12) 4.484676897e-06 0.00067322871496
X(O16) 1.000020767e-10 2.2992697152e-10
X(Fe56) 1e-10 1e-10
abar 4.0000119598 4.0017960842
abar 4.0000119598 4.0017960838
Ye 0.5 0.5
x_velocity -2064636.8122 2064636.8122
y_velocity -2064636.8122 2064636.8122
x_velocity -2064636.8156 2064636.8156
y_velocity -2064636.8156 2064636.8156
z_velocity 0 0
t_sound_t_enuc 0.00023710316663 0.0195732693
enuc 2.9131490847e+15 4.5102586513e+17
magvel 1.6419366351e-10 2067446.1363
radvel -0.00067838574982 2067446.1363
circvel 0 11.820144682
magmom 8.209683175e-05 1.6422547233e+12
angular_momentum_x 0 0
angular_momentum_y 0 0
angular_momentum_z -1.2410862732e+14 1.2410862751e+14
t_sound_t_enuc 0.00023710316663 0.019573273608
enuc 2.9131490847e+15 4.5102596355e+17
magvel 9.9033690456e-10 2067446.1392
radvel -0.00067838913019 2067446.1391
circvel 0 11.820185992
magmom 0.00049516845224 1.6422547294e+12
angular_momentum_x -0 -0
angular_momentum_y -0 -0
angular_momentum_z -1.2410867567e+14 1.2410867593e+14

3 changes: 0 additions & 3 deletions Source/driver/_cpp_parameters
View file
Open in desktop
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

# relative tolerance for the nonlinear solve on rho with SDC
sdc_solver_tol_dens Real 1.e-6

# relative tolerance for the nonlinear solve on rho X_k with SDC
sdc_solver_tol_spec Real 1.e-6

Expand Down
4 changes: 0 additions & 4 deletions Source/reactions/Castro_react_util.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
#include <numerical_jacobian.H>


constexpr int iwrho = 0;
constexpr int iwfs = 1;
constexpr int iwe = NumSpec+1;

// #include <actual_rhs.H>

AMREX_GPU_HOST_DEVICE AMREX_INLINE
Expand Down
Loading