Merge pull request #3770 from CliMA/aj/more_ml

Update ML CDND function

Author: trontrytel

.buildkite/Manifest-v1.11.toml

@@ -395,9 +395,9 @@ version = "0.2.12"
 
 [[deps.ClimaParams]]
 deps = ["TOML"]
-git-tree-sha1 = "4af2dbc0f82c09dd5b514960c7be1c0bad260bfa"
+git-tree-sha1 = "98f8b50fcd3efe21e79c3b98a93457d994bb3cde"
 uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
-version = "0.10.26"
+version = "0.10.27"
 
 [[deps.ClimaReproducibilityTests]]
 deps = ["OrderedCollections", "PrettyTables"]

Project.toml

@@ -43,7 +43,7 @@ AtmosphericProfilesLibrary = "0.1.7"
 ClimaComms = "0.6.6"
 ClimaCore = "0.14.24"
 ClimaDiagnostics = "0.2.12"
-ClimaParams = "0.10.26"
+ClimaParams = "0.10.27"
 ClimaTimeSteppers = "0.8.2"
 ClimaUtilities = "0.1.22"
 CloudMicrophysics = "0.22.9"

src/parameterized_tendencies/microphysics/microphysics_wrappers.jl

@@ -48,15 +48,17 @@ function ml_N_cloud_liquid_droplets(cmc, c_dust, c_seasalt, c_SO4, q_liq)
     # We can also add w, T, RH, w' ...
     # Also consider lookind only at around cloud base height
     (; α_dust, α_seasalt, α_SO4, α_q_liq) = cmc.aml
-    (; c₀_dust, c₀_seasalt, c₀_SO4) = cmc.aml
+    (; c₀_dust, c₀_seasalt, c₀_SO4, q₀_liq) = cmc.aml
     N₀ = cmc.N_cloud_liquid_droplets
 
     FT = eltype(N₀)
-    return N₀ +
-           α_dust * log(max(c_dust, eps(FT)) / c₀_dust) +
-           α_seasalt * log(max(c_seasalt, eps(FT)) / c₀_seasalt) +
-           α_SO4 * log(max(c_SO4, eps(FT)) / c₀_SO4) +
-           α_q_liq * log(max(q_liq, eps(FT)))
+    return N₀ * (
+        FT(1) +
+        α_dust * log(max(c_dust, eps(FT)) / c₀_dust) +
+        α_seasalt * log(max(c_seasalt, eps(FT)) / c₀_seasalt) +
+        α_SO4 * log(max(c_SO4, eps(FT)) / c₀_SO4) +
+        α_q_liq * log(max(q_liq, eps(FT)) / q₀_liq)
+    )
 end
 
 """

src/parameters/create_parameters.jl

@@ -173,6 +173,7 @@ function aerosol_ml_parameters(toml_dict)
         :reference_dust_aerosol_mass_concentration => :c₀_dust,
         :reference_seasalt_aerosol_mass_concentration => :c₀_seasalt,
         :reference_ammonium_sulfate_mass_concentration => :c₀_SO4,
+        :reference_liquid_water_specific_humidity => :q₀_liq,
     )
     return CP.get_parameter_values(toml_dict, name_map, "ClimaAtmos")
 end