From 8e3f82137720508ef73e7badca69445f72a9fce6 Mon Sep 17 00:00:00 2001 From: Arpit-Babbar Date: Sat, 10 Feb 2024 21:07:36 +0530 Subject: [PATCH] Run full formatter to pass CI? --- ...in_helmholtz_instability_fjordholm_etal.jl | 23 +- src/callbacks_step/alive.jl | 4 +- src/callbacks_step/averaging.jl | 6 +- src/callbacks_step/glm_speed.jl | 6 +- src/callbacks_step/save_restart.jl | 11 +- src/callbacks_step/save_solution.jl | 32 +- src/callbacks_step/steady_state.jl | 6 +- src/callbacks_step/stepsize.jl | 4 +- src/callbacks_step/time_series.jl | 12 +- src/callbacks_step/visualization.jl | 16 +- src/meshes/p4est_mesh.jl | 10 +- src/meshes/t8code_mesh.jl | 38 +- src/meshes/tree_mesh.jl | 14 +- .../semidiscretization_euler_gravity.jl | 12 +- src/solvers/dg.jl | 24 +- src/solvers/dgsem_tree/indicators.jl | 30 +- src/solvers/dgsem_tree/subcell_limiters.jl | 18 +- test/test_aqua.jl | 2 +- test/test_dgmulti_1d.jl | 88 +-- test/test_dgmulti_2d.jl | 533 +++++++--------- test/test_dgmulti_3d.jl | 234 +++---- test/test_mpi_p4est_2d.jl | 16 +- test/test_mpi_p4est_3d.jl | 72 +-- test/test_mpi_t8code_2d.jl | 16 +- test/test_mpi_t8code_3d.jl | 54 +- test/test_mpi_tree.jl | 204 +++---- test/test_p4est_2d.jl | 259 +++----- test/test_p4est_3d.jl | 246 +++----- ...est_paper_self_gravitating_gas_dynamics.jl | 188 +++--- test/test_parabolic_1d.jl | 84 +-- test/test_parabolic_2d.jl | 220 +++---- test/test_parabolic_3d.jl | 277 ++++----- test/test_structured_1d.jl | 36 +- test/test_structured_2d.jl | 465 ++++++-------- test/test_structured_3d.jl | 141 ++--- test/test_t8code_2d.jl | 86 ++- test/test_t8code_3d.jl | 108 ++-- test/test_threaded.jl | 190 +++--- test/test_tree_1d_euler.jl | 236 +++---- test/test_tree_1d_eulergravity.jl | 14 +- test/test_tree_1d_eulermulti.jl | 52 +- test/test_tree_1d_fdsbp.jl | 56 +- test/test_tree_1d_mhd.jl | 248 ++++---- test/test_tree_1d_mhdmulti.jl | 40 +- test/test_tree_1d_shallowwater.jl | 236 +++---- test/test_tree_1d_shallowwater_twolayer.jl | 10 +- test/test_tree_2d_acoustics.jl | 76 +-- test/test_tree_2d_euler.jl | 576 +++++++----------- test/test_tree_2d_euleracoustics.jl | 22 +- test/test_tree_2d_eulermulti.jl | 152 ++--- test/test_tree_2d_eulerpolytropic.jl | 12 +- test/test_tree_2d_fdsbp.jl | 64 +- test/test_tree_2d_hypdiff.jl | 56 +- test/test_tree_2d_lbm.jl | 48 +- test/test_tree_2d_linearizedeuler.jl | 32 +- test/test_tree_2d_mhd.jl | 260 ++++---- test/test_tree_2d_mhdmulti.jl | 47 +- test/test_tree_2d_shallowwater.jl | 208 +++---- test/test_tree_2d_shallowwater_twolayer.jl | 24 +- test/test_tree_3d_euler.jl | 324 ++++------ test/test_tree_3d_eulergravity.jl | 18 +- test/test_tree_3d_fdsbp.jl | 54 +- test/test_tree_3d_hypdiff.jl | 48 +- test/test_tree_3d_lbm.jl | 66 +- test/test_tree_3d_mhd.jl | 182 +++--- test/test_trixi.jl | 5 +- test/test_unit.jl | 290 +++++---- test/test_unstructured_2d.jl | 360 +++++------ test/test_visualization.jl | 10 +- 69 files changed, 3000 insertions(+), 4611 deletions(-) diff --git a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_fjordholm_etal.jl b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_fjordholm_etal.jl index 5b2b80d84f3..86eaf021194 100644 --- a/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_fjordholm_etal.jl +++ b/examples/tree_2d_dgsem/elixir_euler_kelvin_helmholtz_instability_fjordholm_etal.jl @@ -35,19 +35,22 @@ function initial_condition_kelvin_helmholtz_instability_fjordholm_etal(x, t, m = 10 a1 = [0.04457096674422902, 0.03891512410182607, 0.0030191053979293433, - 0.0993913172320319, - 0.1622302137588842, 0.1831383653456182, 0.11758003014101702, 0.07964318348142958, - 0.0863245324711805, 0.18518716132585408] + 0.0993913172320319, + 0.1622302137588842, 0.1831383653456182, 0.11758003014101702, 0.07964318348142958, + 0.0863245324711805, 0.18518716132585408] a2 = [0.061688440856337096, 0.23000237877135882, 0.04453793881833177, - 0.19251530387370916, - 0.11107917357941084, 0.05898041974649702, 0.09949312336096268, 0.07022276346006465, - 0.10670366489014596, 0.02477679264318211] + 0.19251530387370916, + 0.11107917357941084, 0.05898041974649702, 0.09949312336096268, + 0.07022276346006465, + 0.10670366489014596, 0.02477679264318211] b1 = [0.06582340543754152, 0.9857886297001535, 0.8450452205037154, -1.279648120993805, - 0.45454198915209526, -0.13359370986823993, 0.07062615913363897, -1.0097986278512623, - 1.0810669017430343, -0.14207309803877177] + 0.45454198915209526, -0.13359370986823993, 0.07062615913363897, + -1.0097986278512623, + 1.0810669017430343, -0.14207309803877177] b2 = [-1.1376882185131414, -1.4798197129947765, 0.6139290513283818, -0.3319087388365522, - 0.14633328999192285, -0.06373231463100072, -0.6270101051216724, 0.13941252226261905, - -1.0337526453303645, 1.0441408867083155] + 0.14633328999192285, -0.06373231463100072, -0.6270101051216724, + 0.13941252226261905, + -1.0337526453303645, 1.0441408867083155] Y1 = 0.0 Y2 = 0.0 for n in 1:m diff --git a/src/callbacks_step/alive.jl b/src/callbacks_step/alive.jl index 9df7181521e..8e2f460cc7f 100644 --- a/src/callbacks_step/alive.jl +++ b/src/callbacks_step/alive.jl @@ -44,9 +44,7 @@ function Base.show(io::IO, ::MIME"text/plain", else alive_callback = cb.affect! - setup = [ - "interval" => alive_callback.alive_interval, - ] + setup = ["interval" => alive_callback.alive_interval] summary_box(io, "AliveCallback", setup) end end diff --git a/src/callbacks_step/averaging.jl b/src/callbacks_step/averaging.jl index efa71af9b91..d69f70d722b 100644 --- a/src/callbacks_step/averaging.jl +++ b/src/callbacks_step/averaging.jl @@ -43,10 +43,8 @@ function Base.show(io::IO, ::MIME"text/plain", else averaging_callback = cb.affect! - setup = [ - "Start time" => first(averaging_callback.tspan), - "Final time" => last(averaging_callback.tspan), - ] + setup = ["Start time" => first(averaging_callback.tspan), + "Final time" => last(averaging_callback.tspan)] summary_box(io, "AveragingCallback", setup) end end diff --git a/src/callbacks_step/glm_speed.jl b/src/callbacks_step/glm_speed.jl index 036f61a522b..c217f1afe62 100644 --- a/src/callbacks_step/glm_speed.jl +++ b/src/callbacks_step/glm_speed.jl @@ -37,10 +37,8 @@ function Base.show(io::IO, ::MIME"text/plain", else glm_speed_callback = cb.affect! - setup = [ - "GLM wave speed scaling" => glm_speed_callback.glm_scale, - "Expected CFL number" => glm_speed_callback.cfl, - ] + setup = ["GLM wave speed scaling" => glm_speed_callback.glm_scale, + "Expected CFL number" => glm_speed_callback.cfl] summary_box(io, "GlmSpeedCallback", setup) end end diff --git a/src/callbacks_step/save_restart.jl b/src/callbacks_step/save_restart.jl index 0d174d85805..70284054708 100644 --- a/src/callbacks_step/save_restart.jl +++ b/src/callbacks_step/save_restart.jl @@ -34,12 +34,11 @@ function Base.show(io::IO, ::MIME"text/plain", else save_restart_callback = cb.affect! - setup = [ - "interval" => save_restart_callback.interval, - "save final solution" => save_restart_callback.save_final_restart ? "yes" : - "no", - "output directory" => abspath(normpath(save_restart_callback.output_directory)), - ] + setup = ["interval" => save_restart_callback.interval, + "save final solution" => save_restart_callback.save_final_restart ? + "yes" : + "no", + "output directory" => abspath(normpath(save_restart_callback.output_directory))] summary_box(io, "SaveRestartCallback", setup) end end diff --git a/src/callbacks_step/save_solution.jl b/src/callbacks_step/save_solution.jl index c106fe69bcd..5731d9ff07c 100644 --- a/src/callbacks_step/save_solution.jl +++ b/src/callbacks_step/save_solution.jl @@ -55,15 +55,13 @@ function Base.show(io::IO, ::MIME"text/plain", else save_solution_callback = cb.affect! - setup = [ - "interval" => save_solution_callback.interval_or_dt, - "solution variables" => save_solution_callback.solution_variables, - "save initial solution" => save_solution_callback.save_initial_solution ? - "yes" : "no", - "save final solution" => save_solution_callback.save_final_solution ? - "yes" : "no", - "output directory" => abspath(normpath(save_solution_callback.output_directory)), - ] + setup = ["interval" => save_solution_callback.interval_or_dt, + "solution variables" => save_solution_callback.solution_variables, + "save initial solution" => save_solution_callback.save_initial_solution ? + "yes" : "no", + "save final solution" => save_solution_callback.save_final_solution ? + "yes" : "no", + "output directory" => abspath(normpath(save_solution_callback.output_directory))] summary_box(io, "SaveSolutionCallback", setup) end end @@ -78,15 +76,13 @@ function Base.show(io::IO, ::MIME"text/plain", else save_solution_callback = cb.affect!.affect! - setup = [ - "dt" => save_solution_callback.interval_or_dt, - "solution variables" => save_solution_callback.solution_variables, - "save initial solution" => save_solution_callback.save_initial_solution ? - "yes" : "no", - "save final solution" => save_solution_callback.save_final_solution ? - "yes" : "no", - "output directory" => abspath(normpath(save_solution_callback.output_directory)), - ] + setup = ["dt" => save_solution_callback.interval_or_dt, + "solution variables" => save_solution_callback.solution_variables, + "save initial solution" => save_solution_callback.save_initial_solution ? + "yes" : "no", + "save final solution" => save_solution_callback.save_final_solution ? + "yes" : "no", + "output directory" => abspath(normpath(save_solution_callback.output_directory))] summary_box(io, "SaveSolutionCallback", setup) end end diff --git a/src/callbacks_step/steady_state.jl b/src/callbacks_step/steady_state.jl index 15c2e834285..ca687118d34 100644 --- a/src/callbacks_step/steady_state.jl +++ b/src/callbacks_step/steady_state.jl @@ -41,10 +41,8 @@ function Base.show(io::IO, ::MIME"text/plain", else steady_state_callback = cb.affect! - setup = [ - "absolute tolerance" => steady_state_callback.abstol, - "relative tolerance" => steady_state_callback.reltol, - ] + setup = ["absolute tolerance" => steady_state_callback.abstol, + "relative tolerance" => steady_state_callback.reltol] summary_box(io, "SteadyStateCallback", setup) end end diff --git a/src/callbacks_step/stepsize.jl b/src/callbacks_step/stepsize.jl index 8b5cb958318..146f528b5c5 100644 --- a/src/callbacks_step/stepsize.jl +++ b/src/callbacks_step/stepsize.jl @@ -32,9 +32,7 @@ function Base.show(io::IO, ::MIME"text/plain", else stepsize_callback = cb.affect! - setup = [ - "CFL number" => stepsize_callback.cfl_number, - ] + setup = ["CFL number" => stepsize_callback.cfl_number] summary_box(io, "StepsizeCallback", setup) end end diff --git a/src/callbacks_step/time_series.jl b/src/callbacks_step/time_series.jl index 7baa6b9c5a1..a9be88b42b9 100644 --- a/src/callbacks_step/time_series.jl +++ b/src/callbacks_step/time_series.jl @@ -68,13 +68,11 @@ function Base.show(io::IO, ::MIME"text/plain", else time_series_callback = cb.affect! - setup = [ - "#points" => size(time_series_callback.point_coordinates, 2), - "interval" => time_series_callback.interval, - "solution_variables" => time_series_callback.solution_variables, - "output_directory" => time_series_callback.output_directory, - "filename" => time_series_callback.filename, - ] + setup = ["#points" => size(time_series_callback.point_coordinates, 2), + "interval" => time_series_callback.interval, + "solution_variables" => time_series_callback.solution_variables, + "output_directory" => time_series_callback.output_directory, + "filename" => time_series_callback.filename] summary_box(io, "TimeSeriesCallback", setup) end end diff --git a/src/callbacks_step/visualization.jl b/src/callbacks_step/visualization.jl index 98c0126a302..23adbf71593 100644 --- a/src/callbacks_step/visualization.jl +++ b/src/callbacks_step/visualization.jl @@ -43,15 +43,13 @@ function Base.show(io::IO, ::MIME"text/plain", else visualization_callback = cb.affect! - setup = [ - "interval" => visualization_callback.interval, - "plot arguments" => visualization_callback.plot_arguments, - "solution variables" => visualization_callback.solution_variables, - "variable names" => visualization_callback.variable_names, - "show mesh" => visualization_callback.show_mesh, - "plot creator" => visualization_callback.plot_creator, - "plot data creator" => visualization_callback.plot_data_creator, - ] + setup = ["interval" => visualization_callback.interval, + "plot arguments" => visualization_callback.plot_arguments, + "solution variables" => visualization_callback.solution_variables, + "variable names" => visualization_callback.variable_names, + "show mesh" => visualization_callback.show_mesh, + "plot creator" => visualization_callback.plot_creator, + "plot data creator" => visualization_callback.plot_data_creator] summary_box(io, "VisualizationCallback", setup) end end diff --git a/src/meshes/p4est_mesh.jl b/src/meshes/p4est_mesh.jl index abe9d9345b5..9962dad6082 100644 --- a/src/meshes/p4est_mesh.jl +++ b/src/meshes/p4est_mesh.jl @@ -103,11 +103,9 @@ function Base.show(io::IO, ::MIME"text/plain", mesh::P4estMesh) if get(io, :compact, false) show(io, mesh) else - setup = [ - "#trees" => ntrees(mesh), - "current #cells" => ncells(mesh), - "polydeg" => length(mesh.nodes) - 1, - ] + setup = ["#trees" => ntrees(mesh), + "current #cells" => ncells(mesh), + "polydeg" => length(mesh.nodes) - 1] summary_box(io, "P4estMesh{" * string(ndims(mesh)) * ", " * string(real(mesh)) * "}", setup) @@ -503,7 +501,7 @@ function parse_elements(meshfile, n_trees, n_dims) # Valid element types (that can be processed by p4est) based on dimension element_types = n_dims == 2 ? ["*ELEMENT, type=CPS4", "*ELEMENT, type=C2D4", - "*ELEMENT, type=S4"] : ["*ELEMENT, type=C3D8"] + "*ELEMENT, type=S4"] : ["*ELEMENT, type=C3D8"] # 2D quads: 4 nodes + element index, 3D hexes: 8 nodes + element index expected_content_length = n_dims == 2 ? 5 : 9 diff --git a/src/meshes/t8code_mesh.jl b/src/meshes/t8code_mesh.jl index cb2ac787e14..f912f206031 100644 --- a/src/meshes/t8code_mesh.jl +++ b/src/meshes/t8code_mesh.jl @@ -89,11 +89,9 @@ function Base.show(io::IO, ::MIME"text/plain", mesh::T8codeMesh) if get(io, :compact, false) show(io, mesh) else - setup = [ - "#trees" => ntrees(mesh), - "current #cells" => ncells(mesh), - "polydeg" => length(mesh.nodes) - 1, - ] + setup = ["#trees" => ntrees(mesh), + "current #cells" => ncells(mesh), + "polydeg" => length(mesh.nodes) - 1] summary_box(io, "T8codeMesh{" * string(ndims(mesh)) * ", " * string(real(mesh)) * "}", setup) @@ -819,14 +817,13 @@ function fill_mesh_info!(mesh::T8codeMesh, interfaces, mortars, boundaries, # Works for quads and hexs only. This mapping is needed in the MPI mortar # sections below. map_iface_to_ichild_to_position = [ - # 0 1 2 3 4 5 6 7 ichild/iface - [1, 0, 2, 0, 3, 0, 4, 0], # 0 - [0, 1, 0, 2, 0, 3, 0, 4], # 1 - [1, 2, 0, 0, 3, 4, 0, 0], # 2 - [0, 0, 1, 2, 0, 0, 3, 4], # 3 - [1, 2, 3, 4, 0, 0, 0, 0], # 4 - [0, 0, 0, 0, 1, 2, 3, 4], # 5 - ] + # 0 1 2 3 4 5 6 7 ichild/iface + [1, 0, 2, 0, 3, 0, 4, 0], # 0 + [0, 1, 0, 2, 0, 3, 0, 4], # 1 + [1, 2, 0, 0, 3, 4, 0, 0], # 2 + [0, 0, 1, 2, 0, 0, 3, 4], # 3 + [1, 2, 3, 4, 0, 0, 0, 0], # 4 + [0, 0, 0, 0, 1, 2, 3, 4]] # Helper variables to compute unique global MPI interface/mortar ids. max_level = t8_forest_get_maxlevel(mesh.forest) #UInt64 @@ -1077,20 +1074,15 @@ function fill_mesh_info!(mesh::T8codeMesh, interfaces, mortars, boundaries, push!(visited_global_mortar_ids, global_mortar_id) global_mortar_id_to_local[global_mortar_id] = local_mpi_mortar_id - mpi_mesh_info.mpi_mortars.local_neighbor_ids[local_mpi_mortar_id] = [ - current_index + 1, - ] - mpi_mesh_info.mpi_mortars.local_neighbor_positions[local_mpi_mortar_id] = [ - map_iface_to_ichild_to_position[iface + 1][t8_element_child_id(eclass_scheme, element) + 1], - ] + mpi_mesh_info.mpi_mortars.local_neighbor_ids[local_mpi_mortar_id] = [current_index + + 1] + mpi_mesh_info.mpi_mortars.local_neighbor_positions[local_mpi_mortar_id] = [map_iface_to_ichild_to_position[iface + 1][t8_element_child_id(eclass_scheme, element) + 1]] init_mortar_node_indices!(mpi_mesh_info.mpi_mortars, (iface, dual_faces[1]), orientation, local_mpi_mortar_id) - neighbor_ranks = [ - remotes[findlast(ghost_remote_first_elem .<= - neighbor_ielements[1])], - ] + neighbor_ranks = [remotes[findlast(ghost_remote_first_elem .<= + neighbor_ielements[1])]] mpi_mesh_info.neighbor_ranks_mortar[local_mpi_mortar_id] = neighbor_ranks mpi_mesh_info.global_mortar_ids[local_mpi_mortar_id] = global_mortar_id diff --git a/src/meshes/tree_mesh.jl b/src/meshes/tree_mesh.jl index 05699d17d16..7568c90f73b 100644 --- a/src/meshes/tree_mesh.jl +++ b/src/meshes/tree_mesh.jl @@ -194,14 +194,12 @@ function Base.show(io::IO, ::MIME"text/plain", if get(io, :compact, false) show(io, mesh) else - setup = [ - "center" => mesh.tree.center_level_0, - "length" => mesh.tree.length_level_0, - "periodicity" => mesh.tree.periodicity, - "current #cells" => mesh.tree.length, - "#leaf-cells" => count_leaf_cells(mesh.tree), - "maximum #cells" => mesh.tree.capacity, - ] + setup = ["center" => mesh.tree.center_level_0, + "length" => mesh.tree.length_level_0, + "periodicity" => mesh.tree.periodicity, + "current #cells" => mesh.tree.length, + "#leaf-cells" => count_leaf_cells(mesh.tree), + "maximum #cells" => mesh.tree.capacity] summary_box(io, "TreeMesh{" * string(NDIMS) * ", " * string(TreeType) * "}", setup) end diff --git a/src/semidiscretization/semidiscretization_euler_gravity.jl b/src/semidiscretization/semidiscretization_euler_gravity.jl index 4201344df80..44fe24c0939 100644 --- a/src/semidiscretization/semidiscretization_euler_gravity.jl +++ b/src/semidiscretization/semidiscretization_euler_gravity.jl @@ -54,13 +54,11 @@ function Base.show(io::IO, ::MIME"text/plain", parameters::ParametersEulerGravit if get(io, :compact, false) show(io, parameters) else - setup = [ - "background density (ρ₀)" => parameters.background_density, - "gravitational constant (G)" => parameters.gravitational_constant, - "CFL (gravity)" => parameters.cfl, - "max. #iterations" => parameters.n_iterations_max, - "time integrator" => parameters.timestep_gravity, - ] + setup = ["background density (ρ₀)" => parameters.background_density, + "gravitational constant (G)" => parameters.gravitational_constant, + "CFL (gravity)" => parameters.cfl, + "max. #iterations" => parameters.n_iterations_max, + "time integrator" => parameters.timestep_gravity] summary_box(io, "ParametersEulerGravity", setup) end end diff --git a/src/solvers/dg.jl b/src/solvers/dg.jl index 9b61df62cc3..91da29a0d74 100644 --- a/src/solvers/dg.jl +++ b/src/solvers/dg.jl @@ -85,9 +85,7 @@ function Base.show(io::IO, ::MIME"text/plain", integral::VolumeIntegralFluxDiffe if get(io, :compact, false) show(io, integral) else - setup = [ - "volume flux" => integral.volume_flux, - ] + setup = ["volume flux" => integral.volume_flux] summary_box(io, "VolumeIntegralFluxDifferencing", setup) end end @@ -177,9 +175,7 @@ function Base.show(io::IO, ::MIME"text/plain", if get(io, :compact, false) show(io, integral) else - setup = [ - "FV flux" => integral.volume_flux_fv, - ] + setup = ["FV flux" => integral.volume_flux_fv] summary_box(io, "VolumeIntegralPureLGLFiniteVolume", setup) end end @@ -274,9 +270,7 @@ function Base.show(io::IO, ::MIME"text/plain", integral::VolumeIntegralUpwind) if get(io, :compact, false) show(io, integral) else - setup = [ - "flux splitting" => integral.splitting, - ] + setup = ["flux splitting" => integral.splitting] summary_box(io, "VolumeIntegralUpwind", setup) end end @@ -314,9 +308,7 @@ function Base.show(io::IO, ::MIME"text/plain", integral::SurfaceIntegralWeakForm if get(io, :compact, false) show(io, integral) else - setup = [ - "surface flux" => integral.surface_flux, - ] + setup = ["surface flux" => integral.surface_flux] summary_box(io, "SurfaceIntegralWeakForm", setup) end end @@ -340,9 +332,7 @@ function Base.show(io::IO, ::MIME"text/plain", integral::SurfaceIntegralStrongFo if get(io, :compact, false) show(io, integral) else - setup = [ - "surface flux" => integral.surface_flux, - ] + setup = ["surface flux" => integral.surface_flux] summary_box(io, "SurfaceIntegralStrongForm", setup) end end @@ -371,9 +361,7 @@ function Base.show(io::IO, ::MIME"text/plain", integral::SurfaceIntegralUpwind) if get(io, :compact, false) show(io, integral) else - setup = [ - "flux splitting" => integral.splitting, - ] + setup = ["flux splitting" => integral.splitting] summary_box(io, "SurfaceIntegralUpwind", setup) end end diff --git a/src/solvers/dgsem_tree/indicators.jl b/src/solvers/dgsem_tree/indicators.jl index bb9109f2762..eb0d67a7e8c 100644 --- a/src/solvers/dgsem_tree/indicators.jl +++ b/src/solvers/dgsem_tree/indicators.jl @@ -92,12 +92,10 @@ end function Base.show(io::IO, ::MIME"text/plain", indicator::IndicatorHennemannGassner) @nospecialize indicator # reduce precompilation time - setup = [ - "indicator variable" => indicator.variable, - "max. α" => indicator.alpha_max, - "min. α" => indicator.alpha_min, - "smooth α" => (indicator.alpha_smooth ? "yes" : "no"), - ] + setup = ["indicator variable" => indicator.variable, + "max. α" => indicator.alpha_max, + "min. α" => indicator.alpha_min, + "smooth α" => (indicator.alpha_smooth ? "yes" : "no")] summary_box(io, "IndicatorHennemannGassner", setup) end @@ -167,12 +165,10 @@ function Base.show(io::IO, ::MIME"text/plain", if get(io, :compact, false) show(io, indicator) else - setup = [ - "indicator variable" => indicator.variable, - "max. α" => indicator.alpha_max, - "min. α" => indicator.alpha_min, - "smooth α" => (indicator.alpha_smooth ? "yes" : "no"), - ] + setup = ["indicator variable" => indicator.variable, + "max. α" => indicator.alpha_max, + "min. α" => indicator.alpha_min, + "smooth α" => (indicator.alpha_smooth ? "yes" : "no")] summary_box(io, "IndicatorHennemannGassnerShallowWater", setup) end end @@ -267,10 +263,8 @@ function Base.show(io::IO, ::MIME"text/plain", indicator::IndicatorLöhner) if get(io, :compact, false) show(io, indicator) else - setup = [ - "indicator variable" => indicator.variable, - "f_wave" => indicator.f_wave, - ] + setup = ["indicator variable" => indicator.variable, + "f_wave" => indicator.f_wave] summary_box(io, "IndicatorLöhner", setup) end end @@ -326,9 +320,7 @@ function Base.show(io::IO, ::MIME"text/plain", indicator::IndicatorMax) if get(io, :compact, false) show(io, indicator) else - setup = [ - "indicator variable" => indicator.variable, - ] + setup = ["indicator variable" => indicator.variable] summary_box(io, "IndicatorMax", setup) end end diff --git a/src/solvers/dgsem_tree/subcell_limiters.jl b/src/solvers/dgsem_tree/subcell_limiters.jl index e433c953779..5e1a1d99656 100644 --- a/src/solvers/dgsem_tree/subcell_limiters.jl +++ b/src/solvers/dgsem_tree/subcell_limiters.jl @@ -150,23 +150,17 @@ function Base.show(io::IO, ::MIME"text/plain", limiter::SubcellLimiterIDP) else setup = ["limiter" => ""] if local_minmax - setup = [ - setup..., - "" => "Local maximum/minimum limiting for conservative variables $(limiter.local_minmax_variables_cons)", - ] + setup = [setup..., + "" => "Local maximum/minimum limiting for conservative variables $(limiter.local_minmax_variables_cons)"] end if positivity string = "Positivity limiting for conservative variables $(limiter.positivity_variables_cons) and $(limiter.positivity_variables_nonlinear)" setup = [setup..., "" => string] - setup = [ - setup..., - "" => "- with positivity correction factor = $(limiter.positivity_correction_factor)", - ] + setup = [setup..., + "" => "- with positivity correction factor = $(limiter.positivity_correction_factor)"] end - setup = [ - setup..., - "Local bounds" => "FV solution", - ] + setup = [setup..., + "Local bounds" => "FV solution"] end summary_box(io, "SubcellLimiterIDP", setup) end diff --git a/test/test_aqua.jl b/test/test_aqua.jl index 93457caba28..b76674ef3b0 100644 --- a/test/test_aqua.jl +++ b/test/test_aqua.jl @@ -12,7 +12,7 @@ include("test_trixi.jl") # exceptions necessary for adding a new method `StartUpDG.estimate_h` # in src/solvers/dgmulti/sbp.jl piracies = (treat_as_own = [Trixi.StartUpDG.RefElemData, - Trixi.StartUpDG.MeshData],)) + Trixi.StartUpDG.MeshData],)) end end #module diff --git a/test/test_dgmulti_1d.jl b/test/test_dgmulti_1d.jl index 0363086341f..635cca3112a 100644 --- a/test/test_dgmulti_1d.jl +++ b/test/test_dgmulti_1d.jl @@ -33,16 +33,12 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_flux_diff.jl"), cells_per_dimension=(16,), # division by sqrt(2.0) corresponds to normalization by the square root of the size of the domain - l2=[ - 7.853842541289665e-7, + l2=[7.853842541289665e-7, 9.609905503440606e-7, - 2.832322219966481e-6, - ] ./ sqrt(2.0), - linf=[ - 1.5003758788711963e-6, - 1.802998748523521e-6, - 4.83599270806323e-6, - ]) + 2.832322219966481e-6] ./ sqrt(2.0), + linf=[1.5003758788711963e-6, + 1.802998748523521e-6, + 4.83599270806323e-6]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -74,16 +70,12 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_flux_diff.jl"), cells_per_dimension=(16,), approximation_type=SBP(), - l2=[ - 6.437827414849647e-6, + l2=[6.437827414849647e-6, 2.1840558851820947e-6, - 1.3245669629438228e-5, - ], - linf=[ - 2.0715843751295537e-5, - 8.519520630301258e-6, - 4.2642194098885255e-5, - ]) + 1.3245669629438228e-5], + linf=[2.0715843751295537e-5, + 8.519520630301258e-6, + 4.2642194098885255e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -103,16 +95,12 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_flux_diff.jl"), cells_per_dimension=(4,), approximation_type=D, - l2=[ - 1.8684509287853788e-5, + l2=[1.8684509287853788e-5, 1.0641411823379635e-5, - 5.178010291876143e-5, - ], - linf=[ - 6.933493585936645e-5, - 3.0277366229292113e-5, - 0.0002220020568932668, - ]) + 5.178010291876143e-5], + linf=[6.933493585936645e-5, + 3.0277366229292113e-5, + 0.0002220020568932668]) show(stdout, semi.solver.basis) show(stdout, MIME"text/plain"(), semi.solver.basis) # Ensure that we do not have excessive memory allocations @@ -127,16 +115,12 @@ end @trixi_testset "elixir_euler_fdsbp_periodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_fdsbp_periodic.jl"), - l2=[ - 9.146929180585711e-7, + l2=[9.146929180585711e-7, 1.8997616878017292e-6, - 3.991417702211889e-6, - ], - linf=[ - 1.7321089884614338e-6, - 3.3252888855805907e-6, - 6.5252787737613005e-6, - ]) + 3.991417702211889e-6], + linf=[1.7321089884614338e-6, + 3.3252888855805907e-6, + 6.5252787737613005e-6]) show(stdout, semi.solver.basis) show(stdout, MIME"text/plain"(), semi.solver.basis) # Ensure that we do not have excessive memory allocations @@ -168,18 +152,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallow_water_quasi_1d.jl"), cells_per_dimension=(8,), approximation_type=SBP(), - l2=[ - 3.03001101100507e-6, + l2=[3.03001101100507e-6, 1.692177335948727e-5, 3.002634351734614e-16, - 1.1636653574178203e-15, - ], - linf=[ - 1.2043401988570679e-5, - 5.346847010329059e-5, - 9.43689570931383e-16, - 2.220446049250313e-15, - ]) + 1.1636653574178203e-15], + linf=[1.2043401988570679e-5, + 5.346847010329059e-5, + 9.43689570931383e-16, + 2.220446049250313e-15]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -194,18 +174,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_quasi_1d.jl"), cells_per_dimension=(8,), approximation_type=SBP(), - l2=[ - 1.633271343738687e-5, + l2=[1.633271343738687e-5, 9.575385661756332e-6, 1.2700331443128421e-5, - 0.0, - ], - linf=[ - 7.304984704381567e-5, - 5.2365944135601694e-5, - 6.469559594934893e-5, - 0.0, - ]) + 0.0], + linf=[7.304984704381567e-5, + 5.2365944135601694e-5, + 6.469559594934893e-5, + 0.0]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_dgmulti_2d.jl b/test/test_dgmulti_2d.jl index 892c8ed37f0..97135b59b19 100644 --- a/test/test_dgmulti_2d.jl +++ b/test/test_dgmulti_2d.jl @@ -18,18 +18,14 @@ isdir(outdir) && rm(outdir, recursive = true) @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_weakform.jl"), cells_per_dimension=(4, 4), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.0013536930300254945, + l2=[0.0013536930300254945, 0.0014315603442106193, 0.001431560344211359, - 0.0047393341007602625, - ] ./ 2.0, - linf=[ - 0.001514260921466004, - 0.0020623991944839215, - 0.002062399194485476, - 0.004897700392503701, - ]) + 0.0047393341007602625] ./ 2.0, + linf=[0.001514260921466004, + 0.0020623991944839215, + 0.002062399194485476, + 0.004897700392503701]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -45,18 +41,14 @@ end cells_per_dimension=(4, 4), approximation_type=SBP(), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.0074706882014934735, + l2=[0.0074706882014934735, 0.005306220583603261, 0.005306220583613591, - 0.014724842607716771, - ] ./ 2.0, - linf=[ - 0.021563604940952885, - 0.01359397832530762, - 0.013593978324845324, - 0.03270995869587523, - ]) + 0.014724842607716771] ./ 2.0, + linf=[0.021563604940952885, + 0.01359397832530762, + 0.013593978324845324, + 0.03270995869587523]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -72,18 +64,14 @@ end cells_per_dimension=(4, 4), element_type=Quad(), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.00031892254415307093, + l2=[0.00031892254415307093, 0.00033637562986771894, 0.0003363756298680649, - 0.0011100259064243145, - ] ./ 2.0, - linf=[ - 0.001073298211445639, - 0.0013568139808282087, - 0.0013568139808290969, - 0.0032249020004324613, - ]) + 0.0011100259064243145] ./ 2.0, + linf=[0.001073298211445639, + 0.0013568139808282087, + 0.0013568139808290969, + 0.0032249020004324613]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -100,18 +88,14 @@ end volume_integral=VolumeIntegralFluxDifferencing(flux_ranocha), surface_integral=SurfaceIntegralWeakForm(flux_ranocha), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.007801417730672109, + l2=[0.007801417730672109, 0.00708583561714128, 0.0070858356171393, - 0.015217574294198809, - ] ./ 2.0, - linf=[ - 0.011572828457858897, - 0.013965298735070686, - 0.01396529873508534, - 0.04227683691807904, - ]) + 0.015217574294198809] ./ 2.0, + linf=[0.011572828457858897, + 0.013965298735070686, + 0.01396529873508534, + 0.04227683691807904]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -129,18 +113,14 @@ end surface_integral=SurfaceIntegralWeakForm(flux_ranocha), approximation_type=SBP(), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.01280067571168776, + l2=[0.01280067571168776, 0.010607599608273302, 0.010607599608239775, - 0.026408338014056548, - ] ./ 2.0, - linf=[ - 0.037983023185674814, - 0.05321027922533417, - 0.05321027922608157, - 0.13392025411844033, - ]) + 0.026408338014056548] ./ 2.0, + linf=[0.037983023185674814, + 0.05321027922533417, + 0.05321027922608157, + 0.13392025411844033]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -159,18 +139,14 @@ end surface_integral=SurfaceIntegralWeakForm(flux_ranocha), approximation_type=SBP(), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.0029373718090697975, + l2=[0.0029373718090697975, 0.0030629360605489465, 0.003062936060545615, - 0.0068486089344859755, - ] ./ 2.0, - linf=[ - 0.01360165305316885, - 0.01267402847925303, - 0.012674028479251254, - 0.02210545278615017, - ]) + 0.0068486089344859755] ./ 2.0, + linf=[0.01360165305316885, + 0.01267402847925303, + 0.012674028479251254, + 0.02210545278615017]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -183,18 +159,14 @@ end @trixi_testset "elixir_euler_bilinear.jl (Bilinear quadrilateral elements, SBP, flux differencing)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_bilinear.jl"), - l2=[ - 1.0259435706215337e-5, + l2=[1.0259435706215337e-5, 9.014090233720625e-6, 9.014090233223014e-6, - 2.738953587401793e-5, - ], - linf=[ - 7.362609083649829e-5, - 6.874188055272512e-5, - 6.874188052830021e-5, - 0.0001912435192696904, - ]) + 2.738953587401793e-5], + linf=[7.362609083649829e-5, + 6.874188055272512e-5, + 6.874188052830021e-5, + 0.0001912435192696904]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -207,18 +179,14 @@ end @trixi_testset "elixir_euler_curved.jl (Quadrilateral elements, SBP, flux differencing)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_curved.jl"), - l2=[ - 1.720476068165337e-5, + l2=[1.720476068165337e-5, 1.592168205710526e-5, 1.592168205812963e-5, - 4.894094865697305e-5, - ], - linf=[ - 0.00010525416930584619, - 0.00010003778091061122, - 0.00010003778085621029, - 0.00036426282101720275, - ]) + 4.894094865697305e-5], + linf=[0.00010525416930584619, + 0.00010003778091061122, + 0.00010003778085621029, + 0.00036426282101720275]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -232,18 +200,14 @@ end @trixi_testset "elixir_euler_curved.jl (Quadrilateral elements, GaussSBP, flux differencing)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_curved.jl"), approximation_type=GaussSBP(), - l2=[ - 3.4666312079259457e-6, + l2=[3.4666312079259457e-6, 3.4392774480368986e-6, 3.439277447953705e-6, - 1.0965598424665836e-5, - ], - linf=[ - 1.1327280377004811e-5, - 1.1343911926253725e-5, - 1.1343911906935844e-5, - 3.679582619220412e-5, - ], + 1.0965598424665836e-5], + linf=[1.1327280377004811e-5, + 1.1343911926253725e-5, + 1.1343911906935844e-5, + 3.679582619220412e-5], rtol=2 * sqrt(eps())) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -259,18 +223,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_curved.jl"), element_type=Tri(), approximation_type=Polynomial(), volume_integral=VolumeIntegralWeakForm(), - l2=[ - 7.905498158659466e-6, + l2=[7.905498158659466e-6, 8.731690809663625e-6, 8.731690811576996e-6, - 2.9113296018693953e-5, - ], - linf=[ - 3.298811230090237e-5, - 4.032272476939269e-5, - 4.032272526011127e-5, - 0.00012013725458537294, - ]) + 2.9113296018693953e-5], + linf=[3.298811230090237e-5, + 4.032272476939269e-5, + 4.032272526011127e-5, + 0.00012013725458537294]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -283,18 +243,14 @@ end @trixi_testset "elixir_euler_hohqmesh.jl (Quadrilateral elements, SBP, flux differencing)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_hohqmesh.jl"), - l2=[ - 0.0008153911341517156, + l2=[0.0008153911341517156, 0.0007768159701964676, 0.00047902606811690694, - 0.0015551846076348535, - ], - linf=[ - 0.0029301131365355726, - 0.0034427051471457304, - 0.0028721569841545502, - 0.011125365074589944, - ]) + 0.0015551846076348535], + linf=[0.0029301131365355726, + 0.0034427051471457304, + 0.0028721569841545502, + 0.011125365074589944]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -310,12 +266,10 @@ end joinpath(EXAMPLES_DIR, "elixir_euler_weakform.jl"), 2) @test isapprox(mean_convergence[:l2], - [ - 4.243843382379403, - 4.128314378833922, - 4.128314378397532, - 4.081366752807379, - ], rtol = 0.05) + [4.243843382379403, + 4.128314378833922, + 4.128314378397532, + 4.081366752807379], rtol = 0.05) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -329,18 +283,14 @@ end @trixi_testset "elixir_euler_weakform_periodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_weakform_periodic.jl"), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.0014986508075708323, + l2=[0.0014986508075708323, 0.001528523420746786, 0.0015285234207473158, - 0.004846505183839211, - ] ./ 2.0, - linf=[ - 0.0015062108658376872, - 0.0019373508504645365, - 0.0019373508504538783, - 0.004742686826709086, - ]) + 0.004846505183839211] ./ 2.0, + linf=[0.0015062108658376872, + 0.0019373508504645365, + 0.0019373508504538783, + 0.004742686826709086]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -353,18 +303,14 @@ end @trixi_testset "elixir_euler_triangulate_pkg_mesh.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_triangulate_pkg_mesh.jl"), - l2=[ - 2.344080455438114e-6, + l2=[2.344080455438114e-6, 1.8610038753097983e-6, 2.4095165666095305e-6, - 6.373308158814308e-6, - ], - linf=[ - 2.5099852761334418e-5, - 2.2683684021362893e-5, - 2.6180448559287584e-5, - 5.5752932611508044e-5, - ]) + 6.373308158814308e-6], + linf=[2.5099852761334418e-5, + 2.2683684021362893e-5, + 2.6180448559287584e-5, + 5.5752932611508044e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -380,18 +326,14 @@ end "elixir_euler_kelvin_helmholtz_instability.jl"), cells_per_dimension=(32, 32), tspan=(0.0, 0.2), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.11140378947116614, + l2=[0.11140378947116614, 0.06598161188703612, 0.10448953167839563, - 0.16023209181809595, - ] ./ 2.0, - linf=[ - 0.24033843177853664, - 0.1659992245272325, - 0.1235468309508845, - 0.26911424973147735, - ]) + 0.16023209181809595] ./ 2.0, + linf=[0.24033843177853664, + 0.1659992245272325, + 0.1235468309508845, + 0.26911424973147735]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -408,18 +350,14 @@ end cells_per_dimension=(32, 32), element_type=Quad(), approximation_type=GaussSBP(), tspan=(0.0, 0.2), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.11141270656347146, + l2=[0.11141270656347146, 0.06598888014584121, 0.1044902203749932, - 0.16023037364774995, - ] ./ 2.0, - linf=[ - 0.2414760062126462, - 0.1662111846065654, - 0.12344140473946856, - 0.26978428189564774, - ]) + 0.16023037364774995] ./ 2.0, + linf=[0.2414760062126462, + 0.1662111846065654, + 0.12344140473946856, + 0.26978428189564774]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -434,18 +372,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_rayleigh_taylor_instability.jl"), cells_per_dimension=(8, 8), tspan=(0.0, 0.2), - l2=[ - 0.0709665896982514, + l2=[0.0709665896982514, 0.005182828752164663, 0.013832655585206478, - 0.03247013800580221, - ], - linf=[ - 0.4783963902824797, - 0.022527207050681054, - 0.040307056293369226, - 0.0852365428206836, - ]) + 0.03247013800580221], + linf=[0.4783963902824797, + 0.022527207050681054, + 0.040307056293369226, + 0.0852365428206836]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -459,18 +393,14 @@ end @trixi_testset "elixir_euler_brown_minion_vortex.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_brown_minion_vortex.jl"), cells_per_dimension=4, tspan=(0.0, 0.1), - l2=[ - 0.006680001611078062, + l2=[0.006680001611078062, 0.02151676347585447, 0.010696524235364626, - 0.15052841129694647, - ], - linf=[ - 0.01544756362800248, - 0.09517304772476806, - 0.021957154972646383, - 0.33773439650806303, - ]) + 0.15052841129694647], + linf=[0.01544756362800248, + 0.09517304772476806, + 0.021957154972646383, + 0.33773439650806303]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -484,18 +414,14 @@ end @trixi_testset "elixir_euler_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), cells_per_dimension=4, tspan=(0.0, 0.1), - l2=[ - 0.05685148333985476, + l2=[0.05685148333985476, 0.04308122135907089, 0.043081221359070915, - 0.21098131003847664, - ], - linf=[ - 0.2360672306096051, - 0.16684417686971842, - 0.1668441768697189, - 0.8572572782118661, - ]) + 0.21098131003847664], + linf=[0.2360672306096051, + 0.16684417686971842, + 0.1668441768697189, + 0.8572572782118661]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -509,18 +435,14 @@ end @trixi_testset "elixir_euler_shockcapturing_curved.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing_curved.jl"), cells_per_dimension=4, tspan=(0.0, 0.1), - l2=[ - 0.05565849298766252, + l2=[0.05565849298766252, 0.042322816017256494, 0.042322816017256466, - 0.2064212098324083, - ], - linf=[ - 0.23633287875008924, - 0.16930148707515683, - 0.16930148707515688, - 0.8587706761131937, - ]) + 0.2064212098324083], + linf=[0.23633287875008924, + 0.16930148707515683, + 0.16930148707515688, + 0.8587706761131937]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -543,18 +465,14 @@ end cfl=1.0, approximation_type=D, # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.0008966318978421226, + l2=[0.0008966318978421226, 0.0011418826379110242, 0.001141882637910878, - 0.0030918374335671393, - ] ./ 2.0, - linf=[ - 0.0015281525343109337, - 0.00162430960401716, - 0.0016243096040242655, - 0.004447503691245913, - ]) + 0.0030918374335671393] ./ 2.0, + linf=[0.0015281525343109337, + 0.00162430960401716, + 0.0016243096040242655, + 0.004447503691245913]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -579,18 +497,14 @@ end volume_integral=VolumeIntegralFluxDifferencing(flux_ranocha), surface_integral=SurfaceIntegralWeakForm(flux_ranocha), # division by 2.0 corresponds to normalization by the square root of the size of the domain - l2=[ - 0.0014018725496871129, + l2=[0.0014018725496871129, 0.0015887007320868913, 0.001588700732086329, - 0.003870926821031202, - ] ./ 2.0, - linf=[ - 0.0029541996523780867, - 0.0034520465226108854, - 0.003452046522624652, - 0.007677153211004928, - ]) + 0.003870926821031202] ./ 2.0, + linf=[0.0029541996523780867, + 0.0034520465226108854, + 0.003452046522624652, + 0.007677153211004928]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -603,18 +517,14 @@ end @trixi_testset "elixir_euler_fdsbp_periodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_fdsbp_periodic.jl"), - l2=[ - 1.3333320340010056e-6, + l2=[1.3333320340010056e-6, 2.044834627970641e-6, 2.044834627855601e-6, - 5.282189803559564e-6, - ], - linf=[ - 2.7000151718858945e-6, - 3.988595028259212e-6, - 3.9885950273710336e-6, - 8.848583042286862e-6, - ]) + 5.282189803559564e-6], + linf=[2.7000151718858945e-6, + 3.988595028259212e-6, + 3.9885950273710336e-6, + 8.848583042286862e-6]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -628,18 +538,14 @@ end @trixi_testset "elixir_euler_fdsbp_periodic.jl (arbitrary reference domain)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_fdsbp_periodic.jl"), xmin=-200.0, xmax=100.0, #= parameters for reference interval =# - l2=[ - 1.333332034149886e-6, + l2=[1.333332034149886e-6, 2.0448346280892024e-6, 2.0448346279766305e-6, - 5.282189803510037e-6, - ], - linf=[ - 2.700015170553627e-6, - 3.988595024262409e-6, - 3.988595024928543e-6, - 8.84858303740188e-6, - ]) + 5.282189803510037e-6], + linf=[2.700015170553627e-6, + 3.988595024262409e-6, + 3.988595024928543e-6, + 8.84858303740188e-6]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -659,18 +565,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_fdsbp_periodic.jl"), approximation_type=D, coordinates_min=(-3.0, -4.0), coordinates_max=(0.0, -1.0), - l2=[ - 0.07318831033918516, + l2=[0.07318831033918516, 0.10039910610067465, 0.1003991061006748, - 0.2642450566234564, - ], - linf=[ - 0.36081081739439735, - 0.5244468027020845, - 0.5244468027020814, - 1.2210130256735705, - ]) + 0.2642450566234564], + linf=[0.36081081739439735, + 0.5244468027020845, + 0.5244468027020814, + 1.2210130256735705]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -691,18 +593,14 @@ end global D = SummationByPartsOperators.couple_continuously(D_local, mesh_local) @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_fdsbp_periodic.jl"), approximation_type=D, - l2=[ - 1.5440402410017893e-5, + l2=[1.5440402410017893e-5, 1.4913189903083485e-5, 1.4913189902797073e-5, - 2.6104615985156992e-5, - ], - linf=[ - 4.16334345412217e-5, - 5.067812788173143e-5, - 5.067812786885284e-5, - 9.887976803746312e-5, - ]) + 2.6104615985156992e-5], + linf=[4.16334345412217e-5, + 5.067812788173143e-5, + 5.067812786885284e-5, + 9.887976803746312e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -722,10 +620,11 @@ end 0.019195256934310016, 0.027856113419468087, 0.0016567799774264065], linf=[0.16447597822733662, 0.244157345789029, - 0.24415734578903472, 0.11982440036793476, - 0.7450328339751362, 0.06357382685763713, 0.0635738268576378, - 0.1058830287485999, - 0.005740591170062146]) + 0.24415734578903472, 0.11982440036793476, + 0.7450328339751362, 0.06357382685763713, + 0.0635738268576378, + 0.1058830287485999, + 0.005740591170062146]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -745,10 +644,10 @@ end 0.015716300366652128, 0.022365252076279075, 0.0009232971979900358], linf=[0.16290247390873458, 0.2256891306641319, - 0.2256891306641336, 0.09476017042552534, - 0.6906308908961734, 0.05349939593012487, - 0.05349939593013042, 0.08830587480616725, - 0.0029551359803035027]) + 0.2256891306641336, 0.09476017042552534, + 0.6906308908961734, 0.05349939593012487, + 0.05349939593013042, 0.08830587480616725, + 0.0029551359803035027]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -773,10 +672,10 @@ end 0.07371172293240634, 0.10782032253431281, 0.004921676235111545] ./ 2.0, linf=[0.1765644464978685, 0.2627803272865769, - 0.26358136695848144, 0.12347681727447984, - 0.7733289736898254, 0.06695360844467957, - 0.06650382120802623, 0.10885097000919097, - 0.007212567638078835]) + 0.26358136695848144, 0.12347681727447984, + 0.7733289736898254, 0.06695360844467957, + 0.06650382120802623, 0.10885097000919097, + 0.007212567638078835]) end @trixi_testset "elixir_mhd_weak_blast_wave_SBP.jl (Tri)" begin @@ -794,17 +693,16 @@ end 0.07733438386480523, 0.109893463921706, 0.00617678167062838] ./ 2.0, linf=[0.22701306227317952, 0.2905255794821543, - 0.2912409425436937, 0.08051361477962096, - 1.0842974228656006, 0.07866000368926784, - 0.0786646354518149, 0.1614896380292925, - 0.010358210347485542]) + 0.2912409425436937, 0.08051361477962096, + 1.0842974228656006, 0.07866000368926784, + 0.0786646354518149, 0.1614896380292925, + 0.010358210347485542]) end @trixi_testset "elixir_mhd_reflective_wall.jl (Quad)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_reflective_wall.jl"), cells_per_dimension=4, - l2=[ - 0.0036019536614619687, + l2=[0.0036019536614619687, 0.001734097206958611, 0.008375221008997178, 0.0, @@ -812,19 +710,16 @@ end 0.0018573693138866614, 0.0020807798141551166, 0.0, - 5.301188920230166e-5, - ], - linf=[ - 0.01692601228199253, - 0.009369662298436778, - 0.04145169295835428, - 0.0, - 0.11569908670112738, - 0.00984964453299233, - 0.01141708032148614, - 0.0, - 0.0002992631411931389, - ]) + 5.301188920230166e-5], + linf=[0.01692601228199253, + 0.009369662298436778, + 0.04145169295835428, + 0.0, + 0.11569908670112738, + 0.00984964453299233, + 0.01141708032148614, + 0.0, + 0.0002992631411931389]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -839,18 +734,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), cells_per_dimension=8, element_type=Quad(), approximation_type=SBP(), - l2=[ - 0.0020316462913319046, + l2=[0.0020316462913319046, 0.023669019044882247, 0.03446194752754684, - 1.9333465252381796e-15, - ], - linf=[ - 0.010385010095182778, - 0.08750628939565086, - 0.12088392994348407, - 9.325873406851315e-15, - ]) + 1.9333465252381796e-15], + linf=[0.010385010095182778, + 0.08750628939565086, + 0.12088392994348407, + 9.325873406851315e-15]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -865,18 +756,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), cells_per_dimension=8, element_type=Tri(), approximation_type=SBP(), - l2=[ - 0.004180680322490383, + l2=[0.004180680322490383, 0.07026192411558974, 0.11815151697006446, - 2.329788936151192e-15, - ], - linf=[ - 0.02076003852980346, - 0.29169601664914424, - 0.5674183379872275, - 1.1546319456101628e-14, - ]) + 2.329788936151192e-15], + linf=[0.02076003852980346, + 0.29169601664914424, + 0.5674183379872275, + 1.1546319456101628e-14]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -893,18 +780,14 @@ end approximation_type=Polynomial(), # The last l2, linf error are the L2 projection error in approximating `b`, so they are not # zero for general non-collocated quadrature rules (e.g., for `element_type=Tri()`, `polydeg > 2`). - l2=[ - 0.0008309356912456799, + l2=[0.0008309356912456799, 0.01522451288799231, 0.016033969387208476, - 1.2820247308150876e-5, - ], - linf=[ - 0.001888045014140971, - 0.05466838692127718, - 0.06345885709961152, - 3.3989933098554914e-5, - ]) + 1.2820247308150876e-5], + linf=[0.001888045014140971, + 0.05466838692127718, + 0.06345885709961152, + 3.3989933098554914e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -923,18 +806,14 @@ end # for `Quad()` elements with `Polynomial()` approximations because the quadrature rule defaults to # a `(polydeg + 1)`-point Gauss quadrature rule in each coordinate (in general, StartUpDG.jl defaults # to the quadrature rule with the fewest number of points which exactly integrates the mass matrix). - l2=[ - 7.460461950323111e-5, + l2=[7.460461950323111e-5, 0.003685589808444905, 0.0039101604749887785, - 2.0636891126652983e-15, - ], - linf=[ - 0.000259995400729629, - 0.0072236204211630906, - 0.010364675200833062, - 1.021405182655144e-14, - ]) + 2.0636891126652983e-15], + linf=[0.000259995400729629, + 0.0072236204211630906, + 0.010364675200833062, + 1.021405182655144e-14]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_dgmulti_3d.jl b/test/test_dgmulti_3d.jl index 3a1db255484..180fe9d2575 100644 --- a/test/test_dgmulti_3d.jl +++ b/test/test_dgmulti_3d.jl @@ -18,20 +18,16 @@ isdir(outdir) && rm(outdir, recursive = true) @trixi_testset "elixir_euler_weakform.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_weakform.jl"), # division by sqrt(8.0) corresponds to normalization by the square root of the size of the domain - l2=[ - 0.0010029534292051608, + l2=[0.0010029534292051608, 0.0011682205957721673, 0.001072975385793516, 0.000997247778892257, - 0.0039364354651358294, - ] ./ sqrt(8), - linf=[ - 0.003660737033303718, - 0.005625620600749226, - 0.0030566354814669516, - 0.0041580358824311325, - 0.019326660236036464, - ]) + 0.0039364354651358294] ./ sqrt(8), + linf=[0.003660737033303718, + 0.005625620600749226, + 0.0030566354814669516, + 0.0041580358824311325, + 0.019326660236036464]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -47,20 +43,16 @@ end surface_integral=SurfaceIntegralWeakForm(flux_ranocha), volume_integral=VolumeIntegralFluxDifferencing(flux_ranocha), # division by sqrt(8.0) corresponds to normalization by the square root of the size of the domain - l2=[ - 0.014932088450136542, + l2=[0.014932088450136542, 0.017080219613061526, 0.016589517840793006, 0.015905000907070196, - 0.03903416208587798, - ] ./ sqrt(8), - linf=[ - 0.06856547797256729, - 0.08225664880340489, - 0.06925055630951782, - 0.06913016119820181, - 0.19161418499621874, - ]) + 0.03903416208587798] ./ sqrt(8), + linf=[0.06856547797256729, + 0.08225664880340489, + 0.06925055630951782, + 0.06913016119820181, + 0.19161418499621874]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -75,20 +67,16 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_weakform.jl"), element_type=Hex(), # division by sqrt(8.0) corresponds to normalization by the square root of the size of the domain - l2=[ - 0.00030580190715769566, + l2=[0.00030580190715769566, 0.00040146357607439464, 0.00040146357607564597, 0.000401463576075708, - 0.0015749412434154315, - ] ./ sqrt(8), - linf=[ - 0.00036910287847780054, - 0.00042659774184228283, - 0.0004265977427213574, - 0.00042659774250686233, - 0.00143803344597071, - ]) + 0.0015749412434154315] ./ sqrt(8), + linf=[0.00036910287847780054, + 0.00042659774184228283, + 0.0004265977427213574, + 0.00042659774250686233, + 0.00143803344597071]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -101,20 +89,16 @@ end @trixi_testset "elixir_euler_curved.jl (Hex elements, SBP, flux differencing)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_curved.jl"), - l2=[ - 0.018354883045936066, + l2=[0.018354883045936066, 0.024412704052042846, 0.024408520416087945, 0.01816314570880129, - 0.039342805507972006, - ], - linf=[ - 0.14862225990775757, - 0.28952368161864683, - 0.2912054484817035, - 0.1456603133854122, - 0.3315354586775472, - ]) + 0.039342805507972006], + linf=[0.14862225990775757, + 0.28952368161864683, + 0.2912054484817035, + 0.1456603133854122, + 0.3315354586775472]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -128,20 +112,16 @@ end @trixi_testset "elixir_euler_curved.jl (Hex elements, GaussSBP, flux differencing)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_curved.jl"), approximation_type=GaussSBP(), - l2=[ - 0.002631131519508634, + l2=[0.002631131519508634, 0.0029144224044954105, 0.002913889110662827, 0.002615140832314194, - 0.006881528610614373, - ], - linf=[ - 0.020996114874140215, - 0.021314522450134543, - 0.021288322783006297, - 0.020273381695435244, - 0.052598740390024545, - ]) + 0.006881528610614373], + linf=[0.020996114874140215, + 0.021314522450134543, + 0.021288322783006297, + 0.020273381695435244, + 0.052598740390024545]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -155,20 +135,16 @@ end @trixi_testset "elixir_euler_weakform_periodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_weakform_periodic.jl"), # division by sqrt(8.0) corresponds to normalization by the square root of the size of the domain - l2=[ - 0.0010317074322517949, + l2=[0.0010317074322517949, 0.0012277090547035293, 0.0011273991123913515, 0.0010418496196130177, - 0.004058878478404962, - ] ./ sqrt(8), - linf=[ - 0.003227752881827861, - 0.005620317864620361, - 0.0030514833972379307, - 0.003987027618439498, - 0.019282224709831652, - ]) + 0.004058878478404962] ./ sqrt(8), + linf=[0.003227752881827861, + 0.005620317864620361, + 0.0030514833972379307, + 0.003987027618439498, + 0.019282224709831652]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -183,20 +159,16 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_weakform_periodic.jl"), element_type=Hex(), # division by sqrt(8.0) corresponds to normalization by the square root of the size of the domain - l2=[ - 0.00034230612468547436, + l2=[0.00034230612468547436, 0.00044397204714598747, 0.0004439720471461567, 0.0004439720471464591, - 0.0016639410646990126, - ] ./ sqrt(8), - linf=[ - 0.0003674374460325147, - 0.0004253921341716982, - 0.0004253921340786615, - 0.0004253921340831024, - 0.0014333414071048267, - ]) + 0.0016639410646990126] ./ sqrt(8), + linf=[0.0003674374460325147, + 0.0004253921341716982, + 0.0004253921340786615, + 0.0004253921340831024, + 0.0014333414071048267]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -214,20 +186,16 @@ end surface_integral=SurfaceIntegralWeakForm(flux_ranocha), approximation_type=SBP(), # division by sqrt(8.0) corresponds to normalization by the square root of the size of the domain - l2=[ - 0.001712443468716032, + l2=[0.001712443468716032, 0.002491315550718859, 0.0024913155507195303, 0.002491315550720031, - 0.008585818982343299, - ] ./ sqrt(8), - linf=[ - 0.003810078279323559, - 0.004998778644230928, - 0.004998778643986235, - 0.0049987786444081195, - 0.016455044373650196, - ]) + 0.008585818982343299] ./ sqrt(8), + linf=[0.003810078279323559, + 0.004998778644230928, + 0.004998778643986235, + 0.0049987786444081195, + 0.016455044373650196]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -241,20 +209,16 @@ end @trixi_testset "elixir_euler_taylor_green_vortex.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_taylor_green_vortex.jl"), polydeg=3, tspan=(0.0, 1.0), cells_per_dimension=(2, 2, 2), - l2=[ - 0.0003612827827560599, + l2=[0.0003612827827560599, 0.06219350883951729, 0.062193508839503864, 0.08121963221634831, - 0.07082703570808184, - ], - linf=[ - 0.0007893509649821162, - 0.1481953939988877, - 0.14819539399791176, - 0.14847291108358926, - 0.21313533492212855, - ]) + 0.07082703570808184], + linf=[0.0007893509649821162, + 0.1481953939988877, + 0.14819539399791176, + 0.14847291108358926, + 0.21313533492212855]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -269,20 +233,16 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_taylor_green_vortex.jl"), polydeg=3, approximation_type=GaussSBP(), tspan=(0.0, 1.0), cells_per_dimension=(2, 2, 2), - l2=[ - 0.00036128278275524326, + l2=[0.00036128278275524326, 0.062193508839511434, 0.06219350883949677, 0.08121963221635205, - 0.07082703570765223, - ], - linf=[ - 0.000789350964946367, - 0.14819539399525805, - 0.14819539399590542, - 0.14847291107658706, - 0.21313533492059378, - ]) + 0.07082703570765223], + linf=[0.000789350964946367, + 0.14819539399525805, + 0.14819539399590542, + 0.14847291107658706, + 0.21313533492059378]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -303,20 +263,16 @@ end element_type=Hex(), cells_per_dimension=(2, 2, 2), approximation_type=D, - l2=[ - 0.0024092707138829925, + l2=[0.0024092707138829925, 0.003318758964118284, 0.0033187589641182386, 0.003318758964118252, - 0.012689348410504253, - ], - linf=[ - 0.006118565824207778, - 0.008486456080185167, - 0.008486456080180282, - 0.008486456080185611, - 0.035113544599208346, - ]) + 0.012689348410504253], + linf=[0.006118565824207778, + 0.008486456080185167, + 0.008486456080180282, + 0.008486456080185611, + 0.035113544599208346]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -339,20 +295,16 @@ end approximation_type=D, volume_integral=VolumeIntegralFluxDifferencing(flux_ranocha), surface_integral=SurfaceIntegralWeakForm(flux_ranocha), - l2=[ - 0.0034543609010604407, + l2=[0.0034543609010604407, 0.004944363692625066, 0.0049443636926250435, 0.004944363692625037, - 0.01788695279620914, - ], - linf=[ - 0.013861851418853988, - 0.02126572106620328, - 0.021265721066209053, - 0.021265721066210386, - 0.0771455289446683, - ]) + 0.01788695279620914], + linf=[0.013861851418853988, + 0.02126572106620328, + 0.021265721066209053, + 0.021265721066210386, + 0.0771455289446683]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -365,20 +317,16 @@ end @trixi_testset "elixir_euler_fdsbp_periodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_fdsbp_periodic.jl"), - l2=[ - 7.561896970325353e-5, + l2=[7.561896970325353e-5, 6.884047859361093e-5, 6.884047859363204e-5, 6.884047859361148e-5, - 0.000201107274617457, - ], - linf=[ - 0.0001337520020225913, - 0.00011571467799287305, - 0.0001157146779990903, - 0.00011571467799376123, - 0.0003446082308800058, - ]) + 0.000201107274617457], + linf=[0.0001337520020225913, + 0.00011571467799287305, + 0.0001157146779990903, + 0.00011571467799376123, + 0.0003446082308800058]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_mpi_p4est_2d.jl b/test/test_mpi_p4est_2d.jl index 6d66bc68a26..dd1ad0dbd68 100644 --- a/test/test_mpi_p4est_2d.jl +++ b/test/test_mpi_p4est_2d.jl @@ -132,18 +132,14 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_2d_dgsem") @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_flag.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), - l2=[ - 0.0034516244508588046, + l2=[0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, - 0.004731710454271893, - ], - linf=[ - 0.04155789011775046, - 0.024772109862748914, - 0.03759938693042297, - 0.08039824959535657, - ]) + 0.004731710454271893], + linf=[0.04155789011775046, + 0.024772109862748914, + 0.03759938693042297, + 0.08039824959535657]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_mpi_p4est_3d.jl b/test/test_mpi_p4est_3d.jl index cca9093ec51..7a8467a8833 100644 --- a/test/test_mpi_p4est_3d.jl +++ b/test/test_mpi_p4est_3d.jl @@ -124,20 +124,16 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_3d_dgsem") @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_curved.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_unstructured_curved.jl"), - l2=[ - 4.070355207909268e-5, + l2=[4.070355207909268e-5, 4.4993257426833716e-5, 5.10588457841744e-5, 5.102840924036687e-5, - 0.00019986264001630542, - ], - linf=[ - 0.0016987332417202072, - 0.003622956808262634, - 0.002029576258317789, - 0.0024206977281964193, - 0.008526972236273522, - ], + 0.00019986264001630542], + linf=[0.0016987332417202072, + 0.003622956808262634, + 0.002029576258317789, + 0.0024206977281964193, + 0.008526972236273522], tspan=(0.0, 0.01)) # Ensure that we do not have excessive memory allocations @@ -153,20 +149,16 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_3d_dgsem") @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 0.0015106060984283647, + l2=[0.0015106060984283647, 0.0014733349038567685, 0.00147333490385685, 0.001473334903856929, - 0.0028149479453087093, - ], - linf=[ - 0.008070806335238156, - 0.009007245083113125, - 0.009007245083121784, - 0.009007245083102688, - 0.01562861968368434, - ], + 0.0028149479453087093], + linf=[0.008070806335238156, + 0.009007245083113125, + 0.009007245083121784, + 0.009007245083102688, + 0.01562861968368434], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations @@ -181,20 +173,16 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_3d_dgsem") @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.010380390326164493, + l2=[0.010380390326164493, 0.006192950051354618, 0.005970674274073704, 0.005965831290564327, - 0.02628875593094754, - ], - linf=[ - 0.3326911600075694, - 0.2824952141320467, - 0.41401037398065543, - 0.45574161423218573, - 0.8099577682187109, - ], + 0.02628875593094754], + linf=[0.3326911600075694, + 0.2824952141320467, + 0.41401037398065543, + 0.45574161423218573, + 0.8099577682187109], tspan=(0.0, 0.2), coverage_override=(polydeg = 3,)) # Prevent long compile time in CI @@ -211,20 +199,16 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "p4est_3d_dgsem") @trixi_testset "elixir_euler_source_terms_nonperiodic_hohqmesh.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic_hohqmesh.jl"), - l2=[ - 0.0042023406458005464, + l2=[0.0042023406458005464, 0.004122532789279737, 0.0042448149597303616, 0.0036361316700401765, - 0.007389845952982495, - ], - linf=[ - 0.04530610539892499, - 0.02765695110527666, - 0.05670295599308606, - 0.048396544302230504, - 0.1154589758186293, - ]) + 0.007389845952982495], + linf=[0.04530610539892499, + 0.02765695110527666, + 0.05670295599308606, + 0.048396544302230504, + 0.1154589758186293]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_mpi_t8code_2d.jl b/test/test_mpi_t8code_2d.jl index 7c7fc03898c..a3dd3e92f50 100644 --- a/test/test_mpi_t8code_2d.jl +++ b/test/test_mpi_t8code_2d.jl @@ -114,18 +114,14 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_2d_dgsem") @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_flag.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), - l2=[ - 0.0034516244508588046, + l2=[0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, - 0.004731710454271893, - ], - linf=[ - 0.04155789011775046, - 0.024772109862748914, - 0.03759938693042297, - 0.08039824959535657, - ]) + 0.004731710454271893], + linf=[0.04155789011775046, + 0.024772109862748914, + 0.03759938693042297, + 0.08039824959535657]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_mpi_t8code_3d.jl b/test/test_mpi_t8code_3d.jl index a15690a7629..26a3c773805 100644 --- a/test/test_mpi_t8code_3d.jl +++ b/test/test_mpi_t8code_3d.jl @@ -91,20 +91,16 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_3d_dgsem") @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_curved.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_unstructured_curved.jl"), - l2=[ - 4.070355207909268e-5, + l2=[4.070355207909268e-5, 4.4993257426833716e-5, 5.10588457841744e-5, 5.102840924036687e-5, - 0.00019986264001630542, - ], - linf=[ - 0.0016987332417202072, - 0.003622956808262634, - 0.002029576258317789, - 0.0024206977281964193, - 0.008526972236273522, - ], + 0.00019986264001630542], + linf=[0.0016987332417202072, + 0.003622956808262634, + 0.002029576258317789, + 0.0024206977281964193, + 0.008526972236273522], tspan=(0.0, 0.01)) # Ensure that we do not have excessive memory allocations @@ -120,20 +116,16 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_3d_dgsem") @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 0.0015106060984283647, + l2=[0.0015106060984283647, 0.0014733349038567685, 0.00147333490385685, 0.001473334903856929, - 0.0028149479453087093, - ], - linf=[ - 0.008070806335238156, - 0.009007245083113125, - 0.009007245083121784, - 0.009007245083102688, - 0.01562861968368434, - ], + 0.0028149479453087093], + linf=[0.008070806335238156, + 0.009007245083113125, + 0.009007245083121784, + 0.009007245083102688, + 0.01562861968368434], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations @@ -148,20 +140,16 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "t8code_3d_dgsem") @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.010380390326164493, + l2=[0.010380390326164493, 0.006192950051354618, 0.005970674274073704, 0.005965831290564327, - 0.02628875593094754, - ], - linf=[ - 0.3326911600075694, - 0.2824952141320467, - 0.41401037398065543, - 0.45574161423218573, - 0.8099577682187109, - ], + 0.02628875593094754], + linf=[0.3326911600075694, + 0.2824952141320467, + 0.41401037398065543, + 0.45574161423218573, + 0.8099577682187109], tspan=(0.0, 0.2), coverage_override=(polydeg = 3,)) # Prevent long compile time in CI diff --git a/test/test_mpi_tree.jl b/test/test_mpi_tree.jl index 6351a405b5d..b50f836f252 100644 --- a/test/test_mpi_tree.jl +++ b/test/test_mpi_tree.jl @@ -101,61 +101,45 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows() @trixi_testset "elixir_hypdiff_lax_friedrichs.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_lax_friedrichs.jl"), - l2=[ - 0.00015687751816056159, + l2=[0.00015687751816056159, 0.001025986772217084, - 0.0010259867722169909, - ], - linf=[ - 0.0011986956416591976, - 0.006423873516411049, - 0.006423873516411049, - ]) + 0.0010259867722169909], + linf=[0.0011986956416591976, + 0.006423873516411049, + 0.006423873516411049]) end end @trixi_testset "elixir_hypdiff_harmonic_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_harmonic_nonperiodic.jl"), - l2=[ - 8.61813235543625e-8, + l2=[8.61813235543625e-8, 5.619399844542781e-7, - 5.6193998447443e-7, - ], - linf=[ - 1.124861862180196e-6, - 8.622436471039663e-6, - 8.622436470151484e-6, - ]) + 5.6193998447443e-7], + linf=[1.124861862180196e-6, + 8.622436471039663e-6, + 8.622436470151484e-6]) end @trixi_testset "elixir_hypdiff_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_nonperiodic.jl"), - l2=[ - 8.523077653955306e-6, + l2=[8.523077653955306e-6, 2.8779323653065056e-5, - 5.4549427691297846e-5, - ], - linf=[ - 5.5227409524905013e-5, - 0.0001454489597927185, - 0.00032396328684569653, - ]) + 5.4549427691297846e-5], + linf=[5.5227409524905013e-5, + 0.0001454489597927185, + 0.00032396328684569653]) end if !CI_ON_WINDOWS # see comment on `CI_ON_WINDOWS` in `test/test_mpi.jl` @trixi_testset "elixir_hypdiff_godunov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_godunov.jl"), - l2=[ - 5.868147556427088e-6, + l2=[5.868147556427088e-6, 3.80517927324465e-5, - 3.805179273249344e-5, - ], - linf=[ - 3.701965498725812e-5, - 0.0002122422943138247, - 0.00021224229431116015, - ], + 3.805179273249344e-5], + linf=[3.701965498725812e-5, + 0.0002122422943138247, + 0.00021224229431116015], atol=2.0e-12) #= required for CI on macOS =# end end @@ -166,18 +150,14 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows() if !CI_ON_WINDOWS # see comment on `CI_ON_WINDOWS` in `test/test_mpi.jl` @trixi_testset "elixir_euler_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"), - l2=[ - 9.321181253186009e-7, + l2=[9.321181253186009e-7, 1.4181210743438511e-6, 1.4181210743487851e-6, - 4.824553091276693e-6, - ], - linf=[ - 9.577246529612893e-6, - 1.1707525976012434e-5, - 1.1707525976456523e-5, - 4.8869615580926506e-5, - ], + 4.824553091276693e-6], + linf=[9.577246529612893e-6, + 1.1707525976012434e-5, + 1.1707525976456523e-5, + 4.8869615580926506e-5], rtol=2000 * sqrt(eps())) end end @@ -187,18 +167,14 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows() @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, + l2=[4.8226610349853444e-5, 4.117706709270575e-5, 4.1177067092959676e-5, - 0.00012205252427437389, - ], - linf=[ - 0.0003543874851490436, - 0.0002973166773747593, - 0.0002973166773760916, - 0.001154106793870291, - ], + 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,)) @@ -209,18 +185,14 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows() @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 2.259440511766445e-6, + 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, - ], + 6.3327863238858925e-6], + linf=[1.498738264560373e-5, + 1.9182011928187137e-5, + 1.918201192685487e-5, + 6.0526717141407005e-5], rtol=0.001) end end @@ -228,18 +200,14 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows() if !CI_ON_WINDOWS # see comment on `CI_ON_WINDOWS` in `test/test_mpi.jl` @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.061751715597716854, + l2=[0.061751715597716854, 0.05018223615408711, 0.05018989446443463, - 0.225871559730513, - ], - linf=[ - 0.29347582879608825, - 0.31081249232844693, - 0.3107380389947736, - 1.0540358049885143, - ]) + 0.225871559730513], + linf=[0.29347582879608825, + 0.31081249232844693, + 0.3107380389947736, + 1.0540358049885143]) @testset "error-based step size control" begin Trixi.mpi_isroot() && println("-"^100) @@ -251,18 +219,14 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows() summary_callback() errors = analysis_callback(sol) if Trixi.mpi_isroot() - @test errors.l2≈[ - 0.061653630426688116, - 0.05006930431098764, - 0.05007694316484242, - 0.22550689872331683, - ] rtol=1.0e-4 - @test errors.linf≈[ - 0.28516937484583693, - 0.2983633696512788, - 0.297812036335975, - 1.027368795517512, - ] rtol=1.0e-4 + @test errors.l2≈[0.061653630426688116, + 0.05006930431098764, + 0.05007694316484242, + 0.22550689872331683] rtol=1.0e-4 + @test errors.linf≈[0.28516937484583693, + 0.2983633696512788, + 0.297812036335975, + 1.027368795517512] rtol=1.0e-4 end end end @@ -270,53 +234,41 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows() @trixi_testset "elixir_euler_vortex.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex.jl"), - l2=[ - 0.00013492249515826863, + l2=[0.00013492249515826863, 0.006615696236378061, 0.006782108219800376, - 0.016393831451740604, - ], - linf=[ - 0.0020782600954247776, - 0.08150078921935999, - 0.08663621974991986, - 0.2829930622010579, - ], + 0.016393831451740604], + linf=[0.0020782600954247776, + 0.08150078921935999, + 0.08663621974991986, + 0.2829930622010579], rtol=0.001) end @trixi_testset "elixir_euler_vortex_mortar.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_mortar.jl"), # Expected errors are exactly the same as in the serial test! - l2=[ - 0.0017208369388227673, + l2=[0.0017208369388227673, 0.09628684992237334, 0.09620157717330868, - 0.1758809552387432, - ], - linf=[ - 0.021869936355319086, - 0.9956698009442038, - 1.0002507727219028, - 2.223249697515648, - ]) + 0.1758809552387432], + linf=[0.021869936355319086, + 0.9956698009442038, + 1.0002507727219028, + 2.223249697515648]) end @trixi_testset "elixir_euler_vortex_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_amr.jl"), # Expected errors are exactly the same as in the serial test! - l2=[ - 5.051719943432265e-5, + l2=[5.051719943432265e-5, 0.0022574259317084747, 0.0021755998463189713, - 0.004346492398617521, - ], - linf=[ - 0.0012880114865917447, - 0.03857193149447702, - 0.031090457959835893, - 0.12125130332971423, - ], + 0.004346492398617521], + linf=[0.0012880114865917447, + 0.03857193149447702, + 0.031090457959835893, + 0.12125130332971423], coverage_override=(maxiters = 6,)) end @@ -324,18 +276,14 @@ CI_ON_WINDOWS = (get(ENV, "GITHUB_ACTIONS", false) == "true") && Sys.iswindows() @trixi_testset "elixir_euler_vortex_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_shockcapturing.jl"), - l2=[ - 0.0017158367642679273, + l2=[0.0017158367642679273, 0.09619888722871434, 0.09616432767924141, - 0.17553381166255197, - ], - linf=[ - 0.021853862449723982, - 0.9878047229255944, - 0.9880191167111795, - 2.2154030488035588, - ], + 0.17553381166255197], + linf=[0.021853862449723982, + 0.9878047229255944, + 0.9880191167111795, + 2.2154030488035588], rtol=0.001) end end diff --git a/test/test_p4est_2d.jl b/test/test_p4est_2d.jl index 0a37d14d8f0..6bdffc276cd 100644 --- a/test/test_p4est_2d.jl +++ b/test/test_p4est_2d.jl @@ -111,18 +111,14 @@ end @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_flag.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), - l2=[ - 0.0034516244508588046, + l2=[0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, - 0.004731710454271893, - ], - linf=[ - 0.04155789011775046, - 0.024772109862748914, - 0.03759938693042297, - 0.08039824959535657, - ]) + 0.004731710454271893], + linf=[0.04155789011775046, + 0.024772109862748914, + 0.03759938693042297, + 0.08039824959535657]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -135,12 +131,10 @@ end @trixi_testset "elixir_euler_free_stream.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), - l2=[ - 2.063350241405049e-15, + l2=[2.063350241405049e-15, 1.8571016296925367e-14, 3.1769447886391905e-14, - 1.4104095258528071e-14, - ], + 1.4104095258528071e-14], linf=[1.9539925233402755e-14, 2e-12, 4.8e-12, 4e-12], atol=2.0e-12,) # Ensure that we do not have excessive memory allocations @@ -155,18 +149,14 @@ end @trixi_testset "elixir_euler_shockcapturing_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing_ec.jl"), - l2=[ - 9.53984675e-02, + l2=[9.53984675e-02, 1.05633455e-01, 1.05636158e-01, - 3.50747237e-01, - ], - linf=[ - 2.94357464e-01, - 4.07893014e-01, - 3.97334516e-01, - 1.08142520e+00, - ], + 3.50747237e-01], + linf=[2.94357464e-01, + 4.07893014e-01, + 3.97334516e-01, + 1.08142520e+00], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -180,18 +170,14 @@ end @trixi_testset "elixir_euler_sedov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 3.76149952e-01, + l2=[3.76149952e-01, 2.46970327e-01, 2.46970327e-01, - 1.28889042e+00, - ], - linf=[ - 1.22139001e+00, - 1.17742626e+00, - 1.17742626e+00, - 6.20638482e+00, - ], + 1.28889042e+00], + linf=[1.22139001e+00, + 1.17742626e+00, + 1.17742626e+00, + 6.20638482e+00], tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -205,18 +191,14 @@ end @trixi_testset "elixir_euler_sedov.jl with HLLC Flux" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 0.4229948321239887, + l2=[0.4229948321239887, 0.2559038337457483, 0.2559038337457484, - 1.2990046683564136, - ], - linf=[ - 1.4989357969730492, - 1.325456585141623, - 1.3254565851416251, - 6.331283015053501, - ], + 1.2990046683564136], + linf=[1.4989357969730492, + 1.325456585141623, + 1.3254565851416251, + 6.331283015053501], surface_flux=flux_hllc, tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations @@ -231,18 +213,14 @@ end @trixi_testset "elixir_euler_sedov.jl (HLLE)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 0.40853279043747015, + l2=[0.40853279043747015, 0.25356771650524296, 0.2535677165052422, - 1.2984601729572691, - ], - linf=[ - 1.3840909333784284, - 1.3077772519086124, - 1.3077772519086157, - 6.298798630968632, - ], + 1.2984601729572691], + linf=[1.3840909333784284, + 1.3077772519086124, + 1.3077772519086157, + 6.298798630968632], surface_flux=flux_hlle, tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations @@ -257,18 +235,14 @@ end @trixi_testset "elixir_euler_blast_wave_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_amr.jl"), - l2=[ - 6.32183914e-01, + 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, - ], + 1.06575688e+00], + linf=[2.76020890e+00, + 2.32659890e+00, + 2.32580837e+00, + 2.15778188e+00], tspan=(0.0, 0.3), coverage_override=(maxiters = 6,)) # Ensure that we do not have excessive memory allocations @@ -283,18 +257,14 @@ end @trixi_testset "elixir_euler_wall_bc_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_wall_bc_amr.jl"), - l2=[ - 0.020291447969983396, + l2=[0.020291447969983396, 0.017479614254319948, 0.011387644425613437, - 0.0514420126021293, - ], - linf=[ - 0.3582779022370579, - 0.32073537890751663, - 0.221818049107692, - 0.9209559420400415, - ], + 0.0514420126021293], + linf=[0.3582779022370579, + 0.32073537890751663, + 0.221818049107692, + 0.9209559420400415], tspan=(0.0, 0.15)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -308,18 +278,14 @@ end @trixi_testset "elixir_euler_forward_step_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_forward_step_amr.jl"), - l2=[ - 0.004194875320833303, + l2=[0.004194875320833303, 0.003785140699353966, 0.0013696609105790351, - 0.03265268616046424, - ], - linf=[ - 2.0585399781442852, - 2.213428805506876, - 3.862362410419163, - 17.75187237459251, - ], + 0.03265268616046424], + linf=[2.0585399781442852, + 2.213428805506876, + 3.862362410419163, + 17.75187237459251], tspan=(0.0, 0.0001), rtol=1.0e-7, skip_coverage=true) @@ -337,18 +303,14 @@ end @trixi_testset "elixir_euler_double_mach_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_double_mach_amr.jl"), - l2=[ - 0.051359355290192046, + l2=[0.051359355290192046, 0.4266034859911273, 0.2438304855475594, - 4.11487176105527, - ], - linf=[ - 6.902000373057003, - 53.95714139820832, - 24.241610279839758, - 561.0630401858057, - ], + 4.11487176105527], + linf=[6.902000373057003, + 53.95714139820832, + 24.241610279839758, + 561.0630401858057], tspan=(0.0, 0.0001), skip_coverage=true) if @isdefined sol # Skipped in coverage run @@ -365,18 +327,14 @@ end @trixi_testset "elixir_euler_supersonic_cylinder.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_supersonic_cylinder.jl"), - l2=[ - 0.026798021911954406, + l2=[0.026798021911954406, 0.05118546368109259, 0.03206703583774831, - 0.19680026567208672, - ], - linf=[ - 3.653905721692421, - 4.285035711361009, - 6.8544353186357645, - 31.748244912257533, - ], + 0.19680026567208672], + linf=[3.653905721692421, + 4.285035711361009, + 6.8544353186357645, + 31.748244912257533], tspan=(0.0, 0.001), skip_coverage=true) if @isdefined sol # Skipped in coverage run @@ -393,14 +351,10 @@ end @trixi_testset "elixir_euler_NACA6412airfoil_mach2.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_NACA6412airfoil_mach2.jl"), - l2=[ - 0.19107654776276498, 0.3545913719444839, - 0.18492730895077583, 0.817927213517244, - ], - linf=[ - 2.5397624311491946, 2.7075156425517917, 2.200980534211764, - 9.031153939238115, - ], + l2=[0.19107654776276498, 0.3545913719444839, + 0.18492730895077583, 0.817927213517244], + linf=[2.5397624311491946, 2.7075156425517917, 2.200980534211764, + 9.031153939238115], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -414,18 +368,14 @@ end @trixi_testset "elixir_eulergravity_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), - l2=[ - 0.00024871265138964204, + l2=[0.00024871265138964204, 0.0003370077102132591, 0.0003370077102131964, - 0.0007231525513793697, - ], - linf=[ - 0.0015813032944647087, - 0.0020494288423820173, - 0.0020494288423824614, - 0.004793821195083758, - ], + 0.0007231525513793697], + linf=[0.0015813032944647087, + 0.0020494288423820173, + 0.0020494288423824614, + 0.004793821195083758], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -439,18 +389,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 9.168126407325352e-5, + l2=[9.168126407325352e-5, 0.0009795410115453788, 0.002546408320320785, - 3.941189812642317e-6, - ], - linf=[ - 0.0009903782521019089, - 0.0059752684687262025, - 0.010941106525454103, - 1.2129488214718265e-5, - ], + 3.941189812642317e-6], + linf=[0.0009903782521019089, + 0.0059752684687262025, + 0.010941106525454103, + 1.2129488214718265e-5], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -470,10 +416,10 @@ end 7.879639065049896e-7, 1.0628631669056271e-6, 4.3382328912336153e-7], linf=[4.255466285174592e-5, 1.0029706745823264e-5, - 1.0029706747467781e-5, 1.2122265939010224e-5, - 5.4791097160444835e-6, 5.18922042269665e-6, - 5.189220422141538e-6, 9.552667261422676e-6, - 1.4237578427628152e-6]) + 1.0029706747467781e-5, 1.2122265939010224e-5, + 5.4791097160444835e-6, 5.18922042269665e-6, + 5.189220422141538e-6, 9.552667261422676e-6, + 1.4237578427628152e-6]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -492,10 +438,11 @@ end 0.0, 2.0597079362763556e-5], linf=[10.194181233788775, 18.25472397868819, 10.031307436191334, - 0.0, - 19.647239392277378, 1.3938810140985936, 1.8724965294853084, - 0.0, - 0.0016290067532561904], + 0.0, + 19.647239392277378, 1.3938810140985936, + 1.8724965294853084, + 0.0, + 0.0016290067532561904], tspan=(0.0, 0.02)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -510,18 +457,14 @@ end @trixi_testset "elixir_linearizedeuler_gaussian_source.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_linearizedeuler_gaussian_source.jl"), - l2=[ - 0.006047938590548741, + l2=[0.006047938590548741, 0.0040953286019907035, 0.004222698522497298, - 0.006269492499336128, - ], - linf=[ - 0.06386175207349379, - 0.0378926444850457, - 0.041759728067967065, - 0.06430136016259067, - ]) + 0.006269492499336128], + linf=[0.06386175207349379, + 0.0378926444850457, + 0.041759728067967065, + 0.06430136016259067]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -534,18 +477,14 @@ end @trixi_testset "elixir_euler_subsonic_cylinder.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_subsonic_cylinder.jl"), - l2=[ - 0.00011914390523852561, + l2=[0.00011914390523852561, 0.00010776028621724485, 6.139954358305467e-5, - 0.0003067693731825959, - ], - linf=[ - 0.1653075586200805, - 0.1868437275544909, - 0.09772818519679008, - 0.4311796171737692, - ], tspan=(0.0, 0.001)) + 0.0003067693731825959], + linf=[0.1653075586200805, + 0.1868437275544909, + 0.09772818519679008, + 0.4311796171737692], tspan=(0.0, 0.001)) u_ode = copy(sol.u[end]) du_ode = zero(u_ode) # Just a placeholder in this case diff --git a/test/test_p4est_3d.jl b/test/test_p4est_3d.jl index ea7d9193add..fc0e486f27a 100644 --- a/test/test_p4est_3d.jl +++ b/test/test_p4est_3d.jl @@ -127,20 +127,16 @@ end @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_curved.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_unstructured_curved.jl"), - l2=[ - 4.070355207909268e-5, + l2=[4.070355207909268e-5, 4.4993257426833716e-5, 5.10588457841744e-5, 5.102840924036687e-5, - 0.00019986264001630542, - ], - linf=[ - 0.0016987332417202072, - 0.003622956808262634, - 0.002029576258317789, - 0.0024206977281964193, - 0.008526972236273522, - ], + 0.00019986264001630542], + linf=[0.0016987332417202072, + 0.003622956808262634, + 0.002029576258317789, + 0.0024206977281964193, + 0.008526972236273522], tspan=(0.0, 0.01)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -155,20 +151,16 @@ end @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 0.0015106060984283647, + l2=[0.0015106060984283647, 0.0014733349038567685, 0.00147333490385685, 0.001473334903856929, - 0.0028149479453087093, - ], - linf=[ - 0.008070806335238156, - 0.009007245083113125, - 0.009007245083121784, - 0.009007245083102688, - 0.01562861968368434, - ], + 0.0028149479453087093], + linf=[0.008070806335238156, + 0.009007245083113125, + 0.009007245083121784, + 0.009007245083102688, + 0.01562861968368434], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -182,20 +174,16 @@ end @trixi_testset "elixir_euler_free_stream.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), - l2=[ - 5.162664597942288e-15, + l2=[5.162664597942288e-15, 1.941857343642486e-14, 2.0232366394187278e-14, 2.3381518645408552e-14, - 7.083114561232324e-14, - ], - linf=[ - 7.269740365245525e-13, - 3.289868377720495e-12, - 4.440087186807773e-12, - 3.8686831516088205e-12, - 9.412914891981927e-12, - ], + 7.083114561232324e-14], + linf=[7.269740365245525e-13, + 3.289868377720495e-12, + 4.440087186807773e-12, + 3.8686831516088205e-12, + 9.412914891981927e-12], tspan=(0.0, 0.03)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -209,20 +197,16 @@ end @trixi_testset "elixir_euler_free_stream_extruded.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream_extruded.jl"), - l2=[ - 8.444868392439035e-16, + l2=[8.444868392439035e-16, 4.889826056731442e-15, 2.2921260987087585e-15, 4.268460455702414e-15, - 1.1356712092620279e-14, - ], - linf=[ - 7.749356711883593e-14, - 2.8792246364872653e-13, - 1.1121659149182506e-13, - 3.3228975127030935e-13, - 9.592326932761353e-13, - ], + 1.1356712092620279e-14], + linf=[7.749356711883593e-14, + 2.8792246364872653e-13, + 1.1121659149182506e-13, + 3.3228975127030935e-13, + 9.592326932761353e-13], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -237,16 +221,12 @@ end @trixi_testset "elixir_euler_free_stream_boundaries.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream_boundaries.jl"), - l2=[ - 6.530157034651212e-16, 1.6057829680004379e-15, + l2=[6.530157034651212e-16, 1.6057829680004379e-15, 3.31107455378537e-15, 3.908829498281281e-15, - 5.048390610424672e-15, - ], - linf=[ - 4.884981308350689e-15, 1.1921019726912618e-14, - 1.5432100042289676e-14, 2.298161660974074e-14, - 6.039613253960852e-14, - ]) + 5.048390610424672e-15], + linf=[4.884981308350689e-15, 1.1921019726912618e-14, + 1.5432100042289676e-14, 2.298161660974074e-14, + 6.039613253960852e-14]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -259,20 +239,16 @@ end @trixi_testset "elixir_euler_free_stream_extruded.jl with HLLC FLux" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream_extruded.jl"), - l2=[ - 8.444868392439035e-16, + l2=[8.444868392439035e-16, 4.889826056731442e-15, 2.2921260987087585e-15, 4.268460455702414e-15, - 1.1356712092620279e-14, - ], - linf=[ - 7.749356711883593e-14, - 4.513472928735496e-13, - 2.9790059308254513e-13, - 1.057154364048074e-12, - 1.6271428648906294e-12, - ], + 1.1356712092620279e-14], + linf=[7.749356711883593e-14, + 4.513472928735496e-13, + 2.9790059308254513e-13, + 1.057154364048074e-12, + 1.6271428648906294e-12], tspan=(0.0, 0.1), surface_flux=flux_hllc) # Ensure that we do not have excessive memory allocations @@ -287,20 +263,16 @@ end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.010380390326164493, + l2=[0.010380390326164493, 0.006192950051354618, 0.005970674274073704, 0.005965831290564327, - 0.02628875593094754, - ], - linf=[ - 0.3326911600075694, - 0.2824952141320467, - 0.41401037398065543, - 0.45574161423218573, - 0.8099577682187109, - ], + 0.02628875593094754], + linf=[0.3326911600075694, + 0.2824952141320467, + 0.41401037398065543, + 0.45574161423218573, + 0.8099577682187109], tspan=(0.0, 0.2), coverage_override=(polydeg = 3,)) # Prevent long compile time in CI # Ensure that we do not have excessive memory allocations @@ -315,20 +287,16 @@ end @trixi_testset "elixir_euler_sedov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 7.82070951e-02, + 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, - ], + 3.75260911e-01], + linf=[7.45329845e-01, + 3.21754792e-01, + 3.21754792e-01, + 3.21754792e-01, + 4.76151527e+00], tspan=(0.0, 0.3), coverage_override=(polydeg = 3,)) # Prevent long compile time in CI # Ensure that we do not have excessive memory allocations @@ -343,20 +311,16 @@ end @trixi_testset "elixir_euler_sedov.jl (HLLE)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 0.09946224487902565, + l2=[0.09946224487902565, 0.04863386374672001, 0.048633863746720116, 0.04863386374672032, - 0.3751015774232693, - ], - linf=[ - 0.789241521871487, - 0.42046970270100276, - 0.42046970270100276, - 0.4204697027010028, - 4.730877375538398, - ], + 0.3751015774232693], + linf=[0.789241521871487, + 0.42046970270100276, + 0.42046970270100276, + 0.4204697027010028, + 4.730877375538398], tspan=(0.0, 0.3), surface_flux=flux_hlle) # Ensure that we do not have excessive memory allocations @@ -372,20 +336,16 @@ end @trixi_testset "elixir_euler_source_terms_nonconforming_earth.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_earth.jl"), - l2=[ - 6.040180337738628e-6, + l2=[6.040180337738628e-6, 5.4254175153621895e-6, 5.677698851333843e-6, 5.8017136892469794e-6, - 1.3637854615117974e-5, - ], - linf=[ - 0.00013996924184311865, - 0.00013681539559939893, - 0.00013681539539733834, - 0.00013681539541021692, - 0.00016833038543762058, - ], + 1.3637854615117974e-5], + linf=[0.00013996924184311865, + 0.00013681539559939893, + 0.00013681539539733834, + 0.00013681539541021692, + 0.00016833038543762058], # Decrease tolerance of adaptive time stepping to get similar results across different systems abstol=1.0e-11, reltol=1.0e-11, coverage_override=(trees_per_cube_face = (1, 1), polydeg = 3)) # Prevent long compile time in CI @@ -402,20 +362,16 @@ end @trixi_testset "elixir_euler_circular_wind_nonconforming.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_circular_wind_nonconforming.jl"), - l2=[ - 1.5737711609657832e-7, + l2=[1.5737711609657832e-7, 3.8630261900166194e-5, 3.8672287531936816e-5, 3.6865116098660796e-5, - 0.05508620970403884, - ], - linf=[ - 2.268845333053271e-6, - 0.000531462302113539, - 0.0005314624461298934, - 0.0005129931254772464, - 0.7942778058932163, - ], + 0.05508620970403884], + linf=[2.268845333053271e-6, + 0.000531462302113539, + 0.0005314624461298934, + 0.0005129931254772464, + 0.7942778058932163], tspan=(0.0, 2e2), coverage_override=(trees_per_cube_face = (1, 1), polydeg = 3)) # Prevent long compile time in CI # Ensure that we do not have excessive memory allocations @@ -431,20 +387,16 @@ end @trixi_testset "elixir_euler_baroclinic_instability.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_baroclinic_instability.jl"), - l2=[ - 6.725093801700048e-7, + l2=[6.725093801700048e-7, 0.00021710076010951073, 0.0004386796338203878, 0.00020836270267103122, - 0.07601887903440395, - ], - linf=[ - 1.9107530539574924e-5, - 0.02980358831035801, - 0.048476331898047564, - 0.02200137344113612, - 4.848310144356219, - ], + 0.07601887903440395], + linf=[1.9107530539574924e-5, + 0.02980358831035801, + 0.048476331898047564, + 0.02200137344113612, + 4.848310144356219], tspan=(0.0, 1e2), # Decrease tolerance of adaptive time stepping to get similar results across different systems abstol=1.0e-9, reltol=1.0e-9, @@ -462,20 +414,16 @@ end @trixi_testset "elixir_euler_source_terms_nonperiodic_hohqmesh.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic_hohqmesh.jl"), - l2=[ - 0.0042023406458005464, + l2=[0.0042023406458005464, 0.004122532789279737, 0.0042448149597303616, 0.0036361316700401765, - 0.007389845952982495, - ], - linf=[ - 0.04530610539892499, - 0.02765695110527666, - 0.05670295599308606, - 0.048396544302230504, - 0.1154589758186293, - ]) + 0.007389845952982495], + linf=[0.04530610539892499, + 0.02765695110527666, + 0.05670295599308606, + 0.048396544302230504, + 0.1154589758186293]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -495,10 +443,10 @@ end 0.0003565026134076906, 0.0007904654548841712, 9.437300326448332e-7], linf=[0.0012482306861187897, 0.006408776208178299, - 0.0016845452099629663, 0.0068711236542984555, - 0.004626581522263695, 0.006614624811393632, - 0.0030068344747734566, 0.008277825749754025, - 1.3475027166309006e-5], + 0.0016845452099629663, 0.0068711236542984555, + 0.004626581522263695, 0.006614624811393632, + 0.0030068344747734566, 0.008277825749754025, + 1.3475027166309006e-5], tspan=(0.0, 0.25), coverage_override=(trees_per_dimension = (1, 1, 1),)) # Ensure that we do not have excessive memory allocations @@ -519,10 +467,10 @@ end 0.007571716276627825, 0.005571862660453231, 3.909755063709152e-6], linf=[0.20904054009050665, 0.18622917151105936, - 0.2347957890323218, 0.19432508025509926, - 0.6858860133405615, 0.15172116633332622, - 0.22432820727833747, 0.16805989780225183, - 0.000535219040687628], + 0.2347957890323218, 0.19432508025509926, + 0.6858860133405615, 0.15172116633332622, + 0.22432820727833747, 0.16805989780225183, + 0.000535219040687628], tspan=(0.0, 0.04), coverage_override=(maxiters = 6, initial_refinement_level = 1, base_level = 1, max_level = 2)) diff --git a/test/test_paper_self_gravitating_gas_dynamics.jl b/test/test_paper_self_gravitating_gas_dynamics.jl index 10b4f93ad74..988fe94860e 100644 --- a/test/test_paper_self_gravitating_gas_dynamics.jl +++ b/test/test_paper_self_gravitating_gas_dynamics.jl @@ -17,18 +17,14 @@ const EXAMPLES_DIR = pkgdir(Trixi, "examples", "paper_self_gravitating_gas_dynam @trixi_testset "elixir_euler_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 0.0001740977055972079, + l2=[0.0001740977055972079, 0.0003369355182519592, 0.0003369355182518708, - 0.0006099171220334989, - ], - linf=[ - 0.001079347149189669, - 0.0018836938381321389, - 0.001883693838132583, - 0.003971575376718217, - ]) + 0.0006099171220334989], + linf=[0.001079347149189669, + 0.0018836938381321389, + 0.001883693838132583, + 0.003971575376718217]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -41,18 +37,14 @@ end @trixi_testset "elixir_euler_convergence.jl with polydeg=4" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 1.7187201161597772e-5, + l2=[1.7187201161597772e-5, 2.678065111772951e-5, 2.678065111783027e-5, - 4.952504160091526e-5, - ], - linf=[ - 0.0001501749544159381, - 0.00016549482504535362, - 0.00016549482504601976, - 0.0004372960291432193, - ], + 4.952504160091526e-5], + linf=[0.0001501749544159381, + 0.00016549482504535362, + 0.00016549482504601976, + 0.0004372960291432193], polydeg=4) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -66,16 +58,12 @@ end @trixi_testset "elixir_hypdiff_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_convergence.jl"), - l2=[ - 0.003154024896093942, + l2=[0.003154024896093942, 0.012394432074951856, - 0.02185973823794725, - ], - linf=[ - 0.01731850928579215, - 0.07843510773347553, - 0.11242300176349201, - ]) + 0.02185973823794725], + linf=[0.01731850928579215, + 0.07843510773347553, + 0.11242300176349201]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -88,16 +76,12 @@ end @trixi_testset "elixir_hypdiff_convergence.jl with polydeg=4" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_convergence.jl"), - l2=[ - 0.0002511283012128458, + l2=[0.0002511283012128458, 0.0008808243846610255, - 0.0016313343228567005, - ], - linf=[ - 0.0017290715087938668, - 0.003129184465704738, - 0.01000728849316701, - ], + 0.0016313343228567005], + linf=[0.0017290715087938668, + 0.003129184465704738, + 0.01000728849316701], polydeg=4) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -111,18 +95,14 @@ end @trixi_testset "elixir_eulergravity_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), - l2=[ - 0.00024871265138964204, + l2=[0.00024871265138964204, 0.0003370077102132591, 0.0003370077102131964, - 0.0007231525513793697, - ], - linf=[ - 0.0015813032944647087, - 0.0020494288423820173, - 0.0020494288423824614, - 0.004793821195083758, - ], + 0.0007231525513793697], + linf=[0.0015813032944647087, + 0.0020494288423820173, + 0.0020494288423824614, + 0.004793821195083758], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -136,18 +116,14 @@ end @trixi_testset "elixir_eulergravity_convergence.jl with polydeg=4" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), - l2=[ - 1.9537712148648045e-5, + l2=[1.9537712148648045e-5, 2.7564396197947587e-5, 2.7564396197967635e-5, - 5.688838772067586e-5, - ], - linf=[ - 0.00012335710672761735, - 0.00020086268350816283, - 0.00020086268350727465, - 0.0004962155455632278, - ], + 5.688838772067586e-5], + linf=[0.00012335710672761735, + 0.00020086268350816283, + 0.00020086268350727465, + 0.0004962155455632278], tspan=(0.0, 0.1), polydeg=4) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -161,18 +137,14 @@ end @trixi_testset "elixir_eulergravity_convergence.jl with 1st order RK3S*" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), - l2=[ - 0.00024871265138959434, + l2=[0.00024871265138959434, 0.000337007710281087, 0.0003370077102811394, - 0.0007231525515231289, - ], - linf=[ - 0.0015813032941613958, - 0.002049428843978518, - 0.0020494288439798503, - 0.004793821198143977, - ], + 0.0007231525515231289], + linf=[0.0015813032941613958, + 0.002049428843978518, + 0.0020494288439798503, + 0.004793821198143977], tspan=(0.0, 0.1), timestep_gravity=Trixi.timestep_gravity_erk51_3Sstar!) # Ensure that we do not have excessive memory allocations @@ -187,18 +159,14 @@ end @trixi_testset "elixir_eulergravity_convergence.jl with 3rd order RK3S*" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), - l2=[ - 0.0002487126513894034, + l2=[0.0002487126513894034, 0.00033700771023049785, 0.00033700771023048245, - 0.0007231525514158737, - ], - linf=[ - 0.0015813032943847727, - 0.002049428842844314, - 0.0020494288428452023, - 0.004793821195971937, - ], + 0.0007231525514158737], + linf=[0.0015813032943847727, + 0.002049428842844314, + 0.0020494288428452023, + 0.004793821195971937], tspan=(0.0, 0.1), timestep_gravity=Trixi.timestep_gravity_erk53_3Sstar!) # Ensure that we do not have excessive memory allocations @@ -214,18 +182,14 @@ end @trixi_testset "elixir_eulergravity_jeans_instability.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_jeans_instability.jl"), - l2=[ - 10733.63378538114, + l2=[10733.63378538114, 13356.780607423452, 1.6722844879795038e-6, - 26834.076821148774, - ], - linf=[ - 15194.296424901113, - 18881.481685044182, - 6.809726988008751e-6, - 37972.99700513482, - ], + 26834.076821148774], + linf=[15194.296424901113, + 18881.481685044182, + 6.809726988008751e-6, + 37972.99700513482], tspan=(0.0, 0.1), atol=4.0e-6) # Ensure that we do not have excessive memory allocations @@ -241,18 +205,14 @@ end @trixi_testset "elixir_eulergravity_jeans_instability.jl with RK3S*" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_jeans_instability.jl"), - l2=[ - 10734.598193238024, + l2=[10734.598193238024, 13358.217234481384, 1.911011743371934e-6, - 26836.487841241516, - ], - linf=[ - 15195.661004798487, - 18883.512035906537, - 7.867948710816926e-6, - 37976.408478975296, - ], + 26836.487841241516], + linf=[15195.661004798487, + 18883.512035906537, + 7.867948710816926e-6, + 37976.408478975296], tspan=(0.0, 0.1), atol=4.0e-6, # the background field is reatively large, so this corresponds to our usual atol parameters=ParametersEulerGravity(background_density = 1.5e7, @@ -300,18 +260,14 @@ end @trixi_testset "elixir_eulergravity_sedov_blast_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_sedov_blast_wave.jl"), - l2=[ - 0.046315994852653024, + l2=[0.046315994852653024, 0.0650818006233669, 0.06508180062336677, - 0.4896707211656037, - ], - linf=[ - 2.3874843337593776, - 4.07876384374792, - 4.07876384374792, - 16.23914384809855, - ], + 0.4896707211656037], + linf=[2.3874843337593776, + 4.07876384374792, + 4.07876384374792, + 16.23914384809855], tspan=(0.0, 0.05), coverage_override=(maxiters = 2,)) # Ensure that we do not have excessive memory allocations @@ -327,18 +283,14 @@ end @trixi_testset "elixir_eulergravity_sedov_blast_wave.jl with ref-level=8 and no AMR" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_sedov_blast_wave.jl"), - l2=[ - 0.00289222135995042, + l2=[0.00289222135995042, 0.013724813590853825, 0.013724813590853832, - 0.05822904710548214, - ], - linf=[ - 0.26361780693997594, - 1.3908873830688688, - 1.3908873830688688, - 4.066701303607613, - ], + 0.05822904710548214], + linf=[0.26361780693997594, + 1.3908873830688688, + 1.3908873830688688, + 4.066701303607613], tspan=(0.0, 0.005), initial_refinement_level=8, amr_callback=TrivialCallback()) # Ensure that we do not have excessive memory allocations diff --git a/test/test_parabolic_1d.jl b/test/test_parabolic_1d.jl index c1cfec052fe..7c74b5eb340 100644 --- a/test/test_parabolic_1d.jl +++ b/test/test_parabolic_1d.jl @@ -64,16 +64,12 @@ end @trixi_testset "TreeMesh1D: elixir_navierstokes_convergence_periodic.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_1d_dgsem", "elixir_navierstokes_convergence_periodic.jl"), - l2=[ - 0.0001133835907077494, + l2=[0.0001133835907077494, 6.226282245610444e-5, - 0.0002820171699999139, - ], - linf=[ - 0.0006255102377159538, - 0.00036195501456059986, - 0.0016147729485886941, - ]) + 0.0002820171699999139], + linf=[0.0006255102377159538, + 0.00036195501456059986, + 0.0016147729485886941]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -91,16 +87,12 @@ end mu = mu(), Prandtl = prandtl_number(), gradient_variables = GradientVariablesEntropy()), - l2=[ - 0.00011310615871043463, + l2=[0.00011310615871043463, 6.216495207074201e-5, - 0.00028195843110817814, - ], - linf=[ - 0.0006240837363233886, - 0.0003616694320713876, - 0.0016147339542413874, - ]) + 0.00028195843110817814], + linf=[0.0006240837363233886, + 0.0003616694320713876, + 0.0016147339542413874]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -114,16 +106,12 @@ end @trixi_testset "TreeMesh1D: elixir_navierstokes_convergence_walls.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_1d_dgsem", "elixir_navierstokes_convergence_walls.jl"), - l2=[ - 0.00047023310868269237, + l2=[0.00047023310868269237, 0.00032181736027057234, - 0.0014966266486095025, - ], - linf=[ - 0.002996375101363302, - 0.002863904256059634, - 0.012691132946258676, - ]) + 0.0014966266486095025], + linf=[0.002996375101363302, + 0.002863904256059634, + 0.012691132946258676]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -141,16 +129,12 @@ end mu = mu(), Prandtl = prandtl_number(), gradient_variables = GradientVariablesEntropy()), - l2=[ - 0.0004608500483647771, + l2=[0.0004608500483647771, 0.00032431091222851285, - 0.0015159733360626845, - ], - linf=[ - 0.002754803146635787, - 0.0028567714697580906, - 0.012941794048176192, - ]) + 0.0015159733360626845], + linf=[0.002754803146635787, + 0.0028567714697580906, + 0.012941794048176192]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -167,16 +151,12 @@ end equations_parabolic=CompressibleNavierStokesDiffusion1D(equations, mu = mu(), Prandtl = prandtl_number()), - l2=[ - 2.5278824700860636e-5, + l2=[2.5278824700860636e-5, 2.5540078777006958e-5, - 0.00012118655083858043, - ], - linf=[ - 0.0001466387075579334, - 0.00019422427462629705, - 0.0009556446847707178, - ]) + 0.00012118655083858043], + linf=[0.0001466387075579334, + 0.00019422427462629705, + 0.0009556446847707178]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -194,16 +174,12 @@ end mu = mu(), Prandtl = prandtl_number(), gradient_variables = GradientVariablesEntropy()), - l2=[ - 2.459359632523962e-5, + l2=[2.459359632523962e-5, 2.3928390718460263e-5, - 0.00011252414117082376, - ], - linf=[ - 0.0001185052018830568, - 0.00018987717854305393, - 0.0009597503607920999, - ]) + 0.00011252414117082376], + linf=[0.0001185052018830568, + 0.00018987717854305393, + 0.0009597503607920999]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_parabolic_2d.jl b/test/test_parabolic_2d.jl index 9f1382caa62..6d104026049 100644 --- a/test/test_parabolic_2d.jl +++ b/test/test_parabolic_2d.jl @@ -123,18 +123,14 @@ end @test_trixi_include(joinpath(examples_dir(), "dgmulti_2d", "elixir_navierstokes_convergence.jl"), cells_per_dimension=(4, 4), tspan=(0.0, 0.1), - l2=[ - 0.0015355076812510957, + l2=[0.0015355076812510957, 0.0033843168272696756, 0.0036531858107443434, - 0.009948436427519214, - ], - linf=[ - 0.005522560467190019, - 0.013425258500730508, - 0.013962115643482154, - 0.027483102120502423, - ]) + 0.009948436427519214], + linf=[0.005522560467190019, + 0.013425258500730508, + 0.013962115643482154, + 0.027483102120502423]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -149,18 +145,14 @@ end @test_trixi_include(joinpath(examples_dir(), "dgmulti_2d", "elixir_navierstokes_convergence_curved.jl"), cells_per_dimension=(4, 4), tspan=(0.0, 0.1), - l2=[ - 0.004255101916146187, + l2=[0.004255101916146187, 0.011118488923215765, 0.011281831283462686, - 0.03573656447388509, - ], - linf=[ - 0.015071710669706473, - 0.04103132025858458, - 0.03990424085750277, - 0.1309401718598764, - ],) + 0.03573656447388509], + linf=[0.015071710669706473, + 0.04103132025858458, + 0.03990424085750277, + 0.1309401718598764],) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -175,18 +167,14 @@ end @test_trixi_include(joinpath(examples_dir(), "dgmulti_2d", "elixir_navierstokes_lid_driven_cavity.jl"), cells_per_dimension=(4, 4), tspan=(0.0, 0.5), - l2=[ - 0.00022156125227115747, + l2=[0.00022156125227115747, 0.028318325921401, 0.009509168701070296, - 0.028267900513550506, - ], - linf=[ - 0.001562278941298234, - 0.14886653390744856, - 0.0716323565533752, - 0.19472785105241996, - ]) + 0.028267900513550506], + linf=[0.001562278941298234, + 0.14886653390744856, + 0.0716323565533752, + 0.19472785105241996]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -272,18 +260,14 @@ end extra_analysis_integrals = (energy_kinetic, energy_internal, enstrophy)), - l2=[ - 0.002111672530658797, + l2=[0.002111672530658797, 0.0034322351490857846, 0.0038742528195910416, - 0.012469246082568561, - ], - linf=[ - 0.012006418939223495, - 0.035520871209746126, - 0.024512747492231427, - 0.11191122588756564, - ]) + 0.012469246082568561], + linf=[0.012006418939223495, + 0.035520871209746126, + 0.024512747492231427, + 0.11191122588756564]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -302,18 +286,14 @@ end t, equations), equations)), - l2=[ - 0.002103629650383915, + l2=[0.002103629650383915, 0.003435843933396454, 0.00386735987813341, - 0.012670355349235728, - ], - linf=[ - 0.012006261793147788, - 0.03550212518982032, - 0.025107947319661185, - 0.11647078036571124, - ]) + 0.012670355349235728], + linf=[0.012006261793147788, + 0.03550212518982032, + 0.025107947319661185, + 0.11647078036571124]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -329,18 +309,14 @@ end "elixir_navierstokes_convergence.jl"), initial_refinement_level=2, tspan=(0.0, 0.1), gradient_variables=GradientVariablesEntropy(), - l2=[ - 0.0021403742517389513, + l2=[0.0021403742517389513, 0.0034258287094908572, 0.0038915122886898517, - 0.012506862343013842, - ], - linf=[ - 0.012244412004628336, - 0.03507559186162224, - 0.024580892345558894, - 0.11425600758350107, - ]) + 0.012506862343013842], + linf=[0.012244412004628336, + 0.03507559186162224, + 0.024580892345558894, + 0.11425600758350107]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -360,18 +336,14 @@ end t, equations), equations)), - l2=[ - 0.0021349737347844907, + l2=[0.0021349737347844907, 0.0034301388278203033, 0.0038928324474291572, - 0.012693611436230873, - ], - linf=[ - 0.01224423627586213, - 0.035054066314102905, - 0.025099598504931965, - 0.11795616324751634, - ]) + 0.012693611436230873], + linf=[0.01224423627586213, + 0.035054066314102905, + 0.025099598504931965, + 0.11795616324751634]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -387,18 +359,14 @@ end "elixir_navierstokes_convergence.jl"), initial_refinement_level=2, tspan=(0.0, 0.1), volume_integral=VolumeIntegralFluxDifferencing(flux_central), - l2=[ - 0.0021116725306633594, + l2=[0.0021116725306633594, 0.0034322351490827557, 0.0038742528196093542, - 0.012469246082526909, - ], - linf=[ - 0.012006418939291663, - 0.035520871209594115, - 0.024512747491801577, - 0.11191122588591007, - ]) + 0.012469246082526909], + linf=[0.012006418939291663, + 0.035520871209594115, + 0.024512747491801577, + 0.11191122588591007]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -450,18 +418,14 @@ end @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_navierstokes_lid_driven_cavity.jl"), initial_refinement_level=2, tspan=(0.0, 0.5), - l2=[ - 0.00015144571529699053, + l2=[0.00015144571529699053, 0.018766076072331623, 0.007065070765652574, - 0.0208399005734258, - ], - linf=[ - 0.0014523369373669048, - 0.12366779944955864, - 0.05532450997115432, - 0.16099927805328207, - ]) + 0.0208399005734258], + linf=[0.0014523369373669048, + 0.12366779944955864, + 0.05532450997115432, + 0.16099927805328207]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -475,18 +439,14 @@ end @trixi_testset "TreeMesh2D: elixir_navierstokes_shearlayer_amr.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_navierstokes_shearlayer_amr.jl"), - l2=[ - 0.00526017743452336, + l2=[0.00526017743452336, 0.4130430692895672, 0.4310996183791349, - 1.1544344171604635, - ], - linf=[ - 0.03492185879198495, - 1.392635891671335, - 1.357551616406459, - 8.713760873018146, - ], + 1.1544344171604635], + linf=[0.03492185879198495, + 1.392635891671335, + 1.357551616406459, + 8.713760873018146], tspan=(0.0, 0.7)) end @@ -594,18 +554,14 @@ end @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_navierstokes_convergence.jl"), initial_refinement_level=1, tspan=(0.0, 0.2), - l2=[ - 0.0003811978985836709, + l2=[0.0003811978985836709, 0.0005874314969169538, 0.0009142898787923481, - 0.0011613918899727263, - ], - linf=[ - 0.0021633623982135752, - 0.009484348274135372, - 0.004231572066492217, - 0.011661660275365193, - ]) + 0.0011613918899727263], + linf=[0.0021633623982135752, + 0.009484348274135372, + 0.004231572066492217, + 0.011661660275365193]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -620,18 +576,14 @@ end @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_navierstokes_convergence_nonperiodic.jl"), initial_refinement_level=1, tspan=(0.0, 0.2), - l2=[ - 0.00040364962558511795, + l2=[0.00040364962558511795, 0.0005869762481506936, 0.00091488537427274, - 0.0011984191566376762, - ], - linf=[ - 0.0024993634941723464, - 0.009487866203944725, - 0.004505829506628117, - 0.011634902776245681, - ]) + 0.0011984191566376762], + linf=[0.0024993634941723464, + 0.009487866203944725, + 0.004505829506628117, + 0.011634902776245681]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -646,18 +598,14 @@ end @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_navierstokes_lid_driven_cavity.jl"), initial_refinement_level=2, tspan=(0.0, 0.5), - l2=[ - 0.00028716166408816073, + l2=[0.00028716166408816073, 0.08101204560401647, 0.02099595625377768, - 0.05008149754143295, - ], - linf=[ - 0.014804500261322406, - 0.9513271652357098, - 0.7223919625994717, - 1.4846907331004786, - ]) + 0.05008149754143295], + linf=[0.014804500261322406, + 0.9513271652357098, + 0.7223919625994717, + 1.4846907331004786]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -672,14 +620,10 @@ end @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_navierstokes_lid_driven_cavity_amr.jl"), tspan=(0.0, 1.0), - l2=[ - 0.0005323841980601085, 0.07892044543547208, - 0.02909671646389337, 0.11717468256112017, - ], - linf=[ - 0.006045292737899444, 0.9233292581786228, - 0.7982129977236198, 1.6864546235292153, - ]) + l2=[0.0005323841980601085, 0.07892044543547208, + 0.02909671646389337, 0.11717468256112017], + linf=[0.006045292737899444, 0.9233292581786228, + 0.7982129977236198, 1.6864546235292153]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_parabolic_3d.jl b/test/test_parabolic_3d.jl index 1eaa9f51a56..290cbb9f752 100644 --- a/test/test_parabolic_3d.jl +++ b/test/test_parabolic_3d.jl @@ -16,20 +16,16 @@ isdir(outdir) && rm(outdir, recursive = true) @test_trixi_include(joinpath(examples_dir(), "dgmulti_3d", "elixir_navierstokes_convergence.jl"), cells_per_dimension=(4, 4, 4), tspan=(0.0, 0.1), - l2=[ - 0.0005532847115849239, + l2=[0.0005532847115849239, 0.000659263490965341, 0.0007776436127362806, 0.0006592634909662951, - 0.0038073628897809185, - ], - linf=[ - 0.0017039861523615585, - 0.002628561703560073, - 0.003531057425112172, - 0.0026285617036090336, - 0.015587829540351095, - ]) + 0.0038073628897809185], + linf=[0.0017039861523615585, + 0.002628561703560073, + 0.003531057425112172, + 0.0026285617036090336, + 0.015587829540351095]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -44,20 +40,16 @@ end @test_trixi_include(joinpath(examples_dir(), "dgmulti_3d", "elixir_navierstokes_convergence_curved.jl"), cells_per_dimension=(4, 4, 4), tspan=(0.0, 0.1), - l2=[ - 0.0014027227251207474, + l2=[0.0014027227251207474, 0.0021322235533273513, 0.0027873741447455194, 0.0024587473070627423, - 0.00997836818019202, - ], - linf=[ - 0.006341750402837576, - 0.010306014252246865, - 0.01520740250924979, - 0.010968264045485565, - 0.047454389831591115, - ]) + 0.00997836818019202], + linf=[0.006341750402837576, + 0.010306014252246865, + 0.01520740250924979, + 0.010968264045485565, + 0.047454389831591115]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -72,20 +64,16 @@ end @test_trixi_include(joinpath(examples_dir(), "dgmulti_3d", "elixir_navierstokes_taylor_green_vortex.jl"), cells_per_dimension=(4, 4, 4), tspan=(0.0, 0.25), - l2=[ - 0.0001825713444029892, + l2=[0.0001825713444029892, 0.015589736382772248, 0.015589736382771884, 0.021943924667273653, - 0.01927370280244222, - ], - linf=[ - 0.0006268463584697681, - 0.03218881662749007, - 0.03218881662697948, - 0.053872495395614256, - 0.05183822000984151, - ]) + 0.01927370280244222], + linf=[0.0006268463584697681, + 0.03218881662749007, + 0.03218881662697948, + 0.053872495395614256, + 0.05183822000984151]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -100,20 +88,16 @@ end @test_trixi_include(joinpath(examples_dir(), "tree_3d_dgsem", "elixir_navierstokes_convergence.jl"), initial_refinement_level=2, tspan=(0.0, 0.1), - l2=[ - 0.0019582188528512257, + l2=[0.0019582188528512257, 0.002653449504302844, 0.002898264205184629, 0.002653449504302853, - 0.009511572365085706, - ], - linf=[ - 0.013680656759085918, - 0.0356910450154318, - 0.023526343547736236, - 0.035691045015431855, - 0.11482570604041165, - ]) + 0.009511572365085706], + linf=[0.013680656759085918, + 0.0356910450154318, + 0.023526343547736236, + 0.035691045015431855, + 0.11482570604041165]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -132,20 +116,16 @@ end t, equations), equations)), - l2=[ - 0.00195468651965362, + l2=[0.00195468651965362, 0.0026554367897028506, 0.002892730402724066, 0.002655436789702817, - 0.009596351796609566, - ], - linf=[ - 0.013680508110645473, - 0.035673446359424356, - 0.024024936779729028, - 0.03567344635942474, - 0.11839497110809383, - ]) + 0.009596351796609566], + linf=[0.013680508110645473, + 0.035673446359424356, + 0.024024936779729028, + 0.03567344635942474, + 0.11839497110809383]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -161,20 +141,16 @@ end "elixir_navierstokes_convergence.jl"), initial_refinement_level=2, tspan=(0.0, 0.1), gradient_variables=GradientVariablesEntropy(), - l2=[ - 0.0019770444875099307, + l2=[0.0019770444875099307, 0.0026524750946399327, 0.00290860030832445, 0.0026524750946399396, - 0.009509568981439294, - ], - linf=[ - 0.01387936112914212, - 0.03526260609304053, - 0.023554197097368997, - 0.035262606093040896, - 0.11719963716509518, - ]) + 0.009509568981439294], + linf=[0.01387936112914212, + 0.03526260609304053, + 0.023554197097368997, + 0.035262606093040896, + 0.11719963716509518]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -194,20 +170,16 @@ end t, equations), equations)), - l2=[ - 0.001974631423398113, + l2=[0.001974631423398113, 0.002654768259143932, 0.002907031063651286, 0.002654768259143901, - 0.009587792882971452, - ], - linf=[ - 0.01387919380137137, - 0.035244084526358944, - 0.02398614622061363, - 0.03524408452635828, - 0.12005056512506407, - ]) + 0.009587792882971452], + linf=[0.01387919380137137, + 0.035244084526358944, + 0.02398614622061363, + 0.03524408452635828, + 0.12005056512506407]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -223,20 +195,16 @@ end "elixir_navierstokes_convergence.jl"), initial_refinement_level=2, tspan=(0.0, 0.1), volume_integral=VolumeIntegralFluxDifferencing(flux_central), - l2=[ - 0.0019582188528180213, + l2=[0.0019582188528180213, 0.002653449504301736, 0.0028982642051960006, 0.0026534495043017384, - 0.009511572364811033, - ], - linf=[ - 0.013680656758949583, - 0.035691045015224444, - 0.02352634354676752, - 0.035691045015223424, - 0.11482570603751441, - ]) + 0.009511572364811033], + linf=[0.013680656758949583, + 0.035691045015224444, + 0.02352634354676752, + 0.035691045015223424, + 0.11482570603751441]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -268,20 +236,16 @@ end dt = 1e-5, ode_default_options()..., callback = callbacks) l2_error, linf_error = analysis_callback(sol) - @test l2_error ≈ [ - 0.0003109336253407314, - 0.0006473493036803503, - 0.0007705277238213672, - 0.0006280517917198335, - 0.000903927789884075, - ] - @test linf_error ≈ [ - 0.0023694155365339142, - 0.010634932622402863, - 0.006772070862236412, - 0.010640551561726901, - 0.019256819038719897, - ] + @test l2_error ≈ [0.0003109336253407314, + 0.0006473493036803503, + 0.0007705277238213672, + 0.0006280517917198335, + 0.000903927789884075] + @test linf_error ≈ [0.0023694155365339142, + 0.010634932622402863, + 0.006772070862236412, + 0.010640551561726901, + 0.019256819038719897] # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -296,20 +260,16 @@ end @test_trixi_include(joinpath(examples_dir(), "tree_3d_dgsem", "elixir_navierstokes_taylor_green_vortex.jl"), initial_refinement_level=2, tspan=(0.0, 0.25), - l2=[ - 0.00024173250389635442, + l2=[0.00024173250389635442, 0.015684268393762454, 0.01568426839376248, 0.021991909545192333, - 0.02825413672911425, - ], - linf=[ - 0.0008410587892853094, - 0.04740176181772552, - 0.04740176181772507, - 0.07483494924031157, - 0.150181591534448, - ]) + 0.02825413672911425], + linf=[0.0008410587892853094, + 0.04740176181772552, + 0.04740176181772507, + 0.07483494924031157, + 0.150181591534448]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -343,20 +303,16 @@ end dt = 5e-3, save_everystep = false, callback = callbacks) l2_error, linf_error = analysis_callback(sol) - @test l2_error ≈ [ - 7.314319856736271e-5, - 0.006266480163542894, - 0.006266489911815533, - 0.008829222305770226, - 0.0032859166842329228, - ] - @test linf_error ≈ [ - 0.0002943968186086554, - 0.013876261980614757, - 0.013883619864959451, - 0.025201279960491936, - 0.018679364985388247, - ] + @test l2_error ≈ [7.314319856736271e-5, + 0.006266480163542894, + 0.006266489911815533, + 0.008829222305770226, + 0.0032859166842329228] + @test linf_error ≈ [0.0002943968186086554, + 0.013876261980614757, + 0.013883619864959451, + 0.025201279960491936, + 0.018679364985388247] # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -372,20 +328,16 @@ end @test_trixi_include(joinpath(examples_dir(), "p4est_3d_dgsem", "elixir_navierstokes_convergence.jl"), initial_refinement_level=2, tspan=(0.0, 0.1), - l2=[ - 0.00026599105554982194, + l2=[0.00026599105554982194, 0.000461877794472316, 0.0005424899076052261, 0.0004618777944723191, - 0.0015846392581126832, - ], - linf=[ - 0.0025241668929956163, - 0.006308461681816373, - 0.004334939663169113, - 0.006308461681804009, - 0.03176343480493493, - ]) + 0.0015846392581126832], + linf=[0.0025241668929956163, + 0.006308461681816373, + 0.004334939663169113, + 0.006308461681804009, + 0.03176343480493493]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -400,20 +352,16 @@ end @test_trixi_include(joinpath(examples_dir(), "p4est_3d_dgsem", "elixir_navierstokes_taylor_green_vortex.jl"), initial_refinement_level=2, tspan=(0.0, 0.25), - l2=[ - 0.0001547509861140407, + l2=[0.0001547509861140407, 0.015637861347119624, 0.015637861347119687, 0.022024699158522523, - 0.009711013505930812, - ], - linf=[ - 0.0006696415247340326, - 0.03442565722527785, - 0.03442565722577423, - 0.06295407168705314, - 0.032857472756916195, - ]) + 0.009711013505930812], + linf=[0.0006696415247340326, + 0.03442565722527785, + 0.03442565722577423, + 0.06295407168705314, + 0.032857472756916195]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -458,20 +406,16 @@ end @test_trixi_include(joinpath(examples_dir(), "p4est_3d_dgsem", "elixir_navierstokes_taylor_green_vortex_amr.jl"), initial_refinement_level=0, tspan=(0.0, 0.5), - l2=[ - 0.0016588740573444188, + l2=[0.0016588740573444188, 0.03437058632045721, 0.03437058632045671, 0.041038898400430075, - 0.30978593009044153, - ], - linf=[ - 0.004173569912012121, - 0.09168674832979556, - 0.09168674832975021, - 0.12129218723807476, - 0.8433893297612087, - ]) + 0.30978593009044153], + linf=[0.004173569912012121, + 0.09168674832979556, + 0.09168674832975021, + 0.12129218723807476, + 0.8433893297612087]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -486,15 +430,12 @@ end @test_trixi_include(joinpath(examples_dir(), "p4est_3d_dgsem", "elixir_navierstokes_blast_wave_amr.jl"), tspan=(0.0, 0.01), - l2=[ - 0.009472104410520866, 0.0017883742549557149, + l2=[0.009472104410520866, 0.0017883742549557149, 0.0017883742549557147, 0.0017883742549557196, - 0.024388540048562748, - ], - linf=[ - 0.6782397526873181, 0.17663702154066238, - 0.17663702154066266, 0.17663702154066238, 1.7327849844825238, - ]) + 0.024388540048562748], + linf=[0.6782397526873181, 0.17663702154066238, + 0.17663702154066266, 0.17663702154066238, + 1.7327849844825238]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_structured_1d.jl b/test/test_structured_1d.jl index f0eecfa9acd..893795cc843 100644 --- a/test/test_structured_1d.jl +++ b/test/test_structured_1d.jl @@ -76,11 +76,9 @@ end @trixi_testset "elixir_euler_sedov_hll_davis.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), l2=[1.278661029299215, 0.0663853410742763, 0.9585741943783386], - linf=[ - 3.1661064228547255, - 0.16256363944708607, - 2.667676158812806, - ], + linf=[3.1661064228547255, + 0.16256363944708607, + 2.667676158812806], tspan=(0.0, 12.5), surface_flux=FluxHLL(min_max_speed_davis)) # Ensure that we do not have excessive memory allocations @@ -96,16 +94,12 @@ end @trixi_testset "elixir_euler_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"), # Expected errors are exactly the same as with TreeMesh! - l2=[ - 2.2527950196212703e-8, + l2=[2.2527950196212703e-8, 1.8187357193835156e-8, - 7.705669939973104e-8, - ], - linf=[ - 1.6205433861493646e-7, - 1.465427772462391e-7, - 5.372255111879554e-7, - ]) + 7.705669939973104e-8], + linf=[1.6205433861493646e-7, + 1.465427772462391e-7, + 5.372255111879554e-7]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -119,16 +113,12 @@ end @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 3.8099996914101204e-6, + l2=[3.8099996914101204e-6, 1.6745575717106341e-6, - 7.732189531480852e-6, - ], - linf=[ - 1.2971473393186272e-5, - 9.270328934274374e-6, - 3.092514399671842e-5, - ]) + 7.732189531480852e-6], + linf=[1.2971473393186272e-5, + 9.270328934274374e-6, + 3.092514399671842e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_structured_2d.jl b/test/test_structured_2d.jl index 522510a42e3..4c61c3ee4c5 100644 --- a/test/test_structured_2d.jl +++ b/test/test_structured_2d.jl @@ -33,34 +33,26 @@ end @trixi_testset "elixir_advection_coupled.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_coupled.jl"), - l2=[ - 7.816742843336293e-6, + l2=[7.816742843336293e-6, 7.816742843340186e-6, 7.816742843025513e-6, - 7.816742843061526e-6, - ], - linf=[ - 6.314906965276812e-5, - 6.314906965187994e-5, - 6.31490696496595e-5, - 6.314906965032563e-5, - ], + 7.816742843061526e-6], + linf=[6.314906965276812e-5, + 6.314906965187994e-5, + 6.31490696496595e-5, + 6.314906965032563e-5], coverage_override=(maxiters = 10^5,)) @testset "analysis_callback(sol) for AnalysisCallbackCoupled" begin errors = analysis_callback(sol) - @test errors.l2≈[ - 7.816742843336293e-6, - 7.816742843340186e-6, - 7.816742843025513e-6, - 7.816742843061526e-6, - ] rtol=1.0e-4 - @test errors.linf≈[ - 6.314906965276812e-5, - 6.314906965187994e-5, - 6.31490696496595e-5, - 6.314906965032563e-5, - ] rtol=1.0e-4 + @test errors.l2≈[7.816742843336293e-6, + 7.816742843340186e-6, + 7.816742843025513e-6, + 7.816742843061526e-6] rtol=1.0e-4 + @test errors.linf≈[6.314906965276812e-5, + 6.314906965187994e-5, + 6.31490696496595e-5, + 6.314906965032563e-5] rtol=1.0e-4 # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -269,20 +261,16 @@ end @trixi_testset "elixir_eulermulti_convergence_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_ec.jl"), - l2=[ - 1.5123651627525257e-5, + l2=[1.5123651627525257e-5, 1.51236516273878e-5, 2.4544918394022538e-5, 5.904791661362391e-6, - 1.1809583322724782e-5, - ], - linf=[ - 8.393471747591974e-5, - 8.393471748258108e-5, - 0.00015028562494778797, - 3.504466610437795e-5, - 7.00893322087559e-5, - ]) + 1.1809583322724782e-5], + linf=[8.393471747591974e-5, + 8.393471748258108e-5, + 0.00015028562494778797, + 3.504466610437795e-5, + 7.00893322087559e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -296,18 +284,14 @@ end @trixi_testset "elixir_euler_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"), # Expected errors are exactly the same as with TreeMesh! - l2=[ - 9.321181253186009e-7, + l2=[9.321181253186009e-7, 1.4181210743438511e-6, 1.4181210743487851e-6, - 4.824553091276693e-6, - ], - linf=[ - 9.577246529612893e-6, - 1.1707525976012434e-5, - 1.1707525976456523e-5, - 4.8869615580926506e-5, - ]) + 4.824553091276693e-6], + linf=[9.577246529612893e-6, + 1.1707525976012434e-5, + 1.1707525976456523e-5, + 4.8869615580926506e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -323,18 +307,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_rotated.jl"), # Expected errors are exactly the same as in elixir_euler_source_terms! - l2=[ - 9.321181253186009e-7, + l2=[9.321181253186009e-7, 1.4181210743438511e-6, 1.4181210743487851e-6, - 4.824553091276693e-6, - ], - linf=[ - 9.577246529612893e-6, - 1.1707525976012434e-5, - 1.1707525976456523e-5, - 4.8869615580926506e-5, - ], + 4.824553091276693e-6], + linf=[9.577246529612893e-6, + 1.1707525976012434e-5, + 1.1707525976456523e-5, + 4.8869615580926506e-5], alpha=0.0) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -350,18 +330,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_rotated.jl"), # Expected errors differ only slightly from elixir_euler_source_terms! - l2=[ - 9.321188057029291e-7, + l2=[9.321188057029291e-7, 1.3195106906473365e-6, 1.510307360354032e-6, - 4.82455408101712e-6, - ], - linf=[ - 9.57723626271445e-6, - 1.0480225511866337e-5, - 1.2817828088262928e-5, - 4.886962393513272e-5, - ], + 4.82455408101712e-6], + linf=[9.57723626271445e-6, + 1.0480225511866337e-5, + 1.2817828088262928e-5, + 4.886962393513272e-5], alpha=0.1) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -377,18 +353,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_rotated.jl"), # Expected errors differ only slightly from elixir_euler_source_terms! - l2=[ - 9.32127973957391e-7, + l2=[9.32127973957391e-7, 8.477824799744325e-7, 1.8175286311402784e-6, - 4.824562453521076e-6, - ], - linf=[ - 9.576898420737834e-6, - 5.057704352218195e-6, - 1.635260719945464e-5, - 4.886978754825577e-5, - ], + 4.824562453521076e-6], + linf=[9.576898420737834e-6, + 5.057704352218195e-6, + 1.635260719945464e-5, + 4.886978754825577e-5], alpha=0.2 * pi) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -404,18 +376,14 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_rotated.jl"), # Expected errors are exactly the same as in elixir_euler_source_terms! - l2=[ - 9.321181253186009e-7, + l2=[9.321181253186009e-7, 1.4181210743438511e-6, 1.4181210743487851e-6, - 4.824553091276693e-6, - ], - linf=[ - 9.577246529612893e-6, - 1.1707525976012434e-5, - 1.1707525976456523e-5, - 4.8869615580926506e-5, - ], + 4.824553091276693e-6], + linf=[9.577246529612893e-6, + 1.1707525976012434e-5, + 1.1707525976456523e-5, + 4.8869615580926506e-5], alpha=0.5 * pi) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -431,18 +399,14 @@ end @trixi_testset "elixir_euler_source_terms_parallelogram.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_parallelogram.jl"), - l2=[ - 1.1167802955144833e-5, + l2=[1.1167802955144833e-5, 1.0805775514153104e-5, 1.953188337010932e-5, - 5.5033856574857146e-5, - ], - linf=[ - 8.297006495561199e-5, - 8.663281475951301e-5, - 0.00012264160606778596, - 0.00041818802502024965, - ]) + 5.5033856574857146e-5], + linf=[8.297006495561199e-5, + 8.663281475951301e-5, + 0.00012264160606778596, + 0.00041818802502024965]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -456,18 +420,14 @@ end @trixi_testset "elixir_euler_source_terms_waving_flag.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_waving_flag.jl"), - l2=[ - 2.991891317562739e-5, + l2=[2.991891317562739e-5, 3.6063177168283174e-5, 2.7082941743640572e-5, - 0.00011414695350996946, - ], - linf=[ - 0.0002437454930492855, - 0.0003438936171968887, - 0.00024217622945688078, - 0.001266380414757684, - ]) + 0.00011414695350996946], + linf=[0.0002437454930492855, + 0.0003438936171968887, + 0.00024217622945688078, + 0.001266380414757684]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -480,18 +440,14 @@ end @trixi_testset "elixir_euler_free_stream.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), - l2=[ - 2.063350241405049e-15, + l2=[2.063350241405049e-15, 1.8571016296925367e-14, 3.1769447886391905e-14, - 1.4104095258528071e-14, - ], - linf=[ - 1.9539925233402755e-14, - 2.9791447087035294e-13, - 6.502853810985698e-13, - 2.7000623958883807e-13, - ], + 1.4104095258528071e-14], + linf=[1.9539925233402755e-14, + 2.9791447087035294e-13, + 6.502853810985698e-13, + 2.7000623958883807e-13], atol=7.0e-13) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -506,18 +462,14 @@ end @trixi_testset "elixir_euler_free_stream.jl with FluxRotated(flux_lax_friedrichs)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), surface_flux=FluxRotated(flux_lax_friedrichs), - l2=[ - 2.063350241405049e-15, + l2=[2.063350241405049e-15, 1.8571016296925367e-14, 3.1769447886391905e-14, - 1.4104095258528071e-14, - ], - linf=[ - 1.9539925233402755e-14, - 2.9791447087035294e-13, - 6.502853810985698e-13, - 2.7000623958883807e-13, - ], + 1.4104095258528071e-14], + linf=[1.9539925233402755e-14, + 2.9791447087035294e-13, + 6.502853810985698e-13, + 2.7000623958883807e-13], atol=7.0e-13) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -532,18 +484,14 @@ end @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 2.259440511901724e-6, + l2=[2.259440511901724e-6, 2.3188881559075347e-6, 2.3188881559568146e-6, - 6.332786324137878e-6, - ], - linf=[ - 1.4987382622067003e-5, - 1.918201192063762e-5, - 1.918201192019353e-5, - 6.052671713430158e-5, - ]) + 6.332786324137878e-6], + linf=[1.4987382622067003e-5, + 1.918201192063762e-5, + 1.918201192019353e-5, + 6.052671713430158e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -556,18 +504,14 @@ end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.03774907669925568, + l2=[0.03774907669925568, 0.02845190575242045, 0.028262802829412605, - 0.13785915638851698, - ], - linf=[ - 0.3368296929764073, - 0.27644083771519773, - 0.27990039685141377, - 1.1971436487402016, - ], + 0.13785915638851698], + linf=[0.3368296929764073, + 0.27644083771519773, + 0.27990039685141377, + 1.1971436487402016], tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -581,18 +525,14 @@ end @trixi_testset "elixir_euler_sedov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 3.69856202e-01, + l2=[3.69856202e-01, 2.35242180e-01, 2.41444928e-01, - 1.28807120e+00, - ], - linf=[ - 1.82786223e+00, - 1.30452904e+00, - 1.40347257e+00, - 6.21791658e+00, - ], + 1.28807120e+00], + linf=[1.82786223e+00, + 1.30452904e+00, + 1.40347257e+00, + 6.21791658e+00], tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -607,18 +547,14 @@ end @trixi_testset "elixir_euler_rayleigh_taylor_instability.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_rayleigh_taylor_instability.jl"), - l2=[ - 0.06365630381017849, + l2=[0.06365630381017849, 0.007166887387738937, 0.002878708825497772, - 0.010247678114070121, - ], - linf=[ - 0.4799214336153155, - 0.024595483032220266, - 0.02059808120543466, - 0.03190756362943725, - ], + 0.010247678114070121], + linf=[0.4799214336153155, + 0.024595483032220266, + 0.02059808120543466, + 0.03190756362943725], cells_per_dimension=(8, 8), tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations @@ -634,18 +570,14 @@ end @trixi_testset "elixir_euler_warm_bubble.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_warm_bubble.jl"), - l2=[ - 0.00019387402388722496, + l2=[0.00019387402388722496, 0.03086514388623955, 0.04541427917165, - 43.892826583444716, - ], - linf=[ - 0.0015942305974430138, - 0.17449778969139373, - 0.3729704262394843, - 307.6706958565337, - ], + 43.892826583444716], + linf=[0.0015942305974430138, + 0.17449778969139373, + 0.3729704262394843, + 307.6706958565337], cells_per_dimension=(32, 16), tspan=(0.0, 10.0)) # Ensure that we do not have excessive memory allocations @@ -660,16 +592,12 @@ end @trixi_testset "elixir_eulerpolytropic_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulerpolytropic_convergence.jl"), - l2=[ - 0.0016688820596537988, + l2=[0.0016688820596537988, 0.0025921681885685425, - 0.003280950351435014, - ], - linf=[ - 0.010994679664394269, - 0.01331197845637, - 0.020080117011346488, - ]) + 0.003280950351435014], + linf=[0.010994679664394269, + 0.01331197845637, + 0.020080117011346488]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -685,14 +613,10 @@ end solver=DGSEM(polydeg = 3, surface_flux = FluxHLL(min_max_speed_davis), volume_integral = VolumeIntegralFluxDifferencing(volume_flux)), - l2=[ - 0.0016689832177644243, 0.0025920263793104445, - 0.003281074494629298, - ], - linf=[ - 0.01099488320190023, 0.013309526619350365, - 0.02008032661117909, - ]) + l2=[0.0016689832177644243, 0.0025920263793104445, + 0.003281074494629298], + linf=[0.01099488320190023, 0.013309526619350365, + 0.02008032661117909]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -705,16 +629,12 @@ end @trixi_testset "elixir_eulerpolytropic_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulerpolytropic_ec.jl"), - l2=[ - 0.03647890611450939, + l2=[0.03647890611450939, 0.025284915444045052, - 0.025340697771609126, - ], - linf=[ - 0.32516731565355583, - 0.37509762516540046, - 0.29812843284727336, - ]) + 0.025340697771609126], + linf=[0.32516731565355583, + 0.37509762516540046, + 0.29812843284727336]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -728,16 +648,12 @@ end @trixi_testset "elixir_eulerpolytropic_isothermal_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulerpolytropic_isothermal_wave.jl"), - l2=[ - 0.004998778491726366, + l2=[0.004998778491726366, 0.004998916000294425, - 9.259136963058664e-17, - ], - linf=[ - 0.010001103673834888, - 0.010051165098399503, - 7.623942913643681e-16, - ]) + 9.259136963058664e-17], + linf=[0.010001103673834888, + 0.010051165098399503, + 7.623942913643681e-16]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -750,16 +666,12 @@ end @trixi_testset "elixir_eulerpolytropic_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulerpolytropic_wave.jl"), - l2=[ - 0.23642682112204072, + l2=[0.23642682112204072, 0.20904264390331334, - 8.174982691297391e-17, - ], - linf=[ - 0.4848250368349989, - 0.253350873815695, - 4.984552457753618e-16, - ]) + 8.174982691297391e-17], + linf=[0.4848250368349989, + 0.253350873815695, + 4.984552457753618e-16]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -789,16 +701,12 @@ end @trixi_testset "elixir_hypdiff_harmonic_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_harmonic_nonperiodic.jl"), - l2=[ - 0.19357947606509474, + l2=[0.19357947606509474, 0.47041398037626814, - 0.4704139803762686, - ], - linf=[ - 0.35026352556630114, - 0.8344372248051408, - 0.8344372248051408, - ], + 0.4704139803762686], + linf=[0.35026352556630114, + 0.8344372248051408, + 0.8344372248051408], tspan=(0.0, 0.1), coverage_override=(polydeg = 3,)) # Prevent long compile time in CI # Ensure that we do not have excessive memory allocations @@ -819,10 +727,10 @@ end 0.024483244374818587, 0.035439957899127385, 0.0016022148194667542], linf=[0.24749024430983746, 0.2990608279625713, - 0.3966937932860247, 0.22265033744519683, - 0.9757376320946505, 0.12123736788315098, - 0.12837436699267113, 0.17793825293524734, - 0.03460761690059514], + 0.3966937932860247, 0.22265033744519683, + 0.9757376320946505, 0.12123736788315098, + 0.12837436699267113, 0.17793825293524734, + 0.03460761690059514], tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -842,10 +750,10 @@ end 0.007003258686714405, 0.006734267830082687, 0.004253003868791559], linf=[0.17517380432288565, 0.06197353710696667, - 0.038494840938641646, 0.05293345499813148, - 0.03817506476831778, 0.042847170999492534, - 0.03761563456810613, 0.048184237474911844, - 0.04114666955364693], + 0.038494840938641646, 0.05293345499813148, + 0.03817506476831778, 0.042847170999492534, + 0.03761563456810613, 0.048184237474911844, + 0.04114666955364693], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -859,18 +767,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.0017285599436729316, + l2=[0.0017285599436729316, 0.025584610912606776, 0.028373834961180594, - 6.274146767730866e-5, - ], - linf=[ - 0.012972309788264802, - 0.108283714215621, - 0.15831585777928936, - 0.00018196759554722775, - ], + 6.274146767730866e-5], + linf=[0.012972309788264802, + 0.108283714215621, + 0.15831585777928936, + 0.00018196759554722775], tspan=(0.0, 0.05)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -884,18 +788,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 0.7920927046419308, + l2=[0.7920927046419308, 9.92129670988898e-15, 1.0118635033124588e-14, - 0.7920927046419308, - ], - linf=[ - 2.408429868800133, - 5.5835419986809516e-14, - 5.448874313931364e-14, - 2.4084298688001335, - ], + 0.7920927046419308], + linf=[2.408429868800133, + 5.5835419986809516e-14, + 5.448874313931364e-14, + 2.4084298688001335], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -910,18 +810,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced_wet_dry.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced_wet_dry.jl"), - l2=[ - 0.019731646454942086, + l2=[0.019731646454942086, 1.0694532773278277e-14, 1.1969913383405568e-14, - 0.0771517260037954, - ], - linf=[ - 0.4999999999998892, - 6.067153702623552e-14, - 4.4849667259339357e-14, - 1.9999999999999993, - ], + 0.0771517260037954], + linf=[0.4999999999998892, + 6.067153702623552e-14, + 4.4849667259339357e-14, + 1.9999999999999993], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -935,18 +831,14 @@ end @trixi_testset "elixir_shallowwater_conical_island.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_conical_island.jl"), - l2=[ - 0.04593154164306353, + l2=[0.04593154164306353, 0.1644534881916908, 0.16445348819169076, - 0.0011537702354532122, - ], - linf=[ - 0.21100717610846442, - 0.9501592344310412, - 0.950159234431041, - 0.021790250683516296, - ], + 0.0011537702354532122], + linf=[0.21100717610846442, + 0.9501592344310412, + 0.950159234431041, + 0.021790250683516296], tspan=(0.0, 0.025)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -960,18 +852,14 @@ end @trixi_testset "elixir_shallowwater_parabolic_bowl.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_parabolic_bowl.jl"), - l2=[ - 0.00015285369980313484, + l2=[0.00015285369980313484, 1.9536806395943226e-5, 9.936906607758672e-5, - 5.0686313334616055e-15, - ], - linf=[ - 0.003316119030459211, - 0.0005075409427972817, - 0.001986721761060583, - 4.701794509287538e-14, - ], + 5.0686313334616055e-15], + linf=[0.003316119030459211, + 0.0005075409427972817, + 0.001986721761060583, + 4.701794509287538e-14], tspan=(0.0, 0.025), cells_per_dimension=(40, 40)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -991,10 +879,11 @@ end 0.017291573200291104, 0.026856206495339655, 0.0007443858043598808], linf=[0.25144373906033013, 0.32881947152723745, - 0.3053266801502693, 0.20989755319972866, - 0.9927517314507455, 0.1105172121361323, 0.1257708104676617, - 0.1628334844841588, - 0.02624301627479052]) + 0.3053266801502693, 0.20989755319972866, + 0.9927517314507455, 0.1105172121361323, + 0.1257708104676617, + 0.1628334844841588, + 0.02624301627479052]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_structured_3d.jl b/test/test_structured_3d.jl index a52c459d6be..d82506c01fe 100644 --- a/test/test_structured_3d.jl +++ b/test/test_structured_3d.jl @@ -79,20 +79,16 @@ end @trixi_testset "elixir_euler_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"), # Expected errors are exactly the same as with TreeMesh! - l2=[ - 0.010385936842224346, + l2=[0.010385936842224346, 0.009776048833895767, 0.00977604883389591, 0.009776048833895733, - 0.01506687097416608, - ], - linf=[ - 0.03285848350791731, - 0.0321792316408982, - 0.032179231640894645, - 0.032179231640895534, - 0.0655408023333299, - ]) + 0.01506687097416608], + linf=[0.03285848350791731, + 0.0321792316408982, + 0.032179231640894645, + 0.032179231640895534, + 0.0655408023333299]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -105,20 +101,16 @@ end @trixi_testset "elixir_euler_free_stream.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), - l2=[ - 2.8815700334367128e-15, + l2=[2.8815700334367128e-15, 9.361915278236651e-15, 9.95614203619935e-15, 1.6809941842374106e-14, - 1.4815037041566735e-14, - ], - linf=[ - 4.1300296516055823e-14, - 2.0444756998472258e-13, - 1.0133560657266116e-13, - 2.0627943797535409e-13, - 2.8954616482224083e-13, - ]) + 1.4815037041566735e-14], + linf=[4.1300296516055823e-14, + 2.0444756998472258e-13, + 1.0133560657266116e-13, + 2.0627943797535409e-13, + 2.8954616482224083e-13]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -132,20 +124,16 @@ end @trixi_testset "elixir_euler_free_stream.jl with FluxRotated(flux_lax_friedrichs)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), surface_flux=FluxRotated(flux_lax_friedrichs), - l2=[ - 2.8815700334367128e-15, + l2=[2.8815700334367128e-15, 9.361915278236651e-15, 9.95614203619935e-15, 1.6809941842374106e-14, - 1.4815037041566735e-14, - ], - linf=[ - 4.1300296516055823e-14, - 2.0444756998472258e-13, - 1.0133560657266116e-13, - 2.0627943797535409e-13, - 2.8954616482224083e-13, - ]) + 1.4815037041566735e-14], + linf=[4.1300296516055823e-14, + 2.0444756998472258e-13, + 1.0133560657266116e-13, + 2.0627943797535409e-13, + 2.8954616482224083e-13]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -159,20 +147,16 @@ end @trixi_testset "elixir_euler_source_terms_nonperiodic_curved.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic_curved.jl"), - l2=[ - 0.0032940531178824463, + l2=[0.0032940531178824463, 0.003275679548217804, 0.0030020672748714084, 0.00324007343451744, - 0.005721986362580164, - ], - linf=[ - 0.03156756290660656, - 0.033597629023726316, - 0.02095783702361409, - 0.03353574465232212, - 0.05873635745032857, - ]) + 0.005721986362580164], + linf=[0.03156756290660656, + 0.033597629023726316, + 0.02095783702361409, + 0.03353574465232212, + 0.05873635745032857]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -185,20 +169,16 @@ end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.011367083018614027, + l2=[0.011367083018614027, 0.007022020327490176, 0.006759580335962235, 0.006820337637760632, - 0.02912659127566544, - ], - linf=[ - 0.2761764220925329, - 0.20286331858055706, - 0.18763944865434593, - 0.19313636558790004, - 0.707563913727584, - ], + 0.02912659127566544], + linf=[0.2761764220925329, + 0.20286331858055706, + 0.18763944865434593, + 0.19313636558790004, + 0.707563913727584], tspan=(0.0, 0.25), coverage_override=(polydeg = 3,)) # Prevent long compile time in CI # Ensure that we do not have excessive memory allocations @@ -213,20 +193,16 @@ end @trixi_testset "elixir_euler_sedov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 5.30310390e-02, + l2=[5.30310390e-02, 2.53167260e-02, 2.64276438e-02, 2.52195992e-02, - 3.56830295e-01, - ], - linf=[ - 6.16356950e-01, - 2.50600049e-01, - 2.74796377e-01, - 2.46448217e-01, - 4.77888479e+00, - ], + 3.56830295e-01], + linf=[6.16356950e-01, + 2.50600049e-01, + 2.74796377e-01, + 2.46448217e-01, + 4.77888479e+00], tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -246,10 +222,11 @@ end 0.003077498677885352, 0.0030740006760477624, 4.192129696970217e-5], linf=[0.2883946030582689, 0.25956437344015054, - 0.2614364943543665, 0.24617277938134657, - 1.1370443512475847, 0.1278041831463388, 0.13347391885068594, - 0.1457563463643099, - 0.0021174246048172563], + 0.2614364943543665, 0.24617277938134657, + 1.1370443512475847, 0.1278041831463388, + 0.13347391885068594, + 0.1457563463643099, + 0.0021174246048172563], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -269,10 +246,10 @@ end 0.0013332311430907598, 0.001647832598455728, 0.0013647609788548722], linf=[0.027510637768610846, 0.02797062834945721, - 0.01274249949295704, 0.038940694415543736, - 0.02200825678588325, 0.03167600959583505, - 0.021420957993862344, 0.03386589835999665, - 0.01888303191983353], + 0.01274249949295704, 0.038940694415543736, + 0.02200825678588325, 0.03167600959583505, + 0.021420957993862344, 0.03386589835999665, + 0.01888303191983353], # Use same polydeg as everything else to prevent long compile times in CI coverage_override=(polydeg = 3,)) # Ensure that we do not have excessive memory allocations @@ -293,10 +270,10 @@ end 0.001328514015121245, 0.001671342529206066, 0.0013653963058149186], linf=[0.027719103797310463, 0.027570111789910784, - 0.012561901006903103, 0.03903568568480584, - 0.021311996934554767, 0.03154849824135775, - 0.020996033645485412, 0.03403185137382961, - 0.019488952445771597], + 0.012561901006903103, 0.03903568568480584, + 0.021311996934554767, 0.03154849824135775, + 0.020996033645485412, 0.03403185137382961, + 0.019488952445771597], 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,)) @@ -318,10 +295,10 @@ end 0.0039219074393817, 0.003906321245184237, 4.197255300781248e-5], linf=[0.30749098250807516, 0.2679008863509767, - 0.271243087484388, 0.26545396569129537, - 0.9620950892188596, 0.18163281157498123, - 0.15995708312378454, 0.17918221526906408, - 0.015138346608166353], + 0.271243087484388, 0.26545396569129537, + 0.9620950892188596, 0.18163281157498123, + 0.15995708312378454, 0.17918221526906408, + 0.015138346608166353], tspan=(0.0, 0.25), # Use same polydeg as everything else to prevent long compile times in CI coverage_override=(polydeg = 3,)) diff --git a/test/test_t8code_2d.jl b/test/test_t8code_2d.jl index d536a6dd73a..7884fa6cd50 100644 --- a/test/test_t8code_2d.jl +++ b/test/test_t8code_2d.jl @@ -127,18 +127,14 @@ end # This test is identical to the one in `test_p4est_2d.jl`. @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), - l2=[ - 0.0034516244508588046, + l2=[0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, - 0.004731710454271893, - ], - linf=[ - 0.04155789011775046, - 0.024772109862748914, - 0.03759938693042297, - 0.08039824959535657, - ]) + 0.004731710454271893], + linf=[0.04155789011775046, + 0.024772109862748914, + 0.03759938693042297, + 0.08039824959535657]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -152,12 +148,10 @@ end @trixi_testset "elixir_euler_free_stream.jl" begin # This test is identical to the one in `test_p4est_2d.jl`. @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), - l2=[ - 2.063350241405049e-15, + l2=[2.063350241405049e-15, 1.8571016296925367e-14, 3.1769447886391905e-14, - 1.4104095258528071e-14, - ], + 1.4104095258528071e-14], linf=[1.9539925233402755e-14, 2e-12, 4.8e-12, 4e-12], atol=2.0e-12,) # Ensure that we do not have excessive memory allocations @@ -173,18 +167,14 @@ end @trixi_testset "elixir_euler_shockcapturing_ec.jl" begin # This test is identical to the one in `test_p4est_2d.jl`. @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing_ec.jl"), - l2=[ - 9.53984675e-02, + l2=[9.53984675e-02, 1.05633455e-01, 1.05636158e-01, - 3.50747237e-01, - ], - linf=[ - 2.94357464e-01, - 4.07893014e-01, - 3.97334516e-01, - 1.08142520e+00, - ], + 3.50747237e-01], + linf=[2.94357464e-01, + 4.07893014e-01, + 3.97334516e-01, + 1.08142520e+00], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -200,18 +190,14 @@ end # This test is identical to the one in `test_p4est_2d.jl` besides minor # deviations in the expected error norms. @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 3.76149952e-01, + l2=[3.76149952e-01, 2.46970327e-01, 2.46970327e-01, - 1.28889042e+00, - ], - linf=[ - 1.22139001e+00, - 1.17742626e+00, - 1.17742626e+00, - 6.20638482e+00, - ], + 1.28889042e+00], + linf=[1.22139001e+00, + 1.17742626e+00, + 1.17742626e+00, + 6.20638482e+00], tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -226,18 +212,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl" begin # This test is identical to the one in `test_p4est_2d.jl`. @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 9.168126407325352e-5, + l2=[9.168126407325352e-5, 0.0009795410115453788, 0.002546408320320785, - 3.941189812642317e-6, - ], - linf=[ - 0.0009903782521019089, - 0.0059752684687262025, - 0.010941106525454103, - 1.2129488214718265e-5, - ], + 3.941189812642317e-6], + linf=[0.0009903782521019089, + 0.0059752684687262025, + 0.010941106525454103, + 1.2129488214718265e-5], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -258,10 +240,10 @@ end 7.879639065049896e-7, 1.0628631669056271e-6, 4.3382328912336153e-7], linf=[4.255466285174592e-5, 1.0029706745823264e-5, - 1.0029706747467781e-5, 1.2122265939010224e-5, - 5.4791097160444835e-6, 5.18922042269665e-6, - 5.189220422141538e-6, 9.552667261422676e-6, - 1.4237578427628152e-6]) + 1.0029706747467781e-5, 1.2122265939010224e-5, + 5.4791097160444835e-6, 5.18922042269665e-6, + 5.189220422141538e-6, 9.552667261422676e-6, + 1.4237578427628152e-6]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -282,10 +264,10 @@ end 0.15403457366543802, 0.0, 2.8399715649715473e-5], linf=[10.04369305341599, 17.995640564998403, 9.576041548174265, - 0.0, - 19.429658884314534, 1.3821395681242314, 1.818559351543182, - 0.0, - 0.002261930217575465], + 0.0, + 19.429658884314534, 1.3821395681242314, 1.818559351543182, + 0.0, + 0.002261930217575465], tspan=(0.0, 0.02)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_t8code_3d.jl b/test/test_t8code_3d.jl index 4232cf04094..027d1df2741 100644 --- a/test/test_t8code_3d.jl +++ b/test/test_t8code_3d.jl @@ -103,20 +103,16 @@ mkdir(outdir) @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_curved.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonconforming_unstructured_curved.jl"), - l2=[ - 4.070355207909268e-5, + l2=[4.070355207909268e-5, 4.4993257426833716e-5, 5.10588457841744e-5, 5.102840924036687e-5, - 0.00019986264001630542, - ], - linf=[ - 0.0016987332417202072, - 0.003622956808262634, - 0.002029576258317789, - 0.0024206977281964193, - 0.008526972236273522, - ], + 0.00019986264001630542], + linf=[0.0016987332417202072, + 0.003622956808262634, + 0.002029576258317789, + 0.0024206977281964193, + 0.008526972236273522], tspan=(0.0, 0.01)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -132,20 +128,16 @@ mkdir(outdir) @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 0.0015106060984283647, + l2=[0.0015106060984283647, 0.0014733349038567685, 0.00147333490385685, 0.001473334903856929, - 0.0028149479453087093, - ], - linf=[ - 0.008070806335238156, - 0.009007245083113125, - 0.009007245083121784, - 0.009007245083102688, - 0.01562861968368434, - ], + 0.0028149479453087093], + linf=[0.008070806335238156, + 0.009007245083113125, + 0.009007245083121784, + 0.009007245083102688, + 0.01562861968368434], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -160,20 +152,16 @@ mkdir(outdir) # This test is identical to the one in `test_p4est_3d.jl`. @trixi_testset "elixir_euler_free_stream.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), - l2=[ - 5.162664597942288e-15, + l2=[5.162664597942288e-15, 1.941857343642486e-14, 2.0232366394187278e-14, 2.3381518645408552e-14, - 7.083114561232324e-14, - ], - linf=[ - 7.269740365245525e-13, - 3.289868377720495e-12, - 4.440087186807773e-12, - 3.8686831516088205e-12, - 9.412914891981927e-12, - ], + 7.083114561232324e-14], + linf=[7.269740365245525e-13, + 3.289868377720495e-12, + 4.440087186807773e-12, + 3.8686831516088205e-12, + 9.412914891981927e-12], tspan=(0.0, 0.03)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -188,20 +176,16 @@ mkdir(outdir) # This test is identical to the one in `test_p4est_3d.jl`. @trixi_testset "elixir_euler_free_stream_extruded.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream_extruded.jl"), - l2=[ - 8.444868392439035e-16, + l2=[8.444868392439035e-16, 4.889826056731442e-15, 2.2921260987087585e-15, 4.268460455702414e-15, - 1.1356712092620279e-14, - ], - linf=[ - 7.749356711883593e-14, - 2.8792246364872653e-13, - 1.1121659149182506e-13, - 3.3228975127030935e-13, - 9.592326932761353e-13, - ], + 1.1356712092620279e-14], + linf=[7.749356711883593e-14, + 2.8792246364872653e-13, + 1.1121659149182506e-13, + 3.3228975127030935e-13, + 9.592326932761353e-13], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -216,20 +200,16 @@ mkdir(outdir) # This test is identical to the one in `test_p4est_3d.jl`. @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.010380390326164493, + l2=[0.010380390326164493, 0.006192950051354618, 0.005970674274073704, 0.005965831290564327, - 0.02628875593094754, - ], - linf=[ - 0.3326911600075694, - 0.2824952141320467, - 0.41401037398065543, - 0.45574161423218573, - 0.8099577682187109, - ], + 0.02628875593094754], + linf=[0.3326911600075694, + 0.2824952141320467, + 0.41401037398065543, + 0.45574161423218573, + 0.8099577682187109], tspan=(0.0, 0.2), coverage_override=(polydeg = 3,)) # Prevent long compile time in CI # Ensure that we do not have excessive memory allocations @@ -246,20 +226,16 @@ mkdir(outdir) # deviations in the expected error norms. @trixi_testset "elixir_euler_sedov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 7.82070951e-02, + 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, - ], + 3.75260911e-01], + linf=[7.45329845e-01, + 3.21754792e-01, + 3.21754792e-01, + 3.21754792e-01, + 4.76151527e+00], tspan=(0.0, 0.3), coverage_override=(polydeg = 3,)) # Prevent long compile time in CI # Ensure that we do not have excessive memory allocations diff --git a/test/test_threaded.jl b/test/test_threaded.jl index a8a1b1b425a..af20200c844 100644 --- a/test/test_threaded.jl +++ b/test/test_threaded.jl @@ -88,18 +88,14 @@ Trixi.MPI.Barrier(Trixi.mpi_comm()) @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, + 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, - ], + 6.3327863238858925e-6], + linf=[1.498738264560373e-5, + 1.9182011928187137e-5, + 1.918201192685487e-5, + 6.0526717141407005e-5], rtol=0.001) # Ensure that we do not have excessive memory allocations @@ -115,18 +111,14 @@ Trixi.MPI.Barrier(Trixi.mpi_comm()) @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_ec.jl"), - l2=[ - 0.061751715597716854, + l2=[0.061751715597716854, 0.05018223615408711, 0.05018989446443463, - 0.225871559730513, - ], - linf=[ - 0.29347582879608825, - 0.31081249232844693, - 0.3107380389947736, - 1.0540358049885143, - ]) + 0.225871559730513], + linf=[0.29347582879608825, + 0.31081249232844693, + 0.3107380389947736, + 1.0540358049885143]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -176,18 +168,14 @@ Trixi.MPI.Barrier(Trixi.mpi_comm()) @trixi_testset "FDSBP, elixir_euler_convergence.jl" begin @test_trixi_include(joinpath(examples_dir(), "tree_2d_fdsbp", "elixir_euler_convergence.jl"), - l2=[ - 1.7088389997042244e-6, + l2=[1.7088389997042244e-6, 1.7437997855125774e-6, 1.7437997855350776e-6, - 5.457223460127621e-6, - ], - linf=[ - 9.796504903736292e-6, - 9.614745892783105e-6, - 9.614745892783105e-6, - 4.026107182575345e-5, - ], + 5.457223460127621e-6], + linf=[9.796504903736292e-6, + 9.614745892783105e-6, + 9.614745892783105e-6, + 4.026107182575345e-5], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations @@ -233,10 +221,10 @@ end 0.024483244374818587, 0.035439957899127385, 0.0016022148194667542], linf=[0.24749024430983746, 0.2990608279625713, - 0.3966937932860247, 0.22265033744519683, - 0.9757376320946505, 0.12123736788315098, - 0.12837436699267113, 0.17793825293524734, - 0.03460761690059514], + 0.3966937932860247, 0.22265033744519683, + 0.9757376320946505, 0.12123736788315098, + 0.12837436699267113, 0.17793825293524734, + 0.03460761690059514], tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations @@ -259,9 +247,9 @@ end 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], + 0.8475748723784078, 0.0, + 8.881784197001252e-16, 1.7763568394002505e-15, + 1.7763568394002505e-15], tspan=(0.0, 5.0)) # Ensure that we do not have excessive memory allocations @@ -279,18 +267,14 @@ end @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, + l2=[0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, - 0.004731710454271893, - ], - linf=[ - 0.04155789011775046, - 0.024772109862748914, - 0.03759938693042297, - 0.08039824959535657, - ]) + 0.004731710454271893], + linf=[0.04155789011775046, + 0.024772109862748914, + 0.03759938693042297, + 0.08039824959535657]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -305,18 +289,14 @@ end @trixi_testset "elixir_eulergravity_convergence.jl" begin @test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem", "elixir_eulergravity_convergence.jl"), - l2=[ - 0.00024871265138964204, + l2=[0.00024871265138964204, 0.0003370077102132591, 0.0003370077102131964, - 0.0007231525513793697, - ], - linf=[ - 0.0015813032944647087, - 0.0020494288423820173, - 0.0020494288423824614, - 0.004793821195083758, - ], + 0.0007231525513793697], + linf=[0.0015813032944647087, + 0.0020494288423820173, + 0.0020494288423824614, + 0.004793821195083758], tspan=(0.0, 0.1)) end end @@ -325,35 +305,27 @@ end @trixi_testset "elixir_euler_source_terms_nonconforming_unstructured_flag.jl" begin @test_trixi_include(joinpath(examples_dir(), "t8code_2d_dgsem", "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), - l2=[ - 0.0034516244508588046, + l2=[0.0034516244508588046, 0.0023420334036925493, 0.0024261923964557187, - 0.004731710454271893, - ], - linf=[ - 0.04155789011775046, - 0.024772109862748914, - 0.03759938693042297, - 0.08039824959535657, - ]) + 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(), "t8code_2d_dgsem", "elixir_eulergravity_convergence.jl"), - l2=[ - 0.00024871265138964204, + l2=[0.00024871265138964204, 0.0003370077102132591, 0.0003370077102131964, - 0.0007231525513793697, - ], - linf=[ - 0.0015813032944647087, - 0.0020494288423820173, - 0.0020494288423824614, - 0.004793821195083758, - ], + 0.0007231525513793697], + linf=[0.0015813032944647087, + 0.0020494288423820173, + 0.0020494288423824614, + 0.004793821195083758], tspan=(0.0, 0.1)) end end @@ -366,18 +338,14 @@ end volume_integral=VolumeIntegralFluxDifferencing(flux_ranocha), surface_integral=SurfaceIntegralWeakForm(flux_ranocha), approximation_type=SBP(), - l2=[ - 0.006400337855843578, + l2=[0.006400337855843578, 0.005303799804137764, 0.005303799804119745, - 0.013204169007030144, - ], - linf=[ - 0.03798302318566282, - 0.05321027922532284, - 0.05321027922605448, - 0.13392025411839015, - ],) + 0.013204169007030144], + linf=[0.03798302318566282, + 0.05321027922532284, + 0.05321027922605448, + 0.13392025411839015],) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -393,18 +361,14 @@ end @test_trixi_include(joinpath(examples_dir(), "dgmulti_2d", "elixir_euler_curved.jl"), alg=RDPK3SpFSAL49(thread = OrdinaryDiffEq.True()), - l2=[ - 1.720476068165337e-5, + l2=[1.720476068165337e-5, 1.592168205710526e-5, 1.592168205812963e-5, - 4.894094865697305e-5, - ], - linf=[ - 0.00010525416930584619, - 0.00010003778091061122, - 0.00010003778085621029, - 0.00036426282101720275, - ]) + 4.894094865697305e-5], + linf=[0.00010525416930584619, + 0.00010003778091061122, + 0.00010003778085621029, + 0.00036426282101720275]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -419,18 +383,14 @@ 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=[ - 2.344080455438114e-6, + l2=[2.344080455438114e-6, 1.8610038753097983e-6, 2.4095165666095305e-6, - 6.373308158814308e-6, - ], - linf=[ - 2.5099852761334418e-5, - 2.2683684021362893e-5, - 2.6180448559287584e-5, - 5.5752932611508044e-5, - ]) + 6.373308158814308e-6], + linf=[2.5099852761334418e-5, + 2.2683684021362893e-5, + 2.6180448559287584e-5, + 5.5752932611508044e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -445,18 +405,14 @@ end @trixi_testset "elixir_euler_fdsbp_periodic.jl" begin @test_trixi_include(joinpath(examples_dir(), "dgmulti_2d", "elixir_euler_fdsbp_periodic.jl"), - l2=[ - 1.3333320340010056e-6, + l2=[1.3333320340010056e-6, 2.044834627970641e-6, 2.044834627855601e-6, - 5.282189803559564e-6, - ], - linf=[ - 2.7000151718858945e-6, - 3.988595028259212e-6, - 3.9885950273710336e-6, - 8.848583042286862e-6, - ]) + 5.282189803559564e-6], + linf=[2.7000151718858945e-6, + 3.988595028259212e-6, + 3.9885950273710336e-6, + 8.848583042286862e-6]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_1d_euler.jl b/test/test_tree_1d_euler.jl index 39a1f6e30ba..ea7ff2f1196 100644 --- a/test/test_tree_1d_euler.jl +++ b/test/test_tree_1d_euler.jl @@ -12,16 +12,12 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") @trixi_testset "elixir_euler_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"), - l2=[ - 2.2527950196212703e-8, + l2=[2.2527950196212703e-8, 1.8187357193835156e-8, - 7.705669939973104e-8, - ], - linf=[ - 1.6205433861493646e-7, - 1.465427772462391e-7, - 5.372255111879554e-7, - ]) + 7.705669939973104e-8], + linf=[1.6205433861493646e-7, + 1.465427772462391e-7, + 5.372255111879554e-7]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -34,16 +30,12 @@ end @trixi_testset "elixir_euler_convergence_pure_fv.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence_pure_fv.jl"), - l2=[ - 0.019355699748523896, + l2=[0.019355699748523896, 0.022326984561234497, - 0.02523665947241734, - ], - linf=[ - 0.02895961127645519, - 0.03293442484199227, - 0.04246098278632804, - ]) + 0.02523665947241734], + linf=[0.02895961127645519, + 0.03293442484199227, + 0.04246098278632804]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -56,16 +48,12 @@ end @trixi_testset "elixir_euler_density_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"), - l2=[ - 0.0011482554820217855, + l2=[0.0011482554820217855, 0.00011482554830323462, - 5.741277429325267e-6, - ], - linf=[ - 0.004090978306812376, - 0.0004090978313582294, - 2.045489210189544e-5, - ]) + 5.741277429325267e-6], + linf=[0.004090978306812376, + 0.0004090978313582294, + 2.045489210189544e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -78,16 +66,12 @@ end @trixi_testset "elixir_euler_density_wave.jl with initial_condition_constant" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"), - l2=[ - 7.71293052584723e-16, + l2=[7.71293052584723e-16, 1.9712947511091717e-14, - 7.50672833504266e-15, - ], - linf=[ - 3.774758283725532e-15, - 6.733502644351574e-14, - 2.4868995751603507e-14, - ], + 7.50672833504266e-15], + linf=[3.774758283725532e-15, + 6.733502644351574e-14, + 2.4868995751603507e-14], initial_condition=initial_condition_constant) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -102,16 +86,12 @@ end @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 3.8099996914101204e-6, + l2=[3.8099996914101204e-6, 1.6745575717106341e-6, - 7.732189531480852e-6, - ], - linf=[ - 1.2971473393186272e-5, - 9.270328934274374e-6, - 3.092514399671842e-5, - ]) + 7.732189531480852e-6], + linf=[1.2971473393186272e-5, + 9.270328934274374e-6, + 3.092514399671842e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -124,16 +104,12 @@ end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.11821957357197649, + l2=[0.11821957357197649, 0.15330089521538678, - 0.4417674632047301, - ], - linf=[ - 0.24280567569982958, - 0.29130548795961936, - 0.8847009003152442, - ]) + 0.4417674632047301], + linf=[0.24280567569982958, + 0.29130548795961936, + 0.8847009003152442]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -146,16 +122,12 @@ end @trixi_testset "elixir_euler_ec.jl with flux_kennedy_gruber" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.07803455838661963, + l2=[0.07803455838661963, 0.10032577312032283, - 0.29228156303827935, - ], - linf=[ - 0.2549869853794955, - 0.3376472164661263, - 0.9650477546553962, - ], + 0.29228156303827935], + linf=[0.2549869853794955, + 0.3376472164661263, + 0.9650477546553962], maxiters=10, surface_flux=flux_kennedy_gruber, volume_flux=flux_kennedy_gruber) @@ -171,16 +143,12 @@ end @trixi_testset "elixir_euler_ec.jl with flux_shima_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.07800654460172655, + l2=[0.07800654460172655, 0.10030365573277883, - 0.2921481199111959, - ], - linf=[ - 0.25408579350400395, - 0.3388657679031271, - 0.9776486386921928, - ], + 0.2921481199111959], + linf=[0.25408579350400395, + 0.3388657679031271, + 0.9776486386921928], maxiters=10, surface_flux=flux_shima_etal, volume_flux=flux_shima_etal) @@ -196,16 +164,12 @@ end @trixi_testset "elixir_euler_ec.jl with flux_chandrashekar" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.07801923089205756, + l2=[0.07801923089205756, 0.10039557434912669, - 0.2922210399923278, - ], - linf=[ - 0.2576521982607225, - 0.3409717926625057, - 0.9772961936567048, - ], + 0.2922210399923278], + linf=[0.2576521982607225, + 0.3409717926625057, + 0.9772961936567048], maxiters=10, surface_flux=flux_chandrashekar, volume_flux=flux_chandrashekar) @@ -222,11 +186,9 @@ end @trixi_testset "elixir_euler_ec.jl with flux_hll" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), l2=[0.07852272782240548, 0.10209790867523805, 0.293873048809011], - linf=[ - 0.19244768908604093, - 0.2515941686151897, - 0.7258000837553769, - ], + linf=[0.19244768908604093, + 0.2515941686151897, + 0.7258000837553769], maxiters=10, surface_flux=flux_hll, volume_flux=flux_ranocha) @@ -242,16 +204,12 @@ end @trixi_testset "elixir_euler_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), - l2=[ - 0.11606096465319675, + l2=[0.11606096465319675, 0.15028768943458806, - 0.4328230323046703, - ], - linf=[ - 0.18031710091067965, - 0.2351582421501841, - 0.6776805692092567, - ]) + 0.4328230323046703], + linf=[0.18031710091067965, + 0.2351582421501841, + 0.6776805692092567]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -265,11 +223,9 @@ end @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 = 6,)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -301,11 +257,9 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_pure_fv.jl"), l2=[1.0735456065491455, 0.07131078703089379, 0.9205739468590453], - linf=[ - 3.4296365168219216, - 0.17635583964559245, - 2.6574584326179505, - ], + linf=[3.4296365168219216, + 0.17635583964559245, + 2.6574584326179505], # Let this test run longer to cover some lines in flux_hllc coverage_override=(maxiters = 10^5, tspan = (0.0, 0.1))) # Ensure that we do not have excessive memory allocations @@ -321,11 +275,9 @@ end @trixi_testset "elixir_euler_sedov_blast_wave.jl with pressure" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), l2=[1.297525985166995, 0.07964929522694145, 0.9269991156246368], - linf=[ - 3.1773015255764427, - 0.21331831536493773, - 2.6650170188241047, - ], + linf=[3.1773015255764427, + 0.21331831536493773, + 2.6650170188241047], shock_indicator_variable=pressure, cfl=0.2, coverage_override=(maxiters = 6,)) @@ -342,11 +294,9 @@ end @trixi_testset "elixir_euler_sedov_blast_wave.jl with density" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), l2=[1.2798798835860528, 0.07103461242058921, 0.9273792517187003], - linf=[ - 3.1087017048015824, - 0.17734706962928956, - 2.666689753470263, - ], + linf=[3.1087017048015824, + 0.17734706962928956, + 2.666689753470263], shock_indicator_variable=density, cfl=0.2, coverage_override=(maxiters = 6,)) @@ -378,11 +328,9 @@ end @trixi_testset "elixir_euler_blast_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave.jl"), l2=[0.21934822867340323, 0.28131919126002686, 0.554361702716662], - linf=[ - 1.5180897390290355, - 1.3967085956620369, - 2.0663825294019595, - ], + linf=[1.5180897390290355, + 1.3967085956620369, + 2.0663825294019595], maxiters=30) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -396,18 +344,14 @@ end @trixi_testset "elixir_euler_quasi_1d_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_quasi_1d_source_terms.jl"), - l2=[ - 3.876288369618363e-7, + l2=[3.876288369618363e-7, 2.2247043122302947e-7, 2.964004224572679e-7, - 5.2716983399807875e-8, - ], - linf=[ - 2.3925118561862746e-6, - 1.3603693522767912e-6, - 1.821888865105592e-6, - 1.1166012159335992e-7, - ]) + 5.2716983399807875e-8], + linf=[2.3925118561862746e-6, + 1.3603693522767912e-6, + 1.821888865105592e-6, + 1.1166012159335992e-7]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -421,18 +365,14 @@ end @trixi_testset "elixir_euler_quasi_1d_discontinuous.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_quasi_1d_discontinuous.jl"), - l2=[ - 0.045510421156346015, + l2=[0.045510421156346015, 0.036750584788912195, 0.2468985959132176, - 0.03684494180829024, - ], - linf=[ - 0.3313374853025697, - 0.11621933362158643, - 1.827403013568638, - 0.28045939999015723, - ]) + 0.03684494180829024], + linf=[0.3313374853025697, + 0.11621933362158643, + 1.827403013568638, + 0.28045939999015723]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -445,18 +385,14 @@ end @trixi_testset "elixir_euler_quasi_1d_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_quasi_1d_ec.jl"), - l2=[ - 0.08889113985713998, + l2=[0.08889113985713998, 0.16199235348889673, 0.40316524365054346, - 2.9602775074723667e-16, - ], - linf=[ - 0.28891355898284043, - 0.3752709888964313, - 0.84477102402413, - 8.881784197001252e-16, - ]) + 2.9602775074723667e-16], + linf=[0.28891355898284043, + 0.3752709888964313, + 0.84477102402413, + 8.881784197001252e-16]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_tree_1d_eulergravity.jl b/test/test_tree_1d_eulergravity.jl index 9ab5b287d0b..0814b3b7867 100644 --- a/test/test_tree_1d_eulergravity.jl +++ b/test/test_tree_1d_eulergravity.jl @@ -12,16 +12,12 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") @trixi_testset "elixir_eulergravity_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), - l2=[ - 0.0002170799126638106, + l2=[0.0002170799126638106, 0.0002913792848717502, - 0.0006112320856262327, - ], - linf=[ - 0.0004977401033188222, - 0.0013594223337776157, - 0.002041891084400227, - ]) + 0.0006112320856262327], + linf=[0.0004977401033188222, + 0.0013594223337776157, + 0.002041891084400227]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_tree_1d_eulermulti.jl b/test/test_tree_1d_eulermulti.jl index b6c79ce03d1..c0e7aa62270 100644 --- a/test/test_tree_1d_eulermulti.jl +++ b/test/test_tree_1d_eulermulti.jl @@ -18,8 +18,8 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") equations = CompressibleEulerMulticomponentEquations1D(gammas = SVector{length(gammas)}(gammas...), gas_constants = SVector{length(gas_constants)}(gas_constants...)) u = [-1.4632513788889214, 0.9908786980927811, 0.2909066990257628, - 0.6256623915420473, 0.4905882754313441, 0.14481800501749112, - 1.0333532872771651, 0.6805599818745411] + 0.6256623915420473, 0.4905882754313441, 0.14481800501749112, + 1.0333532872771651, 0.6805599818745411] w = cons2entropy(u, equations) # test that the entropy variables match the gradients of the total entropy @test w ≈ ForwardDiff.gradient(u -> Trixi.total_entropy(u, equations), u) @@ -33,8 +33,8 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") 0.016888510510282385, 0.03377702102056477, 0.06755404204112954], linf=[0.29130548795961864, 0.8847009003152357, - 0.034686525099975274, 0.06937305019995055, - 0.1387461003999011]) + 0.034686525099975274, 0.06937305019995055, + 0.1387461003999011]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -47,18 +47,14 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") @trixi_testset "elixir_eulermulti_es.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_es.jl"), - l2=[ - 0.1522380497572071, + l2=[0.1522380497572071, 0.43830846465313206, 0.03907262116499431, - 0.07814524232998862, - ], - linf=[ - 0.24939193075537294, - 0.7139395740052739, - 0.06324208768391237, - 0.12648417536782475, - ]) + 0.07814524232998862], + linf=[0.24939193075537294, + 0.7139395740052739, + 0.06324208768391237, + 0.12648417536782475]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -71,18 +67,14 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") @trixi_testset "elixir_eulermulti_convergence_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_ec.jl"), - l2=[ - 8.575236038539227e-5, + l2=[8.575236038539227e-5, 0.00016387804318585358, 1.9412699303977585e-5, - 3.882539860795517e-5, - ], - linf=[ - 0.00030593277277124464, - 0.0006244803933350696, - 7.253121435135679e-5, - 0.00014506242870271358, - ]) + 3.882539860795517e-5], + linf=[0.00030593277277124464, + 0.0006244803933350696, + 7.253121435135679e-5, + 0.00014506242870271358]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -99,8 +91,8 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") 1.5466205761868047e-6, 3.0932411523736094e-6, 6.186482304747219e-6, 1.2372964609494437e-5], linf=[0.00012014372605895218, 0.0003313207215800418, - 6.50836791016296e-6, 1.301673582032592e-5, - 2.603347164065184e-5, 5.206694328130368e-5]) + 6.50836791016296e-6, 1.301673582032592e-5, + 2.603347164065184e-5, 5.206694328130368e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -117,8 +109,8 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") 9.426737161533622e-7, 1.8853474323067245e-6, 3.770694864613449e-6, 7.541389729226898e-6], linf=[0.00011622351152063004, 0.0003079221967086099, - 3.2177423254231563e-6, 6.435484650846313e-6, - 1.2870969301692625e-5, 2.574193860338525e-5], + 3.2177423254231563e-6, 6.435484650846313e-6, + 1.2870969301692625e-5, 2.574193860338525e-5], volume_flux=flux_chandrashekar) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -137,8 +129,8 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") 0.013698784353152794, 0.019179518517518084], linf=[29.6413044707026, 1322.5844802186496, 0.09191919374782143, - 0.31092970966717925, - 0.4417989757182038], + 0.31092970966717925, + 0.4417989757182038], tspan=(0.0, 0.0001)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_1d_fdsbp.jl b/test/test_tree_1d_fdsbp.jl index 33d67e3366f..2755ad1c190 100644 --- a/test/test_tree_1d_fdsbp.jl +++ b/test/test_tree_1d_fdsbp.jl @@ -91,16 +91,12 @@ end @testset "Compressible Euler" begin @trixi_testset "elixir_euler_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 4.1370344463620254e-6, + l2=[4.1370344463620254e-6, 4.297052451817826e-6, - 9.857382045003056e-6, - ], - linf=[ - 1.675305070092392e-5, - 1.3448113863834266e-5, - 3.8185336878271414e-5, - ], + 9.857382045003056e-6], + linf=[1.675305070092392e-5, + 1.3448113863834266e-5, + 3.8185336878271414e-5], tspan=(0.0, 0.5)) # Ensure that we do not have excessive memory allocations @@ -115,16 +111,12 @@ end @trixi_testset "elixir_euler_convergence.jl with splitting_vanleer_haenel" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 3.413790589105506e-6, + l2=[3.413790589105506e-6, 4.243957977156001e-6, - 8.667369423676437e-6, - ], - linf=[ - 1.4228079689537765e-5, - 1.3249887941046978e-5, - 3.201552933251861e-5, - ], + 8.667369423676437e-6], + linf=[1.4228079689537765e-5, + 1.3249887941046978e-5, + 3.201552933251861e-5], tspan=(0.0, 0.5), flux_splitting=splitting_vanleer_haenel) @@ -140,16 +132,12 @@ end @trixi_testset "elixir_euler_convergence.jl with VolumeIntegralStrongForm" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 8.6126767518378e-6, + l2=[8.6126767518378e-6, 7.670897071480729e-6, - 1.4972772284191368e-5, - ], - linf=[ - 6.707982777909294e-5, - 3.487256699541419e-5, - 0.00010170331350556339, - ], + 1.4972772284191368e-5], + linf=[6.707982777909294e-5, + 3.487256699541419e-5, + 0.00010170331350556339], tspan=(0.0, 0.5), solver=DG(D_upw.central, nothing, SurfaceIntegralStrongForm(), VolumeIntegralStrongForm())) @@ -166,16 +154,12 @@ end @trixi_testset "elixir_euler_density_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"), - l2=[ - 1.5894925236031034e-5, + l2=[1.5894925236031034e-5, 9.428412101106044e-6, - 0.0008986477358789918, - ], - linf=[ - 4.969438024382544e-5, - 2.393091812063694e-5, - 0.003271817388146303, - ], + 0.0008986477358789918], + linf=[4.969438024382544e-5, + 2.393091812063694e-5, + 0.003271817388146303], tspan=(0.0, 0.005), abstol=1.0e-9, reltol=1.0e-9) # Ensure that we do not have excessive memory allocations diff --git a/test/test_tree_1d_mhd.jl b/test/test_tree_1d_mhd.jl index 2150ddfd074..68e02041a0a 100644 --- a/test/test_tree_1d_mhd.jl +++ b/test/test_tree_1d_mhd.jl @@ -12,26 +12,22 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") @trixi_testset "elixir_mhd_alfven_wave.jl with initial_condition_constant" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 1.440611823425164e-15, + l2=[1.440611823425164e-15, 1.1373567770134494e-14, 3.024482376149653e-15, 2.0553143516814395e-15, 3.9938347410210535e-14, 3.984545392098788e-16, 2.4782402104201577e-15, - 1.551737464879987e-15, - ], - linf=[ - 1.9984014443252818e-15, - 1.3405943022348765e-14, - 3.3584246494910985e-15, - 3.164135620181696e-15, - 7.815970093361102e-14, - 8.881784197001252e-16, - 2.886579864025407e-15, - 2.942091015256665e-15, - ], + 1.551737464879987e-15], + linf=[1.9984014443252818e-15, + 1.3405943022348765e-14, + 3.3584246494910985e-15, + 3.164135620181696e-15, + 7.815970093361102e-14, + 8.881784197001252e-16, + 2.886579864025407e-15, + 2.942091015256665e-15], initial_condition=initial_condition_constant, tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations @@ -46,26 +42,22 @@ end @trixi_testset "elixir_mhd_alfven_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 1.0375628983659061e-5, + l2=[1.0375628983659061e-5, 6.571144191446236e-7, 3.5833569836289104e-5, 3.583356983615859e-5, 5.084863194951084e-6, 1.1963224165731992e-16, 3.598916927583752e-5, - 3.598916927594727e-5, - ], - linf=[ - 2.614095879338585e-5, - 9.577266731216823e-7, - 0.00012406198007461344, - 0.00012406198007509917, - 1.5066209528846741e-5, - 2.220446049250313e-16, - 0.00012658678753942054, - 0.00012658678753908748, - ]) + 3.598916927594727e-5], + linf=[2.614095879338585e-5, + 9.577266731216823e-7, + 0.00012406198007461344, + 0.00012406198007509917, + 1.5066209528846741e-5, + 2.220446049250313e-16, + 0.00012658678753942054, + 0.00012658678753908748]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -78,26 +70,22 @@ end @trixi_testset "elixir_mhd_alfven_wave.jl with flux_derigs_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 1.4396053943470756e-5, + l2=[1.4396053943470756e-5, 1.1211016739165248e-5, 3.577870687983967e-5, 3.577870687982181e-5, 1.967962220860377e-6, 1.1963224165731992e-16, 3.583562899483433e-5, - 3.583562899486565e-5, - ], - linf=[ - 5.830577969345718e-5, - 3.280495696370357e-5, - 0.00012279619948236953, - 0.00012279619948227238, - 6.978806516122482e-6, - 2.220446049250313e-16, - 0.00012564003648959932, - 0.00012564003648994626, - ], + 3.583562899486565e-5], + linf=[5.830577969345718e-5, + 3.280495696370357e-5, + 0.00012279619948236953, + 0.00012279619948227238, + 6.978806516122482e-6, + 2.220446049250313e-16, + 0.00012564003648959932, + 0.00012564003648994626], volume_flux=flux_derigs_etal) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -111,18 +99,14 @@ end @trixi_testset "elixir_mhd_alfven_wave.jl with flux_hllc" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 1.036850596986597e-5, 1.965192583650368e-6, + l2=[1.036850596986597e-5, 1.965192583650368e-6, 3.5882124656715505e-5, 3.5882124656638764e-5, 5.270975504780837e-6, 1.1963224165731992e-16, - 3.595811808912869e-5, 3.5958118089159453e-5, - ], - linf=[ - 2.887280521446378e-5, 7.310580790352001e-6, - 0.00012390046377899755, 0.00012390046377787345, - 1.5102711136583125e-5, 2.220446049250313e-16, - 0.0001261935452181312, 0.0001261935452182006, - ], + 3.595811808912869e-5, 3.5958118089159453e-5], + linf=[2.887280521446378e-5, 7.310580790352001e-6, + 0.00012390046377899755, 0.00012390046377787345, + 1.5102711136583125e-5, 2.220446049250313e-16, + 0.0001261935452181312, 0.0001261935452182006], surface_flux=flux_hllc) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -136,26 +120,22 @@ end @trixi_testset "elixir_mhd_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), - l2=[ - 0.05815183849746399, + l2=[0.05815183849746399, 0.08166807325621023, 0.054659228513541165, 0.054659228513541165, 0.15578125987042743, 4.130462730494e-17, 0.05465258887150046, - 0.05465258887150046, - ], - linf=[ - 0.12165312668363826, - 0.1901920742264952, - 0.10059813883022554, - 0.10059813883022554, - 0.44079257431070706, - 1.1102230246251565e-16, - 0.10528911365809579, - 0.10528911365809579, - ]) + 0.05465258887150046], + linf=[0.12165312668363826, + 0.1901920742264952, + 0.10059813883022554, + 0.10059813883022554, + 0.44079257431070706, + 1.1102230246251565e-16, + 0.10528911365809579, + 0.10528911365809579]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -168,26 +148,22 @@ end @trixi_testset "elixir_mhd_briowu_shock_tube.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_briowu_shock_tube.jl"), - l2=[ - 0.17477712356961989, + l2=[0.17477712356961989, 0.19489623595086944, 0.3596546157640463, 0.0, 0.3723215736814466, 1.2060075775846403e-15, 0.36276754492568164, - 0.0, - ], - linf=[ - 0.5797109945880677, - 0.4372991899547103, - 1.0906536287185835, - 0.0, - 1.0526758874956808, - 5.995204332975845e-15, - 1.5122922036932964, - 0.0, - ], + 0.0], + linf=[0.5797109945880677, + 0.4372991899547103, + 1.0906536287185835, + 0.0, + 1.0526758874956808, + 5.995204332975845e-15, + 1.5122922036932964, + 0.0], coverage_override=(maxiters = 6,)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -201,26 +177,22 @@ end @trixi_testset "elixir_mhd_torrilhon_shock_tube.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_torrilhon_shock_tube.jl"), - l2=[ - 0.45700904847931145, + l2=[0.45700904847931145, 0.4792535936512035, 0.340651203521865, 0.4478034694296928, 0.9204708961093411, 1.3216517820475193e-16, 0.28897419402047725, - 0.25521206483145126, - ], - linf=[ - 1.2185238171352286, - 0.8913202384963431, - 0.8488793580488431, - 0.973083603686, - 1.660723397705417, - 2.220446049250313e-16, - 0.6874726847741993, - 0.65536978110274, - ]) + 0.25521206483145126], + linf=[1.2185238171352286, + 0.8913202384963431, + 0.8488793580488431, + 0.973083603686, + 1.660723397705417, + 2.220446049250313e-16, + 0.6874726847741993, + 0.65536978110274]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -234,18 +206,14 @@ end @trixi_testset "elixir_mhd_torrilhon_shock_tube.jl (HLLC)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_torrilhon_shock_tube.jl"), surface_flux=flux_hllc, - l2=[ - 0.4573799618744708, 0.4792633358230866, 0.34064852506872795, + l2=[0.4573799618744708, 0.4792633358230866, 0.34064852506872795, 0.4479668434955162, 0.9203891782415092, 1.3216517820475193e-16, 0.28887826520860815, - 0.255281629265771, - ], - linf=[ - 1.2382842201671505, 0.8929169308132259, 0.871298623806198, - 0.9822415614542821, 1.6726170732132717, - 2.220446049250313e-16, 0.7016155888023747, - 0.6556091522071984, - ]) + 0.255281629265771], + linf=[1.2382842201671505, 0.8929169308132259, 0.871298623806198, + 0.9822415614542821, 1.6726170732132717, + 2.220446049250313e-16, 0.7016155888023747, + 0.6556091522071984]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -258,26 +226,22 @@ end @trixi_testset "elixir_mhd_ryujones_shock_tube.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ryujones_shock_tube.jl"), - l2=[ - 0.23469781891518154, + l2=[0.23469781891518154, 0.3916675299696121, 0.08245195301016353, 0.1745346945706147, 0.9606363432904367, 6.608258910237605e-17, 0.21542929107153735, - 0.10705457908737925, - ], - linf=[ - 0.6447951791685409, - 0.9461857095377463, - 0.35074627554617605, - 0.8515177411529542, - 2.0770652030507053, - 1.1102230246251565e-16, - 0.49670855513788204, - 0.24830199967863564, - ], + 0.10705457908737925], + linf=[0.6447951791685409, + 0.9461857095377463, + 0.35074627554617605, + 0.8515177411529542, + 2.0770652030507053, + 1.1102230246251565e-16, + 0.49670855513788204, + 0.24830199967863564], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -291,26 +255,22 @@ end @trixi_testset "elixir_mhd_shu_osher_shock_tube.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_shu_osher_shock_tube.jl"), - l2=[ - 1.01126210e+00, + 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, - ], + 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 = 6,)) # Ensure that we do not have excessive memory allocations @@ -328,26 +288,22 @@ end trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_shu_osher_shock_tube.jl"), tspan = (0.0, 0.0)) @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_shu_osher_shock_tube.jl"), - l2=[ - 1.01539817e+00, + l2=[1.01539817e+00, 8.29625810e+00, 1.29548008e+00, 0.00000000e+00, 5.23565514e+01, 3.18641825e-16, 1.00485291e+00, - 0.00000000e+00, - ], - 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, - ], + 0.00000000e+00], + 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), diff --git a/test/test_tree_1d_mhdmulti.jl b/test/test_tree_1d_mhdmulti.jl index 9bf34634886..f7bda3afd0c 100644 --- a/test/test_tree_1d_mhdmulti.jl +++ b/test/test_tree_1d_mhdmulti.jl @@ -18,10 +18,10 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") 0.054652588871500665, 0.008307405499637766, 0.01661481099927553, 0.03322962199855106], linf=[0.19019207422649645, 0.10059813883022888, - 0.10059813883022888, 0.4407925743107146, - 1.1102230246251565e-16, 0.10528911365809623, - 0.10528911365809623, 0.01737901809766182, - 0.03475803619532364, 0.06951607239064728]) + 0.10059813883022888, 0.4407925743107146, + 1.1102230246251565e-16, 0.10528911365809623, + 0.10528911365809623, 0.01737901809766182, + 0.03475803619532364, 0.06951607239064728]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -40,10 +40,10 @@ end 0.054665489963920275, 0.008308349501359825, 0.01661669900271965, 0.0332333980054393], linf=[0.1824424257860952, 0.09734687137001484, - 0.09734687137001484, 0.4243089502087325, - 1.1102230246251565e-16, 0.09558639591092555, - 0.09558639591092555, 0.017364773041550624, - 0.03472954608310125, 0.0694590921662025], + 0.09734687137001484, 0.4243089502087325, + 1.1102230246251565e-16, 0.09558639591092555, + 0.09558639591092555, 0.017364773041550624, + 0.03472954608310125, 0.0694590921662025], volume_flux=flux_derigs_etal) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -63,10 +63,10 @@ end 0.05363207135290325, 0.008258265884659555, 0.01651653176931911, 0.03303306353863822], linf=[0.14101014428198477, 0.07762441749521025, - 0.07762441749521025, 0.3381334453289866, - 1.1102230246251565e-16, 0.07003646400675223, - 0.07003646400675223, 0.014962483760600165, - 0.02992496752120033, 0.05984993504240066]) + 0.07762441749521025, 0.3381334453289866, + 1.1102230246251565e-16, 0.07003646400675223, + 0.07003646400675223, 0.014962483760600165, + 0.02992496752120033, 0.05984993504240066]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -85,10 +85,10 @@ end 0.0003259682502567132, 2.5467510126885455e-5, 5.093502025377091e-5, 0.00010187004050754182], linf=[3.877554303711845e-5, 0.0012437848638874956, - 0.0012437848638876898, 0.00016431262020277781, - 1.1102230246251565e-16, 0.0012443734922607112, - 0.001244373492260704, 5.691007974162332e-5, - 0.00011382015948324664, 0.00022764031896649328]) + 0.0012437848638876898, 0.00016431262020277781, + 1.1102230246251565e-16, 0.0012443734922607112, + 0.001244373492260704, 5.691007974162332e-5, + 0.00011382015948324664, 0.00022764031896649328]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -107,10 +107,10 @@ end 0.05329005553971236, 0.10658011107942472], linf=[0.4288187627971754, 1.0386547815614993, 0.0, - 0.9541678878162702, - 5.773159728050814e-15, 1.4595119339458051, 0.0, - 0.18201910908829552, - 0.36403821817659104], + 0.9541678878162702, + 5.773159728050814e-15, 1.4595119339458051, 0.0, + 0.18201910908829552, + 0.36403821817659104], coverage_override=(maxiters = 6,)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_1d_shallowwater.jl b/test/test_tree_1d_shallowwater.jl index 2269e858928..29604ebe193 100644 --- a/test/test_tree_1d_shallowwater.jl +++ b/test/test_tree_1d_shallowwater.jl @@ -15,11 +15,9 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") @trixi_testset "elixir_shallowwater_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"), l2=[0.244729018751225, 0.8583565222389505, 0.07330427577586297], - linf=[ - 2.1635021283528504, - 3.8717508164234453, - 1.7711213427919539, - ], + linf=[2.1635021283528504, + 3.8717508164234453, + 1.7711213427919539], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -33,16 +31,12 @@ end @trixi_testset "elixir_shallowwater_ec.jl with initial_condition_weak_blast_wave" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"), - l2=[ - 0.39464782107209717, + l2=[0.39464782107209717, 2.03880864210846, - 4.1623084150546725e-10, - ], - linf=[ - 0.778905801278281, - 3.2409883402608273, - 7.419800190922032e-10, - ], + 4.1623084150546725e-10], + linf=[0.778905801278281, + 3.2409883402608273, + 7.419800190922032e-10], initial_condition=initial_condition_weak_blast_wave, tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations @@ -57,11 +51,9 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 0.10416666834254829, + l2=[0.10416666834254829, 1.4352935256803184e-14, - 0.10416666834254838, - ], + 0.10416666834254838], linf=[1.9999999999999996, 3.248036646353028e-14, 2.0], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations @@ -76,11 +68,9 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl with FluxHydrostaticReconstruction" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 0.10416666834254835, + l2=[0.10416666834254835, 1.1891029971551825e-14, - 0.10416666834254838, - ], + 0.10416666834254838], linf=[2.0000000000000018, 2.4019608337954543e-14, 2.0], surface_flux=(FluxHydrostaticReconstruction(flux_lax_friedrichs, hydrostatic_reconstruction_audusse_etal), @@ -98,11 +88,9 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl with flux_nonconservative_ersing_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 0.10416666834254838, + l2=[0.10416666834254838, 1.6657566141935285e-14, - 0.10416666834254838, - ], + 0.10416666834254838], linf=[2.0000000000000004, 3.0610625110157164e-14, 2.0], surface_flux=(flux_wintermeyer_etal, flux_nonconservative_ersing_etal), @@ -122,16 +110,12 @@ end @trixi_testset "elixir_shallowwater_well_balanced_wet_dry.jl with FluxHydrostaticReconstruction" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced_wet_dry.jl"), - l2=[ - 0.00965787167169024, + l2=[0.00965787167169024, 5.345454081916856e-14, - 0.03857583749209928, - ], - linf=[ - 0.4999999999998892, - 2.2447689894899726e-13, - 1.9999999999999714, - ], + 0.03857583749209928], + linf=[0.4999999999998892, + 2.2447689894899726e-13, + 1.9999999999999714], tspan=(0.0, 0.25), # Soften the tolerance as test results vary between different CPUs atol=1000 * eps()) @@ -147,16 +131,12 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.0022363707373868713, + l2=[0.0022363707373868713, 0.01576799981934617, - 4.436491725585346e-5, - ], - linf=[ - 0.00893601803417754, - 0.05939797350246456, - 9.098379777405796e-5, - ], + 4.436491725585346e-5], + linf=[0.00893601803417754, + 0.05939797350246456, + 9.098379777405796e-5], tspan=(0.0, 0.025)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -170,16 +150,12 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl with flux_hll" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.0022758146627220154, + l2=[0.0022758146627220154, 0.015864082886204556, - 4.436491725585346e-5, - ], - linf=[ - 0.008457195427364006, - 0.057201667446161064, - 9.098379777405796e-5, - ], + 4.436491725585346e-5], + linf=[0.008457195427364006, + 0.057201667446161064, + 9.098379777405796e-5], tspan=(0.0, 0.025), surface_flux=(flux_hll, flux_nonconservative_fjordholm_etal)) # Ensure that we do not have excessive memory allocations @@ -194,16 +170,12 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl with flux_nonconservative_ersing_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.005774284062933275, + l2=[0.005774284062933275, 0.017408601639513584, - 4.43649172561843e-5, - ], - linf=[ - 0.01639116193303547, - 0.05102877460799604, - 9.098379777450205e-5, - ], + 4.43649172561843e-5], + linf=[0.01639116193303547, + 0.05102877460799604, + 9.098379777450205e-5], surface_flux=(flux_wintermeyer_etal, flux_nonconservative_ersing_etal), volume_flux=(flux_wintermeyer_etal, @@ -222,16 +194,12 @@ end @trixi_testset "elixir_shallowwater_source_terms_dirichlet.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms_dirichlet.jl"), - l2=[ - 0.0022851099219788917, + l2=[0.0022851099219788917, 0.01560453773635554, - 4.43649172558535e-5, - ], - linf=[ - 0.008934615705174398, - 0.059403169140869405, - 9.098379777405796e-5, - ], + 4.43649172558535e-5], + linf=[0.008934615705174398, + 0.059403169140869405, + 9.098379777405796e-5], tspan=(0.0, 0.025)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -246,16 +214,12 @@ end @trixi_testset "elixir_shallowwater_source_terms_dirichlet.jl with FluxHydrostaticReconstruction" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms_dirichlet.jl"), - l2=[ - 0.0022956052733432287, + l2=[0.0022956052733432287, 0.015540053559855601, - 4.43649172558535e-5, - ], - linf=[ - 0.008460440313118323, - 0.05720939349382359, - 9.098379777405796e-5, - ], + 4.43649172558535e-5], + linf=[0.008460440313118323, + 0.05720939349382359, + 9.098379777405796e-5], surface_flux=(FluxHydrostaticReconstruction(flux_hll, hydrostatic_reconstruction_audusse_etal), flux_nonconservative_audusse_etal), @@ -273,16 +237,12 @@ end @trixi_testset "elixir_shallowwater_well_balanced_nonperiodic.jl with Dirichlet boundary" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced_nonperiodic.jl"), - l2=[ - 1.725964362045055e-8, + l2=[1.725964362045055e-8, 5.0427180314307505e-16, - 1.7259643530442137e-8, - ], - linf=[ - 3.844551077492042e-8, - 3.469453422316143e-15, - 3.844551077492042e-8, - ], + 1.7259643530442137e-8], + linf=[3.844551077492042e-8, + 3.469453422316143e-15, + 3.844551077492042e-8], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -297,16 +257,12 @@ end @trixi_testset "elixir_shallowwater_well_balanced_nonperiodic.jl with wall boundary" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced_nonperiodic.jl"), - l2=[ - 1.7259643614361866e-8, + l2=[1.7259643614361866e-8, 3.5519018243195145e-16, - 1.7259643530442137e-8, - ], - linf=[ - 3.844551010878661e-8, - 9.846474508971374e-16, - 3.844551077492042e-8, - ], + 1.7259643530442137e-8], + linf=[3.844551010878661e-8, + 9.846474508971374e-16, + 3.844551077492042e-8], tspan=(0.0, 0.25), boundary_condition=boundary_condition_slip_wall) # Ensure that we do not have excessive memory allocations @@ -323,11 +279,9 @@ end @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_shock_capturing.jl"), l2=[0.07424140641160326, 0.2148642632748155, 0.0372579849000542], - linf=[ - 1.1209754279344226, - 1.3230788645853582, - 0.8646939843534251, - ], + linf=[1.1209754279344226, + 1.3230788645853582, + 0.8646939843534251], tspan=(0.0, 0.05)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -341,16 +295,12 @@ end @trixi_testset "elixir_shallowwater_beach.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_beach.jl"), - l2=[ - 0.17979210479598923, + l2=[0.17979210479598923, 1.2377495706611434, - 6.289818963361573e-8, - ], - linf=[ - 0.845938394800688, - 3.3740800777086575, - 4.4541473087633676e-7, - ], + 6.289818963361573e-8], + linf=[0.845938394800688, + 3.3740800777086575, + 4.4541473087633676e-7], tspan=(0.0, 0.05), atol=3e-10) # see https://github.com/trixi-framework/Trixi.jl/issues/1617 # Ensure that we do not have excessive memory allocations @@ -365,16 +315,12 @@ end @trixi_testset "elixir_shallowwater_parabolic_bowl.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_parabolic_bowl.jl"), - l2=[ - 8.965981683033589e-5, + l2=[8.965981683033589e-5, 1.8565707397810857e-5, - 4.1043039226164336e-17, - ], - linf=[ - 0.00041080213807871235, - 0.00014823261488938177, - 2.220446049250313e-16, - ], + 4.1043039226164336e-17], + linf=[0.00041080213807871235, + 0.00014823261488938177, + 2.220446049250313e-16], tspan=(0.0, 0.05)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -389,18 +335,14 @@ end @trixi_testset "elixir_shallow_water_quasi_1d_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallow_water_quasi_1d_source_terms.jl"), - l2=[ - 6.37048760275098e-5, + l2=[6.37048760275098e-5, 0.0002745658116815704, 4.436491725647962e-6, - 8.872983451152218e-6, - ], - linf=[ - 0.00026747526881631956, - 0.0012106730729152249, - 9.098379777500165e-6, - 1.8196759554278685e-5, - ], + 8.872983451152218e-6], + linf=[0.00026747526881631956, + 0.0012106730729152249, + 9.098379777500165e-6, + 1.8196759554278685e-5], tspan=(0.0, 0.05)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -415,18 +357,14 @@ end @trixi_testset "elixir_shallowwater_quasi_1d_well_balanced.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_quasi_1d_well_balanced.jl"), - l2=[ - 1.4250229186905198e-14, + l2=[1.4250229186905198e-14, 2.495109919406496e-12, 7.408599286788738e-17, - 2.7205812409138776e-16, - ], - linf=[ - 5.284661597215745e-14, - 2.74056233065078e-12, - 2.220446049250313e-16, - 8.881784197001252e-16, - ], + 2.7205812409138776e-16], + linf=[5.284661597215745e-14, + 2.74056233065078e-12, + 2.220446049250313e-16, + 8.881784197001252e-16], tspan=(0.0, 100.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -441,18 +379,14 @@ end @trixi_testset "elixir_shallowwater_quasi_1d_discontinuous.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_quasi_1d_discontinuous.jl"), - l2=[ - 0.02843233740533314, + l2=[0.02843233740533314, 0.14083324483705398, 0.0054554472558998, - 0.005455447255899814, - ], - linf=[ - 0.26095842440037487, - 0.45919004549253795, - 0.09999999999999983, - 0.10000000000000009, - ],) + 0.005455447255899814], + linf=[0.26095842440037487, + 0.45919004549253795, + 0.09999999999999983, + 0.10000000000000009],) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_tree_1d_shallowwater_twolayer.jl b/test/test_tree_1d_shallowwater_twolayer.jl index 180fb3ec3b3..634f35b9635 100644 --- a/test/test_tree_1d_shallowwater_twolayer.jl +++ b/test/test_tree_1d_shallowwater_twolayer.jl @@ -17,8 +17,8 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") 0.005049271397924551, 0.0024633066562966574, 0.0004744186597732739], linf=[0.0213772149343594, 0.005385752427290447, - 0.02175023787351349, - 0.008212004668840978, 0.0008992474511784199], + 0.02175023787351349, + 0.008212004668840978, 0.0008992474511784199], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -37,8 +37,8 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") 0.001002881985401548, 2.133351105037203e-16, 0.0010028819854016578], linf=[2.6229018956769323e-15, 1.878451903240623e-16, - 0.005119880996670156, - 8.003199803957679e-16, 0.005119880996670666], + 0.005119880996670156, + 8.003199803957679e-16, 0.005119880996670666], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -56,7 +56,7 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem") l2=[0.1000774903431289, 0.5670692949571057, 0.08764242501014498, 0.45412307886094555, 0.013638618139749523], linf=[0.586718937495144, 2.1215606128311584, 0.5185911311186155, - 1.820382495072612, 0.5], + 1.820382495072612, 0.5], surface_flux=(flux_lax_friedrichs, flux_nonconservative_ersing_etal), tspan=(0.0, 0.25)) diff --git a/test/test_tree_2d_acoustics.jl b/test/test_tree_2d_acoustics.jl index 89bccbf8ca1..3eb76254fb9 100644 --- a/test/test_tree_2d_acoustics.jl +++ b/test/test_tree_2d_acoustics.jl @@ -12,24 +12,20 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_acoustics_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_acoustics_convergence.jl"), - l2=[ - 0.0019921138796370834, + l2=[0.0019921138796370834, 0.002090394698052287, 0.0006091925854593805, 0.0, 0.0, 0.0, - 0.0, - ], - linf=[ - 0.00769282588065634, - 0.008276649669227254, - 0.004196479023954813, - 0.0, - 0.0, - 0.0, - 0.0, - ]) + 0.0], + linf=[0.00769282588065634, + 0.008276649669227254, + 0.004196479023954813, + 0.0, + 0.0, + 0.0, + 0.0]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -42,24 +38,20 @@ end @trixi_testset "elixir_acoustics_gauss.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_acoustics_gauss.jl"), - l2=[ - 0.08005276517890283, + l2=[0.08005276517890283, 0.08005276517890268, 0.4187202920734123, 0.0, 0.0, 0.0, - 0.0, - ], - linf=[ - 0.17261097190220992, - 0.17261097190220973, - 1.13601894068238, - 0.0, - 0.0, - 0.0, - 0.0, - ]) + 0.0], + linf=[0.17261097190220992, + 0.17261097190220973, + 1.13601894068238, + 0.0, + 0.0, + 0.0, + 0.0]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -72,24 +64,20 @@ end @trixi_testset "elixir_acoustics_gaussian_source.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_acoustics_gaussian_source.jl"), - l2=[ - 0.004296394903650806, + l2=[0.004296394903650806, 0.004241280404758938, 0.006269684906035964, 0.0, 0.0, 0.0, - 0.0, - ], - linf=[ - 0.03970270697049378, - 0.04151096349298151, - 0.0640019829058819, - 0.0, - 0.0, - 0.0, - 0.0, - ]) + 0.0], + linf=[0.03970270697049378, + 0.04151096349298151, + 0.0640019829058819, + 0.0, + 0.0, + 0.0, + 0.0]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -107,9 +95,9 @@ end 7.382060834820337e-17, 0.0, 1.4764121669640674e-16, 1.4764121669640674e-16], linf=[0.18193631937316496, 0.1877464607867628, - 1.0355388011792845, - 2.220446049250313e-16, 0.0, 4.440892098500626e-16, - 4.440892098500626e-16]) + 1.0355388011792845, + 2.220446049250313e-16, 0.0, 4.440892098500626e-16, + 4.440892098500626e-16]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -127,8 +115,8 @@ end 0.0009894398191644543, 0.0, 7.144325530679576e-17, 7.144325530679576e-17], linf=[1.000633375007386, 0.5599788929862504, 0.5738432957070382, - 0.015590137026938428, 0.0, 2.220446049250313e-16, - 2.220446049250313e-16], + 0.015590137026938428, 0.0, 2.220446049250313e-16, + 2.220446049250313e-16], maxiters=50) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl index b937abe92c0..8fd8be97676 100644 --- a/test/test_tree_2d_euler.jl +++ b/test/test_tree_2d_euler.jl @@ -12,18 +12,14 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_euler_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"), - l2=[ - 9.321181253186009e-7, + l2=[9.321181253186009e-7, 1.4181210743438511e-6, 1.4181210743487851e-6, - 4.824553091276693e-6, - ], - linf=[ - 9.577246529612893e-6, - 1.1707525976012434e-5, - 1.1707525976456523e-5, - 4.8869615580926506e-5, - ]) + 4.824553091276693e-6], + linf=[9.577246529612893e-6, + 1.1707525976012434e-5, + 1.1707525976456523e-5, + 4.8869615580926506e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -36,18 +32,14 @@ end @trixi_testset "elixir_euler_convergence_pure_fv.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence_pure_fv.jl"), - l2=[ - 0.026440292358506527, + l2=[0.026440292358506527, 0.013245905852168414, 0.013245905852168479, - 0.03912520302609374, - ], - linf=[ - 0.042130817806361964, - 0.022685499230187034, - 0.022685499230187922, - 0.06999771202145322, - ]) + 0.03912520302609374], + linf=[0.042130817806361964, + 0.022685499230187034, + 0.022685499230187922, + 0.06999771202145322]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -60,18 +52,14 @@ end @trixi_testset "elixir_euler_density_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"), - l2=[ - 0.0010600778457964775, + l2=[0.0010600778457964775, 0.00010600778457634275, 0.00021201556915872665, - 2.650194614399671e-5, - ], - linf=[ - 0.006614198043413566, - 0.0006614198043973507, - 0.001322839608837334, - 0.000165354951256802, - ], + 2.650194614399671e-5], + linf=[0.006614198043413566, + 0.0006614198043973507, + 0.001322839608837334, + 0.000165354951256802], tspan=(0.0, 0.5)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -86,18 +74,14 @@ end @trixi_testset "elixir_euler_source_terms_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_nonperiodic.jl"), - l2=[ - 2.259440511766445e-6, + 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, - ]) + 6.3327863238858925e-6], + linf=[1.498738264560373e-5, + 1.9182011928187137e-5, + 1.918201192685487e-5, + 6.0526717141407005e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -110,18 +94,14 @@ end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.061751715597716854, + l2=[0.061751715597716854, 0.05018223615408711, 0.05018989446443463, - 0.225871559730513, - ], - linf=[ - 0.29347582879608825, - 0.31081249232844693, - 0.3107380389947736, - 1.0540358049885143, - ]) + 0.225871559730513], + linf=[0.29347582879608825, + 0.31081249232844693, + 0.3107380389947736, + 1.0540358049885143]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -134,18 +114,14 @@ end @trixi_testset "elixir_euler_ec.jl with flux_kennedy_gruber" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.03481471610306124, + l2=[0.03481471610306124, 0.027694280613944234, 0.027697905866996532, - 0.12932052501462554, - ], - linf=[ - 0.31052098400669004, - 0.3481295959664616, - 0.34807152194137336, - 1.1044947556170719, - ], + 0.12932052501462554], + linf=[0.31052098400669004, + 0.3481295959664616, + 0.34807152194137336, + 1.1044947556170719], maxiters=10, surface_flux=flux_kennedy_gruber, volume_flux=flux_kennedy_gruber) @@ -161,18 +137,14 @@ end @trixi_testset "elixir_euler_ec.jl with flux_chandrashekar" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.03481122603050542, + l2=[0.03481122603050542, 0.027662840593087695, 0.027665658732350273, - 0.12927455860656786, - ], - linf=[ - 0.3110089578739834, - 0.34888111987218107, - 0.3488278669826813, - 1.1056349046774305, - ], + 0.12927455860656786], + linf=[0.3110089578739834, + 0.34888111987218107, + 0.3488278669826813, + 1.1056349046774305], maxiters=10, surface_flux=flux_chandrashekar, volume_flux=flux_chandrashekar) @@ -188,18 +160,14 @@ end @trixi_testset "elixir_euler_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), - l2=[ - 0.05380629130119074, + l2=[0.05380629130119074, 0.04696798008325309, 0.04697067787841479, - 0.19687382235494968, - ], - linf=[ - 0.18527440131928286, - 0.2404798030563736, - 0.23269573860381076, - 0.6874012187446894, - ]) + 0.19687382235494968], + linf=[0.18527440131928286, + 0.2404798030563736, + 0.23269573860381076, + 0.6874012187446894]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -213,18 +181,14 @@ end @trixi_testset "elixir_euler_shockcapturing_subcell.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing_subcell.jl"), - l2=[ - 0.08508152653623638, + l2=[0.08508152653623638, 0.04510301725066843, 0.04510304668512745, - 0.6930705064715306, - ], - linf=[ - 0.31136518019691406, - 0.5617651935473419, - 0.5621200790240503, - 2.8866869108596056, - ]) + 0.6930705064715306], + linf=[0.31136518019691406, + 0.5617651935473419, + 0.5621200790240503, + 2.8866869108596056]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -237,18 +201,14 @@ end @trixi_testset "elixir_euler_blast_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave.jl"), - l2=[ - 0.14170569763947993, + l2=[0.14170569763947993, 0.11647068900798814, 0.11647072556898294, - 0.3391989213659599, - ], - linf=[ - 1.6544204510794196, - 1.35194638484646, - 1.3519463848472744, - 1.831228461662809, - ], + 0.3391989213659599], + linf=[1.6544204510794196, + 1.35194638484646, + 1.3519463848472744, + 1.831228461662809], maxiters=30) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -262,18 +222,14 @@ end @trixi_testset "elixir_euler_blast_wave_pure_fv.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_pure_fv.jl"), - l2=[ - 0.39957047631960346, + l2=[0.39957047631960346, 0.21006912294983154, 0.21006903549932, - 0.6280328163981136, - ], - linf=[ - 2.20417889887697, - 1.5487238480003327, - 1.5486788679247812, - 2.4656795949035857, - ], + 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))) @@ -289,18 +245,14 @@ end @trixi_testset "elixir_euler_blast_wave_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_amr.jl"), - l2=[ - 0.6835576416907511, + l2=[0.6835576416907511, 0.2839963955262972, 0.28399565983676, - 0.7229447806293277, - ], - linf=[ - 3.0969614882801393, - 1.7967947300740248, - 1.7967508302506658, - 3.040149575567518, - ], + 0.7229447806293277], + linf=[3.0969614882801393, + 1.7967947300740248, + 1.7967508302506658, + 3.040149575567518], tspan=(0.0, 1.0), coverage_override=(maxiters = 6,)) # Ensure that we do not have excessive memory allocations @@ -316,18 +268,14 @@ end @trixi_testset "elixir_euler_blast_wave_sc_subcell_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_sc_subcell_nonperiodic.jl"), - l2=[ - 0.3517507570120483, + l2=[0.3517507570120483, 0.19252291020146015, 0.19249751956580294, - 0.618717827188004, - ], - linf=[ - 1.6699566795772216, - 1.3608007992899402, - 1.361864507190922, - 2.44022884092527, - ], + 0.618717827188004], + linf=[1.6699566795772216, + 1.3608007992899402, + 1.361864507190922, + 2.44022884092527], tspan=(0.0, 0.5), initial_refinement_level=4, coverage_override=(maxiters = 6,)) @@ -343,18 +291,14 @@ 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, + l2=[0.4866953770742574, 0.1673477470091984, 0.16734774700934, - 0.6184367248923149, - ], - linf=[ - 2.6724832723962053, - 1.2916089288910635, - 1.2916089289001427, - 6.474699399394252, - ], + 0.6184367248923149], + linf=[2.6724832723962053, + 1.2916089288910635, + 1.2916089289001427, + 6.474699399394252], tspan=(0.0, 1.0), coverage_override=(maxiters = 6,)) # Ensure that we do not have excessive memory allocations @@ -370,18 +314,14 @@ end @trixi_testset "elixir_euler_sedov_blast_wave_sc_subcell.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_sc_subcell.jl"), - l2=[ - 0.4328635350273501, + l2=[0.4328635350273501, 0.15011135840723572, 0.15011135840723572, - 0.616129927549474, - ], - linf=[ - 1.6145297181778906, - 0.8614006163026988, - 0.8614006163026972, - 6.450225090647602, - ], + 0.616129927549474], + linf=[1.6145297181778906, + 0.8614006163026988, + 0.8614006163026972, + 6.450225090647602], tspan=(0.0, 1.0), initial_refinement_level=4, coverage_override=(maxiters = 6,)) @@ -397,18 +337,14 @@ end @trixi_testset "elixir_euler_sedov_blast_wave.jl (HLLE)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), - l2=[ - 0.352405949321075, + l2=[0.352405949321075, 0.17207721487429464, 0.17207721487433883, - 0.6263024434020885, - ], - linf=[ - 2.760997358628186, - 1.8279186132509326, - 1.8279186132502805, - 6.251573757093399, - ], + 0.6263024434020885], + linf=[2.760997358628186, + 1.8279186132509326, + 1.8279186132502805, + 6.251573757093399], tspan=(0.0, 0.5), callbacks=CallbackSet(summary_callback, analysis_callback, alive_callback, @@ -426,18 +362,14 @@ end @trixi_testset "elixir_euler_positivity.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_positivity.jl"), - l2=[ - 0.48862067511841695, + l2=[0.48862067511841695, 0.16787541578869494, 0.16787541578869422, - 0.6184319933114926, - ], - linf=[ - 2.6766520821013002, - 1.2910938760258996, - 1.2910938760258899, - 6.473385481404865, - ], + 0.6184319933114926], + linf=[2.6766520821013002, + 1.2910938760258996, + 1.2910938760258899, + 6.473385481404865], tspan=(0.0, 1.0), coverage_override=(maxiters = 3,)) # Ensure that we do not have excessive memory allocations @@ -452,18 +384,14 @@ end @trixi_testset "elixir_euler_blob_mortar.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blob_mortar.jl"), - l2=[ - 0.22271619518391986, + l2=[0.22271619518391986, 0.6284824759323494, 0.24864213447943648, - 2.9591811489995474, - ], - linf=[ - 9.15245400430106, - 24.96562810334389, - 10.388109127032374, - 101.20581544156934, - ], + 2.9591811489995474], + linf=[9.15245400430106, + 24.96562810334389, + 10.388109127032374, + 101.20581544156934], tspan=(0.0, 0.5)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -477,18 +405,14 @@ end @trixi_testset "elixir_euler_blob_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blob_amr.jl"), - l2=[ - 0.2086261501910662, + l2=[0.2086261501910662, 1.2118352377894666, 0.10255333189606497, - 5.296238138639236, - ], - linf=[ - 14.829071984498198, - 74.12967742435727, - 6.863554388300223, - 303.58813147491134, - ], + 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,)) @@ -505,18 +429,14 @@ end @trixi_testset "elixir_euler_kelvin_helmholtz_instability_fjordholm_etal.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_kelvin_helmholtz_instability_fjordholm_etal.jl"), - l2=[ - 0.1057230211245312, + l2=[0.1057230211245312, 0.10621112311257341, 0.07260957505339989, - 0.11178239111065721, - ], - linf=[ - 2.998719417992662, - 2.1400285015556166, - 1.1569648700415078, - 1.8922492268110913, - ], + 0.11178239111065721], + linf=[2.998719417992662, + 2.1400285015556166, + 1.1569648700415078, + 1.8922492268110913], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -531,18 +451,14 @@ end @trixi_testset "elixir_euler_kelvin_helmholtz_instability.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_kelvin_helmholtz_instability.jl"), - l2=[ - 0.055691508271624536, + l2=[0.055691508271624536, 0.032986009333751655, 0.05224390923711999, - 0.08009536362771563, - ], - linf=[ - 0.24043622527087494, - 0.1660878796929941, - 0.12355946691711608, - 0.2694290787257758, - ], + 0.08009536362771563], + linf=[0.24043622527087494, + 0.1660878796929941, + 0.12355946691711608, + 0.2694290787257758], tspan=(0.0, 0.2)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -557,18 +473,14 @@ end @trixi_testset "elixir_euler_kelvin_helmholtz_instability_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_kelvin_helmholtz_instability_amr.jl"), - l2=[ - 0.05569452733654995, + l2=[0.05569452733654995, 0.033107109983417926, 0.05223609622852158, - 0.08007777597488817, - ], - linf=[ - 0.2535807803900303, - 0.17397028249895308, - 0.12321616095649354, - 0.269046666668995, - ], + 0.08007777597488817], + linf=[0.2535807803900303, + 0.17397028249895308, + 0.12321616095649354, + 0.269046666668995], tspan=(0.0, 0.2), coverage_override=(maxiters = 2,)) # Ensure that we do not have excessive memory allocations @@ -584,18 +496,14 @@ end @trixi_testset "elixir_euler_kelvin_helmholtz_instability_sc_subcell.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_kelvin_helmholtz_instability_sc_subcell.jl"), - l2=[ - 0.42185634563805724, + l2=[0.42185634563805724, 0.1686471269704017, 0.18240674916968103, - 0.17858250604280654, - ], - linf=[ - 1.7012978064377158, - 0.7149714986746726, - 0.5822547982757897, - 0.7300051017382696, - ], + 0.17858250604280654], + linf=[1.7012978064377158, + 0.7149714986746726, + 0.5822547982757897, + 0.7300051017382696], tspan=(0.0, 2.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -609,18 +517,14 @@ end @trixi_testset "elixir_euler_colliding_flow.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_colliding_flow.jl"), - l2=[ - 0.007237139090503349, + l2=[0.007237139090503349, 0.044887582765386916, 1.0453570959003603e-6, - 0.6627307840935432, - ], - linf=[ - 0.19437260992446315, - 0.5554343646648533, - 5.943891455255412e-5, - 15.188919846360125, - ], + 0.6627307840935432], + linf=[0.19437260992446315, + 0.5554343646648533, + 5.943891455255412e-5, + 15.188919846360125], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -634,18 +538,14 @@ end @trixi_testset "elixir_euler_colliding_flow_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_colliding_flow_amr.jl"), - l2=[ - 0.006768801432802192, + l2=[0.006768801432802192, 0.032184992228603666, 6.923887797276484e-7, - 0.6784222932398366, - ], - linf=[ - 0.2508663007713608, - 0.4097017076529792, - 0.0003528986458217968, - 22.435474993016918, - ], + 0.6784222932398366], + linf=[0.2508663007713608, + 0.4097017076529792, + 0.0003528986458217968, + 22.435474993016918], tspan=(0.0, 0.1), coverage_override=(maxiters = 2,)) # Ensure that we do not have excessive memory allocations @@ -660,18 +560,14 @@ 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, + l2=[0.011338365293662804, 10.09743543555765, 0.00392429463200361, - 4031.7811487690506, - ], - linf=[ - 3.3178633141984193, - 2993.6445033486402, - 8.031723414357423, - 1.1918867260293828e6, - ], + 4031.7811487690506], + linf=[3.3178633141984193, + 2993.6445033486402, + 8.031723414357423, + 1.1918867260293828e6], tspan=(0.0, 1.0e-7), coverage_override=(maxiters = 6,)) # Ensure that we do not have excessive memory allocations @@ -686,18 +582,14 @@ end @trixi_testset "elixir_euler_vortex.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex.jl"), - l2=[ - 0.00013492249515826863, + l2=[0.00013492249515826863, 0.006615696236378061, 0.006782108219800376, - 0.016393831451740604, - ], - linf=[ - 0.0020782600954247776, - 0.08150078921935999, - 0.08663621974991986, - 0.2829930622010579, - ]) + 0.016393831451740604], + linf=[0.0020782600954247776, + 0.08150078921935999, + 0.08663621974991986, + 0.2829930622010579]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -711,18 +603,14 @@ end @trixi_testset "elixir_euler_vortex_mortar.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_mortar.jl"), # Expected errors are exactly the same as in the parallel test! - l2=[ - 0.0017208369388227673, + l2=[0.0017208369388227673, 0.09628684992237334, 0.09620157717330868, - 0.1758809552387432, - ], - linf=[ - 0.021869936355319086, - 0.9956698009442038, - 1.0002507727219028, - 2.223249697515648, - ]) + 0.1758809552387432], + linf=[0.021869936355319086, + 0.9956698009442038, + 1.0002507727219028, + 2.223249697515648]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -735,18 +623,14 @@ end @trixi_testset "elixir_euler_vortex_mortar_split.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_mortar_split.jl"), - l2=[ - 0.0017203323613648241, + l2=[0.0017203323613648241, 0.09628962878682261, 0.09621241164155782, - 0.17585995600340926, - ], - linf=[ - 0.021740570456931674, - 0.9938841665880938, - 1.004140123355135, - 2.224108857746245, - ]) + 0.17585995600340926], + linf=[0.021740570456931674, + 0.9938841665880938, + 1.004140123355135, + 2.224108857746245]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -759,18 +643,14 @@ end @trixi_testset "elixir_euler_vortex_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_shockcapturing.jl"), - l2=[ - 0.0017158367642679273, + l2=[0.0017158367642679273, 0.09619888722871434, 0.09616432767924141, - 0.17553381166255197, - ], - linf=[ - 0.021853862449723982, - 0.9878047229255944, - 0.9880191167111795, - 2.2154030488035588, - ]) + 0.17553381166255197], + linf=[0.021853862449723982, + 0.9878047229255944, + 0.9880191167111795, + 2.2154030488035588]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -784,18 +664,14 @@ end @trixi_testset "elixir_euler_vortex_mortar_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_mortar_shockcapturing.jl"), - l2=[ - 0.0017203324051381415, + l2=[0.0017203324051381415, 0.09628962899999398, 0.0962124115572114, - 0.1758599596626405, - ], - linf=[ - 0.021740568112562086, - 0.9938841624655501, - 1.0041401179009877, - 2.2241087041100798, - ]) + 0.1758599596626405], + linf=[0.021740568112562086, + 0.9938841624655501, + 1.0041401179009877, + 2.2241087041100798]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -809,18 +685,14 @@ end @trixi_testset "elixir_euler_vortex_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex_amr.jl"), # Expected errors are exactly the same as in the parallel test! - l2=[ - 5.051719943432265e-5, + l2=[5.051719943432265e-5, 0.0022574259317084747, 0.0021755998463189713, - 0.004346492398617521, - ], - linf=[ - 0.0012880114865917447, - 0.03857193149447702, - 0.031090457959835893, - 0.12125130332971423, - ], + 0.004346492398617521], + linf=[0.0012880114865917447, + 0.03857193149447702, + 0.031090457959835893, + 0.12125130332971423], # Let this test run longer to cover some lines in the AMR indicator coverage_override=(maxiters = 10^5, tspan = (0.0, 10.5))) # Ensure that we do not have excessive memory allocations @@ -835,18 +707,14 @@ end @trixi_testset "elixir_euler_ec.jl with boundary_condition_slip_wall" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.03341239373099515, + l2=[0.03341239373099515, 0.026673245711492915, 0.026678871434568822, - 0.12397486476145089, - ], - linf=[ - 0.3290981764688339, - 0.3812055782309788, - 0.3812041851225023, - 1.168251216556933, - ], + 0.12397486476145089], + linf=[0.3290981764688339, + 0.3812055782309788, + 0.3812041851225023, + 1.168251216556933], periodicity=false, boundary_conditions=boundary_condition_slip_wall, cfl=0.3, tspan=(0.0, 0.1)) # this test is sensitive to the CFL factor @@ -862,18 +730,14 @@ end @trixi_testset "elixir_euler_warm_bubble.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_warm_bubble.jl"), - l2=[ - 0.0001379946769624388, + l2=[0.0001379946769624388, 0.02078779689715382, 0.033237241571263176, - 31.36068872331705, - ], - linf=[ - 0.0016286690573188434, - 0.15623770697198225, - 0.3341371832270615, - 334.5373488726036, - ], + 31.36068872331705], + linf=[0.0016286690573188434, + 0.15623770697198225, + 0.3341371832270615, + 334.5373488726036], tspan=(0.0, 10.0), initial_refinement_level=4) # Ensure that we do not have excessive memory allocations @@ -890,18 +754,14 @@ end @testset "Compressible Euler: Tests for initial conditions" begin @trixi_testset "elixir_euler_vortex.jl one step with initial_condition_constant" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex.jl"), - l2=[ - 1.1790213022362371e-16, + l2=[1.1790213022362371e-16, 8.580657423476384e-17, 1.3082387431804115e-16, - 1.6182739965672862e-15, - ], - linf=[ - 3.3306690738754696e-16, - 2.220446049250313e-16, - 5.273559366969494e-16, - 3.552713678800501e-15, - ], + 1.6182739965672862e-15], + linf=[3.3306690738754696e-16, + 2.220446049250313e-16, + 5.273559366969494e-16, + 3.552713678800501e-15], maxiters=1, initial_condition=initial_condition_constant) # Ensure that we do not have excessive memory allocations @@ -916,18 +776,14 @@ end @trixi_testset "elixir_euler_sedov_blast_wave.jl one step" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), - l2=[ - 0.0021196114178949396, + l2=[0.0021196114178949396, 0.010703549234544042, 0.01070354923454404, - 0.10719124037195142, - ], - linf=[ - 0.11987270645890724, - 0.7468615461136827, - 0.7468615461136827, - 3.910689155287799, - ], + 0.10719124037195142], + linf=[0.11987270645890724, + 0.7468615461136827, + 0.7468615461136827, + 3.910689155287799], maxiters=1) # Ensure that we do not have excessive memory allocations diff --git a/test/test_tree_2d_euleracoustics.jl b/test/test_tree_2d_euleracoustics.jl index e3a4d65f398..8a672366990 100644 --- a/test/test_tree_2d_euleracoustics.jl +++ b/test/test_tree_2d_euleracoustics.jl @@ -15,24 +15,20 @@ EXAMPLES_DIR = joinpath(examples_dir(), "tree_2d_dgsem") "elixir_euleracoustics_co-rotating_vortex_pair.jl"), initial_refinement_level=5, tspan1=(0.0, 1.0), tspan_averaging=(0.0, 1.0), tspan=(0.0, 1.0), - l2=[ - 0.00013268029905807722, + l2=[0.00013268029905807722, 0.0001335062197031223, 0.00021776333678401362, 13.000001753042364, 26.00000080243847, 38.00000884725549, - 51.000000003859995, - ], - linf=[ - 0.22312716933051027, - 0.1579924424942319, - 0.25194831158255576, - 13.468872744263273, - 26.54666679978679, - 38.139032147739684, - 51.378134660241294, - ]) + 51.000000003859995], + linf=[0.22312716933051027, + 0.1579924424942319, + 0.25194831158255576, + 13.468872744263273, + 26.54666679978679, + 38.139032147739684, + 51.378134660241294]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_tree_2d_eulermulti.jl b/test/test_tree_2d_eulermulti.jl index 7c4a4e722e3..059473942da 100644 --- a/test/test_tree_2d_eulermulti.jl +++ b/test/test_tree_2d_eulermulti.jl @@ -19,9 +19,9 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") equations = CompressibleEulerMulticomponentEquations2D(gammas = SVector{length(gammas)}(gammas...), gas_constants = SVector{length(gas_constants)}(gas_constants...)) u = [-1.7433292819144075, 0.8844413258376495, 0.6050737175812364, - 0.8261998359817043, 1.0801186290896465, 0.505654488367698, - 0.6364415555805734, 0.851669392285058, 0.31219606420306223, - 1.0930477805612038] + 0.8261998359817043, 1.0801186290896465, 0.505654488367698, + 0.6364415555805734, 0.851669392285058, 0.31219606420306223, + 1.0930477805612038] w = cons2entropy(u, equations) # test that the entropy variables match the gradients of the total entropy @test w ≈ ForwardDiff.gradient(u -> Trixi.total_entropy(u, equations), u) @@ -35,20 +35,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_eulermulti_shock_bubble.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_shock_bubble.jl"), - l2=[ - 73.78467629094177, + l2=[73.78467629094177, 0.9174752929795251, 57942.83587826468, 0.1828847253029943, - 0.011127037850925347, - ], - linf=[ - 196.81051991521073, - 7.8456811648529605, - 158891.88930113698, - 0.811379581519794, - 0.08011973559187913, - ], + 0.011127037850925347], + linf=[196.81051991521073, + 7.8456811648529605, + 158891.88930113698, + 0.811379581519794, + 0.08011973559187913], tspan=(0.0, 0.001)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -64,20 +60,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") rm("out/deviations.txt", force = true) @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_shock_bubble_shockcapturing_subcell_positivity.jl"), - l2=[ - 81.52845664909304, + l2=[81.52845664909304, 2.5455678559421346, 63229.190712645846, 0.19929478404550321, - 0.011068604228443425, - ], - linf=[ - 249.21708417382013, - 40.33299887640794, - 174205.0118831558, - 0.6881458768113586, - 0.11274401158173972, - ], + 0.011068604228443425], + linf=[249.21708417382013, + 40.33299887640794, + 174205.0118831558, + 0.6881458768113586, + 0.11274401158173972], initial_refinement_level=3, tspan=(0.0, 0.001), output_directory="out") @@ -97,20 +89,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_eulermulti_shock_bubble_shockcapturing_subcell_minmax.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_shock_bubble_shockcapturing_subcell_minmax.jl"), - l2=[ - 73.10832638093902, + l2=[73.10832638093902, 1.4599215762968585, 57176.014861335476, 0.17812843581838675, - 0.010123079422717837, - ], - linf=[ - 214.50568817511956, - 25.40392579616452, - 152862.41011222568, - 0.564195553101797, - 0.0956331651771212, - ], + 0.010123079422717837], + linf=[214.50568817511956, + 25.40392579616452, + 152862.41011222568, + 0.564195553101797, + 0.0956331651771212], initial_refinement_level=3, tspan=(0.0, 0.001)) # Ensure that we do not have excessive memory allocations @@ -125,18 +113,14 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_eulermulti_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_ec.jl"), - l2=[ - 0.050182236154087095, + l2=[0.050182236154087095, 0.050189894464434635, 0.2258715597305131, - 0.06175171559771687, - ], - linf=[ - 0.3108124923284472, - 0.3107380389947733, - 1.054035804988521, - 0.29347582879608936, - ]) + 0.06175171559771687], + linf=[0.3108124923284472, + 0.3107380389947733, + 1.054035804988521, + 0.29347582879608936]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -149,24 +133,20 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_eulermulti_es.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_es.jl"), - l2=[ - 0.0496546258404055, + l2=[0.0496546258404055, 0.04965550099933263, 0.22425206549856372, 0.004087155041747821, 0.008174310083495642, 0.016348620166991283, - 0.032697240333982566, - ], - linf=[ - 0.2488251110766228, - 0.24832493304479406, - 0.9310354690058298, - 0.017452870465607374, - 0.03490574093121475, - 0.0698114818624295, - 0.139622963724859, - ]) + 0.032697240333982566], + linf=[0.2488251110766228, + 0.24832493304479406, + 0.9310354690058298, + 0.017452870465607374, + 0.03490574093121475, + 0.0698114818624295, + 0.139622963724859]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -179,20 +159,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_eulermulti_convergence_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_ec.jl"), - l2=[ - 0.00012290225488326508, + l2=[0.00012290225488326508, 0.00012290225488321876, 0.00018867397906337653, 4.8542321753649044e-5, - 9.708464350729809e-5, - ], - linf=[ - 0.0006722819239133315, - 0.0006722819239128874, - 0.0012662292789555885, - 0.0002843844182700561, - 0.0005687688365401122, - ]) + 9.708464350729809e-5], + linf=[0.0006722819239133315, + 0.0006722819239128874, + 0.0012662292789555885, + 0.0002843844182700561, + 0.0005687688365401122]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -205,20 +181,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_eulermulti_convergence_es.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_es.jl"), - l2=[ - 2.2661773867001696e-6, + l2=[2.2661773867001696e-6, 2.266177386666318e-6, 6.593514692980009e-6, 8.836308667348217e-7, - 1.7672617334696433e-6, - ], - linf=[ - 1.4713170997993075e-5, - 1.4713170997104896e-5, - 5.115618808515521e-5, - 5.3639516094383666e-6, - 1.0727903218876733e-5, - ]) + 1.7672617334696433e-6], + linf=[1.4713170997993075e-5, + 1.4713170997104896e-5, + 5.115618808515521e-5, + 5.3639516094383666e-6, + 1.0727903218876733e-5]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -231,20 +203,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_eulermulti_convergence_es.jl with flux_chandrashekar" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_es.jl"), - l2=[ - 1.8621737639352465e-6, + l2=[1.8621737639352465e-6, 1.862173764098385e-6, 5.942585713809631e-6, 6.216263279534722e-7, - 1.2432526559069443e-6, - ], - linf=[ - 1.6235495582606063e-5, - 1.6235495576388814e-5, - 5.854523678827661e-5, - 5.790274858807898e-6, - 1.1580549717615796e-5, - ], + 1.2432526559069443e-6], + linf=[1.6235495582606063e-5, + 1.6235495576388814e-5, + 5.854523678827661e-5, + 5.790274858807898e-6, + 1.1580549717615796e-5], volume_flux=flux_chandrashekar) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_2d_eulerpolytropic.jl b/test/test_tree_2d_eulerpolytropic.jl index 545cf7274ff..fdcb6a7f9df 100644 --- a/test/test_tree_2d_eulerpolytropic.jl +++ b/test/test_tree_2d_eulerpolytropic.jl @@ -13,14 +13,10 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_eulerpolytropic_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulerpolytropic_convergence.jl"), - l2=[ - 0.0016689832177626373, 0.0025920263793094526, - 0.003281074494626679, - ], - linf=[ - 0.010994883201896677, 0.013309526619350365, - 0.02008032661117376, - ]) + l2=[0.0016689832177626373, 0.0025920263793094526, + 0.003281074494626679], + linf=[0.010994883201896677, 0.013309526619350365, + 0.02008032661117376]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_tree_2d_fdsbp.jl b/test/test_tree_2d_fdsbp.jl index c0844ee5dba..822a2951874 100644 --- a/test/test_tree_2d_fdsbp.jl +++ b/test/test_tree_2d_fdsbp.jl @@ -52,18 +52,14 @@ end @testset "Compressible Euler" begin @trixi_testset "elixir_euler_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 1.7088389997042244e-6, + l2=[1.7088389997042244e-6, 1.7437997855125774e-6, 1.7437997855350776e-6, - 5.457223460127621e-6, - ], - linf=[ - 9.796504903736292e-6, - 9.614745892783105e-6, - 9.614745892783105e-6, - 4.026107182575345e-5, - ], + 5.457223460127621e-6], + linf=[9.796504903736292e-6, + 9.614745892783105e-6, + 9.614745892783105e-6, + 4.026107182575345e-5], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations @@ -78,18 +74,14 @@ end @trixi_testset "elixir_euler_convergence.jl with Lax-Friedrichs splitting" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 2.1149087345799973e-6, + l2=[2.1149087345799973e-6, 1.9391438806845798e-6, 1.9391438806759794e-6, - 5.842833764682604e-6, - ], - linf=[ - 1.3679037540903494e-5, - 1.1770587849069258e-5, - 1.1770587848403125e-5, - 4.68952678644996e-5, - ], + 5.842833764682604e-6], + linf=[1.3679037540903494e-5, + 1.1770587849069258e-5, + 1.1770587848403125e-5, + 4.68952678644996e-5], tspan=(0.0, 0.1), flux_splitting=splitting_lax_friedrichs) # Ensure that we do not have excessive memory allocations @@ -105,18 +97,14 @@ end @trixi_testset "elixir_euler_kelvin_helmholtz_instability.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_kelvin_helmholtz_instability.jl"), - l2=[ - 0.02607850081951497, + l2=[0.02607850081951497, 0.020357717558016252, 0.028510191844948945, - 0.02951535039734857, - ], - linf=[ - 0.12185328623662173, - 0.1065055387595834, - 0.06257122956937419, - 0.11992349951978643, - ], + 0.02951535039734857], + linf=[0.12185328623662173, + 0.1065055387595834, + 0.06257122956937419, + 0.11992349951978643], tspan=(0.0, 0.1)) # Ensure that we do not have excessive memory allocations @@ -131,18 +119,14 @@ end @trixi_testset "elixir_euler_vortex.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_vortex.jl"), - l2=[ - 0.0005330228930711585, + l2=[0.0005330228930711585, 0.028475888529345014, 0.02847513865894387, - 0.056259951995581196, - ], - linf=[ - 0.007206088611304784, - 0.31690373882847234, - 0.31685665067192326, - 0.7938167296134893, - ], + 0.056259951995581196], + linf=[0.007206088611304784, + 0.31690373882847234, + 0.31685665067192326, + 0.7938167296134893], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations diff --git a/test/test_tree_2d_hypdiff.jl b/test/test_tree_2d_hypdiff.jl index 8c5973cbf07..5c701b41d13 100644 --- a/test/test_tree_2d_hypdiff.jl +++ b/test/test_tree_2d_hypdiff.jl @@ -12,16 +12,12 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_hypdiff_lax_friedrichs.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_lax_friedrichs.jl"), - l2=[ - 0.00015687751817403066, + l2=[0.00015687751817403066, 0.001025986772216324, - 0.0010259867722164071, - ], - linf=[ - 0.001198695637957381, - 0.006423873515531753, - 0.006423873515533529, - ]) + 0.0010259867722164071], + linf=[0.001198695637957381, + 0.006423873515531753, + 0.006423873515533529]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -35,16 +31,12 @@ end @trixi_testset "elixir_hypdiff_harmonic_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_harmonic_nonperiodic.jl"), - l2=[ - 8.618132355121019e-8, + l2=[8.618132355121019e-8, 5.619399844384306e-7, - 5.619399844844044e-7, - ], - linf=[ - 1.1248618588430072e-6, - 8.622436487026874e-6, - 8.622436487915053e-6, - ]) + 5.619399844844044e-7], + linf=[1.1248618588430072e-6, + 8.622436487026874e-6, + 8.622436487915053e-6]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -57,16 +49,12 @@ end @trixi_testset "elixir_hypdiff_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_nonperiodic.jl"), - l2=[ - 8.523077653954864e-6, + l2=[8.523077653954864e-6, 2.8779323653020624e-5, - 5.454942769125663e-5, - ], - linf=[ - 5.522740952468297e-5, - 0.00014544895978971679, - 0.00032396328684924924, - ]) + 5.454942769125663e-5], + linf=[5.522740952468297e-5, + 0.00014544895978971679, + 0.00032396328684924924]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -79,16 +67,12 @@ end @trixi_testset "elixir_hypdiff_godunov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_godunov.jl"), - l2=[ - 5.868147556427088e-6, + l2=[5.868147556427088e-6, 3.80517927324465e-5, - 3.805179273249344e-5, - ], - linf=[ - 3.701965498725812e-5, - 0.0002122422943138247, - 0.00021224229431116015, - ], + 3.805179273249344e-5], + linf=[3.701965498725812e-5, + 0.0002122422943138247, + 0.00021224229431116015], atol=2.0e-12) #= required for CI on macOS =# # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_2d_lbm.jl b/test/test_tree_2d_lbm.jl index 4705c9d0d03..f26af8403b4 100644 --- a/test/test_tree_2d_lbm.jl +++ b/test/test_tree_2d_lbm.jl @@ -19,11 +19,11 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") 1.6545443003155128e-16, 6.001333022242579e-16, 9.450994018139234e-15], linf=[5.551115123125783e-15, 5.662137425588298e-15, - 1.2212453270876722e-15, - 1.27675647831893e-15, 2.4980018054066022e-15, - 7.494005416219807e-16, - 4.3021142204224816e-16, 8.881784197001252e-16, - 1.0436096431476471e-14]) + 1.2212453270876722e-15, + 1.27675647831893e-15, 2.4980018054066022e-15, + 7.494005416219807e-16, + 4.3021142204224816e-16, 8.881784197001252e-16, + 1.0436096431476471e-14]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -43,11 +43,11 @@ end 0.00028436349827736705, 0.0003005161103138576, 4.496683876631818e-5], linf=[0.005596384769998769, 4.771160474496827e-5, - 0.005270322068908595, - 0.00011747787108790098, 0.00084326349695725, - 0.000795551892211168, - 0.001956482118303543, 0.0020739599893902436, - 0.00032606270109525326], + 0.005270322068908595, + 0.00011747787108790098, 0.00084326349695725, + 0.000795551892211168, + 0.001956482118303543, 0.0020739599893902436, + 0.00032606270109525326], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -68,10 +68,10 @@ end 0.0004225564518328741, 0.0004593854895507851, 0.00044244398903669927], linf=[0.025886626070758242, 0.00573859077176217, - 0.027568805277855102, 0.00946724671122974, - 0.004031686575556803, 0.0038728927083346437, - 0.020038695575169005, - 0.02061789496737146, 0.05568236920459335], + 0.027568805277855102, 0.00946724671122974, + 0.004031686575556803, 0.0038728927083346437, + 0.020038695575169005, + 0.02061789496737146, 0.05568236920459335], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -92,11 +92,11 @@ end 8.801710065560555e-6, 1.040614383799995e-5, 2.6135657178357052e-15], linf=[1.4432899320127035e-15, 2.1821189867266e-6, - 8.881784197001252e-16, - 2.2481261510165496e-6, 1.0692966335143494e-5, - 9.606391697600247e-6, - 9.62138334279633e-6, 1.0725969916147021e-5, - 3.3861802251067274e-15], + 8.881784197001252e-16, + 2.2481261510165496e-6, 1.0692966335143494e-5, + 9.606391697600247e-6, + 9.62138334279633e-6, 1.0725969916147021e-5, + 3.3861802251067274e-15], initial_condition=function initial_condition_couette_steady(x, t, equations::LatticeBoltzmannEquations2D) @@ -139,11 +139,11 @@ end 6.167794865198169e-17, 5.24166554417795e-17, 6.694740573885739e-16], linf=[5.967448757360216e-16, 6.522560269672795e-16, - 6.522560269672795e-16, - 6.245004513516506e-16, 2.1163626406917047e-16, - 2.185751579730777e-16, - 2.185751579730777e-16, 2.393918396847994e-16, - 1.887379141862766e-15], + 6.522560269672795e-16, + 6.245004513516506e-16, 2.1163626406917047e-16, + 2.185751579730777e-16, + 2.185751579730777e-16, 2.393918396847994e-16, + 1.887379141862766e-15], boundary_conditions=boundary_condition_noslip_wall, tspan=(0, 0.1)) diff --git a/test/test_tree_2d_linearizedeuler.jl b/test/test_tree_2d_linearizedeuler.jl index 7bdb83e328e..0639814e6d5 100644 --- a/test/test_tree_2d_linearizedeuler.jl +++ b/test/test_tree_2d_linearizedeuler.jl @@ -11,18 +11,14 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_linearizedeuler_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_linearizedeuler_convergence.jl"), - l2=[ - 0.00020601485381444888, + l2=[0.00020601485381444888, 0.00013380483421751216, 0.0001338048342174503, - 0.00020601485381444888, - ], - linf=[ - 0.0011006084408365924, - 0.0005788678074691855, - 0.0005788678074701847, - 0.0011006084408365924, - ]) + 0.00020601485381444888], + linf=[0.0011006084408365924, + 0.0005788678074691855, + 0.0005788678074701847, + 0.0011006084408365924]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -35,18 +31,14 @@ end @trixi_testset "elixir_linearizedeuler_gauss_wall.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_linearizedeuler_gauss_wall.jl"), - l2=[ - 0.048185623945503485, + l2=[0.048185623945503485, 0.01941899333212175, 0.019510224816991825, - 0.048185623945503485, - ], - linf=[ - 1.0392165942153189, - 0.18188777290819994, - 0.1877028372108587, - 1.0392165942153189, - ]) + 0.048185623945503485], + linf=[1.0392165942153189, + 0.18188777290819994, + 0.1877028372108587, + 1.0392165942153189]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_2d_mhd.jl b/test/test_tree_2d_mhd.jl index 1f8458075aa..1c9e26467ae 100644 --- a/test/test_tree_2d_mhd.jl +++ b/test/test_tree_2d_mhd.jl @@ -12,8 +12,7 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") @trixi_testset "elixir_mhd_alfven_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 0.00011149543672225127, + l2=[0.00011149543672225127, 5.888242524520296e-6, 5.888242524510072e-6, 8.476931432519067e-6, @@ -21,19 +20,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") 1.2542675002588144e-6, 1.2542675002747718e-6, 1.8705223407238346e-6, - 4.651717010670585e-7, - ], - linf=[ - 0.00026806333988971254, - 1.6278838272418272e-5, - 1.627883827305665e-5, - 2.7551183488072617e-5, - 5.457878055614707e-6, - 8.130129322880819e-6, - 8.130129322769797e-6, - 1.2406302192291552e-5, - 2.373765544951732e-6, - ]) + 4.651717010670585e-7], + linf=[0.00026806333988971254, + 1.6278838272418272e-5, + 1.627883827305665e-5, + 2.7551183488072617e-5, + 5.457878055614707e-6, + 8.130129322880819e-6, + 8.130129322769797e-6, + 1.2406302192291552e-5, + 2.373765544951732e-6]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -46,8 +42,7 @@ end @trixi_testset "elixir_mhd_alfven_wave.jl with flux_derigs_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 1.7201098719531215e-6, + l2=[1.7201098719531215e-6, 8.692057393373005e-7, 8.69205739320643e-7, 1.2726508184718958e-6, @@ -55,19 +50,16 @@ end 1.07029565814218e-6, 1.0702956581404748e-6, 1.3291748105236525e-6, - 4.6172239295786824e-7, - ], - linf=[ - 9.865325754310206e-6, - 7.352074675170961e-6, - 7.352074674185638e-6, - 1.0675656902672803e-5, - 5.112498347226158e-6, - 7.789533065905019e-6, - 7.789533065905019e-6, - 1.0933531593274037e-5, - 2.340244047768378e-6, - ], + 4.6172239295786824e-7], + linf=[9.865325754310206e-6, + 7.352074675170961e-6, + 7.352074674185638e-6, + 1.0675656902672803e-5, + 5.112498347226158e-6, + 7.789533065905019e-6, + 7.789533065905019e-6, + 1.0933531593274037e-5, + 2.340244047768378e-6], volume_flux=(flux_derigs_etal, flux_nonconservative_powell)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -81,8 +73,7 @@ end @trixi_testset "elixir_mhd_alfven_wave_mortar.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave_mortar.jl"), - l2=[ - 3.7762324533854616e-6, + l2=[3.7762324533854616e-6, 1.5534623833573546e-6, 1.4577234868196855e-6, 1.7647724628707057e-6, @@ -90,19 +81,16 @@ end 1.456369119716533e-6, 1.4115666913995062e-6, 1.804758237422838e-6, - 8.320469738087189e-7, - ], - linf=[ - 3.670661330201774e-5, - 1.530289442645827e-5, - 1.3592183785327006e-5, - 1.5173897443654383e-5, - 9.43771379136038e-6, - 1.0906323046233624e-5, - 1.0603954940346938e-5, - 1.5900499596113726e-5, - 5.978772247650426e-6, - ], + 8.320469738087189e-7], + linf=[3.670661330201774e-5, + 1.530289442645827e-5, + 1.3592183785327006e-5, + 1.5173897443654383e-5, + 9.43771379136038e-6, + 1.0906323046233624e-5, + 1.0603954940346938e-5, + 1.5900499596113726e-5, + 5.978772247650426e-6], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -116,8 +104,7 @@ end @trixi_testset "elixir_mhd_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), - l2=[ - 0.03637302248881514, + l2=[0.03637302248881514, 0.043002991956758996, 0.042987505670836056, 0.02574718055258975, @@ -125,19 +112,16 @@ end 0.01745369341302589, 0.017454552320664566, 0.026873190440613117, - 5.336243933079389e-16, - ], - linf=[ - 0.23623816236321427, - 0.3137152204179957, - 0.30378397831730597, - 0.21500228807094865, - 0.9042495730546518, - 0.09398098096581875, - 0.09470282020962917, - 0.15277253978297378, - 4.307694418935709e-15, - ]) + 5.336243933079389e-16], + linf=[0.23623816236321427, + 0.3137152204179957, + 0.30378397831730597, + 0.21500228807094865, + 0.9042495730546518, + 0.09398098096581875, + 0.09470282020962917, + 0.15277253978297378, + 4.307694418935709e-15]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -150,8 +134,7 @@ end @trixi_testset "elixir_mhd_orszag_tang.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_orszag_tang.jl"), - l2=[ - 0.21967600768935716, + l2=[0.21967600768935716, 0.2643126515795721, 0.31488287201980875, 0.0, @@ -159,19 +142,16 @@ end 0.23028914748088603, 0.34413527376463915, 0.0, - 0.003178793090381426, - ], - linf=[ - 1.2749969218080568, - 0.6737013368774057, - 0.8604154399895696, - 0.0, - 2.799342099887639, - 0.6473347557712643, - 0.9691773375490476, - 0.0, - 0.05729832038724348, - ], + 0.003178793090381426], + linf=[1.2749969218080568, + 0.6737013368774057, + 0.8604154399895696, + 0.0, + 2.799342099887639, + 0.6473347557712643, + 0.9691773375490476, + 0.0, + 0.05729832038724348], tspan=(0.0, 0.09)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -185,8 +165,7 @@ end @trixi_testset "elixir_mhd_orszag_tang.jl with flux_hll" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_orszag_tang.jl"), - l2=[ - 0.10806619664693064, + l2=[0.10806619664693064, 0.20199136742199922, 0.22984589847526207, 0.0, @@ -194,19 +173,16 @@ end 0.15688413207147794, 0.24293641543490646, 0.0, - 0.003246181006326598, - ], - linf=[ - 0.560316034595759, - 0.5095520363866776, - 0.6536748458764621, - 0.0, - 0.9627447086204038, - 0.3981375420906146, - 0.673472146198816, - 0.0, - 0.04879208429337193, - ], + 0.003246181006326598], + linf=[0.560316034595759, + 0.5095520363866776, + 0.6536748458764621, + 0.0, + 0.9627447086204038, + 0.3981375420906146, + 0.673472146198816, + 0.0, + 0.04879208429337193], tspan=(0.0, 0.06), surface_flux=(flux_hlle, flux_nonconservative_powell)) @@ -222,8 +198,7 @@ end @trixi_testset "elixir_mhd_alfven_wave.jl one step with initial_condition_constant" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 7.144325530681224e-17, + l2=[7.144325530681224e-17, 2.123397983547417e-16, 5.061138912500049e-16, 3.6588423152083e-17, @@ -231,19 +206,16 @@ end 3.9171737639099993e-16, 2.445565690318772e-16, 3.6588423152083e-17, - 9.971153407737885e-17, - ], - linf=[ - 2.220446049250313e-16, - 8.465450562766819e-16, - 1.8318679906315083e-15, - 1.1102230246251565e-16, - 1.4210854715202004e-14, - 8.881784197001252e-16, - 4.440892098500626e-16, - 1.1102230246251565e-16, - 4.779017148551244e-16, - ], + 9.971153407737885e-17], + linf=[2.220446049250313e-16, + 8.465450562766819e-16, + 1.8318679906315083e-15, + 1.1102230246251565e-16, + 1.4210854715202004e-14, + 8.881784197001252e-16, + 4.440892098500626e-16, + 1.1102230246251565e-16, + 4.779017148551244e-16], maxiters=1, initial_condition=initial_condition_constant, atol=2.0e-13) @@ -259,8 +231,7 @@ end @trixi_testset "elixir_mhd_rotor.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_rotor.jl"), - l2=[ - 1.2623319195262743, + l2=[1.2623319195262743, 1.8273050553090515, 1.7004151198284634, 0.0, @@ -268,19 +239,16 @@ end 0.2147235065899803, 0.23558337696054493, 0.0, - 0.0032515115395693483, - ], - linf=[ - 11.003677581472843, - 14.70614192714736, - 15.687648666952708, - 0.0, - 17.098104835553823, - 1.3283750501377847, - 1.4365828094434892, - 0.0, - 0.07886241196068537, - ], + 0.0032515115395693483], + linf=[11.003677581472843, + 14.70614192714736, + 15.687648666952708, + 0.0, + 17.098104835553823, + 1.3283750501377847, + 1.4365828094434892, + 0.0, + 0.07886241196068537], tspan=(0.0, 0.05)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -294,8 +262,7 @@ end @trixi_testset "elixir_mhd_blast_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_blast_wave.jl"), - l2=[ - 0.17646728395490927, + l2=[0.17646728395490927, 3.866230215339417, 2.4867304651291255, 0.0, @@ -303,19 +270,16 @@ end 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, - ], + 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), # Calling the AnalysisCallback before iteration 9 causes the interpolation # of this IC to have negative density/pressure values, crashing the simulation. @@ -332,8 +296,7 @@ end @trixi_testset "elixir_mhd_shockcapturing_subcell.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_shockcapturing_subcell.jl"), - l2=[ - 3.2064026219236076e-02, + l2=[3.2064026219236076e-02, 7.2461094392606618e-02, 7.2380202888062711e-02, 0.0000000000000000e+00, @@ -341,19 +304,16 @@ end 8.4091669534557805e-03, 5.2156364913231732e-03, 0.0000000000000000e+00, - 2.0786952301129021e-04, - ], - linf=[ - 3.8778760255775635e-01, - 9.4666683953698927e-01, - 9.4618924645661928e-01, - 0.0000000000000000e+00, - 1.0980297261521951e+01, - 1.0264404591009069e-01, - 1.0655686942176350e-01, - 0.0000000000000000e+00, - 6.1013422157115546e-03, - ], + 2.0786952301129021e-04], + linf=[3.8778760255775635e-01, + 9.4666683953698927e-01, + 9.4618924645661928e-01, + 0.0000000000000000e+00, + 1.0980297261521951e+01, + 1.0264404591009069e-01, + 1.0655686942176350e-01, + 0.0000000000000000e+00, + 6.1013422157115546e-03], tspan=(0.0, 0.003)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_2d_mhdmulti.jl b/test/test_tree_2d_mhdmulti.jl index d36554a6679..0e8181385e1 100644 --- a/test/test_tree_2d_mhdmulti.jl +++ b/test/test_tree_2d_mhdmulti.jl @@ -18,10 +18,11 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem") 0.026873190440613162, 1.364647699274761e-15, 0.012124340829605002, 0.024248681659210004], linf=[0.31371522041799105, 0.3037839783173047, - 0.21500228807094351, 0.904249573054642, - 0.0939809809658183, 0.09470282020962761, 0.1527725397829759, - 8.245701827530042e-15, - 0.0787460541210726, 0.1574921082421452]) + 0.21500228807094351, 0.904249573054642, + 0.0939809809658183, 0.09470282020962761, + 0.1527725397829759, + 8.245701827530042e-15, + 0.0787460541210726, 0.1574921082421452]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -42,12 +43,12 @@ end 0.012094208262809778, 0.024188416525619556], linf=[0.3156206778985397, 0.30941696929809526, - 0.21167563519254176, - 0.9688251298546122, 0.09076254289155083, - 0.09160589769498295, - 0.15698032974768705, 0.006131914796912965, - 0.07839287555951036, - 0.1567857511190207], + 0.21167563519254176, + 0.9688251298546122, 0.09076254289155083, + 0.09160589769498295, + 0.15698032974768705, 0.006131914796912965, + 0.07839287555951036, + 0.1567857511190207], volume_flux=(flux_derigs_etal, flux_nonconservative_powell), surface_flux=(flux_derigs_etal, flux_nonconservative_powell)) # Ensure that we do not have excessive memory allocations @@ -68,10 +69,10 @@ end 0.02581748418797907, 0.00023394429554818215, 0.010834603551662698, 0.021669207103325396], linf=[0.23454607703107877, 0.23464789247380322, - 0.11898832084115452, 0.5331209602648022, - 0.061744814466827336, 0.061767127585091286, - 0.09595041452184983, 0.004421037168524759, - 0.06186597801911198, 0.12373195603822396]) + 0.11898832084115452, 0.5331209602648022, + 0.061744814466827336, 0.061767127585091286, + 0.09595041452184983, 0.004421037168524759, + 0.06186597801911198, 0.12373195603822396]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -91,11 +92,11 @@ end 7.4611207452221e-5, 0.000149222414904442, 0.000298444829808884], linf=[0.0013324014301672943, 0.0013324014301669181, - 0.002684449324758791, 0.0016236816790307085, - 0.0019172373117153363, 0.0019172373117148922, - 0.002664932274107224, 0.0011872396664042962, - 0.0002855492944235094, 0.0005710985888470188, - 0.0011421971776940376]) + 0.002684449324758791, 0.0016236816790307085, + 0.0019172373117153363, 0.0019172373117148922, + 0.002664932274107224, 0.0011872396664042962, + 0.0002855492944235094, 0.0005710985888470188, + 0.0011421971776940376]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -114,10 +115,10 @@ end 0.0021114516459281177, 0.15909290019096098, 0.07954645009548049], linf=[9.362339085941425, 9.169838118652539, 0.0, - 10.600957847359556, - 0.6628317732399827, 1.4185626901435056, 0.0, - 0.06914316292003836, - 3.328770801731456, 1.664385400865728], + 10.600957847359556, + 0.6628317732399827, 1.4185626901435056, 0.0, + 0.06914316292003836, + 3.328770801731456, 1.664385400865728], tspan=(0.0, 0.01)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_2d_shallowwater.jl b/test/test_tree_2d_shallowwater.jl index 1f3dfbf5267..97e3eba877a 100644 --- a/test/test_tree_2d_shallowwater.jl +++ b/test/test_tree_2d_shallowwater.jl @@ -14,18 +14,14 @@ EXAMPLES_DIR = joinpath(examples_dir(), "tree_2d_dgsem") @trixi_testset "elixir_shallowwater_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"), - l2=[ - 0.991181203601035, + l2=[0.991181203601035, 0.734130029040644, 0.7447696147162621, - 0.5875351036989047, - ], - linf=[ - 2.0117744577945413, - 2.9962317608172127, - 2.6554999727293653, - 3.0, - ], + 0.5875351036989047], + linf=[2.0117744577945413, + 2.9962317608172127, + 2.6554999727293653, + 3.0], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -39,18 +35,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 0.9130579602987144, + l2=[0.9130579602987144, 1.0602847041965408e-14, 1.082225645390032e-14, - 0.9130579602987147, - ], - linf=[ - 2.113062037615659, - 4.6613606802974e-14, - 5.4225772771633196e-14, - 2.1130620376156584, - ], + 0.9130579602987147], + linf=[2.113062037615659, + 4.6613606802974e-14, + 5.4225772771633196e-14, + 2.1130620376156584], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -65,18 +57,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced_wall.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced_wall.jl"), - l2=[ - 0.9130579602987144, + l2=[0.9130579602987144, 1.0602847041965408e-14, 1.082225645390032e-14, - 0.9130579602987147, - ], - linf=[ - 2.113062037615659, - 4.6613606802974e-14, - 5.4225772771633196e-14, - 2.1130620376156584, - ], + 0.9130579602987147], + linf=[2.113062037615659, + 4.6613606802974e-14, + 5.4225772771633196e-14, + 2.1130620376156584], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -90,18 +78,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl with FluxHydrostaticReconstruction" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 0.9130579602987147, + l2=[0.9130579602987147, 9.68729463970494e-15, 9.694538537436981e-15, - 0.9130579602987147, - ], - linf=[ - 2.1130620376156584, - 2.3875905654916432e-14, - 2.2492839032269154e-14, - 2.1130620376156584, - ], + 0.9130579602987147], + linf=[2.1130620376156584, + 2.3875905654916432e-14, + 2.2492839032269154e-14, + 2.1130620376156584], surface_flux=(FluxHydrostaticReconstruction(flux_lax_friedrichs, hydrostatic_reconstruction_audusse_etal), flux_nonconservative_audusse_etal), @@ -118,18 +102,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl with flux_nonconservative_ersing_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 0.9130579602987146, + l2=[0.9130579602987146, 1.0323158914614244e-14, 1.0276096319430528e-14, - 0.9130579602987147, - ], - linf=[ - 2.11306203761566, - 4.063916419044386e-14, - 3.694484044448245e-14, - 2.1130620376156584, - ], + 0.9130579602987147], + linf=[2.11306203761566, + 4.063916419044386e-14, + 3.694484044448245e-14, + 2.1130620376156584], surface_flux=(flux_wintermeyer_etal, flux_nonconservative_ersing_etal), volume_flux=(flux_wintermeyer_etal, @@ -148,18 +128,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced_wet_dry.jl with FluxHydrostaticReconstruction" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced_wet_dry.jl"), - l2=[ - 0.030186039395610056, + l2=[0.030186039395610056, 2.513287752536758e-14, 1.3631397744897607e-16, - 0.10911781485920438, - ], - linf=[ - 0.49999999999993505, - 5.5278950497971455e-14, - 7.462550826772548e-16, - 2.0, - ], + 0.10911781485920438], + linf=[0.49999999999993505, + 5.5278950497971455e-14, + 7.462550826772548e-16, + 2.0], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -173,18 +149,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.001868474306068482, + l2=[0.001868474306068482, 0.01731687445878443, 0.017649083171490863, - 6.274146767717023e-5, - ], - linf=[ - 0.016962486402209986, - 0.08768628853889782, - 0.09038488750767648, - 0.0001819675955490041, - ], + 6.274146767717023e-5], + linf=[0.016962486402209986, + 0.08768628853889782, + 0.09038488750767648, + 0.0001819675955490041], tspan=(0.0, 0.025)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -199,18 +171,14 @@ end @trixi_testset "elixir_shallowwater_source_terms_dirichlet.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms_dirichlet.jl"), - l2=[ - 0.0018746929418489125, + l2=[0.0018746929418489125, 0.017332321628469628, 0.01634953679145536, - 6.274146767717023e-5, - ], - linf=[ - 0.016262353691956388, - 0.08726160620859424, - 0.09043621801418844, - 0.0001819675955490041, - ], + 6.274146767717023e-5], + linf=[0.016262353691956388, + 0.08726160620859424, + 0.09043621801418844, + 0.0001819675955490041], tspan=(0.0, 0.025)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -224,18 +192,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl with flux_hll" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.0018957692481057034, + l2=[0.0018957692481057034, 0.016943229710439864, 0.01755623297390675, - 6.274146767717414e-5, - ], - linf=[ - 0.015156105797771602, - 0.07964811135780492, - 0.0839787097210376, - 0.0001819675955490041, - ], + 6.274146767717414e-5], + linf=[0.015156105797771602, + 0.07964811135780492, + 0.0839787097210376, + 0.0001819675955490041], tspan=(0.0, 0.025), surface_flux=(flux_hll, flux_nonconservative_fjordholm_etal)) # Ensure that we do not have excessive memory allocations @@ -250,18 +214,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl with flux_nonconservative_ersing_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.002471853426064005, + l2=[0.002471853426064005, 0.05619168608950033, 0.11844727575152562, - 6.274146767730281e-5, - ], - linf=[ - 0.014332922987500218, - 0.2141204806174546, - 0.5392313755637872, - 0.0001819675955490041, - ], + 6.274146767730281e-5], + linf=[0.014332922987500218, + 0.2141204806174546, + 0.5392313755637872, + 0.0001819675955490041], surface_flux=(flux_wintermeyer_etal, flux_nonconservative_ersing_etal), volume_flux=(flux_wintermeyer_etal, @@ -279,18 +239,14 @@ end @trixi_testset "elixir_shallowwater_conical_island.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_conical_island.jl"), - l2=[ - 0.0459315416430658, + l2=[0.0459315416430658, 0.1644534881916991, 0.16445348819169914, - 0.0011537702354532694, - ], - linf=[ - 0.21100717610846464, - 0.9501592344310412, - 0.9501592344310417, - 0.021790250683516282, - ], + 0.0011537702354532694], + linf=[0.21100717610846464, + 0.9501592344310412, + 0.9501592344310417, + 0.021790250683516282], tspan=(0.0, 0.025)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -304,18 +260,14 @@ end @trixi_testset "elixir_shallowwater_parabolic_bowl.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_parabolic_bowl.jl"), - l2=[ - 0.00025345501281482687, + l2=[0.00025345501281482687, 4.4525120338817177e-5, 0.00015991819160294247, - 7.750412064917294e-15, - ], - linf=[ - 0.004664246019836723, - 0.0004972780116736669, - 0.0028735707270457628, - 6.866729407306593e-14, - ], + 7.750412064917294e-15], + linf=[0.004664246019836723, + 0.0004972780116736669, + 0.0028735707270457628, + 6.866729407306593e-14], tspan=(0.0, 0.025), basis=LobattoLegendreBasis(3)) # Ensure that we do not have excessive memory allocations @@ -330,18 +282,14 @@ end @trixi_testset "elixir_shallowwater_wall.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_wall.jl"), - l2=[ - 0.13517233723296504, + l2=[0.13517233723296504, 0.20010876311162215, 0.20010876311162223, - 2.719538414346464e-7, - ], - linf=[ - 0.5303607982988336, - 0.5080989745682338, - 0.5080989745682352, - 1.1301675764130437e-6, - ], + 2.719538414346464e-7], + linf=[0.5303607982988336, + 0.5080989745682338, + 0.5080989745682352, + 1.1301675764130437e-6], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_2d_shallowwater_twolayer.jl b/test/test_tree_2d_shallowwater_twolayer.jl index 802bf4e021c..a1a6d49eb22 100644 --- a/test/test_tree_2d_shallowwater_twolayer.jl +++ b/test/test_tree_2d_shallowwater_twolayer.jl @@ -19,10 +19,10 @@ EXAMPLES_DIR = joinpath(examples_dir(), "tree_2d_dgsem") 0.002680752838455618, 8.873630921431545e-6], linf=[0.002788654460984752, 0.01484602033450666, - 0.017572229756493973, - 0.0016010835493927011, 0.009369847995372549, - 0.008407961775489636, - 3.361991620143279e-5], + 0.017572229756493973, + 0.0016010835493927011, 0.009369847995372549, + 0.008407961775489636, + 3.361991620143279e-5], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -43,10 +43,10 @@ EXAMPLES_DIR = joinpath(examples_dir(), "tree_2d_dgsem") 1.509071695038043e-16, 0.0030769233188014935], linf=[2.248201624865942e-15, 2.346382070278936e-16, - 2.208565017494899e-16, - 0.026474051138910493, 9.237568031609006e-16, - 7.520758026187046e-16, - 0.026474051138910267], + 2.208565017494899e-16, + 0.026474051138910493, 9.237568031609006e-16, + 7.520758026187046e-16, + 0.026474051138910267], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -67,10 +67,10 @@ EXAMPLES_DIR = joinpath(examples_dir(), "tree_2d_dgsem") 1.8473184927121752e-16, 0.0030769233188014935], linf=[7.355227538141662e-16, 2.960836949170518e-16, - 4.2726562436938764e-16, - 0.02647405113891016, 1.038795478061861e-15, - 1.0401789378532516e-15, - 0.026474051138910267], + 4.2726562436938764e-16, + 0.02647405113891016, 1.038795478061861e-15, + 1.0401789378532516e-15, + 0.026474051138910267], surface_flux=(flux_lax_friedrichs, flux_nonconservative_ersing_etal), tspan=(0.0, 0.25)) diff --git a/test/test_tree_3d_euler.jl b/test/test_tree_3d_euler.jl index 02e657e001a..3894120890b 100644 --- a/test/test_tree_3d_euler.jl +++ b/test/test_tree_3d_euler.jl @@ -12,20 +12,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_3d_dgsem") @trixi_testset "elixir_euler_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"), - l2=[ - 0.010385936842224346, + l2=[0.010385936842224346, 0.009776048833895767, 0.00977604883389591, 0.009776048833895733, - 0.01506687097416608, - ], - linf=[ - 0.03285848350791731, - 0.0321792316408982, - 0.032179231640894645, - 0.032179231640895534, - 0.0655408023333299, - ]) + 0.01506687097416608], + linf=[0.03285848350791731, + 0.0321792316408982, + 0.032179231640894645, + 0.032179231640895534, + 0.0655408023333299]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -38,20 +34,16 @@ end @trixi_testset "elixir_euler_convergence_pure_fv.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence_pure_fv.jl"), - l2=[ - 0.037182410351406, + l2=[0.037182410351406, 0.032062252638283974, 0.032062252638283974, 0.03206225263828395, - 0.12228177813586687, - ], - linf=[ - 0.0693648413632646, - 0.0622101894740843, - 0.06221018947408474, - 0.062210189474084965, - 0.24196451799555962, - ]) + 0.12228177813586687], + linf=[0.0693648413632646, + 0.0622101894740843, + 0.06221018947408474, + 0.062210189474084965, + 0.24196451799555962]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -64,20 +56,16 @@ end @trixi_testset "elixir_euler_source_terms.jl with split_form" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"), - l2=[ - 0.010385936842223388, + l2=[0.010385936842223388, 0.009776048833894784, 0.009776048833894784, 0.009776048833894765, - 0.015066870974164096, - ], - linf=[ - 0.03285848350791687, - 0.032179231640897754, - 0.0321792316408942, - 0.0321792316408982, - 0.06554080233333615, - ], + 0.015066870974164096], + linf=[0.03285848350791687, + 0.032179231640897754, + 0.0321792316408942, + 0.0321792316408982, + 0.06554080233333615], volume_integral=VolumeIntegralFluxDifferencing(flux_central)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -91,20 +79,16 @@ end @trixi_testset "elixir_euler_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 0.0003637241020254405, + l2=[0.0003637241020254405, 0.0003955570866382718, 0.0003955570866383613, 0.00039555708663834417, - 0.0007811613481640202, - ], - linf=[ - 0.0024000660244674066, - 0.0029635410025339315, - 0.0029635410025292686, - 0.002963541002525938, - 0.007191437359396424, - ]) + 0.0007811613481640202], + linf=[0.0024000660244674066, + 0.0029635410025339315, + 0.0029635410025292686, + 0.002963541002525938, + 0.007191437359396424]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -117,20 +101,16 @@ end @trixi_testset "elixir_euler_mortar.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_mortar.jl"), - l2=[ - 0.0019428114665068841, + l2=[0.0019428114665068841, 0.0018659907926698422, 0.0018659907926698589, 0.0018659907926698747, - 0.0034549095578444056, - ], - linf=[ - 0.011355360771142298, - 0.011526889155693887, - 0.011526889155689002, - 0.011526889155701436, - 0.02299726519821288, - ]) + 0.0034549095578444056], + linf=[0.011355360771142298, + 0.011526889155693887, + 0.011526889155689002, + 0.011526889155701436, + 0.02299726519821288]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -143,20 +123,16 @@ end @trixi_testset "elixir_euler_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_amr.jl"), - l2=[ - 0.0038281920613404716, + l2=[0.0038281920613404716, 0.003828192061340465, 0.0038281920613404694, 0.0038281920613404672, - 0.005742288092010652, - ], - linf=[ - 0.07390396464027349, - 0.07390396464027305, - 0.07390396464027305, - 0.07390396464027305, - 0.11085594696041134, - ], + 0.005742288092010652], + linf=[0.07390396464027349, + 0.07390396464027305, + 0.07390396464027305, + 0.07390396464027305, + 0.11085594696041134], tspan=(0.0, 0.1), coverage_override=(maxiters = 6, initial_refinement_level = 0, base_level = 0, med_level = 0, max_level = 1)) @@ -172,20 +148,16 @@ end @trixi_testset "elixir_euler_taylor_green_vortex.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_taylor_green_vortex.jl"), - l2=[ - 0.00034949871748737876, + l2=[0.00034949871748737876, 0.03133384111621587, 0.03133384111621582, 0.04378599329988925, - 0.015796137903453026, - ], - linf=[ - 0.0013935237751798724, - 0.0724080091006194, - 0.07240800910061806, - 0.12795921224174792, - 0.07677156293692633, - ], + 0.015796137903453026], + linf=[0.0013935237751798724, + 0.0724080091006194, + 0.07240800910061806, + 0.12795921224174792, + 0.07677156293692633], tspan=(0.0, 0.5)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -199,20 +171,16 @@ end @trixi_testset "elixir_euler_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), - l2=[ - 0.02570137197844877, + l2=[0.02570137197844877, 0.016179934130642552, 0.01617993413064253, 0.016172648598753545, - 0.09261669328795467, - ], - linf=[ - 0.3954458125573179, - 0.26876916180359345, - 0.26876916180359345, - 0.26933123042178553, - 1.3724137121660251, - ]) + 0.09261669328795467], + linf=[0.3954458125573179, + 0.26876916180359345, + 0.26876916180359345, + 0.26933123042178553, + 1.3724137121660251]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -228,20 +196,16 @@ end # `sedov_self_gravity` AMR indicator, which in its original configuration is too expensive for # CI testing @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing_amr.jl"), - l2=[ - 0.02217299067704248, + l2=[0.02217299067704248, 0.012771561294571411, 0.01277156129457143, 0.012770635779336643, - 0.08091898488262424, - ], - linf=[ - 0.4047819603427084, - 0.27493532130155474, - 0.2749353213015551, - 0.2749304638368023, - 1.4053942765487641, - ], + 0.08091898488262424], + linf=[0.4047819603427084, + 0.27493532130155474, + 0.2749353213015551, + 0.2749304638368023, + 1.4053942765487641], maxiters=10, coverage_override=(maxiters = 2,)) # Ensure that we do not have excessive memory allocations @@ -256,20 +220,16 @@ end @trixi_testset "elixir_euler_density_pulse.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_pulse.jl"), - l2=[ - 0.057196526814004715, + l2=[0.057196526814004715, 0.057196526814004715, 0.05719652681400473, 0.057196526814004736, - 0.08579479022100575, - ], - linf=[ - 0.27415246703018203, - 0.2741524670301829, - 0.2741524670301827, - 0.27415246703018226, - 0.41122870054527816, - ]) + 0.08579479022100575], + linf=[0.27415246703018203, + 0.2741524670301829, + 0.2741524670301827, + 0.27415246703018226, + 0.41122870054527816]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -282,20 +242,16 @@ end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.02526341317987378, + l2=[0.02526341317987378, 0.016632068583699623, 0.016632068583699623, 0.01662548715216875, - 0.0913477018048886, - ], - linf=[ - 0.4372549540810414, - 0.28613118232798984, - 0.28613118232799006, - 0.28796686065271876, - 1.5072828647309124, - ]) + 0.0913477018048886], + linf=[0.4372549540810414, + 0.28613118232798984, + 0.28613118232799006, + 0.28796686065271876, + 1.5072828647309124]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -308,20 +264,16 @@ end @trixi_testset "elixir_euler_ec.jl with initial_condition=initial_condition_constant" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 4.183721551616214e-16, + l2=[4.183721551616214e-16, 6.059779958716338e-16, 4.916596221090319e-16, 9.739943366304456e-16, - 3.7485908743251566e-15, - ], - linf=[ - 2.4424906541753444e-15, - 3.733124920302089e-15, - 4.440892098500626e-15, - 5.329070518200751e-15, - 2.4868995751603507e-14, - ], + 3.7485908743251566e-15], + linf=[2.4424906541753444e-15, + 3.733124920302089e-15, + 4.440892098500626e-15, + 5.329070518200751e-15, + 2.4868995751603507e-14], initial_condition=initial_condition_constant) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -335,20 +287,16 @@ end @trixi_testset "elixir_euler_ec.jl with flux_chandrashekar" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.025265721172813106, + l2=[0.025265721172813106, 0.016649800693500427, 0.01664980069350042, 0.01664379306708522, - 0.09137248646784184, - ], - linf=[ - 0.4373399329742198, - 0.28434487167605427, - 0.28434487167605427, - 0.28522678968890774, - 1.532471676033761, - ], + 0.09137248646784184], + linf=[0.4373399329742198, + 0.28434487167605427, + 0.28434487167605427, + 0.28522678968890774, + 1.532471676033761], surface_flux=flux_chandrashekar, volume_flux=flux_chandrashekar) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -362,20 +310,16 @@ end @trixi_testset "elixir_euler_ec.jl with flux_kennedy_gruber" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.025280033869871984, + l2=[0.025280033869871984, 0.016675487948639846, 0.016675487948639853, 0.016668992714991282, - 0.091455613470441, - ], - linf=[ - 0.43348628145015766, - 0.28853549062014217, - 0.28853549062014217, - 0.2903943042772536, - 1.5236557526482426, - ], + 0.091455613470441], + linf=[0.43348628145015766, + 0.28853549062014217, + 0.28853549062014217, + 0.2903943042772536, + 1.5236557526482426], surface_flux=flux_kennedy_gruber, volume_flux=flux_kennedy_gruber) # Ensure that we do not have excessive memory allocations @@ -390,20 +334,16 @@ end @trixi_testset "elixir_euler_ec.jl with flux_shima_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.025261716925811403, + l2=[0.025261716925811403, 0.016637655557848952, 0.01663765555784895, 0.01663105921013437, - 0.09136239054024566, - ], - linf=[ - 0.43692416928732536, - 0.28622033209064734, - 0.28622033209064746, - 0.2881197143457632, - 1.506534270303663, - ], + 0.09136239054024566], + linf=[0.43692416928732536, + 0.28622033209064734, + 0.28622033209064746, + 0.2881197143457632, + 1.506534270303663], surface_flux=flux_shima_etal, volume_flux=flux_shima_etal) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -417,20 +357,16 @@ end @trixi_testset "elixir_euler_blob_amr.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blob_amr.jl"), - l2=[ - 0.04867856452253151, + l2=[0.04867856452253151, 0.2640486962336911, 0.0354927658652858, 0.03549276586528571, - 1.0777274757408568, - ], - linf=[ - 9.558543313792217, - 49.4518309553356, - 10.319859082570309, - 10.319859082570487, - 195.1066220797401, - ], + 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 @@ -447,20 +383,16 @@ 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, + l2=[0.0007127163978031706, 0.0023166296394624025, 0.002316629639462401, 0.0023166296394624038, - 0.010200581509653256, - ], - linf=[ - 0.06344190883105805, - 0.6292607955969378, - 0.6292607955969377, - 0.6292607955969377, - 2.397746252817731, - ], + 0.010200581509653256], + linf=[0.06344190883105805, + 0.6292607955969378, + 0.6292607955969377, + 0.6292607955969377, + 2.397746252817731], maxiters=5, max_level=6, coverage_override=(maxiters = 2, initial_refinement_level = 1, base_level = 1, max_level = 3)) @@ -476,20 +408,16 @@ end @trixi_testset "elixir_euler_sedov_blast_wave.jl (HLLE)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"), - l2=[ - 0.0007871241159752619, + l2=[0.0007871241159752619, 0.0037168004033428146, 0.0037168004033428094, 0.0037168004033428514, - 0.011119869089205635, - ], - linf=[ - 0.13982864363612468, - 0.786004687738243, - 0.786004687738243, - 0.7860046877382431, - 1.7082524045150382, - ], + 0.011119869089205635], + linf=[0.13982864363612468, + 0.786004687738243, + 0.786004687738243, + 0.7860046877382431, + 1.7082524045150382], tspan=(0.0, 0.01), surface_flux=flux_hlle) # Ensure that we do not have excessive memory allocations diff --git a/test/test_tree_3d_eulergravity.jl b/test/test_tree_3d_eulergravity.jl index 1b5e715f774..294aff8d3a3 100644 --- a/test/test_tree_3d_eulergravity.jl +++ b/test/test_tree_3d_eulergravity.jl @@ -12,20 +12,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_3d_dgsem") @trixi_testset "elixir_eulergravity_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), - l2=[ - 0.0004276779201667428, + l2=[0.0004276779201667428, 0.00047204222332596204, 0.00047204222332608705, 0.0004720422233259819, - 0.0010987026250960728, - ], - linf=[ - 0.003496616916238704, - 0.003764418290373106, - 0.003764418290377103, - 0.0037644182903766588, - 0.008370424899251105, - ], + 0.0010987026250960728], + linf=[0.003496616916238704, + 0.003764418290373106, + 0.003764418290377103, + 0.0037644182903766588, + 0.008370424899251105], resid_tol=1.0e-4, tspan=(0.0, 0.2)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) diff --git a/test/test_tree_3d_fdsbp.jl b/test/test_tree_3d_fdsbp.jl index e0e2bfe4b88..c2e744e28a9 100644 --- a/test/test_tree_3d_fdsbp.jl +++ b/test/test_tree_3d_fdsbp.jl @@ -52,20 +52,16 @@ end @testset "Compressible Euler" begin @trixi_testset "elixir_euler_convergence.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 2.247522803543667e-5, + l2=[2.247522803543667e-5, 2.2499169224681058e-5, 2.24991692246826e-5, 2.2499169224684707e-5, - 5.814121361417382e-5, - ], - linf=[ - 9.579357410749445e-5, - 9.544871933409027e-5, - 9.54487193367548e-5, - 9.544871933453436e-5, - 0.0004192294529472562, - ], + 5.814121361417382e-5], + linf=[9.579357410749445e-5, + 9.544871933409027e-5, + 9.54487193367548e-5, + 9.544871933453436e-5, + 0.0004192294529472562], tspan=(0.0, 0.2)) # Ensure that we do not have excessive memory allocations @@ -80,20 +76,16 @@ end @trixi_testset "elixir_euler_convergence.jl with VolumeIntegralStrongForm" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), - l2=[ - 4.084919840272202e-5, + l2=[4.084919840272202e-5, 4.1320630860402814e-5, 4.132063086040211e-5, 4.132063086039092e-5, - 8.502518355874354e-5, - ], - linf=[ - 0.0001963934848161486, - 0.00020239883896255861, - 0.0002023988389729947, - 0.00020239883896766564, - 0.00052605624510349, - ], + 8.502518355874354e-5], + linf=[0.0001963934848161486, + 0.00020239883896255861, + 0.0002023988389729947, + 0.00020239883896766564, + 0.00052605624510349], tspan=(0.0, 0.2), solver=DG(D_upw.central, nothing, SurfaceIntegralStrongForm(), VolumeIntegralStrongForm())) @@ -110,20 +102,16 @@ end @trixi_testset "elixir_euler_taylor_green_vortex.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_taylor_green_vortex.jl"), - l2=[ - 3.529693407280806e-6, + l2=[3.529693407280806e-6, 0.0004691301922633193, 0.00046913019226332234, 0.0006630180220973541, - 0.0015732759680929076, - ], - linf=[ - 3.4253965106145756e-5, - 0.0010033197685090707, - 0.0010033197685091054, - 0.0018655642702542635, - 0.008479800046757191, - ], + 0.0015732759680929076], + linf=[3.4253965106145756e-5, + 0.0010033197685090707, + 0.0010033197685091054, + 0.0018655642702542635, + 0.008479800046757191], tspan=(0.0, 0.0075), abstol=1.0e-9, reltol=1.0e-9) # Ensure that we do not have excessive memory allocations diff --git a/test/test_tree_3d_hypdiff.jl b/test/test_tree_3d_hypdiff.jl index 5c9dacbd87d..2bddd5ea52e 100644 --- a/test/test_tree_3d_hypdiff.jl +++ b/test/test_tree_3d_hypdiff.jl @@ -12,18 +12,14 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_3d_dgsem") @trixi_testset "elixir_hypdiff_lax_friedrichs.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_lax_friedrichs.jl"), - l2=[ - 0.001530331609036682, + l2=[0.001530331609036682, 0.011314177033289238, 0.011314177033289402, - 0.011314177033289631, - ], - linf=[ - 0.02263459033909354, - 0.10139777904683545, - 0.10139777904683545, - 0.10139777904683545, - ], + 0.011314177033289631], + linf=[0.02263459033909354, + 0.10139777904683545, + 0.10139777904683545, + 0.10139777904683545], initial_refinement_level=2) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -37,18 +33,14 @@ end @trixi_testset "elixir_hypdiff_lax_friedrichs.jl with surface_flux=flux_godunov)" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_lax_friedrichs.jl"), - l2=[ - 0.0015377731806850128, + l2=[0.0015377731806850128, 0.01137685274151801, 0.011376852741518175, - 0.011376852741518494, - ], - linf=[ - 0.022715420630041172, - 0.10183745338964201, - 0.10183745338964201, - 0.1018374533896429, - ], + 0.011376852741518494], + linf=[0.022715420630041172, + 0.10183745338964201, + 0.10183745338964201, + 0.1018374533896429], initial_refinement_level=2, surface_flux=flux_godunov) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -62,18 +54,14 @@ end @trixi_testset "elixir_hypdiff_nonperiodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_nonperiodic.jl"), - l2=[ - 0.00022868320512754316, + l2=[0.00022868320512754316, 0.0007974309948540525, 0.0015035143230654987, - 0.0015035143230655293, - ], - linf=[ - 0.0016405001653623241, - 0.0029870057159104594, - 0.009410031618285686, - 0.009410031618287462, - ]) + 0.0015035143230655293], + linf=[0.0016405001653623241, + 0.0029870057159104594, + 0.009410031618285686, + 0.009410031618287462]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_tree_3d_lbm.jl b/test/test_tree_3d_lbm.jl index dc7e770dfa4..4b33a1958fd 100644 --- a/test/test_tree_3d_lbm.jl +++ b/test/test_tree_3d_lbm.jl @@ -31,23 +31,23 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_3d_dgsem") 3.608945206319316e-17, 4.187850903422495e-17, 8.254587760492495e-16], linf=[1.1657341758564144e-15, 1.5543122344752192e-15, - 1.1657341758564144e-15, - 1.4710455076283324e-15, 1.0547118733938987e-15, - 1.4988010832439613e-15, - 5.273559366969494e-16, 5.065392549852277e-16, - 5.967448757360216e-16, - 5.342948306008566e-16, 5.412337245047638e-16, - 5.967448757360216e-16, - 3.608224830031759e-16, 3.469446951953614e-16, - 2.42861286636753e-16, - 2.498001805406602e-16, 2.2898349882893854e-16, - 4.3021142204224816e-16, - 2.1510571102112408e-16, 1.43982048506075e-16, - 1.214306433183765e-16, - 1.4224732503009818e-16, 1.214306433183765e-16, - 1.3877787807814457e-16, - 8.673617379884035e-17, 9.71445146547012e-17, - 2.7755575615628914e-15], + 1.1657341758564144e-15, + 1.4710455076283324e-15, 1.0547118733938987e-15, + 1.4988010832439613e-15, + 5.273559366969494e-16, 5.065392549852277e-16, + 5.967448757360216e-16, + 5.342948306008566e-16, 5.412337245047638e-16, + 5.967448757360216e-16, + 3.608224830031759e-16, 3.469446951953614e-16, + 2.42861286636753e-16, + 2.498001805406602e-16, 2.2898349882893854e-16, + 4.3021142204224816e-16, + 2.1510571102112408e-16, 1.43982048506075e-16, + 1.214306433183765e-16, + 1.4224732503009818e-16, 1.214306433183765e-16, + 1.3877787807814457e-16, + 8.673617379884035e-17, 9.71445146547012e-17, + 2.7755575615628914e-15], tspan=(0.0, 0.5)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -79,22 +79,22 @@ end 6.697526775465983e-6, 6.697526775466005e-6, 2.8805380887802028e-6], linf=[0.00021570074723312183, 0.0002157007472331357, - 0.00021570074723314958, - 0.00021570074723316346, 1.9675688146578163e-5, - 1.967568814660592e-5, - 9.53539471547013e-6, 9.53539471547013e-6, - 5.7339968249785905e-5, - 5.7339968249778966e-5, 5.7339968249792844e-5, - 5.7339968249778966e-5, - 9.535394715480539e-6, 9.53539471546666e-6, - 5.73399682497755e-5, 5.7339968249785905e-5, - 5.7339968249782436e-5, 5.7339968249782436e-5, - 1.3570400471223966e-5, - 1.3570400471222231e-5, 1.3570400471220496e-5, - 1.3570400471224833e-5, - 1.3570400471223966e-5, 1.3570400471221364e-5, - 1.3570400471224833e-5, - 1.3570400471224833e-5, 1.4249297322244114e-5], + 0.00021570074723314958, + 0.00021570074723316346, 1.9675688146578163e-5, + 1.967568814660592e-5, + 9.53539471547013e-6, 9.53539471547013e-6, + 5.7339968249785905e-5, + 5.7339968249778966e-5, 5.7339968249792844e-5, + 5.7339968249778966e-5, + 9.535394715480539e-6, 9.53539471546666e-6, + 5.73399682497755e-5, 5.7339968249785905e-5, + 5.7339968249782436e-5, 5.7339968249782436e-5, + 1.3570400471223966e-5, + 1.3570400471222231e-5, 1.3570400471220496e-5, + 1.3570400471224833e-5, + 1.3570400471223966e-5, 1.3570400471221364e-5, + 1.3570400471224833e-5, + 1.3570400471224833e-5, 1.4249297322244114e-5], tspan=(0.0, 0.1), initial_refinement_level=3) # Ensure that we do not have excessive memory allocations diff --git a/test/test_tree_3d_mhd.jl b/test/test_tree_3d_mhd.jl index e75685f0b43..857d8398fae 100644 --- a/test/test_tree_3d_mhd.jl +++ b/test/test_tree_3d_mhd.jl @@ -12,8 +12,7 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_3d_dgsem") @trixi_testset "elixir_mhd_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), - l2=[ - 0.017590099293094203, + l2=[0.017590099293094203, 0.017695875823827714, 0.017695875823827686, 0.017698038279620777, @@ -21,19 +20,16 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_3d_dgsem") 0.010391801950005755, 0.010391801950005759, 0.010393502246627087, - 2.524766553484067e-16, - ], - linf=[ - 0.28173002819718196, - 0.3297583616136297, - 0.32975836161363004, - 0.356862935505337, - 1.2893514981209626, - 0.10950981489747313, - 0.10950981489747136, - 0.11517234329681891, - 2.0816911067714202e-15, - ]) + 2.524766553484067e-16], + linf=[0.28173002819718196, + 0.3297583616136297, + 0.32975836161363004, + 0.356862935505337, + 1.2893514981209626, + 0.10950981489747313, + 0.10950981489747136, + 0.11517234329681891, + 2.0816911067714202e-15]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -46,8 +42,7 @@ end @trixi_testset "elixir_mhd_ec.jl with initial_condition=initial_condition_constant" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), - l2=[ - 4.270231310667203e-16, + l2=[4.270231310667203e-16, 2.4381208042014784e-15, 5.345107673575357e-15, 3.00313882171883e-15, @@ -55,19 +50,16 @@ end 1.0340110783830874e-15, 1.1779095371939702e-15, 9.961878521814573e-16, - 8.1201730630719145e-16, - ], - linf=[ - 2.4424906541753444e-15, - 2.881028748902281e-14, - 2.4646951146678475e-14, - 2.3092638912203256e-14, - 2.3447910280083306e-13, - 1.7763568394002505e-14, - 1.0436096431476471e-14, - 2.042810365310288e-14, - 7.057203733035201e-15, - ], + 8.1201730630719145e-16], + linf=[2.4424906541753444e-15, + 2.881028748902281e-14, + 2.4646951146678475e-14, + 2.3092638912203256e-14, + 2.3447910280083306e-13, + 1.7763568394002505e-14, + 1.0436096431476471e-14, + 2.042810365310288e-14, + 7.057203733035201e-15], atol=1000 * eps(), initial_condition=initial_condition_constant) # Ensure that we do not have excessive memory allocations @@ -82,8 +74,7 @@ end @trixi_testset "elixir_mhd_alfven_wave.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 0.0032217291057246157, + l2=[0.0032217291057246157, 0.009511644936958913, 0.004217358459420256, 0.011591709179125335, @@ -91,19 +82,16 @@ end 0.00916500047763897, 0.005069863732625444, 0.011503011541926135, - 0.003988175543749985, - ], - linf=[ - 0.01188593784273051, - 0.03638015998373141, - 0.01568200398945724, - 0.04666974730787579, - 0.031235294705421968, - 0.03316343064943483, - 0.011539436992528018, - 0.04896687646520839, - 0.018714054039927555, - ]) + 0.003988175543749985], + linf=[0.01188593784273051, + 0.03638015998373141, + 0.01568200398945724, + 0.04666974730787579, + 0.031235294705421968, + 0.03316343064943483, + 0.011539436992528018, + 0.04896687646520839, + 0.018714054039927555]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -116,8 +104,7 @@ end @trixi_testset "elixir_mhd_alfven_wave.jl with flux_derigs_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 0.003755235939722358, + l2=[0.003755235939722358, 0.009062519246840721, 0.004096299856228109, 0.011429935838448906, @@ -125,19 +112,16 @@ end 0.00900886245212482, 0.004926537542780259, 0.01153285554590683, - 0.0037842060148666886, - ], - linf=[ - 0.012982853115883541, - 0.0320228076558316, - 0.011575276754611022, - 0.04425778643430531, - 0.02478109022285846, - 0.03198699034954189, - 0.009761077061886558, - 0.04433669321441455, - 0.01618905441148782, - ], + 0.0037842060148666886], + linf=[0.012982853115883541, + 0.0320228076558316, + 0.011575276754611022, + 0.04425778643430531, + 0.02478109022285846, + 0.03198699034954189, + 0.009761077061886558, + 0.04433669321441455, + 0.01618905441148782], volume_flux=(flux_derigs_etal, flux_nonconservative_powell)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -151,8 +135,7 @@ end @trixi_testset "elixir_mhd_alfven_wave_mortar.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave_mortar.jl"), - l2=[ - 0.001879021634926363, + l2=[0.001879021634926363, 0.007032724521848316, 0.0032793932234187325, 0.009056594733320348, @@ -160,19 +143,16 @@ end 0.007328739509868727, 0.00309794018112387, 0.009026356949274878, - 0.0035732583778049776, - ], - linf=[ - 0.013734346970999622, - 0.06173467158736011, - 0.02183946452704291, - 0.06258216169457917, - 0.03672304497348122, - 0.055120532123884625, - 0.018202716205672487, - 0.06133688282205586, - 0.019888161885935608, - ], + 0.0035732583778049776], + linf=[0.013734346970999622, + 0.06173467158736011, + 0.02183946452704291, + 0.06258216169457917, + 0.03672304497348122, + 0.055120532123884625, + 0.018202716205672487, + 0.06133688282205586, + 0.019888161885935608], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -188,8 +168,7 @@ end # OBS! This setup does not make much sense and is only used to exercise all components of the # flux_hll implementation @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), - l2=[ - 0.004391143689111404, + l2=[0.004391143689111404, 0.04144737547475548, 0.041501307637678286, 0.04150353006408862, @@ -197,19 +176,16 @@ end 0.021125605214031118, 0.03295607553556973, 0.03296235755245784, - 7.16035229384135e-6, - ], - linf=[ - 0.017894703320895378, - 0.08486850681397005, - 0.0891044523165206, - 0.08492024792056754, - 0.10448301878352373, - 0.05381260695579509, - 0.0884774018719996, - 0.07784546966765199, - 7.71609149516089e-5, - ], + 7.16035229384135e-6], + linf=[0.017894703320895378, + 0.08486850681397005, + 0.0891044523165206, + 0.08492024792056754, + 0.10448301878352373, + 0.05381260695579509, + 0.0884774018719996, + 0.07784546966765199, + 7.71609149516089e-5], initial_condition=function initial_condition_orszag_tang(x, t, equations::IdealGlmMhdEquations3D) # The classical Orszag-Tang vortex test case adapted to 3D. Setup is taken from @@ -260,8 +236,7 @@ end @trixi_testset "elixir_mhd_ec_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec_shockcapturing.jl"), - l2=[ - 0.0186712969755079, + l2=[0.0186712969755079, 0.01620736832264799, 0.01620736832264803, 0.016207474382769683, @@ -269,19 +244,16 @@ end 0.007355137041002365, 0.0073551370410023425, 0.00735520932001833, - 0.000506140942330923, - ], - linf=[ - 0.28040713666979633, - 0.27212885844703694, - 0.2721288584470349, - 0.2837380205051839, - 0.7915852408267114, - 0.08770240288089526, - 0.08770240288089792, - 0.08773409387876674, - 0.050221095224119834, - ]) + 0.000506140942330923], + linf=[0.28040713666979633, + 0.27212885844703694, + 0.2721288584470349, + 0.2837380205051839, + 0.7915852408267114, + 0.08770240288089526, + 0.08770240288089792, + 0.08773409387876674, + 0.050221095224119834]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let diff --git a/test/test_trixi.jl b/test/test_trixi.jl index cebe2164ae6..1d3417ffba6 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -63,9 +63,8 @@ macro test_trixi_include(elixir, args...) # if `maxiters` is set in tests, it is usually set to a small number to # run only a few steps - ignore possible warnings coming from that 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"] + additional_ignore_content = [r"┌ Warning: Interrupted\. Larger maxiters is needed\..*\n└ @ SciMLBase .+\n", + r"┌ Warning: Interrupted\. Larger maxiters is needed\..*\n└ @ Trixi .+\n"] else additional_ignore_content = [] end diff --git a/test/test_unit.jl b/test/test_unit.jl index 7943d952f71..33d82f8758b 100644 --- a/test/test_unit.jl +++ b/test/test_unit.jl @@ -605,7 +605,7 @@ end point_data_1 = time_series.affect!.point_data[1] @test all(isapprox.(point_data_1[1:7], [-2.4417734981719132e-5, -3.4296207289200194e-5, - 0.0018130846385739788, -0.5, 0.25, 1.0, 1.0])) + 0.0018130846385739788, -0.5, 0.25, 1.0, 1.0])) @test_throws DimensionMismatch Trixi.get_elements_by_coordinates!([1, 2], rand(2, 4), mesh, solver, nothing) @@ -680,9 +680,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_hll(u, u, normal_direction, equations) ≈ @@ -699,9 +699,9 @@ end equations = ShallowWaterEquations2D(gravity_constant = 9.81) normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] u = SVector(1, 0.5, 0.5, 0.0) for normal_direction in normal_directions @test flux_hll(u, u, normal_direction, equations) ≈ @@ -714,7 +714,7 @@ end equations = IdealGlmMhdEquations1D(1.4) u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2)] for u in u_values @test flux_hll(u, u, 1, equations) ≈ flux(u, 1, equations) @@ -722,13 +722,13 @@ end equations = IdealGlmMhdEquations2D(1.4, 5.0) #= c_h =# normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] orientations = [1, 2] u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1, 0.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] for u in u_values, orientation in orientations @test flux_hll(u, u, orientation, equations) ≈ flux(u, orientation, equations) @@ -741,14 +741,14 @@ end equations = IdealGlmMhdEquations3D(1.4, 5.0) #= c_h =# normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] orientations = [1, 2, 3] u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1, 0.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] for u in u_values, orientation in orientations @test flux_hll(u, u, orientation, equations) ≈ flux(u, orientation, equations) @@ -781,9 +781,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_hll(u, u, normal_direction, equations) ≈ @@ -799,10 +799,10 @@ end end normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] for normal_direction in normal_directions @test flux_hll(u, u, normal_direction, equations) ≈ @@ -824,9 +824,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_hll(u, u, normal_direction, equations) ≈ @@ -847,9 +847,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_winters_etal(u, u, normal_direction, equations) ≈ @@ -870,9 +870,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_hll(u, u, normal_direction, equations) ≈ @@ -889,9 +889,9 @@ end equations = ShallowWaterEquations2D(gravity_constant = 9.81) normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] u = SVector(1, 0.5, 0.5, 0.0) for normal_direction in normal_directions @test flux_hll(u, u, normal_direction, equations) ≈ @@ -909,7 +909,7 @@ end equations = IdealGlmMhdEquations1D(1.4) u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2)] for u in u_values @test flux_hll(u, u, 1, equations) ≈ flux(u, 1, equations) @@ -917,13 +917,13 @@ end equations = IdealGlmMhdEquations2D(1.4, 5.0) #= c_h =# normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] orientations = [1, 2] u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1, 0.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] for u in u_values, orientation in orientations @test flux_hll(u, u, orientation, equations) ≈ flux(u, orientation, equations) @@ -936,14 +936,14 @@ end equations = IdealGlmMhdEquations3D(1.4, 5.0) #= c_h =# normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] orientations = [1, 2, 3] u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1, 0.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] for u in u_values, orientation in orientations @test flux_hll(u, u, orientation, equations) ≈ flux(u, orientation, equations) @@ -974,9 +974,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_hlle(u, u, normal_direction, equations) ≈ @@ -992,10 +992,10 @@ end end normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] for normal_direction in normal_directions @test flux_hlle(u, u, normal_direction, equations) ≈ @@ -1010,9 +1010,9 @@ end equations = ShallowWaterEquations2D(gravity_constant = 9.81) normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] orientations = [1, 2] u = SVector(1, 0.5, 0.5, 0.0) @@ -1030,7 +1030,7 @@ end @timed_testset "Consistency check for HLLE flux: MHD" begin equations = IdealGlmMhdEquations1D(1.4) u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2)] for u in u_values @test flux_hlle(u, u, 1, equations) ≈ flux(u, 1, equations) @@ -1039,13 +1039,13 @@ end equations = IdealGlmMhdEquations2D(1.4, 5.0) #= c_h =# normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] orientations = [1, 2] u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1, 0.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] for u in u_values, orientation in orientations @test flux_hlle(u, u, orientation, equations) ≈ flux(u, orientation, equations) @@ -1058,14 +1058,14 @@ end equations = IdealGlmMhdEquations3D(1.4, 5.0) #= c_h =# normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] orientations = [1, 2, 3] u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1, 0.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] for u in u_values, orientation in orientations @test flux_hlle(u, u, orientation, equations) ≈ flux(u, orientation, equations) @@ -1088,9 +1088,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_hllc(u, u, normal_direction, equations) ≈ @@ -1106,10 +1106,10 @@ end end normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] for normal_direction in normal_directions @test flux_hllc(u, u, normal_direction, equations) ≈ @@ -1148,9 +1148,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_godunov(u, u, normal_direction, equation) ≈ @@ -1167,10 +1167,10 @@ end end normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] for normal_direction in normal_directions @test flux_godunov(u, u, normal_direction, equation) ≈ @@ -1182,7 +1182,7 @@ end c_mean_global = 1.1, rho_mean_global = 1.2) u_values = [SVector(1.0, 0.5, -0.7, 1.0), - SVector(1.5, -0.2, 0.1, 5.0)] + SVector(1.5, -0.2, 0.1, 5.0)] orientations = [1, 2] for orientation in orientations, u in u_values @@ -1190,9 +1190,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions, u in u_values @test flux_godunov(u, u, normal_direction, equation) ≈ @@ -1223,12 +1223,10 @@ end @testset "Consistency check for `gradient_conservative` routine" begin # Set up conservative variables, equations - u = [ - 0.5011914484393387, - 0.8829127712445113, - 0.43024132987932817, - 0.7560616633050348, - ] + u = [0.5011914484393387, + 0.8829127712445113, + 0.43024132987932817, + 0.7560616633050348] equations = CompressibleEulerEquations2D(1.4) @@ -1277,9 +1275,9 @@ end end normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] for normal_direction in normal_directions @test flux_godunov(3 * u, u, normal_direction, equation) ≈ @@ -1297,10 +1295,10 @@ end end normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] for normal_direction in normal_directions @test flux_godunov(1.3 * u, u, normal_direction, equation) ≈ @@ -1313,12 +1311,12 @@ end flux_lmars = FluxLMARS(340) normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] orientations = [1, 2] u_values = [SVector(1.0, 0.5, -0.7, 1.0), - SVector(1.5, -0.2, 0.1, 5.0)] + SVector(1.5, -0.2, 0.1, 5.0)] for u in u_values, orientation in orientations @test flux_lmars(u, u, orientation, equations) ≈ @@ -1332,13 +1330,13 @@ end equations = CompressibleEulerEquations3D(1.4) normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] orientations = [1, 2, 3] u_values = [SVector(1.0, 0.5, -0.7, 0.1, 1.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0)] for u in u_values, orientation in orientations @test flux_lmars(u, u, orientation, equations) ≈ @@ -1357,11 +1355,11 @@ end gas_constants = (0.4, 0.4)) normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] u_values = [SVector(0.1, -0.5, 1.0, 1.0, 2.0), - SVector(-0.1, -0.3, 1.2, 1.3, 1.4)] + SVector(-0.1, -0.3, 1.2, 1.3, 1.4)] f_std = flux f_rot = FluxRotated(f_std) @@ -1378,14 +1376,14 @@ end @timed_testset "CompressibleEulerEquations2D" begin equations = CompressibleEulerEquations2D(1.4) normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] u_values = [SVector(1.0, 0.5, -0.7, 1.0), - SVector(1.5, -0.2, 0.1, 5.0)] + SVector(1.5, -0.2, 0.1, 5.0)] fluxes = [flux_central, flux_ranocha, flux_shima_etal, flux_kennedy_gruber, - FluxLMARS(340), flux_hll, FluxHLL(min_max_speed_davis), flux_hlle, flux_hllc, - ] + FluxLMARS(340), flux_hll, FluxHLL(min_max_speed_davis), flux_hlle, + flux_hllc] for f_std in fluxes f_rot = FluxRotated(f_std) @@ -1401,15 +1399,15 @@ end @timed_testset "CompressibleEulerEquations3D" begin equations = CompressibleEulerEquations3D(1.4) normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] u_values = [SVector(1.0, 0.5, -0.7, 0.1, 1.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0)] + SVector(1.5, -0.2, 0.1, 0.2, 5.0)] fluxes = [flux_central, flux_ranocha, flux_shima_etal, flux_kennedy_gruber, - FluxLMARS(340), flux_hll, FluxHLL(min_max_speed_davis), flux_hlle, flux_hllc, - ] + FluxLMARS(340), flux_hll, FluxHLL(min_max_speed_davis), flux_hlle, + flux_hllc] for f_std in fluxes f_rot = FluxRotated(f_std) @@ -1425,30 +1423,28 @@ end @timed_testset "ShallowWaterEquations2D" begin equations = ShallowWaterEquations2D(gravity_constant = 9.81) normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] u = SVector(1, 0.5, 0.5, 0.0) fluxes = [flux_central, flux_fjordholm_etal, flux_wintermeyer_etal, - flux_hll, FluxHLL(min_max_speed_davis), flux_hlle] + flux_hll, FluxHLL(min_max_speed_davis), flux_hlle] end @timed_testset "IdealGlmMhdEquations2D" begin equations = IdealGlmMhdEquations2D(1.4, 5.0) #= c_h =# normal_directions = [SVector(1.0, 0.0), - SVector(0.0, 1.0), - SVector(0.5, -0.5), - SVector(-1.2, 0.3)] + SVector(0.0, 1.0), + SVector(0.5, -0.5), + SVector(-1.2, 0.3)] u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1, 0.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] - fluxes = [ - flux_central, - flux_hindenlang_gassner, - FluxHLL(min_max_speed_davis), - flux_hlle, - ] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] + fluxes = [flux_central, + flux_hindenlang_gassner, + FluxHLL(min_max_speed_davis), + flux_hlle] for f_std in fluxes f_rot = FluxRotated(f_std) @@ -1464,18 +1460,16 @@ end @timed_testset "IdealGlmMhdEquations3D" begin equations = IdealGlmMhdEquations3D(1.4, 5.0) #= c_h =# normal_directions = [SVector(1.0, 0.0, 0.0), - SVector(0.0, 1.0, 0.0), - SVector(0.0, 0.0, 1.0), - SVector(0.5, -0.5, 0.2), - SVector(-1.2, 0.3, 1.4)] + SVector(0.0, 1.0, 0.0), + SVector(0.0, 0.0, 1.0), + SVector(0.5, -0.5, 0.2), + SVector(-1.2, 0.3, 1.4)] u_values = [SVector(1.0, 0.4, -0.5, 0.1, 1.0, 0.1, -0.2, 0.1, 0.0), - SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] - fluxes = [ - flux_central, - flux_hindenlang_gassner, - FluxHLL(min_max_speed_davis), - flux_hlle, - ] + SVector(1.5, -0.2, 0.1, 0.2, 5.0, -0.1, 0.1, 0.2, 0.2)] + fluxes = [flux_central, + flux_hindenlang_gassner, + FluxHLL(min_max_speed_davis), + flux_hlle] for f_std in fluxes f_rot = FluxRotated(f_std) diff --git a/test/test_unstructured_2d.jl b/test/test_unstructured_2d.jl index 139b423ead1..723b93c3232 100644 --- a/test/test_unstructured_2d.jl +++ b/test/test_unstructured_2d.jl @@ -18,18 +18,14 @@ isdir(outdir) && rm(outdir, recursive = true) @trixi_testset "elixir_euler_periodic.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_periodic.jl"), - l2=[ - 0.00010978828464875207, + l2=[0.00010978828464875207, 0.00013010359527356914, 0.00013010359527326057, - 0.0002987656724828824, - ], - linf=[ - 0.00638626102818618, - 0.009804042508242183, - 0.009804042508253286, - 0.02183139311614468, - ]) + 0.0002987656724828824], + linf=[0.00638626102818618, + 0.009804042508242183, + 0.009804042508253286, + 0.02183139311614468]) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) let @@ -42,18 +38,14 @@ end @trixi_testset "elixir_euler_free_stream.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"), - l2=[ - 3.3937971107485363e-14, + l2=[3.3937971107485363e-14, 2.447586447887882e-13, 1.4585205789296455e-13, - 4.716993468962946e-13, - ], - linf=[ - 8.804734719092266e-12, - 6.261270668606045e-11, - 2.93670088247211e-11, - 1.205400224080222e-10, - ], + 4.716993468962946e-13], + linf=[8.804734719092266e-12, + 6.261270668606045e-11, + 2.93670088247211e-11, + 1.205400224080222e-10], tspan=(0.0, 0.1), atol=3.0e-13) # Ensure that we do not have excessive memory allocations @@ -68,18 +60,14 @@ end @trixi_testset "elixir_euler_wall_bc.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_wall_bc.jl"), - l2=[ - 0.040189107976346644, + l2=[0.040189107976346644, 0.04256154998030852, 0.03734120743842209, - 0.10057425897733507, - ], - linf=[ - 0.24455374304626365, - 0.2970686406973577, - 0.29339040847600434, - 0.5915610037764794, - ], + 0.10057425897733507], + linf=[0.24455374304626365, + 0.2970686406973577, + 0.29339040847600434, + 0.5915610037764794], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -93,18 +81,14 @@ end @trixi_testset "elixir_euler_basic.jl" begin @test_trixi_include(default_example_unstructured(), - l2=[ - 0.0007213418215265047, + l2=[0.0007213418215265047, 0.0006752337675043779, 0.0006437485997536973, - 0.0014782883071363362, - ], - linf=[ - 0.004301288971032324, - 0.005243995459478956, - 0.004685630332338153, - 0.01750217718347713, - ], + 0.0014782883071363362], + linf=[0.004301288971032324, + 0.005243995459478956, + 0.004685630332338153, + 0.01750217718347713], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -118,18 +102,14 @@ end @trixi_testset "elixir_euler_restart.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_restart.jl"), - l2=[ - 0.0007213418215265047, + l2=[0.0007213418215265047, 0.0006752337675043779, 0.0006437485997536973, - 0.0014782883071363362, - ], - linf=[ - 0.004301288971032324, - 0.005243995459478956, - 0.004685630332338153, - 0.01750217718347713, - ], + 0.0014782883071363362], + linf=[0.004301288971032324, + 0.005243995459478956, + 0.004685630332338153, + 0.01750217718347713], # With the default `maxiters = 1` in coverage tests, # there would be no time steps after the restart. coverage_override=(maxiters = 100_000,)) @@ -145,18 +125,14 @@ end @trixi_testset "elixir_euler_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2=[ - 0.06594600495903137, + l2=[0.06594600495903137, 0.10803914821786433, 0.10805946357846291, - 0.1738171782368222, - ], - linf=[ - 0.31880214280781305, - 0.3468488554333352, - 0.34592958184413264, - 0.784555926860546, - ], + 0.1738171782368222], + linf=[0.31880214280781305, + 0.3468488554333352, + 0.34592958184413264, + 0.784555926860546], tspan=(0.0, 1.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -184,18 +160,14 @@ end @trixi_testset "elixir_euler_sedov.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"), - l2=[ - 2.19945600e-01, + l2=[2.19945600e-01, 1.71050453e-01, 1.71050453e-01, - 1.21719195e+00, - ], - linf=[ - 7.44218635e-01, - 7.02887039e-01, - 7.02887039e-01, - 6.11732719e+00, - ], + 1.21719195e+00], + linf=[7.44218635e-01, + 7.02887039e-01, + 7.02887039e-01, + 6.11732719e+00], tspan=(0.0, 0.3)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -214,9 +186,9 @@ end 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], + 0.8475748723784078, 0.0, + 8.881784197001252e-16, 1.7763568394002505e-15, + 1.7763568394002505e-15], tspan=(0.0, 5.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -236,10 +208,10 @@ end 0.04044440614962498, 0.05735896706356321, 0.0020992340041681734], linf=[0.1417000509328017, 0.3210578460652491, 0.335041095545175, - 0.22500796423572675, - 0.44230628074326406, 0.16743171716317784, - 0.16745989278866702, 0.17700588224362557, - 0.02692320090677309], + 0.22500796423572675, + 0.44230628074326406, 0.16743171716317784, + 0.16745989278866702, 0.17700588224362557, + 0.02692320090677309], tspan=(0.0, 0.5)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -259,10 +231,10 @@ end 0.0999999926130088, 0.14142135396487032, 1.1553833987291942e-5], linf=[0.00039334982566352483, 0.14144904937275282, - 0.14144904937277897, 0.20003315928443416, - 6.826863293230012e-5, 0.14146512909995967, - 0.14146512909994702, 0.20006706837452526, - 0.00013645610312810813], + 0.14144904937277897, 0.20003315928443416, + 6.826863293230012e-5, 0.14146512909995967, + 0.14146512909994702, 0.20006706837452526, + 0.00013645610312810813], tspan=(0.0, 0.5)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -276,18 +248,14 @@ end @trixi_testset "elixir_shallowwater_ec.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"), - l2=[ - 0.6106939484178353, + l2=[0.6106939484178353, 0.48586236867426724, 0.48234490854514356, - 0.29467422718511727, - ], - linf=[ - 2.775979948281604, - 3.1721242154451548, - 3.5713448319601393, - 2.052861364219655, - ], + 0.29467422718511727], + linf=[2.775979948281604, + 3.1721242154451548, + 3.5713448319601393, + 2.052861364219655], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -301,18 +269,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 1.2164292510839076, + l2=[1.2164292510839076, 2.6118925543469468e-12, 1.1636046671473883e-12, - 1.2164292510839079, - ], - linf=[ - 1.5138512282315846, - 4.998482888288039e-11, - 2.0246214978154587e-11, - 1.513851228231574, - ], + 1.2164292510839079], + linf=[1.5138512282315846, + 4.998482888288039e-11, + 2.0246214978154587e-11, + 1.513851228231574], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -326,18 +290,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl with FluxHydrostaticReconstruction" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 1.2164292510839085, + l2=[1.2164292510839085, 1.2643106818778908e-12, 7.46884905098358e-13, - 1.2164292510839079, - ], - linf=[ - 1.513851228231562, - 1.6287765844373185e-11, - 6.8766999132716964e-12, - 1.513851228231574, - ], + 1.2164292510839079], + linf=[1.513851228231562, + 1.6287765844373185e-11, + 6.8766999132716964e-12, + 1.513851228231574], surface_flux=(FluxHydrostaticReconstruction(flux_lax_friedrichs, hydrostatic_reconstruction_audusse_etal), flux_nonconservative_audusse_etal), @@ -354,18 +314,14 @@ end @trixi_testset "elixir_shallowwater_well_balanced.jl with flux_nonconservative_ersing_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_well_balanced.jl"), - l2=[ - 1.2164292510839083, + l2=[1.2164292510839083, 2.590643638636187e-12, 1.0945471514840143e-12, - 1.2164292510839079, - ], - linf=[ - 1.5138512282315792, - 5.0276441977281156e-11, - 1.9816934589292803e-11, - 1.513851228231574, - ], + 1.2164292510839079], + linf=[1.5138512282315792, + 5.0276441977281156e-11, + 1.9816934589292803e-11, + 1.513851228231574], surface_flux=(flux_wintermeyer_etal, flux_nonconservative_ersing_etal), volume_flux=(flux_wintermeyer_etal, @@ -383,18 +339,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.0011197623982310795, + l2=[0.0011197623982310795, 0.04456344888447023, 0.014317376629669337, - 5.089218476758975e-6, - ], - linf=[ - 0.007835284004819698, - 0.3486891284278597, - 0.11242778979399048, - 2.6407324614119432e-5, - ], + 5.089218476758975e-6], + linf=[0.007835284004819698, + 0.3486891284278597, + 0.11242778979399048, + 2.6407324614119432e-5], tspan=(0.0, 0.025)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -408,18 +360,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl with FluxHydrostaticReconstruction" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.0011197139793938152, + l2=[0.0011197139793938152, 0.015430259691310781, 0.017081031802719724, - 5.089218476758271e-6, - ], - linf=[ - 0.014300809338967824, - 0.12783372461225184, - 0.17625472321992852, - 2.6407324614341476e-5, - ], + 5.089218476758271e-6], + linf=[0.014300809338967824, + 0.12783372461225184, + 0.17625472321992852, + 2.6407324614341476e-5], surface_flux=(FluxHydrostaticReconstruction(flux_hll, hydrostatic_reconstruction_audusse_etal), flux_nonconservative_audusse_etal), @@ -436,18 +384,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl with flux_nonconservative_ersing_etal" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.0011196687776346434, + l2=[0.0011196687776346434, 0.044562672453443995, 0.014306265289763618, - 5.089218476759981e-6, - ], - linf=[ - 0.007825021762002393, - 0.348550815397918, - 0.1115517935018282, - 2.6407324614341476e-5, - ], + 5.089218476759981e-6], + linf=[0.007825021762002393, + 0.348550815397918, + 0.1115517935018282, + 2.6407324614341476e-5], surface_flux=(flux_wintermeyer_etal, flux_nonconservative_ersing_etal), volume_flux=(flux_wintermeyer_etal, @@ -465,18 +409,14 @@ end @trixi_testset "elixir_shallowwater_source_terms.jl with flux_hll" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"), - l2=[ - 0.0011197139793938727, + l2=[0.0011197139793938727, 0.015430259691311309, 0.017081031802719554, - 5.089218476759981e-6, - ], - linf=[ - 0.014300809338967824, - 0.12783372461224918, - 0.17625472321993918, - 2.6407324614341476e-5, - ], + 5.089218476759981e-6], + linf=[0.014300809338967824, + 0.12783372461224918, + 0.17625472321993918, + 2.6407324614341476e-5], surface_flux=(flux_hll, flux_nonconservative_fjordholm_etal), tspan=(0.0, 0.025)) # Ensure that we do not have excessive memory allocations @@ -491,18 +431,14 @@ end @trixi_testset "elixir_shallowwater_dirichlet.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_dirichlet.jl"), - l2=[ - 1.1577518608940115e-5, + l2=[1.1577518608940115e-5, 4.867189932537344e-13, 4.647273240470541e-13, - 1.1577518608933468e-5, - ], - linf=[ - 8.394063878602864e-5, - 1.1469760027632646e-10, - 1.1146619484429974e-10, - 8.394063879602065e-5, - ], + 1.1577518608933468e-5], + linf=[8.394063878602864e-5, + 1.1469760027632646e-10, + 1.1146619484429974e-10, + 8.394063879602065e-5], tspan=(0.0, 2.0)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -517,18 +453,14 @@ end @trixi_testset "elixir_shallowwater_wall_bc_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_wall_bc_shockcapturing.jl"), - l2=[ - 0.04444388691670699, + l2=[0.04444388691670699, 0.1527771788033111, 0.1593763537203512, - 6.225080476986749e-8, - ], - linf=[ - 0.6526506870169639, - 1.980765893182952, - 2.4807635459119757, - 3.982097158683473e-7, - ], + 6.225080476986749e-8], + linf=[0.6526506870169639, + 1.980765893182952, + 2.4807635459119757, + 3.982097158683473e-7], tspan=(0.0, 0.05)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -543,18 +475,14 @@ end @trixi_testset "elixir_shallowwater_ec_shockcapturing.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec_shockcapturing.jl"), - l2=[ - 0.6124656312639043, + l2=[0.6124656312639043, 0.504371951785709, 0.49180896200746366, - 0.29467422718511727, - ], - linf=[ - 2.7639232436274392, - 3.3985508653311767, - 3.3330308209196224, - 2.052861364219655, - ], + 0.29467422718511727], + linf=[2.7639232436274392, + 3.3985508653311767, + 3.3330308209196224, + 2.052861364219655], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -569,18 +497,14 @@ end @trixi_testset "elixir_shallowwater_three_mound_dam_break.jl" begin @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_three_mound_dam_break.jl"), - l2=[ - 0.0892957892027502, + l2=[0.0892957892027502, 0.30648836484407915, 2.28712547616214e-15, - 0.0008778654298684622, - ], - linf=[ - 0.850329472915091, - 2.330631694956507, - 5.783660020252348e-14, - 0.04326237921249021, - ], + 0.0008778654298684622], + linf=[0.850329472915091, + 2.330631694956507, + 5.783660020252348e-14, + 0.04326237921249021], basis=LobattoLegendreBasis(3), tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations @@ -602,9 +526,9 @@ end 0.0015758146898767814, 6.849532064729749e-6], linf=[0.0059205195991136605, 0.08072126590166251, - 0.03463806075399023, - 0.005884818649227186, 0.042658506561995546, - 0.014125956138838602, 2.5829318284764646e-5], + 0.03463806075399023, + 0.005884818649227186, 0.042658506561995546, + 0.014125956138838602, 2.5829318284764646e-5], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -625,10 +549,10 @@ end 3.3105180099689275e-15, 0.0021928129262660085], linf=[4.468647674116255e-15, 1.3607872120431166e-14, - 9.557155049520056e-15, - 0.024280130945632084, 6.68910907640583e-14, - 4.7000983997100496e-14, - 0.024280130945632732], + 9.557155049520056e-15, + 0.024280130945632084, 6.68910907640583e-14, + 4.7000983997100496e-14, + 0.024280130945632732], tspan=(0.0, 0.25)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -648,10 +572,10 @@ end 0.09119400061322577, 0.015276216721920347, 0.0012126995108983853, 0.09991983966647647], linf=[0.044305765721807444, 0.03279620980615845, - 0.010754320388190101, - 0.111309922939555, 0.03663360204931427, - 0.014332822306649284, - 0.10000000000000003], + 0.010754320388190101, + 0.111309922939555, 0.03663360204931427, + 0.014332822306649284, + 0.10000000000000003], surface_flux=(flux_lax_friedrichs, flux_nonconservative_ersing_etal), tspan=(0.0, 0.25)) @@ -689,9 +613,9 @@ end 0.00014778637884460072, 0.00045584189984542687], linf=[0.0002670775876922882, - 0.0005683064706873964, - 0.0005683064706762941, - 0.0017770812025146299], + 0.0005683064706873964, + 0.0005683064706762941, + 0.0017770812025146299], tspan=(0.0, 0.05)) # Ensure that we do not have excessive memory allocations # (e.g., from type instabilities) @@ -711,9 +635,9 @@ end 6.889210012578449e-14, 1.568290814572709e-13], linf=[5.963762816918461e-10, - 5.08869890669672e-11, - 1.1581377523661729e-10, - 4.61017890529547e-11], + 5.08869890669672e-11, + 1.1581377523661729e-10, + 4.61017890529547e-11], tspan=(0.0, 0.1), atol=1.0e-11) # Ensure that we do not have excessive memory allocations diff --git a/test/test_visualization.jl b/test/test_visualization.jl index 6444dc91d5d..0974c96e53d 100644 --- a/test/test_visualization.jl +++ b/test/test_visualization.jl @@ -71,9 +71,9 @@ test_examples_2d = Dict("TreeMesh" => ("tree_2d_dgsem", @test keys(pd) == ("rho", "v1", "v2", "p") @test eltype(pd) <: Pair{String, <:Trixi.PlotDataSeries} @test [v for v in pd] == ["rho" => Trixi.PlotDataSeries(pd, 1), - "v1" => Trixi.PlotDataSeries(pd, 2), - "v2" => Trixi.PlotDataSeries(pd, 3), - "p" => Trixi.PlotDataSeries(pd, 4)] + "v1" => Trixi.PlotDataSeries(pd, 2), + "v2" => Trixi.PlotDataSeries(pd, 3), + "p" => Trixi.PlotDataSeries(pd, 4)] # PlotDataSeries pds = pd["p"] @@ -158,8 +158,8 @@ end @test keys(pd) == ("rho", "v1", "p") @test eltype(pd) <: Pair{String, <:Trixi.PlotDataSeries} @test [v for v in pd] == ["rho" => Trixi.PlotDataSeries(pd, 1), - "v1" => Trixi.PlotDataSeries(pd, 2), - "p" => Trixi.PlotDataSeries(pd, 3)] + "v1" => Trixi.PlotDataSeries(pd, 2), + "p" => Trixi.PlotDataSeries(pd, 3)] # PlotDataSeries pds = pd["p"]