From a089ad8b24c3802c1bae06a7a73be2e31d7e95b4 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 4 Feb 2026 08:30:04 +0100 Subject: [PATCH 1/4] more tests for upstream CI runs --- test/runtests.jl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 61d41554..08cb6874 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -75,13 +75,15 @@ const TRIXI_NTHREADS = clamp(Sys.CPU_THREADS, 2, 3) end end - @time if TRIXI_TEST == "all" || TRIXI_TEST == "shallow_water_3d" + @time if TRIXI_TEST == "all" || TRIXI_TEST == "shallow_water_3d" || + TRIXI_TEST == "upstream" @testset verbose=true showtiming=true "Spherical SWE Cartesian tests" begin include("test_3d_shallow_water.jl") end end - @time if TRIXI_TEST == "all" || TRIXI_TEST == "shallow_water_2d_covariant" + @time if TRIXI_TEST == "all" || TRIXI_TEST == "shallow_water_2d_covariant" || + TRIXI_TEST == "upstream" @testset verbose=true showtiming=true "Spherical SWE covariant tests" begin include("test_2d_shallow_water_covariant.jl") end @@ -93,7 +95,8 @@ const TRIXI_NTHREADS = clamp(Sys.CPU_THREADS, 2, 3) end end - @time if TRIXI_TEST == "all" || TRIXI_TEST == "euler_potential_temperature_2d" + @time if TRIXI_TEST == "all" || TRIXI_TEST == "euler_potential_temperature_2d" || + TRIXI_TEST == "upstream" @testset verbose=true showtiming=true "Euler potential temperature 2D tests" begin include("test_2d_potential_temperature.jl") end From 7044ef7cede021e7231e02a0d49a7e41f916b55c Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 4 Feb 2026 08:30:39 +0100 Subject: [PATCH 2/4] use at-test_trixi_include for Trixi.jl consistency tests --- test/test_trixi_consistency.jl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/test_trixi_consistency.jl b/test/test_trixi_consistency.jl index 9dbf1e88..7bd5c5ff 100644 --- a/test/test_trixi_consistency.jl +++ b/test/test_trixi_consistency.jl @@ -16,12 +16,12 @@ isdir(outdir) && rm(outdir, recursive = true) "elixir_euler_warm_bubble.jl") # Override fluxes, polydeg, cfl, maxiters - trixi_include(trixi_elixir; - volume_flux = Trixi.flux_chandrashekar, - surface_flux = Trixi.FluxLMARS(360.0), - polydeg = 4, - stepsize_callback = Trixi.StepsizeCallback(cfl = 0.2), - maxiters = maxiters) + @test_trixi_include(trixi_elixir; + volume_flux=Trixi.flux_chandrashekar, + surface_flux=Trixi.FluxLMARS(360.0), + polydeg=4, + stepsize_callback=Trixi.StepsizeCallback(cfl = 0.2), + maxiters=maxiters) # Save errors errors_trixi = Main.analysis_callback(Main.sol) @@ -44,10 +44,10 @@ isdir(outdir) && rm(outdir, recursive = true) # Override initial condition, maxiters, # gravitational acceleration constant to match Trixi's equations - trixi_include(elixir_atmo; - initial_condition = Main.warm_bubble_setup, - gravity = 9.81, - maxiters = maxiters) + @test_trixi_include(elixir_atmo; + initial_condition=Main.warm_bubble_setup, + gravity=9.81, + maxiters=maxiters) # Save errors errors_atmo = Main.analysis_callback(Main.sol) From db41545719eed6bbaa9fcf8688158446a8c735d3 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 4 Feb 2026 11:34:55 +0100 Subject: [PATCH 3/4] format --- test/test_trixi_consistency.jl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/test_trixi_consistency.jl b/test/test_trixi_consistency.jl index 7bd5c5ff..6fff5baa 100644 --- a/test/test_trixi_consistency.jl +++ b/test/test_trixi_consistency.jl @@ -17,11 +17,11 @@ isdir(outdir) && rm(outdir, recursive = true) # Override fluxes, polydeg, cfl, maxiters @test_trixi_include(trixi_elixir; - volume_flux=Trixi.flux_chandrashekar, - surface_flux=Trixi.FluxLMARS(360.0), - polydeg=4, - stepsize_callback=Trixi.StepsizeCallback(cfl = 0.2), - maxiters=maxiters) + volume_flux = Trixi.flux_chandrashekar, + surface_flux = Trixi.FluxLMARS(360.0), + polydeg = 4, + stepsize_callback = Trixi.StepsizeCallback(cfl = 0.2), + maxiters = maxiters) # Save errors errors_trixi = Main.analysis_callback(Main.sol) @@ -45,9 +45,9 @@ isdir(outdir) && rm(outdir, recursive = true) # Override initial condition, maxiters, # gravitational acceleration constant to match Trixi's equations @test_trixi_include(elixir_atmo; - initial_condition=Main.warm_bubble_setup, - gravity=9.81, - maxiters=maxiters) + initial_condition = Main.warm_bubble_setup, + gravity = 9.81, + maxiters = maxiters) # Save errors errors_atmo = Main.analysis_callback(Main.sol) From 11bc305c7630b1f223693d4bf2585ad6e02d2145 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 4 Feb 2026 12:06:18 +0100 Subject: [PATCH 4/4] use trixi_include as before due to some error --- test/test_trixi_consistency.jl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/test_trixi_consistency.jl b/test/test_trixi_consistency.jl index 6fff5baa..9dbf1e88 100644 --- a/test/test_trixi_consistency.jl +++ b/test/test_trixi_consistency.jl @@ -16,12 +16,12 @@ isdir(outdir) && rm(outdir, recursive = true) "elixir_euler_warm_bubble.jl") # Override fluxes, polydeg, cfl, maxiters - @test_trixi_include(trixi_elixir; - volume_flux = Trixi.flux_chandrashekar, - surface_flux = Trixi.FluxLMARS(360.0), - polydeg = 4, - stepsize_callback = Trixi.StepsizeCallback(cfl = 0.2), - maxiters = maxiters) + trixi_include(trixi_elixir; + volume_flux = Trixi.flux_chandrashekar, + surface_flux = Trixi.FluxLMARS(360.0), + polydeg = 4, + stepsize_callback = Trixi.StepsizeCallback(cfl = 0.2), + maxiters = maxiters) # Save errors errors_trixi = Main.analysis_callback(Main.sol) @@ -44,10 +44,10 @@ isdir(outdir) && rm(outdir, recursive = true) # Override initial condition, maxiters, # gravitational acceleration constant to match Trixi's equations - @test_trixi_include(elixir_atmo; - initial_condition = Main.warm_bubble_setup, - gravity = 9.81, - maxiters = maxiters) + trixi_include(elixir_atmo; + initial_condition = Main.warm_bubble_setup, + gravity = 9.81, + maxiters = maxiters) # Save errors errors_atmo = Main.analysis_callback(Main.sol)