Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdannberg
jdannberg committed Jun 14, 2024
1 parent b897961 commit db27bba
Show file tree
Hide file tree
Showing 10 changed files with 214 additions and 204 deletions.
2 changes: 1 addition & 1 deletion source/simulator/parameters.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ namespace aspect
prm.declare_entry ("Reaction solver relative tolerance", "1e-6",
Patterns::Double (0.),
"The relative solver tolerance used in the ARKode reaction solver. "
"This tolerance is used to adaptivelt determine the reaction step size. "
"This tolerance is used to adaptively determine the reaction step size. "
"For more details, see the ARKode documentation. This parameter is only used "
"if the `ARKode' reaction solver type is used. "
"Units: none.");
Expand Down
5 changes: 5 additions & 0 deletions tests/advection_reaction.prm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ set Maximum time step = 1
# through the ODE solver scheme. Instead of changing the step
# for the ODE solver, we can make the solution more accurate by
# modifying the Reaction solver relative tolerance.
subsection Solver parameters
subsection Operator splitting parameters
Reaction solver relative tolerance = 1e-6
end
end

subsection Discretization
subsection Stabilization parameters
Expand Down
5 changes: 5 additions & 0 deletions tests/exponential_decay.prm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ set Maximum time step = 10
# Instead of changing the step for the ODE solver, we can make the
# solution more accurate by modifying the Reaction solver relative
# tolerance.
subsection Solver parameters
subsection Operator splitting parameters
Reaction solver relative tolerance = 1e-6
end
end

subsection Geometry model
set Model name = box
Expand Down
320 changes: 160 additions & 160 deletions tests/latent_heat_melt_transport/screen-output
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions tests/solubility/screen-output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,64 +30,64 @@ Number of degrees of freedom: 4,925 (1,206+502+1,206+202+603+603+603)
RMS, max velocity: 0.01 m/year, 0.01 m/year

*** Timestep 1: t=10000 years, dt=10000 years
Solving composition reactions... in 10 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving porosity system ... 10 iterations.
Solving water_content system ... 9 iterations.
Rebuilding Stokes preconditioner...
Solving Stokes system... 3+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 8.84047e-15, 0.0300843, 0.00318787, 0.000390392
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.00318787
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 8.55456e-15, 0.0300843, 0.00315753, 0.000381968
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.00315753

Solving temperature system... 0 iterations.
Solving porosity system ... 9 iterations.
Solving water_content system ... 6 iterations.
Rebuilding Stokes preconditioner...
Solving Stokes system... 2+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 8.6504e-15, 0.00296642, 1.89545e-06, 1.09451e-05
Relative nonlinear residual (total system) after nonlinear iteration 2: 1.09451e-05
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 8.24598e-15, 0.00293185, 1.86223e-06, 1.0513e-05
Relative nonlinear residual (total system) after nonlinear iteration 2: 1.0513e-05

Solving temperature system... 0 iterations.
Solving porosity system ... 7 iterations.
Solving water_content system ... 4 iterations.
Rebuilding Stokes preconditioner...
Solving Stokes system... 2+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 9.41156e-15, 5.44969e-05, 4.13232e-09, 2.80776e-07
Relative nonlinear residual (total system) after nonlinear iteration 3: 2.80776e-07
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 8.89565e-15, 5.28711e-05, 3.92659e-09, 2.65279e-07
Relative nonlinear residual (total system) after nonlinear iteration 3: 2.65279e-07


Postprocessing:
Writing graphical output: output-solubility/solution/solution-00001
Compositions min/max/mass: -9.192e-05/0.001947/1.112e+04 // 0.008067/0.0101/1.889e+05
Compositions min/max/mass: -9.099e-05/0.001929/1.101e+04 // 0.008085/0.0101/1.89e+05
RMS, max velocity: 0.01 m/year, 0.01 m/year

