Format, make name map used symbols

CliMA · Jan 17, 2024 · d28266c · d28266c
1 parent 5647501
commit d28266c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/ext/CreateParametersExt.jl b/ext/CreateParametersExt.jl
@@ -6,32 +6,32 @@ import CLIMAParameters as CP
 ThermodynamicsParameters(FT) = ThermodynamicsParameters(CP.create_toml_dict(FT))
 
 function ThermodynamicsParameters(toml_dict::CP.AbstractTOMLDict)
-    name_map = Dict{String, String}(
-        "temperature_min_at_reference" => "T_min_ref",
-        "entropy_water_vapor" => "entropy_water_vapor",
-        "entropy_dry_air" => "entropy_dry_air",
-        "potential_temperature_reference_pressure" => "p_ref_theta",
-        "entropy_reference_temperature" => "entropy_reference_temperature",
-        "temperature_saturation_adjustment_max" => "T_max",
-        "molar_mass_dry_air" => "molmass_dryair",
-        "pow_icenuc" => "pow_icenuc",
-        "temperature_triple_point" => "T_triple",
-        "adiabatic_exponent_dry_air" => "kappa_d",
-        "pressure_triple_point" => "press_triple",
-        "thermodynamics_temperature_reference" => "T_0",
-        "temperature_water_freeze" => "T_freeze",
-        "isobaric_specific_heat_ice" => "cp_i",
-        "latent_heat_sublimation_at_reference" => "LH_s0",
-        "isobaric_specific_heat_vapor" => "cp_v",
-        "molar_mass_water" => "molmass_water",
-        "mean_sea_level_pressure" => "MSLP",
-        "isobaric_specific_heat_liquid" => "cp_l",
-        "latent_heat_vaporization_at_reference" => "LH_v0",
-        "temperature_saturation_adjustment_min" => "T_min",
-        "gas_constant" => "gas_constant",
-        "temperature_mean_at_reference" => "T_surf_ref",
-        "gravitational_acceleration" => "grav",
-        "temperature_homogenous_nucleation" => "T_icenuc",
+    name_map = (
+        :temperature_min_at_reference => :T_min_ref,
+        :entropy_water_vapor => :entropy_water_vapor,
+        :entropy_dry_air => :entropy_dry_air,
+        :potential_temperature_reference_pressure => :p_ref_theta,
+        :entropy_reference_temperature => :entropy_reference_temperature,
+        :temperature_saturation_adjustment_max => :T_max,
+        :molar_mass_dry_air => :molmass_dryair,
+        :pow_icenuc => :pow_icenuc,
+        :temperature_triple_point => :T_triple,
+        :adiabatic_exponent_dry_air => :kappa_d,
+        :pressure_triple_point => :press_triple,
+        :thermodynamics_temperature_reference => :T_0,
+        :temperature_water_freeze => :T_freeze,
+        :isobaric_specific_heat_ice => :cp_i,
+        :latent_heat_sublimation_at_reference => :LH_s0,
+        :isobaric_specific_heat_vapor => :cp_v,
+        :molar_mass_water => :molmass_water,
+        :mean_sea_level_pressure => :MSLP,
+        :isobaric_specific_heat_liquid => :cp_l,
+        :latent_heat_vaporization_at_reference => :LH_v0,
+        :temperature_saturation_adjustment_min => :T_min,
+        :gas_constant => :gas_constant,
+        :temperature_mean_at_reference => :T_surf_ref,
+        :gravitational_acceleration => :grav,
+        :temperature_homogenous_nucleation => :T_icenuc,
     )
     parameters = CP.get_parameter_values(toml_dict, name_map, "Thermodynamics")
     FT = CP.float_type(toml_dict)

diff --git a/src/Thermodynamics.jl b/src/Thermodynamics.jl
@@ -87,6 +87,8 @@ Base.broadcastable(dap::DryAdiabaticProcess) = tuple(dap)
 Base.broadcastable(phase::Phase) = tuple(phase)
 
 # For backwards compatibility with package extensions
-isdefined(Base, :get_extension) || include(joinpath("..", "ext", "CreateParametersExt.jl"))
+if !isdefined(Base, :get_extension)
+    include(joinpath("..", "ext", "CreateParametersExt.jl"))
+end
 
 end #module Thermodynamics.jl