Merge pull request #641 from CliMA/aj/deps

trontrytel · web-flow · commit 1aa868ff122c · 2025-09-09T13:55:05.000-07:00
Update to ClimaParams v1
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.27.1"
+version = "0.27.2"
 
 [deps]
 ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
@@ -23,7 +23,7 @@ MLJ = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
 EmulatorModelsExt = ["DataFrames", "MLJ"]
 
 [compat]
-ClimaParams = "0.12"
+ClimaParams = "0.12, 1"
 DataFrames = "1.6"
 DocStringExtensions = "0.8, 0.9"
 ForwardDiff = "0.10, 1"
diff --git a/docs/src/API.md b/docs/src/API.md
@@ -98,7 +98,7 @@ P3Scheme
 ```@docs
 CMP.ParametersP3{Float64}
 CMP.ParametersP3(::Float64)
-CMP.ParametersP3(::Parameters.CP.AbstractTOMLDict)
+CMP.ParametersP3(::Parameters.CP.ParamDict)
 ```
 
 ### Sub-parameterizations
diff --git a/src/parameters/AerosolATD.jl b/src/parameters/AerosolATD.jl
@@ -31,7 +31,7 @@ end
 ArizonaTestDust(::Type{FT}) where {FT <: AbstractFloat} =
     ArizonaTestDust(CP.create_toml_dict(FT))
 
