Merge pull request #3862 from CliMA/oa/update_CM

Update CloudMicrophysics.jl to version 24.0

Author: oalcabes

.buildkite/Manifest-v1.11.toml

@@ -410,9 +410,9 @@ version = "0.2.15"
 
 [[deps.ClimaParams]]
 deps = ["TOML"]
-git-tree-sha1 = "f82183583b42d08bccad3f1f466e014b04189a2d"
+git-tree-sha1 = "46397777b5eb84842e90ece991603d4372eddc53"
 uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
-version = "0.10.31"
+version = "0.10.32"
 
 [[deps.ClimaReproducibilityTests]]
 deps = ["OrderedCollections", "PrettyTables"]
@@ -451,10 +451,10 @@ uuid = "fb6a15b2-703c-40df-9091-08a04967cfa9"
 version = "0.1.13"
 
 [[deps.CloudMicrophysics]]
-deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "HCubature", "LazyArtifacts", "LogExpFunctions", "QuadGK", "RootSolvers", "SpecialFunctions", "Thermodynamics"]
-git-tree-sha1 = "a1570cd66f2d389ac02b2451ce2082a4a8e8c0fe"
+deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "LazyArtifacts", "LogExpFunctions", "QuadGK", "RootSolvers", "SpecialFunctions", "Thermodynamics"]
+git-tree-sha1 = "55810bafe2bc9e0fb9e2a5301ad5009939046690"
 uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
-version = "0.23.0"
+version = "0.24.1"
 
     [deps.CloudMicrophysics.extensions]
     EmulatorModelsExt = ["DataFrames", "MLJ"]

Project.toml

@@ -47,7 +47,7 @@ ClimaDiagnostics = "0.2.12"
 ClimaParams = "0.10.31"
 ClimaTimeSteppers = "0.8.2"
 ClimaUtilities = "0.1.22"
-CloudMicrophysics = "0.23.0"
+CloudMicrophysics = "0.24.0"
 Dates = "1"
 ForwardDiff = ">= 0.10"
 Insolation = "0.9.2"

src/cache/prognostic_edmf_precomputed_quantities.jl

@@ -655,12 +655,14 @@ NVTX.@annotate function set_prognostic_edmf_precomputed_quantities_precipitation
             thp,
             ᶜtsʲs.:($$j),
             Y.c.sgsʲs.:($$j).q_rai,
+            Y.c.sgsʲs.:($$j).q_sno,
             dt,
         )
         @. ᶜSqᵢᵖʲs.:($$j) += cloud_sources(
             cmc.ice,
             thp,
             ᶜtsʲs.:($$j),
+            Y.c.sgsʲs.:($$j).q_rai,
             Y.c.sgsʲs.:($$j).q_sno,
             dt,
         )
@@ -701,7 +703,7 @@ NVTX.@annotate function set_prognostic_edmf_precomputed_quantities_precipitation
         thp,
     )
     # Cloud formation from the environment
-    @. ᶜSqₗᵖ⁰ += cloud_sources(cmc.liquid, thp, ᶜts⁰, ᶜq_rai⁰, dt)
-    @. ᶜSqᵢᵖ⁰ += cloud_sources(cmc.ice, thp, ᶜts⁰, ᶜq_sno⁰, dt)
+    @. ᶜSqₗᵖ⁰ += cloud_sources(cmc.liquid, thp, ᶜts⁰, ᶜq_rai⁰, ᶜq_sno⁰, dt)
+    @. ᶜSqᵢᵖ⁰ += cloud_sources(cmc.ice, thp, ᶜts⁰, ᶜq_rai⁰, ᶜq_sno⁰, dt)
     return nothing
 end

src/parameterized_tendencies/microphysics/cloud_condensate.jl

