Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to ClimaParameter v0.9.0, Thermodynamics v0.12.0 #156

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Update to ClimaParameter v0.9.0, Thermodynamics v0.12.0 #156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76b6ecf
Update breaking dependencies
nefrathenrici Feb 14, 2024
15bfc25
Bump patch version
nefrathenrici Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
CreateParametersExt = "CLIMAParameters"

[compat]
CLIMAParameters = "0.8"
CLIMAParameters = "0.9"
DocStringExtensions = "0.8, 0.9"
RootSolvers = "0.2, 0.3, 0.4"
Thermodynamics = "0.11.5"
Thermodynamics = "0.12"
julia = "1.9"
1 change: 0 additions & 1 deletion test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"

[compat]
Aqua = "0.8"
CLIMAParameters = "0.8"
KernelAbstractions = "0.9"
6 changes: 3 additions & 3 deletions test/aqua.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ using Aqua
# then please lower the limit based on the new number of ambiguities.
# We're trying to drive this number down to zero to reduce latency.
# Uncomment for debugging:
for method_ambiguity in ambs
@show method_ambiguity
end
# for method_ambiguity in ambs
# @show method_ambiguity
# end
@test length(ambs) ≤ 0
end

Expand Down
10 changes: 4 additions & 6 deletions test/test_convergence.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ function assemble_surface_conditions(prof_int, prof_sfc, ts_int, ts_sfc, z0m, z0
end

function check_over_dry_states(
param_set,
::Type{FT},
profiles_int,
profiles_sfc,
Expand All @@ -80,6 +79,7 @@ function check_over_dry_states(
tol_neutral,
gryanik_noniterative::Bool,
) where {FT}
param_set = SFP.SurfaceFluxesParameters(FT, UF.BusingerParams)
counter = [0, 0, 0] # Stable, Unstable, Neutral
@inbounds for (ii, prof_int) in enumerate(profiles_int)
@inbounds for (jj, prof_sfc) in enumerate(profiles_sfc)
Expand Down Expand Up @@ -137,8 +137,7 @@ function check_over_dry_states(
end

function check_over_moist_states(
param_set,
FT::DataType,
::Type{FT},
profiles_int,
profiles_sfc,
scheme,
Expand All @@ -147,7 +146,8 @@ function check_over_moist_states(
maxiter,
tol_neutral,
gryanik_noniterative::Bool,
)
) where {FT}
param_set = SFP.SurfaceFluxesParameters(FT, BusingerParams)
counter = [0, 0, 0] # Stable, Unstable, Neutral
@inbounds for (ii, prof_int) in enumerate(profiles_int)
@inbounds for (jj, prof_sfc) in enumerate(profiles_sfc)
Expand Down Expand Up @@ -233,7 +233,6 @@ end
tol_neutral = FT(SF.Parameters.cp_d(param_set) / 10)
for iteration_option in [true]
counter = check_over_dry_states(
param_set,
FT,
profiles_int,
profiles_sfc,
Expand All @@ -245,7 +244,6 @@ end
iteration_option,
)
counter = check_over_moist_states(
param_set,
FT,
profiles_int,
profiles_sfc,
Expand Down
Loading