Merge branch 'main' of https://github.com/CliMA/ClimaAtmos.jl into fix-ci-plot-align

Author: petebachant

.buildkite/PrecompileCI/src/PrecompileCI.jl

@@ -18,7 +18,7 @@ import ClimaParams
     bubble = true # false
     parsed_args =
         Dict{String, Any}("topography" => "NoWarp", "topo_smoothing" => false)
-    comms_ctx = ClimaComms.context()
+    comms_ctx = ClimaComms.context(ClimaComms.CPUSingleThreaded())
     deep = false
 
     # constants

.buildkite/pipeline.yml

@@ -934,6 +934,15 @@ steps:
         agents:
           slurm_mem: 20GB
 
+      - label: ":umbrella: Prognostic EDMFX Rico with 2-moment in a column"
+        command: >
+          julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
+          --config_file $CONFIG_PATH/prognostic_edmfx_rico_column_2M.yml
+          --job_id prognostic_edmfx_rico_column_2M
+        artifact_paths: "prognostic_edmfx_rico_column_2M/output_active/*"
+        agents:
+          slurm_mem: 20GB
+
       - label: ":umbrella: Prognostic EDMFX TRMM in a column"
         command: >
           julia --color=yes --project=.buildkite .buildkite/ci_driver.jl

config/model_configs/prognostic_edmfx_rico_column_2M.yml

@@ -0,0 +1,42 @@
+initial_condition: "Rico"
+subsidence: "Rico"
+ls_adv: "Rico"
+surface_setup: "Rico"
+turbconv: "prognostic_edmfx"
+implicit_diffusion: false
+implicit_sgs_advection: false
+approximate_linear_solve_iters: 2
+edmfx_upwinding: first_order
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+edmfx_nh_pressure: true
+edmfx_filter: true
+prognostic_tke: true
+moist: "nonequil"
+cloud_model: "quadrature_sgs"
+call_cloud_diagnostics_per_stage: true
+precip_model: "2M"
+config: "column"
+z_max: 4e3
+x_elem: 2
+y_elem: 2
+z_elem: 100
+z_stretch: false
+perturb_initstate: false
+dt: "10secs"
+t_end: "6hours"
+dt_save_state_to_disk: "10mins"
+toml: [toml/prognostic_edmfx_1M.toml]
+netcdf_interpolation_num_points: [8, 8, 100]
+prescribed_aerosols: ["SO4", "CB1", "OC1", "DST01", "SSLT01", "SSLT02", "SSLT03", "SSLT04", "SSLT05"]
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, cdnc, hussfc, evspsbl, pr]
+    period: 10mins
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, cdncup, husraup, hussnup, ncraup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, cdncen, husraen, hussnen, ncraen, tke]
+    period: 10mins
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 10mins
+  - short_name: [husra, hussn, ncra]
+    period: 10mins

post_processing/ci_plots.jl

@@ -1405,6 +1405,7 @@ EDMFBoxPlots = Union{
 
 EDMFBoxPlotsWithPrecip = Union{
     Val{:prognostic_edmfx_rico_column},
+    Val{:prognostic_edmfx_rico_column_2M},
     Val{:prognostic_edmfx_trmm_column},
     Val{:prognostic_edmfx_dycoms_rf02_column},
 }
@@ -1499,8 +1500,25 @@ function make_plots(
     simdirs = SimDir.(output_paths)
 
     if sim_type isa EDMFBoxPlotsWithPrecip
-        precip_names =
-            ("husra", "hussn", "husraup", "hussnup", "husraen", "hussnen")
+        if sim_type isa Val{:prognostic_edmfx_rico_column_2M}
+            precip_names = (
+                "husra",
+                "hussn",
+                "husraup",
+                "hussnup",
+                "husraen",
+                "hussnen",
+                "cdnc",
+                "ncra",
+                "cdncup",
+                "ncraup",
+                "cdncen",
+                "ncraen",
+            )
+        else
+            precip_names =
+                ("husra", "hussn", "husraup", "hussnup", "husraen", "hussnen")
+        end
     elseif sim_type isa DiagEDMFBoxPlotsWithPrecip
         precip_names = ("husra", "hussn", "husraup", "hussnup")
     else

src/cache/precipitation_precomputed_quantities.jl

@@ -414,7 +414,8 @@ function set_precipitation_cache!(
     ::Microphysics2Moment,
     ::PrognosticEDMFX,
 )
-    error("Not implemented yet")
+    # Nothing needs to be done on the grid mean. The Sources are computed
+    # in edmf sub-domains.
     return nothing
 end
 

src/cache/precomputed_quantities.jl

@@ -148,6 +148,21 @@ function precomputed_quantities(Y, atmos)
             ᶜSqᵢᵖ⁰ = similar(Y.c, FT),
             ᶜSqᵣᵖ⁰ = similar(Y.c, FT),
             ᶜSqₛᵖ⁰ = similar(Y.c, FT),
+        ) :
+        atmos.microphysics_model isa Microphysics2Moment ?
+        (;
+            ᶜSqₗᵖʲs = similar(Y.c, NTuple{n, FT}),
+            ᶜSqᵢᵖʲs = similar(Y.c, NTuple{n, FT}),
+            ᶜSqᵣᵖʲs = similar(Y.c, NTuple{n, FT}),
+            ᶜSqₛᵖʲs = similar(Y.c, NTuple{n, FT}),
+            ᶜSnₗᵖʲs = similar(Y.c, NTuple{n, FT}),
+            ᶜSnᵣᵖʲs = similar(Y.c, NTuple{n, FT}),
+            ᶜSqₗᵖ⁰ = similar(Y.c, FT),
+            ᶜSqᵢᵖ⁰ = similar(Y.c, FT),
+            ᶜSqᵣᵖ⁰ = similar(Y.c, FT),
+            ᶜSqₛᵖ⁰ = similar(Y.c, FT),
+            ᶜSnₗᵖ⁰ = similar(Y.c, FT),
+            ᶜSnᵣᵖ⁰ = similar(Y.c, FT),
         ) : (;)
     advective_sgs_quantities =
         atmos.turbconv_model isa PrognosticEDMFX ?