Skip to content

Commit

Permalink
fix comments, update convergence test values
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickersing committed Apr 11, 2024
1 parent 9270816 commit 0e2f101
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ solver = DGSEM(polydeg = 3, surface_flux = surface_flux,
volume_integral = VolumeIntegralFluxDifferencing(volume_flux))

###############################################################################
# Get the TreeMesh and setup a periodic mesh
# Get the TreeMesh and setup a non-periodic mesh with wall boundary conditions

coordinates_min = (-1.0, -1.0)
coordinates_max = (1.0, 1.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using Trixi
using TrixiShallowWater

###############################################################################
# Semidiscretization of the two-layer shallow water equations with a bottom topography function
# Semidiscretization of the multilayer shallow water equations with a bottom topography function
# to test well-balancedness

equations = ShallowWaterMultiLayerEquations2D(gravity_constant = 9.81, H0 = 0.6,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using Trixi
using TrixiShallowWater

###############################################################################
# Semidiscretization of the two-layer shallow water equations with a periodic
# Semidiscretization of the multilayer shallow water equations with a periodic
# bottom topography function (set in the initial conditions)

equations = ShallowWaterMultiLayerEquations2D(gravity_constant = 10.0,
Expand All @@ -17,7 +17,7 @@ initial_condition = initial_condition_convergence_test

volume_flux = (flux_ersing_etal, flux_nonconservative_ersing_etal)
surface_flux = (flux_ersing_etal, flux_nonconservative_ersing_etal)
solver = DGSEM(polydeg = 8, surface_flux = surface_flux,
solver = DGSEM(polydeg = 6, surface_flux = surface_flux,
volume_integral = VolumeIntegralFluxDifferencing(volume_flux))

###############################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using Trixi
using TrixiShallowWater

###############################################################################
# Semidiscretization of the two-layer shallow water equations with a bottom topography function
# Semidiscretization of the multilayer shallow water equations with a bottom topography function
# to test well-balancedness

equations = ShallowWaterMultiLayerEquations2D(gravity_constant = 9.81, H0 = 0.6,
Expand Down
80 changes: 40 additions & 40 deletions test/test_unstructured_2d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -432,28 +432,28 @@ end # 2LSWE
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_multilayer_convergence.jl"),
l2=[
1.8656084144845292e-5,
1.917796508073001e-5,
1.7454512418793462e-5,
0.00014048665094953486,
3.1328989570708975e-5,
3.512474430566952e-5,
0.00014804378967592363,
3.2299027874400884e-5,
3.881063343808959e-5,
2.393199280374949e-7,
0.0004897160984647814,
0.0005096737100476838,
0.000386126716413923,
0.0037553984372061602,
0.0008470734515158057,
0.000914391804695984,
0.0039026859922448687,
0.0008458945196610379,
0.0009797369075336638,
1.4701175107332196e-5,
],
linf=[
0.00013984354089258133,
0.00011014730412189921,
0.00010077985342477058,
0.0011054081397450233,
0.00022137639447733504,
0.0002451045776211691,
0.0009651462415440903,
0.00026431961702122475,
0.0002728818589384785,
1.03643740911874e-6,
0.003156020123921799,
0.0023782353180252236,
0.002165877463488175,
0.027549055479562767,
0.007426673513840409,
0.0057007815151305374,
0.03394812114803547,
0.00528271152947668,
0.008033142366791368,
5.280913235339302e-5,
],
tspan=(0.0, 0.25))
# Ensure that we do not have excessive memory allocations
Expand All @@ -470,28 +470,28 @@ end # 2LSWE
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_shallowwater_multilayer_convergence.jl"),
l2=[
1.0098144596783888e-5,
8.667598940295975e-6,
7.5615805463112364e-6,
1.8150527998748446e-5,
6.935960840543087e-6,
7.335149149911856e-6,
2.403682140927019e-5,
9.684693895783513e-6,
8.27535107484968e-6,
2.393199280374949e-7,
0.0002738452813944285,
0.00024728982452184266,
0.00018186742817211048,
0.000515064164935216,
0.00020716566255560428,
0.0001967259461755342,
0.0006765281760969105,
0.00026967321034573937,
0.0002097997387723772,
1.4701175107334422e-5,
],
linf=[
6.62853303028399e-5,
5.144519565108974e-5,
3.6540170641030656e-5,
0.00013228821066646468,
4.67241008220709e-5,
4.623162831440819e-5,
0.00015925845769571012,
7.204370895297352e-5,
4.566973688335807e-5,
1.03643740911874e-6,
0.0016143270108415209,
0.0013659806938262076,
0.0008667976189581372,
0.0024878154391543283,
0.0007750025239923741,
0.0012310851890787178,
0.0031150595992053276,
0.0015746347140027095,
0.0011906648185069368,
5.280913235350404e-5,
],
surface_flux=(flux_lax_friedrichs,
flux_nonconservative_ersing_etal),
Expand Down

0 comments on commit 0e2f101

Please sign in to comment.