Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
9 changes: 6 additions & 3 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions test/test_trixi_consistency.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
Loading