Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jdannberg committed Jun 15, 2024
1 parent b897961 commit f393e8a
Show file tree
Hide file tree
Showing 12 changed files with 247 additions and 237 deletions.
2 changes: 1 addition & 1 deletion source/simulator/parameters.cc
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
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
set Reaction solver relative tolerance = 1e-6
end
end

subsection Discretization
subsection Stabilization parameters
Expand Down
6 changes: 3 additions & 3 deletions tests/advection_reaction/screen-output
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ Number of degrees of freedom: 17,989 (8,450+1,089+4,225+4,225)
Errors time=0.000000e+00 ndofs= 17989 C_L2_current= 3.076482e-05 C_L2_max= 3.076482e-05 T_L2_current= 3.076482e-05 T_L2_max= 3.076482e-05

*** Timestep 1: t=1 seconds, dt=1 seconds
Solving composition reactions... in 500 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 22 iterations.
Solving C_1 system ... 22 iterations.
Solving Stokes system... 0+0 iterations.

Postprocessing:
Compositions min/max/mass: -0.9974/0.9974/-3.408e-08
Compositions min/max/mass: -0.9974/0.9974/-3.301e-08
Writing graphical output: output-advection_reaction/solution/solution-00001
Errors time=1.000000e+00 ndofs= 17989 C_L2_current= 1.349430e-03 C_L2_max= 1.349430e-03 T_L2_current= 1.349430e-03 T_L2_max= 1.349430e-03
Errors time=1.000000e+00 ndofs= 17989 C_L2_current= 1.348377e-03 C_L2_max= 1.348377e-03 T_L2_current= 1.348377e-03 T_L2_max= 1.348377e-03

Termination requested by criterion: end time

Expand Down
5 changes: 5 additions & 0 deletions tests/exponential_decay.prm
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
set Reaction solver relative tolerance = 1e-6
end
end

subsection Geometry model
set Model name = box
Expand Down
60 changes: 30 additions & 30 deletions tests/exponential_decay/screen-output
Original file line number Diff line number Diff line change
Expand Up @@ -15,114 +15,114 @@ Number of degrees of freedom: 1,237 (578+81+289+289)
Errors time=0.000000e+00 ndofs= 1237 C_L2_current= 1.100813e-16 C_L2_max= 1.100813e-16 T_L2_current= 1.100813e-16 T_L2_max= 1.100813e-16

*** Timestep 1: t=10 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.4996/0.4996/0.4996
Compositions min/max/mass: 0.5/0.5/0.5
Writing graphical output: output-exponential_decay/solution/solution-00001
Errors time=1.000000e+01 ndofs= 1237 C_L2_current= 3.854009e-04 C_L2_max= 3.854009e-04 T_L2_current= 3.854009e-04 T_L2_max= 3.854009e-04
Errors time=1.000000e+01 ndofs= 1237 C_L2_current= 1.657684e-08 C_L2_max= 1.657684e-08 T_L2_current= 1.657684e-08 T_L2_max= 1.657684e-08

*** Timestep 2: t=20 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.2496/0.2496/0.2496
Compositions min/max/mass: 0.25/0.25/0.25
Writing graphical output: output-exponential_decay/solution/solution-00002
Errors time=2.000000e+01 ndofs= 1237 C_L2_current= 3.852524e-04 C_L2_max= 3.854009e-04 T_L2_current= 3.852524e-04 T_L2_max= 3.854009e-04
Errors time=2.000000e+01 ndofs= 1237 C_L2_current= 1.657776e-08 C_L2_max= 1.657776e-08 T_L2_current= 1.657776e-08 T_L2_max= 1.657776e-08

*** Timestep 3: t=30 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.1247/0.1247/0.1247
Compositions min/max/mass: 0.125/0.125/0.125
Writing graphical output: output-exponential_decay/solution/solution-00003
Errors time=3.000000e+01 ndofs= 1237 C_L2_current= 2.888279e-04 C_L2_max= 3.854009e-04 T_L2_current= 2.888279e-04 T_L2_max= 3.854009e-04
Errors time=3.000000e+01 ndofs= 1237 C_L2_current= 1.243447e-08 C_L2_max= 1.657776e-08 T_L2_current= 1.243447e-08 T_L2_max= 1.657776e-08

*** Timestep 4: t=40 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.06231/0.06231/0.06231
Compositions min/max/mass: 0.0625/0.0625/0.0625
Writing graphical output: output-exponential_decay/solution/solution-00004
Errors time=4.000000e+01 ndofs= 1237 C_L2_current= 1.924778e-04 C_L2_max= 3.854009e-04 T_L2_current= 1.924778e-04 T_L2_max= 3.854009e-04
Errors time=4.000000e+01 ndofs= 1237 C_L2_current= 8.290951e-09 C_L2_max= 1.657776e-08 T_L2_current= 8.290951e-09 T_L2_max= 1.657776e-08