@@ -34,11 +34,23 @@ function cloud_condensate_tendency!(
     cmc = CAP.microphysics_cloud_params(params)
 
     @. Yₜ.c.ρq_liq +=
-        Y.c.ρ *
-        cloud_sources(cmc.liquid, thp, ᶜts, specific(Y.c.ρq_rai, Y.c.ρ), dt)
+        Y.c.ρ * cloud_sources(
+            cmc.liquid,
+            thp,
+            ᶜts,
+            specific(Y.c.ρq_rai, Y.c.ρ),
+            specific(Y.c.ρq_sno, Y.c.ρ),
+            dt,
+        )
     @. Yₜ.c.ρq_ice +=
-        Y.c.ρ *
-        cloud_sources(cmc.ice, thp, ᶜts, specific(Y.c.ρq_sno, Y.c.ρ), dt)
+        Y.c.ρ * cloud_sources(
+            cmc.ice,
+            thp,
+            ᶜts,
+            specific(Y.c.ρq_rai, Y.c.ρ),
+            specific(Y.c.ρq_sno, Y.c.ρ),
+            dt,
+        )
 end
 
 function cloud_condensate_tendency!(
@@ -55,18 +67,31 @@ function cloud_condensate_tendency!(
     cmc = CAP.microphysics_cloud_params(params)
 
     @. Yₜ.c.ρq_liq +=
-        Y.c.ρ *
-        cloud_sources(cmc.liquid, thp, ᶜts, specific(Y.c.ρq_rai, Y.c.ρ), dt)
+        Y.c.ρ * cloud_sources(
+            cmc.liquid,
+            thp,
+            ᶜts,
+            specific(Y.c.ρq_rai, Y.c.ρ),
+            specific(Y.c.ρq_sno, Y.c.ρ),
+            dt,
+        )
     @. Yₜ.c.ρq_ice +=
-        Y.c.ρ *
-        cloud_sources(cmc.ice, thp, ᶜts, specific(Y.c.ρq_sno, Y.c.ρ), dt)
+        Y.c.ρ * cloud_sources(
+            cmc.ice,
+            thp,
+            ᶜts,
+            specific(Y.c.ρq_rai, Y.c.ρ),
+            specific(Y.c.ρq_sno, Y.c.ρ),
+            dt,
+        )
 
     @. Yₜ.c.ρn_liq +=
         Y.c.ρ * aerosol_activation_sources(
             cmc.liquid,
             thp,
             ᶜts,
             specific(Y.c.ρq_rai, Y.c.ρ),
+            specific(Y.c.ρq_sno, Y.c.ρ),
             specific(Y.c.ρn_liq, Y.c.ρ),
             cmc.N_cloud_liquid_droplets,
             dt,

src/parameterized_tendencies/microphysics/microphysics_wrappers.jl

@@ -69,7 +69,8 @@ end
  - cm_params - CloudMicrophysics parameters struct for cloud water or ice condensate
  - thp - Thermodynamics parameters struct
  - ts - thermodynamics state
- - qᵣ or qₛ - rain or snow specific humidity
+ - qᵣ - rain specific humidity
+ - qₛ - snow specific humidity
  - dt - model time step
 
 Returns the condensation/evaporation or deposition/sublimation rate for
@@ -80,26 +81,50 @@ function cloud_sources(
     thp,
     ts,
     qᵣ,
+    qₛ,
     dt,
 ) where {FT}
 
     q = TD.PhasePartition(thp, ts)
     ρ = TD.air_density(thp, ts)
 
-    S = CMNe.conv_q_vap_to_q_liq_ice_MM2015(cm_params, thp, q, ρ, Tₐ(thp, ts))
+    S = CMNe.conv_q_vap_to_q_liq_ice_MM2015(
+        cm_params,
+        thp,
+        q,
+        qᵣ,
+        qₛ,
+        ρ,
+        Tₐ(thp, ts),
+    )
 
     return ifelse(
         S > FT(0),
         triangle_inequality_limiter(S, limit(qᵥ(thp, ts), dt, 2)),
         -triangle_inequality_limiter(abs(S), limit(qₗ(thp, ts, qₚ(qᵣ)), dt, 2)),
     )
 end
-function cloud_sources(cm_params::CMP.CloudIce{FT}, thp, ts, qₛ, dt) where {FT}
+function cloud_sources(
+    cm_params::CMP.CloudIce{FT},
+    thp,
+    ts,
+    qᵣ,
+    qₛ,
+    dt,
+) where {FT}
 
     q = TD.PhasePartition(thp, ts)
     ρ = TD.air_density(thp, ts)
 
-    S = CMNe.conv_q_vap_to_q_liq_ice_MM2015(cm_params, thp, q, ρ, Tₐ(thp, ts))
+    S = CMNe.conv_q_vap_to_q_liq_ice_MM2015(
+        cm_params,
+        thp,
+        q,
+        qᵣ,
+        qₛ,
+        ρ,
+        Tₐ(thp, ts),
+    )
 
     return ifelse(
         S > FT(0),
@@ -342,7 +367,8 @@ end
  - cm_params - CloudMicrophysics parameters struct for cloud water or ice condensate
  - thp - Thermodynamics parameters struct
  - ts - thermodynamics state
- - qₚ - precipitation (rain or snow) specific humidity
+ - qᵣ - rain specific humidity
+ - qₛ - snow specific humidity
  - n_dp - number concentration droplets (liquid or ice) per mass
  _ n_dp_prescribed - prescribed number concentration of droplets (liquid or ice) per mass
  - dt - model time step
@@ -354,14 +380,15 @@ function aerosol_activation_sources(
     cm_params::CMP.CloudLiquid{FT},
     thp,
     ts,
-    qₚ,
+    qᵣ,
+    qₛ,
     n_dp,
     n_dp_prescribed,
     dt,
 ) where {FT}
     r_dp = FT(2e-6) # 2 μm
     m_dp = 4 / 3 * FT(π) * r_dp^3 * cm_params.ρw
-    Sn = cloud_sources(cm_params, thp, ts, qₚ, dt) / m_dp
+    Sn = cloud_sources(cm_params, thp, ts, qᵣ, qₛ, dt) / m_dp
 
     return ifelse(
         Sn > FT(0),