Merge pull request #3475 from CliMA/aj/more_diffusion

Add exponentially decaying with height diffusion option
CliMA · Dec 12, 2024 · 9c20f6a · 9c20f6a
2 parents d1aebff + 14b644b
commit 9c20f6a
Show file tree

Hide file tree

Showing 32 changed files with 125 additions and 50 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -14,6 +14,14 @@ the atmosphere. PR [3476](https://github.com/CliMA/ClimaAtmos.jl/pull/3476)
 v0.27.9
 -------
 
+### Features
+
+### New option for vertical diffusion
+
+When `vert_diff` is set to `DecayWithHeightDiffusion`, diffusion decays
+exponentially with height.
+PR [3475](https://github.com/CliMA/ClimaAtmos.jl/pull/3475)
+
 v0.27.8
 -------
 

diff --git a/Project.toml b/Project.toml
@@ -43,7 +43,7 @@ AtmosphericProfilesLibrary = "0.1.7"
 ClimaComms = "0.6.4"
 ClimaCore = "0.14.12"
 ClimaDiagnostics = "0.2.4"
-ClimaParams = "0.10.12"
+ClimaParams = "0.10.17"
 ClimaTimeSteppers = "0.7.33"
 ClimaUtilities = "0.1.14"
 CloudMicrophysics = "0.22.3"

diff --git a/calibration/experiments/gcm_driven_scm/Manifest.toml b/calibration/experiments/gcm_driven_scm/Manifest.toml
@@ -371,9 +371,9 @@ version = "0.2.8"
 
 [[deps.ClimaParams]]
 deps = ["TOML"]
-git-tree-sha1 = "b43ca371c435056129295445122ea87fd843b505"
+git-tree-sha1 = "df21e7c6101f38cfd61f82a9e965332eb3136854"
 uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
-version = "0.10.14"
+version = "0.10.17"
 
 [[deps.ClimaTimeSteppers]]
 deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]

diff --git a/calibration/experiments/sphere_held_suarez_rhoe_equilmoist/Manifest.toml b/calibration/experiments/sphere_held_suarez_rhoe_equilmoist/Manifest.toml
@@ -386,9 +386,9 @@ version = "0.1.7"
 
 [[deps.ClimaParams]]
 deps = ["DocStringExtensions", "TOML", "Test"]
-git-tree-sha1 = "0b5afc75bd3aa7c30d76c2d33b8361f961e86237"
+git-tree-sha1 = "df21e7c6101f38cfd61f82a9e965332eb3136854"
 uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
-version = "0.10.8"
+version = "0.10.17"
 
 [[deps.ClimaTimeSteppers]]
 deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]

diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -140,7 +140,7 @@ reference_job_id:
     Identifier of job to use as the "reference" solution in the quicklook plot; the current job's results get compared to the results of the quicklook job on the main branch
   value: ~
 vert_diff:
-  help: "Vertical diffusion [`false` (default), `VerticalDiffusion`, `true` (defaults to `VerticalDiffusion`), `FriersonDiffusion`]"
+  help: "Vertical diffusion [`false` (default), `VerticalDiffusion`, `true` (defaults to `VerticalDiffusion`), `FriersonDiffusion`, `DecayWithHeightDiffusion`]"
   value: false
 hyperdiff:
   help: "Hyperdiffusion [`ClimaHyperdiffusion` (or `true`; default), `none` (or `false`)]"

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml
@@ -11,7 +11,7 @@ precip_model: 1M
 rad: allskywithclear
 idealized_insolation: false
 dt_rad: 1hours
-vert_diff: FriersonDiffusion
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 dt_cloud_fraction: 1hours

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml
@@ -13,7 +13,7 @@ rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml
@@ -13,7 +13,7 @@ rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml
@@ -13,7 +13,7 @@ rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml
@@ -13,7 +13,7 @@ rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"

diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml
@@ -14,6 +14,6 @@ rad: "allskywithclear"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
 surface_setup: "DefaultMoninObukhov"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 precip_model: "0M"
 toml: [toml/longrun_aquaplanet.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml b/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml
@@ -16,6 +16,6 @@ rad: "allskywithclear"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
 surface_setup: "DefaultMoninObukhov"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 precip_model: "0M"
 toml: [toml/longrun_aquaplanet.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml
@@ -14,6 +14,6 @@ rad: "allskywithclear"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
 surface_setup: "DefaultMoninObukhov"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 precip_model: "1M"
 toml: [toml/longrun_aquaplanet.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_1M_noneq.yml b/config/longrun_configs/longrun_aquaplanet_allsky_1M_noneq.yml
@@ -16,5 +16,5 @@ rad: "allskywithclear"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
 surface_setup: "DefaultMoninObukhov"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 toml: [toml/longrun_aquaplanet.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml b/config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml
@@ -14,7 +14,7 @@ moist: "equil"
 prognostic_surface: "PrognosticSurfaceTemperature"
 albedo_model: "RegressionFunctionAlbedo"
 surface_setup: "DefaultMoninObukhov"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"

diff --git a/config/longrun_configs/longrun_aquaplanet_dyamond.yml b/config/longrun_configs/longrun_aquaplanet_dyamond.yml
@@ -6,16 +6,16 @@ rayleigh_sponge: true
 viscous_sponge: true
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
-moist: "equil" 
+moist: "equil"
 cloud_model: "grid_scale"
-dt: "60secs" 
+dt: "60secs"
 t_end: "30days"
 dt_save_state_to_disk: "10days"
 rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
-surface_setup: "DefaultMoninObukhov" 
-vert_diff: "FriersonDiffusion" 
-precip_model: "0M" 
+surface_setup: "DefaultMoninObukhov"
+vert_diff: "DecayWithHeightDiffusion"
+precip_model: "0M"
 toml: [toml/longrun_aquaplanet.toml]
diff --git a/config/model_configs/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml b/config/model_configs/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml
@@ -4,7 +4,7 @@ t_end: "5days"
 moist: "equil"
 precip_model: "0M"
 surface_setup: "DefaultMoninObukhov"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 rad: "clearsky"

diff --git a/config/model_configs/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean_ft64.yml b/config/model_configs/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean_ft64.yml
@@ -4,7 +4,7 @@ t_end: "5days"
 moist: "equil"
 precip_model: "0M"
 surface_setup: "DefaultMoninObukhov"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 rad: "clearsky"

diff --git a/config/model_configs/gpu_aquaplanet_dyamond.yml b/config/model_configs/gpu_aquaplanet_dyamond.yml
@@ -10,7 +10,7 @@ rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"

diff --git a/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml b/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml
@@ -4,7 +4,7 @@ dz_bottom: 50.0
 dt: "400secs"
 t_end: "18hours"
 dt_save_state_to_disk: "18hours"
-vert_diff: "FriersonDiffusion"
+vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 cloud_model: "grid_scale"

diff --git a/config/mpi_configs/mpi_sphere_aquaplanet_rhoe_equilmoist_clearsky.yml b/config/mpi_configs/mpi_sphere_aquaplanet_rhoe_equilmoist_clearsky.yml
@@ -1,4 +1,4 @@
-vert_diff: true
+vert_diff: "DecayWithHeightDiffusion"
 surface_setup: "DefaultExchangeCoefficients"
 moist: "equil"
 rad: "clearsky"

diff --git a/docs/Manifest.toml b/docs/Manifest.toml
@@ -349,9 +349,9 @@ version = "0.2.11"
 
 [[deps.ClimaParams]]
 deps = ["TOML"]
-git-tree-sha1 = "489c5655993c62fb34293908a6b0877e32f183ee"
+git-tree-sha1 = "df21e7c6101f38cfd61f82a9e965332eb3136854"
 uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
-version = "0.10.16"
+version = "0.10.17"
 
 [[deps.ClimaTimeSteppers]]
 deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]

diff --git a/examples/Manifest.toml b/examples/Manifest.toml
@@ -400,9 +400,9 @@ version = "0.2.11"
 
 [[deps.ClimaParams]]
 deps = ["TOML"]
-git-tree-sha1 = "489c5655993c62fb34293908a6b0877e32f183ee"
+git-tree-sha1 = "df21e7c6101f38cfd61f82a9e965332eb3136854"
 uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
-version = "0.10.16"
+version = "0.10.17"
 
 [[deps.ClimaReproducibilityTests]]
 deps = ["OrderedCollections", "PrettyTables"]

diff --git a/perf/Manifest.toml b/perf/Manifest.toml
@@ -411,9 +411,9 @@ version = "0.2.11"
 
 [[deps.ClimaParams]]
 deps = ["TOML"]
-git-tree-sha1 = "489c5655993c62fb34293908a6b0877e32f183ee"
+git-tree-sha1 = "df21e7c6101f38cfd61f82a9e965332eb3136854"
 uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
-version = "0.10.16"
+version = "0.10.17"
 
 [[deps.ClimaTimeSteppers]]
 deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]

diff --git a/src/cache/precomputed_quantities.jl b/src/cache/precomputed_quantities.jl
@@ -139,15 +139,14 @@ function precomputed_quantities(Y, atmos)
             ρatke_flux = similar(Fields.level(Y.f, half), C3{FT}),
             precipitation_sgs_quantities...,
         ) : (;)
-    vert_diff_quantities = if atmos.vert_diff isa VerticalDiffusion
-        ᶜK_h = similar(Y.c, FT)
-        (; ᶜK_u = ᶜK_h, ᶜK_h) # ᶜK_u aliases ᶜK_h because they are always equal.
-    elseif atmos.vert_diff isa FriersonDiffusion
-        ᶜK_h = similar(Y.c, FT)
-        (; ᶜK_u = ᶜK_h, ᶜK_h) # ᶜK_u aliases ᶜK_h because they are always equal.
-    else
-        (;)
-    end
+    vert_diff_quantities =
+        if atmos.vert_diff isa
+           Union{VerticalDiffusion, DecayWithHeightDiffusion, FriersonDiffusion}
+            ᶜK_h = similar(Y.c, FT)
+            (; ᶜK_u = ᶜK_h, ᶜK_h) # ᶜK_u aliases ᶜK_h because they are always equal.
+        else
+            (;)
+        end
     precipitation_quantities =
         atmos.precip_model isa Microphysics1Moment ?
         (;
@@ -333,6 +332,9 @@ ts_sgs(thermo_params, moisture_model, specific, K, Φ, p) = thermo_state(
     p,
 )
 
+function eddy_diffusivity_coefficient_H(D₀, H, z_sfc, z)
+    return D₀ * exp(-(z - z_sfc) / H)
+end
 function eddy_diffusivity_coefficient(C_E, norm_v_a, z_a, p)
     p_pbl = 85000
     p_strato = 10000
@@ -544,7 +546,17 @@ NVTX.@annotate function set_precomputed_quantities!(Y, p, t)
         )
     end
 
-    if vert_diff isa VerticalDiffusion
+    if vert_diff isa DecayWithHeightDiffusion
+        (; ᶜK_h) = p.precomputed
+        ᶜz = Fields.coordinate_field(Y.c).z
+        ᶠz_sfc = Fields.level(Fields.coordinate_field(Y.f).z, Fields.half)
+        @. ᶜK_h = eddy_diffusivity_coefficient_H(
+            p.atmos.vert_diff.D₀,
+            p.atmos.vert_diff.H,
+            ᶠz_sfc,
+            ᶜz,
+        )
+    elseif vert_diff isa VerticalDiffusion
         (; ᶜK_h) = p.precomputed
         interior_uₕ = Fields.level(Y.c.uₕ, 1)
         ᶜΔz_surface = Fields.Δz_field(interior_uₕ)

diff --git a/src/diagnostics/Diagnostics.jl b/src/diagnostics/Diagnostics.jl
@@ -35,6 +35,7 @@ import ClimaAtmos.RRTMGPInterface as RRTMGPI
 # vert_diff
 import ..VerticalDiffusion
 import ..FriersonDiffusion
+import ..DecayWithHeightDiffusion
 
 # turbconv_model
 import ..PrognosticEDMFX

diff --git a/src/diagnostics/edmfx_diagnostics.jl b/src/diagnostics/edmfx_diagnostics.jl
@@ -1017,7 +1017,11 @@ function compute_edt!(
     state,
     cache,
     time,
-    vert_diff::Union{VerticalDiffusion, FriersonDiffusion},
+    vert_diff::Union{
+        VerticalDiffusion,
+        FriersonDiffusion,
+        DecayWithHeightDiffusion,
+    },
     turbconv_model::Nothing,
 )
     if isnothing(out)
@@ -1072,7 +1076,11 @@ function compute_evu!(
     state,
     cache,
     time,
-    vert_diff::Union{VerticalDiffusion, FriersonDiffusion},
+    vert_diff::Union{
+        VerticalDiffusion,
+        FriersonDiffusion,
+        DecayWithHeightDiffusion,
+    },
     turbconv_model::Nothing,
 )
     if isnothing(out)

diff --git a/src/parameters/Parameters.jl b/src/parameters/Parameters.jl
@@ -69,6 +69,7 @@ Base.@kwdef struct ClimaAtmosParameters{
     SFP,
     TCP,
     STP,
+    VDP,
 } <: ACAP
     thermodynamics_params::TP
     rrtmgp_params::RP
@@ -79,12 +80,12 @@ Base.@kwdef struct ClimaAtmosParameters{
     surface_fluxes_params::SFP
     turbconv_params::TCP
     surface_temp_params::STP
+    vert_diff_params::VDP
     Omega::FT
     f_plane_coriolis_frequency::FT
     planet_radius::FT
     astro_unit::FT
     c_smag::FT
-    C_E::FT
     C_H::FT
     # Held Suarez
     ΔT_y_dry::FT