*** Timestep 2: t=15000 years, dt=5000 years
Solving composition reactions... in 10 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving porosity system ... 9 iterations.
Solving water_content system ... 8 iterations.
Rebuilding Stokes preconditioner...
Solving Stokes system... 4+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.66586e-15, 0.00337522, 0.000492161, 0.000386663
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.000492161
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.58033e-15, 0.00338608, 0.000490638, 0.000383393
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.000490638

Solving temperature system... 0 iterations.
Solving porosity system ... 8 iterations.
Solving water_content system ... 5 iterations.
Rebuilding Stokes preconditioner...
Solving Stokes system... 2+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.44958e-15, 0.000858604, 7.99505e-07, 7.61182e-06
Relative nonlinear residual (total system) after nonlinear iteration 2: 7.61182e-06
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.49146e-15, 0.000853322, 7.79602e-07, 7.48652e-06
Relative nonlinear residual (total system) after nonlinear iteration 2: 7.48652e-06


Postprocessing:
Writing graphical output: output-solubility/solution/solution-00002
Compositions min/max/mass: -0.0001435/0.002797/1.586e+04 // 0.007232/0.01015/1.842e+05
Compositions min/max/mass: -0.0001422/0.002776/1.575e+04 // 0.007252/0.01015/1.843e+05
RMS, max velocity: 0.01 m/year, 0.01 m/year

Termination requested by criterion: end time
Expand Down
14 changes: 7 additions & 7 deletions tests/tian_MORB/screen-output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 4+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.98898e-10, 3.76711e-10, 1.67792e-09, 0, 0, 1.77859e-16, 0, 0.0192689
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.0192689
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.98898e-10, 3.76711e-10, 1.67769e-09, 0, 0, 1.77859e-16, 0, 0.0192705
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.0192705

Solving temperature system... 5 iterations.
Solving porosity system ... 7 iterations.
Expand All @@ -58,8 +58,8 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 2+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.57094e-07, 1.16194e-05, 1.21423e-06, 0, 0, 2.22575e-16, 0, 9.90009e-07
Relative nonlinear residual (total system) after nonlinear iteration 2: 1.16194e-05
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.5708e-07, 1.16195e-05, 1.21404e-06, 0, 0, 1.96209e-16, 0, 9.90084e-07
Relative nonlinear residual (total system) after nonlinear iteration 2: 1.16195e-05

Solving temperature system... 1 iterations.
Solving porosity system ... 2 iterations.
Expand All @@ -71,12 +71,12 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 0+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 2.52184e-12, 1.52682e-10, 5.02891e-12, 0, 0, 1.92195e-16, 0, 1.87227e-09
Relative nonlinear residual (total system) after nonlinear iteration 3: 1.87227e-09
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 2.52157e-12, 1.52671e-10, 5.02883e-12, 0, 0, 1.93314e-16, 0, 1.8724e-09
Relative nonlinear residual (total system) after nonlinear iteration 3: 1.8724e-09


Postprocessing:
Compositions min/max/mass: 0.057/0.1095/3.857e+09 // 0.0005016/0.053/5.432e+08 // 0/0/0 // 0/0/0 // 1/1/4e+10 // 0/0/0
Compositions min/max/mass: 0.057/0.1095/3.857e+09 // 0.0005065/0.053/5.434e+08 // 0/0/0 // 0/0/0 // 1/1/4e+10 // 0/0/0

Termination requested by criterion: end time

Expand Down
14 changes: 7 additions & 7 deletions tests/tian_gabbro/screen-output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 4+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.98897e-10, 3.76196e-10, 1.52958e-09, 0, 1.77859e-16, 0, 0, 0.0208107
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.0208107
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.98897e-10, 3.76196e-10, 1.52938e-09, 0, 1.77859e-16, 0, 0, 0.0208124
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.0208124

