Skip to content

Commit

Permalink
update test reference values
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrickersing
patrickersing committed Apr 9, 2024
1 parent 0b7024b commit 433ba01
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 77 deletions.
12 changes: 6 additions & 6 deletions test/test_structured_2d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ isdir(outdir) && rm(outdir, recursive = true)
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_source_terms.jl"),
l2=[
0.0017285599436729316,
0.025584610912606776,
0.028373834961180594,
0.0017286908591070864,
0.025585037307655684,
0.028374244567802766,
6.274146767730866e-5,
],
linf=[
0.012972309788264802,
0.108283714215621,
0.15831585777928936,
0.012973752001194772,
0.10829375385832263,
0.15832858475438094,
0.00018196759554722775,
],
tspan=(0.0, 0.05))
Expand Down
26 changes: 13 additions & 13 deletions test/test_tree_1d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ isdir(outdir) && rm(outdir, recursive = true)
@trixi_testset "elixir_shallowwater_ec.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"),
l2=[
0.244729018751225,
0.8583565222389505,
0.24476140682560343,
0.8587309324660326,
0.07330427577586297,
],
linf=[
2.1635021283528504,
3.8717508164234453,
2.1636963952308372,
3.8737770522883115,
1.7711213427919539,
],
tspan=(0.0, 0.25))
Expand All @@ -42,13 +42,13 @@ isdir(outdir) && rm(outdir, recursive = true)
@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,
2.03880864210846,
0.39472828074570576,
2.0390687947320076,
4.1623084150546725e-10,
],
linf=[
0.778905801278281,
3.2409883402608273,
0.7793741954662221,
3.2411927977882096,
7.419800190922032e-10,
],
initial_condition=initial_condition_weak_blast_wave,
Expand Down Expand Up @@ -134,14 +134,14 @@ isdir(outdir) && rm(outdir, recursive = true)
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_well_balanced_wet_dry.jl"),
l2=[
0.00965787167169024,
5.345454081916856e-14,
0.03857583749209928,
0.009657871671690306,
6.23878532543316e-14,
0.03857583749209947,
],
linf=[
0.4999999999998892,
2.2447689894899726e-13,
1.9999999999999714,
4.4857500383821557e-13,
1.9999999999999811,
],
tspan=(0.0, 0.25),
# Soften the tolerance as test results vary between different CPUs
Expand Down
24 changes: 12 additions & 12 deletions test/test_tree_2d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ isdir(outdir) && rm(outdir, recursive = true)
@trixi_testset "elixir_shallowwater_ec.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"),
l2=[
0.991181203601035,
0.734130029040644,
0.7447696147162621,
0.9911802019934329,
0.7340106828033273,
0.7446338002084801,
0.5875351036989047,
],
linf=[
2.0117744577945413,
2.9962317608172127,
2.6554999727293653,
2.0120253138457564,
2.991158989293406,
2.6557412817714035,
3.0,
],
tspan=(0.0, 0.25))
Expand Down Expand Up @@ -344,15 +344,15 @@ isdir(outdir) && rm(outdir, recursive = true)
@trixi_testset "elixir_shallowwater_wall.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_wall.jl"),
l2=[
0.13517233723296504,
0.20010876311162215,
0.20010876311162223,
0.1351723240085936,
0.20010881416550014,
0.2001088141654999,
2.719538414346464e-7,
],
linf=[
0.5303607982988336,
0.5080989745682338,
0.5080989745682352,
0.5303608302490757,
0.5080987791967457,
0.5080987791967506,
1.1301675764130437e-6,
],
tspan=(0.0, 0.25))
Expand Down
88 changes: 44 additions & 44 deletions test/test_unstructured_2d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ isdir(outdir) && rm(outdir, recursive = true)
@trixi_testset "elixir_shallowwater_ec.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"),
l2=[
0.6106939484178353,
0.48586236867426724,
0.48234490854514356,
0.29467422718511727,
0.6107326269462766,
0.48666631722018877,
0.48309775159067053,
0.29467422718511704,
],
linf=[
2.775979948281604,
3.1721242154451548,
3.5713448319601393,
2.776782342826098,
3.2158378644333707,
3.652920889487258,
2.052861364219655,
],
tspan=(0.0, 0.25))
Expand Down Expand Up @@ -133,16 +133,16 @@ isdir(outdir) && rm(outdir, recursive = true)
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_source_terms.jl"),
l2=[
0.0011197623982310795,
0.04456344888447023,
0.014317376629669337,
5.089218476758975e-6,
0.001118134082248467,
0.044560486817464634,
0.01430926600634214,
5.089218476759981e-6,
],
linf=[
0.007835284004819698,
0.3486891284278597,
0.11242778979399048,
2.6407324614119432e-5,
0.007798727223654822,
0.34782952734839157,
0.11161614702628064,
2.6407324614341476e-5,
],
tspan=(0.0, 0.025))
# Ensure that we do not have excessive memory allocations
Expand All @@ -159,16 +159,16 @@ isdir(outdir) && rm(outdir, recursive = true)
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_source_terms.jl"),
l2=[
0.0011197139793938152,
0.015430259691310781,
0.017081031802719724,
5.089218476758271e-6,
0.001119719074048042,
0.015430106961377458,
0.017081080392855975,
5.0892184767572974e-6,
],
linf=[
0.014300809338967824,
0.12783372461225184,
0.17625472321992852,
2.6407324614341476e-5,
0.014300786288935274,
0.12782194018738569,
0.1762517408268396,
2.640732461456352e-5,
],
surface_flux=(FluxHydrostaticReconstruction(FluxHLL(min_max_speed_naive),
hydrostatic_reconstruction_audusse_etal),
Expand All @@ -188,15 +188,15 @@ isdir(outdir) && rm(outdir, recursive = true)
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_source_terms.jl"),
l2=[
0.0011196687776346434,
0.044562672453443995,
0.014306265289763618,
0.001118046975499805,
0.04455969246244461,
0.014298120235633432,
5.089218476759981e-6,
],
linf=[
0.007825021762002393,
0.348550815397918,
0.1115517935018282,
0.007776521213640031,
0.34768318303226353,
0.11075311228066198,
2.6407324614341476e-5,
],
surface_flux=(flux_wintermeyer_etal,
Expand All @@ -218,16 +218,16 @@ isdir(outdir) && rm(outdir, recursive = true)
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_source_terms.jl"),
l2=[
0.0011197139793938727,
0.015430259691311309,
0.017081031802719554,
5.089218476759981e-6,
0.0011197190740480426,
0.015430106961377272,
0.017081080392856225,
5.0892184767572974e-6,
],
linf=[
0.014300809338967824,
0.12783372461224918,
0.17625472321993918,
2.6407324614341476e-5,
0.014300786288934386,
0.1278219401874079,
0.1762517408268396,
2.640732461456352e-5,
],
surface_flux=(FluxHLL(min_max_speed_naive),
flux_nonconservative_fjordholm_etal),
Expand Down Expand Up @@ -303,15 +303,15 @@ isdir(outdir) && rm(outdir, recursive = true)
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_ec_shockcapturing.jl"),
l2=[
0.6124656312639043,
0.504371951785709,
0.49180896200746366,
0.29467422718511727,
0.612551520607341,
0.5039173660221961,
0.49136517934903523,
0.29467422718511704,
],
linf=[
2.7639232436274392,
3.3985508653311767,
3.3330308209196224,
2.7636771472622197,
3.236168963021072,
3.3363936775653826,
2.052861364219655,
],
tspan=(0.0, 0.25))
Expand Down
26 changes: 24 additions & 2 deletions test/test_upstream.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,30 @@ isdir(outdir) && rm(outdir, recursive = true)
# Run tests for TreeMesh
@testset "TreeMesh" begin
# Shallow water wet/dry 1D
@trixi_testset "elixir_shallowwater_ec.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "tree_1d_dgsem",
"elixir_shallowwater_ec.jl"),
l2=[
0.24476140682560343,
0.8587309324660326,
0.07330427577586297,
],
linf=[
2.1636963952308372,
3.8737770522883115,
1.7711213427919539,
],
tspan=(0.0, 0.25))
# Ensure that we do not have excessive memory allocations
# (e.g., from type instabilities)
let
t = sol.t[end]
u_ode = sol.u[end]
du_ode = similar(u_ode)
@test (@allocated Trixi.rhs!(du_ode, u_ode, semi, t)) < 1000
end
end

@trixi_testset "TreeMesh1D: elixir_shallowwater_well_balanced_nonperiodic.jl with wall boundary" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "tree_1d_dgsem",
"elixir_shallowwater_well_balanced_nonperiodic.jl"),
Expand All @@ -42,8 +66,6 @@ isdir(outdir) && rm(outdir, recursive = true)
@test (@allocated Trixi.rhs!(du_ode, u_ode, semi, t)) < 1000
end
end
# TODO: add upstream tests in 2D and positivity-preserving tests

# Shallow water wet/dry 2D
# TreeMesh2D
@trixi_testset "TreeMesh2D: elixir_shallowwater_conical_island.jl" begin
Expand Down

0 comments on commit 433ba01

Please sign in to comment.