Skip to content

Commit 8735502

Browse files
committed
no reference values
1 parent fbfc60b commit 8735502

File tree

3 files changed

+34
-61
lines changed

3 files changed

+34
-61
lines changed

test/test_3d_shallow_water.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ EXAMPLES_DIR = TrixiAtmo.examples_dir()
1111
@test_trixi_include(joinpath(EXAMPLES_DIR,
1212
"elixir_shallowwater_cartesian_unsteady_solid_body_rotation_EC_correction.jl"),
1313
l2=[
14-
0.1385840313143962,
15-
0.82837506217066,
16-
0.1401783834081,
17-
0.3170683216476,
14+
0.0274954994,
15+
9.65117289,
16+
8.20257340,
17+
18.5292301,
1818
0.0
1919
],
2020
linf=[
21-
0.159323444366919,
22-
0.7491913049016,
23-
0.553600463765,
24-
0.0452131916827,
21+
0.157738035,
22+
59.4123680,
23+
51.9233503,
24+
8.36833383,
2525
0.0
2626
],
2727
polydeg=3,

test/test_spherical_advection.jl

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ EXAMPLES_DIR = TrixiAtmo.examples_dir()
1111
@test_trixi_include(joinpath(EXAMPLES_DIR,
1212
"elixir_shallowwater_cartesian_advection_cubed_sphere.jl"),
1313
l2=[
14-
0.0,
15-
0.317829852384286,
16-
0.810001095524816,
17-
0.317829852393054,
14+
0.183524336,
15+
5.64470440,
16+
2.80467667,
17+
5.64470440,
1818
0.0
1919
],
2020
linf=[
21-
0.872101731709677,
22-
0.6515963524798,
23-
0.1288712006542,
24-
0.65159635247255,
21+
2.79650356,
22+
91.6208734,
23+
24.9330974,
24+
91.6208734,
2525
0.0
2626
])
2727
# and small reference values
@@ -39,17 +39,17 @@ end
3939
@test_trixi_include(joinpath(EXAMPLES_DIR,
4040
"elixir_shallowwater_cartesian_advection_quad_icosahedron.jl"),
4141
l2=[
42-
0.0,
43-
0.807355540175404,
44-
0.311881740745649,
45-
0.807355540181993,
42+
0.0771325788,
43+
2.24899209,
44+
1.45355192,
45+
2.24899209,
4646
0.0
4747
],
4848
linf=[
49-
0.591965583200476,
50-
0.76418895396273,
51-
0.69731833993228,
52-
0.76418895397,
49+
1.18929523,
50+
34.1427583,
51+
17.9760460,
52+
34.1427583,
5353
0.0
5454
])
5555
# and small reference values
@@ -67,17 +67,17 @@ end
6767
@test_trixi_include(joinpath(EXAMPLES_DIR,
6868
"elixir_shallowwater_cartesian_advection_cubed_sphere.jl"),
6969
l2=[
70-
0.8933429672952714,
71-
0.84887991902509,
72-
0.758850586757735,
73-
0.84887991902542,
70+
0.222179190,
71+
6.74419737,
72+
3.36551000,
73+
6.74419737,
7474
0.0
7575
],
7676
linf=[
77-
0.289456304624764,
78-
0.6958334067349,
79-
0.59259301602742,
80-
0.69583340674217,
77+
3.60436608,
78+
113.572183,
79+
30.1250336,
80+
113.572183,
8181
0.0
8282
], element_local_mapping=true)
8383
# and small reference values

test/test_trixiatmo.jl

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,43 +21,16 @@ macro test_trixi_include(elixir, args...)
2121
local linf = get_kwarg(args, :linf, nothing)
2222
local atol = get_kwarg(args, :atol, 500 * eps())
2323
local rtol = get_kwarg(args, :rtol, sqrt(eps()))
24-
local skip_coverage = get_kwarg(args, :skip_coverage, false)
25-
local coverage_override = expr_to_named_tuple(get_kwarg(args, :coverage_override, :()))
26-
if !(:maxiters in keys(coverage_override))
27-
# maxiters in coverage_override defaults to 1
28-
coverage_override = (; coverage_override..., maxiters = 1)
29-
end
30-
3124
local cmd = string(Base.julia_cmd())
32-
local coverage = occursin("--code-coverage", cmd) &&
33-
!occursin("--code-coverage=none", cmd)
3425

3526
local kwargs = Pair{Symbol, Any}[]
3627
for arg in args
3728
if (arg.head == :(=) &&
38-
!(arg.args[1] in (:l2, :linf, :atol, :rtol, :coverage_override, :skip_coverage))
39-
&& !(coverage && arg.args[1] in keys(coverage_override)))
29+
!(arg.args[1] in (:l2, :linf, :atol, :rtol)))
4030
push!(kwargs, Pair(arg.args...))
4131
end
4232
end
4333

44-
if coverage
45-
for key in keys(coverage_override)
46-
push!(kwargs, Pair(key, coverage_override[key]))
47-
end
48-
end
49-
50-
if coverage && skip_coverage
51-
return quote
52-
if TrixiAtmo.Trixi.mpi_isroot()
53-
println(""^100)
54-
println("Skipping coverage test of ", $elixir)
55-
println(""^100)
56-
println("\n\n")
57-
end
58-
end
59-
end
60-
6134
quote
6235
TrixiAtmo.Trixi.mpi_isroot() && println(""^100)
6336
TrixiAtmo.Trixi.mpi_isroot() && println($elixir)
@@ -76,7 +49,7 @@ macro test_trixi_include(elixir, args...)
7649
@test_nowarn_mod TrixiAtmo.Trixi.trixi_include(@__MODULE__, $elixir; $kwargs...) additional_ignore_content
7750

7851
# if present, compare l2 and linf errors against reference values
79-
if !$coverage && (!isnothing($l2) || !isnothing($linf))
52+
if !isnothing($l2) || !isnothing($linf)
8053
l2_measured, linf_measured = analysis_callback(sol)
8154

8255
if TrixiAtmo.Trixi.mpi_isroot() && !isnothing($l2)

0 commit comments

Comments
 (0)