Skip to content

Commit

Permalink
Merge #122
Browse files Browse the repository at this point in the history
122: Add held suarez parameters, uniqueness test r=nefrathenrici a=nefrathenrici

Content:
- Adds held suarez parameters for ClimaAtmos
- Adds a test ensuring that aliases in the default parameter.toml are unique.

Co-authored-by: nefrathenrici <nat.henrici@gmail.com>
  • Loading branch information
bors[bot] and nefrathenrici authored Aug 17, 2023
2 parents fcb1894 + ad73696 commit 53c2639
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "CLIMAParameters"
uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
authors = ["Climate Modeling Alliance"]
version = "0.7.10"
version = "0.7.11"

[deps]
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Expand Down
30 changes: 30 additions & 0 deletions src/parameters.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1811,6 +1811,36 @@ type = "float"

# Held-Suarez

[held_suarez_T_equator_dry]
alias = "T_equator_dry"
value = 294
type = "float"
description = "Equator temperature. See Held and Suarez (1994) https://doi.org/10.1175/1520-0477(1994)075%3C1825:APFTIO%3E2.0.CO;2"

[held_suarez_T_equator_wet]
alias = "T_equator_wet"
value = 315
type = "float"
description = "Equator temperature. See Held and Suarez (1994) https://doi.org/10.1175/1520-0477(1994)075%3C1825:APFTIO%3E2.0.CO;2"

[potential_temp_vertical_gradient]
alias = "Δθ_z"
value = 10
type = "float"
description = "Potential temperature gradient with height. See Held and Suarez (1994) https://doi.org/10.1175/1520-0477(1994)075%3C1825:APFTIO%3E2.0.CO;2"

[drag_layer_vertical_extent]
alias = "σ_b"
value = 0.7
type = "float"
description = "Vertical extend of drag layer. See Held and Suarez (1994) https://doi.org/10.1175/1520-0477(1994)075%3C1825:APFTIO%3E2.0.CO;2"

[held_suarez_minimum_temperature]
alias = "T_min_hs"
value = 200
type = "float"
description = "Minimum temperature. See Held and Suarez (1994) https://doi.org/10.1175/1520-0477(1994)075%3C1825:APFTIO%3E2.0.CO;2"

[equator_pole_temperature_gradient_dry]
alias = "ΔT_y_dry"
value = 60
Expand Down
6 changes: 6 additions & 0 deletions test/param_boxes.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,10 @@ end

end

@testset "Unique aliases" begin
toml_dict = CP.create_toml_dict(Float64; dict_type = "alias")
alias_values = [dict["alias"] for dict in values(toml_dict.data)]
@test length(alias_values) == length(unique(alias_values))
end

end # end module

0 comments on commit 53c2639

Please sign in to comment.