add dingemans_calibration

Author: JoshuaLampert

src/equations/bbm_bbm_1d.jl

@@ -223,6 +223,8 @@ function source_terms_manufactured_reflecting(q, x, t,
     return SVector(s1, s2, zero(s1))
 end
 
+dingemans_calibration(equations::BBMBBMEquations1D) = 2.7
+
 """
     initial_condition_dingemans(x, t, equations::BBMBBMEquations1D, mesh)
 
@@ -249,10 +251,11 @@ function initial_condition_dingemans(x, t, equations::BBMBBMEquations1D, mesh)
     A = 0.02
     # omega = 2*pi/(2.02*sqrt(2))
     k = 0.8406220896381442 # precomputed result of find_zero(k -> omega^2 - g * k * tanh(k * h0), 1.0) using Roots.jl
-    if x < -30.5 * pi / k || x > -8.5 * pi / k
+    offset = dingemans_calibration(equations)
+    if x - offset < -34.5 * pi / k || x - offset > -4.5 * pi / k
         h = 0.0
     else
-        h = A * cos(k * x)
+        h = A * cos(k * (x - offset))
     end
     v = sqrt(g / k * tanh(k * h0)) * h / h0
     if 11.01 <= x && x < 23.04

src/equations/equations.jl

@@ -614,6 +614,10 @@ function solve_system_matrix!(dv, system_matrix, ::Union{BBMEquation1D, BBMBBMEq
     ldiv!(system_matrix, dv)
 end
 
+# To match the experimental data from Dingemans, the initial condition needs to be shifted
+# to account for the phase shift to the experimental data.
+dingemans_calibration(equations) = 0
+
 """
     initial_condition_dingemans(x, t, equations::AbstractShallowWaterEquations, mesh)
 
@@ -635,10 +639,11 @@ function initial_condition_dingemans(x, t, equations::AbstractShallowWaterEquati
     A = 0.02
     # omega = 2*pi/(2.02*sqrt(2))
     k = 0.8406220896381442 # precomputed result of find_zero(k -> omega^2 - g * k * tanh(k * h0), 1.0) using Roots.jl
-    if x < -30.5 * pi / k || x > -8.5 * pi / k
+    offset = dingemans_calibration(equations)
+    if x - offset < -34.5 * pi / k || x - offset > -4.5 * pi / k
         h = 0.0
     else
-        h = A * cos(k * x)
+        h = A * cos(k * (x - offset))
     end
     v = sqrt(g / k * tanh(k * h0)) * h / h0
     if 11.01 <= x && x < 23.04

src/equations/hyperbolic_serre_green_naghdi_1d.jl

@@ -321,6 +321,8 @@ function source_terms_manufactured_reflecting(q, x, t,
     return SVector(s1, s2, s3, s4, s5)
 end
 
+dingemans_calibration(equations::HyperbolicSerreGreenNaghdiEquations1D) = 2.4
+
 function create_cache(mesh, equations::HyperbolicSerreGreenNaghdiEquations1D,
                       solver, initial_condition,
                       boundary_conditions::Union{BoundaryConditionPeriodic,

src/equations/serre_green_naghdi_1d.jl

@@ -414,7 +414,7 @@ function source_terms_manufactured_reflecting(q, x, t,
     cos3_pix = cospi(x)^3
     cos4_pix = cospi(x)^4
 
-    # Compute s1 
+    # Compute s1
     s1 = 2(2 + cospix + x) + (-1 - 2(2 + cospix + x) * t) * sinpix * t -
          2(1 - pi * sinpix) * sinpix * t2 * x +
          cospix * (-1 - 2(2 + cospix + x) * t) * pi * t * x
@@ -496,6 +496,8 @@ function source_terms_manufactured_reflecting(q, x, t,
     return SVector(s1, s2, zero(s1))
 end
 
+dingemans_calibration(equations::SerreGreenNaghdiEquations1D) = 2.4
+
 # flat bathymetry with periodic or reflecting boundary conditions
 function create_cache(mesh,
                       equations::SerreGreenNaghdiEquations1D{BathymetryFlat},

src/equations/svaerd_kalisch_1d.jl

@@ -197,6 +197,8 @@ function source_terms_manufactured_reflecting(q, x, t, equations::SvaerdKalischE
     return SVector(s1, s2, zero(s1))
 end
 
+dingemans_calibration(equations::SvaerdKalischEquations1D) = 2.2
+
 # For periodic boundary conditions
 function assemble_system_matrix!(cache, h,
                                  ::SvaerdKalischEquations1D,