Synchronised parameter names with ClimaParams

src/parameters/create_parameters.jl

@@ -61,6 +61,14 @@ function ClimaAtmosParameters(toml_dict::TD) where {TD <: CP.AbstractTOMLDict}
     external_forcing_params = external_forcing_parameters(toml_dict)
     EFP = typeof(external_forcing_params)
 
+    non_orographic_gravity_wave_params =
+        NonOrographicGravityWaveParameters(toml_dict)
+    NOGWP = typeof(non_orographic_gravity_wave_params)
+
+    orographic_gravity_wave_params =
+        OrographicGravityWaveParameters(toml_dict)
+    OGWP = typeof(orographic_gravity_wave_params)
+
     parameters =
         CP.get_parameter_values(toml_dict, atmos_name_map, "ClimaAtmos")
     return CAP.ClimaAtmosParameters{
@@ -77,6 +85,8 @@ function ClimaAtmosParameters(toml_dict::TD) where {TD <: CP.AbstractTOMLDict}
         STP,
         VDP,
         EFP,
+        NOGWP,
+        OGWP,
     }(;
         parameters...,
         thermodynamics_params,
@@ -92,6 +102,8 @@ function ClimaAtmosParameters(toml_dict::TD) where {TD <: CP.AbstractTOMLDict}
         vert_diff_params,
         external_forcing_params,
         coeff_b_m_gryanik = coeff_b_m_gryanik_val,
+        non_orographic_gravity_wave_params,
+        orographic_gravity_wave_params,
     )
 end
 
@@ -115,7 +127,7 @@ atmos_name_map = (;
     :drag_layer_vertical_extent => :σ_b,
     :kappa_2_sponge => :kappa_2_sponge,
     :held_suarez_minimum_temperature => :T_min_hs,
-    :ocean_surface_albedo => :idealized_ocean_albedo,
+    :idealized_ocean_albedo => :idealized_ocean_albedo,
     :water_refractive_index => :water_refractive_index,
     :optics_lookup_temperature_min => :optics_lookup_temperature_min,
     :optics_lookup_temperature_max => :optics_lookup_temperature_max,
@@ -192,7 +204,7 @@ function aerosol_ml_parameters(toml_dict)
         :dust_calibration_coefficient => :α_dust,
         :seasalt_calibration_coefficient => :α_seasalt,
         :ammonium_sulfate_calibration_coefficient => :α_SO4,
-        :liquid_water_specific_humidity_calibration_coefficent => :α_q_liq,
+        :liquid_water_specific_humidity_calibration_coefficient => :α_q_liq,
         :reference_dust_aerosol_mass_concentration => :c₀_dust,
         :reference_seasalt_aerosol_mass_concentration => :c₀_seasalt,
         :reference_ammonium_sulfate_mass_concentration => :c₀_SO4,
@@ -297,3 +309,51 @@ function SurfaceTemperatureParameters(
     FT = CP.float_type(toml_dict)
     CAP.SurfaceTemperatureParameters{FT}(; parameters...)
 end
+
+
+NonOrographicGravityWaveParameters(
+    ::Type{FT},
+    overrides = NamedTuple(),
+) where {FT <: AbstractFloat} =
+    NonOrographicGravityWaveParameters(CP.create_toml_dict(FT), overrides)
+
+function NonOrographicGravityWaveParameters(
+    toml_dict::CP.AbstractTOMLDict,
+    overrides = NamedTuple(),
+)
+    name_map = (;
+        :placeholder => :placeholder, # Placeholder for future parameters
+    )
+    parameters = CP.get_parameter_values(toml_dict, name_map, "ClimaAtmos")
+    parameters = merge(parameters, overrides)
+    FT = CP.float_type(toml_dict)
+    CAP.NonOrographicGravityWaveParameters{FT}(; parameters...)
+end
+
+
+OrographicGravityWaveParameters(
+    ::Type{FT},
+    overrides = NamedTuple(),
+) where {FT <: AbstractFloat} =
+    OrographicGravityWaveParameters(CP.create_toml_dict(FT), overrides)
+
+function OrographicGravityWaveParameters(
+    toml_dict::CP.AbstractTOMLDict,
+    overrides = NamedTuple(),
+)
+    name_map = (;
+        :ogw_mountain_height_width_exponent => :γ, # L ∝ h^γ (equation 14, paper suggests γ ≈ 0.4)
+        :ogw_number_density_exponent => :ϵ, # number density of orography in a grid cell, n(h) ∝ h^(-ε)
+        :ogw_mountain_shape_parameter => :β, # L(z) = L_b(1 - z/h)^β (equation 12), β=1 for triangular mountains and β<1 for blunt mounrains, β>1 for pointy mountains
+        :ogw_critical_height_threshold => :h_frac, # h_crit = h_frac * (V / N)
+        :ogw_density_scale_factor => :ρscale,
+        :ogw_reference_mountain_width => :L0, # L_0 = 80 km 
+        :ogw_linear_drag_coefficient => :a0, # a_0 = 0.9
+        :ogw_nonlinear_drag_coefficient => :a1, # a_1 = 3.0
+        :ogw_critical_froude_number => :Fr_crit, # Fr_crit = 0.7
+    )
+    parameters = CP.get_parameter_values(toml_dict, name_map, "ClimaAtmos")
+    parameters = merge(parameters, overrides)
+    FT = CP.float_type(toml_dict)
+    CAP.OrographicGravityWaveParameters{FT}(; parameters...)
+end

toml/rcemipii_diagnostic_edmfx_0M.toml

@@ -25,7 +25,7 @@ value = 0
 [angular_velocity_planet_rotation]
 value = 0
 
-[ocean_surface_albedo]
+[idealized_ocean_albedo]
 value = 0.07
 
 [mean_sea_level_pressure]