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.

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

switch to OrdinaryDiffEq sub-packages #71

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

using Downloads: download
using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater
using Printf: @printf, @sprintf
Expand Down
2 changes: 1 addition & 1 deletion examples/tree_1d_dgsem/elixir_shallowwater_beach.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
2 changes: 1 addition & 1 deletion examples/tree_1d_dgsem/elixir_shallowwater_ec.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater
using Roots
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down Expand Up @@ -41,7 +41,7 @@ function initial_condition_parabolic_bowl(x, t,

H = sigma * h_0 / a^2 * (2 * x[1] * cos(ω * t) - sigma) + h_0

#=
#=
It is mandatory to shift the water level at dry areas to make sure the water height h
stays positive. The system would not be stable for h set to a hard 0 due to division by h in
the computation of velocity, e.g., (h v) / h. Therefore, a small dry state threshold
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand All @@ -15,12 +15,12 @@ equations = ShallowWaterMultiLayerEquations1D(gravity_constant = 1.0, H0 = 2.0,

Initial condition with a complex (discontinuous) bottom topography to test well-balancedness for a
two-layer shallow water system with dry states if `perturbation` is set to `false`.
Additionally, it is possible to set a perturbation in the lower layer to test perturbations from the
Additionally, it is possible to set a perturbation in the lower layer to test perturbations from the
lake-at-rest condition by setting the `perturbation` variable to `true`.

The initial condition is taken from the paper:
- S. Martínez-Aranda, A. Ramos-Pérez, P. García-Navarro (2020)
A 1D shallow-flow model for two-layer flows based on FORCE scheme with wet–dry treatment\n
A 1D shallow-flow model for two-layer flows based on FORCE scheme with wet–dry treatment\n
[DOI:10.2166/hydro.2020.002](https://doi.org/10.2166/hydro.2020.002)
"""
function initial_condition_twolayer_well_balanced_wet_dry(perturbation::Bool,
Expand Down Expand Up @@ -78,7 +78,7 @@ function initial_condition_twolayer_well_balanced_wet_dry(perturbation::Bool,
v1_upper = zero(H_upper)
v1_lower = zero(H_upper)

#=
#=
It is mandatory to shift the water level at dry areas to make sure the water height h
stays positive. The system would not be stable for h set to a hard 0 due to division by h in
the computation of velocity, e.g., (h v) / h. Therefore, a small dry state threshold
Expand Down Expand Up @@ -122,7 +122,7 @@ solver = DGSEM(basis, surface_flux, volume_integral)
###############################################################################
# Get the TreeMesh and setup a periodic mesh

# The domain of interest [0.0, 100.0] is extended towards -28.0 to match the positions of the
# The domain of interest [0.0, 100.0] is extended towards -28.0 to match the positions of the
# disctontinuities with TreeMesh.
coordinates_min = -28.0
coordinates_max = 100.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
2 changes: 1 addition & 1 deletion examples/tree_1d_dgsem/elixir_shallowwater_source_terms.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using Printf: @printf, @sprintf
using TrixiShallowWater
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
2 changes: 1 addition & 1 deletion examples/tree_2d_dgsem/elixir_shallowwater_ec.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down Expand Up @@ -88,10 +88,10 @@ semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver,
tspan = (0.0, 2.0)
ode = semidiscretize(semi, tspan)
###############################################################################
#=
Workaround for TreeMesh2D to set true discontinuities for debugging and testing.
#=
Workaround for TreeMesh2D to set true discontinuities for debugging and testing.
Essentially, this is a slight augmentation of the `compute_coefficients` where the `x` node values
passed here are slightly perturbed in order to set a true discontinuity that avoids the doubled
passed here are slightly perturbed in order to set a true discontinuity that avoids the doubled
value of the LGL nodes at a particular element interface.
=#

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
2 changes: 1 addition & 1 deletion examples/tree_2d_dgsem/elixir_shallowwater_source_terms.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
2 changes: 1 addition & 1 deletion examples/tree_2d_dgsem/elixir_shallowwater_wall.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater
using Printf: @printf, @sprintf
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

using Downloads: download
using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
2 changes: 1 addition & 1 deletion examples/unstructured_2d_dgsem/elixir_shallowwater_ec.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

using Downloads: download
using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

using Downloads: download
using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

using OrdinaryDiffEq
using OrdinaryDiffEqSSPRK, OrdinaryDiffEqLowStorageRK
using Trixi
using TrixiShallowWater

Expand Down
Loading
Loading