diff --git a/src/parameters/IceNucleation.jl b/src/parameters/IceNucleation.jl index 3de6c85001..9f313738ff 100644 --- a/src/parameters/IceNucleation.jl +++ b/src/parameters/IceNucleation.jl @@ -16,9 +16,6 @@ Base.@kwdef struct Mohler2006{FT} <: ParametersType{FT} T_thr::FT end -Mohler2006(::Type{FT}) where {FT <: AbstractFloat} = - Mohler2006(CP.create_toml_dict(FT)) - function Mohler2006(td::CP.AbstractTOMLDict) name_map = (; :Mohler2006_maximum_allowed_Si => :Sᵢ_max, @@ -53,9 +50,6 @@ Base.@kwdef struct Koop2000{FT} <: ParametersType{FT} c₄::FT end -Koop2000(::Type{FT}) where {FT <: AbstractFloat} = - Koop2000(CP.create_toml_dict(FT)) - function Koop2000(td::CP.AbstractTOMLDict) name_map = (; :Koop2000_min_delta_aw => :Δa_w_min, diff --git a/src/parameters/Microphysics2M.jl b/src/parameters/Microphysics2M.jl index 499fa7c372..a74d45b8fa 100644 --- a/src/parameters/Microphysics2M.jl +++ b/src/parameters/Microphysics2M.jl @@ -19,9 +19,6 @@ Base.@kwdef struct AcnvKK2000{FT} <: ParametersType{FT} c::FT end -AcnvKK2000(::Type{FT}) where {FT <: AbstractFloat} = - AcnvKK2000(CP.create_toml_dict(FT)) - function AcnvKK2000(td::CP.AbstractTOMLDict) name_map = (; :KK2000_auctoconversion_coeff_A => :A, @@ -51,9 +48,6 @@ Base.@kwdef struct AccrKK2000{FT} <: ParametersType{FT} b::FT end -AccrKK2000(::Type{FT}) where {FT <: AbstractFloat} = - AccrKK2000(CP.create_toml_dict(FT)) - function AccrKK2000(td::CP.AbstractTOMLDict) name_map = (; :KK2000_accretion_coeff_A => :A, @@ -119,9 +113,6 @@ Base.@kwdef struct AcnvB1994{FT} <: ParametersType{FT} k::FT end -AcnvB1994(::Type{FT}) where {FT <: AbstractFloat} = - AcnvB1994(CP.create_toml_dict(FT)) - function AcnvB1994(td::CP.AbstractTOMLDict) name_map = (; :B1994_auctoconversion_coeff_C => :C, @@ -151,9 +142,6 @@ struct AccrB1994{FT} <: ParametersType{FT} A::FT end -AccrB1994(::Type{FT}) where {FT <: AbstractFloat} = - AccrB1994(CP.create_toml_dict(FT)) - function AccrB1994(toml_dict::CP.AbstractTOMLDict) (; B1994_accretion_coeff_A) = CP.get_parameter_values( toml_dict, @@ -214,9 +202,6 @@ Base.@kwdef struct AcnvTC1980{FT} <: ParametersType{FT} k::FT end -AcnvTC1980(::Type{FT}) where {FT <: AbstractFloat} = - AcnvTC1980(CP.create_toml_dict(FT)) - function AcnvTC1980(td::CP.AbstractTOMLDict) name_map = (; :TC1980_autoconversion_coeff_a => :a, @@ -247,9 +232,6 @@ struct AccrTC1980{FT} <: ParametersType{FT} A::FT end -AccrTC1980(::Type{FT}) where {FT <: AbstractFloat} = - AccrTC1980(CP.create_toml_dict(FT)) - function AccrTC1980(toml_dict::CP.AbstractTOMLDict) (; TC1980_accretion_coeff_A) = CP.get_parameter_values( toml_dict, @@ -379,9 +361,6 @@ Base.@kwdef struct ParticlePDF_SB2006{FT} <: ParametersType{FT} ρ0::FT end -ParticlePDF_SB2006(::Type{FT}) where {FT <: AbstractFloat} = - ParticlePDF_SB2006(CP.create_toml_dict(FT)) - function ParticlePDF_SB2006(td::CP.AbstractTOMLDict) name_map = (; :SB2006_raindrops_min_mass => :xr_min, @@ -423,9 +402,6 @@ Base.@kwdef struct AcnvSB2006{FT} <: ParametersType{FT} b::FT end -AcnvSB2006(::Type{FT}) where {FT <: AbstractFloat} = - AcnvSB2006(CP.create_toml_dict(FT)) - function AcnvSB2006(td::CP.AbstractTOMLDict) name_map = (; :SB2006_collection_kernel_coeff_kcc => :kcc, @@ -461,9 +437,6 @@ Base.@kwdef struct AccrSB2006{FT} <: ParametersType{FT} c::FT end -AccrSB2006(::Type{FT}) where {FT <: AbstractFloat} = - AccrSB2006(CP.create_toml_dict(FT)) - function AccrSB2006(td::CP.AbstractTOMLDict) name_map = (; :SB2006_collection_kernel_coeff_kcr => :kcr, @@ -493,9 +466,6 @@ Base.@kwdef struct SelfColSB2006{FT} <: ParametersType{FT} d::FT end -SelfColSB2006(::Type{FT}) where {FT <: AbstractFloat} = - SelfColSB2006(CP.create_toml_dict(FT)) - function SelfColSB2006(td::CP.AbstractTOMLDict) name_map = (; :SB2006_collection_kernel_coeff_krr => :krr, @@ -526,9 +496,6 @@ Base.@kwdef struct BreakupSB2006{FT} <: ParametersType{FT} κbr::FT end -BreakupSB2006(::Type{FT}) where {FT <: AbstractFloat} = - BreakupSB2006(CP.create_toml_dict(FT)) - function BreakupSB2006(td::CP.AbstractTOMLDict) name_map = (; :SB2006_raindrops_equlibrium_mean_diameter => :Deq, @@ -562,9 +529,6 @@ Base.@kwdef struct EvaporationSB2006{FT} <: ParametersType{FT} ρ0::FT end -EvaporationSB2006(::Type{FT}) where {FT <: AbstractFloat} = - EvaporationSB2006(CP.create_toml_dict(FT)) - function EvaporationSB2006(td::CP.AbstractTOMLDict) name_map = (; :SB2006_ventilation_factor_coeff_av => :av, diff --git a/src/parameters/TerminalVelocity.jl b/src/parameters/TerminalVelocity.jl index b60b76d92e..dbf82e7c11 100644 --- a/src/parameters/TerminalVelocity.jl +++ b/src/parameters/TerminalVelocity.jl @@ -26,9 +26,6 @@ Base.@kwdef struct Blk1MVelTypeRain{FT} <: ParametersType{FT} grav::FT end -Blk1MVelTypeRain(::Type{FT}) where {FT <: AbstractFloat} = - Blk1MVelTypeRain(CP.create_toml_dict(FT)) - function Blk1MVelTypeRain(td::CP.AbstractTOMLDict) name_map = (; :snow_flake_length_scale => :r0, @@ -66,9 +63,6 @@ Base.@kwdef struct Blk1MVelTypeSnow{FT} <: ParametersType{FT} v0::FT end -Blk1MVelTypeSnow(::Type{FT}) where {FT <: AbstractFloat} = - Blk1MVelTypeSnow(CP.create_toml_dict(FT)) - function Blk1MVelTypeSnow(td::CP.AbstractTOMLDict) name_map = (; :snow_flake_length_scale => :r0, @@ -159,9 +153,6 @@ struct Chen2022VelTypeSnowIce{FT} <: ParametersType{FT} ρᵢ::FT end -Chen2022VelTypeSnowIce(::Type{FT}) where {FT <: AbstractFloat} = - Chen2022VelTypeSnowIce(CP.create_toml_dict(FT)) - function Chen2022VelTypeSnowIce(toml_dict::CP.AbstractTOMLDict) # TODO: These should be array parameters. name_map = (;