diff --git a/src/equations/equations.jl b/src/equations/equations.jl index a84bff8..4d31451 100644 --- a/src/equations/equations.jl +++ b/src/equations/equations.jl @@ -7,7 +7,6 @@ #################################################################################################### # Include files with actual implementations for different systems of equations. -# Numerical flux formulations that are independent of the specific system of equations include("shallow_water_wet_dry_1d.jl") end # @muladd diff --git a/src/equations/shallow_water_wet_dry_1d.jl b/src/equations/shallow_water_wet_dry_1d.jl index e1d0fd2..bace4da 100644 --- a/src/equations/shallow_water_wet_dry_1d.jl +++ b/src/equations/shallow_water_wet_dry_1d.jl @@ -478,18 +478,6 @@ end # return u_ll_star, u_rr_star # end -# TODO: Probably can be removed. Since we dispatch to ShallowWaterEquations1D we don't need -# equation specific wave speed estimates. -# # Calculate maximum wave speed for local Lax-Friedrichs-type dissipation as the -# # maximum velocity magnitude plus the maximum speed of sound -# @inline function Trixi.max_abs_speed_naive(u_ll, u_rr, orientation::Integer, -# equations::ShallowWaterEquationsWetDry1D) -# return Trixi.max_abs_speed_naive(u_ll, u_rr, orientation, -# Trixi.ShallowWaterEquations1D(equations.gravity, -# equations.H0, eps(), -# eps())) -# end - # Specialized `DissipationLocalLaxFriedrichs` to avoid spurious dissipation in the bottom topography @inline function (dissipation::Trixi.DissipationLocalLaxFriedrichs)(u_ll, u_rr, orientation_or_normal_direction, @@ -511,17 +499,6 @@ end eps())) end -# TODO: Probably can be removed. Since we dispatch to ShallowWaterEquations1D we don't need -# equation specific wave speed estimates. -# # Calculate estimate for minimum and maximum wave speeds for HLL-type fluxes -# @inline function Trixi.min_max_speed_naive(u_ll, u_rr, orientation::Integer, -# equations::ShallowWaterEquationsWetDry1D) -# return Trixi.min_max_speed_naive(u_ll, u_rr, orientation, -# Trixi.ShallowWaterEquations1D(equations.gravity, -# equations.H0, eps(), -# eps())) -# end - # TODO: This function is currently exported by Trixi.jl. Needs to be uncommented when removed from Trixi.jl # """ # min_max_speed_chen_noelle(u_ll, u_rr, orientation::Integer, @@ -555,27 +532,6 @@ end # return λ_min, λ_max # end -# TODO: Probably can be removed. Since we dispatch to ShallowWaterEquations1D we don't need -# equation specific wave speed estimates. -# More refined estimates for minimum and maximum wave speeds for HLL-type fluxes -# @inline function Trixi.min_max_speed_davis(u_ll, u_rr, orientation::Integer, -# equations::ShallowWaterEquationsWetDry1D) -# return Trixi.min_max_speed_davis(u_ll, u_rr, orientation, -# Trixi.ShallowWaterEquations1D(equations.gravity, -# equations.H0, eps(), -# eps())) -# end - -# TODO: Probably can be removed. Since we dispatch to ShallowWaterEquations1D we don't need -# equation specific wave speed estimates. -# @inline function Trixi.min_max_speed_einfeldt(u_ll, u_rr, orientation::Integer, -# equations::ShallowWaterEquationsWetDry1D) -# return Trixi.min_max_speed_einfeldt(u_ll, u_rr, orientation, -# Trixi.ShallowWaterEquations1D(equations.gravity, -# equations.H0, -# eps(), eps())) -# end - @inline function Trixi.max_abs_speeds(u, equations::ShallowWaterEquationsWetDry1D) return Trixi.max_abs_speeds(u, Trixi.ShallowWaterEquations1D(equations.gravity, diff --git a/test/test_unit.jl b/test/test_unit.jl index 448f8fc..9517443 100644 --- a/test/test_unit.jl +++ b/test/test_unit.jl @@ -33,25 +33,6 @@ isdir(outdir) && rm(outdir, recursive = true) @test cons_vars ≈ Trixi.entropy2cons(entropy_vars, equations) end end - -# TODO: Probably can be removed. Since we dispatch to ShallowWaterEquations1D we don't need -# equation specific wave speed estimates. -# @timed_testset "Connectivity with Trixi.jl" begin -# u = SVector(SVector(1, 0.5, 0.0)) -# orientation = 1 -# equations = ShallowWaterEquationsWetDry1D(gravity_constant = 9.81) -# equations_trixi = ShallowWaterEquations1D(gravity_constant = 9.81) - -# # We only need to check equivalence between the equation systems. The functionality is tested in -# # Trixi.jl. We choose these specific ones to improve code coverage, as they are not tested in -# # any elixirs. -# @test min_max_speed_einfeldt(u, u, orientation, equations) == -# min_max_speed_einfeldt(u, u, orientation, equations_trixi) -# @test min_max_speed_davis(u, u, orientation, equations) == -# min_max_speed_davis(u, u, orientation, equations_trixi) -# @test max_abs_speed_naive(u, u, orientation, equations) == -# max_abs_speed_naive(u, u, orientation, equations_trixi) -# end end end # module