Merge pull request #2941 from CliMA/as/hughes23-test

Add topography option to support Hughes2023 double-mountain config

.buildkite/pipeline.yml

@@ -420,6 +420,13 @@ steps:
           --config_file $CONFIG_PATH/sphere_ssp_baroclinic_wave_rhoe_equilmoist_earth.yml
           --job_id sphere_ssp_baroclinic_wave_rhoe_equilmoist_earth
         artifact_paths: "sphere_ssp_baroclinic_wave_rhoe_equilmoist_earth/output_active/*"
+
+      - label: ":computer: Baroclinic wave (ρe) equilmoist (Hughes2023 double mountain config)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe_hughes2023.yml
+          --job_id sphere_baroclinic_wave_rhoe_hughes2023
+        artifact_paths: "sphere_baroclinic_wave_rhoe_hughes2023/output_active/*"
 
   - group: "Restarting"
     steps:

config/default_configs/default_config.yml

@@ -35,7 +35,7 @@ scalar_hyperdiffusion_coefficient:
   value: 1.5
 # Topography
 topography:
-  help: "Define the surface elevation profile [`NoWarp`,`Earth`,`DCMIP200`,`Agnesi`]"
+  help: "Define the surface elevation profile [`NoWarp` (default),`Earth`,`DCMIP200`,`Agnesi`, `Schar`, `Hughes2023`]"
   value: "NoWarp"
 mesh_warp_type:
   help: "Sets the interior mesh warp method [`Linear`, `SLEVE`]"

config/model_configs/sphere_baroclinic_wave_rhoe_hughes2023.yml

@@ -0,0 +1,13 @@
+dt_save_state_to_disk: "2days"
+initial_condition: "MoistBaroclinicWave"
+topography: "Hughes2023"
+topo_smoothing: false
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+moist: equil
+dt: "200secs"
+t_end: "10days"
+vert_diff: "FriersonDiffusion"
+diagnostics:
+  - short_name: [pfull, ua, wa, va, rv, pr, cli, hus, ke]
+    period: 1days

post_processing/ci_plots.jl

@@ -677,8 +677,13 @@ function make_plots(::DryBaroWavePlots, output_paths::Vector{<:AbstractString})
     )
 end
 
+SphereOrographyPlots = Union{
+    Val{:sphere_baroclinic_wave_rhoe_topography_dcmip_rs},
+    Val{:sphere_baroclinic_wave_rhoe_hughes2023},
+}
+
 function make_plots(
-    ::Val{:sphere_baroclinic_wave_rhoe_topography_dcmip_rs},
+    ::SphereOrographyPlots,
     output_paths::Vector{<:AbstractString},
 )
     simdirs = SimDir.(output_paths)

src/topography/topography.jl

@@ -23,6 +23,39 @@ function topography_dcmip200(coords)
     return zₛ
 end
 
+"""
+    topography_hughes2023(λ,ϕ)
+λ = longitude (degrees)
+ϕ = latitude (degrees)
+Returns the surface elevation profile used in the baroclinic wave
+test problem defined by Hughes and Jablonowski (2023).
+"""
+function topography_hughes2023(coords)
+    λ, ϕ = coords.long, coords.lat
+    FT = eltype(λ)
+    h₀ = FT(2e3)
+    # Angles in degrees
+    ϕ₁ = FT(45)
+    ϕ₂ = FT(45)
+    λ_min = minimum(λ)
+    λ₁ = FT(72)
+    λ₂ = FT(140)
+    λₘ = FT(7)
+    ϕₘ = FT(40)
+    d = ϕₘ / 2 * (-log(0.1))^(-1 / 6)
+    c = λₘ / 2 * (-log(0.1))^(-1 / 2)
+    d₁ = @. (λ - λ_min) - λ₁
+    d₂ = @. (λ - λ_min) - λ₂
+    l₁ = @. λ - λ₁
+    l₂ = @. λ - λ₂
+    zₛ = @. FT(
+        h₀ * (
+            exp(-(((ϕ - ϕ₁) / d)^6 + (l₁ / c)^2)) +
+            exp(-(((ϕ - ϕ₂) / d)^6 + (l₂ / c)^2))
+        ),
+    )
+end
+
 """
     topography_agnesi(x,z)
 x = horizontal coordinate [m]

src/utils/common_spaces.jl

@@ -100,7 +100,8 @@ function make_hybrid_spaces(
     z_grid = Grids.FiniteDifferenceGrid(z_topology)
 
     topography = parsed_args["topography"]
-    @assert topography in ("NoWarp", "DCMIP200", "Earth", "Agnesi", "Schar")
+    @assert topography in
+            ("NoWarp", "DCMIP200", "Earth", "Agnesi", "Schar", "Hughes2023")
     if topography == "DCMIP200"
         z_surface = SpaceVaryingInput(topography_dcmip200, h_space)
         @info "Computing DCMIP200 orography on spectral horizontal space"
@@ -110,6 +111,9 @@ function make_hybrid_spaces(
     elseif topography == "Schar"
         z_surface = SpaceVaryingInput(topography_schar, h_space)
         @info "Computing Schar orography on spectral horizontal space"
+    elseif topography == "Hughes2023"
+        z_surface = SpaceVaryingInput(topography_hughes2023, h_space)
+        @info "Computing Hughes2023 orography on spectral horizontal space"
     elseif topography == "Earth"
         z_surface = SpaceVaryingInput(
             AA.earth_orography_file_path(;