Merge pull request #3972 from CliMA/zs/up_deps

update dependencies and bump patch version

Author: szy21

.buildkite/Manifest-v1.11.toml

@@ -1,7 +1,7 @@
 name = "ClimaAtmos"
 uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
 authors = ["Climate Modeling Alliance"]
-version = "0.31.2"
+version = "0.31.3"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -47,13 +47,13 @@ ClimaComms = "0.6.9"
 ClimaCore = "0.14.37"
 ClimaDiagnostics = "0.2.12"
 ClimaInterpolations = "0.1.0"
-ClimaParams = "0.11.1"
+ClimaParams = "0.12.1"
 ClimaTimeSteppers = "0.8.2"
 ClimaUtilities = "0.1.23"
-CloudMicrophysics = "0.26.4"
+CloudMicrophysics = "0.27"
 Dates = "1"
 ForwardDiff = "1"
-Insolation = "0.9.5"
+Insolation = "0.10.1"
 Interpolations = "0.15.1, 0.16"
 LazyArtifacts = "1"
 LazyBroadcast = "1"
@@ -62,14 +62,14 @@ Logging = "1"
 NCDatasets = "0.14.2"
 NVTX = "0.3, 1"
 NullBroadcasts = "0.1"
-RRTMGP = "0.21.4"
+RRTMGP = "0.21.5"
 Random = "1"
 SciMLBase = "2.108"
 SparseMatrixColorings = "0.4.20"
 StaticArrays = "1.9"
 Statistics = "1"
-SurfaceFluxes = "0.12.1"
-Thermodynamics = "0.13.1"
+SurfaceFluxes = "0.12.2"
+Thermodynamics = "0.14"
 UnrolledUtilities = "0.1.9"
 YAML = "0.4"
 julia = "1.9"

Project.toml

@@ -1,4 +1,4 @@
-257
+258
 
 # **README**
 #
@@ -20,6 +20,9 @@
 
 
 #=
+258
+- Update deps, specifically ClimaParams.jl and Thermodynamics.jl
+
 257
 - Redefine sedimentation velocity for Prognostic EDMF with 1-moment or 2-moment microphysics
   on the grid scale; fix a bug in EDMFx SGS mass flux.

reproducibility_tests/ref_counter.jl

@@ -215,13 +215,10 @@ function set_insolation_variables!(Y, p, t, tvi::TimeVaryingInsolation)
     max_zenith_angle = FT(π) / 2 - eps(FT)
     irradiance = FT(CAP.tot_solar_irrad(params))
     au = FT(CAP.astro_unit(params))
-    # date0 references the start of the astronomial epoch J2000
-    date0 = DateTime("2000-01-01T11:58:56.816")
     d, δ, η_UTC =
         FT.(
             Insolation.helper_instantaneous_zenith_angle(
                 current_datetime,
-                date0,
                 insolation_params,
             ),
         )

src/callbacks/callbacks.jl

@@ -137,7 +137,7 @@ for var in fieldnames(TD.Parameters.ThermodynamicsParameters)
     @eval $var(ps::ACAP) = TD.Parameters.$var(thermodynamics_params(ps))
 end
 # Thermodynamics derived parameters
-for var in [:Rv_over_Rd, :R_d, :R_v, :e_int_v0, :cp_d, :cv_v, :cv_l, :cv_d]
+for var in [:Rv_over_Rd, :kappa_d, :e_int_v0, :cv_v, :cv_l, :cv_d]
     @eval $var(ps::ACAP) = TD.Parameters.$var(thermodynamics_params(ps))
 end
 

src/parameters/Parameters.jl

@@ -128,7 +128,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,
@@ -205,7 +205,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,

src/parameters/create_parameters.jl

@@ -233,16 +233,8 @@ function get_coszen_inst(
 
     date = DateTime(date)
 
-    date0 = DateTime("2000-01-01T11:58:56.816")
-
-    S, μ = Insolation.solar_flux_and_cos_sza(
-        date,
-        date0,
-        od,
-        FT(lon),
-        FT(lat),
-        param_set,
-    )
+    S, μ =
+        Insolation.solar_flux_and_cos_sza(date, od, FT(lon), FT(lat), param_set)
 
     return μ, S * μ
 end
@@ -306,12 +298,7 @@ function generate_external_forcing_file(
 
     external_tv_params = CP.get_parameter_values(
         CP.create_toml_dict(FT),
-        [
-            "gravitational_acceleration",
-            "planet_radius",
-            "gas_constant",
-            "molar_mass_dry_air",
-        ],
+        ["gravitational_acceleration", "planet_radius", "gas_constant_dry_air"],
     )
     # load datasets
     tvforcing =
@@ -358,9 +345,9 @@ function generate_external_forcing_file(
 
     # compute subsidence
     pressure = tvforcing["pressure_level"] .* 100 # convert hPa to Pa
-    R_d =
-        external_tv_params.gas_constant / external_tv_params.molar_mass_dry_air # J/(kg*K)
-    ρ = pressure ./ (R_d .* sim_forcing["ta"])
+    ρ =
+        pressure ./
+        (external_tv_params.gas_constant_dry_air .* sim_forcing["ta"])
     sim_forcing["rho"] = ρ # air density
     sim_forcing["wa"] =
         .-sim_forcing["wap"] ./

src/utils/era5_observations_to_forcing_file.jl

@@ -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]