Skip to content

Commit

Permalink
Adjust test values (#48)
Browse files Browse the repository at this point in the history 
* adjust test values

* adjust atol for CI
  • Loading branch information
@JoshuaLampert
JoshuaLampert authored Sep 26, 2023
1 parent c370f28 commit b9ad564
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 28 deletions.
10 changes: 5 additions & 5 deletions test/test_bbm_bbm_1d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ EXAMPLES_DIR = joinpath(examples_dir(), "bbm_bbm_1d")
@trixi_testset "bbm_bbm_1d_basic" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "bbm_bbm_1d_basic.jl"),
tspan=(0.0, 1.0),
l2=[0.003249079018874934 0.007190714378932064],
linf=[0.0027187328947428924 0.0037427924312432026],
l2=[0.0032744047432744098 0.007246784414780245],
linf=[0.0027330692690079594 0.0037734832590992085],
cons_error=[2.234687408354354e-13 5.684341886080801e-13],
change_waterheight=2.2222469560301384e-13,
change_velocity=-5.684341886080801e-13,
change_entropy=0.00019550087108655134,
change_entropy=0.00019552914864107152,
atol_ints=1e-10) # in order to make CI pass
end

Expand All @@ -34,8 +34,8 @@ EXAMPLES_DIR = joinpath(examples_dir(), "bbm_bbm_1d")
@trixi_testset "bbm_bbm_1d_relaxation" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "bbm_bbm_1d_relaxation.jl"),
tspan=(0.0, 1.0),
l2=[0.003248414414759437 0.007189120223695793],
linf=[0.002718237079326169 0.0037417143809364006],
l2=[0.003273738156062929 0.007245185828684949],
linf=[0.0027325632260941646 0.0037724348496581683],
cons_error=[2.259983767321016e-13 4.547473508864641e-13],
change_waterheight=2.1746572188776938e-13,
change_velocity=-4.547473508864641e-13,
Expand Down
15 changes: 8 additions & 7 deletions test/test_bbm_bbm_variable_bathymetry_1d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,21 @@ EXAMPLES_DIR = joinpath(examples_dir(), "bbm_bbm_variable_bathymetry_1d")
@test_trixi_include(joinpath(EXAMPLES_DIR,
"bbm_bbm_variable_bathymetry_1d_basic.jl"),
tspan=(0.0, 1.0),
l2=[0.0024561065856105136 0.005467472679563469 0.0],
linf=[0.0019322426802252934 0.003270790905389731 0.0],
l2=[0.002475254552148715 0.005510109246665293 0.0],
linf=[0.0019397546359500861 0.0032957358113563373 0.0],
cons_error=[1.0394561372181596e-13 3.410605131648481e-13 0.0],
change_waterheight=1.0394561372181596e-13,
change_velocity=-3.410605131648481e-13,
change_entropy=0.0006138716858004045)
change_entropy=0.0006197172569955001,
atol_ints=1e-10) # in order to make CI pass
end

@trixi_testset "bbm_bbm_variable_bathymetry_1d_relaxation" begin
@test_trixi_include(joinpath(EXAMPLES_DIR,
"bbm_bbm_variable_bathymetry_1d_relaxation.jl"),
tspan=(0.0, 1.0),
l2=[1.234497154595864 2.0325352963894225 0.0],
linf=[1.856609837506367 2.537322089418664 0.0],
linf=[1.8566998050289607 2.537410906888876 0.0],
cons_error=[2.0694557179012918e-13 2.789919043027633e-13 0.0],
change_waterheight=-2.1271873151818e-13,
change_velocity=2.7874259106214573e-13,
Expand Down Expand Up @@ -74,12 +75,12 @@ EXAMPLES_DIR = joinpath(examples_dir(), "bbm_bbm_variable_bathymetry_1d")
"bbm_bbm_variable_bathymetry_1d_dingemans.jl"),
tspan=(0.0, 1.0),
N=512,
l2=[0.23120795192990629 0.7544344847900466 0.0],
linf=[0.03707736413915552 0.12038327721384329 0.0],
l2=[0.23119432844001495 0.7543986688031077 0.0],
linf=[0.037067680051741214 0.12128735996476576 0.0],
cons_error=[1.4210854715202004e-13 3.1478183774857893e-15 0.0],
change_waterheight=-1.4210854715202004e-13,
change_velocity=-3.1478183774857893e-15,
change_entropy=-1.1468728189356625e-9)
change_entropy=-1.3967564882477745e-9)
end
end

Expand Down
32 changes: 16 additions & 16 deletions test/test_svaerd_kalisch_1d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,38 @@ EXAMPLES_DIR = joinpath(examples_dir(), "svaerd_kalisch_1d")
"svaerd_kalisch_1d_dingemans.jl"),
tspan=(0.0, 1.0),
N=512,
l2=[0.2264997669219955 0.7326153404586632 0.0],
linf=[0.03641032763299723 0.11738950764868172 0.0],
cons_error=[3.979039320256561e-13 7.648176553013466e-5 0.0],
l2=[0.22648616606810756 0.7325813437573053 0.0],
linf=[0.03645879748792702 0.11849678361651249 0.0],
cons_error=[3.979039320256561e-13 7.670877062280329e-5 0.0],
change_waterheight=-3.979039320256561e-13,
change_momentum=-2.0323272786892943e-9,
change_entropy=-0.0005894453857990811,
change_entropy_modified=3.0048763619561214e-6)
change_momentum=-2.109259079896564e-9,
change_entropy=-0.0005910026394531087,
change_entropy_modified=3.20516357987799e-6)
end

@trixi_testset "svaerd_kalisch_1d_dingemans_upwind" begin
@test_trixi_include(joinpath(EXAMPLES_DIR,
"svaerd_kalisch_1d_dingemans_upwind.jl"),
tspan=(0.0, 1.0),
l2=[0.2265797299117127 0.7327963925248041 0.0],
linf=[0.036426119662156475 0.1178108264598402 0.0],
cons_error=[1.1368683772161603e-13 7.540163948846978e-5 0.0],
l2=[0.22656501380746077 0.7327645752975466 0.0],
linf=[0.03648151661791921 0.1182504804050214 0.0],
cons_error=[1.1368683772161603e-13 7.59953335162671e-5 0.0],
change_waterheight=-1.1368683772161603e-13,
change_momentum=-2.1784861692353275e-9,
change_entropy=-0.0005782276325589919,
change_entropy_modified=1.7219122128153685e-6)
change_momentum=-2.28489619585881e-9,
change_entropy=-0.0005840425510541536,
change_entropy_modified=2.108449052684591e-6)
end

@trixi_testset "svaerd_kalisch_1d_dingemans_relaxation" begin
@test_trixi_include(joinpath(EXAMPLES_DIR,
"svaerd_kalisch_1d_dingemans_relaxation.jl"),
tspan=(0.0, 1.0),
N=512,
l2=[0.22649926749071012 0.7326132878628044 0.0],
linf=[0.03641021393801758 0.11738893742931189 0.0],
cons_error=[3.979039320256561e-13 7.647827842231048e-5 0.0],
l2=[0.22648560566941997 0.7325790781930053 0.0],
linf=[0.03645867682442583 0.1184963632507331 0.0],
cons_error=[3.979039320256561e-13 7.670526860626775e-5 0.0],
change_waterheight=-3.979039320256561e-13,
change_entropy=-0.0005922598786582967,
change_entropy=-0.0005940058100577517,
change_entropy_modified=0.0)
end

Expand Down

0 comments on commit b9ad564

Please sign in to comment.