Solving temperature system... 5 iterations.
Solving porosity system ... 7 iterations.
Expand All @@ -58,8 +58,8 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 2+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.67114e-07, 1.20625e-05, 1.23251e-06, 0, 1.94796e-16, 0, 0, 1.09741e-06
Relative nonlinear residual (total system) after nonlinear iteration 2: 1.20625e-05
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.671e-07, 1.20626e-05, 1.23233e-06, 0, 2.02305e-16, 0, 0, 1.0975e-06
Relative nonlinear residual (total system) after nonlinear iteration 2: 1.20626e-05

Solving temperature system... 1 iterations.
Solving porosity system ... 2 iterations.
Expand All @@ -71,12 +71,12 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 0+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 2.77101e-12, 1.64474e-10, 4.67294e-12, 0, 1.95977e-16, 0, 0, 2.23761e-09
Relative nonlinear residual (total system) after nonlinear iteration 3: 2.23761e-09
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 2.7708e-12, 1.64463e-10, 4.67304e-12, 0, 2.16909e-16, 0, 0, 2.23779e-09
Relative nonlinear residual (total system) after nonlinear iteration 3: 2.23779e-09


Postprocessing:
Compositions min/max/mass: 0.059/0.1096/3.792e+09 // 0.0003498/0.051/6.078e+08 // 0/0/0 // 1/1/4e+10 // 0/0/0 // 0/0/0
Compositions min/max/mass: 0.059/0.1096/3.792e+09 // 0.0003547/0.051/6.08e+08 // 0/0/0 // 1/1/4e+10 // 0/0/0 // 0/0/0

Termination requested by criterion: end time

Expand Down
14 changes: 7 additions & 7 deletions tests/tian_peridotite/screen-output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 9+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.98896e-10, 1.41542e-09, 2.1839e-09, 1.77859e-16, 0, 0, 0, 0.0295083
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.0295083
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.98896e-10, 1.41542e-09, 2.18378e-09, 1.77859e-16, 0, 0, 0, 0.0295107
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.0295107

Solving temperature system... 7 iterations.
Solving porosity system ... 9 iterations.
Expand All @@ -58,8 +58,8 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 7+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 2.181e-05, 0.000574823, 0.000145666, 1.82873e-16, 0, 0, 0, 0.000630417
Relative nonlinear residual (total system) after nonlinear iteration 2: 0.000630417
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 2.18097e-05, 0.000574824, 0.000145656, 2.06122e-16, 0, 0, 0, 0.000630391
Relative nonlinear residual (total system) after nonlinear iteration 2: 0.000630391

Solving temperature system... 4 iterations.
Solving porosity system ... 6 iterations.
Expand All @@ -71,12 +71,12 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 4+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 4.66691e-08, 2.35667e-06, 3.02875e-07, 1.89997e-16, 0, 0, 0, 2.19117e-06
Relative nonlinear residual (total system) after nonlinear iteration 3: 2.35667e-06
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 4.66657e-08, 2.35655e-06, 3.02831e-07, 1.89059e-16, 0, 0, 0, 2.19098e-06
Relative nonlinear residual (total system) after nonlinear iteration 3: 2.35655e-06


Postprocessing:
Compositions min/max/mass: -5.908e-05/0.1099/2.977e+09 // 4.488e-05/0.11/1.422e+09 // 1/1/4e+10 // 0/0/0 // 0/0/0 // 0/0/0
Compositions min/max/mass: -5.907e-05/0.1099/2.977e+09 // 4.987e-05/0.11/1.422e+09 // 1/1/4e+10 // 0/0/0 // 0/0/0 // 0/0/0

Termination requested by criterion: end time

Expand Down
14 changes: 7 additions & 7 deletions tests/tian_sediment/screen-output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 4+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.98897e-10, 1.79655e-10, 9.54157e-10, 0, 0, 0, 1.77859e-16, 0.0191931
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.0191931
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.98897e-10, 1.79655e-10, 9.53922e-10, 0, 0, 0, 1.77859e-16, 0.0191947
Relative nonlinear residual (total system) after nonlinear iteration 1: 0.0191947

