diff --git a/src/equations/bbm_bbm_variable_bathymetry_1d.jl b/src/equations/bbm_bbm_variable_bathymetry_1d.jl index d69c10bf..ee4729e4 100644 --- a/src/equations/bbm_bbm_variable_bathymetry_1d.jl +++ b/src/equations/bbm_bbm_variable_bathymetry_1d.jl @@ -63,7 +63,7 @@ end The initial condition that uses the dispersion relation of the Euler equations to approximate waves generated by a wave maker as it is done by experiments of -Dingemans. The topography is a trapesoidal. +Dingemans. The topography is a trapezoidal. References: - Magnus Svärd, Henrik Kalisch (2023) @@ -84,16 +84,14 @@ function initial_condition_dingemans(x, t, equations::BBMBBMVariableEquations1D, h = A * cos(k * x) end v = sqrt(equations.gravity / k * tanh(k * eta0)) * h / eta0 - if x < 11.01 || x >= 33.07 - b = 0.0 - elseif 11.01 <= x && x < 23.04 + if 11.01 <= x && x < 23.04 b = 0.6 * (x - 11.01) / (23.04 - 11.01) elseif 23.04 <= x && x < 27.04 b = 0.6 elseif 27.04 <= x && x < 33.07 b = 0.6 * (33.07 - x) / (33.07 - 27.04) else - error("should not happen") + b = 0.0 end eta = h + eta0 D = -b diff --git a/src/equations/svaerd_kalisch_1d.jl b/src/equations/svaerd_kalisch_1d.jl index 3a53f376..633637ba 100644 --- a/src/equations/svaerd_kalisch_1d.jl +++ b/src/equations/svaerd_kalisch_1d.jl @@ -49,7 +49,7 @@ varnames(::typeof(prim2cons), ::SvaerdKalischEquations1D) = ("h", "hv", "b") The initial condition that uses the dispersion relation of the Euler equations to approximate waves generated by a wave maker as it is done by experiments of -Dingemans. The topography is a trapesoidal. It is assumed that `equations.eta0 = 0.8`. +Dingemans. The topography is a trapezoidal. It is assumed that `equations.eta0 = 0.8`. References: - Magnus Svärd, Henrik Kalisch (2023) @@ -70,16 +70,14 @@ function initial_condition_dingemans(x, t, equations::SvaerdKalischEquations1D, h = A * cos(k * x) end v = sqrt(equations.gravity / k * tanh(k * eta0)) * h / eta0 - if x < 11.01 || x >= 33.07 - b = 0.0 - elseif 11.01 <= x && x < 23.04 + if 11.01 <= x && x < 23.04 b = 0.6 * (x - 11.01) / (23.04 - 11.01) elseif 23.04 <= x && x < 27.04 b = 0.6 elseif 27.04 <= x && x < 33.07 b = 0.6 * (33.07 - x) / (33.07 - 27.04) else - error("should not happen") + b = 0.0 end eta = h + eta0 D = -b