Skip to content

Commit d3d8190

Browse files
authored
Merge branch 'main' into yl/p-model_new
2 parents 3a07385 + f684693 commit d3d8190

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3640
-2351
lines changed

.buildkite/Manifest-v1.11.toml

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

.buildkite/Manifest.toml

Lines changed: 89 additions & 87 deletions
Large diffs are not rendered by default.

.buildkite/Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
3232
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
3333
NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
3434
Poppler_jll = "9c32591e-4766-534b-9725-b71a8799265b"
35+
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
3536
ProfileCanvas = "efd6af41-a80b-495e-886c-e51b0c7d77a3"
3637
RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
3738
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
@@ -51,4 +52,5 @@ ClimaDiagnostics = "0.2.13"
5152
ClimaTimeSteppers = "0.7, 0.8"
5253
EnsembleKalmanProcesses = "2.4.1"
5354
Flux = "0.15"
55+
GeoMakie = "< 0.7.13" # v0.7.13 causes infinite recursion with GridPositions
5456
Statistics = "1"

.github/workflows/downgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ jobs:
2929
- uses: julia-actions/cache@v2
3030
- uses: julia-actions/julia-downgrade-compat@v1
3131
with:
32-
skip: Dates, LazyArtifacts, LinearAlgebra, Test, Statistics
32+
skip: Dates, LazyArtifacts, LinearAlgebra, Test, Statistics, Printf
3333
- uses: julia-actions/julia-buildpkg@latest
3434
- uses: julia-actions/julia-runtest@latest

NEWS.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,22 @@ ClimaLand.jl Release Notes
33

44
main
55
-------
6-
- Fix texure norm bug (soil composition) PR[#1217](https://github.com/CliMA/ClimaLand.jl/pull/1217)
6+
- Remove root_depths from the PrescribeGroundConditions struct, and treat these ground ``drivers" consistently with how we handle atmospheric forcing PR[#1199](https://github.com/CliMA/ClimaLand.jl/pull/1240)
7+
- Add constructors with default values for Canopy components PR[#1233](https://github.com/CliMA/ClimaLand.jl/pull/1233)
8+
9+
v0.17.2
10+
-------
11+
- ![][badge-🐛bugfix] Clip VPD to fix bug in medlyn term computation PR[#1242](https://github.com/CliMA/ClimaLand.jl/pull/1242)
12+
- Create the extension LandSimulationsVisualization PR[#1199](https://github.com/CliMA/ClimaLand.jl/pull/1199)
13+
- Enable constructing Point and Column domains with latitude and longitude PR[#1237](https://github.com/CliMA/ClimaLand.jl/pull/1237)
14+
15+
v0.17.1
16+
-------
17+
- ![][badge-🐛bugfix] Fix bug in soil boundary var types for coupled atmos PR[#1228](https://github.com/CliMA/ClimaLand.jl/pull/1228)
18+
19+
v0.17.0
20+
-------
21+
- ![][badge-🐛bugfix] Fix texure norm bug (soil composition) PR[#1217](https://github.com/CliMA/ClimaLand.jl/pull/1217)
722
- ![breaking change][badge-💥breaking] Remove ModelSetup.jl and split spatial parameter functions up PR[#1211](https://github.com/CliMA/ClimaLand.jl/pull/1211)
823
- ![breaking change][badge-💥breaking] Rename all `comms_ctx` to `context` PR[#1207](https://github.com/CliMA/ClimaLand.jl/pull/1207)
924
- Output NaNs in diagnostics where the ocean is PR[#1200](https://github.com/CliMA/ClimaLand.jl/pull/1200)

Project.toml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name = "ClimaLand"
22
uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
33
authors = ["Clima Land Team"]
4-
version = "0.16.3"
4+
version = "0.17.2"
55

66
[deps]
77
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
88
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
99
ClimaDiagnostics = "1ecacbb8-0713-4841-9a07-eb5aa8a2d53f"
10+
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
1011
ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
1112
ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
1213
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -25,19 +26,25 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
2526
[weakdeps]
2627
BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
2728
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
28-
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
29+
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
30+
ClimaAnalysis = "29b5916a-a76c-4e73-9657-3c8fd22e65e6"
2931
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
3032
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
33+
GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6"
3134
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
35+
Poppler_jll = "9c32591e-4766-534b-9725-b71a8799265b"
36+
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
3237
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
3338

3439
[extensions]
35-
CreateParametersExt = "ClimaParams"
40+
LandSimulationVisualization = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
3641
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "BSON"]
3742

3843
[compat]
3944
BSON = "0.3.9"
45+
CairoMakie = "0.12"
4046
CSV = "0.10.14"
47+
ClimaAnalysis = "0.5.17"
4148
ClimaComms = "0.6.2"
4249
ClimaCore = "0.14.23"
4350
ClimaDiagnostics = "0.2.10"
@@ -48,16 +55,19 @@ DataFrames = "1.4"
4855
Dates = "1"
4956
DocStringExtensions = "0.9"
5057
Flux = "0.15, 0.16"
58+
GeoMakie = "< 0.7.13"
5159
HTTP = "1.10"
5260
Insolation = "0.9.2"
5361
Interpolations = "0.15.1, 0.16"
5462
LazyArtifacts = "1"
5563
LazyBroadcast = "1.0.0"
5664
LinearAlgebra = "1"
5765
NCDatasets = "0.14"
66+
Poppler_jll = "24"
67+
Printf = "1"
5868
SciMLBase = "2.53"
5969
StaticArrays = "1.6"
6070
StatsBase = "0.34"
6171
SurfaceFluxes = "0.11, 0.12"
62-
Thermodynamics = "0.12.4"
72+
Thermodynamics = "0.12.15"
6373
julia = "1.10"

0 commit comments

Comments
 (0)