Skip to content

Commit

Permalink
Merge branch 'main' into ViscousForces
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanielDoehring
DanielDoehring authored Apr 5, 2024
2 parents 1fac4c1 + b4fb1db commit 843f57b
Show file tree
Hide file tree
Showing 19 changed files with 85 additions and 81 deletions.
2 changes: 1 addition & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Trixi"
uuid = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
authors = ["Michael Schlottke-Lakemper <[email protected]>", "Gregor Gassner <[email protected]>", "Hendrik Ranocha <[email protected]>", "Andrew R. Winters <[email protected]>", "Jesse Chan <[email protected]>"]
version = "0.7.7-pre"
version = "0.7.8-pre"

[deps]
CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
Expand Down
2 changes: 1 addition & 1 deletion examples/structured_2d_dgsem/elixir_shallowwater_source_terms.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ save_solution = SaveSolutionCallback(interval = 100,
save_final_solution = true,
solution_variables = cons2prim)

stepsize_callback = StepsizeCallback(cfl = 2.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback,
analysis_callback, alive_callback,
Expand Down
2 changes: 1 addition & 1 deletion examples/structured_2d_dgsem/elixir_shallowwater_well_balanced.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ save_solution = SaveSolutionCallback(interval = 1000,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/tree_1d_dgsem/elixir_shallowwater_ec.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ save_solution = SaveSolutionCallback(interval = 100,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/tree_1d_dgsem/elixir_shallowwater_quasi_1d_well_balanced.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ save_solution = SaveSolutionCallback(interval = 1000,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/tree_1d_dgsem/elixir_shallowwater_well_balanced.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ save_solution = SaveSolutionCallback(interval = 1000,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/tree_2d_dgsem/elixir_shallowwater_ec.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ save_solution = SaveSolutionCallback(dt = 0.2,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/tree_2d_dgsem/elixir_shallowwater_well_balanced.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ save_solution = SaveSolutionCallback(interval = 1000,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/tree_2d_dgsem/elixir_shallowwater_well_balanced_wall.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ save_solution = SaveSolutionCallback(interval = 1000,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ save_solution = SaveSolutionCallback(interval = 1000,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/unstructured_2d_dgsem/elixir_shallowwater_ec_shockcapturing.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ analysis_callback = AnalysisCallback(semi, interval = analysis_interval)

alive_callback = AliveCallback(analysis_interval = analysis_interval)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion examples/unstructured_2d_dgsem/elixir_shallowwater_well_balanced.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ save_solution = SaveSolutionCallback(interval = 1000,
save_initial_solution = true,
save_final_solution = true)

stepsize_callback = StepsizeCallback(cfl = 3.0)
stepsize_callback = StepsizeCallback(cfl = 1.0)

callbacks = CallbackSet(summary_callback, analysis_callback, alive_callback, save_solution,
stepsize_callback)
Expand Down
2 changes: 1 addition & 1 deletion src/equations/shallow_water_1d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ end
h = waterheight(u, equations)
v = velocity(u, equations)

c = equations.gravity * sqrt(h)
c = sqrt(equations.gravity * h)
return (abs(v) + c,)
end

Expand Down
2 changes: 1 addition & 1 deletion src/equations/shallow_water_2d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ end
h = waterheight(u, equations)
v1, v2 = velocity(u, equations)

c = equations.gravity * sqrt(h)
c = sqrt(equations.gravity * h)
return abs(v1) + c, abs(v2) + c
end

Expand Down
2 changes: 1 addition & 1 deletion src/equations/shallow_water_quasi_1d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ end
h = waterheight(u, equations)
v = velocity(u, equations)

c = equations.gravity * sqrt(h)
c = sqrt(equations.gravity * h)
return (abs(v) + c,)
end

Expand Down
12 changes: 6 additions & 6 deletions test/test_structured_2d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -849,15 +849,15 @@ end
@trixi_testset "elixir_shallowwater_source_terms.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"),
l2=[
0.0017285599436729316,
0.025584610912606776,
0.028373834961180594,
0.0017286908591070864,
0.025585037307655684,
0.028374244567802766,
6.274146767730866e-5,
],
linf=[
0.012972309788264802,
0.108283714215621,
0.15831585777928936,
0.012973752001194772,
0.10829375385832263,
0.15832858475438094,
0.00018196759554722775,
],
tspan=(0.0, 0.05))
Expand Down
18 changes: 11 additions & 7 deletions test/test_tree_1d_shallowwater.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_1d_dgsem")

@trixi_testset "elixir_shallowwater_ec.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"),
l2=[0.244729018751225, 0.8583565222389505, 0.07330427577586297],
l2=[
0.24476140682560343,
0.8587309324660326,
0.07330427577586297,
],
linf=[
2.1635021283528504,
3.8717508164234453,
2.1636963952308372,
3.8737770522883115,
1.7711213427919539,
],
tspan=(0.0, 0.25))
Expand All @@ -32,13 +36,13 @@ end
@trixi_testset "elixir_shallowwater_ec.jl with initial_condition_weak_blast_wave" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"),
l2=[
0.39464782107209717,
2.03880864210846,
0.39472828074570576,
2.0390687947320076,
4.1623084150546725e-10,
],
linf=[
0.778905801278281,
3.2409883402608273,
0.7793741954662221,
3.2411927977882096,
7.419800190922032e-10,
],
initial_condition=initial_condition_weak_blast_wave,
Expand Down
24 changes: 12 additions & 12 deletions test/test_tree_2d_shallowwater.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ EXAMPLES_DIR = joinpath(examples_dir(), "tree_2d_dgsem")
@trixi_testset "elixir_shallowwater_ec.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"),
l2=[
0.991181203601035,
0.734130029040644,
0.7447696147162621,
0.9911802019934329,
0.7340106828033273,
0.7446338002084801,
0.5875351036989047,
],
linf=[
2.0117744577945413,
2.9962317608172127,
2.6554999727293653,
2.0120253138457564,
2.991158989293406,
2.6557412817714035,
3.0,
],
tspan=(0.0, 0.25))
Expand Down Expand Up @@ -280,15 +280,15 @@ end
@trixi_testset "elixir_shallowwater_wall.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_wall.jl"),
l2=[
0.13517233723296504,
0.20010876311162215,
0.20010876311162223,
0.1351723240085936,
0.20010881416550014,
0.2001088141654999,
2.719538414346464e-7,
],
linf=[
0.5303607982988336,
0.5080989745682338,
0.5080989745682352,
0.5303608302490757,
0.5080987791967457,
0.5080987791967506,
1.1301675764130437e-6,
],
tspan=(0.0, 0.25))
Expand Down
82 changes: 41 additions & 41 deletions test/test_unstructured_2d.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,15 @@ end
@trixi_testset "elixir_shallowwater_ec.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_ec.jl"),
l2=[
0.6106939484178353,
0.48586236867426724,
0.48234490854514356,
0.29467422718511727,
0.6107326269462766,
0.48666631722018877,
0.48309775159067053,
0.29467422718511704,
],
linf=[
2.775979948281604,
3.1721242154451548,
3.5713448319601393,
2.776782342826098,
3.2158378644333707,
3.652920889487258,
2.052861364219655,
],
tspan=(0.0, 0.25))
Expand Down Expand Up @@ -408,16 +408,16 @@ end
@trixi_testset "elixir_shallowwater_source_terms.jl" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"),
l2=[
0.0011197623982310795,
0.04456344888447023,
0.014317376629669337,
5.089218476758975e-6,
0.001118134082248467,
0.044560486817464634,
0.01430926600634214,
5.089218476759981e-6,
],
linf=[
0.007835284004819698,
0.3486891284278597,
0.11242778979399048,
2.6407324614119432e-5,
0.007798727223654822,
0.34782952734839157,
0.11161614702628064,
2.6407324614341476e-5,
],
tspan=(0.0, 0.025))
# Ensure that we do not have excessive memory allocations
Expand All @@ -433,15 +433,15 @@ end
@trixi_testset "elixir_shallowwater_source_terms.jl with FluxHydrostaticReconstruction" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"),
l2=[
0.001119678684752799,
0.015429108794630785,
0.01708275441241111,
5.089218476758271e-6,
0.0011196838135485918,
0.01542895635133927,
0.017082803023121197,
5.089218476759981e-6,
],
linf=[
0.014299564388827513,
0.12785126473870534,
0.17626788561725526,
0.014299541415654371,
0.12783948113206955,
0.17626489583921323,
2.6407324614341476e-5,
],
surface_flux=(FluxHydrostaticReconstruction(flux_hll,
Expand All @@ -461,15 +461,15 @@ end
@trixi_testset "elixir_shallowwater_source_terms.jl with flux_nonconservative_ersing_etal" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"),
l2=[
0.0011196687776346434,
0.044562672453443995,
0.014306265289763618,
0.001118046975499805,
0.04455969246244461,
0.014298120235633432,
5.089218476759981e-6,
],
linf=[
0.007825021762002393,
0.348550815397918,
0.1115517935018282,
0.007776521213640031,
0.34768318303226353,
0.11075311228066198,
2.6407324614341476e-5,
],
surface_flux=(flux_wintermeyer_etal,
Expand All @@ -490,15 +490,15 @@ end
@trixi_testset "elixir_shallowwater_source_terms.jl with flux_hll" begin
@test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_shallowwater_source_terms.jl"),
l2=[
0.0011196786847528799,
0.015429108794631075,
0.017082754412411742,
0.0011196838135486059,
0.015428956351339451,
0.017082803023120943,
5.089218476759981e-6,
],
linf=[
0.014299564388830177,
0.12785126473870667,
0.17626788561728546,
0.01429954141565526,
0.12783948113205668,
0.176264895839215,
2.6407324614341476e-5,
],
surface_flux=(flux_hll,
Expand Down Expand Up @@ -561,15 +561,15 @@ end
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_ec_shockcapturing.jl"),
l2=[
0.6124656312639043,
0.504371951785709,
0.49180896200746366,
0.29467422718511727,
0.612551520607341,
0.5039173660221961,
0.49136517934903523,
0.29467422718511704,
],
linf=[
2.7639232436274392,
3.3985508653311767,
3.3330308209196224,
2.7636771472622197,
3.236168963021072,
3.3363936775653826,
2.052861364219655,
],
tspan=(0.0, 0.25))
Expand Down

0 comments on commit 843f57b

Please sign in to comment.