Add EDOnlyEDMFX

Author: Sbozzolo

.buildkite/pipeline.yml

@@ -533,6 +533,30 @@ steps:
         agents:
           slurm_mem: 20GB
 
+  - group: "EDOnlyEDMFX"
+    steps:
+
+      - label: ":man_in_business_suit_levitating: EDOnlyEDMFX test on a sphere"
+        command: >
+          julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
+          --config_file $CONFIG_PATH/edonly_edmfx_aquaplanet.yml
+          --job_id edonly_edmfx_aquaplanet
+        artifact_paths: "edonly_edmfx_aquaplanet/output_active/*"
+        agents:
+          slurm_mem: 20GB
+
+      - label: ":man_in_business_suit_levitating: EDOnlyEDMFX test on a sphere GPU"
+        command: >
+          julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
+          --config_file $CONFIG_PATH/edonly_edmfx_aquaplanet.yml
+          --job_id edonly_edmfx_aquaplanet_gpu
+        artifact_paths: "edonly_edmfx_aquaplanet_gpu/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_mem: 20GB
+          slurm_gpus: 1
+
   - group: "Diagnostic EDMFX"
     steps:
 

NEWS.md

@@ -5,6 +5,13 @@ Main
 -------
 ### Features
 
+### Add EDOnlyEDMFX
+
+PR [3622](https://github.com/CliMA/ClimaAtmos.jl/pull/3622) adds a new
+simplified EDMF model that only implements the Eddy-Diffusivity part of the
+scheme (not the Mass-Flux).
+
+
 ### Update default configuration to use deep-atmosphere eqns, fix diagnostic bug
 PR [3422](https://github.com/CliMA/ClimaAtmos.jl/pull/3422)
 Updates the `default_config` to set `deep_atmosphere=true`, and updates the 

config/model_configs/edonly_edmfx_aquaplanet.yml

@@ -0,0 +1,13 @@
+surface_setup: DefaultMoninObukhov
+rad: allskywithclear
+co2_model: fixed
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+edmfx_sgs_diffusive_flux: true
+turbconv: edonly_edmfx
+moist: equil
+precip_model: 0M
+dt: 120secs
+t_end: 3hours
+dt_save_state_to_disk: 600secs
+use_itime: true

post_processing/ci_plots.jl

@@ -950,6 +950,7 @@ function make_plots(
 end
 
 AquaplanetPlots = Union{
+    Val{:edonly_edmfx_aquaplanet},
     Val{:mpi_sphere_aquaplanet_rhoe_equilmoist_clearsky},
     Val{:sphere_aquaplanet_rhoe_nonequilmoist_allsky},
     Val{:rcemipii_sphere_diagnostic_edmfx},

src/cache/cloud_fraction.jl

@@ -131,15 +131,14 @@ NVTX.@annotate function set_cloud_fraction!(
     p,
     ::Union{EquilMoistModel, NonEquilMoistModel},
     qc::SGSQuadratureCloud,
-    ::DiagnosticEDMFX,
+    ::Union{EDOnlyEDMFX, DiagnosticEDMFX},
 )
     SG_quad = qc.SG_quad
     (; params) = p
 
     FT = eltype(params)
     thermo_params = CAP.thermodynamics_params(params)
     (; ᶜts, ᶜmixing_length, cloud_diagnostics_tuple) = p.precomputed
-    (; ᶜρaʲs, ᶜρʲs, ᶜtsʲs) = p.precomputed
     (; turbconv_model) = p.atmos
 
     # TODO - we should make this default when using diagnostic edmf
@@ -158,6 +157,9 @@ NVTX.@annotate function set_cloud_fraction!(
 
     # updrafts
     n = n_mass_flux_subdomains(turbconv_model)
+    if n > 0
+        (; ᶜρaʲs, ᶜρʲs, ᶜtsʲs) = p.precomputed
+    end
 
     for j in 1:n
         @. cloud_diagnostics_tuple += NamedTuple{(:cf, :q_liq, :q_ice)}(
@@ -296,8 +298,8 @@ function quad_loop(
         θ_hat = μ_c + sqrt(FT(2)) * σ_c * χ2
         q_hat = q_mean + sqrt(FT(2)) * σ_q * χ1
         # The σ_q_lim limits q_tot_hat to be close to zero
-        # for the negative sampling points. However due to numerical erros
-        # we sometimes still get small negative numers here
+        # for the negative sampling points. However due to numerical errors
+        # we sometimes still get small negative numbers here
         return (θ_hat, max(FT(0), q_hat))
     end
 
@@ -315,7 +317,6 @@ function quad_loop(
 
         return (; cf, q_liq, q_ice)
     end
-
     return quad(f, get_x_hat, SG_quad)
 end
 

src/cache/diagnostic_edmf_precomputed_quantities.jl

@@ -914,8 +914,7 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_env_closures!
     (; ᶜp, ᶜu, ᶜts) = p.precomputed
     (; q_tot) = p.precomputed.ᶜspecific
     (; ustar, obukhov_length) = p.precomputed.sfc_conditions
-    (; ᶜρaʲs, ᶠu³ʲs, ᶜdetrʲs) = p.precomputed
-    (; ᶜtke⁰, ᶠu³⁰, ᶜu⁰) = p.precomputed
+    (; ᶜtke⁰) = p.precomputed
     (;
         ᶜlinear_buoygrad,
         ᶜstrain_rate_norm,
@@ -926,7 +925,13 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_env_closures!
     thermo_params = CAP.thermodynamics_params(params)
     ᶜlg = Fields.local_geometry_field(Y.c)
 
-    @. ᶜu⁰ = C123(Y.c.uₕ) + ᶜinterp(C123(ᶠu³⁰))
+    if p.atmos.turbconv_model isa DiagnosticEDMFX
+        (; ᶜρaʲs, ᶠu³ʲs, ᶜdetrʲs, ᶠu³⁰, ᶜu⁰) = p.precomputed
+    elseif p.atmos.turbconv_model isa EDOnlyEDMFX
+        ᶠu³⁰ = p.precomputed.ᶠu³
+        ᶜu⁰ = ᶜu
+    end
+    @. ᶜu⁰ = C123(Y.c.uₕ) + ᶜinterp(C123(ᶠu³⁰))  # Set here, but used in a different function
 
     @. ᶜlinear_buoygrad = buoyancy_gradients(
         BuoyGradMean(),

src/cache/precomputed_quantities.jl

@@ -113,6 +113,17 @@ function precomputed_quantities(Y, atmos)
             ᶜgradᵥ_θ_liq_ice⁰ = Fields.Field(C3{FT}, cspace),
             precipitation_sgs_quantities...,
         ) : (;)
+
+    edonly_quantities =
+        atmos.turbconv_model isa EDOnlyEDMFX ?
+        (;
+            ᶜmixing_length_tuple = similar(Y.c, MixingLength{FT}),
+            ᶜtke⁰ = similar(Y.c, FT),
+            ᶜK_u = similar(Y.c, FT),
+            ρatke_flux = similar(Fields.level(Y.f, half), C3{FT}),
+            ᶜK_h = similar(Y.c, FT),
+        ) : (;)
+
     sgs_quantities = (;
         ᶜgradᵥ_θ_virt = Fields.Field(C3{FT}, cspace),
         ᶜgradᵥ_q_tot = Fields.Field(C3{FT}, cspace),
@@ -172,6 +183,7 @@ function precomputed_quantities(Y, atmos)
         gs_quantities...,
         sgs_quantities...,
         advective_sgs_quantities...,
+        edonly_quantities...,
         diagnostic_sgs_quantities...,
         vert_diff_quantities...,
         sedimentation_quantities...,
@@ -519,6 +531,10 @@ NVTX.@annotate function set_precomputed_quantities!(Y, p, t)
         )
     end
 
+    if turbconv_model isa EDOnlyEDMFX
+        set_diagnostic_edmf_precomputed_quantities_env_closures!(Y, p, t)
+    end
+
     if vert_diff isa DecayWithHeightDiffusion
         (; ᶜK_h) = p.precomputed
         bc_K_h = compute_eddy_diffusivity_coefficient(ᶜρ, vert_diff)

src/diagnostics/Diagnostics.jl

@@ -37,6 +37,7 @@ import ..VerticalDiffusion
 import ..DecayWithHeightDiffusion
 
 # turbconv_model
+import ..EDOnlyEDMFX
 import ..PrognosticEDMFX
 import ..DiagnosticEDMFX
 

src/diagnostics/default_diagnostics.jl

@@ -378,3 +378,13 @@ function default_diagnostics(
         )...,
     ]
 end
+
+function default_diagnostics(::EDOnlyEDMFX, duration, start_date; output_writer)
+    edonly_edmfx_diagnostics = ["tke"]
+
+    average_func = frequency_averages(duration)
+
+    return [
+        average_func(edonly_edmfx_diagnostics...; output_writer, start_date)...,
+    ]
+end

src/diagnostics/edmfx_diagnostics.jl

@@ -893,7 +893,7 @@ function compute_tke!(
     state,
     cache,
     time,
-    turbconv_model::Union{PrognosticEDMFX, DiagnosticEDMFX},
+    turbconv_model::Union{EDOnlyEDMFX, PrognosticEDMFX, DiagnosticEDMFX},
 )
     if isnothing(out)
         return copy(cache.precomputed.ᶜtke⁰)