Add r_eff overwirte based on ClimaParams

CliMA · Feb 11, 2025 · 4bc4711 · 4bc4711
1 parent 2d9b6e3
commit 4bc4711
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "CloudMicrophysics"
 uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
 authors = ["Climate Modeling Alliance"]
-version = "0.22.7"
+version = "0.22.8"
 
 [deps]
 ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
@@ -22,7 +22,7 @@ MLJ = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
 EmulatorModelsExt = ["DataFrames", "MLJ"]
 
 [compat]
-ClimaParams = "0.10"
+ClimaParams = "0.10.19"
 DataFrames = "1.6"
 DocStringExtensions = "0.8, 0.9"
 ForwardDiff = "0.10"

diff --git a/src/CloudDiagnostics.jl b/src/CloudDiagnostics.jl
@@ -210,10 +210,10 @@ end
 Returns a constant assumed effective radius for clouds
 """
 function effective_radius_const(cloud_params::CMP.CloudLiquid{FT}) where {FT}
-    return FT(14e-6) # TODO grab it from parameters
+    return cloud_params.r_eff
 end
 function effective_radius_const(cloud_params::CMP.CloudIce{FT}) where {FT}
-    return FT(25e-6)
+    return cloud_params.r_eff
 end
 
 end # end module
diff --git a/test/Project.toml b/test/Project.toml
@@ -32,6 +32,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
 [compat]
+ClimaParams = "0.10.19"
 KernelAbstractions = "0.9"
 MLJFlux = "0.4"
 Optim = "<1.9.3"