-function ArizonaTestDust(td::CP.AbstractTOMLDict)
+function ArizonaTestDust(td::CP.ParamDict)
     name_map = (;
         :Mohler2006_S0_warm_ArizonaTestDust => :S₀_warm,
         :Mohler2006_S0_cold_ArizonaTestDust => :S₀_cold,
diff --git a/src/parameters/AerosolActivation.jl b/src/parameters/AerosolActivation.jl
@@ -39,7 +39,7 @@ end
 AerosolActivationParameters(::Type{FT}) where {FT <: AbstractFloat} =
     AerosolActivationParameters(CP.create_toml_dict(FT))
 
-function AerosolActivationParameters(td::CP.AbstractTOMLDict)
+function AerosolActivationParameters(td::CP.ParamDict)
     name_map = (;
         :molar_mass_water => :M_w,
         :universal_gas_constant => :R,
diff --git a/src/parameters/AerosolAsianDust.jl b/src/parameters/AerosolAsianDust.jl
@@ -22,7 +22,7 @@ end
 AsianDust(::Type{FT}) where {FT <: AbstractFloat} =
     AsianDust(CP.create_toml_dict(FT))
 
-function AsianDust(td::CP.AbstractTOMLDict)
+function AsianDust(td::CP.ParamDict)
     name_map = (;
         :J_ABDINM_m_AsianDust => :deposition_m,
         :J_ABDINM_c_AsianDust => :deposition_c,
diff --git a/src/parameters/AerosolDesertDust.jl b/src/parameters/AerosolDesertDust.jl
@@ -28,7 +28,7 @@ end
 DesertDust(::Type{FT}) where {FT <: AbstractFloat} =
     DesertDust(CP.create_toml_dict(FT))
 
-function DesertDust(td::CP.AbstractTOMLDict)
+function DesertDust(td::CP.ParamDict)
     name_map = (;
         :Mohler2006_S0_warm_DesertDust => :S₀_warm,
         :Mohler2006_S0_cold_DesertDust => :S₀_cold,
diff --git a/src/parameters/AerosolDust.jl b/src/parameters/AerosolDust.jl
@@ -21,7 +21,7 @@ end
 
 Dust(::Type{FT}) where {FT <: AbstractFloat} = Dust(CP.create_toml_dict(FT))
 
-function Dust(td::CP.AbstractTOMLDict)
+function Dust(td::CP.ParamDict)
     name_map = (;
         :J_ABDINM_m_Dust => :deposition_m,
         :J_ABDINM_c_Dust => :deposition_c,
diff --git a/src/parameters/AerosolFeldspar.jl b/src/parameters/AerosolFeldspar.jl
@@ -19,7 +19,7 @@ end
 Feldspar(::Type{FT}) where {FT <: AbstractFloat} =
     Feldspar(CP.create_toml_dict(FT))
 
-function Feldspar(td::CP.AbstractTOMLDict)
+function Feldspar(td::CP.ParamDict)
     name_map = (;
         :Alpert2022_J_deposition_m_Feldspar => :deposition_m,
         :Alpert2022_J_deposition_c_Feldspar => :deposition_c,
diff --git a/src/parameters/AerosolFerrihydrite.jl b/src/parameters/AerosolFerrihydrite.jl
@@ -19,7 +19,7 @@ end
 Ferrihydrite(::Type{FT}) where {FT <: AbstractFloat} =
     Ferrihydrite(CP.create_toml_dict(FT))
 
-function Ferrihydrite(td::CP.AbstractTOMLDict)
+function Ferrihydrite(td::CP.ParamDict)
     name_map = (;
         :Alpert2022_J_deposition_m_Ferrihydrite => :deposition_m,
         :Alpert2022_J_deposition_c_Ferrihydrite => :deposition_c,
diff --git a/src/parameters/AerosolIllite.jl b/src/parameters/AerosolIllite.jl
@@ -22,7 +22,7 @@ end
 
 Illite(::Type{FT}) where {FT <: AbstractFloat} = Illite(CP.create_toml_dict(FT))
 
-function Illite(td::CP.AbstractTOMLDict)
+function Illite(td::CP.ParamDict)
     name_map = (;
         :J_ABDINM_m_Illite => :deposition_m,
         :J_ABDINM_c_Illite => :deposition_c,
diff --git a/src/parameters/AerosolKaolinite.jl b/src/parameters/AerosolKaolinite.jl
@@ -24,7 +24,7 @@ end
 Kaolinite(::Type{FT}) where {FT <: AbstractFloat} =
     Kaolinite(CP.create_toml_dict(FT))
 
-function Kaolinite(td::CP.AbstractTOMLDict)
+function Kaolinite(td::CP.ParamDict)
     name_map = (;
         :China2017_J_deposition_m_Kaolinite => :deposition_m,
         :China2017_J_deposition_c_Kaolinite => :deposition_c,
diff --git a/src/parameters/AerosolMiddleEasternDust.jl b/src/parameters/AerosolMiddleEasternDust.jl
@@ -18,7 +18,7 @@ end
 MiddleEasternDust(::Type{FT}) where {FT <: AbstractFloat} =
     MiddleEasternDust(CP.create_toml_dict(FT))
 
-function MiddleEasternDust(td::CP.AbstractTOMLDict)
+function MiddleEasternDust(td::CP.ParamDict)
     name_map = (;
         :J_ABIFM_m_MiddleEasternDust => :ABIFM_m,
         :J_ABIFM_c_MiddleEasternDust => :ABIFM_c,
diff --git a/src/parameters/AerosolModalNucleation.jl b/src/parameters/AerosolModalNucleation.jl
@@ -36,7 +36,7 @@ end
 H2S04NucleationParameters(::Type{FT}) where {FT <: AbstractFloat} =
     H2S04NucleationParameters(CP.create_toml_dict(FT))
 
-function H2S04NucleationParameters(td::CP.AbstractTOMLDict)
+function H2S04NucleationParameters(td::CP.ParamDict)
     name_map = (;
         :mam3_nucleation_p_b_n_neutral => :p_b_n,
         :mam3_nucleation_p_b_i_ion_induced => :p_b_i,
@@ -91,7 +91,7 @@ end
 OrganicNucleationParameters(::Type{FT}) where {FT <: AbstractFloat} =
     OrganicNucleationParameters(CP.create_toml_dict(FT))
 
-function OrganicNucleationParameters(td::CP.AbstractTOMLDict)
+function OrganicNucleationParameters(td::CP.ParamDict)
     name_map = (;
         :mam3_nucleation_a_1_neutral => :a_1,
         :mam3_nucleation_a_2_neutral => :a_2,
@@ -128,7 +128,7 @@ end
 MixedNucleationParameters(::Type{FT}) where {FT <: AbstractFloat} =
     MixedNucleationParameters(CP.create_toml_dict(FT))
 
-function MixedNucleationParameters(td::CP.AbstractTOMLDict)
+function MixedNucleationParameters(td::CP.ParamDict)
     name_map = (;
         :mam3_nucleation_k_H2SO4_mixed_organic_sulfuric_acid_factor =>
             :k_H2SO4org,
diff --git a/src/parameters/AerosolSaharanDust.jl b/src/parameters/AerosolSaharanDust.jl
@@ -18,7 +18,7 @@ end
 SaharanDust(::Type{FT}) where {FT <: AbstractFloat} =
     SaharanDust(CP.create_toml_dict(FT))
 
-function SaharanDust(td::CP.AbstractTOMLDict)
+function SaharanDust(td::CP.ParamDict)
     name_map = (;
         :J_ABDINM_m_SaharanDust => :deposition_m,
         :J_ABDINM_c_SaharanDust => :deposition_c,
diff --git a/src/parameters/AerosolSeasalt.jl b/src/parameters/AerosolSeasalt.jl
@@ -26,7 +26,7 @@ end
 Seasalt(::Type{FT}) where {FT <: AbstractFloat} =
     Seasalt(CP.create_toml_dict(FT))
 
-function Seasalt(td::CP.AbstractTOMLDict)
+function Seasalt(td::CP.ParamDict)
     name_map = (;
         :seasalt_aerosol_molar_mass => :M,
         :seasalt_aerosol_density => :ρ,
diff --git a/src/parameters/AerosolSulfate.jl b/src/parameters/AerosolSulfate.jl
@@ -26,7 +26,7 @@ end
 Sulfate(::Type{FT}) where {FT <: AbstractFloat} =
     Sulfate(CP.create_toml_dict(FT))
 
-function Sulfate(td::CP.AbstractTOMLDict)
+function Sulfate(td::CP.ParamDict)
     name_map = (;
         :sulfate_aerosol_molar_mass => :M,
         :sulfate_aerosol_density => :ρ,
diff --git a/src/parameters/Aerosol_H2SO4_Solution.jl b/src/parameters/Aerosol_H2SO4_Solution.jl
@@ -35,7 +35,7 @@ end
 H2SO4SolutionParameters(::Type{FT}) where {FT <: AbstractFloat} =
     H2SO4SolutionParameters(CP.create_toml_dict(FT))
 
-function H2SO4SolutionParameters(td::CP.AbstractTOMLDict)
+function H2SO4SolutionParameters(td::CP.ParamDict)
     name_map = (;
         :p_over_sulphuric_acid_solution_T_max => :T_max,
         :p_over_sulphuric_acid_solution_T_min => :T_min,
diff --git a/src/parameters/AirProperties.jl b/src/parameters/AirProperties.jl
@@ -20,7 +20,7 @@ end
 AirProperties(::Type{FT}) where {FT <: AbstractFloat} =
     AirProperties(CP.create_toml_dict(FT))
 
-function AirProperties(td::CP.AbstractTOMLDict)
+function AirProperties(td::CP.ParamDict)
     name_map = (;
         :thermal_conductivity_of_air => :K_therm,
         :diffusivity_of_water_vapor => :D_vapor,
diff --git a/src/parameters/IceNucleation.jl b/src/parameters/IceNucleation.jl
@@ -17,7 +17,7 @@ Base.@kwdef struct Mohler2006{FT} <: ParametersType{FT}
     T_thr::FT
 end
 
-function Mohler2006(td::CP.AbstractTOMLDict)
+function Mohler2006(td::CP.ParamDict)
     name_map = (;
         :Mohler2006_maximum_allowed_Si => :Sᵢ_max,
         :Mohler2006_threshold_T => :T_thr,
@@ -55,7 +55,7 @@ Base.@kwdef struct Koop2000{FT} <: ParametersType{FT}
     linear_c₂::FT
 end
 
-function Koop2000(td::CP.AbstractTOMLDict)
+function Koop2000(td::CP.ParamDict)
     name_map = (;
         :Koop2000_min_delta_aw => :Δa_w_min,
         :Koop2000_max_delta_aw => :Δa_w_max,
@@ -95,7 +95,7 @@ Base.@kwdef struct MorrisonMilbrandt2014{FT} <: ParametersType{FT}
     het_B::FT
 end
 
-function MorrisonMilbrandt2014(td::CP.AbstractTOMLDict)
+function MorrisonMilbrandt2014(td::CP.ParamDict)
     name_map = (;
         :temperature_homogenous_nucleation => :T_dep_thres,
         :Thompson2004_c1_Cooper => :c₁,
@@ -126,7 +126,7 @@ end
 IceNucleationParameters(::Type{FT}) where {FT <: AbstractFloat} =
     IceNucleationParameters(CP.create_toml_dict(FT))
 
-function IceNucleationParameters(toml_dict::CP.AbstractTOMLDict)
+function IceNucleationParameters(toml_dict::CP.ParamDict)
     deposition = Mohler2006(toml_dict)
     homogeneous = Koop2000(toml_dict)
     p3 = MorrisonMilbrandt2014(toml_dict)
@@ -163,7 +163,7 @@ end
 Frostenberg2023(::Type{FT}) where {FT <: AbstractFloat} =
     Frostenberg2023(CP.create_toml_dict(FT))
 
-function Frostenberg2023(td::CP.AbstractTOMLDict)
+function Frostenberg2023(td::CP.ParamDict)
     name_map = (;
         :Frostenberg2023_standard_deviation => :σ,
         :Frostenberg2023_a_coefficient => :a,
diff --git a/src/parameters/Microphysics0M.jl b/src/parameters/Microphysics0M.jl
@@ -20,7 +20,7 @@ end
 Parameters0M(::Type{FT}) where {FT <: AbstractFloat} =
     Parameters0M(CP.create_toml_dict(FT))
 
-function Parameters0M(td::CP.AbstractTOMLDict)
+function Parameters0M(td::CP.ParamDict)
     name_map = (;
         :precipitation_timescale => :τ_precip,
         :specific_humidity_precipitation_threshold => :qc_0,
diff --git a/src/parameters/Microphysics1M.jl b/src/parameters/Microphysics1M.jl
@@ -140,7 +140,7 @@ end
 CloudLiquid(::Type{FT}) where {FT <: AbstractFloat} =
     CloudLiquid(CP.create_toml_dict(FT))
 
-function CloudLiquid(toml_dict::CP.AbstractTOMLDict)
+function CloudLiquid(toml_dict::CP.ParamDict)
     name_map = (;
         :condensation_evaporation_timescale => :τ_relax,
         :density_liquid_water => :ρw,
@@ -180,7 +180,7 @@ end
 CloudIce(::Type{FT}) where {FT <: AbstractFloat} =
     CloudIce(CP.create_toml_dict(FT))
 
-function CloudIce(toml_dict::CP.AbstractTOMLDict = CP.create_toml_dict(FT))
+function CloudIce(toml_dict::CP.ParamDict = CP.create_toml_dict(FT))
     name_map = (;
         :cloud_ice_apparent_density => :ρᵢ,
         :cloud_ice_crystals_length_scale => :r0,
@@ -207,7 +207,7 @@ function CloudIce(toml_dict::CP.AbstractTOMLDict = CP.create_toml_dict(FT))
     )
 end
 
-function ParticleMass(::Type{CloudIce}, td::CP.AbstractTOMLDict)
+function ParticleMass(::Type{CloudIce}, td::CP.ParamDict)
     name_map = (;
         :cloud_ice_apparent_density => :ρᵢ,
         :cloud_ice_crystals_length_scale => :r0,
@@ -246,7 +246,7 @@ end
 
 Rain(::Type{FT}) where {FT <: AbstractFloat} = Rain(CP.create_toml_dict(FT))
 
-function Rain(toml_dict::CP.AbstractTOMLDict)
+function Rain(toml_dict::CP.ParamDict)
     name_map = (;
         :density_liquid_water => :ρ,
         :rain_drop_length_scale => :r0,
@@ -277,7 +277,7 @@ function Rain(toml_dict::CP.AbstractTOMLDict)
     return Rain{FT, P, M, A, V, AC}(pdf, mass, area, vent, acnv1M, p.r0)
 end
 
-function ParticleMass(::Type{Rain}, td::CP.AbstractTOMLDict)
+function ParticleMass(::Type{Rain}, td::CP.ParamDict)
     name_map = (;
         :density_liquid_water => :ρ,
         :rain_drop_length_scale => :r0,
@@ -291,7 +291,7 @@ function ParticleMass(::Type{Rain}, td::CP.AbstractTOMLDict)
     return ParticleMass{FT}(; p.r0, m0, p.me, p.Δm, p.χm)
 end
 
-function ParticleArea(::Type{Rain}, td::CP.AbstractTOMLDict)
+function ParticleArea(::Type{Rain}, td::CP.ParamDict)
     name_map = (;
         :rain_drop_length_scale => :r0,
         :rain_cross_section_size_relation_coefficient_ae => :ae,
@@ -335,7 +335,7 @@ end
 
 Snow(::Type{FT}) where {FT <: AbstractFloat} = Snow(CP.create_toml_dict(FT))
 
-function Snow(toml_dict::CP.AbstractTOMLDict)
+function Snow(toml_dict::CP.ParamDict)
     name_map = (;
         :cloud_ice_crystals_length_scale => :r0,
         :snow_apparent_density => :ρᵢ,
@@ -381,7 +381,7 @@ function Snow(toml_dict::CP.AbstractTOMLDict)
     )
 end
 
-function ParticleMass(::Type{Snow}, td::CP.AbstractTOMLDict)
+function ParticleMass(::Type{Snow}, td::CP.ParamDict)
     name_map = (;
         :snow_flake_length_scale => :r0,
         :snow_mass_size_relation_coefficient_me => :me,
@@ -394,7 +394,7 @@ function ParticleMass(::Type{Snow}, td::CP.AbstractTOMLDict)
     return ParticleMass{FT}(; p.r0, m0, p.me, p.Δm, p.χm)
 end
 
-function ParticleArea(::Type{Snow}, toml_dict::CP.AbstractTOMLDict)
+function ParticleArea(::Type{Snow}, toml_dict::CP.ParamDict)
     name_map = (;
         :snow_flake_length_scale => :r0,
         :snow_cross_section_size_relation_coefficient => :ae,
@@ -431,7 +431,7 @@ end
 CollisionEff(::Type{FT}) where {FT <: AbstractFloat} =
     CollisionEff(CP.create_toml_dict(FT))
 
-function CollisionEff(td::CP.AbstractTOMLDict)
+function CollisionEff(td::CP.ParamDict)
     name_map = (;
         :cloud_liquid_rain_collision_efficiency => :e_liq_rai,
         :cloud_liquid_snow_collision_efficiency => :e_liq_sno,
diff --git a/src/parameters/Microphysics2M.jl b/src/parameters/Microphysics2M.jl
diff --git a/src/parameters/MicrophysicsP3.jl b/src/parameters/MicrophysicsP3.jl
diff --git a/src/parameters/TerminalVelocity.jl b/src/parameters/TerminalVelocity.jl
diff --git a/src/parameters/WaterProperties.jl b/src/parameters/WaterProperties.jl
