From 7bc0a5c74ffbf718a8552734ba6d5e465ebc7ab1 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 4 Feb 2026 13:57:28 +0100 Subject: [PATCH 1/4] Use at-test_trixi_include for consistency tests with Trixi.jl --- 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..4202e64a 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 3dcaf788b3b0a88ec5fb0e220e432496792b52b4 Mon Sep 17 00:00:00 2001 From: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com> Date: Wed, 4 Feb 2026 18:25:23 +0100 Subject: [PATCH 2/4] Update test/test_trixi_consistency.jl --- test/test_trixi_consistency.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_trixi_consistency.jl b/test/test_trixi_consistency.jl index 4202e64a..2947d227 100644 --- a/test/test_trixi_consistency.jl +++ b/test/test_trixi_consistency.jl @@ -11,7 +11,7 @@ isdir(outdir) && rm(outdir, recursive = true) using TrixiAtmo: CompressibleMoistEulerEquations2D # Dry air warm bubble test case in Trixi.jl - maxiters = 100 + global maxiters = 100 trixi_elixir = joinpath(Trixi.examples_dir(), "tree_2d_dgsem", "elixir_euler_warm_bubble.jl") From 5989995139c63de0d977a9197a1fd3539ecb3f63 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Wed, 4 Feb 2026 21:16:17 +0100 Subject: [PATCH 3/4] remove Main. --- test/test_trixi_consistency.jl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/test_trixi_consistency.jl b/test/test_trixi_consistency.jl index 2947d227..fb844621 100644 --- a/test/test_trixi_consistency.jl +++ b/test/test_trixi_consistency.jl @@ -24,16 +24,16 @@ isdir(outdir) && rm(outdir, recursive = true) maxiters = maxiters) # Save errors - errors_trixi = Main.analysis_callback(Main.sol) + errors_trixi = analysis_callback(sol) # Create an instance of Trixi's equations, just used for dispatch below - equations_trixi = Trixi.CompressibleEulerEquations2D(Main.warm_bubble_setup.gamma) - add_zeros = SVector(zero(eltype(Main.sol)), zero(eltype(Main.sol))) + equations_trixi = Trixi.CompressibleEulerEquations2D(warm_bubble_setup.gamma) + add_zeros = SVector(zero(eltype(sol)), zero(eltype(sol))) # Redefine initial condition in Trixi.jl for CompressibleMoistEulerEquations2D # Different formulae were used! - @inline function (setup::Main.WarmBubbleSetup)(x, t, - ::CompressibleMoistEulerEquations2D) + @inline function (setup::WarmBubbleSetup)(x, t, + ::CompressibleMoistEulerEquations2D) ret_trixi = setup(x, t, equations_trixi) return vcat(ret_trixi, add_zeros) end @@ -45,12 +45,12 @@ 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, + initial_condition = warm_bubble_setup, gravity = 9.81, maxiters = maxiters) # Save errors - errors_atmo = Main.analysis_callback(Main.sol) + errors_atmo = analysis_callback(sol) for (error_trixi, error_atmo) in zip(errors_trixi.l2, errors_atmo.l2) @test isapprox(error_trixi, error_atmo, rtol = 1e-12) From 61748284e669d086e8027566cf7ad269fe6aeaa3 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Wed, 4 Feb 2026 21:28:32 +0100 Subject: [PATCH 4/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 fb844621..9ddf40c2 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 = analysis_callback(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 = warm_bubble_setup, - gravity = 9.81, - maxiters = maxiters) + initial_condition=warm_bubble_setup, + gravity=9.81, + maxiters=maxiters) # Save errors errors_atmo = analysis_callback(sol)