Make Schar mountain taller in kinetic energy test

CliMA · Apr 29, 2024 · 598d163 · 598d163
1 parent bb65638
commit 598d163
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/config/model_configs/plane_schar_mountain_kinetic_energy_check_stretched.yml b/config/model_configs/plane_schar_mountain_kinetic_energy_check_stretched.yml
@@ -13,7 +13,7 @@ ode_algo: "SSP33ShuOsher"
 config: "plane"
 hyperdiff: "false"
 z_max: 25000.0
-topography: "Schar"
+topography: "Tall Schar"
 job_id: "plane_schar_mountain_kinetic_energy_check_stretched"
 toml: [toml/plane_schar_mountain_test_stretched.toml]
 diagnostics:

diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl
@@ -147,11 +147,14 @@ function get_spaces(parsed_args, params, comms_ctx)
     bubble = parsed_args["bubble"]
     deep = parsed_args["deep_atmosphere"]
 
-    @assert topography in ("NoWarp", "DCMIP200", "Earth", "Agnesi", "Schar")
+    @assert topography in
+            ("NoWarp", "DCMIP200", "Earth", "Agnesi", "Tall Schar", "Schar")
     if topography == "DCMIP200"
         warp_function = topography_dcmip200
     elseif topography == "Agnesi"
         warp_function = topography_agnesi
+    elseif topography == "Tall Schar"
+        warp_function = topography_tall_schar
     elseif topography == "Schar"
         warp_function = topography_schar
     elseif topography == "NoWarp"

diff --git a/src/topography/topography.jl b/src/topography/topography.jl
@@ -77,3 +77,14 @@ function topography_schar(coords)
     zₛ = @. h_c * exp(-((x - x_c) / a_c)^2) * (cospi((x - x_c) / λ_c))^2
     return zₛ
 end
+
+function topography_tall_schar(coords)
+    x = coords.x
+    FT = eltype(x)
+    h_c = FT(5000)
+    λ_c = FT(4000)
+    a_c = FT(5000)
+    x_c = FT(60000)
+    zₛ = @. h_c * exp(-((x - x_c) / a_c)^2) * (cospi((x - x_c) / λ_c))^2
+    return zₛ
+end