Merge pull request #3880 from CliMA/aj/delete_PP_from_micro

Update 2M scheme to working fluid (CM v0.25)

Author: trontrytel

.buildkite/Manifest-v1.11.toml

@@ -452,9 +452,9 @@ version = "0.1.13"
 
 [[deps.CloudMicrophysics]]
 deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "LazyArtifacts", "LogExpFunctions", "QuadGK", "RootSolvers", "SpecialFunctions", "Thermodynamics"]
-git-tree-sha1 = "7bc112bf39c90925ca3856ac0fcb4c68d45c952f"
+git-tree-sha1 = "cfc9decc96d616ab3b8d911f843eeb2aafd7d2ad"
 uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
-version = "0.24.2"
+version = "0.25.0"
 
     [deps.CloudMicrophysics.extensions]
     EmulatorModelsExt = ["DataFrames", "MLJ"]
@@ -527,9 +527,9 @@ version = "1.0.0"
 
 [[deps.Compat]]
 deps = ["TOML", "UUIDs"]
-git-tree-sha1 = "8ae8d32e09f0dcf42a36b90d4e17f5dd2e4c4215"
+git-tree-sha1 = "3a3dfb30697e96a440e4149c8c51bf32f818c0f3"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "4.16.0"
+version = "4.17.0"
 weakdeps = ["Dates", "LinearAlgebra"]
 
     [deps.Compat.extensions]
@@ -946,9 +946,9 @@ version = "0.2.0"
 
 [[deps.GPUCompiler]]
 deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "PrecompileTools", "Preferences", "Scratch", "Serialization", "TOML", "Tracy", "UUIDs"]
-git-tree-sha1 = "bbb7004345fb6141989835fc9f2f9e93bba3c806"
+git-tree-sha1 = "71a747c7c0137222dceb799b5643440e8eb6bfce"
 uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
-version = "1.5.3"
+version = "1.6.0"
 
 [[deps.GPUToolbox]]
 git-tree-sha1 = "15d8b0f5a6dca9bf8c02eeaf6687660dafa638d0"
@@ -1302,9 +1302,9 @@ version = "0.4.10"
 
 [[deps.KernelAbstractions]]
 deps = ["Adapt", "Atomix", "InteractiveUtils", "MacroTools", "PrecompileTools", "Requires", "StaticArrays", "UUIDs"]
-git-tree-sha1 = "602c0e9efadafb8abfe8281c3fbf9cf6f406fc03"
+git-tree-sha1 = "4efa9cec6f308e0f492ea635421638bff81cf6f8"
 uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
-version = "0.9.35"
+version = "0.9.36"
 weakdeps = ["EnzymeCore", "LinearAlgebra", "SparseArrays"]
 
     [deps.KernelAbstractions.extensions]
@@ -2546,9 +2546,9 @@ weakdeps = ["FlameGraphs"]
 
 [[deps.Tracy]]
 deps = ["ExprTools", "LibTracyClient_jll", "Libdl"]
-git-tree-sha1 = "16439d004690d4086da35528f0c6b4d7006d6dae"
+git-tree-sha1 = "91dbaee0f50faa4357f7e9fc69442c7b6364dfe5"
 uuid = "e689c965-62c8-4b79-b2c5-8359227902fd"
-version = "0.1.4"
+version = "0.1.5"
 
     [deps.Tracy.extensions]
     TracyProfilerExt = "TracyProfiler_jll"

Project.toml

@@ -47,7 +47,7 @@ ClimaDiagnostics = "0.2.12"
 ClimaParams = "0.10.35"
 ClimaTimeSteppers = "0.8.2"
 ClimaUtilities = "0.1.22"
-CloudMicrophysics = "0.24.2"
+CloudMicrophysics = "0.25.0"
 Dates = "1"
 ForwardDiff = "0.10.38, 1"
 Insolation = "0.9.2"

src/cache/precipitation_precomputed_quantities.jl

@@ -357,8 +357,6 @@ function set_precipitation_cache!(Y, p, ::Microphysics2Moment, _)
     (; ᶜSqₗᵖ, ᶜSqᵢᵖ, ᶜSqᵣᵖ, ᶜSqₛᵖ) = p.precomputed
     (; ᶜSnₗᵖ, ᶜSnᵣᵖ) = p.precomputed
 
