From 2cd16ca03a47e3d3d6c62b1b7751807fa8eb516b Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 28 Jun 2021 05:40:44 +0200 Subject: [PATCH] _eoc -> _convergence in elixirs --- ..._source_terms_nonperiodic_unstructured.jl} | 0 ....jl => elixir_eulergravity_convergence.jl} | 0 .../README.md | 12 +++---- ...ler_eoc.jl => elixir_euler_convergence.jl} | 0 ....jl => elixir_eulergravity_convergence.jl} | 0 ...f_eoc.jl => elixir_hypdiff_convergence.jl} | 0 ...jl => elixir_euler_convergence_pure_fv.jl} | 0 ....jl => elixir_eulergravity_convergence.jl} | 0 ...jl => elixir_eulermulti_convergence_ec.jl} | 0 ...jl => elixir_eulermulti_convergence_es.jl} | 0 ..._eoc.jl => elixir_mhdmulti_convergence.jl} | 0 ...r_ape_eoc.jl => elixir_ape_convergence.jl} | 0 ...jl => elixir_euler_convergence_pure_fv.jl} | 0 ...jl => elixir_eulermulti_convergence_ec.jl} | 0 ...jl => elixir_eulermulti_convergence_es.jl} | 0 ..._eoc.jl => elixir_mhdmulti_convergence.jl} | 0 ...oc_test.jl => elixir_euler_convergence.jl} | 0 ...jl => elixir_euler_convergence_pure_fv.jl} | 0 ....jl => elixir_eulergravity_convergence.jl} | 0 test/test_examples_1d_euler.jl | 4 +-- test/test_examples_1d_eulergravity.jl | 4 +-- test/test_examples_1d_eulermulti.jl | 8 ++--- test/test_examples_1d_mhdmulti.jl | 4 +-- test/test_examples_2d_ape.jl | 4 +-- test/test_examples_2d_euler.jl | 4 +-- test/test_examples_2d_eulermulti.jl | 8 ++--- test/test_examples_2d_mhdmulti.jl | 4 +-- test/test_examples_2d_p4est.jl | 4 +-- test/test_examples_3d_euler.jl | 8 ++--- test/test_examples_3d_eulergravity.jl | 4 +-- ...est_paper_self_gravitating_gas_dynamics.jl | 32 +++++++++---------- test/test_special_elixirs.jl | 24 +++++++------- 32 files changed, 62 insertions(+), 62 deletions(-) rename examples/p4est_2d_dgsem/{elixir_euler_nonperiodic_unstructured.jl => elixir_euler_source_terms_nonperiodic_unstructured.jl} (100%) rename examples/p4est_2d_dgsem/{elixir_eulergravity_eoc.jl => elixir_eulergravity_convergence.jl} (100%) rename examples/paper_self_gravitating_gas_dynamics/{elixir_euler_eoc.jl => elixir_euler_convergence.jl} (100%) rename examples/paper_self_gravitating_gas_dynamics/{elixir_eulergravity_eoc.jl => elixir_eulergravity_convergence.jl} (100%) rename examples/paper_self_gravitating_gas_dynamics/{elixir_hypdiff_eoc.jl => elixir_hypdiff_convergence.jl} (100%) rename examples/tree_1d_dgsem/{elixir_euler_eoc_pure_fv.jl => elixir_euler_convergence_pure_fv.jl} (100%) rename examples/tree_1d_dgsem/{elixir_eulergravity_eoc.jl => elixir_eulergravity_convergence.jl} (100%) rename examples/tree_1d_dgsem/{elixir_eulermulti_eoc_ec.jl => elixir_eulermulti_convergence_ec.jl} (100%) rename examples/tree_1d_dgsem/{elixir_eulermulti_eoc_es.jl => elixir_eulermulti_convergence_es.jl} (100%) rename examples/tree_1d_dgsem/{elixir_mhdmulti_eoc.jl => elixir_mhdmulti_convergence.jl} (100%) rename examples/tree_2d_dgsem/{elixir_ape_eoc.jl => elixir_ape_convergence.jl} (100%) rename examples/tree_2d_dgsem/{elixir_euler_eoc_pure_fv.jl => elixir_euler_convergence_pure_fv.jl} (100%) rename examples/tree_2d_dgsem/{elixir_eulermulti_eoc_ec.jl => elixir_eulermulti_convergence_ec.jl} (100%) rename examples/tree_2d_dgsem/{elixir_eulermulti_eoc_es.jl => elixir_eulermulti_convergence_es.jl} (100%) rename examples/tree_2d_dgsem/{elixir_mhdmulti_eoc.jl => elixir_mhdmulti_convergence.jl} (100%) rename examples/tree_3d_dgsem/{elixir_euler_eoc_test.jl => elixir_euler_convergence.jl} (100%) rename examples/tree_3d_dgsem/{elixir_euler_eoc_pure_fv.jl => elixir_euler_convergence_pure_fv.jl} (100%) rename examples/tree_3d_dgsem/{elixir_eulergravity_eoc_test.jl => elixir_eulergravity_convergence.jl} (100%) diff --git a/examples/p4est_2d_dgsem/elixir_euler_nonperiodic_unstructured.jl b/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonperiodic_unstructured.jl similarity index 100% rename from examples/p4est_2d_dgsem/elixir_euler_nonperiodic_unstructured.jl rename to examples/p4est_2d_dgsem/elixir_euler_source_terms_nonperiodic_unstructured.jl diff --git a/examples/p4est_2d_dgsem/elixir_eulergravity_eoc.jl b/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl similarity index 100% rename from examples/p4est_2d_dgsem/elixir_eulergravity_eoc.jl rename to examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl diff --git a/examples/paper_self_gravitating_gas_dynamics/README.md b/examples/paper_self_gravitating_gas_dynamics/README.md index cd1c8e17295..ca2a642f45e 100644 --- a/examples/paper_self_gravitating_gas_dynamics/README.md +++ b/examples/paper_self_gravitating_gas_dynamics/README.md @@ -13,14 +13,14 @@ https://doi.org/10.5281/zenodo.3996575. ```julia julia> using Trixi -julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_euler_eoc.jl", 4) +julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl", 4) ``` **polydeg = 4**: ```julia julia> using Trixi -julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_euler_eoc.jl", 4, polydeg=4) +julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl", 4, polydeg=4) ``` ## Sec. 4.1.2, Table 3, EOC tests hyperbolic diffusion @@ -28,14 +28,14 @@ julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_eul ```julia julia> using Trixi -julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_eoc.jl", 4) +julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl", 4) ``` **polydeg = 4**: ```julia julia> using Trixi -julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_eoc.jl", 4, polydeg=4) +julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl", 4, polydeg=4) ``` ## Sec. 4.1.3, Table 4, EOC tests coupled Euler-gravity @@ -43,14 +43,14 @@ julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_hyp ```julia julia> using Trixi -julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_eoc.jl", 4) +julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl", 4) ``` **polydeg = 4**: ```julia julia> using Trixi -julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_eoc.jl", 4, polydeg=4) +julia> convergence_test("examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl", 4, polydeg=4) ``` ## Sec. 4.1.3, Table 5, EOC tests coupled Euler-gravity (update gravity once per step) diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_euler_eoc.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl similarity index 100% rename from examples/paper_self_gravitating_gas_dynamics/elixir_euler_eoc.jl rename to examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_eoc.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl similarity index 100% rename from examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_eoc.jl rename to examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_eoc.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl similarity index 100% rename from examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_eoc.jl rename to examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl diff --git a/examples/tree_1d_dgsem/elixir_euler_eoc_pure_fv.jl b/examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl similarity index 100% rename from examples/tree_1d_dgsem/elixir_euler_eoc_pure_fv.jl rename to examples/tree_1d_dgsem/elixir_euler_convergence_pure_fv.jl diff --git a/examples/tree_1d_dgsem/elixir_eulergravity_eoc.jl b/examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl similarity index 100% rename from examples/tree_1d_dgsem/elixir_eulergravity_eoc.jl rename to examples/tree_1d_dgsem/elixir_eulergravity_convergence.jl diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_eoc_ec.jl b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl similarity index 100% rename from examples/tree_1d_dgsem/elixir_eulermulti_eoc_ec.jl rename to examples/tree_1d_dgsem/elixir_eulermulti_convergence_ec.jl diff --git a/examples/tree_1d_dgsem/elixir_eulermulti_eoc_es.jl b/examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl similarity index 100% rename from examples/tree_1d_dgsem/elixir_eulermulti_eoc_es.jl rename to examples/tree_1d_dgsem/elixir_eulermulti_convergence_es.jl diff --git a/examples/tree_1d_dgsem/elixir_mhdmulti_eoc.jl b/examples/tree_1d_dgsem/elixir_mhdmulti_convergence.jl similarity index 100% rename from examples/tree_1d_dgsem/elixir_mhdmulti_eoc.jl rename to examples/tree_1d_dgsem/elixir_mhdmulti_convergence.jl diff --git a/examples/tree_2d_dgsem/elixir_ape_eoc.jl b/examples/tree_2d_dgsem/elixir_ape_convergence.jl similarity index 100% rename from examples/tree_2d_dgsem/elixir_ape_eoc.jl rename to examples/tree_2d_dgsem/elixir_ape_convergence.jl diff --git a/examples/tree_2d_dgsem/elixir_euler_eoc_pure_fv.jl b/examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl similarity index 100% rename from examples/tree_2d_dgsem/elixir_euler_eoc_pure_fv.jl rename to examples/tree_2d_dgsem/elixir_euler_convergence_pure_fv.jl diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_eoc_ec.jl b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl similarity index 100% rename from examples/tree_2d_dgsem/elixir_eulermulti_eoc_ec.jl rename to examples/tree_2d_dgsem/elixir_eulermulti_convergence_ec.jl diff --git a/examples/tree_2d_dgsem/elixir_eulermulti_eoc_es.jl b/examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl similarity index 100% rename from examples/tree_2d_dgsem/elixir_eulermulti_eoc_es.jl rename to examples/tree_2d_dgsem/elixir_eulermulti_convergence_es.jl diff --git a/examples/tree_2d_dgsem/elixir_mhdmulti_eoc.jl b/examples/tree_2d_dgsem/elixir_mhdmulti_convergence.jl similarity index 100% rename from examples/tree_2d_dgsem/elixir_mhdmulti_eoc.jl rename to examples/tree_2d_dgsem/elixir_mhdmulti_convergence.jl diff --git a/examples/tree_3d_dgsem/elixir_euler_eoc_test.jl b/examples/tree_3d_dgsem/elixir_euler_convergence.jl similarity index 100% rename from examples/tree_3d_dgsem/elixir_euler_eoc_test.jl rename to examples/tree_3d_dgsem/elixir_euler_convergence.jl diff --git a/examples/tree_3d_dgsem/elixir_euler_eoc_pure_fv.jl b/examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl similarity index 100% rename from examples/tree_3d_dgsem/elixir_euler_eoc_pure_fv.jl rename to examples/tree_3d_dgsem/elixir_euler_convergence_pure_fv.jl diff --git a/examples/tree_3d_dgsem/elixir_eulergravity_eoc_test.jl b/examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl similarity index 100% rename from examples/tree_3d_dgsem/elixir_eulergravity_eoc_test.jl rename to examples/tree_3d_dgsem/elixir_eulergravity_convergence.jl diff --git a/test/test_examples_1d_euler.jl b/test/test_examples_1d_euler.jl index cb762061462..baf0469a31e 100644 --- a/test/test_examples_1d_euler.jl +++ b/test/test_examples_1d_euler.jl @@ -15,8 +15,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 linf = [1.6205433861493646e-7, 1.465427772462391e-7, 5.372255111879554e-7]) end - @trixi_testset "elixir_euler_eoc_pure_fv.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_eoc_pure_fv.jl"), + @trixi_testset "elixir_euler_convergence_pure_fv.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence_pure_fv.jl"), l2 = [0.019355699748523896, 0.022326984561234497, 0.02523665947241734], linf = [0.02895961127645519, 0.03293442484199227, 0.04246098278632804]) end diff --git a/test/test_examples_1d_eulergravity.jl b/test/test_examples_1d_eulergravity.jl index 7bd370b3aff..a2a4db3af07 100644 --- a/test/test_examples_1d_eulergravity.jl +++ b/test/test_examples_1d_eulergravity.jl @@ -9,8 +9,8 @@ include("test_trixi.jl") EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1d_dgsem") @testset "Compressible Euler with self-gravity" begin - @trixi_testset "elixir_eulergravity_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_eoc.jl"), + @trixi_testset "elixir_eulergravity_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), l2 = [0.0002170799126638106, 0.0002913792848717502, 0.0006112320856262327], linf = [0.0004977401033188222, 0.0013594223337776157, 0.002041891084400227]) end diff --git a/test/test_examples_1d_eulermulti.jl b/test/test_examples_1d_eulermulti.jl index 244dd2037b6..c9a0d1cd499 100644 --- a/test/test_examples_1d_eulermulti.jl +++ b/test/test_examples_1d_eulermulti.jl @@ -22,14 +22,14 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 linf = [2.50203604e-01, 7.19643482e-01, 6.36541480e-02, 1.27308296e-01]) end - @trixi_testset "elixir_eulermulti_eoc_ec.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_eoc_ec.jl"), + @trixi_testset "elixir_eulermulti_convergence_ec.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_ec.jl"), l2 = [8.54278172e-05, 1.63112465e-04, 1.87964310e-05, 3.75928621e-05], linf = [3.13612234e-04, 5.82916495e-04, 7.05047326e-05, 1.41009465e-04]) end - @trixi_testset "elixir_eulermulti_eoc_es.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_eoc_es.jl"), + @trixi_testset "elixir_eulermulti_convergence_es.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_es.jl"), l2 = [1.88845048e-05, 5.49106005e-05, 9.42673716e-07, 1.88534743e-06, 3.77069486e-06, 7.54138973e-06], linf = [1.16223512e-04, 3.07922197e-04, 3.21774233e-06, 6.43548465e-06, 1.28709693e-05, 2.57419386e-05]) end diff --git a/test/test_examples_1d_mhdmulti.jl b/test/test_examples_1d_mhdmulti.jl index f19edd758b2..79604d06075 100644 --- a/test/test_examples_1d_mhdmulti.jl +++ b/test/test_examples_1d_mhdmulti.jl @@ -22,8 +22,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_1 linf = [5.25859519e-01, 1.11130058e+00, 0.00000000e+00, 1.46798145e+00, 1.11022302e-16, 1.86689645e+00, 0.00000000e+00, 7.63433974e-02, 1.52686795e-01, 3.05373590e-01]) end - @trixi_testset "elixir_mhdmulti_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhdmulti_eoc.jl"), + @trixi_testset "elixir_mhdmulti_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhdmulti_convergence.jl"), l2 = [1.70884468e-05, 3.33778117e-04, 3.33778117e-04, 3.60816702e-05, 4.13046273e-17, 3.33548882e-04, 3.33548882e-04, 1.30233539e-05, 2.60467077e-05, 5.20934154e-05], linf = [2.34173129e-05, 1.23807753e-03, 1.23807753e-03, 1.07512068e-04, 1.11022302e-16, 1.22960686e-03, 1.22960686e-03, 2.01157231e-05, 4.02314461e-05, 8.04628923e-05]) end diff --git a/test/test_examples_2d_ape.jl b/test/test_examples_2d_ape.jl index 3f1a3ab3b20..7ad30958343 100644 --- a/test/test_examples_2d_ape.jl +++ b/test/test_examples_2d_ape.jl @@ -9,8 +9,8 @@ include("test_trixi.jl") EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2d_dgsem") @testset "Acoustic Perturbation" begin - @trixi_testset "elixir_ape_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_ape_eoc.jl"), + @trixi_testset "elixir_ape_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_ape_convergence.jl"), l2 = [0.0018873176537420558, 0.00228615992541537, 0.003125083031985467, 0.0, 0.0, 0.0, 0.0], linf = [0.007481011083990019, 0.009788636350308355, 0.02522255492947867, 0.0, 0.0, 0.0, 0.0]) end diff --git a/test/test_examples_2d_euler.jl b/test/test_examples_2d_euler.jl index 03d215a3842..5d1deb7a631 100644 --- a/test/test_examples_2d_euler.jl +++ b/test/test_examples_2d_euler.jl @@ -15,8 +15,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 linf = [8.357848139128876e-6, 1.0326302096741458e-5, 1.0326302101404394e-5, 4.496194024383726e-5]) end - @trixi_testset "elixir_euler_eoc_pure_fv.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_eoc_pure_fv.jl"), + @trixi_testset "elixir_euler_convergence_pure_fv.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence_pure_fv.jl"), l2 = [0.026440292358506527, 0.013245905852168414, 0.013245905852168479, 0.03912520302609374], linf = [0.042130817806361964, 0.022685499230187034, 0.022685499230187922, 0.06999771202145322]) end diff --git a/test/test_examples_2d_eulermulti.jl b/test/test_examples_2d_eulermulti.jl index 8ab10621bf5..a3a4999f3e2 100644 --- a/test/test_examples_2d_eulermulti.jl +++ b/test/test_examples_2d_eulermulti.jl @@ -46,14 +46,14 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 linf = [2.48820395e-01, 2.48311640e-01, 9.35790843e-01, 1.72574990e-02, 3.45149980e-02, 6.90299959e-02, 1.38059992e-01]) end - @trixi_testset "elixir_eulermulti_eoc_ec.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_eoc_ec.jl"), + @trixi_testset "elixir_eulermulti_convergence_ec.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_ec.jl"), l2 = [1.15269058e-04, 1.15269058e-04, 1.66578747e-04, 4.61097337e-05, 9.22194673e-05], linf = [5.05618608e-04, 5.05618608e-04, 7.87591809e-04, 2.06476960e-04, 4.12953919e-04]) end - @trixi_testset "elixir_eulermulti_eoc_es.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_eoc_es.jl"), + @trixi_testset "elixir_eulermulti_convergence_es.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulermulti_convergence_es.jl"), l2 = [1.74779183e-06, 1.74779183e-06, 5.62550396e-06, 6.15682712e-07, 1.23136542e-06], linf = [1.51966473e-05, 1.51966473e-05, 5.51065526e-05, 5.58096521e-06, 1.11619304e-05]) end diff --git a/test/test_examples_2d_mhdmulti.jl b/test/test_examples_2d_mhdmulti.jl index 75fae6eea53..527c02246ff 100644 --- a/test/test_examples_2d_mhdmulti.jl +++ b/test/test_examples_2d_mhdmulti.jl @@ -22,8 +22,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_2 linf = [2.34445200e-01, 2.34641311e-01, 1.18747959e-01, 5.33819926e-01, 6.20443752e-02, 6.20664068e-02, 9.73946982e-02, 4.75640645e-03, 6.21579619e-02, 1.24315924e-01]) end - @trixi_testset "elixir_mhdmulti_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhdmulti_eoc.jl"), + @trixi_testset "elixir_mhdmulti_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhdmulti_convergence.jl"), l2 = [2.59813133e-04, 2.59813133e-04, 4.80423374e-04, 3.28657614e-04, 3.67440987e-04, 3.67440987e-04, 4.99348315e-04, 3.88655564e-04, 5.37357512e-05, 1.07471502e-04, 2.14943005e-04], linf = [1.54109844e-03, 1.54109844e-03, 2.39709057e-03, 1.01030991e-03, 1.88632092e-03, 1.88632092e-03, 2.59329609e-03, 1.08934177e-03, 2.13125874e-04, 4.26251747e-04, 8.52503495e-04]) end diff --git a/test/test_examples_2d_p4est.jl b/test/test_examples_2d_p4est.jl index c63ac3cdc90..b18bb9ab593 100644 --- a/test/test_examples_2d_p4est.jl +++ b/test/test_examples_2d_p4est.jl @@ -65,8 +65,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "p4est_ ) end - @trixi_testset "elixir_eulergravity_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_eoc.jl"), + @trixi_testset "elixir_eulergravity_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), l2 = [0.0002456507718735638, 0.0003374236900407321, 0.00033742369004074064, 0.0007198398465056179], linf = [0.0013653498212873316, 0.0018996803803537077, 0.0018996803803517093, 0.004384818684607161], tspan = (0.0, 0.1)) diff --git a/test/test_examples_3d_euler.jl b/test/test_examples_3d_euler.jl index 6d5f3b373af..6a0a31f903f 100644 --- a/test/test_examples_3d_euler.jl +++ b/test/test_examples_3d_euler.jl @@ -15,8 +15,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 linf = [0.034894790428615874, 0.033835365548322116, 0.033835365548322116, 0.03383536554832034, 0.06785765131417065]) end - @trixi_testset "elixir_euler_eoc_pure_fv.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_eoc_pure_fv.jl"), + @trixi_testset "elixir_euler_convergence_pure_fv.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence_pure_fv.jl"), l2 = [0.037182410351406, 0.032062252638283974, 0.032062252638283974, 0.03206225263828395, 0.12228177813586687], linf = [0.0693648413632646, 0.0622101894740843, 0.06221018947408474, 0.062210189474084965, 0.24196451799555962]) end @@ -28,8 +28,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3 volume_integral=VolumeIntegralFluxDifferencing(flux_central)) end - @trixi_testset "elixir_euler_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_eoc.jl"), + @trixi_testset "elixir_euler_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), l2 = [0.0003637241020254405, 0.0003955570866382718, 0.0003955570866383613, 0.00039555708663834417, 0.0007811613481640202], linf = [0.0024000660244674066, 0.0029635410025339315, 0.0029635410025292686, 0.002963541002525938, 0.007191437359396424]) end diff --git a/test/test_examples_3d_eulergravity.jl b/test/test_examples_3d_eulergravity.jl index 13cb465e357..a173e92abc6 100644 --- a/test/test_examples_3d_eulergravity.jl +++ b/test/test_examples_3d_eulergravity.jl @@ -9,8 +9,8 @@ include("test_trixi.jl") EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "tree_3d_dgsem") @testset "Compressible Euler with self-gravity" begin - @trixi_testset "elixir_eulergravity_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_eoc.jl"), + @trixi_testset "elixir_eulergravity_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), l2 = [0.0004276779201667428, 0.00047204222332596204, 0.00047204222332608705, 0.0004720422233259819, 0.0010987026250960728], linf = [0.003496616916238704, 0.003764418290373106, 0.003764418290377103, 0.0037644182903766588, 0.008370424899251105], resid_tol = 1.0e-4, tspan = (0.0, 0.2)) diff --git a/test/test_paper_self_gravitating_gas_dynamics.jl b/test/test_paper_self_gravitating_gas_dynamics.jl index b0a62fa4f5c..4df31cfbf09 100644 --- a/test/test_paper_self_gravitating_gas_dynamics.jl +++ b/test/test_paper_self_gravitating_gas_dynamics.jl @@ -14,57 +14,57 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " # Numerical examples from the Euler-gravity paper @testset "paper_self_gravitating_gas_dynamics" begin - @trixi_testset "elixir_euler_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_eoc.jl"), + @trixi_testset "elixir_euler_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), l2 = [0.0001740977055972079, 0.0003369355182519592, 0.0003369355182518708, 0.0006099171220334989], linf = [0.001079347149189669, 0.0018836938381321389, 0.001883693838132583, 0.003971575376718217]) end - @trixi_testset "elixir_euler_eoc.jl with polydeg=4" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_eoc.jl"), + @trixi_testset "elixir_euler_convergence.jl with polydeg=4" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_convergence.jl"), l2 = [1.7187201161597772e-5, 2.678065111772951e-5, 2.678065111783027e-5, 4.952504160091526e-5], linf = [0.0001501749544159381, 0.00016549482504535362, 0.00016549482504601976, 0.0004372960291432193], polydeg = 4) end - @trixi_testset "elixir_hypdiff_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_eoc.jl"), + @trixi_testset "elixir_hypdiff_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_convergence.jl"), l2 = [0.003154024896093942, 0.012394432074951856, 0.02185973823794725], linf = [0.01731850928579215, 0.07843510773347553, 0.11242300176349201]) end - @trixi_testset "elixir_hypdiff_eoc.jl with polydeg=4" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_eoc.jl"), + @trixi_testset "elixir_hypdiff_convergence.jl with polydeg=4" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hypdiff_convergence.jl"), l2 = [0.0002511283012128458, 0.0008808243846610255, 0.0016313343228567005], linf = [0.0017290715087938668, 0.003129184465704738, 0.01000728849316701], polydeg = 4) end - @trixi_testset "elixir_eulergravity_eoc.jl" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_eoc.jl"), + @trixi_testset "elixir_eulergravity_convergence.jl" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), l2 = [0.00024871265138964204, 0.0003370077102132591, 0.0003370077102131964, 0.0007231525513793697], linf = [0.0015813032944647087, 0.0020494288423820173, 0.0020494288423824614, 0.004793821195083758], tspan = (0.0, 0.1)) end - @trixi_testset "elixir_eulergravity_eoc.jl with polydeg=4" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_eoc.jl"), + @trixi_testset "elixir_eulergravity_convergence.jl with polydeg=4" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), l2 = [1.9537712148648045e-5, 2.7564396197947587e-5, 2.7564396197967635e-5, 5.688838772067586e-5], linf = [0.00012335710672761735, 0.00020086268350816283, 0.00020086268350727465, 0.0004962155455632278], tspan = (0.0, 0.1), polydeg = 4) end - @trixi_testset "elixir_eulergravity_eoc.jl with 1st order RK3S*" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_eoc.jl"), + @trixi_testset "elixir_eulergravity_convergence.jl with 1st order RK3S*" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), l2 = [0.00024871265138959434, 0.000337007710281087, 0.0003370077102811394, 0.0007231525515231289], linf = [0.0015813032941613958, 0.002049428843978518, 0.0020494288439798503, 0.004793821198143977], tspan = (0.0, 0.1), timestep_gravity=Trixi.timestep_gravity_erk51_3Sstar!) end - @trixi_testset "elixir_eulergravity_eoc.jl with 3rd order RK3S*" begin - @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_eoc.jl"), + @trixi_testset "elixir_eulergravity_convergence.jl with 3rd order RK3S*" begin + @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_eulergravity_convergence.jl"), l2 = [0.0002487126513894034, 0.00033700771023049785, 0.00033700771023048245, 0.0007231525514158737], linf = [0.0015813032943847727, 0.002049428842844314, 0.0020494288428452023, 0.004793821195971937], tspan = (0.0, 0.1), timestep_gravity=Trixi.timestep_gravity_erk53_3Sstar!) diff --git a/test/test_special_elixirs.jl b/test/test_special_elixirs.jl index a6461a67ca9..d07eaea18d7 100644 --- a/test/test_special_elixirs.jl +++ b/test/test_special_elixirs.jl @@ -16,23 +16,23 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples") @testset "Special elixirs" begin @testset "Convergence test" begin - mean_eoc = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 3) - @test isapprox(mean_eoc[:l2], [4.0], rtol=0.01) + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "tree_2d_dgsem", "elixir_advection_extended.jl"), 3) + @test isapprox(mean_convergence[:l2], [4.0], rtol=0.01) - mean_eoc = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_2d_dgsem", "elixir_advection_extended.jl"), 3) - @test isapprox(mean_eoc[:l2], [4.0], rtol=0.01) + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_2d_dgsem", "elixir_advection_extended.jl"), 3) + @test isapprox(mean_convergence[:l2], [4.0], rtol=0.01) - mean_eoc = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "p4est_2d_dgsem", "elixir_euler_source_terms_nonperiodic_unstructured.jl"), 3) - @test isapprox(mean_eoc[:l2], [3.54, 3.50, 3.50, 3.52], rtol=0.01) + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "p4est_2d_dgsem", "elixir_euler_source_terms_nonperiodic_unstructured.jl"), 3) + @test isapprox(mean_convergence[:l2], [3.54, 3.50, 3.50, 3.52], rtol=0.01) - mean_eoc = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_3d_dgsem", "elixir_advection_basic.jl"), 2) - @test isapprox(mean_eoc[:l2], [4.0], rtol=0.01) + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "structured_3d_dgsem", "elixir_advection_basic.jl"), 2) + @test isapprox(mean_convergence[:l2], [4.0], rtol=0.01) - mean_eoc = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "p4est_3d_dgsem", "elixir_advection_unstructured_curved.jl"), 2, initial_refinement_level=1) - @test isapprox(mean_eoc[:l2], [3.31], rtol=0.01) + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "p4est_3d_dgsem", "elixir_advection_unstructured_curved.jl"), 2, initial_refinement_level=1) + @test isapprox(mean_convergence[:l2], [3.31], rtol=0.01) - mean_eoc = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "paper_self_gravitating_gas_dynamics", "elixir_eulergravity_eoc.jl"), 2, tspan=(0.0, 0.1)) - @test isapprox(mean_eoc[:l2], 4 * ones(4), atol=0.4) + mean_convergence = convergence_test(@__MODULE__, joinpath(EXAMPLES_DIR, "paper_self_gravitating_gas_dynamics", "elixir_eulergravity_convergence.jl"), 2, tspan=(0.0, 0.1)) + @test isapprox(mean_convergence[:l2], 4 * ones(4), atol=0.4) end