Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More adaptations for Taal/Taam #268

Merged
merged 2 commits into from
Oct 30, 2020
Merged

More adaptations for Taal/Taam #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3986b03
same name for mhd_rotor_shockcapturing_amr
ranocha Oct 30, 2020
bafa057
2d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl matches
ranocha Oct 30, 2020
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
2 changes: 1 addition & 1 deletion examples/2d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ amr_callback = AMRCallback(semi, amr_controller,
adapt_initial_condition=true,
adapt_initial_condition_only_refine=true)

stepsize_callback = StepsizeCallback(cfl=1.0)
stepsize_callback = StepsizeCallback(cfl=0.8)

save_solution = SaveSolutionCallback(interval=100,
save_initial_solution=true,
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/parameters_euler_sedov_blast_wave_shockcapturing_amr.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ t_end = 12.5
# Solver
solver = "dg"
polydeg = 3
cfl = 1.0
cfl = 0.8
n_steps_max = 10000
analysis_interval = 100
volume_integral_type = "shock_capturing"
Expand Down
0 examples/2d/parameters_mhd_rotor.toml → ...ameters_mhd_rotor_shockcapturing_amr.toml
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions test/test_examples_2d_old.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,11 @@ end
n_steps_max = 1,
initial_condition = "initial_condition_constant")
end
@testset "parameters_mhd_rotor.toml one step" begin
test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_mhd_rotor.toml"),
@testset "parameters_mhd_rotor_shockcapturing_amr.toml one step" begin
test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_mhd_rotor_shockcapturing_amr.toml"),
l2 = [0.019195558428459367, 0.0444345270981607, 0.04329215391420532, 0.0, 0.07639332626939939, 0.0044777850800556485, 0.007266820549785791, 0.0, 0.0008422441423441393],
linf = [0.5171127312547106, 1.9513340343194656, 1.9404704272260034, 0.0, 2.993145341292035, 0.14424331829406456, 0.20606277176198587, 0.0, 0.06685635962044646],
n_steps_max = 1)
t_end = 0.02)
end
@test_skip Trixi.run(joinpath(EXAMPLES_DIR, "parameters_mhd_blast_wave.toml"), n_steps_max=1)
end
Expand All @@ -345,7 +345,6 @@ if haskey(ENV, "TRIXI_TEST_EXTENDED") && lowercase(ENV["TRIXI_TEST_EXTENDED"]) i
@test_nowarn Trixi.run(joinpath(EXAMPLES_DIR, "parameters_euler_ec_mortar.toml"))
@test_nowarn Trixi.run(joinpath(EXAMPLES_DIR, "parameters_mhd_blast_wave.toml"))
@test_nowarn Trixi.run(joinpath(EXAMPLES_DIR, "parameters_mhd_orszag_tang.toml"))
@test_nowarn Trixi.run(joinpath(EXAMPLES_DIR, "parameters_mhd_rotor.toml"))
end
end

Expand Down