Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions test/test_trixi_consistency.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@ 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")

# 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)
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
Expand All @@ -44,13 +44,13 @@ 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=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)
Expand Down
Loading