Skip to content

Commit df83856

Browse files
committed
update dependencies and bump patch version
1 parent f496d5c commit df83856

File tree

8 files changed

+131
-124
lines changed

8 files changed

+131
-124
lines changed

.buildkite/Manifest-v1.11.toml

Lines changed: 110 additions & 90 deletions
Large diffs are not rendered by default.

Project.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ClimaAtmos"
22
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
33
authors = ["Climate Modeling Alliance"]
4-
version = "0.31.2"
4+
version = "0.31.3"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -47,13 +47,13 @@ ClimaComms = "0.6.9"
4747
ClimaCore = "0.14.37"
4848
ClimaDiagnostics = "0.2.12"
4949
ClimaInterpolations = "0.1.0"
50-
ClimaParams = "0.11.1"
50+
ClimaParams = "0.12.1"
5151
ClimaTimeSteppers = "0.8.2"
5252
ClimaUtilities = "0.1.23"
53-
CloudMicrophysics = "0.26.4"
53+
CloudMicrophysics = "0.27"
5454
Dates = "1"
5555
ForwardDiff = "1"
56-
Insolation = "0.9.5"
56+
Insolation = "0.10.1"
5757
Interpolations = "0.15.1, 0.16"
5858
LazyArtifacts = "1"
5959
LazyBroadcast = "1"
@@ -62,14 +62,14 @@ Logging = "1"
6262
NCDatasets = "0.14.2"
6363
NVTX = "0.3, 1"
6464
NullBroadcasts = "0.1"
65-
RRTMGP = "0.21.4"
65+
RRTMGP = "0.21.5"
6666
Random = "1"
6767
SciMLBase = "2.108"
6868
SparseMatrixColorings = "0.4.20"
6969
StaticArrays = "1.9"
7070
Statistics = "1"
71-
SurfaceFluxes = "0.12.1"
72-
Thermodynamics = "0.13.1"
71+
SurfaceFluxes = "0.12.2"
72+
Thermodynamics = "0.14"
7373
UnrolledUtilities = "0.1.9"
7474
YAML = "0.4"
7575
julia = "1.9"

reproducibility_tests/ref_counter.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
257
1+
258
22

33
# **README**
44
#
@@ -20,6 +20,9 @@
2020

2121

2222
#=
23+
258
24+
- Update deps, specifically ClimaParams.jl and Thermodynamics.jl
25+
2326
257
2427
- Redefine sedimentation velocity for Prognostic EDMF with 1-moment or 2-moment microphysics
2528
on the grid scale; fix a bug in EDMFx SGS mass flux.

src/callbacks/callbacks.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,10 @@ function set_insolation_variables!(Y, p, t, tvi::TimeVaryingInsolation)
215215
max_zenith_angle = FT(π) / 2 - eps(FT)
216216
irradiance = FT(CAP.tot_solar_irrad(params))
217217
au = FT(CAP.astro_unit(params))
218-
# date0 references the start of the astronomial epoch J2000
219-
date0 = DateTime("2000-01-01T11:58:56.816")
220218
d, δ, η_UTC =
221219
FT.(
222220
Insolation.helper_instantaneous_zenith_angle(
223221
current_datetime,
224-
date0,
225222
insolation_params,
226223
),
227224
)

src/parameters/Parameters.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ for var in fieldnames(TD.Parameters.ThermodynamicsParameters)
137137
@eval $var(ps::ACAP) = TD.Parameters.$var(thermodynamics_params(ps))
138138
end
139139
# Thermodynamics derived parameters
140-
for var in [:Rv_over_Rd, :R_d, :R_v, :e_int_v0, :cp_d, :cv_v, :cv_l, :cv_d]
140+
for var in [:Rv_over_Rd, :kappa_d, :e_int_v0, :cv_v, :cv_l, :cv_d]
141141
@eval $var(ps::ACAP) = TD.Parameters.$var(thermodynamics_params(ps))
142142
end
143143

src/parameters/create_parameters.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ atmos_name_map = (;
115115
:drag_layer_vertical_extent => :σ_b,
116116
:kappa_2_sponge => :kappa_2_sponge,
117117
:held_suarez_minimum_temperature => :T_min_hs,
118-
:ocean_surface_albedo => :idealized_ocean_albedo,
118+
:idealized_ocean_albedo => :idealized_ocean_albedo,
119119
:water_refractive_index => :water_refractive_index,
120120
:optics_lookup_temperature_min => :optics_lookup_temperature_min,
121121
:optics_lookup_temperature_max => :optics_lookup_temperature_max,
@@ -192,7 +192,7 @@ function aerosol_ml_parameters(toml_dict)
192192
:dust_calibration_coefficient => :α_dust,
193193
:seasalt_calibration_coefficient => :α_seasalt,
194194
:ammonium_sulfate_calibration_coefficient => :α_SO4,
195-
:liquid_water_specific_humidity_calibration_coefficent => :α_q_liq,
195+
:liquid_water_specific_humidity_calibration_coefficient => :α_q_liq,
196196
:reference_dust_aerosol_mass_concentration => :c₀_dust,
197197
:reference_seasalt_aerosol_mass_concentration => :c₀_seasalt,
198198
:reference_ammonium_sulfate_mass_concentration => :c₀_SO4,

src/utils/era5_observations_to_forcing_file.jl

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,8 @@ function get_coszen_inst(
233233

234234
date = DateTime(date)
235235

236-
date0 = DateTime("2000-01-01T11:58:56.816")
237-
238-
S, μ = Insolation.solar_flux_and_cos_sza(
239-
date,
240-
date0,
241-
od,
242-
FT(lon),
243-
FT(lat),
244-
param_set,
245-
)
236+
S, μ =
237+
Insolation.solar_flux_and_cos_sza(date, od, FT(lon), FT(lat), param_set)
246238

247239
return μ, S * μ
248240
end
@@ -306,12 +298,7 @@ function generate_external_forcing_file(
306298

307299
external_tv_params = CP.get_parameter_values(
308300
CP.create_toml_dict(FT),
309-
[
310-
"gravitational_acceleration",
311-
"planet_radius",
312-
"gas_constant",
313-
"molar_mass_dry_air",
314-
],
301+
["gravitational_acceleration", "planet_radius", "gas_constant_dry_air"],
315302
)
316303
# load datasets
317304
tvforcing =
@@ -358,9 +345,9 @@ function generate_external_forcing_file(
358345

359346
# compute subsidence
360347
pressure = tvforcing["pressure_level"] .* 100 # convert hPa to Pa
361-
R_d =
362-
external_tv_params.gas_constant / external_tv_params.molar_mass_dry_air # J/(kg*K)
363-
ρ = pressure ./ (R_d .* sim_forcing["ta"])
348+
ρ =
349+
pressure ./
350+
(external_tv_params.gas_constant_dry_air .* sim_forcing["ta"])
364351
sim_forcing["rho"] = ρ # air density
365352
sim_forcing["wa"] =
366353
.-sim_forcing["wap"] ./

toml/rcemipii_diagnostic_edmfx_0M.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ value = 0
2525
[angular_velocity_planet_rotation]
2626
value = 0
2727

28-
[ocean_surface_albedo]
28+
[idealized_ocean_albedo]
2929
value = 0.07
3030

3131
[mean_sea_level_pressure]

0 commit comments

Comments
 (0)