-    (; q_liq, q_rai, n_liq, n_rai) = p.precomputed.ᶜspecific
-
     ᶜSᵖ = p.scratch.ᶜtemp_scalar
     ᶜS₂ᵖ = p.scratch.ᶜtemp_scalar_2
 
@@ -376,10 +374,13 @@ function set_precipitation_cache!(Y, p, ::Microphysics2Moment, _)
         ᶜSqₗᵖ,
         ᶜSqᵣᵖ,
         Y.c.ρ,
-        n_liq,
-        n_rai,
-        q_liq,
-        q_rai,
+        lazy.(specific.(Y.c.ρn_liq, Y.c.ρ)),
+        lazy.(specific.(Y.c.ρn_rai, Y.c.ρ)),
+        lazy.(specific.(Y.c.ρq_tot, Y.c.ρ)),
+        lazy.(specific.(Y.c.ρq_liq, Y.c.ρ)),
+        lazy.(specific.(Y.c.ρq_ice, Y.c.ρ)),
+        lazy.(specific.(Y.c.ρq_rai, Y.c.ρ)),
+        lazy.(specific.(Y.c.ρq_sno, Y.c.ρ)),
         ᶜts,
         dt,
         cmp,

src/parameterized_tendencies/microphysics/microphysics_wrappers.jl

@@ -417,13 +417,13 @@ function aerosol_activation_sources(
 end
 
 """
-    compute_warm_precipitation_sources_2M!(Sᵖ, S₂ᵖ, Snₗᵖ, Snᵣᵖ, Sqₗᵖ, Sqᵣᵖ, ρ, nₗ, nᵣ, qₗ, qᵣ, ts, dt, sb, thp)
+    compute_warm_precipitation_sources_2M!(Sᵖ, S₂ᵖ, Snₗᵖ, Snᵣᵖ, Sqₗᵖ, Sqᵣᵖ, ρ, nₗ, nᵣ, qₜ, qₗ, qᵢ, qᵣ, qₛ, ts, dt, sb, thp)
 
  - Sᵖ, S₂ᵖ - temporary containters to help compute precipitation source terms
  - Snₗᵖ, Snᵣᵖ, Sqₗᵖ, Sqᵣᵖ - cached storage for precipitation source terms
  - ρ - air density
  - nₗ, nᵣ - cloud liquid and rain number concentration per mass [1 / kg of moist air]
- - qₗ, qᵣ - cloud liquid and rain specific humidity
+ - qₜ, qₗ, qᵢ, qᵣ, qₛ - total water, cloud liquid, cloud ice, rain and snow specific humidity
  - ts - thermodynamic state (see td package for details)
  - dt - model time step
  - thp, mp - structs with thermodynamic and microphysics parameters
@@ -441,8 +441,11 @@ function compute_warm_precipitation_sources_2M!(
     ρ,
     nₗ,
     nᵣ,
+    qₜ,
     qₗ,
+    qᵢ,
     qᵣ,
+    qₛ,
     ts,
     dt,
     mp,
@@ -531,8 +534,11 @@ function compute_warm_precipitation_sources_2M!(
                 mp.sb,
                 mp.aps,
                 thp,
-                PP(thp, ts),
+                qₜ,
+                qₗ,
+                qᵢ,
                 qᵣ,
+                qₛ,
                 ρ,
                 ρ * nᵣ,
                 Tₐ(thp, ts),
@@ -548,8 +554,11 @@ function compute_warm_precipitation_sources_2M!(
                 mp.sb,
                 mp.aps,
                 thp,
-                PP(thp, ts),
+                qₜ,
+                qₗ,
+                qᵢ,
                 qᵣ,
+                qₛ,
                 ρ,
                 ρ * nᵣ,
                 Tₐ(thp, ts),
@@ -560,7 +569,7 @@ function compute_warm_precipitation_sources_2M!(
 
     # cloud liquid number adjustment for mass limits
     # TODO: Once CCN number becomes a prognostic variable, these number adjustment tendencies
-    #       should be linked to it. Any increase in droplet number (source here) would imply 
+    #       should be linked to it. Any increase in droplet number (source here) would imply
     #       a corresponding sink in CCN, and vice versa.
     @. Sᵖ = CM2.number_increase_for_mass_limit(
         mp.sb.numadj,