*** Timestep 5: t=50 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.03113/0.03113/0.03113
Compositions min/max/mass: 0.03125/0.03125/0.03125
Writing graphical output: output-exponential_decay/solution/solution-00005
Errors time=5.000000e+01 ndofs= 1237 C_L2_current= 1.202523e-04 C_L2_max= 3.854009e-04 T_L2_current= 1.202523e-04 T_L2_max= 3.854009e-04
Errors time=5.000000e+01 ndofs= 1237 C_L2_current= 5.183252e-09 C_L2_max= 1.657776e-08 T_L2_current= 5.183252e-09 T_L2_max= 1.657776e-08

*** Timestep 6: t=60 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.01555/0.01555/0.01555
Compositions min/max/mass: 0.01562/0.01562/0.01562
Writing graphical output: output-exponential_decay/solution/solution-00006
Errors time=6.000000e+01 ndofs= 1237 C_L2_current= 7.212356e-05 C_L2_max= 3.854009e-04 T_L2_current= 7.212356e-05 T_L2_max= 3.854009e-04
Errors time=6.000000e+01 ndofs= 1237 C_L2_current= 3.111434e-09 C_L2_max= 1.657776e-08 T_L2_current= 3.111434e-09 T_L2_max= 1.657776e-08

*** Timestep 7: t=70 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.00777/0.00777/0.00777
Compositions min/max/mass: 0.007812/0.007812/0.007812
Writing graphical output: output-exponential_decay/solution/solution-00007
Errors time=7.000000e+01 ndofs= 1237 C_L2_current= 4.205588e-05 C_L2_max= 3.854009e-04 T_L2_current= 4.205588e-05 T_L2_max= 3.854009e-04
Errors time=7.000000e+01 ndofs= 1237 C_L2_current= 1.816541e-09 C_L2_max= 1.657776e-08 T_L2_current= 1.816541e-09 T_L2_max= 1.657776e-08

*** Timestep 8: t=80 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.003882/0.003882/0.003882
Compositions min/max/mass: 0.003906/0.003906/0.003906
Writing graphical output: output-exponential_decay/solution/solution-00008
Errors time=8.000000e+01 ndofs= 1237 C_L2_current= 2.402267e-05 C_L2_max= 3.854009e-04 T_L2_current= 2.402267e-05 T_L2_max= 3.854009e-04
Errors time=8.000000e+01 ndofs= 1237 C_L2_current= 1.039602e-09 C_L2_max= 1.657776e-08 T_L2_current= 1.039602e-09 T_L2_max= 1.657776e-08

*** Timestep 9: t=90 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.00194/0.00194/0.00194
Compositions min/max/mass: 0.001953/0.001953/0.001953
Writing graphical output: output-exponential_decay/solution/solution-00009
Errors time=9.000000e+01 ndofs= 1237 C_L2_current= 1.350755e-05 C_L2_max= 3.854009e-04 T_L2_current= 1.350755e-05 T_L2_max= 3.854009e-04
Errors time=9.000000e+01 ndofs= 1237 C_L2_current= 5.863873e-10 C_L2_max= 1.657776e-08 T_L2_current= 5.863873e-10 T_L2_max= 1.657776e-08

*** Timestep 10: t=100 seconds, dt=10 seconds
Solving composition reactions... in 312 substep(s).
Solving composition reactions... in 1 substep(s).
Solving temperature system... 0 iterations.
Solving C_1 system ... 0 iterations.
Solving Stokes system... 8+0 iterations.

Postprocessing:
Compositions min/max/mass: 0.0009691/0.0009691/0.0009691
Compositions min/max/mass: 0.0009766/0.0009766/0.0009766
Writing graphical output: output-exponential_decay/solution/solution-00010
Errors time=1.000000e+02 ndofs= 1237 C_L2_current= 7.501305e-06 C_L2_max= 3.854009e-04 T_L2_current= 7.501305e-06 T_L2_max= 3.854009e-04
Errors time=1.000000e+02 ndofs= 1237 C_L2_current= 3.274074e-10 C_L2_max= 1.657776e-08 T_L2_current= 3.274074e-10 T_L2_max= 1.657776e-08

Termination requested by criterion: end time

Expand Down
Loading

0 comments on commit f393e8a

Please sign in to comment.