From a03f09a0a2374e179f28938732d0028b333440a0 Mon Sep 17 00:00:00 2001 From: Anna Jaruga Date: Thu, 15 Feb 2024 10:09:30 -0800 Subject: [PATCH] params --- ext/EmulatorModelsExt.jl | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/ext/EmulatorModelsExt.jl b/ext/EmulatorModelsExt.jl index 2baa6c5de1..29787f1183 100644 --- a/ext/EmulatorModelsExt.jl +++ b/ext/EmulatorModelsExt.jl @@ -152,30 +152,14 @@ end function MLEmulatedAerosolActivation( ::Type{FT}, emulator_filepath::String, - toml_dict::CP.AbstractTOMLDict = CP.create_toml_dict(FT), ) where {FT} - (; data) = toml_dict machine = MLJ.machine(emulator_filepath) - - M_w = FT(data["molar_mass_water"]["value"]) - R = FT(data["gas_constant"]["value"]) - ρ_w = FT(data["density_liquid_water"]["value"]) - σ = FT(data["surface_tension_water"]["value"]) - g = FT(data["gravitational_acceleration"]["value"]) - f1 = FT(data["ARG2000_f_coeff_1"]["value"]) - f2 = FT(data["ARG2000_f_coeff_2"]["value"]) - g1 = FT(data["ARG2000_g_coeff_1"]["value"]) - g2 = FT(data["ARG2000_g_coeff_2"]["value"]) - p1 = FT(data["ARG2000_pow_1"]["value"]) - p2 = FT(data["ARG2000_pow_2"]["value"]) - - activation_params = CMP.AerosolActivationParameters(M_w, R, ρ_w, σ, g, f1, f2, g1, g2, p1, p2) - return MLEmulatedAerosolActivation(activation_params, machine) + ap = CMP.AerosolActivationParameters(FT) + return MLEmulatedAerosolActivation(ap, machine) end function AA.N_activated_per_mode( ml::MLAerosolActivationParameters, - ad::CMP.AerosolDistributionType, aip::CMP.AirProperties, tps::TDP.ThermodynamicsParameters, T::FT,