From f3cc82b7a7c322a64681f43671f41ea595c07da7 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com> Date: Thu, 28 Oct 2021 13:13:32 +0200 Subject: [PATCH 01/22] First draft of sped up coverage test --- .../p4est_3d_dgsem/elixir_advection_amr.jl | 2 +- ...lixir_advection_amr_unstructured_curved.jl | 2 +- .../p4est_3d_dgsem/elixir_advection_basic.jl | 2 +- .../elixir_advection_cubed_sphere.jl | 2 +- .../elixir_advection_nonconforming.jl | 2 +- .../elixir_advection_restart.jl | 2 +- .../elixir_advection_unstructured_curved.jl | 2 +- examples/p4est_3d_dgsem/elixir_euler_ec.jl | 2 +- .../elixir_euler_free_stream.jl | 2 +- .../elixir_euler_free_stream_extruded.jl | 2 +- examples/p4est_3d_dgsem/elixir_euler_sedov.jl | 10 +++---- ...terms_nonconforming_unstructured_curved.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- .../elixir_mhd_alfven_wave_nonconforming.jl | 2 +- .../elixir_mhd_shockcapturing_amr.jl | 2 +- test/test_trixi.jl | 26 +++++++++++++------ 16 files changed, 37 insertions(+), 27 deletions(-) diff --git a/examples/p4est_3d_dgsem/elixir_advection_amr.jl b/examples/p4est_3d_dgsem/elixir_advection_amr.jl index 0473fd2b23a..af73957f565 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_amr.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_amr.jl @@ -70,5 +70,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl index fb87c361c18..e83d47f49b2 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl @@ -107,5 +107,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_advection_basic.jl b/examples/p4est_3d_dgsem/elixir_advection_basic.jl index 1ff16210d77..a8892c65a94 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_basic.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_basic.jl @@ -60,7 +60,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_restart, save_ # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl b/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl index ff343f2bb6c..95f77cd2ca4 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl @@ -56,7 +56,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl b/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl index 0ca7b5c1712..a5ff66e5283 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl @@ -74,7 +74,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/p4est_3d_dgsem/elixir_advection_restart.jl b/examples/p4est_3d_dgsem/elixir_advection_restart.jl index 71b37e9f39b..1748dc908f1 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_restart.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_restart.jl @@ -29,5 +29,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl index ec546ae4d8c..fce76599b32 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl @@ -93,7 +93,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/p4est_3d_dgsem/elixir_euler_ec.jl b/examples/p4est_3d_dgsem/elixir_euler_ec.jl index 30269bb63b9..40eda9d8cfa 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_ec.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_ec.jl @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl b/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl index b494cf5e84f..d91d4c2517a 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl @@ -105,5 +105,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl b/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl index bed87c853fe..79be341a670 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl @@ -98,5 +98,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), #maxiters=1, dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_sedov.jl b/examples/p4est_3d_dgsem/elixir_euler_sedov.jl index 5f5d895c08d..eaabea52d28 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_sedov.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_sedov.jl @@ -27,7 +27,7 @@ function initial_condition_medium_sedov_blast_wave(x, t, equations::Compressible r0 = 0.21875 # = 3.5 * smallest dx (for domain length=4 and max-ref=6) E = 1.0 p0_inner = 3 * (equations.gamma - 1) * E / (4 * pi * r0^2) - p0_outer = 1.0e-3 + p0_outer = 1.0e-3 # Calculate primitive variables rho = 1.0 @@ -42,7 +42,7 @@ end initial_condition = initial_condition_medium_sedov_blast_wave surface_flux = flux_lax_friedrichs -volume_flux = flux_ranocha +volume_flux = flux_ranocha polydeg = 5 basis = LobattoLegendreBasis(polydeg) indicator_sc = IndicatorHennemannGassner(equations, basis, @@ -53,8 +53,8 @@ indicator_sc = IndicatorHennemannGassner(equations, basis, volume_integral = VolumeIntegralShockCapturingHG(indicator_sc; volume_flux_dg=volume_flux, volume_flux_fv=surface_flux) - -solver = DGSEM(polydeg=polydeg, surface_flux=surface_flux, volume_integral=volume_integral) + +solver = DGSEM(polydeg=polydeg, surface_flux=surface_flux, volume_integral=volume_integral) coordinates_min = (-1.0, -1.0, -1.0) coordinates_max = ( 1.0, 1.0, 1.0) @@ -98,5 +98,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl index 67194a521a8..5e3ffaed942 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl @@ -108,5 +108,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl index cd796c33e47..e6726fd3b38 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -67,5 +67,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl b/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl index 7e448c4867c..bb33ac1e789 100644 --- a/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl +++ b/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl @@ -76,5 +76,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl b/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl index fc95d427abb..7082342c02a 100644 --- a/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl +++ b/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl @@ -127,5 +127,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/test/test_trixi.jl b/test/test_trixi.jl index d0146982206..9e5cd7f0668 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -16,13 +16,23 @@ as absolute/relative tolerance. """ macro test_trixi_include(elixir, args...) - local l2 = get_kwarg(args, :l2, nothing) - local linf = get_kwarg(args, :linf, nothing) - local atol = get_kwarg(args, :atol, 500*eps()) - local rtol = get_kwarg(args, :rtol, sqrt(eps())) + local l2 = get_kwarg(args, :l2, nothing) + local linf = get_kwarg(args, :linf, nothing) + local atol = get_kwarg(args, :atol, 500*eps()) + local rtol = get_kwarg(args, :rtol, sqrt(eps())) + local maxiters = get_kwarg(args, :maxiters, typemax(Int)) + + local cmd = string(Base.julia_cmd()) + local coverage = occursin("--code-coverage", cmd) && !occursin("--code-coverage=none", cmd) + if coverage + # Instead of the kwarg `maxiters`, use `maxiters_coverage` (defaults to 1) + # if Julia is run with code coverage + maxiters = get_kwarg(args, :maxiters_coverage, 1) + end + local kwargs = Pair{Symbol, Any}[] for arg in args - if arg.head == :(=) && !(arg.args[1] in (:l2, :linf, :atol, :rtol)) + if arg.head == :(=) && !(arg.args[1] in (:l2, :linf, :atol, :rtol, :maxiters, :maxiters_coverage)) push!(kwargs, Pair(arg.args...)) end end @@ -33,7 +43,7 @@ macro test_trixi_include(elixir, args...) # if `maxiters` is set in tests, it is usually set to a small numer to # run only a few steps - ignore possible warnings coming from that - if any(==(:maxiters) ∘ first, $kwargs) + if $maxiters < typemax(Int) additional_ignore_content = [ r"┌ Warning: Interrupted\. Larger maxiters is needed\.\n└ @ SciMLBase .+\n", r"┌ Warning: Interrupted\. Larger maxiters is needed\.\n└ @ Trixi .+\n"] @@ -42,10 +52,10 @@ macro test_trixi_include(elixir, args...) end # evaluate examples in the scope of the module they're called from - @test_nowarn_mod trixi_include(@__MODULE__, $elixir; $kwargs...) additional_ignore_content + @test_nowarn_mod trixi_include(@__MODULE__, $elixir; maxiters=$maxiters, $kwargs...) additional_ignore_content # if present, compare l2 and linf errors against reference values - if !isnothing($l2) || !isnothing($linf) + if !$coverage && (!isnothing($l2) || !isnothing($linf)) l2_measured, linf_measured = analysis_callback(sol) if Trixi.mpi_isroot() && !isnothing($l2) From 9cc808df05a07268a7e79fdaa2e7d56a8ad85b84 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com> Date: Thu, 28 Oct 2021 16:16:48 +0200 Subject: [PATCH 02/22] Prevent GlmSpeedCallback from overriding maxiters --- src/callbacks_step/glm_speed.jl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/callbacks_step/glm_speed.jl b/src/callbacks_step/glm_speed.jl index f2b8abe638f..03809c97e83 100644 --- a/src/callbacks_step/glm_speed.jl +++ b/src/callbacks_step/glm_speed.jl @@ -84,6 +84,9 @@ end # c_h is proportional to its own time step divided by the complete MHD time step equations.c_h = glm_scale * c_h_deltat / dt + # avoid re-evaluating possible FSAL stages + u_modified!(integrator, false) + return nothing end From 148a8e2f16bdff5d95cbb1a6e38e99f22d7643f9 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com> Date: Thu, 28 Oct 2021 16:17:17 +0200 Subject: [PATCH 03/22] Run tests twice: Once with coverage and once without --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dec14760f24..ad0f3d5ee26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,7 +111,17 @@ jobs: - uses: julia-actions/julia-buildpkg@v1 env: PYTHON: "" - - uses: julia-actions/julia-runtest@v1 + - name: Run tests without coverage + uses: julia-actions/julia-runtest@v1 + with: + coverage: false + env: + PYTHON: "" + TRIXI_TEST: ${{ matrix.trixi_test }} + - name: Run tests with coverage + uses: julia-actions/julia-runtest@v1 + with: + coverage: true env: PYTHON: "" TRIXI_TEST: ${{ matrix.trixi_test }} From 33bf6236bed355daeec9fc427d029c7fad1aeb74 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Wed, 3 Nov 2021 11:56:08 +0100 Subject: [PATCH 04/22] Add maxiters kwarg to all elixirs --- .../elixir_euler_brown_minion_vortex.jl | 2 +- ...ixir_euler_kelvin_helmholtz_instability.jl | 3 +- ...lixir_euler_rayleigh_taylor_instability.jl | 2 +- .../elixir_euler_triangulate_pkg_mesh.jl | 3 +- examples/dgmulti_2d/elixir_euler_weakform.jl | 3 +- .../elixir_euler_weakform_periodic.jl | 3 +- .../dgmulti_2d/elixir_mhd_weak_blast_wave.jl | 2 +- .../elixir_shallowwater_source_terms.jl | 2 +- .../elixir_euler_taylor_green_vortex.jl | 4 +- examples/dgmulti_3d/elixir_euler_weakform.jl | 3 +- .../elixir_euler_weakform_periodic.jl | 3 +- ...ixir_advection_amr_solution_independent.jl | 2 +- .../elixir_advection_amr_unstructured_flag.jl | 2 +- .../p4est_2d_dgsem/elixir_advection_basic.jl | 2 +- .../elixir_advection_nonconforming_flag.jl | 2 +- .../elixir_advection_restart.jl | 2 +- .../elixir_advection_unstructured_flag.jl | 2 +- .../elixir_euler_blast_wave_amr.jl | 4 +- .../elixir_euler_free_stream.jl | 2 +- examples/p4est_2d_dgsem/elixir_euler_sedov.jl | 2 +- .../elixir_euler_shockcapturing_ec.jl | 4 +- ...e_terms_nonconforming_unstructured_flag.jl | 2 +- .../elixir_eulergravity_convergence.jl | 2 +- .../p4est_2d_dgsem/elixir_mhd_alfven_wave.jl | 2 +- examples/p4est_2d_dgsem/elixir_mhd_rotor.jl | 2 +- .../elixir_euler_convergence.jl | 2 +- .../elixir_eulergravity_convergence.jl | 2 +- .../elixir_eulergravity_jeans_instability.jl | 2 +- .../elixir_eulergravity_sedov_blast_wave.jl | 2 +- .../elixir_hypdiff_convergence.jl | 2 +- .../elixir_advection_basic.jl | 2 +- .../elixir_advection_nonperiodic.jl | 2 +- .../structured_1d_dgsem/elixir_euler_sedov.jl | 6 +-- .../elixir_euler_source_terms.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- .../elixir_advection_basic.jl | 2 +- .../elixir_advection_free_stream.jl | 2 +- .../elixir_advection_nonperiodic.jl | 2 +- .../elixir_advection_parallelogram.jl | 4 +- .../elixir_advection_restart.jl | 2 +- .../elixir_advection_rotated.jl | 4 +- .../elixir_advection_waving_flag.jl | 2 +- .../structured_2d_dgsem/elixir_euler_ec.jl | 2 +- .../elixir_euler_free_stream.jl | 2 +- ...lixir_euler_rayleigh_taylor_instability.jl | 2 +- .../structured_2d_dgsem/elixir_euler_sedov.jl | 8 ++-- .../elixir_euler_source_terms.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- ...elixir_euler_source_terms_parallelogram.jl | 2 +- .../elixir_euler_source_terms_rotated.jl | 2 +- .../elixir_euler_source_terms_waving_flag.jl | 2 +- .../elixir_hypdiff_harmonic_nonperiodic.jl | 2 +- .../elixir_hypdiff_nonperiodic.jl | 2 +- .../elixir_mhd_alfven_wave.jl | 2 +- examples/structured_2d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_mhd_ec_shockcapturing.jl | 2 +- .../elixir_shallowwater_source_terms.jl | 2 +- .../elixir_advection_basic.jl | 2 +- .../elixir_advection_free_stream.jl | 2 +- .../elixir_advection_nonperiodic_curved.jl | 2 +- .../elixir_advection_restart.jl | 2 +- .../structured_3d_dgsem/elixir_euler_ec.jl | 2 +- .../elixir_euler_free_stream.jl | 2 +- .../structured_3d_dgsem/elixir_euler_sedov.jl | 8 ++-- .../elixir_euler_source_terms.jl | 2 +- ...r_euler_source_terms_nonperiodic_curved.jl | 2 +- .../elixir_mhd_alfven_wave.jl | 2 +- examples/structured_3d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_mhd_ec_shockcapturing.jl | 2 +- .../tree_1d_dgsem/elixir_advection_amr.jl | 2 +- .../elixir_advection_amr_nonperiodic.jl | 2 +- .../tree_1d_dgsem/elixir_advection_basic.jl | 2 +- .../tree_1d_dgsem/elixir_burgers_basic.jl | 2 +- .../elixir_burgers_linear_stability.jl | 2 +- .../elixir_euler_convergence_pure_fv.jl | 2 +- .../elixir_euler_density_wave.jl | 2 +- .../tree_1d_dgsem/elixir_euler_positivity.jl | 2 +- .../elixir_euler_sedov_blast_wave.jl | 2 +- .../elixir_euler_sedov_blast_wave_pure_fv.jl | 2 +- .../elixir_euler_shockcapturing.jl | 2 +- .../elixir_euler_source_terms.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- .../elixir_eulergravity_convergence.jl | 2 +- .../elixir_eulermulti_convergence_ec.jl | 2 +- .../elixir_eulermulti_convergence_es.jl | 2 +- .../tree_1d_dgsem/elixir_eulermulti_ec.jl | 2 +- .../tree_1d_dgsem/elixir_eulermulti_es.jl | 2 +- .../elixir_hypdiff_harmonic_nonperiodic.jl | 2 +- .../elixir_hypdiff_nonperiodic.jl | 2 +- .../tree_1d_dgsem/elixir_mhd_alfven_wave.jl | 2 +- .../elixir_mhd_briowu_shock_tube.jl | 2 +- examples/tree_1d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_mhd_ryujones_shock_tube.jl | 2 +- .../elixir_mhd_shu_osher_shock_tube.jl | 2 +- .../elixir_mhd_torrilhon_shock_tube.jl | 2 +- .../elixir_mhdmulti_briowu_shock_tube.jl | 2 +- examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl | 2 +- examples/tree_1d_dgsem/elixir_mhdmulti_es.jl | 2 +- .../elixir_acoustics_convergence.jl | 2 +- .../tree_2d_dgsem/elixir_acoustics_gauss.jl | 2 +- .../elixir_acoustics_gauss_wall.jl | 2 +- .../elixir_acoustics_gaussian_source.jl | 2 +- .../elixir_acoustics_monopole.jl | 2 +- .../tree_2d_dgsem/elixir_advection_amr.jl | 2 +- .../elixir_advection_amr_coarsen_twice.jl | 2 +- .../elixir_advection_amr_nonperiodic.jl | 2 +- .../elixir_advection_amr_refine_twice.jl | 2 +- ...ixir_advection_amr_solution_independent.jl | 2 +- .../elixir_advection_amr_visualization.jl | 2 +- .../tree_2d_dgsem/elixir_advection_basic.jl | 2 +- .../elixir_advection_callbacks.jl | 2 +- .../tree_2d_dgsem/elixir_advection_mortar.jl | 2 +- .../tree_2d_dgsem/elixir_advection_restart.jl | 2 +- .../elixir_euler_astro_jet_amr.jl | 40 +++++++++---------- .../elixir_euler_blast_wave_amr.jl | 2 +- .../tree_2d_dgsem/elixir_euler_blob_amr.jl | 2 +- .../tree_2d_dgsem/elixir_euler_blob_mortar.jl | 2 +- .../elixir_euler_colliding_flow.jl | 12 +++--- .../elixir_euler_colliding_flow_amr.jl | 14 +++---- .../elixir_euler_convergence_pure_fv.jl | 2 +- .../elixir_euler_density_wave.jl | 2 +- examples/tree_2d_dgsem/elixir_euler_ec.jl | 2 +- ...ixir_euler_kelvin_helmholtz_instability.jl | 2 +- ..._euler_kelvin_helmholtz_instability_amr.jl | 2 +- .../elixir_euler_shockcapturing.jl | 2 +- .../elixir_euler_source_terms.jl | 2 +- ...r_euler_source_terms_amr_refine_coarsen.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- .../tree_2d_dgsem/elixir_euler_vortex_amr.jl | 2 +- .../elixir_euler_vortex_mortar.jl | 2 +- ...ixir_euler_vortex_mortar_shockcapturing.jl | 2 +- .../elixir_euler_vortex_mortar_split.jl | 2 +- .../elixir_euler_vortex_shockcapturing.jl | 2 +- ..._euleracoustics_co-rotating_vortex_pair.jl | 4 +- .../elixir_eulermulti_convergence_ec.jl | 2 +- .../elixir_eulermulti_convergence_es.jl | 2 +- .../tree_2d_dgsem/elixir_eulermulti_ec.jl | 2 +- .../tree_2d_dgsem/elixir_eulermulti_es.jl | 2 +- .../tree_2d_dgsem/elixir_hypdiff_godunov.jl | 2 +- .../elixir_hypdiff_harmonic_nonperiodic.jl | 2 +- .../elixir_hypdiff_lax_friedrichs.jl | 2 +- .../elixir_hypdiff_nonperiodic.jl | 2 +- examples/tree_2d_dgsem/elixir_lbm_constant.jl | 2 +- examples/tree_2d_dgsem/elixir_lbm_couette.jl | 2 +- .../elixir_lbm_lid_driven_cavity.jl | 2 +- .../elixir_mhd_alfven_wave_mortar.jl | 2 +- .../tree_2d_dgsem/elixir_mhd_blast_wave.jl | 2 +- examples/tree_2d_dgsem/elixir_mhd_ec.jl | 2 +- .../tree_2d_dgsem/elixir_mhd_orszag_tang.jl | 2 +- examples/tree_2d_dgsem/elixir_mhd_rotor.jl | 2 +- examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl | 2 +- examples/tree_2d_dgsem/elixir_mhdmulti_es.jl | 2 +- .../tree_2d_dgsem/elixir_mhdmulti_rotor.jl | 2 +- .../tree_2d_dgsem/elixir_shallowwater_ec.jl | 2 +- .../elixir_shallowwater_source_terms.jl | 2 +- .../elixir_shallowwater_well_balanced.jl | 2 +- .../tree_3d_dgsem/elixir_advection_amr.jl | 2 +- .../tree_3d_dgsem/elixir_advection_basic.jl | 2 +- .../tree_3d_dgsem/elixir_advection_mortar.jl | 2 +- .../tree_3d_dgsem/elixir_advection_restart.jl | 2 +- examples/tree_3d_dgsem/elixir_euler_amr.jl | 2 +- .../tree_3d_dgsem/elixir_euler_blob_amr.jl | 2 +- .../tree_3d_dgsem/elixir_euler_convergence.jl | 2 +- .../elixir_euler_convergence_pure_fv.jl | 2 +- .../elixir_euler_density_pulse.jl | 2 +- examples/tree_3d_dgsem/elixir_euler_ec.jl | 2 +- examples/tree_3d_dgsem/elixir_euler_mortar.jl | 2 +- .../elixir_euler_shockcapturing.jl | 2 +- .../elixir_euler_source_terms.jl | 2 +- .../elixir_euler_taylor_green_vortex.jl | 2 +- .../elixir_eulergravity_convergence.jl | 2 +- .../elixir_hypdiff_lax_friedrichs.jl | 2 +- .../elixir_hypdiff_nonperiodic.jl | 2 +- .../tree_3d_dgsem/elixir_mhd_alfven_wave.jl | 2 +- .../elixir_mhd_alfven_wave_mortar.jl | 2 +- examples/tree_3d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_mhd_ec_shockcapturing.jl | 2 +- .../elixir_acoustics_gauss_wall.jl | 2 +- .../elixir_advection_basic.jl | 2 +- .../elixir_euler_basic.jl | 2 +- .../unstructured_2d_dgsem/elixir_euler_ec.jl | 2 +- .../elixir_euler_free_stream.jl | 2 +- .../elixir_euler_periodic.jl | 2 +- .../elixir_euler_restart.jl | 2 +- .../elixir_euler_sedov.jl | 2 +- .../elixir_euler_wall_bc.jl | 2 +- .../unstructured_2d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_shallowwater_dirichlet.jl | 2 +- .../elixir_shallowwater_ec.jl | 4 +- .../elixir_shallowwater_ec_shockcapturing.jl | 2 +- .../elixir_shallowwater_source_terms.jl | 2 +- .../elixir_shallowwater_wall_bc.jl | 2 +- .../elixir_shallowwater_well_balanced.jl | 4 +- 193 files changed, 245 insertions(+), 239 deletions(-) diff --git a/examples/dgmulti_2d/elixir_euler_brown_minion_vortex.jl b/examples/dgmulti_2d/elixir_euler_brown_minion_vortex.jl index 9a1435473f5..c73f0f10c6e 100644 --- a/examples/dgmulti_2d/elixir_euler_brown_minion_vortex.jl +++ b/examples/dgmulti_2d/elixir_euler_brown_minion_vortex.jl @@ -48,6 +48,6 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback) tol = 1.0e-8 sol = solve(ode, RDPK3SpFSAL49(), abstol=tol, reltol=tol, - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary \ No newline at end of file diff --git a/examples/dgmulti_2d/elixir_euler_kelvin_helmholtz_instability.jl b/examples/dgmulti_2d/elixir_euler_kelvin_helmholtz_instability.jl index 0537aca77f6..f9c5e483101 100644 --- a/examples/dgmulti_2d/elixir_euler_kelvin_helmholtz_instability.jl +++ b/examples/dgmulti_2d/elixir_euler_kelvin_helmholtz_instability.jl @@ -50,6 +50,7 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt= estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); + dt= estimate_dt(mesh, dg), save_everystep=false, + callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl b/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl index 83b88e6f59a..99937b0bd57 100644 --- a/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl +++ b/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl @@ -103,6 +103,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-6, reltol=1.0e-6, - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary \ No newline at end of file diff --git a/examples/dgmulti_2d/elixir_euler_triangulate_pkg_mesh.jl b/examples/dgmulti_2d/elixir_euler_triangulate_pkg_mesh.jl index 93905ec8671..67ad18ae590 100644 --- a/examples/dgmulti_2d/elixir_euler_triangulate_pkg_mesh.jl +++ b/examples/dgmulti_2d/elixir_euler_triangulate_pkg_mesh.jl @@ -38,5 +38,6 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback) # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, + callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_euler_weakform.jl b/examples/dgmulti_2d/elixir_euler_weakform.jl index 6fed317e2fb..cfe809cfb31 100644 --- a/examples/dgmulti_2d/elixir_euler_weakform.jl +++ b/examples/dgmulti_2d/elixir_euler_weakform.jl @@ -40,5 +40,6 @@ callbacks = CallbackSet(summary_callback, alive_callback, stepsize_callback, ana # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, + callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl b/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl index 79a82eab136..02da2e728b9 100644 --- a/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl +++ b/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl @@ -28,5 +28,6 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback) # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, + callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl b/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl index 2073508a448..89034544b34 100644 --- a/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl +++ b/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl @@ -50,6 +50,6 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_shallowwater_source_terms.jl b/examples/dgmulti_2d/elixir_shallowwater_source_terms.jl index 53f51c0b772..69cbbfcccc9 100644 --- a/examples/dgmulti_2d/elixir_shallowwater_source_terms.jl +++ b/examples/dgmulti_2d/elixir_shallowwater_source_terms.jl @@ -42,6 +42,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-7, reltol=1.0e-7, - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl b/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl index b37b9ad4c72..e603a52675b 100644 --- a/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl +++ b/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl @@ -62,6 +62,6 @@ callbacks = CallbackSet(summary_callback, ############################################################################### # run the simulation -sol = solve(ode, RDPK3SpFSAL49(), abstol = 1.0e-7, reltol = 1.0e-7, - save_everystep = false, callback = callbacks) +sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-7, reltol=1.0e-7, + save_everystep=false, callback=callbacks, maxiters=typemax(Int)) summary_callback() # print the timer summary diff --git a/examples/dgmulti_3d/elixir_euler_weakform.jl b/examples/dgmulti_3d/elixir_euler_weakform.jl index b8b0e6e54ed..957dd270d7b 100644 --- a/examples/dgmulti_3d/elixir_euler_weakform.jl +++ b/examples/dgmulti_3d/elixir_euler_weakform.jl @@ -39,5 +39,6 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback) # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, + callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl b/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl index ca2163b558c..48d44c19683 100644 --- a/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl +++ b/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl @@ -29,5 +29,6 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback) # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, + callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl b/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl index 841a080947e..80a9311bf6e 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl @@ -145,5 +145,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl index 7e6d99c83b1..6d0a3b82f7a 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl @@ -90,6 +90,6 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_advection_basic.jl b/examples/p4est_2d_dgsem/elixir_advection_basic.jl index 0ee935d9e38..743c93f1268 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_basic.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_basic.jl @@ -57,7 +57,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl index 4268368d100..e2c70545f3d 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl @@ -76,7 +76,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/p4est_2d_dgsem/elixir_advection_restart.jl b/examples/p4est_2d_dgsem/elixir_advection_restart.jl index 1906fb2896e..f9c6c0a8bec 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_restart.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_restart.jl @@ -32,5 +32,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl index 7e41b4e0a5f..8be0b61b1ce 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl @@ -75,7 +75,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl b/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl index 35272fec96b..335b9286a00 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl @@ -56,7 +56,7 @@ isfile(mesh_file) || download("https://gist.githubusercontent.com/efaulhaber/a07 mesh = P4estMesh{2}(mesh_file, polydeg=3, initial_refinement_level=1) -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, boundary_conditions=Dict( :all => BoundaryConditionDirichlet(initial_condition) )) @@ -105,5 +105,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary \ No newline at end of file diff --git a/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl b/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl index 130e9e053af..096a9ecd5e2 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_euler_sedov.jl b/examples/p4est_2d_dgsem/elixir_euler_sedov.jl index e2459dc6d64..94dabf7ce0c 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_sedov.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_sedov.jl @@ -97,5 +97,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl b/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl index 49f1197aaa1..2e3da69a8a0 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl @@ -60,7 +60,7 @@ save_solution = SaveSolutionCallback(interval=100, stepsize_callback = StepsizeCallback(cfl=1.0) callbacks = CallbackSet(summary_callback, - analysis_callback, + analysis_callback, alive_callback, save_solution, stepsize_callback) @@ -69,5 +69,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl index 9db5fdcea62..e7127409900 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl @@ -94,5 +94,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl b/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl index b34c73d2a4e..bc4a0023747 100644 --- a/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl +++ b/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl @@ -82,6 +82,6 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl b/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl index 66bce781f60..7b8ff2607b8 100644 --- a/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl b/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl index 58915a8f6a7..9699b282ccc 100644 --- a/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl +++ b/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl @@ -133,5 +133,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl index 316f36adc9b..8ebf6c7169a 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl @@ -50,5 +50,5 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl index f2693c89583..7c4118a683b 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl @@ -77,6 +77,6 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl index b33c03f00d3..39e5ecda7ff 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl @@ -153,6 +153,6 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl index 0d86521f635..c6cc957c865 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl @@ -223,6 +223,6 @@ callbacks = CallbackSet(summary_callback, amr_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl index 029c19380cf..719cd5da6be 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl @@ -64,5 +64,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, stepsize_callba sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_1d_dgsem/elixir_advection_basic.jl b/examples/structured_1d_dgsem/elixir_advection_basic.jl index 4c431a98f8c..cc4b242e047 100644 --- a/examples/structured_1d_dgsem/elixir_advection_basic.jl +++ b/examples/structured_1d_dgsem/elixir_advection_basic.jl @@ -54,7 +54,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl b/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl index e87e0b36b0a..ade1d443cad 100644 --- a/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl +++ b/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_1d_dgsem/elixir_euler_sedov.jl b/examples/structured_1d_dgsem/elixir_euler_sedov.jl index ee950b3aaaa..fd50843dbc9 100644 --- a/examples/structured_1d_dgsem/elixir_euler_sedov.jl +++ b/examples/structured_1d_dgsem/elixir_euler_sedov.jl @@ -78,8 +78,8 @@ save_solution = SaveSolutionCallback(interval=100, stepsize_callback = StepsizeCallback(cfl=0.5) -callbacks = CallbackSet(summary_callback, - analysis_callback, +callbacks = CallbackSet(summary_callback, + analysis_callback, alive_callback, save_solution, stepsize_callback) @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_1d_dgsem/elixir_euler_source_terms.jl b/examples/structured_1d_dgsem/elixir_euler_source_terms.jl index cbda7087052..44119ec36b3 100644 --- a/examples/structured_1d_dgsem/elixir_euler_source_terms.jl +++ b/examples/structured_1d_dgsem/elixir_euler_source_terms.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/structured_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl index 9aa5b7f4979..e0a05885554 100644 --- a/examples/structured_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/structured_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -64,5 +64,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_advection_basic.jl b/examples/structured_2d_dgsem/elixir_advection_basic.jl index d174fa315ac..ff3e792006f 100644 --- a/examples/structured_2d_dgsem/elixir_advection_basic.jl +++ b/examples/structured_2d_dgsem/elixir_advection_basic.jl @@ -55,7 +55,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_advection_free_stream.jl b/examples/structured_2d_dgsem/elixir_advection_free_stream.jl index 348e1b15a19..efad68812f9 100644 --- a/examples/structured_2d_dgsem/elixir_advection_free_stream.jl +++ b/examples/structured_2d_dgsem/elixir_advection_free_stream.jl @@ -71,7 +71,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_restart, save_ # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_advection_nonperiodic.jl b/examples/structured_2d_dgsem/elixir_advection_nonperiodic.jl index 2aad3a01566..c0b4e4b7f2e 100644 --- a/examples/structured_2d_dgsem/elixir_advection_nonperiodic.jl +++ b/examples/structured_2d_dgsem/elixir_advection_nonperiodic.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl b/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl index 36a9255671f..c03dc877c00 100644 --- a/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl +++ b/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl @@ -1,6 +1,6 @@ # This elixir transforms the setup of elixir_advection_basic to a parallelogram. # The nodal values of the initial condition and the exact solution are the same as -# in elixir_advection_basic. +# in elixir_advection_basic. # However, on this non-rectangular mesh, the metric terms are non-trivial. # The same errors as with elixir_advection_basic are expected. @@ -85,7 +85,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_advection_restart.jl b/examples/structured_2d_dgsem/elixir_advection_restart.jl index 2c2a0ef8f51..e1cba7b6369 100644 --- a/examples/structured_2d_dgsem/elixir_advection_restart.jl +++ b/examples/structured_2d_dgsem/elixir_advection_restart.jl @@ -31,5 +31,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_advection_rotated.jl b/examples/structured_2d_dgsem/elixir_advection_rotated.jl index 52dc3cd4327..3b40abb5fb5 100644 --- a/examples/structured_2d_dgsem/elixir_advection_rotated.jl +++ b/examples/structured_2d_dgsem/elixir_advection_rotated.jl @@ -1,6 +1,6 @@ # This elixir transforms the setup of elixir_advection_basic to a rotated square. # The nodal values of the initial condition and the exact solution are the same as -# in elixir_advection_basic. +# in elixir_advection_basic. # However, on this rotated mesh, the metric terms are non-trivial. # The same errors as with elixir_advection_basic are expected (except for rounding errors). @@ -113,7 +113,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl b/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl index a52bad470db..bd2bc74dd94 100644 --- a/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl +++ b/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl @@ -63,7 +63,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_restart, save_ # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_euler_ec.jl b/examples/structured_2d_dgsem/elixir_euler_ec.jl index 2c91349ff98..2178a159ad9 100644 --- a/examples/structured_2d_dgsem/elixir_euler_ec.jl +++ b/examples/structured_2d_dgsem/elixir_euler_ec.jl @@ -74,5 +74,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_free_stream.jl b/examples/structured_2d_dgsem/elixir_euler_free_stream.jl index c4ddb887e5f..3ba94b93f8c 100644 --- a/examples/structured_2d_dgsem/elixir_euler_free_stream.jl +++ b/examples/structured_2d_dgsem/elixir_euler_free_stream.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl b/examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl index 7dc4053e640..7fd83982f77 100644 --- a/examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl +++ b/examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl @@ -112,6 +112,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-6, reltol=1.0e-6, - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_sedov.jl b/examples/structured_2d_dgsem/elixir_euler_sedov.jl index ed1bfab3be2..fa2f3b5bdd2 100644 --- a/examples/structured_2d_dgsem/elixir_euler_sedov.jl +++ b/examples/structured_2d_dgsem/elixir_euler_sedov.jl @@ -59,12 +59,12 @@ function mapping(xi, eta) y = eta + 0.125 * (cos(1.5 * pi * xi) * cos(0.5 * pi * eta)) x = xi + 0.125 * (cos(0.5 * pi * xi) * cos(2 * pi * y)) - + return SVector(x, y) end - + cells_per_dimension = (16, 16) - + mesh = StructuredMesh(cells_per_dimension, mapping, periodicity=true) # create the semidiscretization @@ -100,5 +100,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms.jl index 70d3e060dd0..8c3c4aaf73e 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl index 94537ecef0d..5280c674117 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl index a9c08049f41..7b62456dd73 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl index fdd189ffb55..1b7619d7493 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl @@ -129,5 +129,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl index 505e28ecd8d..ecbbd735e13 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl b/examples/structured_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl index 6730b1c4beb..126147939fe 100644 --- a/examples/structured_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl +++ b/examples/structured_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl @@ -79,5 +79,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_hypdiff_nonperiodic.jl b/examples/structured_2d_dgsem/elixir_hypdiff_nonperiodic.jl index ba77dca9a99..10cca2e99cd 100644 --- a/examples/structured_2d_dgsem/elixir_hypdiff_nonperiodic.jl +++ b/examples/structured_2d_dgsem/elixir_hypdiff_nonperiodic.jl @@ -79,5 +79,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_mhd_alfven_wave.jl b/examples/structured_2d_dgsem/elixir_mhd_alfven_wave.jl index 259875050c6..56ed20d5fa5 100644 --- a/examples/structured_2d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/structured_2d_dgsem/elixir_mhd_alfven_wave.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_mhd_ec.jl b/examples/structured_2d_dgsem/elixir_mhd_ec.jl index 634738e5c8b..0223122448b 100644 --- a/examples/structured_2d_dgsem/elixir_mhd_ec.jl +++ b/examples/structured_2d_dgsem/elixir_mhd_ec.jl @@ -93,5 +93,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_mhd_ec_shockcapturing.jl b/examples/structured_2d_dgsem/elixir_mhd_ec_shockcapturing.jl index 084aeca90b9..7e5b41ae3da 100644 --- a/examples/structured_2d_dgsem/elixir_mhd_ec_shockcapturing.jl +++ b/examples/structured_2d_dgsem/elixir_mhd_ec_shockcapturing.jl @@ -70,5 +70,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl b/examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl index 18f48080850..d63e80540de 100644 --- a/examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl +++ b/examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_advection_basic.jl b/examples/structured_3d_dgsem/elixir_advection_basic.jl index b3c336a0831..2a2c31b4c2a 100644 --- a/examples/structured_3d_dgsem/elixir_advection_basic.jl +++ b/examples/structured_3d_dgsem/elixir_advection_basic.jl @@ -58,7 +58,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, save # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/structured_3d_dgsem/elixir_advection_free_stream.jl b/examples/structured_3d_dgsem/elixir_advection_free_stream.jl index 4c813927c6f..c1b3dff73e0 100644 --- a/examples/structured_3d_dgsem/elixir_advection_free_stream.jl +++ b/examples/structured_3d_dgsem/elixir_advection_free_stream.jl @@ -72,7 +72,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/structured_3d_dgsem/elixir_advection_nonperiodic_curved.jl b/examples/structured_3d_dgsem/elixir_advection_nonperiodic_curved.jl index fa8ae756566..bcd7d9d6d9e 100644 --- a/examples/structured_3d_dgsem/elixir_advection_nonperiodic_curved.jl +++ b/examples/structured_3d_dgsem/elixir_advection_nonperiodic_curved.jl @@ -78,5 +78,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_advection_restart.jl b/examples/structured_3d_dgsem/elixir_advection_restart.jl index 39e1a675167..dca221b9e13 100644 --- a/examples/structured_3d_dgsem/elixir_advection_restart.jl +++ b/examples/structured_3d_dgsem/elixir_advection_restart.jl @@ -29,5 +29,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_ec.jl b/examples/structured_3d_dgsem/elixir_euler_ec.jl index 0009eb31180..ed2de6c165f 100644 --- a/examples/structured_3d_dgsem/elixir_euler_ec.jl +++ b/examples/structured_3d_dgsem/elixir_euler_ec.jl @@ -80,5 +80,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_free_stream.jl b/examples/structured_3d_dgsem/elixir_euler_free_stream.jl index b0e71435767..fd11373da8b 100644 --- a/examples/structured_3d_dgsem/elixir_euler_free_stream.jl +++ b/examples/structured_3d_dgsem/elixir_euler_free_stream.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_sedov.jl b/examples/structured_3d_dgsem/elixir_euler_sedov.jl index 8f428495b4f..26f9385da9d 100644 --- a/examples/structured_3d_dgsem/elixir_euler_sedov.jl +++ b/examples/structured_3d_dgsem/elixir_euler_sedov.jl @@ -26,7 +26,7 @@ function initial_condition_medium_sedov_blast_wave(x, t, equations::Compressible r0 = 0.21875 # = 3.5 * smallest dx (for domain length=4 and max-ref=6) E = 1.0 p0_inner = 3 * (equations.gamma - 1) * E / (4 * pi * r0^2) - p0_outer = 1.0e-3 + p0_outer = 1.0e-3 # Calculate primitive variables rho = 1.0 @@ -52,8 +52,8 @@ indicator_sc = IndicatorHennemannGassner(equations, basis, volume_integral = VolumeIntegralShockCapturingHG(indicator_sc; volume_flux_dg=volume_flux, volume_flux_fv=surface_flux) - -solver = DGSEM(polydeg=polydeg, surface_flux=surface_flux, volume_integral=volume_integral) + +solver = DGSEM(polydeg=polydeg, surface_flux=surface_flux, volume_integral=volume_integral) # Mapping as described in https://arxiv.org/abs/2012.12040 function mapping(xi, eta, zeta) @@ -103,5 +103,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_source_terms.jl b/examples/structured_3d_dgsem/elixir_euler_source_terms.jl index d8c6ea4bb83..142653076b4 100644 --- a/examples/structured_3d_dgsem/elixir_euler_source_terms.jl +++ b/examples/structured_3d_dgsem/elixir_euler_source_terms.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_source_terms_nonperiodic_curved.jl b/examples/structured_3d_dgsem/elixir_euler_source_terms_nonperiodic_curved.jl index 8ddfd426553..d3dc731ca4b 100644 --- a/examples/structured_3d_dgsem/elixir_euler_source_terms_nonperiodic_curved.jl +++ b/examples/structured_3d_dgsem/elixir_euler_source_terms_nonperiodic_curved.jl @@ -84,5 +84,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_mhd_alfven_wave.jl b/examples/structured_3d_dgsem/elixir_mhd_alfven_wave.jl index f4da8ee9470..ea13873bde8 100644 --- a/examples/structured_3d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/structured_3d_dgsem/elixir_mhd_alfven_wave.jl @@ -68,5 +68,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_mhd_ec.jl b/examples/structured_3d_dgsem/elixir_mhd_ec.jl index a8c2288e811..d01233bb966 100644 --- a/examples/structured_3d_dgsem/elixir_mhd_ec.jl +++ b/examples/structured_3d_dgsem/elixir_mhd_ec.jl @@ -78,5 +78,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_mhd_ec_shockcapturing.jl b/examples/structured_3d_dgsem/elixir_mhd_ec_shockcapturing.jl index d669c2350a5..7690858b9b0 100644 --- a/examples/structured_3d_dgsem/elixir_mhd_ec_shockcapturing.jl +++ b/examples/structured_3d_dgsem/elixir_mhd_ec_shockcapturing.jl @@ -83,5 +83,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_advection_amr.jl b/examples/tree_1d_dgsem/elixir_advection_amr.jl index dc371233bc8..d01fa34a930 100644 --- a/examples/tree_1d_dgsem/elixir_advection_amr.jl +++ b/examples/tree_1d_dgsem/elixir_advection_amr.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_advection_amr_nonperiodic.jl b/examples/tree_1d_dgsem/elixir_advection_amr_nonperiodic.jl index 098deedb9d6..23446fcb166 100644 --- a/examples/tree_1d_dgsem/elixir_advection_amr_nonperiodic.jl +++ b/examples/tree_1d_dgsem/elixir_advection_amr_nonperiodic.jl @@ -71,5 +71,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_advection_basic.jl b/examples/tree_1d_dgsem/elixir_advection_basic.jl index 0452e956a12..6b87ad1889b 100644 --- a/examples/tree_1d_dgsem/elixir_advection_basic.jl +++ b/examples/tree_1d_dgsem/elixir_advection_basic.jl @@ -53,7 +53,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/tree_1d_dgsem/elixir_burgers_basic.jl b/examples/tree_1d_dgsem/elixir_burgers_basic.jl index cebd9b11201..9226defc6a5 100644 --- a/examples/tree_1d_dgsem/elixir_burgers_basic.jl +++ b/examples/tree_1d_dgsem/elixir_burgers_basic.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_burgers_linear_stability.jl b/examples/tree_1d_dgsem/elixir_burgers_linear_stability.jl index 6a25f94ca05..b9984ac3d0e 100644 --- a/examples/tree_1d_dgsem/elixir_burgers_linear_stability.jl +++ b/examples/tree_1d_dgsem/elixir_burgers_linear_stability.jl @@ -53,5 +53,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl b/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl index fe221ea5bd7..49d6843cb25 100644 --- a/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl +++ b/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_density_wave.jl b/examples/tree_1d_dgsem/elixir_euler_density_wave.jl index 746989dfe56..6fd7d48f77d 100644 --- a/examples/tree_1d_dgsem/elixir_euler_density_wave.jl +++ b/examples/tree_1d_dgsem/elixir_euler_density_wave.jl @@ -50,5 +50,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_positivity.jl b/examples/tree_1d_dgsem/elixir_euler_positivity.jl index 7942937151a..34518183e0c 100644 --- a/examples/tree_1d_dgsem/elixir_euler_positivity.jl +++ b/examples/tree_1d_dgsem/elixir_euler_positivity.jl @@ -106,5 +106,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(5.0e-6, 5.0e-6) sol = solve(ode, CarpenterKennedy2N54(stage_limiter!, williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave.jl b/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave.jl index 746a7cf1bac..1595be17901 100644 --- a/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave.jl +++ b/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave.jl @@ -105,5 +105,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave_pure_fv.jl b/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave_pure_fv.jl index 00b80dbae92..cb2caaeb31c 100644 --- a/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave_pure_fv.jl +++ b/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave_pure_fv.jl @@ -96,5 +96,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_shockcapturing.jl b/examples/tree_1d_dgsem/elixir_euler_shockcapturing.jl index 90547f8ddc1..61987319cda 100644 --- a/examples/tree_1d_dgsem/elixir_euler_shockcapturing.jl +++ b/examples/tree_1d_dgsem/elixir_euler_shockcapturing.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_source_terms.jl b/examples/tree_1d_dgsem/elixir_euler_source_terms.jl index 213206eb9e0..ae6bf32c764 100644 --- a/examples/tree_1d_dgsem/elixir_euler_source_terms.jl +++ b/examples/tree_1d_dgsem/elixir_euler_source_terms.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/tree_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl index 3794e0c8d54..b074913f292 100644 --- a/examples/tree_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/tree_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -65,5 +65,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl b/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl index 42de0e18e51..e9f304ffe44 100644 --- a/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl +++ b/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl @@ -78,6 +78,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl index 2444fe8611d..50d8e5394db 100644 --- a/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl +++ b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl index 86f4a4bad04..5f7e784d26c 100644 --- a/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl +++ b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_ec.jl b/examples/tree_1d_dgsem/elixir_eulermulti_ec.jl index 04d937a9a8f..c4eb6890836 100644 --- a/examples/tree_1d_dgsem/elixir_eulermulti_ec.jl +++ b/examples/tree_1d_dgsem/elixir_eulermulti_ec.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_es.jl b/examples/tree_1d_dgsem/elixir_eulermulti_es.jl index 7abb3b0d021..b236c929702 100644 --- a/examples/tree_1d_dgsem/elixir_eulermulti_es.jl +++ b/examples/tree_1d_dgsem/elixir_eulermulti_es.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl b/examples/tree_1d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl index 9a19807ae29..2e2d74766a2 100644 --- a/examples/tree_1d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl +++ b/examples/tree_1d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl @@ -81,5 +81,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_hypdiff_nonperiodic.jl b/examples/tree_1d_dgsem/elixir_hypdiff_nonperiodic.jl index 827d8d25ce7..c8000ec7659 100644 --- a/examples/tree_1d_dgsem/elixir_hypdiff_nonperiodic.jl +++ b/examples/tree_1d_dgsem/elixir_hypdiff_nonperiodic.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_alfven_wave.jl b/examples/tree_1d_dgsem/elixir_mhd_alfven_wave.jl index 82bca93c707..8d6a4e96714 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_alfven_wave.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_briowu_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhd_briowu_shock_tube.jl index e1c11f610cd..8199db01872 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_briowu_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_briowu_shock_tube.jl @@ -107,5 +107,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_ec.jl b/examples/tree_1d_dgsem/elixir_mhd_ec.jl index 1f2e77006b1..49ece11c8db 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_ec.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_ec.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_ryujones_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhd_ryujones_shock_tube.jl index 010788d48f5..50e462a433f 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_ryujones_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_ryujones_shock_tube.jl @@ -96,5 +96,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_shu_osher_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhd_shu_osher_shock_tube.jl index d0427371b1d..d7e64172f4b 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_shu_osher_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_shu_osher_shock_tube.jl @@ -132,5 +132,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_torrilhon_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhd_torrilhon_shock_tube.jl index 68556764293..38371018693 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_torrilhon_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_torrilhon_shock_tube.jl @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhdmulti_briowu_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhdmulti_briowu_shock_tube.jl index 714ce4aa129..0a2050dfa16 100644 --- a/examples/tree_1d_dgsem/elixir_mhdmulti_briowu_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhdmulti_briowu_shock_tube.jl @@ -115,5 +115,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl b/examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl index 34fdce6634e..111a123aa9f 100644 --- a/examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl +++ b/examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl @@ -53,5 +53,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhdmulti_es.jl b/examples/tree_1d_dgsem/elixir_mhdmulti_es.jl index 8ca32194b9e..9130c9e4a67 100644 --- a/examples/tree_1d_dgsem/elixir_mhdmulti_es.jl +++ b/examples/tree_1d_dgsem/elixir_mhdmulti_es.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_acoustics_convergence.jl b/examples/tree_2d_dgsem/elixir_acoustics_convergence.jl index 7ae2802710e..b5f25845b1b 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_convergence.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_convergence.jl @@ -56,7 +56,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_acoustics_gauss.jl b/examples/tree_2d_dgsem/elixir_acoustics_gauss.jl index 839e4b7df8b..6d7aa577d2b 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_gauss.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_gauss.jl @@ -55,7 +55,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_acoustics_gauss_wall.jl b/examples/tree_2d_dgsem/elixir_acoustics_gauss_wall.jl index 4438ea848e8..035bdf0fb6f 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_gauss_wall.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_gauss_wall.jl @@ -70,7 +70,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks) + save_everystep=false, callback=callbacks, maxiters=typemax(Int)) # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_acoustics_gaussian_source.jl b/examples/tree_2d_dgsem/elixir_acoustics_gaussian_source.jl index 0b52da00e12..ab243b90e7c 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_gaussian_source.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_gaussian_source.jl @@ -78,7 +78,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, time # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_acoustics_monopole.jl b/examples/tree_2d_dgsem/elixir_acoustics_monopole.jl index 7adfd88113d..c6b45bc2e8c 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_monopole.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_monopole.jl @@ -140,7 +140,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=10^5) + save_everystep=false, callback=callbacks, maxiters=1e5) # Print the timer summary summary_callback() \ No newline at end of file diff --git a/examples/tree_2d_dgsem/elixir_advection_amr.jl b/examples/tree_2d_dgsem/elixir_advection_amr.jl index 84841877448..7d722d9dd04 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_coarsen_twice.jl b/examples/tree_2d_dgsem/elixir_advection_amr_coarsen_twice.jl index 897d3569e10..3ca99dbd098 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_coarsen_twice.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_coarsen_twice.jl @@ -99,5 +99,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_nonperiodic.jl b/examples/tree_2d_dgsem/elixir_advection_amr_nonperiodic.jl index 42aee985889..5139ef04302 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_nonperiodic.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_nonperiodic.jl @@ -67,5 +67,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_refine_twice.jl b/examples/tree_2d_dgsem/elixir_advection_amr_refine_twice.jl index e69cab29bb6..dd7f0ba11ae 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_refine_twice.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_refine_twice.jl @@ -99,5 +99,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_solution_independent.jl b/examples/tree_2d_dgsem/elixir_advection_amr_solution_independent.jl index efd282dab1f..8d56e69ae14 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_solution_independent.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_solution_independent.jl @@ -137,5 +137,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_visualization.jl b/examples/tree_2d_dgsem/elixir_advection_amr_visualization.jl index f517b4eb1cf..bd7d7bba3ec 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_visualization.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_visualization.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_basic.jl b/examples/tree_2d_dgsem/elixir_advection_basic.jl index 39ab2611e55..4f0d69c7673 100644 --- a/examples/tree_2d_dgsem/elixir_advection_basic.jl +++ b/examples/tree_2d_dgsem/elixir_advection_basic.jl @@ -53,7 +53,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_advection_callbacks.jl b/examples/tree_2d_dgsem/elixir_advection_callbacks.jl index 1b3915736a9..f1036c2e7c5 100644 --- a/examples/tree_2d_dgsem/elixir_advection_callbacks.jl +++ b/examples/tree_2d_dgsem/elixir_advection_callbacks.jl @@ -160,7 +160,7 @@ example_stage_callback! = TrixiExtensionExample.ExampleStageCallback() sol = solve(ode, CarpenterKennedy2N54(example_stage_callback!, williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary # Check whether we recorded the same values. diff --git a/examples/tree_2d_dgsem/elixir_advection_mortar.jl b/examples/tree_2d_dgsem/elixir_advection_mortar.jl index 2a283fb9008..4dfa68e63de 100644 --- a/examples/tree_2d_dgsem/elixir_advection_mortar.jl +++ b/examples/tree_2d_dgsem/elixir_advection_mortar.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_restart.jl b/examples/tree_2d_dgsem/elixir_advection_restart.jl index 2cb45c0b47e..3b4c0a170cf 100644 --- a/examples/tree_2d_dgsem/elixir_advection_restart.jl +++ b/examples/tree_2d_dgsem/elixir_advection_restart.jl @@ -28,5 +28,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_astro_jet_amr.jl b/examples/tree_2d_dgsem/elixir_euler_astro_jet_amr.jl index b20a2b65611..bb4ace72583 100644 --- a/examples/tree_2d_dgsem/elixir_euler_astro_jet_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_astro_jet_amr.jl @@ -7,13 +7,13 @@ using Trixi gamma = 5/3 equations = CompressibleEulerEquations2D(gamma) -# Initial condition adopted from +# Initial condition adopted from # - Yong Liu, Jianfang Lu, and Chi-Wang Shu # An oscillation free discontinuous Galerkin method for hyperbolic systems # https://tinyurl.com/c76fjtx4 # Mach = 2000 jet function initial_condition_astro_jet(x, t, equations::CompressibleEulerEquations2D) - @unpack gamma = equations + @unpack gamma = equations rho = 0.5 v1 = 0 v2 = 0 @@ -44,7 +44,7 @@ basis = LobattoLegendreBasis(polydeg) # shock capturing necessary for this tough example indicator_sc = IndicatorHennemannGassner(equations, basis, - alpha_max=0.3, + alpha_max=0.3, alpha_min=0.0001, alpha_smooth=true, variable=density_pressure) @@ -81,25 +81,25 @@ save_solution = SaveSolutionCallback(interval=5000, save_final_solution=true, solution_variables=cons2prim) -amr_indicator = IndicatorHennemannGassner(semi, - alpha_max=1.0, - alpha_min=0.0001, - alpha_smooth=false, - variable=Trixi.density) - -amr_controller = ControllerThreeLevelCombined(semi, amr_indicator, indicator_sc, - base_level=2, +amr_indicator = IndicatorHennemannGassner(semi, + alpha_max=1.0, + alpha_min=0.0001, + alpha_smooth=false, + variable=Trixi.density) + +amr_controller = ControllerThreeLevelCombined(semi, amr_indicator, indicator_sc, + base_level=2, med_level =0, med_threshold=0.0003, # med_level = current level - max_level =8, max_threshold=0.003, - max_threshold_secondary=indicator_sc.alpha_max) - -amr_callback = AMRCallback(semi, amr_controller, - interval=1, - adapt_initial_condition=true, - adapt_initial_condition_only_refine=true) + max_level =8, max_threshold=0.003, + max_threshold_secondary=indicator_sc.alpha_max) + +amr_callback = AMRCallback(semi, amr_controller, + interval=1, + adapt_initial_condition=true, + adapt_initial_condition_only_refine=true) callbacks = CallbackSet(summary_callback, - analysis_callback, alive_callback, + analysis_callback, alive_callback, amr_callback, save_solution) # positivity limiter necessary for this tough example @@ -110,5 +110,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(5.0e-6, 5.0e-6) # run the simulation # use adaptive time stepping based on error estimates, time step roughly dt = 1e-7 sol = solve(ode, SSPRK43(stage_limiter!), - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_blast_wave_amr.jl b/examples/tree_2d_dgsem/elixir_euler_blast_wave_amr.jl index 6abfca03db1..31e9497c76b 100644 --- a/examples/tree_2d_dgsem/elixir_euler_blast_wave_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_blast_wave_amr.jl @@ -103,5 +103,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_blob_amr.jl b/examples/tree_2d_dgsem/elixir_euler_blob_amr.jl index f4040732667..9dee8c594c1 100644 --- a/examples/tree_2d_dgsem/elixir_euler_blob_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_blob_amr.jl @@ -123,5 +123,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_blob_mortar.jl b/examples/tree_2d_dgsem/elixir_euler_blob_mortar.jl index 5b7365f860f..f5920514d2e 100644 --- a/examples/tree_2d_dgsem/elixir_euler_blob_mortar.jl +++ b/examples/tree_2d_dgsem/elixir_euler_blob_mortar.jl @@ -112,5 +112,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_colliding_flow.jl b/examples/tree_2d_dgsem/elixir_euler_colliding_flow.jl index 383fd22caa9..2dac2023e6e 100644 --- a/examples/tree_2d_dgsem/elixir_euler_colliding_flow.jl +++ b/examples/tree_2d_dgsem/elixir_euler_colliding_flow.jl @@ -14,20 +14,20 @@ function initial_condition_colliding_flow_astro(x, t, equations::CompressibleEul # change discontinuity to tanh # resolution 128^2 elements (refined close to the interface) and polydeg=3 (total of 512^2 DOF) # domain size is [-64,+64]^2 - @unpack gamma = equations + @unpack gamma = equations # the quantities are chosen such, that they are as close as possible to the astro examples # keep in mind, that in the astro example, the physical units are weird (parsec, mega years, ...) rho = 0.0247 c = 0.2 p = c^2 / gamma * rho - vel = 13.907432274789372 + vel = 13.907432274789372 slope = 1.0 v1 = -vel*tanh(slope * x[1]) # add small initial disturbance to the field, but only close to the interface if abs(x[1]) < 10 v1 = v1 * (1 + 0.01 * sin(pi * x[2])) end - v2 = 0.0 + v2 = 0.0 return prim2cons(SVector(rho, v1, v2, p), equations) end initial_condition = initial_condition_colliding_flow_astro @@ -49,7 +49,7 @@ basis = LobattoLegendreBasis(polydeg) # shock capturing necessary for this tough example, however alpha_max = 0.5 is fine indicator_sc = IndicatorHennemannGassner(equations, basis, - alpha_max=0.5, + alpha_max=0.5, alpha_min=0.0001, alpha_smooth=true, variable=density_pressure) @@ -95,7 +95,7 @@ save_solution = SaveSolutionCallback(interval=1000, solution_variables=cons2prim) callbacks = CallbackSet(summary_callback, - analysis_callback, alive_callback, + analysis_callback, alive_callback, save_solution) # positivity limiter necessary for this tough example @@ -106,5 +106,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(5.0e-6, 5.0e-6) # run the simulation # use adaptive time stepping based on error estimates, time step roughly dt = 5e-3 sol = solve(ode, SSPRK43(stage_limiter!), - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_colliding_flow_amr.jl b/examples/tree_2d_dgsem/elixir_euler_colliding_flow_amr.jl index 8c8f546f37a..0dbe4732be6 100644 --- a/examples/tree_2d_dgsem/elixir_euler_colliding_flow_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_colliding_flow_amr.jl @@ -14,20 +14,20 @@ function initial_condition_colliding_flow_astro(x, t, equations::CompressibleEul # change discontinuity to tanh # resolution 128^2 elements (refined close to the interface) and polydeg=3 (total of 512^2 DOF) # domain size is [-64,+64]^2 - @unpack gamma = equations + @unpack gamma = equations # the quantities are chosen such, that they are as close as possible to the astro examples # keep in mind, that in the astro example, the physical units are weird (parsec, mega years, ...) rho = 0.0247 c = 0.2 p = c^2 / gamma * rho - vel = 13.907432274789372 + vel = 13.907432274789372 slope = 1.0 v1 = -vel*tanh(slope * x[1]) # add small initial disturbance to the field, but only close to the interface if abs(x[1]) < 10 v1 = v1 * (1 + 0.01 * sin(pi*x[2])) end - v2 = 0.0 + v2 = 0.0 return prim2cons(SVector(rho, v1, v2, p), equations) end initial_condition = initial_condition_colliding_flow_astro @@ -49,7 +49,7 @@ basis = LobattoLegendreBasis(polydeg) # shock capturing necessary for this tough example, however alpha_max = 0.5 is fine indicator_sc = IndicatorHennemannGassner(equations, basis, - alpha_max=0.5, + alpha_max=0.5, alpha_min=0.0001, alpha_smooth=true, variable=density_pressure) @@ -95,7 +95,7 @@ amr_indicator = IndicatorHennemannGassner(semi, amr_controller = ControllerThreeLevelCombined(semi, amr_indicator, indicator_sc, base_level=2, med_level =0, med_threshold=0.0003, # med_level = current level - max_level =8, max_threshold=0.003, + max_level =8, max_threshold=0.003, max_threshold_secondary=indicator_sc.alpha_max) amr_callback = AMRCallback(semi, amr_controller, @@ -104,7 +104,7 @@ amr_callback = AMRCallback(semi, amr_controller, adapt_initial_condition_only_refine=true) callbacks = CallbackSet(summary_callback, - analysis_callback, alive_callback, + analysis_callback, alive_callback, amr_callback, save_solution) # positivity limiter necessary for this tough example @@ -115,5 +115,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(5.0e-6, 5.0e-6) # run the simulation # use adaptive time stepping based on error estimates, time step roughly dt = 5e-3 sol = solve(ode, SSPRK43(stage_limiter!), - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl b/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl index 89d7422cfe6..e48a667dba6 100644 --- a/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl +++ b/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_density_wave.jl b/examples/tree_2d_dgsem/elixir_euler_density_wave.jl index a5e9d30e389..b9bf1cec0b7 100644 --- a/examples/tree_2d_dgsem/elixir_euler_density_wave.jl +++ b/examples/tree_2d_dgsem/elixir_euler_density_wave.jl @@ -52,5 +52,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_ec.jl b/examples/tree_2d_dgsem/elixir_euler_ec.jl index aa51c383eaa..fc7527b6316 100644 --- a/examples/tree_2d_dgsem/elixir_euler_ec.jl +++ b/examples/tree_2d_dgsem/elixir_euler_ec.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=10^5); + save_everystep=false, callback=callbacks, maxiters=1e5); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability.jl b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability.jl index 4fdedf516ef..3b2d56a91c1 100644 --- a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability.jl +++ b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability.jl @@ -83,5 +83,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_amr.jl b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_amr.jl index b8927c3fd6b..954bbb45ac5 100644 --- a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_amr.jl @@ -100,5 +100,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_shockcapturing.jl b/examples/tree_2d_dgsem/elixir_euler_shockcapturing.jl index f0a7ed0b953..9509d505e95 100644 --- a/examples/tree_2d_dgsem/elixir_euler_shockcapturing.jl +++ b/examples/tree_2d_dgsem/elixir_euler_shockcapturing.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms.jl b/examples/tree_2d_dgsem/elixir_euler_source_terms.jl index 36d93147289..46cae8535f8 100644 --- a/examples/tree_2d_dgsem/elixir_euler_source_terms.jl +++ b/examples/tree_2d_dgsem/elixir_euler_source_terms.jl @@ -51,5 +51,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms_amr_refine_coarsen.jl b/examples/tree_2d_dgsem/elixir_euler_source_terms_amr_refine_coarsen.jl index 231486b11c9..b3de10583d1 100644 --- a/examples/tree_2d_dgsem/elixir_euler_source_terms_amr_refine_coarsen.jl +++ b/examples/tree_2d_dgsem/elixir_euler_source_terms_amr_refine_coarsen.jl @@ -104,5 +104,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/tree_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl index 9826a53d3d5..e17b0a986af 100644 --- a/examples/tree_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/tree_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -65,5 +65,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_amr.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_amr.jl index 9ff4d0aa25d..0f1574260bc 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_amr.jl @@ -161,5 +161,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar.jl index 227fa935035..e98ee754ee4 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar.jl @@ -94,5 +94,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_shockcapturing.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_shockcapturing.jl index a528780df67..db0e782a94a 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_shockcapturing.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_shockcapturing.jl @@ -108,5 +108,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_split.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_split.jl index 36aa89d2a66..b9cc1c778bc 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_split.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_split.jl @@ -97,5 +97,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_shockcapturing.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_shockcapturing.jl index 83576f92d00..5b2b575eac4 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_shockcapturing.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_shockcapturing.jl @@ -106,5 +106,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euleracoustics_co-rotating_vortex_pair.jl b/examples/tree_2d_dgsem/elixir_euleracoustics_co-rotating_vortex_pair.jl index 38b48b5d537..ac7b2510a65 100644 --- a/examples/tree_2d_dgsem/elixir_euleracoustics_co-rotating_vortex_pair.jl +++ b/examples/tree_2d_dgsem/elixir_euleracoustics_co-rotating_vortex_pair.jl @@ -323,7 +323,7 @@ callbacks_averaging = CallbackSet(summary_callback, alive_callback, averaging_ca # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol_averaging = solve(ode_averaging, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks_averaging); + save_everystep=false, callback=callbacks_averaging, maxiters=typemax(Int)); # Print the timer summary summary_callback() @@ -372,7 +372,7 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() \ No newline at end of file diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl index d423b800fd0..935b3968963 100644 --- a/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl +++ b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl index 62c5bab51ea..880f31c62e5 100644 --- a/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl +++ b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_ec.jl b/examples/tree_2d_dgsem/elixir_eulermulti_ec.jl index 0715dfe35d6..81dc82335a9 100644 --- a/examples/tree_2d_dgsem/elixir_eulermulti_ec.jl +++ b/examples/tree_2d_dgsem/elixir_eulermulti_ec.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_es.jl b/examples/tree_2d_dgsem/elixir_eulermulti_es.jl index a3e5580b572..30d9d376c55 100644 --- a/examples/tree_2d_dgsem/elixir_eulermulti_es.jl +++ b/examples/tree_2d_dgsem/elixir_eulermulti_es.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_hypdiff_godunov.jl b/examples/tree_2d_dgsem/elixir_hypdiff_godunov.jl index abf9735fd28..3e6535410a7 100644 --- a/examples/tree_2d_dgsem/elixir_hypdiff_godunov.jl +++ b/examples/tree_2d_dgsem/elixir_hypdiff_godunov.jl @@ -88,5 +88,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl b/examples/tree_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl index c144ef47a63..83e748a0315 100644 --- a/examples/tree_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl +++ b/examples/tree_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl @@ -80,5 +80,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_hypdiff_lax_friedrichs.jl b/examples/tree_2d_dgsem/elixir_hypdiff_lax_friedrichs.jl index d0d706981a2..c6167d81b9a 100644 --- a/examples/tree_2d_dgsem/elixir_hypdiff_lax_friedrichs.jl +++ b/examples/tree_2d_dgsem/elixir_hypdiff_lax_friedrichs.jl @@ -87,5 +87,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_hypdiff_nonperiodic.jl b/examples/tree_2d_dgsem/elixir_hypdiff_nonperiodic.jl index fc825660f1e..b45bca66a73 100644 --- a/examples/tree_2d_dgsem/elixir_hypdiff_nonperiodic.jl +++ b/examples/tree_2d_dgsem/elixir_hypdiff_nonperiodic.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_lbm_constant.jl b/examples/tree_2d_dgsem/elixir_lbm_constant.jl index 40b16f41ef6..89136ccfaf8 100644 --- a/examples/tree_2d_dgsem/elixir_lbm_constant.jl +++ b/examples/tree_2d_dgsem/elixir_lbm_constant.jl @@ -58,5 +58,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_lbm_couette.jl b/examples/tree_2d_dgsem/elixir_lbm_couette.jl index 6a33b2fb0ee..bb3af33259a 100644 --- a/examples/tree_2d_dgsem/elixir_lbm_couette.jl +++ b/examples/tree_2d_dgsem/elixir_lbm_couette.jl @@ -136,5 +136,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_lbm_lid_driven_cavity.jl b/examples/tree_2d_dgsem/elixir_lbm_lid_driven_cavity.jl index a34e784e7ac..058f597340e 100644 --- a/examples/tree_2d_dgsem/elixir_lbm_lid_driven_cavity.jl +++ b/examples/tree_2d_dgsem/elixir_lbm_lid_driven_cavity.jl @@ -117,5 +117,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_alfven_wave_mortar.jl b/examples/tree_2d_dgsem/elixir_mhd_alfven_wave_mortar.jl index 11dfeacde6a..da3c6a3246b 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_alfven_wave_mortar.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_alfven_wave_mortar.jl @@ -64,5 +64,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_blast_wave.jl b/examples/tree_2d_dgsem/elixir_mhd_blast_wave.jl index af05fffaf54..1b48bed2f74 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_blast_wave.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_blast_wave.jl @@ -111,5 +111,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_ec.jl b/examples/tree_2d_dgsem/elixir_mhd_ec.jl index 5873388f798..6f74c3167f8 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_ec.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_ec.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_orszag_tang.jl b/examples/tree_2d_dgsem/elixir_mhd_orszag_tang.jl index 460b24e02b2..75f1a09b0a9 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_orszag_tang.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_orszag_tang.jl @@ -103,5 +103,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_rotor.jl b/examples/tree_2d_dgsem/elixir_mhd_rotor.jl index c6d880e9e9d..b3114d6f83b 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_rotor.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_rotor.jl @@ -118,5 +118,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl b/examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl index ec2f3c21cdd..20f2955bcf7 100644 --- a/examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl +++ b/examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhdmulti_es.jl b/examples/tree_2d_dgsem/elixir_mhdmulti_es.jl index 3cd9c621ae3..6f751cad949 100644 --- a/examples/tree_2d_dgsem/elixir_mhdmulti_es.jl +++ b/examples/tree_2d_dgsem/elixir_mhdmulti_es.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhdmulti_rotor.jl b/examples/tree_2d_dgsem/elixir_mhdmulti_rotor.jl index 55a4004f794..259afb3c43f 100644 --- a/examples/tree_2d_dgsem/elixir_mhdmulti_rotor.jl +++ b/examples/tree_2d_dgsem/elixir_mhdmulti_rotor.jl @@ -119,5 +119,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_shallowwater_ec.jl b/examples/tree_2d_dgsem/elixir_shallowwater_ec.jl index 555c9070981..ea982f0b9ad 100644 --- a/examples/tree_2d_dgsem/elixir_shallowwater_ec.jl +++ b/examples/tree_2d_dgsem/elixir_shallowwater_ec.jl @@ -112,5 +112,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl b/examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl index 8e6d9f331a4..8448ba286ff 100644 --- a/examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl +++ b/examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav # use a Runge-Kutta method with automatic (error based) time step size control sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-8, reltol=1.0e-8, - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl b/examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl index 6d7309ad0bd..d5a21b92ad3 100644 --- a/examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl +++ b/examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl @@ -112,5 +112,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_advection_amr.jl b/examples/tree_3d_dgsem/elixir_advection_amr.jl index 67664eed563..2175e5dc458 100644 --- a/examples/tree_3d_dgsem/elixir_advection_amr.jl +++ b/examples/tree_3d_dgsem/elixir_advection_amr.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_advection_basic.jl b/examples/tree_3d_dgsem/elixir_advection_basic.jl index 39d502404d9..491b29bc27e 100644 --- a/examples/tree_3d_dgsem/elixir_advection_basic.jl +++ b/examples/tree_3d_dgsem/elixir_advection_basic.jl @@ -53,7 +53,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/tree_3d_dgsem/elixir_advection_mortar.jl b/examples/tree_3d_dgsem/elixir_advection_mortar.jl index 7b24f152b6a..a7f2e1abff3 100644 --- a/examples/tree_3d_dgsem/elixir_advection_mortar.jl +++ b/examples/tree_3d_dgsem/elixir_advection_mortar.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_advection_restart.jl b/examples/tree_3d_dgsem/elixir_advection_restart.jl index 83bf4418b98..5fc0234a1c2 100644 --- a/examples/tree_3d_dgsem/elixir_advection_restart.jl +++ b/examples/tree_3d_dgsem/elixir_advection_restart.jl @@ -28,5 +28,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_amr.jl b/examples/tree_3d_dgsem/elixir_euler_amr.jl index f226a6b446d..868d7764fd1 100644 --- a/examples/tree_3d_dgsem/elixir_euler_amr.jl +++ b/examples/tree_3d_dgsem/elixir_euler_amr.jl @@ -82,5 +82,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_blob_amr.jl b/examples/tree_3d_dgsem/elixir_euler_blob_amr.jl index a8d112f5b05..8ec6b592538 100644 --- a/examples/tree_3d_dgsem/elixir_euler_blob_amr.jl +++ b/examples/tree_3d_dgsem/elixir_euler_blob_amr.jl @@ -118,5 +118,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(1.0e-4, 1.0e-4) sol = solve(ode, CarpenterKennedy2N54(stage_limiter!, williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_convergence.jl b/examples/tree_3d_dgsem/elixir_euler_convergence.jl index 2eeb280ae1f..f7f6765b399 100644 --- a/examples/tree_3d_dgsem/elixir_euler_convergence.jl +++ b/examples/tree_3d_dgsem/elixir_euler_convergence.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl b/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl index dbf5747784c..efb287b63c7 100644 --- a/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl +++ b/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_density_pulse.jl b/examples/tree_3d_dgsem/elixir_euler_density_pulse.jl index ee788321c66..fb739684048 100644 --- a/examples/tree_3d_dgsem/elixir_euler_density_pulse.jl +++ b/examples/tree_3d_dgsem/elixir_euler_density_pulse.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_ec.jl b/examples/tree_3d_dgsem/elixir_euler_ec.jl index dbdab89d5c2..0123de80522 100644 --- a/examples/tree_3d_dgsem/elixir_euler_ec.jl +++ b/examples/tree_3d_dgsem/elixir_euler_ec.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=10^5); + save_everystep=false, callback=callbacks, maxiters=1e5); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_mortar.jl b/examples/tree_3d_dgsem/elixir_euler_mortar.jl index c9fc2dfed50..9fd109dbbb8 100644 --- a/examples/tree_3d_dgsem/elixir_euler_mortar.jl +++ b/examples/tree_3d_dgsem/elixir_euler_mortar.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_shockcapturing.jl b/examples/tree_3d_dgsem/elixir_euler_shockcapturing.jl index 3015f6c50a4..c90827ba98c 100644 --- a/examples/tree_3d_dgsem/elixir_euler_shockcapturing.jl +++ b/examples/tree_3d_dgsem/elixir_euler_shockcapturing.jl @@ -65,5 +65,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_source_terms.jl b/examples/tree_3d_dgsem/elixir_euler_source_terms.jl index 3445e9fc433..fabbb5295ca 100644 --- a/examples/tree_3d_dgsem/elixir_euler_source_terms.jl +++ b/examples/tree_3d_dgsem/elixir_euler_source_terms.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_taylor_green_vortex.jl b/examples/tree_3d_dgsem/elixir_euler_taylor_green_vortex.jl index 693f9ce9049..a76a6aa9b8f 100644 --- a/examples/tree_3d_dgsem/elixir_euler_taylor_green_vortex.jl +++ b/examples/tree_3d_dgsem/elixir_euler_taylor_green_vortex.jl @@ -72,5 +72,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl b/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl index 6699ec9a4da..a092b25f71b 100644 --- a/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl +++ b/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl @@ -79,6 +79,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/tree_3d_dgsem/elixir_hypdiff_lax_friedrichs.jl b/examples/tree_3d_dgsem/elixir_hypdiff_lax_friedrichs.jl index c7744ce23bd..d6b8b80289b 100644 --- a/examples/tree_3d_dgsem/elixir_hypdiff_lax_friedrichs.jl +++ b/examples/tree_3d_dgsem/elixir_hypdiff_lax_friedrichs.jl @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_hypdiff_nonperiodic.jl b/examples/tree_3d_dgsem/elixir_hypdiff_nonperiodic.jl index beefb22ea1e..e5d9621cbd8 100644 --- a/examples/tree_3d_dgsem/elixir_hypdiff_nonperiodic.jl +++ b/examples/tree_3d_dgsem/elixir_hypdiff_nonperiodic.jl @@ -65,5 +65,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_mhd_alfven_wave.jl b/examples/tree_3d_dgsem/elixir_mhd_alfven_wave.jl index 191982bf2d6..d64a2bfea7c 100644 --- a/examples/tree_3d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/tree_3d_dgsem/elixir_mhd_alfven_wave.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_mhd_alfven_wave_mortar.jl b/examples/tree_3d_dgsem/elixir_mhd_alfven_wave_mortar.jl index e23f7ce5460..aa480153dbf 100644 --- a/examples/tree_3d_dgsem/elixir_mhd_alfven_wave_mortar.jl +++ b/examples/tree_3d_dgsem/elixir_mhd_alfven_wave_mortar.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_mhd_ec.jl b/examples/tree_3d_dgsem/elixir_mhd_ec.jl index 057ffcb031f..28ee3510d75 100644 --- a/examples/tree_3d_dgsem/elixir_mhd_ec.jl +++ b/examples/tree_3d_dgsem/elixir_mhd_ec.jl @@ -58,5 +58,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_mhd_ec_shockcapturing.jl b/examples/tree_3d_dgsem/elixir_mhd_ec_shockcapturing.jl index 6b4f6e310ce..3250ab16760 100644 --- a/examples/tree_3d_dgsem/elixir_mhd_ec_shockcapturing.jl +++ b/examples/tree_3d_dgsem/elixir_mhd_ec_shockcapturing.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_acoustics_gauss_wall.jl b/examples/unstructured_2d_dgsem/elixir_acoustics_gauss_wall.jl index 75608b7a453..567f09a8800 100644 --- a/examples/unstructured_2d_dgsem/elixir_acoustics_gauss_wall.jl +++ b/examples/unstructured_2d_dgsem/elixir_acoustics_gauss_wall.jl @@ -74,6 +74,6 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution) # use a Runge-Kutta method with automatic (error based) time step size control sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-6, reltol=1.0e-6, - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); # Print the timer summary summary_callback() diff --git a/examples/unstructured_2d_dgsem/elixir_advection_basic.jl b/examples/unstructured_2d_dgsem/elixir_advection_basic.jl index 36942581cf6..324987419cd 100644 --- a/examples/unstructured_2d_dgsem/elixir_advection_basic.jl +++ b/examples/unstructured_2d_dgsem/elixir_advection_basic.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_basic.jl b/examples/unstructured_2d_dgsem/elixir_euler_basic.jl index 9fbea47a9d5..80ef8c9adc6 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_basic.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_basic.jl @@ -74,5 +74,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_ec.jl b/examples/unstructured_2d_dgsem/elixir_euler_ec.jl index 2725142fd17..0eea9b81b9c 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_ec.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_ec.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_free_stream.jl b/examples/unstructured_2d_dgsem/elixir_euler_free_stream.jl index 36e119ab794..957235e5d89 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_free_stream.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_free_stream.jl @@ -67,5 +67,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_periodic.jl b/examples/unstructured_2d_dgsem/elixir_euler_periodic.jl index bb4b520e09a..5466af3300a 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_periodic.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_periodic.jl @@ -52,5 +52,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback) ############################################################################### # run the simulation -sol = solve(ode, SSPRK43(), save_everystep=false, callback=callbacks); +sol = solve(ode, SSPRK43(), save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_restart.jl b/examples/unstructured_2d_dgsem/elixir_euler_restart.jl index 2ac67652023..6fb48403104 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_restart.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_restart.jl @@ -30,6 +30,6 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_sedov.jl b/examples/unstructured_2d_dgsem/elixir_euler_sedov.jl index b0721786275..0d513367358 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_sedov.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_sedov.jl @@ -94,5 +94,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_wall_bc.jl b/examples/unstructured_2d_dgsem/elixir_euler_wall_bc.jl index 5bfe1ae4e0e..a68e107b504 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_wall_bc.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_wall_bc.jl @@ -80,5 +80,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_mhd_ec.jl b/examples/unstructured_2d_dgsem/elixir_mhd_ec.jl index d75079bb8d7..edc52de7c23 100644 --- a/examples/unstructured_2d_dgsem/elixir_mhd_ec.jl +++ b/examples/unstructured_2d_dgsem/elixir_mhd_ec.jl @@ -81,5 +81,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_dirichlet.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_dirichlet.jl index ea02a0c4c53..79aaf59b5fa 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_dirichlet.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_dirichlet.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav # use a Runge-Kutta method with automatic (error based) time step size control sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-11, reltol=1.0e-11, - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl index 38054ad982e..5d5b7af6bc2 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl @@ -47,7 +47,7 @@ ode = semidiscretize(semi, tspan) # bottom topography function and initial condtion for this academic testcase of entropy conservation. # The errors from the analysis callback are not important but `∑∂S/∂U ⋅ Uₜ` should be around machine roundoff # In contrast to the usual signature of initial conditions, this one get passed the -# `element_id` explicitly. In particular, this initial conditions works as intended +# `element_id` explicitly. In particular, this initial conditions works as intended # only for the specific mesh loaded above! function initial_condition_ec_discontinuous_bottom(x, t, element_id, equations::ShallowWaterEquations2D) # Set up polar coordinates @@ -114,5 +114,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl index 6dc4f9a926d..b6d57ba3725 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl @@ -120,5 +120,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_source_terms.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_source_terms.jl index ce6a2f03546..9b9582fecb2 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_source_terms.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_source_terms.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_wall_bc.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_wall_bc.jl index 171b448b7fa..a37c72e53e6 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_wall_bc.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_wall_bc.jl @@ -79,5 +79,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav # use a Runge-Kutta method with automatic (error based) time step size control sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-8, reltol=1.0e-8, - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl index 42ef4ffa1fd..be97a366517 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl @@ -61,7 +61,7 @@ ode = semidiscretize(semi, tspan) # The errors from the analysis callback are not important but the error for this lake at rest test case # `∑|H0-(h+b)|` should be around machine roundoff # In contrast to the usual signature of initial conditions, this one get passed the -# `element_id` explicitly. In particular, this initial conditions works as intended +# `element_id` explicitly. In particular, this initial conditions works as intended # only for the specific mesh loaded above! function initial_condition_discontinuous_well_balancedness(x, t, element_id, equations::ShallowWaterEquations2D) # Set the background values @@ -114,5 +114,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=typemax(Int)); summary_callback() # print the timer summary From 1507fee84daccda6477b2c3e995b65b5b48b44b8 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Wed, 3 Nov 2021 12:49:03 +0100 Subject: [PATCH 05/22] Fix tests --- test/test_tree_2d_mhd.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_tree_2d_mhd.jl b/test/test_tree_2d_mhd.jl index 45c2f230321..d1c6a0e2d86 100644 --- a/test/test_tree_2d_mhd.jl +++ b/test/test_tree_2d_mhd.jl @@ -69,7 +69,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_blast_wave.jl"), l2 = [0.17646728395490927, 3.866230215339417, 2.4867304651291255, 0.0, 355.4562971958441, 2.359493623565687, 1.4030741420730297, 0.0, 0.029613599942667133], linf = [1.581630420824181, 44.15725488910748, 13.056964982196554, 0.0, 2244.875490238186, 13.07679044647926, 9.14612176426092, 0.0, 0.5154756722488522], - tspan = (0.0, 0.003)) + tspan = (0.0, 0.003), + maxiters_coverage = 9) # For some reason, this doesn't run with maxiters < 9 end end From 9459979792198e4f5bda8ed21fac2ee1e9ce6c61 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Thu, 4 Nov 2021 10:28:24 +0100 Subject: [PATCH 06/22] Revert elixirs --- .../elixir_euler_brown_minion_vortex.jl | 2 +- ...ixir_euler_kelvin_helmholtz_instability.jl | 3 +- ...lixir_euler_rayleigh_taylor_instability.jl | 2 +- .../elixir_euler_triangulate_pkg_mesh.jl | 3 +- examples/dgmulti_2d/elixir_euler_weakform.jl | 3 +- .../elixir_euler_weakform_periodic.jl | 3 +- .../dgmulti_2d/elixir_mhd_weak_blast_wave.jl | 2 +- .../elixir_shallowwater_source_terms.jl | 2 +- .../elixir_euler_taylor_green_vortex.jl | 4 +- examples/dgmulti_3d/elixir_euler_weakform.jl | 3 +- .../elixir_euler_weakform_periodic.jl | 3 +- ...ixir_advection_amr_solution_independent.jl | 2 +- .../elixir_advection_amr_unstructured_flag.jl | 2 +- .../p4est_2d_dgsem/elixir_advection_basic.jl | 2 +- .../elixir_advection_nonconforming_flag.jl | 2 +- .../elixir_advection_restart.jl | 2 +- .../elixir_advection_unstructured_flag.jl | 2 +- .../elixir_euler_blast_wave_amr.jl | 4 +- .../elixir_euler_free_stream.jl | 2 +- examples/p4est_2d_dgsem/elixir_euler_sedov.jl | 2 +- .../elixir_euler_shockcapturing_ec.jl | 4 +- ...e_terms_nonconforming_unstructured_flag.jl | 2 +- .../elixir_eulergravity_convergence.jl | 2 +- .../p4est_2d_dgsem/elixir_mhd_alfven_wave.jl | 2 +- examples/p4est_2d_dgsem/elixir_mhd_rotor.jl | 2 +- .../p4est_3d_dgsem/elixir_advection_amr.jl | 2 +- ...lixir_advection_amr_unstructured_curved.jl | 2 +- .../p4est_3d_dgsem/elixir_advection_basic.jl | 2 +- .../elixir_advection_cubed_sphere.jl | 2 +- .../elixir_advection_nonconforming.jl | 2 +- .../elixir_advection_restart.jl | 2 +- .../elixir_advection_unstructured_curved.jl | 2 +- examples/p4est_3d_dgsem/elixir_euler_ec.jl | 2 +- .../elixir_euler_free_stream.jl | 2 +- .../elixir_euler_free_stream_extruded.jl | 2 +- examples/p4est_3d_dgsem/elixir_euler_sedov.jl | 10 ++--- ...terms_nonconforming_unstructured_curved.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- .../elixir_mhd_alfven_wave_nonconforming.jl | 2 +- .../elixir_mhd_shockcapturing_amr.jl | 2 +- .../elixir_euler_convergence.jl | 2 +- .../elixir_eulergravity_convergence.jl | 2 +- .../elixir_eulergravity_jeans_instability.jl | 2 +- .../elixir_eulergravity_sedov_blast_wave.jl | 2 +- .../elixir_hypdiff_convergence.jl | 2 +- .../elixir_advection_basic.jl | 2 +- .../elixir_advection_nonperiodic.jl | 2 +- .../structured_1d_dgsem/elixir_euler_sedov.jl | 6 +-- .../elixir_euler_source_terms.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- .../elixir_advection_basic.jl | 2 +- .../elixir_advection_free_stream.jl | 2 +- .../elixir_advection_nonperiodic.jl | 2 +- .../elixir_advection_parallelogram.jl | 4 +- .../elixir_advection_restart.jl | 2 +- .../elixir_advection_rotated.jl | 4 +- .../elixir_advection_waving_flag.jl | 2 +- .../structured_2d_dgsem/elixir_euler_ec.jl | 2 +- .../elixir_euler_free_stream.jl | 2 +- ...lixir_euler_rayleigh_taylor_instability.jl | 2 +- .../structured_2d_dgsem/elixir_euler_sedov.jl | 8 ++-- .../elixir_euler_source_terms.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- ...elixir_euler_source_terms_parallelogram.jl | 2 +- .../elixir_euler_source_terms_rotated.jl | 2 +- .../elixir_euler_source_terms_waving_flag.jl | 2 +- .../elixir_hypdiff_harmonic_nonperiodic.jl | 2 +- .../elixir_hypdiff_nonperiodic.jl | 2 +- .../elixir_mhd_alfven_wave.jl | 2 +- examples/structured_2d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_mhd_ec_shockcapturing.jl | 2 +- .../elixir_shallowwater_source_terms.jl | 2 +- .../elixir_advection_basic.jl | 2 +- .../elixir_advection_free_stream.jl | 2 +- .../elixir_advection_nonperiodic_curved.jl | 2 +- .../elixir_advection_restart.jl | 2 +- .../structured_3d_dgsem/elixir_euler_ec.jl | 2 +- .../elixir_euler_free_stream.jl | 2 +- .../structured_3d_dgsem/elixir_euler_sedov.jl | 8 ++-- .../elixir_euler_source_terms.jl | 2 +- ...r_euler_source_terms_nonperiodic_curved.jl | 2 +- .../elixir_mhd_alfven_wave.jl | 2 +- examples/structured_3d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_mhd_ec_shockcapturing.jl | 2 +- .../tree_1d_dgsem/elixir_advection_amr.jl | 2 +- .../elixir_advection_amr_nonperiodic.jl | 2 +- .../tree_1d_dgsem/elixir_advection_basic.jl | 2 +- .../tree_1d_dgsem/elixir_burgers_basic.jl | 2 +- .../elixir_burgers_linear_stability.jl | 2 +- .../elixir_euler_convergence_pure_fv.jl | 2 +- .../elixir_euler_density_wave.jl | 2 +- .../tree_1d_dgsem/elixir_euler_positivity.jl | 2 +- .../elixir_euler_sedov_blast_wave.jl | 2 +- .../elixir_euler_sedov_blast_wave_pure_fv.jl | 2 +- .../elixir_euler_shockcapturing.jl | 2 +- .../elixir_euler_source_terms.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- .../elixir_eulergravity_convergence.jl | 2 +- .../elixir_eulermulti_convergence_ec.jl | 2 +- .../elixir_eulermulti_convergence_es.jl | 2 +- .../tree_1d_dgsem/elixir_eulermulti_ec.jl | 2 +- .../tree_1d_dgsem/elixir_eulermulti_es.jl | 2 +- .../elixir_hypdiff_harmonic_nonperiodic.jl | 2 +- .../elixir_hypdiff_nonperiodic.jl | 2 +- .../tree_1d_dgsem/elixir_mhd_alfven_wave.jl | 2 +- .../elixir_mhd_briowu_shock_tube.jl | 2 +- examples/tree_1d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_mhd_ryujones_shock_tube.jl | 2 +- .../elixir_mhd_shu_osher_shock_tube.jl | 2 +- .../elixir_mhd_torrilhon_shock_tube.jl | 2 +- .../elixir_mhdmulti_briowu_shock_tube.jl | 2 +- examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl | 2 +- examples/tree_1d_dgsem/elixir_mhdmulti_es.jl | 2 +- .../elixir_acoustics_convergence.jl | 2 +- .../tree_2d_dgsem/elixir_acoustics_gauss.jl | 2 +- .../elixir_acoustics_gauss_wall.jl | 2 +- .../elixir_acoustics_gaussian_source.jl | 2 +- .../elixir_acoustics_monopole.jl | 2 +- .../tree_2d_dgsem/elixir_advection_amr.jl | 2 +- .../elixir_advection_amr_coarsen_twice.jl | 2 +- .../elixir_advection_amr_nonperiodic.jl | 2 +- .../elixir_advection_amr_refine_twice.jl | 2 +- ...ixir_advection_amr_solution_independent.jl | 2 +- .../elixir_advection_amr_visualization.jl | 2 +- .../tree_2d_dgsem/elixir_advection_basic.jl | 2 +- .../elixir_advection_callbacks.jl | 2 +- .../tree_2d_dgsem/elixir_advection_mortar.jl | 2 +- .../tree_2d_dgsem/elixir_advection_restart.jl | 2 +- .../elixir_euler_astro_jet_amr.jl | 40 +++++++++---------- .../elixir_euler_blast_wave_amr.jl | 2 +- .../tree_2d_dgsem/elixir_euler_blob_amr.jl | 2 +- .../tree_2d_dgsem/elixir_euler_blob_mortar.jl | 2 +- .../elixir_euler_colliding_flow.jl | 12 +++--- .../elixir_euler_colliding_flow_amr.jl | 14 +++---- .../elixir_euler_convergence_pure_fv.jl | 2 +- .../elixir_euler_density_wave.jl | 2 +- examples/tree_2d_dgsem/elixir_euler_ec.jl | 2 +- ...ixir_euler_kelvin_helmholtz_instability.jl | 2 +- ..._euler_kelvin_helmholtz_instability_amr.jl | 2 +- .../elixir_euler_shockcapturing.jl | 2 +- .../elixir_euler_source_terms.jl | 2 +- ...r_euler_source_terms_amr_refine_coarsen.jl | 2 +- .../elixir_euler_source_terms_nonperiodic.jl | 2 +- .../tree_2d_dgsem/elixir_euler_vortex_amr.jl | 2 +- .../elixir_euler_vortex_mortar.jl | 2 +- ...ixir_euler_vortex_mortar_shockcapturing.jl | 2 +- .../elixir_euler_vortex_mortar_split.jl | 2 +- .../elixir_euler_vortex_shockcapturing.jl | 2 +- ..._euleracoustics_co-rotating_vortex_pair.jl | 4 +- .../elixir_eulermulti_convergence_ec.jl | 2 +- .../elixir_eulermulti_convergence_es.jl | 2 +- .../tree_2d_dgsem/elixir_eulermulti_ec.jl | 2 +- .../tree_2d_dgsem/elixir_eulermulti_es.jl | 2 +- .../tree_2d_dgsem/elixir_hypdiff_godunov.jl | 2 +- .../elixir_hypdiff_harmonic_nonperiodic.jl | 2 +- .../elixir_hypdiff_lax_friedrichs.jl | 2 +- .../elixir_hypdiff_nonperiodic.jl | 2 +- examples/tree_2d_dgsem/elixir_lbm_constant.jl | 2 +- examples/tree_2d_dgsem/elixir_lbm_couette.jl | 2 +- .../elixir_lbm_lid_driven_cavity.jl | 2 +- .../elixir_mhd_alfven_wave_mortar.jl | 2 +- .../tree_2d_dgsem/elixir_mhd_blast_wave.jl | 2 +- examples/tree_2d_dgsem/elixir_mhd_ec.jl | 2 +- .../tree_2d_dgsem/elixir_mhd_orszag_tang.jl | 2 +- examples/tree_2d_dgsem/elixir_mhd_rotor.jl | 2 +- examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl | 2 +- examples/tree_2d_dgsem/elixir_mhdmulti_es.jl | 2 +- .../tree_2d_dgsem/elixir_mhdmulti_rotor.jl | 2 +- .../tree_2d_dgsem/elixir_shallowwater_ec.jl | 2 +- .../elixir_shallowwater_source_terms.jl | 2 +- .../elixir_shallowwater_well_balanced.jl | 2 +- .../tree_3d_dgsem/elixir_advection_amr.jl | 2 +- .../tree_3d_dgsem/elixir_advection_basic.jl | 2 +- .../tree_3d_dgsem/elixir_advection_mortar.jl | 2 +- .../tree_3d_dgsem/elixir_advection_restart.jl | 2 +- examples/tree_3d_dgsem/elixir_euler_amr.jl | 2 +- .../tree_3d_dgsem/elixir_euler_blob_amr.jl | 2 +- .../tree_3d_dgsem/elixir_euler_convergence.jl | 2 +- .../elixir_euler_convergence_pure_fv.jl | 2 +- .../elixir_euler_density_pulse.jl | 2 +- examples/tree_3d_dgsem/elixir_euler_ec.jl | 2 +- examples/tree_3d_dgsem/elixir_euler_mortar.jl | 2 +- .../elixir_euler_shockcapturing.jl | 2 +- .../elixir_euler_source_terms.jl | 2 +- .../elixir_euler_taylor_green_vortex.jl | 2 +- .../elixir_eulergravity_convergence.jl | 2 +- .../elixir_hypdiff_lax_friedrichs.jl | 2 +- .../elixir_hypdiff_nonperiodic.jl | 2 +- .../tree_3d_dgsem/elixir_mhd_alfven_wave.jl | 2 +- .../elixir_mhd_alfven_wave_mortar.jl | 2 +- examples/tree_3d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_mhd_ec_shockcapturing.jl | 2 +- .../elixir_acoustics_gauss_wall.jl | 2 +- .../elixir_advection_basic.jl | 2 +- .../elixir_euler_basic.jl | 2 +- .../unstructured_2d_dgsem/elixir_euler_ec.jl | 2 +- .../elixir_euler_free_stream.jl | 2 +- .../elixir_euler_periodic.jl | 2 +- .../elixir_euler_restart.jl | 2 +- .../elixir_euler_sedov.jl | 2 +- .../elixir_euler_wall_bc.jl | 2 +- .../unstructured_2d_dgsem/elixir_mhd_ec.jl | 2 +- .../elixir_shallowwater_dirichlet.jl | 2 +- .../elixir_shallowwater_ec.jl | 4 +- .../elixir_shallowwater_ec_shockcapturing.jl | 2 +- .../elixir_shallowwater_source_terms.jl | 2 +- .../elixir_shallowwater_wall_bc.jl | 2 +- .../elixir_shallowwater_well_balanced.jl | 4 +- 208 files changed, 258 insertions(+), 264 deletions(-) diff --git a/examples/dgmulti_2d/elixir_euler_brown_minion_vortex.jl b/examples/dgmulti_2d/elixir_euler_brown_minion_vortex.jl index c73f0f10c6e..9a1435473f5 100644 --- a/examples/dgmulti_2d/elixir_euler_brown_minion_vortex.jl +++ b/examples/dgmulti_2d/elixir_euler_brown_minion_vortex.jl @@ -48,6 +48,6 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback) tol = 1.0e-8 sol = solve(ode, RDPK3SpFSAL49(), abstol=tol, reltol=tol, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary \ No newline at end of file diff --git a/examples/dgmulti_2d/elixir_euler_kelvin_helmholtz_instability.jl b/examples/dgmulti_2d/elixir_euler_kelvin_helmholtz_instability.jl index f9c5e483101..0537aca77f6 100644 --- a/examples/dgmulti_2d/elixir_euler_kelvin_helmholtz_instability.jl +++ b/examples/dgmulti_2d/elixir_euler_kelvin_helmholtz_instability.jl @@ -50,7 +50,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt= estimate_dt(mesh, dg), save_everystep=false, - callback=callbacks, maxiters=typemax(Int)); + dt= estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl b/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl index 99937b0bd57..83b88e6f59a 100644 --- a/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl +++ b/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl @@ -103,6 +103,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-6, reltol=1.0e-6, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary \ No newline at end of file diff --git a/examples/dgmulti_2d/elixir_euler_triangulate_pkg_mesh.jl b/examples/dgmulti_2d/elixir_euler_triangulate_pkg_mesh.jl index 67ad18ae590..93905ec8671 100644 --- a/examples/dgmulti_2d/elixir_euler_triangulate_pkg_mesh.jl +++ b/examples/dgmulti_2d/elixir_euler_triangulate_pkg_mesh.jl @@ -38,6 +38,5 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback) # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, - callback=callbacks, maxiters=typemax(Int)); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_euler_weakform.jl b/examples/dgmulti_2d/elixir_euler_weakform.jl index cfe809cfb31..6fed317e2fb 100644 --- a/examples/dgmulti_2d/elixir_euler_weakform.jl +++ b/examples/dgmulti_2d/elixir_euler_weakform.jl @@ -40,6 +40,5 @@ callbacks = CallbackSet(summary_callback, alive_callback, stepsize_callback, ana # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, - callback=callbacks, maxiters=typemax(Int)); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl b/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl index 02da2e728b9..79a82eab136 100644 --- a/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl +++ b/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl @@ -28,6 +28,5 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback) # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, - callback=callbacks, maxiters=typemax(Int)); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl b/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl index 89034544b34..2073508a448 100644 --- a/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl +++ b/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl @@ -50,6 +50,6 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/dgmulti_2d/elixir_shallowwater_source_terms.jl b/examples/dgmulti_2d/elixir_shallowwater_source_terms.jl index 69cbbfcccc9..53f51c0b772 100644 --- a/examples/dgmulti_2d/elixir_shallowwater_source_terms.jl +++ b/examples/dgmulti_2d/elixir_shallowwater_source_terms.jl @@ -42,6 +42,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-7, reltol=1.0e-7, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl b/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl index 722cc225e57..1d6fc34d1ad 100644 --- a/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl +++ b/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl @@ -62,6 +62,6 @@ callbacks = CallbackSet(summary_callback, ############################################################################### # run the simulation -sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-7, reltol=1.0e-7, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)) +sol = solve(ode, RDPK3SpFSAL49(), abstol = 1.0e-7, reltol = 1.0e-7, + save_everystep = false, callback = callbacks) summary_callback() # print the timer summary diff --git a/examples/dgmulti_3d/elixir_euler_weakform.jl b/examples/dgmulti_3d/elixir_euler_weakform.jl index 957dd270d7b..b8b0e6e54ed 100644 --- a/examples/dgmulti_3d/elixir_euler_weakform.jl +++ b/examples/dgmulti_3d/elixir_euler_weakform.jl @@ -39,6 +39,5 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback) # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, - callback=callbacks, maxiters=typemax(Int)); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl b/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl index 48d44c19683..ca2163b558c 100644 --- a/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl +++ b/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl @@ -29,6 +29,5 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback) # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), - dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, - callback=callbacks, maxiters=typemax(Int)); + dt = 0.5 * estimate_dt(mesh, dg), save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl b/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl index 80a9311bf6e..841a080947e 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl @@ -145,5 +145,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl index 6d0a3b82f7a..7e6d99c83b1 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl @@ -90,6 +90,6 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_advection_basic.jl b/examples/p4est_2d_dgsem/elixir_advection_basic.jl index 743c93f1268..0ee935d9e38 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_basic.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_basic.jl @@ -57,7 +57,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl index e2c70545f3d..4268368d100 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl @@ -76,7 +76,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/p4est_2d_dgsem/elixir_advection_restart.jl b/examples/p4est_2d_dgsem/elixir_advection_restart.jl index f9c6c0a8bec..1906fb2896e 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_restart.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_restart.jl @@ -32,5 +32,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl index 8be0b61b1ce..7e41b4e0a5f 100644 --- a/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl +++ b/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl @@ -75,7 +75,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl b/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl index 335b9286a00..35272fec96b 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl @@ -56,7 +56,7 @@ isfile(mesh_file) || download("https://gist.githubusercontent.com/efaulhaber/a07 mesh = P4estMesh{2}(mesh_file, polydeg=3, initial_refinement_level=1) -semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, boundary_conditions=Dict( :all => BoundaryConditionDirichlet(initial_condition) )) @@ -105,5 +105,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary \ No newline at end of file diff --git a/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl b/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl index 096a9ecd5e2..130e9e053af 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_euler_sedov.jl b/examples/p4est_2d_dgsem/elixir_euler_sedov.jl index 94dabf7ce0c..e2459dc6d64 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_sedov.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_sedov.jl @@ -97,5 +97,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl b/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl index 2e3da69a8a0..49f1197aaa1 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl @@ -60,7 +60,7 @@ save_solution = SaveSolutionCallback(interval=100, stepsize_callback = StepsizeCallback(cfl=1.0) callbacks = CallbackSet(summary_callback, - analysis_callback, + analysis_callback, alive_callback, save_solution, stepsize_callback) @@ -69,5 +69,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl index e7127409900..9db5fdcea62 100644 --- a/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl +++ b/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl @@ -94,5 +94,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl b/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl index bc4a0023747..b34c73d2a4e 100644 --- a/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl +++ b/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl @@ -82,6 +82,6 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl b/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl index 7b8ff2607b8..66bce781f60 100644 --- a/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl b/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl index 9699b282ccc..58915a8f6a7 100644 --- a/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl +++ b/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl @@ -133,5 +133,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_advection_amr.jl b/examples/p4est_3d_dgsem/elixir_advection_amr.jl index af73957f565..0473fd2b23a 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_amr.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_amr.jl @@ -70,5 +70,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl index e83d47f49b2..fb87c361c18 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl @@ -107,5 +107,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_advection_basic.jl b/examples/p4est_3d_dgsem/elixir_advection_basic.jl index a8892c65a94..1ff16210d77 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_basic.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_basic.jl @@ -60,7 +60,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_restart, save_ # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl b/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl index 95f77cd2ca4..ff343f2bb6c 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl @@ -56,7 +56,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl b/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl index a5ff66e5283..0ca7b5c1712 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl @@ -74,7 +74,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/p4est_3d_dgsem/elixir_advection_restart.jl b/examples/p4est_3d_dgsem/elixir_advection_restart.jl index 1748dc908f1..71b37e9f39b 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_restart.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_restart.jl @@ -29,5 +29,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl index fce76599b32..ec546ae4d8c 100644 --- a/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl +++ b/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl @@ -93,7 +93,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/p4est_3d_dgsem/elixir_euler_ec.jl b/examples/p4est_3d_dgsem/elixir_euler_ec.jl index 40eda9d8cfa..30269bb63b9 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_ec.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_ec.jl @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl b/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl index d91d4c2517a..b494cf5e84f 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl @@ -105,5 +105,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl b/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl index 79be341a670..bed87c853fe 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl @@ -98,5 +98,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), #maxiters=1, dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_sedov.jl b/examples/p4est_3d_dgsem/elixir_euler_sedov.jl index eaabea52d28..5f5d895c08d 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_sedov.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_sedov.jl @@ -27,7 +27,7 @@ function initial_condition_medium_sedov_blast_wave(x, t, equations::Compressible r0 = 0.21875 # = 3.5 * smallest dx (for domain length=4 and max-ref=6) E = 1.0 p0_inner = 3 * (equations.gamma - 1) * E / (4 * pi * r0^2) - p0_outer = 1.0e-3 + p0_outer = 1.0e-3 # Calculate primitive variables rho = 1.0 @@ -42,7 +42,7 @@ end initial_condition = initial_condition_medium_sedov_blast_wave surface_flux = flux_lax_friedrichs -volume_flux = flux_ranocha +volume_flux = flux_ranocha polydeg = 5 basis = LobattoLegendreBasis(polydeg) indicator_sc = IndicatorHennemannGassner(equations, basis, @@ -53,8 +53,8 @@ indicator_sc = IndicatorHennemannGassner(equations, basis, volume_integral = VolumeIntegralShockCapturingHG(indicator_sc; volume_flux_dg=volume_flux, volume_flux_fv=surface_flux) - -solver = DGSEM(polydeg=polydeg, surface_flux=surface_flux, volume_integral=volume_integral) + +solver = DGSEM(polydeg=polydeg, surface_flux=surface_flux, volume_integral=volume_integral) coordinates_min = (-1.0, -1.0, -1.0) coordinates_max = ( 1.0, 1.0, 1.0) @@ -98,5 +98,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl index 5e3ffaed942..67194a521a8 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl @@ -108,5 +108,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl index e6726fd3b38..cd796c33e47 100644 --- a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -67,5 +67,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl b/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl index bb33ac1e789..7e448c4867c 100644 --- a/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl +++ b/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl @@ -76,5 +76,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl b/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl index 7082342c02a..fc95d427abb 100644 --- a/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl +++ b/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl @@ -127,5 +127,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl index 8ebf6c7169a..316f36adc9b 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl @@ -50,5 +50,5 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl index 7c4118a683b..f2693c89583 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl @@ -77,6 +77,6 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl index 39e5ecda7ff..b33c03f00d3 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl @@ -153,6 +153,6 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl index c6cc957c865..0d86521f635 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl @@ -223,6 +223,6 @@ callbacks = CallbackSet(summary_callback, amr_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl index 719cd5da6be..029c19380cf 100644 --- a/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl +++ b/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl @@ -64,5 +64,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, stepsize_callba sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_1d_dgsem/elixir_advection_basic.jl b/examples/structured_1d_dgsem/elixir_advection_basic.jl index cc4b242e047..4c431a98f8c 100644 --- a/examples/structured_1d_dgsem/elixir_advection_basic.jl +++ b/examples/structured_1d_dgsem/elixir_advection_basic.jl @@ -54,7 +54,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl b/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl index ade1d443cad..e87e0b36b0a 100644 --- a/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl +++ b/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_1d_dgsem/elixir_euler_sedov.jl b/examples/structured_1d_dgsem/elixir_euler_sedov.jl index fd50843dbc9..ee950b3aaaa 100644 --- a/examples/structured_1d_dgsem/elixir_euler_sedov.jl +++ b/examples/structured_1d_dgsem/elixir_euler_sedov.jl @@ -78,8 +78,8 @@ save_solution = SaveSolutionCallback(interval=100, stepsize_callback = StepsizeCallback(cfl=0.5) -callbacks = CallbackSet(summary_callback, - analysis_callback, +callbacks = CallbackSet(summary_callback, + analysis_callback, alive_callback, save_solution, stepsize_callback) @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_1d_dgsem/elixir_euler_source_terms.jl b/examples/structured_1d_dgsem/elixir_euler_source_terms.jl index 44119ec36b3..cbda7087052 100644 --- a/examples/structured_1d_dgsem/elixir_euler_source_terms.jl +++ b/examples/structured_1d_dgsem/elixir_euler_source_terms.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/structured_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl index e0a05885554..9aa5b7f4979 100644 --- a/examples/structured_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/structured_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -64,5 +64,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_advection_basic.jl b/examples/structured_2d_dgsem/elixir_advection_basic.jl index ff3e792006f..d174fa315ac 100644 --- a/examples/structured_2d_dgsem/elixir_advection_basic.jl +++ b/examples/structured_2d_dgsem/elixir_advection_basic.jl @@ -55,7 +55,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_advection_free_stream.jl b/examples/structured_2d_dgsem/elixir_advection_free_stream.jl index efad68812f9..348e1b15a19 100644 --- a/examples/structured_2d_dgsem/elixir_advection_free_stream.jl +++ b/examples/structured_2d_dgsem/elixir_advection_free_stream.jl @@ -71,7 +71,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_restart, save_ # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_advection_nonperiodic.jl b/examples/structured_2d_dgsem/elixir_advection_nonperiodic.jl index c0b4e4b7f2e..2aad3a01566 100644 --- a/examples/structured_2d_dgsem/elixir_advection_nonperiodic.jl +++ b/examples/structured_2d_dgsem/elixir_advection_nonperiodic.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl b/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl index c03dc877c00..36a9255671f 100644 --- a/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl +++ b/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl @@ -1,6 +1,6 @@ # This elixir transforms the setup of elixir_advection_basic to a parallelogram. # The nodal values of the initial condition and the exact solution are the same as -# in elixir_advection_basic. +# in elixir_advection_basic. # However, on this non-rectangular mesh, the metric terms are non-trivial. # The same errors as with elixir_advection_basic are expected. @@ -85,7 +85,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_advection_restart.jl b/examples/structured_2d_dgsem/elixir_advection_restart.jl index e1cba7b6369..2c2a0ef8f51 100644 --- a/examples/structured_2d_dgsem/elixir_advection_restart.jl +++ b/examples/structured_2d_dgsem/elixir_advection_restart.jl @@ -31,5 +31,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_advection_rotated.jl b/examples/structured_2d_dgsem/elixir_advection_rotated.jl index 3b40abb5fb5..52dc3cd4327 100644 --- a/examples/structured_2d_dgsem/elixir_advection_rotated.jl +++ b/examples/structured_2d_dgsem/elixir_advection_rotated.jl @@ -1,6 +1,6 @@ # This elixir transforms the setup of elixir_advection_basic to a rotated square. # The nodal values of the initial condition and the exact solution are the same as -# in elixir_advection_basic. +# in elixir_advection_basic. # However, on this rotated mesh, the metric terms are non-trivial. # The same errors as with elixir_advection_basic are expected (except for rounding errors). @@ -113,7 +113,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl b/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl index bd2bc74dd94..a52bad470db 100644 --- a/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl +++ b/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl @@ -63,7 +63,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_restart, save_ # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/structured_2d_dgsem/elixir_euler_ec.jl b/examples/structured_2d_dgsem/elixir_euler_ec.jl index 2178a159ad9..2c91349ff98 100644 --- a/examples/structured_2d_dgsem/elixir_euler_ec.jl +++ b/examples/structured_2d_dgsem/elixir_euler_ec.jl @@ -74,5 +74,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_free_stream.jl b/examples/structured_2d_dgsem/elixir_euler_free_stream.jl index 3ba94b93f8c..c4ddb887e5f 100644 --- a/examples/structured_2d_dgsem/elixir_euler_free_stream.jl +++ b/examples/structured_2d_dgsem/elixir_euler_free_stream.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl b/examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl index 7fd83982f77..7dc4053e640 100644 --- a/examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl +++ b/examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl @@ -112,6 +112,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-6, reltol=1.0e-6, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_sedov.jl b/examples/structured_2d_dgsem/elixir_euler_sedov.jl index fa2f3b5bdd2..ed1bfab3be2 100644 --- a/examples/structured_2d_dgsem/elixir_euler_sedov.jl +++ b/examples/structured_2d_dgsem/elixir_euler_sedov.jl @@ -59,12 +59,12 @@ function mapping(xi, eta) y = eta + 0.125 * (cos(1.5 * pi * xi) * cos(0.5 * pi * eta)) x = xi + 0.125 * (cos(0.5 * pi * xi) * cos(2 * pi * y)) - + return SVector(x, y) end - + cells_per_dimension = (16, 16) - + mesh = StructuredMesh(cells_per_dimension, mapping, periodicity=true) # create the semidiscretization @@ -100,5 +100,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms.jl index 8c3c4aaf73e..70d3e060dd0 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl index 5280c674117..94537ecef0d 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl index 7b62456dd73..a9c08049f41 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl index 1b7619d7493..fdd189ffb55 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl @@ -129,5 +129,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl index ecbbd735e13..505e28ecd8d 100644 --- a/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl +++ b/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl b/examples/structured_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl index 126147939fe..6730b1c4beb 100644 --- a/examples/structured_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl +++ b/examples/structured_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl @@ -79,5 +79,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_hypdiff_nonperiodic.jl b/examples/structured_2d_dgsem/elixir_hypdiff_nonperiodic.jl index 10cca2e99cd..ba77dca9a99 100644 --- a/examples/structured_2d_dgsem/elixir_hypdiff_nonperiodic.jl +++ b/examples/structured_2d_dgsem/elixir_hypdiff_nonperiodic.jl @@ -79,5 +79,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_mhd_alfven_wave.jl b/examples/structured_2d_dgsem/elixir_mhd_alfven_wave.jl index 56ed20d5fa5..259875050c6 100644 --- a/examples/structured_2d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/structured_2d_dgsem/elixir_mhd_alfven_wave.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_mhd_ec.jl b/examples/structured_2d_dgsem/elixir_mhd_ec.jl index 0223122448b..634738e5c8b 100644 --- a/examples/structured_2d_dgsem/elixir_mhd_ec.jl +++ b/examples/structured_2d_dgsem/elixir_mhd_ec.jl @@ -93,5 +93,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_mhd_ec_shockcapturing.jl b/examples/structured_2d_dgsem/elixir_mhd_ec_shockcapturing.jl index 7e5b41ae3da..084aeca90b9 100644 --- a/examples/structured_2d_dgsem/elixir_mhd_ec_shockcapturing.jl +++ b/examples/structured_2d_dgsem/elixir_mhd_ec_shockcapturing.jl @@ -70,5 +70,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl b/examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl index d63e80540de..18f48080850 100644 --- a/examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl +++ b/examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_advection_basic.jl b/examples/structured_3d_dgsem/elixir_advection_basic.jl index 2a2c31b4c2a..b3c336a0831 100644 --- a/examples/structured_3d_dgsem/elixir_advection_basic.jl +++ b/examples/structured_3d_dgsem/elixir_advection_basic.jl @@ -58,7 +58,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, save # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/structured_3d_dgsem/elixir_advection_free_stream.jl b/examples/structured_3d_dgsem/elixir_advection_free_stream.jl index c1b3dff73e0..4c813927c6f 100644 --- a/examples/structured_3d_dgsem/elixir_advection_free_stream.jl +++ b/examples/structured_3d_dgsem/elixir_advection_free_stream.jl @@ -72,7 +72,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/structured_3d_dgsem/elixir_advection_nonperiodic_curved.jl b/examples/structured_3d_dgsem/elixir_advection_nonperiodic_curved.jl index bcd7d9d6d9e..fa8ae756566 100644 --- a/examples/structured_3d_dgsem/elixir_advection_nonperiodic_curved.jl +++ b/examples/structured_3d_dgsem/elixir_advection_nonperiodic_curved.jl @@ -78,5 +78,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_advection_restart.jl b/examples/structured_3d_dgsem/elixir_advection_restart.jl index dca221b9e13..39e1a675167 100644 --- a/examples/structured_3d_dgsem/elixir_advection_restart.jl +++ b/examples/structured_3d_dgsem/elixir_advection_restart.jl @@ -29,5 +29,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_ec.jl b/examples/structured_3d_dgsem/elixir_euler_ec.jl index ed2de6c165f..0009eb31180 100644 --- a/examples/structured_3d_dgsem/elixir_euler_ec.jl +++ b/examples/structured_3d_dgsem/elixir_euler_ec.jl @@ -80,5 +80,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_free_stream.jl b/examples/structured_3d_dgsem/elixir_euler_free_stream.jl index fd11373da8b..b0e71435767 100644 --- a/examples/structured_3d_dgsem/elixir_euler_free_stream.jl +++ b/examples/structured_3d_dgsem/elixir_euler_free_stream.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_sedov.jl b/examples/structured_3d_dgsem/elixir_euler_sedov.jl index 26f9385da9d..8f428495b4f 100644 --- a/examples/structured_3d_dgsem/elixir_euler_sedov.jl +++ b/examples/structured_3d_dgsem/elixir_euler_sedov.jl @@ -26,7 +26,7 @@ function initial_condition_medium_sedov_blast_wave(x, t, equations::Compressible r0 = 0.21875 # = 3.5 * smallest dx (for domain length=4 and max-ref=6) E = 1.0 p0_inner = 3 * (equations.gamma - 1) * E / (4 * pi * r0^2) - p0_outer = 1.0e-3 + p0_outer = 1.0e-3 # Calculate primitive variables rho = 1.0 @@ -52,8 +52,8 @@ indicator_sc = IndicatorHennemannGassner(equations, basis, volume_integral = VolumeIntegralShockCapturingHG(indicator_sc; volume_flux_dg=volume_flux, volume_flux_fv=surface_flux) - -solver = DGSEM(polydeg=polydeg, surface_flux=surface_flux, volume_integral=volume_integral) + +solver = DGSEM(polydeg=polydeg, surface_flux=surface_flux, volume_integral=volume_integral) # Mapping as described in https://arxiv.org/abs/2012.12040 function mapping(xi, eta, zeta) @@ -103,5 +103,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_source_terms.jl b/examples/structured_3d_dgsem/elixir_euler_source_terms.jl index 142653076b4..d8c6ea4bb83 100644 --- a/examples/structured_3d_dgsem/elixir_euler_source_terms.jl +++ b/examples/structured_3d_dgsem/elixir_euler_source_terms.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_euler_source_terms_nonperiodic_curved.jl b/examples/structured_3d_dgsem/elixir_euler_source_terms_nonperiodic_curved.jl index d3dc731ca4b..8ddfd426553 100644 --- a/examples/structured_3d_dgsem/elixir_euler_source_terms_nonperiodic_curved.jl +++ b/examples/structured_3d_dgsem/elixir_euler_source_terms_nonperiodic_curved.jl @@ -84,5 +84,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_mhd_alfven_wave.jl b/examples/structured_3d_dgsem/elixir_mhd_alfven_wave.jl index ea13873bde8..f4da8ee9470 100644 --- a/examples/structured_3d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/structured_3d_dgsem/elixir_mhd_alfven_wave.jl @@ -68,5 +68,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_mhd_ec.jl b/examples/structured_3d_dgsem/elixir_mhd_ec.jl index d01233bb966..a8c2288e811 100644 --- a/examples/structured_3d_dgsem/elixir_mhd_ec.jl +++ b/examples/structured_3d_dgsem/elixir_mhd_ec.jl @@ -78,5 +78,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/structured_3d_dgsem/elixir_mhd_ec_shockcapturing.jl b/examples/structured_3d_dgsem/elixir_mhd_ec_shockcapturing.jl index 7690858b9b0..d669c2350a5 100644 --- a/examples/structured_3d_dgsem/elixir_mhd_ec_shockcapturing.jl +++ b/examples/structured_3d_dgsem/elixir_mhd_ec_shockcapturing.jl @@ -83,5 +83,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_advection_amr.jl b/examples/tree_1d_dgsem/elixir_advection_amr.jl index d01fa34a930..dc371233bc8 100644 --- a/examples/tree_1d_dgsem/elixir_advection_amr.jl +++ b/examples/tree_1d_dgsem/elixir_advection_amr.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_advection_amr_nonperiodic.jl b/examples/tree_1d_dgsem/elixir_advection_amr_nonperiodic.jl index 23446fcb166..098deedb9d6 100644 --- a/examples/tree_1d_dgsem/elixir_advection_amr_nonperiodic.jl +++ b/examples/tree_1d_dgsem/elixir_advection_amr_nonperiodic.jl @@ -71,5 +71,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_advection_basic.jl b/examples/tree_1d_dgsem/elixir_advection_basic.jl index 6b87ad1889b..0452e956a12 100644 --- a/examples/tree_1d_dgsem/elixir_advection_basic.jl +++ b/examples/tree_1d_dgsem/elixir_advection_basic.jl @@ -53,7 +53,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/tree_1d_dgsem/elixir_burgers_basic.jl b/examples/tree_1d_dgsem/elixir_burgers_basic.jl index 9226defc6a5..cebd9b11201 100644 --- a/examples/tree_1d_dgsem/elixir_burgers_basic.jl +++ b/examples/tree_1d_dgsem/elixir_burgers_basic.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_burgers_linear_stability.jl b/examples/tree_1d_dgsem/elixir_burgers_linear_stability.jl index b9984ac3d0e..6a25f94ca05 100644 --- a/examples/tree_1d_dgsem/elixir_burgers_linear_stability.jl +++ b/examples/tree_1d_dgsem/elixir_burgers_linear_stability.jl @@ -53,5 +53,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl b/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl index 49d6843cb25..fe221ea5bd7 100644 --- a/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl +++ b/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_density_wave.jl b/examples/tree_1d_dgsem/elixir_euler_density_wave.jl index 6fd7d48f77d..746989dfe56 100644 --- a/examples/tree_1d_dgsem/elixir_euler_density_wave.jl +++ b/examples/tree_1d_dgsem/elixir_euler_density_wave.jl @@ -50,5 +50,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_positivity.jl b/examples/tree_1d_dgsem/elixir_euler_positivity.jl index 34518183e0c..7942937151a 100644 --- a/examples/tree_1d_dgsem/elixir_euler_positivity.jl +++ b/examples/tree_1d_dgsem/elixir_euler_positivity.jl @@ -106,5 +106,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(5.0e-6, 5.0e-6) sol = solve(ode, CarpenterKennedy2N54(stage_limiter!, williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave.jl b/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave.jl index 1595be17901..746a7cf1bac 100644 --- a/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave.jl +++ b/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave.jl @@ -105,5 +105,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave_pure_fv.jl b/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave_pure_fv.jl index cb2caaeb31c..00b80dbae92 100644 --- a/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave_pure_fv.jl +++ b/examples/tree_1d_dgsem/elixir_euler_sedov_blast_wave_pure_fv.jl @@ -96,5 +96,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_shockcapturing.jl b/examples/tree_1d_dgsem/elixir_euler_shockcapturing.jl index 61987319cda..90547f8ddc1 100644 --- a/examples/tree_1d_dgsem/elixir_euler_shockcapturing.jl +++ b/examples/tree_1d_dgsem/elixir_euler_shockcapturing.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_source_terms.jl b/examples/tree_1d_dgsem/elixir_euler_source_terms.jl index ae6bf32c764..213206eb9e0 100644 --- a/examples/tree_1d_dgsem/elixir_euler_source_terms.jl +++ b/examples/tree_1d_dgsem/elixir_euler_source_terms.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/tree_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl index b074913f292..3794e0c8d54 100644 --- a/examples/tree_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/tree_1d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -65,5 +65,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl b/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl index e9f304ffe44..42de0e18e51 100644 --- a/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl +++ b/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl @@ -78,6 +78,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl index 50d8e5394db..2444fe8611d 100644 --- a/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl +++ b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl index 5f7e784d26c..86f4a4bad04 100644 --- a/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl +++ b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_ec.jl b/examples/tree_1d_dgsem/elixir_eulermulti_ec.jl index c4eb6890836..04d937a9a8f 100644 --- a/examples/tree_1d_dgsem/elixir_eulermulti_ec.jl +++ b/examples/tree_1d_dgsem/elixir_eulermulti_ec.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_es.jl b/examples/tree_1d_dgsem/elixir_eulermulti_es.jl index b236c929702..7abb3b0d021 100644 --- a/examples/tree_1d_dgsem/elixir_eulermulti_es.jl +++ b/examples/tree_1d_dgsem/elixir_eulermulti_es.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl b/examples/tree_1d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl index 2e2d74766a2..9a19807ae29 100644 --- a/examples/tree_1d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl +++ b/examples/tree_1d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl @@ -81,5 +81,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_hypdiff_nonperiodic.jl b/examples/tree_1d_dgsem/elixir_hypdiff_nonperiodic.jl index c8000ec7659..827d8d25ce7 100644 --- a/examples/tree_1d_dgsem/elixir_hypdiff_nonperiodic.jl +++ b/examples/tree_1d_dgsem/elixir_hypdiff_nonperiodic.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_alfven_wave.jl b/examples/tree_1d_dgsem/elixir_mhd_alfven_wave.jl index 8d6a4e96714..82bca93c707 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_alfven_wave.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_briowu_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhd_briowu_shock_tube.jl index 8199db01872..e1c11f610cd 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_briowu_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_briowu_shock_tube.jl @@ -107,5 +107,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_ec.jl b/examples/tree_1d_dgsem/elixir_mhd_ec.jl index 49ece11c8db..1f2e77006b1 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_ec.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_ec.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_ryujones_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhd_ryujones_shock_tube.jl index 50e462a433f..010788d48f5 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_ryujones_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_ryujones_shock_tube.jl @@ -96,5 +96,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_shu_osher_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhd_shu_osher_shock_tube.jl index d7e64172f4b..d0427371b1d 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_shu_osher_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_shu_osher_shock_tube.jl @@ -132,5 +132,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhd_torrilhon_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhd_torrilhon_shock_tube.jl index 38371018693..68556764293 100644 --- a/examples/tree_1d_dgsem/elixir_mhd_torrilhon_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhd_torrilhon_shock_tube.jl @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhdmulti_briowu_shock_tube.jl b/examples/tree_1d_dgsem/elixir_mhdmulti_briowu_shock_tube.jl index 0a2050dfa16..714ce4aa129 100644 --- a/examples/tree_1d_dgsem/elixir_mhdmulti_briowu_shock_tube.jl +++ b/examples/tree_1d_dgsem/elixir_mhdmulti_briowu_shock_tube.jl @@ -115,5 +115,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl b/examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl index 111a123aa9f..34fdce6634e 100644 --- a/examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl +++ b/examples/tree_1d_dgsem/elixir_mhdmulti_ec.jl @@ -53,5 +53,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_1d_dgsem/elixir_mhdmulti_es.jl b/examples/tree_1d_dgsem/elixir_mhdmulti_es.jl index 9130c9e4a67..8ca32194b9e 100644 --- a/examples/tree_1d_dgsem/elixir_mhdmulti_es.jl +++ b/examples/tree_1d_dgsem/elixir_mhdmulti_es.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_acoustics_convergence.jl b/examples/tree_2d_dgsem/elixir_acoustics_convergence.jl index b5f25845b1b..7ae2802710e 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_convergence.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_convergence.jl @@ -56,7 +56,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_acoustics_gauss.jl b/examples/tree_2d_dgsem/elixir_acoustics_gauss.jl index 6d7aa577d2b..839e4b7df8b 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_gauss.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_gauss.jl @@ -55,7 +55,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_acoustics_gauss_wall.jl b/examples/tree_2d_dgsem/elixir_acoustics_gauss_wall.jl index 035bdf0fb6f..4438ea848e8 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_gauss_wall.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_gauss_wall.jl @@ -70,7 +70,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)) + save_everystep=false, callback=callbacks) # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_acoustics_gaussian_source.jl b/examples/tree_2d_dgsem/elixir_acoustics_gaussian_source.jl index ab243b90e7c..0b52da00e12 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_gaussian_source.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_gaussian_source.jl @@ -78,7 +78,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, time # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_acoustics_monopole.jl b/examples/tree_2d_dgsem/elixir_acoustics_monopole.jl index c6b45bc2e8c..7adfd88113d 100644 --- a/examples/tree_2d_dgsem/elixir_acoustics_monopole.jl +++ b/examples/tree_2d_dgsem/elixir_acoustics_monopole.jl @@ -140,7 +140,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=1e5) + save_everystep=false, callback=callbacks, maxiters=10^5) # Print the timer summary summary_callback() \ No newline at end of file diff --git a/examples/tree_2d_dgsem/elixir_advection_amr.jl b/examples/tree_2d_dgsem/elixir_advection_amr.jl index 7d722d9dd04..84841877448 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_coarsen_twice.jl b/examples/tree_2d_dgsem/elixir_advection_amr_coarsen_twice.jl index 3ca99dbd098..897d3569e10 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_coarsen_twice.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_coarsen_twice.jl @@ -99,5 +99,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_nonperiodic.jl b/examples/tree_2d_dgsem/elixir_advection_amr_nonperiodic.jl index 5139ef04302..42aee985889 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_nonperiodic.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_nonperiodic.jl @@ -67,5 +67,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=stepsize_callback(ode), # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_refine_twice.jl b/examples/tree_2d_dgsem/elixir_advection_amr_refine_twice.jl index dd7f0ba11ae..e69cab29bb6 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_refine_twice.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_refine_twice.jl @@ -99,5 +99,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_solution_independent.jl b/examples/tree_2d_dgsem/elixir_advection_amr_solution_independent.jl index 8d56e69ae14..efd282dab1f 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_solution_independent.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_solution_independent.jl @@ -137,5 +137,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_amr_visualization.jl b/examples/tree_2d_dgsem/elixir_advection_amr_visualization.jl index bd7d7bba3ec..f517b4eb1cf 100644 --- a/examples/tree_2d_dgsem/elixir_advection_amr_visualization.jl +++ b/examples/tree_2d_dgsem/elixir_advection_amr_visualization.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_basic.jl b/examples/tree_2d_dgsem/elixir_advection_basic.jl index 4f0d69c7673..39ab2611e55 100644 --- a/examples/tree_2d_dgsem/elixir_advection_basic.jl +++ b/examples/tree_2d_dgsem/elixir_advection_basic.jl @@ -53,7 +53,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/tree_2d_dgsem/elixir_advection_callbacks.jl b/examples/tree_2d_dgsem/elixir_advection_callbacks.jl index f1036c2e7c5..1b3915736a9 100644 --- a/examples/tree_2d_dgsem/elixir_advection_callbacks.jl +++ b/examples/tree_2d_dgsem/elixir_advection_callbacks.jl @@ -160,7 +160,7 @@ example_stage_callback! = TrixiExtensionExample.ExampleStageCallback() sol = solve(ode, CarpenterKennedy2N54(example_stage_callback!, williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary # Check whether we recorded the same values. diff --git a/examples/tree_2d_dgsem/elixir_advection_mortar.jl b/examples/tree_2d_dgsem/elixir_advection_mortar.jl index 4dfa68e63de..2a283fb9008 100644 --- a/examples/tree_2d_dgsem/elixir_advection_mortar.jl +++ b/examples/tree_2d_dgsem/elixir_advection_mortar.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_advection_restart.jl b/examples/tree_2d_dgsem/elixir_advection_restart.jl index 3b4c0a170cf..2cb45c0b47e 100644 --- a/examples/tree_2d_dgsem/elixir_advection_restart.jl +++ b/examples/tree_2d_dgsem/elixir_advection_restart.jl @@ -28,5 +28,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_astro_jet_amr.jl b/examples/tree_2d_dgsem/elixir_euler_astro_jet_amr.jl index bb4ace72583..b20a2b65611 100644 --- a/examples/tree_2d_dgsem/elixir_euler_astro_jet_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_astro_jet_amr.jl @@ -7,13 +7,13 @@ using Trixi gamma = 5/3 equations = CompressibleEulerEquations2D(gamma) -# Initial condition adopted from +# Initial condition adopted from # - Yong Liu, Jianfang Lu, and Chi-Wang Shu # An oscillation free discontinuous Galerkin method for hyperbolic systems # https://tinyurl.com/c76fjtx4 # Mach = 2000 jet function initial_condition_astro_jet(x, t, equations::CompressibleEulerEquations2D) - @unpack gamma = equations + @unpack gamma = equations rho = 0.5 v1 = 0 v2 = 0 @@ -44,7 +44,7 @@ basis = LobattoLegendreBasis(polydeg) # shock capturing necessary for this tough example indicator_sc = IndicatorHennemannGassner(equations, basis, - alpha_max=0.3, + alpha_max=0.3, alpha_min=0.0001, alpha_smooth=true, variable=density_pressure) @@ -81,25 +81,25 @@ save_solution = SaveSolutionCallback(interval=5000, save_final_solution=true, solution_variables=cons2prim) -amr_indicator = IndicatorHennemannGassner(semi, - alpha_max=1.0, - alpha_min=0.0001, - alpha_smooth=false, - variable=Trixi.density) - -amr_controller = ControllerThreeLevelCombined(semi, amr_indicator, indicator_sc, - base_level=2, +amr_indicator = IndicatorHennemannGassner(semi, + alpha_max=1.0, + alpha_min=0.0001, + alpha_smooth=false, + variable=Trixi.density) + +amr_controller = ControllerThreeLevelCombined(semi, amr_indicator, indicator_sc, + base_level=2, med_level =0, med_threshold=0.0003, # med_level = current level - max_level =8, max_threshold=0.003, - max_threshold_secondary=indicator_sc.alpha_max) - -amr_callback = AMRCallback(semi, amr_controller, - interval=1, - adapt_initial_condition=true, - adapt_initial_condition_only_refine=true) + max_level =8, max_threshold=0.003, + max_threshold_secondary=indicator_sc.alpha_max) + +amr_callback = AMRCallback(semi, amr_controller, + interval=1, + adapt_initial_condition=true, + adapt_initial_condition_only_refine=true) callbacks = CallbackSet(summary_callback, - analysis_callback, alive_callback, + analysis_callback, alive_callback, amr_callback, save_solution) # positivity limiter necessary for this tough example @@ -110,5 +110,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(5.0e-6, 5.0e-6) # run the simulation # use adaptive time stepping based on error estimates, time step roughly dt = 1e-7 sol = solve(ode, SSPRK43(stage_limiter!), - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_blast_wave_amr.jl b/examples/tree_2d_dgsem/elixir_euler_blast_wave_amr.jl index 31e9497c76b..6abfca03db1 100644 --- a/examples/tree_2d_dgsem/elixir_euler_blast_wave_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_blast_wave_amr.jl @@ -103,5 +103,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_blob_amr.jl b/examples/tree_2d_dgsem/elixir_euler_blob_amr.jl index 9dee8c594c1..f4040732667 100644 --- a/examples/tree_2d_dgsem/elixir_euler_blob_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_blob_amr.jl @@ -123,5 +123,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_blob_mortar.jl b/examples/tree_2d_dgsem/elixir_euler_blob_mortar.jl index f5920514d2e..5b7365f860f 100644 --- a/examples/tree_2d_dgsem/elixir_euler_blob_mortar.jl +++ b/examples/tree_2d_dgsem/elixir_euler_blob_mortar.jl @@ -112,5 +112,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_colliding_flow.jl b/examples/tree_2d_dgsem/elixir_euler_colliding_flow.jl index 2dac2023e6e..383fd22caa9 100644 --- a/examples/tree_2d_dgsem/elixir_euler_colliding_flow.jl +++ b/examples/tree_2d_dgsem/elixir_euler_colliding_flow.jl @@ -14,20 +14,20 @@ function initial_condition_colliding_flow_astro(x, t, equations::CompressibleEul # change discontinuity to tanh # resolution 128^2 elements (refined close to the interface) and polydeg=3 (total of 512^2 DOF) # domain size is [-64,+64]^2 - @unpack gamma = equations + @unpack gamma = equations # the quantities are chosen such, that they are as close as possible to the astro examples # keep in mind, that in the astro example, the physical units are weird (parsec, mega years, ...) rho = 0.0247 c = 0.2 p = c^2 / gamma * rho - vel = 13.907432274789372 + vel = 13.907432274789372 slope = 1.0 v1 = -vel*tanh(slope * x[1]) # add small initial disturbance to the field, but only close to the interface if abs(x[1]) < 10 v1 = v1 * (1 + 0.01 * sin(pi * x[2])) end - v2 = 0.0 + v2 = 0.0 return prim2cons(SVector(rho, v1, v2, p), equations) end initial_condition = initial_condition_colliding_flow_astro @@ -49,7 +49,7 @@ basis = LobattoLegendreBasis(polydeg) # shock capturing necessary for this tough example, however alpha_max = 0.5 is fine indicator_sc = IndicatorHennemannGassner(equations, basis, - alpha_max=0.5, + alpha_max=0.5, alpha_min=0.0001, alpha_smooth=true, variable=density_pressure) @@ -95,7 +95,7 @@ save_solution = SaveSolutionCallback(interval=1000, solution_variables=cons2prim) callbacks = CallbackSet(summary_callback, - analysis_callback, alive_callback, + analysis_callback, alive_callback, save_solution) # positivity limiter necessary for this tough example @@ -106,5 +106,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(5.0e-6, 5.0e-6) # run the simulation # use adaptive time stepping based on error estimates, time step roughly dt = 5e-3 sol = solve(ode, SSPRK43(stage_limiter!), - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_colliding_flow_amr.jl b/examples/tree_2d_dgsem/elixir_euler_colliding_flow_amr.jl index 0dbe4732be6..8c8f546f37a 100644 --- a/examples/tree_2d_dgsem/elixir_euler_colliding_flow_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_colliding_flow_amr.jl @@ -14,20 +14,20 @@ function initial_condition_colliding_flow_astro(x, t, equations::CompressibleEul # change discontinuity to tanh # resolution 128^2 elements (refined close to the interface) and polydeg=3 (total of 512^2 DOF) # domain size is [-64,+64]^2 - @unpack gamma = equations + @unpack gamma = equations # the quantities are chosen such, that they are as close as possible to the astro examples # keep in mind, that in the astro example, the physical units are weird (parsec, mega years, ...) rho = 0.0247 c = 0.2 p = c^2 / gamma * rho - vel = 13.907432274789372 + vel = 13.907432274789372 slope = 1.0 v1 = -vel*tanh(slope * x[1]) # add small initial disturbance to the field, but only close to the interface if abs(x[1]) < 10 v1 = v1 * (1 + 0.01 * sin(pi*x[2])) end - v2 = 0.0 + v2 = 0.0 return prim2cons(SVector(rho, v1, v2, p), equations) end initial_condition = initial_condition_colliding_flow_astro @@ -49,7 +49,7 @@ basis = LobattoLegendreBasis(polydeg) # shock capturing necessary for this tough example, however alpha_max = 0.5 is fine indicator_sc = IndicatorHennemannGassner(equations, basis, - alpha_max=0.5, + alpha_max=0.5, alpha_min=0.0001, alpha_smooth=true, variable=density_pressure) @@ -95,7 +95,7 @@ amr_indicator = IndicatorHennemannGassner(semi, amr_controller = ControllerThreeLevelCombined(semi, amr_indicator, indicator_sc, base_level=2, med_level =0, med_threshold=0.0003, # med_level = current level - max_level =8, max_threshold=0.003, + max_level =8, max_threshold=0.003, max_threshold_secondary=indicator_sc.alpha_max) amr_callback = AMRCallback(semi, amr_controller, @@ -104,7 +104,7 @@ amr_callback = AMRCallback(semi, amr_controller, adapt_initial_condition_only_refine=true) callbacks = CallbackSet(summary_callback, - analysis_callback, alive_callback, + analysis_callback, alive_callback, amr_callback, save_solution) # positivity limiter necessary for this tough example @@ -115,5 +115,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(5.0e-6, 5.0e-6) # run the simulation # use adaptive time stepping based on error estimates, time step roughly dt = 5e-3 sol = solve(ode, SSPRK43(stage_limiter!), - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl b/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl index e48a667dba6..89d7422cfe6 100644 --- a/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl +++ b/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_density_wave.jl b/examples/tree_2d_dgsem/elixir_euler_density_wave.jl index b9bf1cec0b7..a5e9d30e389 100644 --- a/examples/tree_2d_dgsem/elixir_euler_density_wave.jl +++ b/examples/tree_2d_dgsem/elixir_euler_density_wave.jl @@ -52,5 +52,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_ec.jl b/examples/tree_2d_dgsem/elixir_euler_ec.jl index fc7527b6316..aa51c383eaa 100644 --- a/examples/tree_2d_dgsem/elixir_euler_ec.jl +++ b/examples/tree_2d_dgsem/elixir_euler_ec.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=1e5); + save_everystep=false, callback=callbacks, maxiters=10^5); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability.jl b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability.jl index 3b2d56a91c1..4fdedf516ef 100644 --- a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability.jl +++ b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability.jl @@ -83,5 +83,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_amr.jl b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_amr.jl index 954bbb45ac5..b8927c3fd6b 100644 --- a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_amr.jl @@ -100,5 +100,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_shockcapturing.jl b/examples/tree_2d_dgsem/elixir_euler_shockcapturing.jl index 9509d505e95..f0a7ed0b953 100644 --- a/examples/tree_2d_dgsem/elixir_euler_shockcapturing.jl +++ b/examples/tree_2d_dgsem/elixir_euler_shockcapturing.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms.jl b/examples/tree_2d_dgsem/elixir_euler_source_terms.jl index 46cae8535f8..36d93147289 100644 --- a/examples/tree_2d_dgsem/elixir_euler_source_terms.jl +++ b/examples/tree_2d_dgsem/elixir_euler_source_terms.jl @@ -51,5 +51,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms_amr_refine_coarsen.jl b/examples/tree_2d_dgsem/elixir_euler_source_terms_amr_refine_coarsen.jl index b3de10583d1..231486b11c9 100644 --- a/examples/tree_2d_dgsem/elixir_euler_source_terms_amr_refine_coarsen.jl +++ b/examples/tree_2d_dgsem/elixir_euler_source_terms_amr_refine_coarsen.jl @@ -104,5 +104,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/tree_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl index e17b0a986af..9826a53d3d5 100644 --- a/examples/tree_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl +++ b/examples/tree_2d_dgsem/elixir_euler_source_terms_nonperiodic.jl @@ -65,5 +65,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_amr.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_amr.jl index 0f1574260bc..9ff4d0aa25d 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_amr.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_amr.jl @@ -161,5 +161,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar.jl index e98ee754ee4..227fa935035 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar.jl @@ -94,5 +94,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_shockcapturing.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_shockcapturing.jl index db0e782a94a..a528780df67 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_shockcapturing.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_shockcapturing.jl @@ -108,5 +108,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_split.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_split.jl index b9cc1c778bc..36aa89d2a66 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_split.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_mortar_split.jl @@ -97,5 +97,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euler_vortex_shockcapturing.jl b/examples/tree_2d_dgsem/elixir_euler_vortex_shockcapturing.jl index 5b2b575eac4..83576f92d00 100644 --- a/examples/tree_2d_dgsem/elixir_euler_vortex_shockcapturing.jl +++ b/examples/tree_2d_dgsem/elixir_euler_vortex_shockcapturing.jl @@ -106,5 +106,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_euleracoustics_co-rotating_vortex_pair.jl b/examples/tree_2d_dgsem/elixir_euleracoustics_co-rotating_vortex_pair.jl index ac7b2510a65..38b48b5d537 100644 --- a/examples/tree_2d_dgsem/elixir_euleracoustics_co-rotating_vortex_pair.jl +++ b/examples/tree_2d_dgsem/elixir_euleracoustics_co-rotating_vortex_pair.jl @@ -323,7 +323,7 @@ callbacks_averaging = CallbackSet(summary_callback, alive_callback, averaging_ca # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol_averaging = solve(ode_averaging, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks_averaging, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks_averaging); # Print the timer summary summary_callback() @@ -372,7 +372,7 @@ callbacks = CallbackSet(summary_callback, alive_callback, analysis_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() \ No newline at end of file diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl index 935b3968963..d423b800fd0 100644 --- a/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl +++ b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl index 880f31c62e5..62c5bab51ea 100644 --- a/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl +++ b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_ec.jl b/examples/tree_2d_dgsem/elixir_eulermulti_ec.jl index 81dc82335a9..0715dfe35d6 100644 --- a/examples/tree_2d_dgsem/elixir_eulermulti_ec.jl +++ b/examples/tree_2d_dgsem/elixir_eulermulti_ec.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_es.jl b/examples/tree_2d_dgsem/elixir_eulermulti_es.jl index 30d9d376c55..a3e5580b572 100644 --- a/examples/tree_2d_dgsem/elixir_eulermulti_es.jl +++ b/examples/tree_2d_dgsem/elixir_eulermulti_es.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_hypdiff_godunov.jl b/examples/tree_2d_dgsem/elixir_hypdiff_godunov.jl index 3e6535410a7..abf9735fd28 100644 --- a/examples/tree_2d_dgsem/elixir_hypdiff_godunov.jl +++ b/examples/tree_2d_dgsem/elixir_hypdiff_godunov.jl @@ -88,5 +88,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl b/examples/tree_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl index 83e748a0315..c144ef47a63 100644 --- a/examples/tree_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl +++ b/examples/tree_2d_dgsem/elixir_hypdiff_harmonic_nonperiodic.jl @@ -80,5 +80,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_hypdiff_lax_friedrichs.jl b/examples/tree_2d_dgsem/elixir_hypdiff_lax_friedrichs.jl index c6167d81b9a..d0d706981a2 100644 --- a/examples/tree_2d_dgsem/elixir_hypdiff_lax_friedrichs.jl +++ b/examples/tree_2d_dgsem/elixir_hypdiff_lax_friedrichs.jl @@ -87,5 +87,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_hypdiff_nonperiodic.jl b/examples/tree_2d_dgsem/elixir_hypdiff_nonperiodic.jl index b45bca66a73..fc825660f1e 100644 --- a/examples/tree_2d_dgsem/elixir_hypdiff_nonperiodic.jl +++ b/examples/tree_2d_dgsem/elixir_hypdiff_nonperiodic.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_lbm_constant.jl b/examples/tree_2d_dgsem/elixir_lbm_constant.jl index 89136ccfaf8..40b16f41ef6 100644 --- a/examples/tree_2d_dgsem/elixir_lbm_constant.jl +++ b/examples/tree_2d_dgsem/elixir_lbm_constant.jl @@ -58,5 +58,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_lbm_couette.jl b/examples/tree_2d_dgsem/elixir_lbm_couette.jl index bb3af33259a..6a33b2fb0ee 100644 --- a/examples/tree_2d_dgsem/elixir_lbm_couette.jl +++ b/examples/tree_2d_dgsem/elixir_lbm_couette.jl @@ -136,5 +136,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_lbm_lid_driven_cavity.jl b/examples/tree_2d_dgsem/elixir_lbm_lid_driven_cavity.jl index 058f597340e..a34e784e7ac 100644 --- a/examples/tree_2d_dgsem/elixir_lbm_lid_driven_cavity.jl +++ b/examples/tree_2d_dgsem/elixir_lbm_lid_driven_cavity.jl @@ -117,5 +117,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_alfven_wave_mortar.jl b/examples/tree_2d_dgsem/elixir_mhd_alfven_wave_mortar.jl index da3c6a3246b..11dfeacde6a 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_alfven_wave_mortar.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_alfven_wave_mortar.jl @@ -64,5 +64,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_blast_wave.jl b/examples/tree_2d_dgsem/elixir_mhd_blast_wave.jl index 1b48bed2f74..af05fffaf54 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_blast_wave.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_blast_wave.jl @@ -111,5 +111,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_ec.jl b/examples/tree_2d_dgsem/elixir_mhd_ec.jl index 6f74c3167f8..5873388f798 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_ec.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_ec.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_orszag_tang.jl b/examples/tree_2d_dgsem/elixir_mhd_orszag_tang.jl index 75f1a09b0a9..460b24e02b2 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_orszag_tang.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_orszag_tang.jl @@ -103,5 +103,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhd_rotor.jl b/examples/tree_2d_dgsem/elixir_mhd_rotor.jl index b3114d6f83b..c6d880e9e9d 100644 --- a/examples/tree_2d_dgsem/elixir_mhd_rotor.jl +++ b/examples/tree_2d_dgsem/elixir_mhd_rotor.jl @@ -118,5 +118,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl b/examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl index 20f2955bcf7..ec2f3c21cdd 100644 --- a/examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl +++ b/examples/tree_2d_dgsem/elixir_mhdmulti_ec.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhdmulti_es.jl b/examples/tree_2d_dgsem/elixir_mhdmulti_es.jl index 6f751cad949..3cd9c621ae3 100644 --- a/examples/tree_2d_dgsem/elixir_mhdmulti_es.jl +++ b/examples/tree_2d_dgsem/elixir_mhdmulti_es.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_mhdmulti_rotor.jl b/examples/tree_2d_dgsem/elixir_mhdmulti_rotor.jl index 259afb3c43f..55a4004f794 100644 --- a/examples/tree_2d_dgsem/elixir_mhdmulti_rotor.jl +++ b/examples/tree_2d_dgsem/elixir_mhdmulti_rotor.jl @@ -119,5 +119,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_shallowwater_ec.jl b/examples/tree_2d_dgsem/elixir_shallowwater_ec.jl index ea982f0b9ad..555c9070981 100644 --- a/examples/tree_2d_dgsem/elixir_shallowwater_ec.jl +++ b/examples/tree_2d_dgsem/elixir_shallowwater_ec.jl @@ -112,5 +112,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl b/examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl index 8448ba286ff..8e6d9f331a4 100644 --- a/examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl +++ b/examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl @@ -56,5 +56,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav # use a Runge-Kutta method with automatic (error based) time step size control sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-8, reltol=1.0e-8, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl b/examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl index d5a21b92ad3..6d7309ad0bd 100644 --- a/examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl +++ b/examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl @@ -112,5 +112,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_advection_amr.jl b/examples/tree_3d_dgsem/elixir_advection_amr.jl index 2175e5dc458..67664eed563 100644 --- a/examples/tree_3d_dgsem/elixir_advection_amr.jl +++ b/examples/tree_3d_dgsem/elixir_advection_amr.jl @@ -63,5 +63,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_advection_basic.jl b/examples/tree_3d_dgsem/elixir_advection_basic.jl index 491b29bc27e..39d502404d9 100644 --- a/examples/tree_3d_dgsem/elixir_advection_basic.jl +++ b/examples/tree_3d_dgsem/elixir_advection_basic.jl @@ -53,7 +53,7 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step # OrdinaryDiffEq's `solve` method evolves the solution in time and executes the passed callbacks sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/tree_3d_dgsem/elixir_advection_mortar.jl b/examples/tree_3d_dgsem/elixir_advection_mortar.jl index a7f2e1abff3..7b24f152b6a 100644 --- a/examples/tree_3d_dgsem/elixir_advection_mortar.jl +++ b/examples/tree_3d_dgsem/elixir_advection_mortar.jl @@ -59,5 +59,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_advection_restart.jl b/examples/tree_3d_dgsem/elixir_advection_restart.jl index 5fc0234a1c2..83bf4418b98 100644 --- a/examples/tree_3d_dgsem/elixir_advection_restart.jl +++ b/examples/tree_3d_dgsem/elixir_advection_restart.jl @@ -28,5 +28,5 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_amr.jl b/examples/tree_3d_dgsem/elixir_euler_amr.jl index 868d7764fd1..f226a6b446d 100644 --- a/examples/tree_3d_dgsem/elixir_euler_amr.jl +++ b/examples/tree_3d_dgsem/elixir_euler_amr.jl @@ -82,5 +82,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_blob_amr.jl b/examples/tree_3d_dgsem/elixir_euler_blob_amr.jl index 8ec6b592538..a8d112f5b05 100644 --- a/examples/tree_3d_dgsem/elixir_euler_blob_amr.jl +++ b/examples/tree_3d_dgsem/elixir_euler_blob_amr.jl @@ -118,5 +118,5 @@ stage_limiter! = PositivityPreservingLimiterZhangShu(thresholds=(1.0e-4, 1.0e-4) sol = solve(ode, CarpenterKennedy2N54(stage_limiter!, williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_convergence.jl b/examples/tree_3d_dgsem/elixir_euler_convergence.jl index f7f6765b399..2eeb280ae1f 100644 --- a/examples/tree_3d_dgsem/elixir_euler_convergence.jl +++ b/examples/tree_3d_dgsem/elixir_euler_convergence.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl b/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl index efb287b63c7..dbf5747784c 100644 --- a/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl +++ b/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_density_pulse.jl b/examples/tree_3d_dgsem/elixir_euler_density_pulse.jl index fb739684048..ee788321c66 100644 --- a/examples/tree_3d_dgsem/elixir_euler_density_pulse.jl +++ b/examples/tree_3d_dgsem/elixir_euler_density_pulse.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_ec.jl b/examples/tree_3d_dgsem/elixir_euler_ec.jl index 0123de80522..dbdab89d5c2 100644 --- a/examples/tree_3d_dgsem/elixir_euler_ec.jl +++ b/examples/tree_3d_dgsem/elixir_euler_ec.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=1e5); + save_everystep=false, callback=callbacks, maxiters=10^5); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_mortar.jl b/examples/tree_3d_dgsem/elixir_euler_mortar.jl index 9fd109dbbb8..c9fc2dfed50 100644 --- a/examples/tree_3d_dgsem/elixir_euler_mortar.jl +++ b/examples/tree_3d_dgsem/elixir_euler_mortar.jl @@ -55,5 +55,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_shockcapturing.jl b/examples/tree_3d_dgsem/elixir_euler_shockcapturing.jl index c90827ba98c..3015f6c50a4 100644 --- a/examples/tree_3d_dgsem/elixir_euler_shockcapturing.jl +++ b/examples/tree_3d_dgsem/elixir_euler_shockcapturing.jl @@ -65,5 +65,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_source_terms.jl b/examples/tree_3d_dgsem/elixir_euler_source_terms.jl index fabbb5295ca..3445e9fc433 100644 --- a/examples/tree_3d_dgsem/elixir_euler_source_terms.jl +++ b/examples/tree_3d_dgsem/elixir_euler_source_terms.jl @@ -54,5 +54,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_euler_taylor_green_vortex.jl b/examples/tree_3d_dgsem/elixir_euler_taylor_green_vortex.jl index a76a6aa9b8f..693f9ce9049 100644 --- a/examples/tree_3d_dgsem/elixir_euler_taylor_green_vortex.jl +++ b/examples/tree_3d_dgsem/elixir_euler_taylor_green_vortex.jl @@ -72,5 +72,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl b/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl index a092b25f71b..6699ec9a4da 100644 --- a/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl +++ b/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl @@ -79,6 +79,6 @@ callbacks = CallbackSet(summary_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary println("Number of gravity subcycles: ", semi.gravity_counter.ncalls_since_readout) diff --git a/examples/tree_3d_dgsem/elixir_hypdiff_lax_friedrichs.jl b/examples/tree_3d_dgsem/elixir_hypdiff_lax_friedrichs.jl index d6b8b80289b..c7744ce23bd 100644 --- a/examples/tree_3d_dgsem/elixir_hypdiff_lax_friedrichs.jl +++ b/examples/tree_3d_dgsem/elixir_hypdiff_lax_friedrichs.jl @@ -90,5 +90,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_hypdiff_nonperiodic.jl b/examples/tree_3d_dgsem/elixir_hypdiff_nonperiodic.jl index e5d9621cbd8..beefb22ea1e 100644 --- a/examples/tree_3d_dgsem/elixir_hypdiff_nonperiodic.jl +++ b/examples/tree_3d_dgsem/elixir_hypdiff_nonperiodic.jl @@ -65,5 +65,5 @@ callbacks = CallbackSet(summary_callback, steady_state_callback, sol = Trixi.solve(ode, Trixi.HypDiffN3Erk3Sstar52(), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_mhd_alfven_wave.jl b/examples/tree_3d_dgsem/elixir_mhd_alfven_wave.jl index d64a2bfea7c..191982bf2d6 100644 --- a/examples/tree_3d_dgsem/elixir_mhd_alfven_wave.jl +++ b/examples/tree_3d_dgsem/elixir_mhd_alfven_wave.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_mhd_alfven_wave_mortar.jl b/examples/tree_3d_dgsem/elixir_mhd_alfven_wave_mortar.jl index aa480153dbf..e23f7ce5460 100644 --- a/examples/tree_3d_dgsem/elixir_mhd_alfven_wave_mortar.jl +++ b/examples/tree_3d_dgsem/elixir_mhd_alfven_wave_mortar.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_mhd_ec.jl b/examples/tree_3d_dgsem/elixir_mhd_ec.jl index 28ee3510d75..057ffcb031f 100644 --- a/examples/tree_3d_dgsem/elixir_mhd_ec.jl +++ b/examples/tree_3d_dgsem/elixir_mhd_ec.jl @@ -58,5 +58,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/tree_3d_dgsem/elixir_mhd_ec_shockcapturing.jl b/examples/tree_3d_dgsem/elixir_mhd_ec_shockcapturing.jl index 3250ab16760..6b4f6e310ce 100644 --- a/examples/tree_3d_dgsem/elixir_mhd_ec_shockcapturing.jl +++ b/examples/tree_3d_dgsem/elixir_mhd_ec_shockcapturing.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_acoustics_gauss_wall.jl b/examples/unstructured_2d_dgsem/elixir_acoustics_gauss_wall.jl index 567f09a8800..75608b7a453 100644 --- a/examples/unstructured_2d_dgsem/elixir_acoustics_gauss_wall.jl +++ b/examples/unstructured_2d_dgsem/elixir_acoustics_gauss_wall.jl @@ -74,6 +74,6 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution) # use a Runge-Kutta method with automatic (error based) time step size control sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-6, reltol=1.0e-6, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); # Print the timer summary summary_callback() diff --git a/examples/unstructured_2d_dgsem/elixir_advection_basic.jl b/examples/unstructured_2d_dgsem/elixir_advection_basic.jl index 324987419cd..36942581cf6 100644 --- a/examples/unstructured_2d_dgsem/elixir_advection_basic.jl +++ b/examples/unstructured_2d_dgsem/elixir_advection_basic.jl @@ -57,5 +57,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, save_solution, step sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_basic.jl b/examples/unstructured_2d_dgsem/elixir_euler_basic.jl index 80ef8c9adc6..9fbea47a9d5 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_basic.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_basic.jl @@ -74,5 +74,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_ec.jl b/examples/unstructured_2d_dgsem/elixir_euler_ec.jl index 0eea9b81b9c..2725142fd17 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_ec.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_ec.jl @@ -62,5 +62,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_free_stream.jl b/examples/unstructured_2d_dgsem/elixir_euler_free_stream.jl index 957235e5d89..36e119ab794 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_free_stream.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_free_stream.jl @@ -67,5 +67,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_periodic.jl b/examples/unstructured_2d_dgsem/elixir_euler_periodic.jl index 5466af3300a..bb4b520e09a 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_periodic.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_periodic.jl @@ -52,5 +52,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback) ############################################################################### # run the simulation -sol = solve(ode, SSPRK43(), save_everystep=false, callback=callbacks, maxiters=typemax(Int)); +sol = solve(ode, SSPRK43(), save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_restart.jl b/examples/unstructured_2d_dgsem/elixir_euler_restart.jl index 6fb48403104..2ac67652023 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_restart.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_restart.jl @@ -30,6 +30,6 @@ ode = semidiscretize(semi, tspan, restart_filename); sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_sedov.jl b/examples/unstructured_2d_dgsem/elixir_euler_sedov.jl index 0d513367358..b0721786275 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_sedov.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_sedov.jl @@ -94,5 +94,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_euler_wall_bc.jl b/examples/unstructured_2d_dgsem/elixir_euler_wall_bc.jl index a68e107b504..5bfe1ae4e0e 100644 --- a/examples/unstructured_2d_dgsem/elixir_euler_wall_bc.jl +++ b/examples/unstructured_2d_dgsem/elixir_euler_wall_bc.jl @@ -80,5 +80,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_mhd_ec.jl b/examples/unstructured_2d_dgsem/elixir_mhd_ec.jl index edc52de7c23..d75079bb8d7 100644 --- a/examples/unstructured_2d_dgsem/elixir_mhd_ec.jl +++ b/examples/unstructured_2d_dgsem/elixir_mhd_ec.jl @@ -81,5 +81,5 @@ callbacks = CallbackSet(summary_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_dirichlet.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_dirichlet.jl index 79aaf59b5fa..ea02a0c4c53 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_dirichlet.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_dirichlet.jl @@ -75,5 +75,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav # use a Runge-Kutta method with automatic (error based) time step size control sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-11, reltol=1.0e-11, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl index 5d5b7af6bc2..38054ad982e 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl @@ -47,7 +47,7 @@ ode = semidiscretize(semi, tspan) # bottom topography function and initial condtion for this academic testcase of entropy conservation. # The errors from the analysis callback are not important but `∑∂S/∂U ⋅ Uₜ` should be around machine roundoff # In contrast to the usual signature of initial conditions, this one get passed the -# `element_id` explicitly. In particular, this initial conditions works as intended +# `element_id` explicitly. In particular, this initial conditions works as intended # only for the specific mesh loaded above! function initial_condition_ec_discontinuous_bottom(x, t, element_id, equations::ShallowWaterEquations2D) # Set up polar coordinates @@ -114,5 +114,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl index b6d57ba3725..6dc4f9a926d 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl @@ -120,5 +120,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_source_terms.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_source_terms.jl index 9b9582fecb2..ce6a2f03546 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_source_terms.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_source_terms.jl @@ -60,5 +60,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_wall_bc.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_wall_bc.jl index a37c72e53e6..171b448b7fa 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_wall_bc.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_wall_bc.jl @@ -79,5 +79,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav # use a Runge-Kutta method with automatic (error based) time step size control sol = solve(ode, RDPK3SpFSAL49(), abstol=1.0e-8, reltol=1.0e-8, - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary diff --git a/examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl b/examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl index be97a366517..42ef4ffa1fd 100644 --- a/examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl +++ b/examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl @@ -61,7 +61,7 @@ ode = semidiscretize(semi, tspan) # The errors from the analysis callback are not important but the error for this lake at rest test case # `∑|H0-(h+b)|` should be around machine roundoff # In contrast to the usual signature of initial conditions, this one get passed the -# `element_id` explicitly. In particular, this initial conditions works as intended +# `element_id` explicitly. In particular, this initial conditions works as intended # only for the specific mesh loaded above! function initial_condition_discontinuous_well_balancedness(x, t, element_id, equations::ShallowWaterEquations2D) # Set the background values @@ -114,5 +114,5 @@ callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, sav sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks, maxiters=typemax(Int)); + save_everystep=false, callback=callbacks); summary_callback() # print the timer summary From 35bb1510ff75f181333f431c33f43a2d5487f77a Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Thu, 4 Nov 2021 16:11:11 +0100 Subject: [PATCH 07/22] Allow passing different kwargs for coverage override --- test/test_trixi.jl | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index 9e5cd7f0668..a4e223872d6 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -16,34 +16,40 @@ as absolute/relative tolerance. """ macro test_trixi_include(elixir, args...) - local l2 = get_kwarg(args, :l2, nothing) - local linf = get_kwarg(args, :linf, nothing) - local atol = get_kwarg(args, :atol, 500*eps()) - local rtol = get_kwarg(args, :rtol, sqrt(eps())) - local maxiters = get_kwarg(args, :maxiters, typemax(Int)) + local l2 = get_kwarg(args, :l2, nothing) + local linf = get_kwarg(args, :linf, nothing) + local atol = get_kwarg(args, :atol, 500*eps()) + local rtol = get_kwarg(args, :rtol, sqrt(eps())) + local coverage_override = eval(get_kwarg(args, :coverage_override, (;))) + if !(:maxiters in keys(coverage_override)) + # maxiters in coverage_override defaults to 1 + coverage_override = (coverage_override..., maxiters=1) + end local cmd = string(Base.julia_cmd()) local coverage = occursin("--code-coverage", cmd) && !occursin("--code-coverage=none", cmd) - if coverage - # Instead of the kwarg `maxiters`, use `maxiters_coverage` (defaults to 1) - # if Julia is run with code coverage - maxiters = get_kwarg(args, :maxiters_coverage, 1) - end local kwargs = Pair{Symbol, Any}[] for arg in args - if arg.head == :(=) && !(arg.args[1] in (:l2, :linf, :atol, :rtol, :maxiters, :maxiters_coverage)) + if (arg.head == :(=) && !(arg.args[1] in (:l2, :linf, :atol, :rtol, :coverage_override)) + && !(coverage && arg.args[1] in keys(coverage_override))) push!(kwargs, Pair(arg.args...)) end end + if coverage + for key in keys(coverage_override) + push!(kwargs, Pair(key, coverage_override[key])) + end + end + quote Trixi.mpi_isroot() && println("═"^100) Trixi.mpi_isroot() && println($elixir) # if `maxiters` is set in tests, it is usually set to a small numer to # run only a few steps - ignore possible warnings coming from that - if $maxiters < typemax(Int) + if any(==(:maxiters) ∘ first, $kwargs) additional_ignore_content = [ r"┌ Warning: Interrupted\. Larger maxiters is needed\.\n└ @ SciMLBase .+\n", r"┌ Warning: Interrupted\. Larger maxiters is needed\.\n└ @ Trixi .+\n"] @@ -52,7 +58,7 @@ macro test_trixi_include(elixir, args...) end # evaluate examples in the scope of the module they're called from - @test_nowarn_mod trixi_include(@__MODULE__, $elixir; maxiters=$maxiters, $kwargs...) additional_ignore_content + @test_nowarn_mod trixi_include(@__MODULE__, $elixir; $kwargs...) additional_ignore_content # if present, compare l2 and linf errors against reference values if !$coverage && (!isnothing($l2) || !isnothing($linf)) From 1af1895a4231b12d07a6457a978ef06e3885bc63 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Thu, 4 Nov 2021 16:11:30 +0100 Subject: [PATCH 08/22] Update coverage_override for maxiters for the AMR tests --- test/test_p4est_2d.jl | 9 ++++++--- test/test_p4est_3d.jl | 9 ++++++--- test/test_tree_1d_advection.jl | 6 ++++-- test/test_tree_1d_euler.jl | 15 ++++++++++----- test/test_tree_1d_mhd.jl | 9 ++++++--- test/test_tree_1d_mhdmulti.jl | 3 ++- test/test_tree_2d_advection.jl | 12 ++++++++---- test/test_tree_2d_euler.jl | 30 ++++++++++++++++++++---------- test/test_tree_3d_advection.jl | 15 ++++++++------- test/test_tree_3d_euler.jl | 12 ++++++++---- 10 files changed, 78 insertions(+), 42 deletions(-) diff --git a/test/test_p4est_2d.jl b/test/test_p4est_2d.jl index 4ce451bc4a7..8b4b5395c86 100644 --- a/test/test_p4est_2d.jl +++ b/test/test_p4est_2d.jl @@ -35,13 +35,15 @@ isdir(outdir) && rm(outdir, recursive=true) @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_solution_independent.jl"), # Expected errors are exactly the same as with StructuredMesh! l2 = [4.949660644033807e-5], - linf = [0.0004867846262313763]) + linf = [0.0004867846262313763], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_advection_amr_unstructured_flag.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_unstructured_flag.jl"), l2 = [0.0012766060609964525], - linf = [0.01750280631586159]) + linf = [0.01750280631586159], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_advection_restart.jl" begin @@ -82,7 +84,8 @@ isdir(outdir) && rm(outdir, recursive=true) @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_amr.jl"), l2 = [6.32183914e-01, 3.86914231e-01, 3.86869171e-01, 1.06575688e+00], linf = [2.76020890e+00, 2.32659890e+00, 2.32580837e+00, 2.15778188e+00], - tspan = (0.0, 0.3)) + tspan = (0.0, 0.3), + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_eulergravity_convergence.jl" begin diff --git a/test/test_p4est_3d.jl b/test/test_p4est_3d.jl index a3bc1364aff..e669b10a521 100644 --- a/test/test_p4est_3d.jl +++ b/test/test_p4est_3d.jl @@ -35,14 +35,16 @@ isdir(outdir) && rm(outdir, recursive=true) @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"), # Expected errors are exactly the same as with TreeMesh! l2 = [9.773852895157622e-6], - linf = [0.0005853874124926162]) + linf = [0.0005853874124926162], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_advection_amr_unstructured_curved.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_unstructured_curved.jl"), l2 = [1.6236411810065552e-5], linf = [0.0010554006923731395], - tspan = (0.0, 1.0)) + tspan = (0.0, 1.0), + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_advection_cubed_sphere.jl" begin @@ -118,7 +120,8 @@ isdir(outdir) && rm(outdir, recursive=true) linf = [0.20904054009050665, 0.18622917151105936, 0.2347957890323218, 0.19432508025509926, 0.6858860133405615, 0.15172116633332622, 0.22432820727833747, 0.16805989780225183, 0.000535219040687628], - tspan = (0.0, 0.04)) + tspan = (0.0, 0.04), + coverage_override = (maxiters=5,)) end end diff --git a/test/test_tree_1d_advection.jl b/test/test_tree_1d_advection.jl index 6fceace901a..e6e4282d0d7 100644 --- a/test/test_tree_1d_advection.jl +++ b/test/test_tree_1d_advection.jl @@ -18,13 +18,15 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @trixi_testset "elixir_advection_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"), l2 = [0.3540206249507417], - linf = [0.9999896603382347]) + linf = [0.9999896603382347], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_advection_amr_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_nonperiodic.jl"), l2 = [4.283508859843524e-6], - linf = [3.235356127918171e-5]) + linf = [3.235356127918171e-5], + coverage_override = (maxiters=5,)) end end diff --git a/test/test_tree_1d_euler.jl b/test/test_tree_1d_euler.jl index c0123cff9cb..ce81550d91b 100644 --- a/test/test_tree_1d_euler.jl +++ b/test/test_tree_1d_euler.jl @@ -91,13 +91,15 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @trixi_testset "elixir_euler_sedov_blast_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), l2 = [1.250005061244617, 0.06878411345533507, 0.9264328311018613], - linf = [2.9766770877037168, 0.16838100902295852, 2.6655773445485798]) + linf = [2.9766770877037168, 0.16838100902295852, 2.6655773445485798], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_sedov_blast_wave_pure_fv.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_pure_fv.jl"), l2 = [1.075075094036344, 0.06766902169711514, 0.9221426570128292], - linf = [3.3941512671408542, 0.16862631133303882, 2.6572394126490315]) + linf = [3.3941512671408542, 0.16862631133303882, 2.6572394126490315], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_sedov_blast_wave.jl with pressure" begin @@ -105,7 +107,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 l2 = [1.297525985166995, 0.07964929522694145, 0.9269991156246368], linf = [3.1773015255764427, 0.21331831536493773, 2.6650170188241047], shock_indicator_variable = pressure, - cfl = 0.2) + cfl = 0.2, + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_sedov_blast_wave.jl with density" begin @@ -113,13 +116,15 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 l2 = [1.2798798835860528, 0.07103461242058921, 0.9273792517187003], linf = [3.1087017048015824, 0.17734706962928956, 2.666689753470263], shock_indicator_variable = density, - cfl = 0.2) + cfl = 0.2, + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_positivity.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_positivity.jl"), l2 = [1.6493820253458906, 0.19793887460986834, 0.9783506076125921], - linf = [4.71751203912051, 0.5272411022735763, 2.7426163947635844]) + linf = [4.71751203912051, 0.5272411022735763, 2.7426163947635844], + coverage_override = (maxiters=2,)) end @trixi_testset "elixir_euler_blast_wave.jl" begin diff --git a/test/test_tree_1d_mhd.jl b/test/test_tree_1d_mhd.jl index 26ede13dec8..b8b76685c93 100644 --- a/test/test_tree_1d_mhd.jl +++ b/test/test_tree_1d_mhd.jl @@ -40,7 +40,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @trixi_testset "elixir_mhd_briowu_shock_tube.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_briowu_shock_tube.jl"), l2 = [0.17764301067932906, 0.19693621875378622, 0.3635136528288642, 0.0, 0.3757321708837591, 8.593007507325741e-16, 0.36473438378159656, 0.0], - linf = [0.5601530250396535, 0.43867368105486537, 1.0960903616351099, 0.0, 1.0551794137886303, 4.107825191113079e-15, 1.5374410890043144, 0.0]) + linf = [0.5601530250396535, 0.43867368105486537, 1.0960903616351099, 0.0, 1.0551794137886303, 4.107825191113079e-15, 1.5374410890043144, 0.0], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_mhd_torrilhon_shock_tube.jl" begin @@ -60,7 +61,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_shu_osher_shock_tube.jl"), l2 = [1.01126210e+00, 8.27157902e+00, 1.30882545e+00, 0.00000000e+00, 5.21930435e+01, 6.56538824e-16, 1.01022340e+00, 0.00000000e+00], linf = [2.87172004e+00, 2.26438057e+01, 4.16672442e+00, 0.00000000e+00, 1.35152372e+02, 3.44169138e-15, 2.83556069e+00, 0.00000000e+00], - tspan = (0.0, 0.2)) + tspan = (0.0, 0.2), + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_mhd_shu_osher_shock_tube.jl with flipped shock direction" begin @@ -71,7 +73,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 linf = [2.92876280e+00, 2.28341581e+01, 4.11643561e+00, 0.00000000e+00, 1.36966213e+02, 1.55431223e-15, 2.80548864e+00, 0.00000000e+00], initial_condition = initial_condition_shu_osher_shock_tube_flipped, boundary_conditions=BoundaryConditionDirichlet(initial_condition_shu_osher_shock_tube_flipped), - tspan = (0.0, 0.2)) + tspan = (0.0, 0.2), + coverage_override = (maxiters=5,)) end end diff --git a/test/test_tree_1d_mhdmulti.jl b/test/test_tree_1d_mhdmulti.jl index 22306dc86b6..d0f127a300b 100644 --- a/test/test_tree_1d_mhdmulti.jl +++ b/test/test_tree_1d_mhdmulti.jl @@ -58,7 +58,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 0.11550738429083786], linf = [0.4345551123140612, 1.0874941615375844, 0.0, 1.0493729052116585, 3.219646771412954e-15, 1.5160434573973656, 0.0, 0.18616213071936066, - 0.3723242614387213]) + 0.3723242614387213], + coverage_override = (maxiters=5,)) end end diff --git a/test/test_tree_2d_advection.jl b/test/test_tree_2d_advection.jl index ba7b9513bbd..b3256f38c63 100644 --- a/test/test_tree_2d_advection.jl +++ b/test/test_tree_2d_advection.jl @@ -41,20 +41,23 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"), # Expected errors are exactly the same as in the parallel test! l2 = [4.913300828257469e-5], - linf = [0.00045263895394385967]) + linf = [0.00045263895394385967], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_advection_amr_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_nonperiodic.jl"), # Expected errors are exactly the same as in the parallel test! l2 = [3.2207388565869075e-5], - linf = [0.0007508059772436404]) + linf = [0.0007508059772436404], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_advection_amr_solution_independent.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_solution_independent.jl"), l2 = [4.949660644033807e-5], - linf = [0.0004867846262313763]) + linf = [0.0004867846262313763], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_advection_amr_visualization.jl" begin @@ -68,7 +71,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_visualization.jl"), l2 = [0.0007225529919720868], - linf = [0.005954447875428925]) + linf = [0.005954447875428925], + coverage_override = (maxiters=5,)) # Restore GKSwstype to previous value (if it was set) if !isinteractive() diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl index 88a80c7104b..6e6a4c16460 100644 --- a/test/test_tree_2d_euler.jl +++ b/test/test_tree_2d_euler.jl @@ -117,28 +117,32 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_amr.jl"), l2 = [0.6835576416907511, 0.2839963955262972, 0.28399565983676, 0.7229447806293277], linf = [3.0969614882801393, 1.7967947300740248, 1.7967508302506658, 3.040149575567518], - tspan = (0.0, 1.0)) + tspan = (0.0, 1.0), + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_sedov_blast_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), l2 = [0.4866953770742574, 0.1673477470091984, 0.16734774700934, 0.6184367248923149], linf = [2.6724832723962053, 1.2916089288910635, 1.2916089289001427, 6.474699399394252], - tspan = (0.0, 1.0)) + tspan = (0.0, 1.0), + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_sedov_blast_wave_neuralnetwork_perssonperaire.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_neuralnetwork_perssonperaire.jl"), l2 = [0.0845430093623868, 0.09271459184623232, 0.09271459184623232, 0.4377291875101709], linf = [1.3608553480069898, 1.6822884847136004, 1.6822884847135997, 4.220147414536653], - maxiters = 30) + maxiters = 30, + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_positivity.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_positivity.jl"), l2 = [0.48862067511841695, 0.16787541578869494, 0.16787541578869422, 0.6184319933114926], linf = [2.6766520821013002, 1.2910938760258996, 1.2910938760258899, 6.473385481404865], - tspan = (0.0, 1.0)) + tspan = (0.0, 1.0), + coverage_override = (maxiters=2,)) end @trixi_testset "elixir_euler_blob_mortar.jl" begin @@ -152,7 +156,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blob_amr.jl"), l2 = [0.2086261501910662, 1.2118352377894666, 0.10255333189606497, 5.296238138639236], linf = [14.829071984498198, 74.12967742435727, 6.863554388300223, 303.58813147491134], - tspan = (0.0, 0.12)) + tspan = (0.0, 0.12), + coverage_override = (maxiters=1,) # AMR interval is 1) end @trixi_testset "elixir_euler_kelvin_helmholtz_instability.jl" begin @@ -166,14 +171,16 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_kelvin_helmholtz_instability_amr.jl"), l2 = [0.05569452733654995, 0.033107109983417926, 0.05223609622852158, 0.08007777597488817], linf = [0.2535807803900303, 0.17397028249895308, 0.12321616095649354, 0.269046666668995], - tspan = (0.0, 0.2)) + tspan = (0.0, 0.2), + coverage_override = (maxiters=1,) # AMR interval is 1) end @trixi_testset "elixir_euler_kelvin_helmholtz_instability_amr_neuralnetwork_perssonperaire.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_kelvin_helmholtz_instability_amr_neuralnetwork_perssonperaire.jl"), l2 = [0.0009823702998067061, 0.004943231496200673, 0.0048604522073091815, 0.00496983530893294], linf = [0.00855717053383187, 0.02087422420794427, 0.017121993783086185, 0.02720703869972585], - maxiters = 30) + maxiters = 30, + coverage_override = (maxiters=1,) # AMR interval is 1) end @trixi_testset "elixir_euler_colliding_flow.jl" begin @@ -187,14 +194,16 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_colliding_flow_amr.jl"), l2 = [0.006768801432802192, 0.032184992228603666, 6.923887797276484e-7, 0.6784222932398366], linf = [0.2508663007713608, 0.4097017076529792, 0.0003528986458217968, 22.435474993016918], - tspan = (0.0, 0.1)) + tspan = (0.0, 0.1), + coverage_override = (maxiters=1,) # AMR interval is 1) end @trixi_testset "elixir_euler_astro_jet_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_astro_jet_amr.jl"), l2 = [0.011338365293662804, 10.09743543555765, 0.00392429463200361, 4031.7811487690506], linf = [3.3178633141984193, 2993.6445033486402, 8.031723414357423, 1.1918867260293828e6], - tspan = (0.0, 1.0e-7)) + tspan = (0.0, 1.0e-7), + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_vortex.jl" begin @@ -232,7 +241,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_amr.jl"), # Expected errors are exactly the same as in the parallel test! l2 = [2.120552206480055e-6, 0.003281541473561042, 0.003280625257336616, 0.004645872821313438], - linf = [4.500266027052113e-5, 0.031765399304366726, 0.03179340562764421, 0.04563622772500864]) + linf = [4.500266027052113e-5, 0.031765399304366726, 0.03179340562764421, 0.04563622772500864], + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_ec.jl with boundary_condition_slip_wall" begin diff --git a/test/test_tree_3d_advection.jl b/test/test_tree_3d_advection.jl index 8e182cf42c7..b35d5dd81b6 100644 --- a/test/test_tree_3d_advection.jl +++ b/test/test_tree_3d_advection.jl @@ -11,33 +11,33 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 @testset "Linear scalar advection" begin @trixi_testset "elixir_advection_basic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"), - l2 = [0.00016263963870641478], + l2 = [0.00016263963870641478], linf = [0.0014537194925779984]) end @trixi_testset "elixir_advection_restart.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_restart.jl"), - l2 = [0.00016017848135651983], + l2 = [0.00016017848135651983], linf = [0.0014175368788298393]) end @trixi_testset "elixir_advection_extended.jl with initial_condition_sin" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_extended.jl"), - l2 = [0.002647730309275237], + l2 = [0.002647730309275237], linf = [0.02114324070353557], initial_condition=Trixi.initial_condition_sin) end @trixi_testset "elixir_advection_extended.jl with initial_condition_constant" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_extended.jl"), - l2 = [7.728011630010656e-16], + l2 = [7.728011630010656e-16], linf = [3.9968028886505635e-15], initial_condition=initial_condition_constant) end @trixi_testset "elixir_advection_extended.jl with initial_condition_linear_z and periodicity=false" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_extended.jl"), - l2 = [3.007995700405795e-16], + l2 = [3.007995700405795e-16], linf = [2.886579864025407e-15], initial_condition=Trixi.initial_condition_linear_z, boundary_conditions=Trixi.boundary_condition_linear_z, periodicity=false) @@ -45,14 +45,15 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 @trixi_testset "elixir_advection_mortar.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_mortar.jl"), - l2 = [0.001810141301577316], + l2 = [0.001810141301577316], linf = [0.017848192256602058]) end @trixi_testset "elixir_advection_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"), l2 = [9.773852895157622e-6], - linf = [0.0005853874124926162]) + linf = [0.0005853874124926162], + coverage_override = (maxiters=5,)) end end diff --git a/test/test_tree_3d_euler.jl b/test/test_tree_3d_euler.jl index d04b3fd1b92..e5044da3cde 100644 --- a/test/test_tree_3d_euler.jl +++ b/test/test_tree_3d_euler.jl @@ -44,7 +44,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_amr.jl"), l2 = [0.0038281920613404716, 0.003828192061340465, 0.0038281920613404694, 0.0038281920613404672, 0.005742288092010652], linf = [0.07390396464027349, 0.07390396464027305, 0.07390396464027305, 0.07390396464027305, 0.11085594696041134], - tspan=(0.0, 0.1)) + tspan=(0.0, 0.1), + coverage_override = (maxiters=5,)) end @trixi_testset "elixir_euler_taylor_green_vortex.jl" begin @@ -67,7 +68,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing_amr.jl"), l2 = [0.02217299067704248, 0.012771561294571411, 0.01277156129457143, 0.012770635779336643, 0.08091898488262424], linf = [0.4047819603427084, 0.27493532130155474, 0.2749353213015551, 0.2749304638368023, 1.4053942765487641], - maxiters=10) + maxiters=10, + coverage_override = (maxiters=1,) # AMR interval is 1) end @trixi_testset "elixir_euler_density_pulse.jl" begin @@ -114,14 +116,16 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blob_amr.jl"), l2 = [0.04867856452253151, 0.2640486962336911, 0.0354927658652858, 0.03549276586528571, 1.0777274757408568], linf = [9.558543313792217, 49.4518309553356, 10.319859082570309, 10.319859082570487, 195.1066220797401], - tspan = (0.0, 0.2)) + tspan = (0.0, 0.2), + coverage_override = (maxiters=3,)) end @trixi_testset "elixir_euler_sedov_blast_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), l2 = [0.0007127163978031706, 0.0023166296394624025, 0.002316629639462401, 0.0023166296394624038, 0.010200581509653256], linf = [0.06344190883105805, 0.6292607955969378, 0.6292607955969377, 0.6292607955969377, 2.397746252817731], - maxiters=5, max_level=6) + maxiters=5, max_level=6, + coverage_override = (maxiters=1,) # AMR interval is 1) end end From 457ec7eccecd094b46399257cf0ab7254a2e3179 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Thu, 4 Nov 2021 16:29:54 +0100 Subject: [PATCH 09/22] Skip most convergence tests in coverage tests --- test/test_special_elixirs.jl | 58 ++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/test/test_special_elixirs.jl b/test/test_special_elixirs.jl index 01dbff2a128..3290ca29726 100644 --- a/test/test_special_elixirs.jl +++ b/test/test_special_elixirs.jl @@ -15,39 +15,47 @@ isdir(outdir) && rm(outdir, recursive=true) # pathof(Trixi) returns /path/to/Trixi/src/Trixi.jl, dirname gives the parent directory const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples") +cmd = string(Base.julia_cmd()) +coverage = occursin("--code-coverage", cmd) && !occursin("--code-coverage=none", cmd) @testset "Special elixirs" begin @testset "Convergence test" begin - @timed_testset "tree_2d_dgsem" begin - mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 3, initial_refinement_level=2) - @test isapprox(mean_convergence[:l2], [4.0], rtol=0.05) - end + if !coverage + @timed_testset "tree_2d_dgsem" begin + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 3, initial_refinement_level=2) + @test isapprox(mean_convergence[:l2], [4.0], rtol=0.05) + end - @timed_testset "structured_2d_dgsem" begin - mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_2d_dgsem", "elixir_advection_extended.jl"), 3, cells_per_dimension=(5, 9)) - @test isapprox(mean_convergence[:l2], [4.0], rtol=0.05) - end + @timed_testset "structured_2d_dgsem" begin + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_2d_dgsem", "elixir_advection_extended.jl"), 3, cells_per_dimension=(5, 9)) + @test isapprox(mean_convergence[:l2], [4.0], rtol=0.05) + end - @timed_testset "p4est_2d_dgsem" begin - # Run convergence test on unrefined mesh - no_refine = @cfunction((p4est, which_tree, quadrant) -> Cint(0), Cint, (Ptr{Trixi.p4est_t}, Ptr{Trixi.p4est_topidx_t}, Ptr{Trixi.p4est_quadrant_t})) - mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "p4est_2d_dgsem", "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), 2, refine_fn_c=no_refine) - @test isapprox(mean_convergence[:linf], [3.2, 3.2, 4.0, 3.7], rtol=0.05) - end + @timed_testset "p4est_2d_dgsem" begin + # Run convergence test on unrefined mesh + no_refine = @cfunction((p4est, which_tree, quadrant) -> Cint(0), Cint, (Ptr{Trixi.p4est_t}, Ptr{Trixi.p4est_topidx_t}, Ptr{Trixi.p4est_quadrant_t})) + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "p4est_2d_dgsem", "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), 2, refine_fn_c=no_refine) + @test isapprox(mean_convergence[:linf], [3.2, 3.2, 4.0, 3.7], rtol=0.05) + end - @timed_testset "structured_3d_dgsem" begin - mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_3d_dgsem", "elixir_advection_basic.jl"), 2, cells_per_dimension=(7, 4, 5)) - @test isapprox(mean_convergence[:l2], [4.0], rtol=0.05) - end + @timed_testset "structured_3d_dgsem" begin + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_3d_dgsem", "elixir_advection_basic.jl"), 2, cells_per_dimension=(7, 4, 5)) + @test isapprox(mean_convergence[:l2], [4.0], rtol=0.05) + end - @timed_testset "p4est_3d_dgsem" begin - mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "p4est_3d_dgsem", "elixir_advection_unstructured_curved.jl"), 2, initial_refinement_level=0) - @test isapprox(mean_convergence[:l2], [2.7], rtol=0.05) - end + @timed_testset "p4est_3d_dgsem" begin + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "p4est_3d_dgsem", "elixir_advection_unstructured_curved.jl"), 2, initial_refinement_level=0) + @test isapprox(mean_convergence[:l2], [2.7], rtol=0.05) + end - @timed_testset "paper_self_gravitating_gas_dynamics" begin - mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "paper_self_gravitating_gas_dynamics", "elixir_eulergravity_convergence.jl"), 2, tspan=(0.0, 0.25), initial_refinement_level=1) - @test isapprox(mean_convergence[:l2], 4 * ones(4), atol=0.4) + @timed_testset "paper_self_gravitating_gas_dynamics" begin + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "paper_self_gravitating_gas_dynamics", "elixir_eulergravity_convergence.jl"), 2, tspan=(0.0, 0.25), initial_refinement_level=1) + @test isapprox(mean_convergence[:l2], 4 * ones(4), atol=0.4) + end + else + # Without coverage, just run one simple convergence test to cover + # the convergence test logic + @test_nowarn convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 1, initial_refinement_level=1) end end From f72dd071f060feddbfde4d39a6586bd9e9caeeab Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Thu, 4 Nov 2021 20:07:47 +0100 Subject: [PATCH 10/22] Fix errors --- test/test_special_elixirs.jl | 2 +- test/test_tree_2d_euler.jl | 8 ++++---- test/test_tree_2d_mhd.jl | 4 +++- test/test_tree_3d_euler.jl | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/test_special_elixirs.jl b/test/test_special_elixirs.jl index 3290ca29726..48b1f3ea05a 100644 --- a/test/test_special_elixirs.jl +++ b/test/test_special_elixirs.jl @@ -55,7 +55,7 @@ coverage = occursin("--code-coverage", cmd) && !occursin("--code-coverage=none", else # Without coverage, just run one simple convergence test to cover # the convergence test logic - @test_nowarn convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 1, initial_refinement_level=1) + @test_nowarn convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 2, initial_refinement_level=1) end end diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl index 6e6a4c16460..81e4117d0ef 100644 --- a/test/test_tree_2d_euler.jl +++ b/test/test_tree_2d_euler.jl @@ -157,7 +157,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.2086261501910662, 1.2118352377894666, 0.10255333189606497, 5.296238138639236], linf = [14.829071984498198, 74.12967742435727, 6.863554388300223, 303.58813147491134], tspan = (0.0, 0.12), - coverage_override = (maxiters=1,) # AMR interval is 1) + coverage_override = (maxiters=1,)) # AMR interval is 1) end @trixi_testset "elixir_euler_kelvin_helmholtz_instability.jl" begin @@ -172,7 +172,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.05569452733654995, 0.033107109983417926, 0.05223609622852158, 0.08007777597488817], linf = [0.2535807803900303, 0.17397028249895308, 0.12321616095649354, 0.269046666668995], tspan = (0.0, 0.2), - coverage_override = (maxiters=1,) # AMR interval is 1) + coverage_override = (maxiters=1,)) # AMR interval is 1) end @trixi_testset "elixir_euler_kelvin_helmholtz_instability_amr_neuralnetwork_perssonperaire.jl" begin @@ -180,7 +180,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.0009823702998067061, 0.004943231496200673, 0.0048604522073091815, 0.00496983530893294], linf = [0.00855717053383187, 0.02087422420794427, 0.017121993783086185, 0.02720703869972585], maxiters = 30, - coverage_override = (maxiters=1,) # AMR interval is 1) + coverage_override = (maxiters=1,)) # AMR interval is 1) end @trixi_testset "elixir_euler_colliding_flow.jl" begin @@ -195,7 +195,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.006768801432802192, 0.032184992228603666, 6.923887797276484e-7, 0.6784222932398366], linf = [0.2508663007713608, 0.4097017076529792, 0.0003528986458217968, 22.435474993016918], tspan = (0.0, 0.1), - coverage_override = (maxiters=1,) # AMR interval is 1) + coverage_override = (maxiters=1,)) # AMR interval is 1) end @trixi_testset "elixir_euler_astro_jet_amr.jl" begin diff --git a/test/test_tree_2d_mhd.jl b/test/test_tree_2d_mhd.jl index d1c6a0e2d86..2d66c4f6a04 100644 --- a/test/test_tree_2d_mhd.jl +++ b/test/test_tree_2d_mhd.jl @@ -70,7 +70,9 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.17646728395490927, 3.866230215339417, 2.4867304651291255, 0.0, 355.4562971958441, 2.359493623565687, 1.4030741420730297, 0.0, 0.029613599942667133], linf = [1.581630420824181, 44.15725488910748, 13.056964982196554, 0.0, 2244.875490238186, 13.07679044647926, 9.14612176426092, 0.0, 0.5154756722488522], tspan = (0.0, 0.003), - maxiters_coverage = 9) # For some reason, this doesn't run with maxiters < 9 + # Calling the AnalysisCallback before iteration 9 causes the interpolation + # of this IC to have negative density/pressure values, crashing the simulation. + coverage_override = (maxiters=9,)) end end diff --git a/test/test_tree_3d_euler.jl b/test/test_tree_3d_euler.jl index e5044da3cde..edfbbfcedf4 100644 --- a/test/test_tree_3d_euler.jl +++ b/test/test_tree_3d_euler.jl @@ -69,7 +69,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 l2 = [0.02217299067704248, 0.012771561294571411, 0.01277156129457143, 0.012770635779336643, 0.08091898488262424], linf = [0.4047819603427084, 0.27493532130155474, 0.2749353213015551, 0.2749304638368023, 1.4053942765487641], maxiters=10, - coverage_override = (maxiters=1,) # AMR interval is 1) + coverage_override = (maxiters=1,)) # AMR interval is 1) end @trixi_testset "elixir_euler_density_pulse.jl" begin @@ -125,7 +125,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 l2 = [0.0007127163978031706, 0.0023166296394624025, 0.002316629639462401, 0.0023166296394624038, 0.010200581509653256], linf = [0.06344190883105805, 0.6292607955969378, 0.6292607955969377, 0.6292607955969377, 2.397746252817731], maxiters=5, max_level=6, - coverage_override = (maxiters=1,) # AMR interval is 1) + coverage_override = (maxiters=1,)) # AMR interval is 1) end end From d2b95ccc9d89890e193ab5e7d3a4a4e8f00f0023 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Thu, 4 Nov 2021 20:45:47 +0100 Subject: [PATCH 11/22] Replace `eval` --- test/test_trixi.jl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index a4e223872d6..bc6413e1820 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -20,7 +20,7 @@ macro test_trixi_include(elixir, args...) local linf = get_kwarg(args, :linf, nothing) local atol = get_kwarg(args, :atol, 500*eps()) local rtol = get_kwarg(args, :rtol, sqrt(eps())) - local coverage_override = eval(get_kwarg(args, :coverage_override, (;))) + local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, (;))) if !(:maxiters in keys(coverage_override)) # maxiters in coverage_override defaults to 1 coverage_override = (coverage_override..., maxiters=1) @@ -98,6 +98,17 @@ function get_kwarg(args, keyword, default_value) return val end +function expr_to_named_tuple(expr) + result = (;) + + for arg in expr.args + if arg.head != :(=) + error("Invalid expression") + end + result = (; result..., arg.args[1] => arg.args[2]) + end + return result +end # Modified version of `@test_nowarn` that prints the content of `stderr` when From 87d906c4e7f980c2e1c699592255b5d0efed2f35 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Thu, 4 Nov 2021 21:03:58 +0100 Subject: [PATCH 12/22] Fix @test_trixi_include --- test/test_trixi.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index bc6413e1820..5e7088d3d14 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -20,10 +20,10 @@ macro test_trixi_include(elixir, args...) local linf = get_kwarg(args, :linf, nothing) local atol = get_kwarg(args, :atol, 500*eps()) local rtol = get_kwarg(args, :rtol, sqrt(eps())) - local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, (;))) + local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, (; maxiters=1))) if !(:maxiters in keys(coverage_override)) # maxiters in coverage_override defaults to 1 - coverage_override = (coverage_override..., maxiters=1) + coverage_override = (; coverage_override..., maxiters=1) end local cmd = string(Base.julia_cmd()) From ab9ab65e897ea5be7c9b378be1ab2a3181c2aaf0 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Thu, 4 Nov 2021 21:19:27 +0100 Subject: [PATCH 13/22] Fix 87d906c --- test/test_trixi.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index 5e7088d3d14..69ce934d416 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -20,7 +20,7 @@ macro test_trixi_include(elixir, args...) local linf = get_kwarg(args, :linf, nothing) local atol = get_kwarg(args, :atol, 500*eps()) local rtol = get_kwarg(args, :rtol, sqrt(eps())) - local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, (; maxiters=1))) + local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, :())) if !(:maxiters in keys(coverage_override)) # maxiters in coverage_override defaults to 1 coverage_override = (; coverage_override..., maxiters=1) From bf242a997ed882a44460e8a46d2c8dd167ac8a93 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Fri, 5 Nov 2021 00:34:55 +0100 Subject: [PATCH 14/22] Increase maxiters for AMR tests by 1 --- test/test_p4est_2d.jl | 6 +++--- test/test_p4est_3d.jl | 6 +++--- test/test_tree_1d_advection.jl | 4 ++-- test/test_tree_1d_euler.jl | 10 +++++----- test/test_tree_1d_mhd.jl | 6 +++--- test/test_tree_1d_mhdmulti.jl | 2 +- test/test_tree_2d_advection.jl | 8 ++++---- test/test_tree_2d_euler.jl | 20 ++++++++++---------- test/test_tree_3d_advection.jl | 2 +- test/test_tree_3d_euler.jl | 8 ++++---- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/test/test_p4est_2d.jl b/test/test_p4est_2d.jl index 8b4b5395c86..5eb01535e5c 100644 --- a/test/test_p4est_2d.jl +++ b/test/test_p4est_2d.jl @@ -36,14 +36,14 @@ isdir(outdir) && rm(outdir, recursive=true) # Expected errors are exactly the same as with StructuredMesh! l2 = [4.949660644033807e-5], linf = [0.0004867846262313763], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_amr_unstructured_flag.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_unstructured_flag.jl"), l2 = [0.0012766060609964525], linf = [0.01750280631586159], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_restart.jl" begin @@ -85,7 +85,7 @@ isdir(outdir) && rm(outdir, recursive=true) l2 = [6.32183914e-01, 3.86914231e-01, 3.86869171e-01, 1.06575688e+00], linf = [2.76020890e+00, 2.32659890e+00, 2.32580837e+00, 2.15778188e+00], tspan = (0.0, 0.3), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_eulergravity_convergence.jl" begin diff --git a/test/test_p4est_3d.jl b/test/test_p4est_3d.jl index e669b10a521..7dc3523e5aa 100644 --- a/test/test_p4est_3d.jl +++ b/test/test_p4est_3d.jl @@ -36,7 +36,7 @@ isdir(outdir) && rm(outdir, recursive=true) # Expected errors are exactly the same as with TreeMesh! l2 = [9.773852895157622e-6], linf = [0.0005853874124926162], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_amr_unstructured_curved.jl" begin @@ -44,7 +44,7 @@ isdir(outdir) && rm(outdir, recursive=true) l2 = [1.6236411810065552e-5], linf = [0.0010554006923731395], tspan = (0.0, 1.0), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_cubed_sphere.jl" begin @@ -121,7 +121,7 @@ isdir(outdir) && rm(outdir, recursive=true) 0.6858860133405615, 0.15172116633332622, 0.22432820727833747, 0.16805989780225183, 0.000535219040687628], tspan = (0.0, 0.04), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end end diff --git a/test/test_tree_1d_advection.jl b/test/test_tree_1d_advection.jl index e6e4282d0d7..1de7a71b66f 100644 --- a/test/test_tree_1d_advection.jl +++ b/test/test_tree_1d_advection.jl @@ -19,14 +19,14 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"), l2 = [0.3540206249507417], linf = [0.9999896603382347], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_amr_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_nonperiodic.jl"), l2 = [4.283508859843524e-6], linf = [3.235356127918171e-5], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end end diff --git a/test/test_tree_1d_euler.jl b/test/test_tree_1d_euler.jl index ce81550d91b..f5f20052997 100644 --- a/test/test_tree_1d_euler.jl +++ b/test/test_tree_1d_euler.jl @@ -92,14 +92,14 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), l2 = [1.250005061244617, 0.06878411345533507, 0.9264328311018613], linf = [2.9766770877037168, 0.16838100902295852, 2.6655773445485798], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_sedov_blast_wave_pure_fv.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_pure_fv.jl"), l2 = [1.075075094036344, 0.06766902169711514, 0.9221426570128292], linf = [3.3941512671408542, 0.16862631133303882, 2.6572394126490315], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_sedov_blast_wave.jl with pressure" begin @@ -108,7 +108,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 linf = [3.1773015255764427, 0.21331831536493773, 2.6650170188241047], shock_indicator_variable = pressure, cfl = 0.2, - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_sedov_blast_wave.jl with density" begin @@ -117,14 +117,14 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 linf = [3.1087017048015824, 0.17734706962928956, 2.666689753470263], shock_indicator_variable = density, cfl = 0.2, - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_positivity.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_positivity.jl"), l2 = [1.6493820253458906, 0.19793887460986834, 0.9783506076125921], linf = [4.71751203912051, 0.5272411022735763, 2.7426163947635844], - coverage_override = (maxiters=2,)) + coverage_override = (maxiters=3,)) end @trixi_testset "elixir_euler_blast_wave.jl" begin diff --git a/test/test_tree_1d_mhd.jl b/test/test_tree_1d_mhd.jl index b8b76685c93..eb8e7a12afa 100644 --- a/test/test_tree_1d_mhd.jl +++ b/test/test_tree_1d_mhd.jl @@ -41,7 +41,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_briowu_shock_tube.jl"), l2 = [0.17764301067932906, 0.19693621875378622, 0.3635136528288642, 0.0, 0.3757321708837591, 8.593007507325741e-16, 0.36473438378159656, 0.0], linf = [0.5601530250396535, 0.43867368105486537, 1.0960903616351099, 0.0, 1.0551794137886303, 4.107825191113079e-15, 1.5374410890043144, 0.0], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_mhd_torrilhon_shock_tube.jl" begin @@ -62,7 +62,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 l2 = [1.01126210e+00, 8.27157902e+00, 1.30882545e+00, 0.00000000e+00, 5.21930435e+01, 6.56538824e-16, 1.01022340e+00, 0.00000000e+00], linf = [2.87172004e+00, 2.26438057e+01, 4.16672442e+00, 0.00000000e+00, 1.35152372e+02, 3.44169138e-15, 2.83556069e+00, 0.00000000e+00], tspan = (0.0, 0.2), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_mhd_shu_osher_shock_tube.jl with flipped shock direction" begin @@ -74,7 +74,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 initial_condition = initial_condition_shu_osher_shock_tube_flipped, boundary_conditions=BoundaryConditionDirichlet(initial_condition_shu_osher_shock_tube_flipped), tspan = (0.0, 0.2), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end end diff --git a/test/test_tree_1d_mhdmulti.jl b/test/test_tree_1d_mhdmulti.jl index d0f127a300b..43671d5353e 100644 --- a/test/test_tree_1d_mhdmulti.jl +++ b/test/test_tree_1d_mhdmulti.jl @@ -59,7 +59,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 linf = [0.4345551123140612, 1.0874941615375844, 0.0, 1.0493729052116585, 3.219646771412954e-15, 1.5160434573973656, 0.0, 0.18616213071936066, 0.3723242614387213], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end end diff --git a/test/test_tree_2d_advection.jl b/test/test_tree_2d_advection.jl index b3256f38c63..d4dc29e91bc 100644 --- a/test/test_tree_2d_advection.jl +++ b/test/test_tree_2d_advection.jl @@ -42,7 +42,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 # Expected errors are exactly the same as in the parallel test! l2 = [4.913300828257469e-5], linf = [0.00045263895394385967], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_amr_nonperiodic.jl" begin @@ -50,14 +50,14 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 # Expected errors are exactly the same as in the parallel test! l2 = [3.2207388565869075e-5], linf = [0.0007508059772436404], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_amr_solution_independent.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_solution_independent.jl"), l2 = [4.949660644033807e-5], linf = [0.0004867846262313763], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_amr_visualization.jl" begin @@ -72,7 +72,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_visualization.jl"), l2 = [0.0007225529919720868], linf = [0.005954447875428925], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) # Restore GKSwstype to previous value (if it was set) if !isinteractive() diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl index 81e4117d0ef..086a3d4102d 100644 --- a/test/test_tree_2d_euler.jl +++ b/test/test_tree_2d_euler.jl @@ -118,7 +118,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.6835576416907511, 0.2839963955262972, 0.28399565983676, 0.7229447806293277], linf = [3.0969614882801393, 1.7967947300740248, 1.7967508302506658, 3.040149575567518], tspan = (0.0, 1.0), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_sedov_blast_wave.jl" begin @@ -126,7 +126,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.4866953770742574, 0.1673477470091984, 0.16734774700934, 0.6184367248923149], linf = [2.6724832723962053, 1.2916089288910635, 1.2916089289001427, 6.474699399394252], tspan = (0.0, 1.0), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_sedov_blast_wave_neuralnetwork_perssonperaire.jl" begin @@ -134,7 +134,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.0845430093623868, 0.09271459184623232, 0.09271459184623232, 0.4377291875101709], linf = [1.3608553480069898, 1.6822884847136004, 1.6822884847135997, 4.220147414536653], maxiters = 30, - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_positivity.jl" begin @@ -142,7 +142,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.48862067511841695, 0.16787541578869494, 0.16787541578869422, 0.6184319933114926], linf = [2.6766520821013002, 1.2910938760258996, 1.2910938760258899, 6.473385481404865], tspan = (0.0, 1.0), - coverage_override = (maxiters=2,)) + coverage_override = (maxiters=3,)) end @trixi_testset "elixir_euler_blob_mortar.jl" begin @@ -157,7 +157,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.2086261501910662, 1.2118352377894666, 0.10255333189606497, 5.296238138639236], linf = [14.829071984498198, 74.12967742435727, 6.863554388300223, 303.58813147491134], tspan = (0.0, 0.12), - coverage_override = (maxiters=1,)) # AMR interval is 1) + coverage_override = (maxiters=2,)) end @trixi_testset "elixir_euler_kelvin_helmholtz_instability.jl" begin @@ -172,7 +172,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.05569452733654995, 0.033107109983417926, 0.05223609622852158, 0.08007777597488817], linf = [0.2535807803900303, 0.17397028249895308, 0.12321616095649354, 0.269046666668995], tspan = (0.0, 0.2), - coverage_override = (maxiters=1,)) # AMR interval is 1) + coverage_override = (maxiters=2,)) end @trixi_testset "elixir_euler_kelvin_helmholtz_instability_amr_neuralnetwork_perssonperaire.jl" begin @@ -180,7 +180,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.0009823702998067061, 0.004943231496200673, 0.0048604522073091815, 0.00496983530893294], linf = [0.00855717053383187, 0.02087422420794427, 0.017121993783086185, 0.02720703869972585], maxiters = 30, - coverage_override = (maxiters=1,)) # AMR interval is 1) + coverage_override = (maxiters=2,)) end @trixi_testset "elixir_euler_colliding_flow.jl" begin @@ -195,7 +195,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.006768801432802192, 0.032184992228603666, 6.923887797276484e-7, 0.6784222932398366], linf = [0.2508663007713608, 0.4097017076529792, 0.0003528986458217968, 22.435474993016918], tspan = (0.0, 0.1), - coverage_override = (maxiters=1,)) # AMR interval is 1) + coverage_override = (maxiters=2,)) end @trixi_testset "elixir_euler_astro_jet_amr.jl" begin @@ -203,7 +203,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.011338365293662804, 10.09743543555765, 0.00392429463200361, 4031.7811487690506], linf = [3.3178633141984193, 2993.6445033486402, 8.031723414357423, 1.1918867260293828e6], tspan = (0.0, 1.0e-7), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_vortex.jl" begin @@ -242,7 +242,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 # Expected errors are exactly the same as in the parallel test! l2 = [2.120552206480055e-6, 0.003281541473561042, 0.003280625257336616, 0.004645872821313438], linf = [4.500266027052113e-5, 0.031765399304366726, 0.03179340562764421, 0.04563622772500864], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_ec.jl with boundary_condition_slip_wall" begin diff --git a/test/test_tree_3d_advection.jl b/test/test_tree_3d_advection.jl index b35d5dd81b6..2edc2276019 100644 --- a/test/test_tree_3d_advection.jl +++ b/test/test_tree_3d_advection.jl @@ -53,7 +53,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"), l2 = [9.773852895157622e-6], linf = [0.0005853874124926162], - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end end diff --git a/test/test_tree_3d_euler.jl b/test/test_tree_3d_euler.jl index edfbbfcedf4..707224d2152 100644 --- a/test/test_tree_3d_euler.jl +++ b/test/test_tree_3d_euler.jl @@ -45,7 +45,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 l2 = [0.0038281920613404716, 0.003828192061340465, 0.0038281920613404694, 0.0038281920613404672, 0.005742288092010652], linf = [0.07390396464027349, 0.07390396464027305, 0.07390396464027305, 0.07390396464027305, 0.11085594696041134], tspan=(0.0, 0.1), - coverage_override = (maxiters=5,)) + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_taylor_green_vortex.jl" begin @@ -69,7 +69,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 l2 = [0.02217299067704248, 0.012771561294571411, 0.01277156129457143, 0.012770635779336643, 0.08091898488262424], linf = [0.4047819603427084, 0.27493532130155474, 0.2749353213015551, 0.2749304638368023, 1.4053942765487641], maxiters=10, - coverage_override = (maxiters=1,)) # AMR interval is 1) + coverage_override = (maxiters=2,)) end @trixi_testset "elixir_euler_density_pulse.jl" begin @@ -117,7 +117,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 l2 = [0.04867856452253151, 0.2640486962336911, 0.0354927658652858, 0.03549276586528571, 1.0777274757408568], linf = [9.558543313792217, 49.4518309553356, 10.319859082570309, 10.319859082570487, 195.1066220797401], tspan = (0.0, 0.2), - coverage_override = (maxiters=3,)) + coverage_override = (maxiters=8,)) # We need 8 iterations to run into the limiter end @trixi_testset "elixir_euler_sedov_blast_wave.jl" begin @@ -125,7 +125,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 l2 = [0.0007127163978031706, 0.0023166296394624025, 0.002316629639462401, 0.0023166296394624038, 0.010200581509653256], linf = [0.06344190883105805, 0.6292607955969378, 0.6292607955969377, 0.6292607955969377, 2.397746252817731], maxiters=5, max_level=6, - coverage_override = (maxiters=1,)) # AMR interval is 1) + coverage_override = (maxiters=2,)) end end From ca59aa53cf704fcb2f69611aacc17417273cae5e Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Fri, 5 Nov 2021 11:23:18 +0100 Subject: [PATCH 15/22] Let some coverage tests run longer --- test/test_mpi.jl | 18 ++++++++++++------ test/test_special_elixirs.jl | 7 +++++-- test/test_tree_1d_euler.jl | 2 +- test/test_tree_2d_advection.jl | 5 +++-- test/test_tree_2d_euler.jl | 5 +++-- test/test_tree_3d_euler.jl | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/test/test_mpi.jl b/test/test_mpi.jl index 957ec3b2de9..24e06bdd44c 100644 --- a/test/test_mpi.jl +++ b/test/test_mpi.jl @@ -42,14 +42,16 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"), # Expected errors are exactly the same as in the serial test! l2 = [4.913300828257469e-5], - linf = [0.00045263895394385967]) + linf = [0.00045263895394385967], + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_amr_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_nonperiodic.jl"), # Expected errors are exactly the same as in the serial test! l2 = [3.2207388565869075e-5], - linf = [0.0007508059772436404]) + linf = [0.0007508059772436404], + coverage_override = (maxiters=6,)) end # Linear scalar advection with AMR @@ -57,13 +59,15 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " @trixi_testset "elixir_advection_amr_refine_twice.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_refine_twice.jl"), l2 = [0.00020547512522578292], - linf = [0.007831753383083506]) + linf = [0.007831753383083506], + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_advection_amr_coarsen_twice.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_coarsen_twice.jl"), l2 = [0.0014321062757891826], - linf = [0.0253454486893413]) + linf = [0.0253454486893413], + coverage_override = (maxiters=6,)) end # Hyperbolic diffusion @@ -106,7 +110,8 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " @trixi_testset "elixir_euler_source_terms_amr_refine_coarsen.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_amr_refine_coarsen.jl"), l2 = [4.8226610349853444e-5, 4.117706709270575e-5, 4.1177067092959676e-5, 0.00012205252427437389], - linf = [0.0003543874851490436, 0.0002973166773747593, 0.0002973166773760916, 0.001154106793870291]) + linf = [0.0003543874851490436, 0.0002973166773747593, 0.0002973166773760916, 0.001154106793870291], + coverage_override = (maxiters=10^5,)) end @trixi_testset "elixir_euler_density_wave.jl" begin @@ -147,7 +152,8 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_amr.jl"), # Expected errors are exactly the same as in the serial test! l2 = [2.120552206480055e-6, 0.003281541473561042, 0.003280625257336616, 0.004645872821313438], - linf = [4.500266027052113e-5, 0.031765399304366726, 0.03179340562764421, 0.04563622772500864]) + linf = [4.500266027052113e-5, 0.031765399304366726, 0.03179340562764421, 0.04563622772500864], + coverage_override = (maxiters=6,)) end @trixi_testset "elixir_euler_vortex_shockcapturing.jl" begin diff --git a/test/test_special_elixirs.jl b/test/test_special_elixirs.jl index 48b1f3ea05a..fbcfa155a1a 100644 --- a/test/test_special_elixirs.jl +++ b/test/test_special_elixirs.jl @@ -53,9 +53,12 @@ coverage = occursin("--code-coverage", cmd) && !occursin("--code-coverage=none", @test isapprox(mean_convergence[:l2], 4 * ones(4), atol=0.4) end else - # Without coverage, just run one simple convergence test to cover + # Without coverage, just run simple convergence tests to cover # the convergence test logic - @test_nowarn convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 2, initial_refinement_level=1) + @test_nowarn convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_basic.jl"), 2, tspan=(0.0, 0.01)) + @test_nowarn convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 2, initial_refinement_level=0, tspan=(0.0, 0.1)) + @test_nowarn convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_2d_dgsem", "elixir_advection_basic.jl"), 2, tspan=(0.0, 0.01)) + @test_nowarn convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_2d_dgsem", "elixir_advection_extended.jl"), 2, cells_per_dimension=(1, 1), tspan=(0.0, 0.1)) end end diff --git a/test/test_tree_1d_euler.jl b/test/test_tree_1d_euler.jl index f5f20052997..0e4f6f93524 100644 --- a/test/test_tree_1d_euler.jl +++ b/test/test_tree_1d_euler.jl @@ -99,7 +99,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_pure_fv.jl"), l2 = [1.075075094036344, 0.06766902169711514, 0.9221426570128292], linf = [3.3941512671408542, 0.16862631133303882, 2.6572394126490315], - coverage_override = (maxiters=6,)) + coverage_override = (maxiters=10^5, tspan=(0.0, 0.1))) end @trixi_testset "elixir_euler_sedov_blast_wave.jl with pressure" begin diff --git a/test/test_tree_2d_advection.jl b/test/test_tree_2d_advection.jl index d4dc29e91bc..d6096fa439d 100644 --- a/test/test_tree_2d_advection.jl +++ b/test/test_tree_2d_advection.jl @@ -13,7 +13,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"), # Expected errors are exactly the same as in the parallel test! l2 = [8.311947673061856e-6], - linf = [6.627000273229378e-5]) + linf = [6.627000273229378e-5], + coverage_override = (maxiters=10^5,)) end @trixi_testset "elixir_advection_extended.jl with polydeg=1" begin @@ -42,7 +43,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 # Expected errors are exactly the same as in the parallel test! l2 = [4.913300828257469e-5], linf = [0.00045263895394385967], - coverage_override = (maxiters=6,)) + coverage_override = (maxiters=10^5,)) end @trixi_testset "elixir_advection_amr_nonperiodic.jl" begin diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl index 086a3d4102d..f55cab4bcae 100644 --- a/test/test_tree_2d_euler.jl +++ b/test/test_tree_2d_euler.jl @@ -110,7 +110,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_pure_fv.jl"), l2 = [0.39957047631960346, 0.21006912294983154, 0.21006903549932, 0.6280328163981136], linf = [2.20417889887697, 1.5487238480003327, 1.5486788679247812, 2.4656795949035857], - tspan = (0.0, 0.5)) + tspan = (0.0, 0.5), + coverage_override = (maxiters=10^5, tspan=(0.0, 0.1))) end @trixi_testset "elixir_euler_blast_wave_amr.jl" begin @@ -242,7 +243,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 # Expected errors are exactly the same as in the parallel test! l2 = [2.120552206480055e-6, 0.003281541473561042, 0.003280625257336616, 0.004645872821313438], linf = [4.500266027052113e-5, 0.031765399304366726, 0.03179340562764421, 0.04563622772500864], - coverage_override = (maxiters=6,)) + coverage_override = (maxiters=10^5, tspan=(0.0, 10.5))) end @trixi_testset "elixir_euler_ec.jl with boundary_condition_slip_wall" begin diff --git a/test/test_tree_3d_euler.jl b/test/test_tree_3d_euler.jl index 707224d2152..b7698d327fb 100644 --- a/test/test_tree_3d_euler.jl +++ b/test/test_tree_3d_euler.jl @@ -117,7 +117,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 l2 = [0.04867856452253151, 0.2640486962336911, 0.0354927658652858, 0.03549276586528571, 1.0777274757408568], linf = [9.558543313792217, 49.4518309553356, 10.319859082570309, 10.319859082570487, 195.1066220797401], tspan = (0.0, 0.2), - coverage_override = (maxiters=8,)) # We need 8 iterations to run into the limiter + coverage_override = (maxiters=10^5,)) end @trixi_testset "elixir_euler_sedov_blast_wave.jl" begin From dbee951f70ccd9c43c598d2fc52ac5d49ad4df41 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Fri, 5 Nov 2021 16:44:33 +0100 Subject: [PATCH 16/22] Fix coverage --- test/test_paper_self_gravitating_gas_dynamics.jl | 3 ++- test/test_tree_2d_advection.jl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test_paper_self_gravitating_gas_dynamics.jl b/test/test_paper_self_gravitating_gas_dynamics.jl index 714c5fcb1ff..3ab1435c77a 100644 --- a/test/test_paper_self_gravitating_gas_dynamics.jl +++ b/test/test_paper_self_gravitating_gas_dynamics.jl @@ -116,7 +116,8 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_sedov_blast_wave.jl"), l2 = [0.046315994852653024, 0.0650818006233669, 0.06508180062336677, 0.4896707211656037], linf = [2.3874843337593776, 4.07876384374792, 4.07876384374792, 16.23914384809855], - tspan = (0.0, 0.05)) + tspan = (0.0, 0.05), + coverage_override = (maxiters=2,)) end @trixi_testset "elixir_eulergravity_sedov_blast_wave.jl with ref-level=8 and no AMR" begin diff --git a/test/test_tree_2d_advection.jl b/test/test_tree_2d_advection.jl index d6096fa439d..c00e1ff1b95 100644 --- a/test/test_tree_2d_advection.jl +++ b/test/test_tree_2d_advection.jl @@ -88,7 +88,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @trixi_testset "elixir_advection_timeintegration.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_timeintegration.jl"), l2 = [2.4976030518356626e-5], - linf = [0.0005531580316338533]) + linf = [0.0005531580316338533], + coverage_override = (tspan=(0.0, 0.1))) end @trixi_testset "elixir_advection_timeintegration.jl with carpenter_kennedy_erk43" begin From 66e7820474a8a32dd65e17c2d33a1c86de917d16 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Fri, 5 Nov 2021 17:23:46 +0100 Subject: [PATCH 17/22] Fix tests --- test/test_tree_2d_advection.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_tree_2d_advection.jl b/test/test_tree_2d_advection.jl index c00e1ff1b95..0b5604cf6b9 100644 --- a/test/test_tree_2d_advection.jl +++ b/test/test_tree_2d_advection.jl @@ -89,7 +89,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_timeintegration.jl"), l2 = [2.4976030518356626e-5], linf = [0.0005531580316338533], - coverage_override = (tspan=(0.0, 0.1))) + coverage_override = (tspan=(0.0, 0.1),)) end @trixi_testset "elixir_advection_timeintegration.jl with carpenter_kennedy_erk43" begin From b5f4ba38ecc8cbcffc478ec36ebe90328513869b Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Sat, 6 Nov 2021 11:07:29 +0100 Subject: [PATCH 18/22] Increase coverage --- test/test_tree_2d_advection.jl | 2 +- test/test_tree_2d_euler.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_tree_2d_advection.jl b/test/test_tree_2d_advection.jl index 0b5604cf6b9..2298346b28c 100644 --- a/test/test_tree_2d_advection.jl +++ b/test/test_tree_2d_advection.jl @@ -89,7 +89,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_timeintegration.jl"), l2 = [2.4976030518356626e-5], linf = [0.0005531580316338533], - coverage_override = (tspan=(0.0, 0.1),)) + coverage_override = (maxiters=10^5, tspan=(0.0, 0.1))) end @trixi_testset "elixir_advection_timeintegration.jl with carpenter_kennedy_erk43" begin diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl index f55cab4bcae..812a57bab51 100644 --- a/test/test_tree_2d_euler.jl +++ b/test/test_tree_2d_euler.jl @@ -158,7 +158,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.2086261501910662, 1.2118352377894666, 0.10255333189606497, 5.296238138639236], linf = [14.829071984498198, 74.12967742435727, 6.863554388300223, 303.58813147491134], tspan = (0.0, 0.12), - coverage_override = (maxiters=2,)) + coverage_override = (maxiters=10^5,)) end @trixi_testset "elixir_euler_kelvin_helmholtz_instability.jl" begin From 46c4f953e5697a8d69ef825e401f0fc50e2e2137 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Sat, 6 Nov 2021 11:29:45 +0100 Subject: [PATCH 19/22] Speed up `StructuredMesh` and `P4estMesh` coverage tests --- test/test_p4est_3d.jl | 6 ++++-- test/test_structured_3d.jl | 12 +++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/test/test_p4est_3d.jl b/test/test_p4est_3d.jl index 500342da513..b776138b099 100644 --- a/test/test_p4est_3d.jl +++ b/test/test_p4est_3d.jl @@ -91,14 +91,16 @@ isdir(outdir) && rm(outdir, recursive=true) @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), l2 = [0.010380390326164493, 0.006192950051354618, 0.005970674274073704, 0.005965831290564327, 0.02628875593094754], linf = [0.3326911600075694, 0.2824952141320467, 0.41401037398065543, 0.45574161423218573, 0.8099577682187109], - tspan = (0.0, 0.2)) + tspan = (0.0, 0.2), + coverage_override = (polydeg=3,)) # Prevent long compile time in CI end @trixi_testset "elixir_euler_sedov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), l2 = [7.82070951e-02, 4.33260474e-02, 4.33260474e-02, 4.33260474e-02, 3.75260911e-01], linf = [7.45329845e-01, 3.21754792e-01, 3.21754792e-01, 3.21754792e-01, 4.76151527e+00], - tspan = (0.0, 0.3)) + tspan = (0.0, 0.3), + coverage_override = (polydeg=3,)) # Prevent long compile time in CI end @trixi_testset "elixir_mhd_alfven_wave_nonconforming.jl" begin diff --git a/test/test_structured_3d.jl b/test/test_structured_3d.jl index 3d0523186bf..aa008e14c77 100644 --- a/test/test_structured_3d.jl +++ b/test/test_structured_3d.jl @@ -98,7 +98,9 @@ isdir(outdir) && rm(outdir, recursive=true) 0.0013647609788548722], linf = [0.027510637768610846, 0.02797062834945721, 0.01274249949295704, 0.038940694415543736, 0.02200825678588325, 0.03167600959583505, 0.021420957993862344, 0.03386589835999665, - 0.01888303191983353]) + 0.01888303191983353], + # Use same polydeg as everything else to prevent long compile times in CI + coverage_override = (polydeg=3,)) end @trixi_testset "elixir_mhd_alfven_wave.jl with flux_lax_friedrichs" begin @@ -109,7 +111,9 @@ isdir(outdir) && rm(outdir, recursive=true) linf = [0.027719103797310463, 0.027570111789910784, 0.012561901006903103, 0.03903568568480584, 0.021311996934554767, 0.03154849824135775, 0.020996033645485412, 0.03403185137382961, 0.019488952445771597], - surface_flux = (flux_lax_friedrichs, flux_nonconservative_powell)) + surface_flux = (flux_lax_friedrichs, flux_nonconservative_powell), + # Use same polydeg as everything else to prevent long compile times in CI + coverage_override = (polydeg=3,)) end @trixi_testset "elixir_mhd_ec_shockcapturing.jl" begin @@ -120,7 +124,9 @@ isdir(outdir) && rm(outdir, recursive=true) linf = [0.30749098250807516, 0.2679008863509767, 0.271243087484388, 0.26545396569129537, 0.9620950892188596, 0.18163281157498123, 0.15995708312378454, 0.17918221526906408, 0.015138346608166353], - tspan = (0.0, 0.25)) + tspan = (0.0, 0.25), + # Use same polydeg as everything else to prevent long compile times in CI + coverage_override = (polydeg=3,)) end end From f89f0e63dcb6223e5d8b64072a0de6d1f5921e71 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Sun, 7 Nov 2021 23:14:58 +0100 Subject: [PATCH 20/22] Add comments --- test/test_mpi.jl | 2 ++ test/test_tree_1d_euler.jl | 1 + test/test_tree_2d_advection.jl | 4 ++++ test/test_tree_2d_euler.jl | 3 +++ test/test_tree_3d_euler.jl | 2 ++ 5 files changed, 12 insertions(+) diff --git a/test/test_mpi.jl b/test/test_mpi.jl index 24e06bdd44c..24f46852b74 100644 --- a/test/test_mpi.jl +++ b/test/test_mpi.jl @@ -111,6 +111,8 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_amr_refine_coarsen.jl"), l2 = [4.8226610349853444e-5, 4.117706709270575e-5, 4.1177067092959676e-5, 0.00012205252427437389], linf = [0.0003543874851490436, 0.0002973166773747593, 0.0002973166773760916, 0.001154106793870291], + # Let this test run until the end to cover the time-dependent lines + # of the indicator and the MPI-specific AMR code. coverage_override = (maxiters=10^5,)) end diff --git a/test/test_tree_1d_euler.jl b/test/test_tree_1d_euler.jl index 0e4f6f93524..a5a0e9aee88 100644 --- a/test/test_tree_1d_euler.jl +++ b/test/test_tree_1d_euler.jl @@ -99,6 +99,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_pure_fv.jl"), l2 = [1.075075094036344, 0.06766902169711514, 0.9221426570128292], linf = [3.3941512671408542, 0.16862631133303882, 2.6572394126490315], + # Let this test run longer to cover some lines in flux_hllc coverage_override = (maxiters=10^5, tspan=(0.0, 0.1))) end diff --git a/test/test_tree_2d_advection.jl b/test/test_tree_2d_advection.jl index 2298346b28c..d218eb418a9 100644 --- a/test/test_tree_2d_advection.jl +++ b/test/test_tree_2d_advection.jl @@ -14,6 +14,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 # Expected errors are exactly the same as in the parallel test! l2 = [8.311947673061856e-6], linf = [6.627000273229378e-5], + # Let the small basic test run to the end coverage_override = (maxiters=10^5,)) end @@ -43,6 +44,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 # Expected errors are exactly the same as in the parallel test! l2 = [4.913300828257469e-5], linf = [0.00045263895394385967], + # Let this test run to the end to cover some AMR code coverage_override = (maxiters=10^5,)) end @@ -89,6 +91,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_timeintegration.jl"), l2 = [2.4976030518356626e-5], linf = [0.0005531580316338533], + # Let this test terminate by time instead of maxiters to cover some lines + # in time_integration/methods_2N.jl coverage_override = (maxiters=10^5, tspan=(0.0, 0.1))) end diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl index 812a57bab51..9680ba364ef 100644 --- a/test/test_tree_2d_euler.jl +++ b/test/test_tree_2d_euler.jl @@ -111,6 +111,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.39957047631960346, 0.21006912294983154, 0.21006903549932, 0.6280328163981136], linf = [2.20417889887697, 1.5487238480003327, 1.5486788679247812, 2.4656795949035857], tspan = (0.0, 0.5), + # Let this test run longer to cover some lines in flux_hllc coverage_override = (maxiters=10^5, tspan=(0.0, 0.1))) end @@ -158,6 +159,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 l2 = [0.2086261501910662, 1.2118352377894666, 0.10255333189606497, 5.296238138639236], linf = [14.829071984498198, 74.12967742435727, 6.863554388300223, 303.58813147491134], tspan = (0.0, 0.12), + # Let this test run longer to cover the ControllerThreeLevelCombined lines coverage_override = (maxiters=10^5,)) end @@ -243,6 +245,7 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 # Expected errors are exactly the same as in the parallel test! l2 = [2.120552206480055e-6, 0.003281541473561042, 0.003280625257336616, 0.004645872821313438], linf = [4.500266027052113e-5, 0.031765399304366726, 0.03179340562764421, 0.04563622772500864], + # Let this test run longer to cover some lines in the AMR indicator coverage_override = (maxiters=10^5, tspan=(0.0, 10.5))) end diff --git a/test/test_tree_3d_euler.jl b/test/test_tree_3d_euler.jl index b7698d327fb..a6aa4626b0b 100644 --- a/test/test_tree_3d_euler.jl +++ b/test/test_tree_3d_euler.jl @@ -117,6 +117,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 l2 = [0.04867856452253151, 0.2640486962336911, 0.0354927658652858, 0.03549276586528571, 1.0777274757408568], linf = [9.558543313792217, 49.4518309553356, 10.319859082570309, 10.319859082570487, 195.1066220797401], tspan = (0.0, 0.2), + # Let this test run longer to cover some lines in the positivity preserving limiter + # and some AMR lines coverage_override = (maxiters=10^5,)) end From 063efdfc3b78b342ce2d4627c1226e57ba790793 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Sun, 7 Nov 2021 23:24:18 +0100 Subject: [PATCH 21/22] Don't run threaded tests twice --- test/test_threaded.jl | 42 ++++++++++++++++++++++++++---------------- test/test_trixi.jl | 15 ++++++++++----- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/test/test_threaded.jl b/test/test_threaded.jl index d108cf8a87e..cecd03b5e0d 100644 --- a/test/test_threaded.jl +++ b/test/test_threaded.jl @@ -15,32 +15,37 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_advection_restart.jl"), # Expected errors are exactly the same as in the serial test! l2 = [7.81674284320524e-6], - linf = [6.314906965243505e-5]) + linf = [6.314906965243505e-5], + run_with_coverage=false) end @trixi_testset "elixir_advection_amr_refine_twice.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_advection_amr_refine_twice.jl"), - l2 = [0.00020547512522578292], - linf = [0.007831753383083506]) + l2 = [0.00020547512522578292], + linf = [0.007831753383083506], + run_with_coverage=false) end @trixi_testset "elixir_advection_amr_coarsen_twice.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_advection_amr_coarsen_twice.jl"), - l2 = [0.0014321062757891826], - linf = [0.0253454486893413]) + l2 = [0.0014321062757891826], + linf = [0.0253454486893413], + run_with_coverage=false) end @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_source_terms_nonperiodic.jl"), l2 = [2.259440511766445e-6, 2.318888155713922e-6, 2.3188881557894307e-6, 6.3327863238858925e-6], linf = [1.498738264560373e-5, 1.9182011928187137e-5, 1.918201192685487e-5, 6.0526717141407005e-5], - rtol = 0.001) + rtol = 0.001, + run_with_coverage=false) end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_ec.jl"), l2 = [0.061751715597716854, 0.05018223615408711, 0.05018989446443463, 0.225871559730513], - linf = [0.29347582879608825, 0.31081249232844693, 0.3107380389947736, 1.0540358049885143]) + linf = [0.29347582879608825, 0.31081249232844693, 0.3107380389947736, 1.0540358049885143], + run_with_coverage=false) end end @@ -52,7 +57,8 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) linf = [0.0015194298895079283], rtol = 7e-6, # Higher tolerance to make tests pass in CI with macOS elixir_file="elixir_advection_waving_flag.jl", - restart_file="restart_000021.h5") + restart_file="restart_000021.h5", + run_with_coverage=false) end @trixi_testset "elixir_mhd_ec.jl" begin @@ -63,7 +69,8 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) linf = [0.24749024430983746, 0.2990608279625713, 0.3966937932860247, 0.22265033744519683, 0.9757376320946505, 0.12123736788315098, 0.12837436699267113, 0.17793825293524734, 0.03460761690059514], - tspan = (0.0, 0.3)) + tspan = (0.0, 0.3), + run_with_coverage=false) end end @@ -75,7 +82,8 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) 7.175152371650832e-16, 1.4350304743301665e-15, 1.4350304743301665e-15], linf = [0.36236334472179443, 0.3690785638275256, 0.8475748723784078, 0.0, 8.881784197001252e-16, 1.7763568394002505e-15, 1.7763568394002505e-15], - tspan = (0.0, 5.0)) + tspan = (0.0, 5.0), + run_with_coverage=false) end end @@ -83,15 +91,17 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) @testset "P4estMesh" begin @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_flag.jl" begin @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), - l2 = [0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, 0.004731710454271893], - linf = [0.04155789011775046, 0.024772109862748914, 0.03759938693042297, 0.08039824959535657]) + l2 = [0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, 0.004731710454271893], + linf = [0.04155789011775046, 0.024772109862748914, 0.03759938693042297, 0.08039824959535657], + run_with_coverage=false) end @trixi_testset "elixir_eulergravity_convergence.jl" begin @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_eulergravity_convergence.jl"), l2 = [0.00024871265138964204, 0.0003370077102132591, 0.0003370077102131964, 0.0007231525513793697], linf = [0.0015813032944647087, 0.0020494288423820173, 0.0020494288423824614, 0.004793821195083758], - tspan = (0.0, 0.1)) + tspan = (0.0, 0.1), + run_with_coverage=false) end end @@ -105,14 +115,14 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) approximation_type = SBP(), l2 = [0.01280067571168776, 0.010607599608273158, 0.010607599608239976, 0.026408338014056502], linf = [0.03798302318566282, 0.05321027922532284, 0.05321027922605448, 0.13392025411839015], - ) + run_with_coverage=false) end @trixi_testset "elixir_euler_triangulate_pkg_mesh.jl" begin @test_trixi_include(joinpath(examples_dir(), "dgmulti_2d", "elixir_euler_triangulate_pkg_mesh.jl"), l2 = [4.664661209491976e-6, 3.7033509525940745e-6, 4.794877426562555e-6, 1.2682723101532175e-5], - linf = [2.5099852761334418e-5, 2.2683684021362893e-5, 2.6180448559287584e-5, 5.5752932611508044e-5] - ) + linf = [2.5099852761334418e-5, 2.2683684021362893e-5, 2.6180448559287584e-5, 5.5752932611508044e-5], + run_with_coverage=false) end end end diff --git a/test/test_trixi.jl b/test/test_trixi.jl index 69ce934d416..0dac38b1802 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -16,11 +16,13 @@ as absolute/relative tolerance. """ macro test_trixi_include(elixir, args...) - local l2 = get_kwarg(args, :l2, nothing) - local linf = get_kwarg(args, :linf, nothing) - local atol = get_kwarg(args, :atol, 500*eps()) - local rtol = get_kwarg(args, :rtol, sqrt(eps())) - local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, :())) + local l2 = get_kwarg(args, :l2, nothing) + local linf = get_kwarg(args, :linf, nothing) + local atol = get_kwarg(args, :atol, 500*eps()) + local rtol = get_kwarg(args, :rtol, sqrt(eps())) + local run_without_coverage = get_kwarg(args, :run_without_coverage, true) + local run_with_coverage = get_kwarg(args, :run_with_coverage, true) + local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, :())) if !(:maxiters in keys(coverage_override)) # maxiters in coverage_override defaults to 1 coverage_override = (; coverage_override..., maxiters=1) @@ -28,6 +30,9 @@ macro test_trixi_include(elixir, args...) local cmd = string(Base.julia_cmd()) local coverage = occursin("--code-coverage", cmd) && !occursin("--code-coverage=none", cmd) + if (coverage && !run_with_coverage) || (!coverage && !run_without_coverage) + return + end local kwargs = Pair{Symbol, Any}[] for arg in args From d5d6cbbfbbdd1e68845d862663811762df4e71a1 Mon Sep 17 00:00:00 2001 From: Erik Faulhaber Date: Mon, 8 Nov 2021 11:13:21 +0100 Subject: [PATCH 22/22] Revert "Don't run threaded tests twice" This reverts commit 063efdfc3b78b342ce2d4627c1226e57ba790793. --- test/test_threaded.jl | 42 ++++++++++++++++-------------------------- test/test_trixi.jl | 15 +++++---------- 2 files changed, 21 insertions(+), 36 deletions(-) diff --git a/test/test_threaded.jl b/test/test_threaded.jl index cecd03b5e0d..d108cf8a87e 100644 --- a/test/test_threaded.jl +++ b/test/test_threaded.jl @@ -15,37 +15,32 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_advection_restart.jl"), # Expected errors are exactly the same as in the serial test! l2 = [7.81674284320524e-6], - linf = [6.314906965243505e-5], - run_with_coverage=false) + linf = [6.314906965243505e-5]) end @trixi_testset "elixir_advection_amr_refine_twice.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_advection_amr_refine_twice.jl"), - l2 = [0.00020547512522578292], - linf = [0.007831753383083506], - run_with_coverage=false) + l2 = [0.00020547512522578292], + linf = [0.007831753383083506]) end @trixi_testset "elixir_advection_amr_coarsen_twice.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_advection_amr_coarsen_twice.jl"), - l2 = [0.0014321062757891826], - linf = [0.0253454486893413], - run_with_coverage=false) + l2 = [0.0014321062757891826], + linf = [0.0253454486893413]) end @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_source_terms_nonperiodic.jl"), l2 = [2.259440511766445e-6, 2.318888155713922e-6, 2.3188881557894307e-6, 6.3327863238858925e-6], linf = [1.498738264560373e-5, 1.9182011928187137e-5, 1.918201192685487e-5, 6.0526717141407005e-5], - rtol = 0.001, - run_with_coverage=false) + rtol = 0.001) end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_ec.jl"), l2 = [0.061751715597716854, 0.05018223615408711, 0.05018989446443463, 0.225871559730513], - linf = [0.29347582879608825, 0.31081249232844693, 0.3107380389947736, 1.0540358049885143], - run_with_coverage=false) + linf = [0.29347582879608825, 0.31081249232844693, 0.3107380389947736, 1.0540358049885143]) end end @@ -57,8 +52,7 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) linf = [0.0015194298895079283], rtol = 7e-6, # Higher tolerance to make tests pass in CI with macOS elixir_file="elixir_advection_waving_flag.jl", - restart_file="restart_000021.h5", - run_with_coverage=false) + restart_file="restart_000021.h5") end @trixi_testset "elixir_mhd_ec.jl" begin @@ -69,8 +63,7 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) linf = [0.24749024430983746, 0.2990608279625713, 0.3966937932860247, 0.22265033744519683, 0.9757376320946505, 0.12123736788315098, 0.12837436699267113, 0.17793825293524734, 0.03460761690059514], - tspan = (0.0, 0.3), - run_with_coverage=false) + tspan = (0.0, 0.3)) end end @@ -82,8 +75,7 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) 7.175152371650832e-16, 1.4350304743301665e-15, 1.4350304743301665e-15], linf = [0.36236334472179443, 0.3690785638275256, 0.8475748723784078, 0.0, 8.881784197001252e-16, 1.7763568394002505e-15, 1.7763568394002505e-15], - tspan = (0.0, 5.0), - run_with_coverage=false) + tspan = (0.0, 5.0)) end end @@ -91,17 +83,15 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) @testset "P4estMesh" begin @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_flag.jl" begin @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), - l2 = [0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, 0.004731710454271893], - linf = [0.04155789011775046, 0.024772109862748914, 0.03759938693042297, 0.08039824959535657], - run_with_coverage=false) + l2 = [0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, 0.004731710454271893], + linf = [0.04155789011775046, 0.024772109862748914, 0.03759938693042297, 0.08039824959535657]) end @trixi_testset "elixir_eulergravity_convergence.jl" begin @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_eulergravity_convergence.jl"), l2 = [0.00024871265138964204, 0.0003370077102132591, 0.0003370077102131964, 0.0007231525513793697], linf = [0.0015813032944647087, 0.0020494288423820173, 0.0020494288423824614, 0.004793821195083758], - tspan = (0.0, 0.1), - run_with_coverage=false) + tspan = (0.0, 0.1)) end end @@ -115,14 +105,14 @@ Trixi.mpi_isroot() && isdir(outdir) && rm(outdir, recursive=true) approximation_type = SBP(), l2 = [0.01280067571168776, 0.010607599608273158, 0.010607599608239976, 0.026408338014056502], linf = [0.03798302318566282, 0.05321027922532284, 0.05321027922605448, 0.13392025411839015], - run_with_coverage=false) + ) end @trixi_testset "elixir_euler_triangulate_pkg_mesh.jl" begin @test_trixi_include(joinpath(examples_dir(), "dgmulti_2d", "elixir_euler_triangulate_pkg_mesh.jl"), l2 = [4.664661209491976e-6, 3.7033509525940745e-6, 4.794877426562555e-6, 1.2682723101532175e-5], - linf = [2.5099852761334418e-5, 2.2683684021362893e-5, 2.6180448559287584e-5, 5.5752932611508044e-5], - run_with_coverage=false) + linf = [2.5099852761334418e-5, 2.2683684021362893e-5, 2.6180448559287584e-5, 5.5752932611508044e-5] + ) end end end diff --git a/test/test_trixi.jl b/test/test_trixi.jl index 0dac38b1802..69ce934d416 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -16,13 +16,11 @@ as absolute/relative tolerance. """ macro test_trixi_include(elixir, args...) - local l2 = get_kwarg(args, :l2, nothing) - local linf = get_kwarg(args, :linf, nothing) - local atol = get_kwarg(args, :atol, 500*eps()) - local rtol = get_kwarg(args, :rtol, sqrt(eps())) - local run_without_coverage = get_kwarg(args, :run_without_coverage, true) - local run_with_coverage = get_kwarg(args, :run_with_coverage, true) - local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, :())) + local l2 = get_kwarg(args, :l2, nothing) + local linf = get_kwarg(args, :linf, nothing) + local atol = get_kwarg(args, :atol, 500*eps()) + local rtol = get_kwarg(args, :rtol, sqrt(eps())) + local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, :())) if !(:maxiters in keys(coverage_override)) # maxiters in coverage_override defaults to 1 coverage_override = (; coverage_override..., maxiters=1) @@ -30,9 +28,6 @@ macro test_trixi_include(elixir, args...) local cmd = string(Base.julia_cmd()) local coverage = occursin("--code-coverage", cmd) && !occursin("--code-coverage=none", cmd) - if (coverage && !run_with_coverage) || (!coverage && !run_without_coverage) - return - end local kwargs = Pair{Symbol, Any}[] for arg in args