Solving temperature system... 5 iterations.
Solving porosity system ... 7 iterations.
Expand All @@ -58,8 +58,8 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 2+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.4116e-07, 1.14053e-05, 6.81472e-07, 0, 0, 0, 1.9696e-16, 8.87775e-07
Relative nonlinear residual (total system) after nonlinear iteration 2: 1.14053e-05
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 3.41147e-07, 1.14054e-05, 6.81282e-07, 0, 0, 0, 1.95397e-16, 8.87851e-07
Relative nonlinear residual (total system) after nonlinear iteration 2: 1.14054e-05

Solving temperature system... 1 iterations.
Solving porosity system ... 2 iterations.
Expand All @@ -71,12 +71,12 @@ Number of degrees of freedom: 989 (162+73+162+25+81+81+81+81+81+81+81)
Rebuilding Stokes preconditioner...
Solving Stokes system... 0+0 iterations.
Solving fluid velocity system... 1 iterations.
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 1.77102e-12, 1.37697e-10, 2.93732e-12, 0, 0, 0, 2.03944e-16, 1.53067e-09
Relative nonlinear residual (total system) after nonlinear iteration 3: 1.53067e-09
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 1.77082e-12, 1.37687e-10, 2.93613e-12, 0, 0, 0, 2.04204e-16, 1.53077e-09
Relative nonlinear residual (total system) after nonlinear iteration 3: 1.53077e-09


Postprocessing:
Compositions min/max/mass: 0.078/0.1063/3.767e+09 // 0.003685/0.032/6.334e+08 // 0/0/0 // 0/0/0 // 0/0/0 // 1/1/4e+10
Compositions min/max/mass: 0.078/0.1063/3.766e+09 // 0.00369/0.032/6.336e+08 // 0/0/0 // 0/0/0 // 0/0/0 // 1/1/4e+10

Termination requested by criterion: end time

Expand Down
2 changes: 1 addition & 1 deletion tests/uncoupled_two_phase_tian_parameterization_kinematic_slab/statistics
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
# 35: Global mass for composition sediment
0 0.000000000000e+00 0.000000000000e+00 16 187 81 486 0 0 0 0 0 0 0 24 26 26 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 1.00000000e+00 9.91319444e+09 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00
1 1.000000000000e+03 1.000000000000e+03 16 187 81 486 8 0 11 8 10 11 0 17 19 19 0.00000000e+00 0.00000000e+00 0.00000000e+00 -2.63897272e-03 2.00000000e-02 1.03573618e+06 0.00000000e+00 1.00792232e+00 9.91036714e+09 -1.32154382e-01 1.00000000e+00 1.29474543e+07 -1.31948636e-01 1.00000000e+00 5.17868088e+07 0.00000000e+00 0.00000000e+00 0.00000000e+00
2 2.000000000000e+03 1.000000000000e+03 16 187 81 486 7 10 11 7 10 11 0 16 18 18 -1.35538213e-07 4.98262779e-05 8.42600735e+03 -2.35715286e-03 2.00000000e-02 1.08075722e+06 0.00000000e+00 1.01539290e+00 9.90754232e+09 -1.18366167e-01 1.00000000e+00 1.36157275e+07 -1.17842891e-01 1.00000000e+00 5.44591625e+07 0.00000000e+00 0.00000000e+00 0.00000000e+00
2 2.000000000000e+03 1.000000000000e+03 16 187 81 486 7 10 11 7 10 11 0 16 18 18 -1.35403919e-07 4.97769316e-05 8.41766249e+03 -2.35715257e-03 2.00000000e-02 1.08076556e+06 0.00000000e+00 1.01539290e+00 9.90754232e+09 -1.18366167e-01 1.00000000e+00 1.36157275e+07 -1.17842891e-01 1.00000000e+00 5.44591625e+07 0.00000000e+00 0.00000000e+00 0.00000000e+00

0 comments on commit db27bba

Please sign in to comment.