Skip to content

Commit 23fd60d

Browse files
juliasloan25juliasloan25
authored
Merge pull request #1199 from CliMA/tr/add-ClimaLandModel-struct
add ClimaLandSimulation struct
2 parents 710a9f5 + 8548f33 commit 23fd60d

File tree

23 files changed

+774
-249
lines changed

23 files changed

+774
-249
lines changed

‎.buildkite/amip/pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: clima
33
slurm_time: 96:00:00
4-
modules: climacommon/2024_12_16
4+
modules: climacommon/2025_01_27
55

66
env:
77
JULIA_MAX_NUM_PRECOMPILE_FILES: 100

‎.buildkite/benchmarks/pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: clima
33
slurm_time: 24:00:00
4-
modules: climacommon/2024_12_16
4+
modules: climacommon/2025_01_27
55

66
env:
77
JULIA_NVTX_CALLBACKS: gc

‎.buildkite/hierarchies/pipeline.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: new-central
33
slurm_time: 24:00:00
4-
modules: climacommon/2024_12_16
4+
modules: climacommon/2025_01_27
55

66
env:
77
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
@@ -30,7 +30,7 @@ steps:
3030

3131
agents:
3232
queue: clima
33-
modules: climacommon/2024_12_16
33+
modules: climacommon/2025_01_27
3434
env:
3535
JULIA_NUM_PRECOMPILE_TASKS: 8
3636
JULIA_MAX_NUM_PRECOMPILE_FILES: 50
@@ -52,7 +52,7 @@ steps:
5252
queue: clima
5353
slurm_mem: 20GB
5454
slurm_gpus: 1
55-
modules: climacommon/2024_12_16
55+
modules: climacommon/2025_01_27
5656

5757
- label: "Clima: GPU ClimaCoupler moist HS"
5858
command:
@@ -64,7 +64,7 @@ steps:
6464
queue: clima
6565
slurm_mem: 20GB
6666
slurm_gpus: 1
67-
modules: climacommon/2024_12_16
67+
modules: climacommon/2025_01_27
6868

6969
- label: "Clima: GPU ClimaCoupler Cloudless Aquaplanet"
7070
command:
@@ -76,7 +76,7 @@ steps:
7676
queue: clima
7777
slurm_mem: 20GB
7878
slurm_gpus: 1
79-
modules: climacommon/2024_12_16
79+
modules: climacommon/2025_01_27
8080

8181
- label: "Clima: GPU ClimaCoupler Cloudy Aquaplanet"
8282
command:
@@ -88,7 +88,7 @@ steps:
8888
queue: clima
8989
slurm_mem: 20GB
9090
slurm_gpus: 1
91-
modules: climacommon/2024_12_16
91+
modules: climacommon/2025_01_27
9292

9393
- label: "Clima: GPU ClimaCoupler Cloudy Slabplanet"
9494
command:
@@ -100,4 +100,4 @@ steps:
100100
queue: clima
101101
slurm_mem: 20GB
102102
slurm_gpus: 1
103-
modules: climacommon/2024_12_16
103+
modules: climacommon/2025_01_27

‎.buildkite/longruns/pipeline.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: new-central
33
slurm_time: 24:00:00
4-
modules: climacommon/2024_12_16
4+
modules: climacommon/2025_01_27
55

66
env:
77
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
@@ -48,7 +48,7 @@ steps:
4848
- "julia --project=experiments/calibration/ -e 'using Pkg; Pkg.instantiate(;verbose=true); Pkg.develop(;path=\".\")'"
4949
agents:
5050
queue: clima
51-
modules: climacommon/2024_12_16
51+
modules: climacommon/2025_01_27
5252
env:
5353
JULIA_NUM_PRECOMPILE_TASKS: 8
5454
JULIA_MAX_NUM_PRECOMPILE_FILES: 50
@@ -298,7 +298,7 @@ steps:
298298
slurm_cpus_per_task: 4
299299
slurm_ntasks: 1
300300
slurm_mem: 30GB
301-
modules: climacommon/2024_12_16
301+
modules: climacommon/2025_01_27
302302
soft_fail: true
303303

304304
# DYAMOND AMIP: 1 day (convection resolving)
@@ -314,7 +314,7 @@ steps:
314314
queue: clima
315315
slurm_mem: 20GB
316316
slurm_gpus: 1
317-
modules: climacommon/2024_12_16
317+
modules: climacommon/2025_01_27
318318
soft_fail: true
319319

320320
- label: "Perfect model calibration test"
@@ -332,7 +332,7 @@ steps:
332332
slurm_gpus_per_task: 1
333333
slurm_cpus_per_task: 4
334334
slurm_time: 05:00:00
335-
modules: climacommon/2024_12_16
335+
modules: climacommon/2025_01_27
336336

337337
- wait
338338

‎.buildkite/nightly/pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: clima
33
slurm_time: 14:00:00
4-
modules: climacommon/2024_12_16
4+
modules: climacommon/2025_01_27
55

66
env:
77
JULIA_MAX_NUM_PRECOMPILE_FILES: 100

‎.buildkite/pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: new-central
33
slurm_time: 4:00:00
4-
modules: climacommon/2024_12_16
4+
modules: climacommon/2025_01_27
55

66
env:
77
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
@@ -98,7 +98,7 @@ steps:
9898
agents:
9999
slurm_ntasks: 1
100100
slurm_gres: "gpu:1"
101-
slurm_mem: 20GB
101+
slurm_mem: 32GB
102102

103103
- group: "ClimaEarth test"
104104
steps:

‎NEWS.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ ClimaCoupler.jl Release Notes
66

77
### ClimaCoupler features
88

9+
#### Add `ClimaLandSimulation` object PR[#1199](https://github.com/CliMA/ClimaCoupler.jl/pull/1199)
10+
Add methods to support running `ClimaLand.LandModel` in a coupled simulation.
11+
Also add tests to verify the constructor setup and taking a step.
12+
This type is not yet tested within a coupled simulation, but much
13+
of the necessary software infrastructure is added in this PR.
14+
915
#### Add default `get_field` methods for surface models PR[#1210](https://github.com/CliMA/ClimaCoupler.jl/pull/1210)
1016
Add default methods for `get_field` methods that are commonly
1117
not extended for surface models. These return reasonable default

‎docs/src/interfacer.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ be done in place. If this function isn't extended for a property,
109109
that property will remain constant throughout the simulation
110110
and a warning will be raised.
111111
This function is expected to be extended for the
112-
following properties:
112+
following properties, and may also be extended for any additional
113+
properties needed by a component model.
113114

114115
| Coupler name | Description | Units |
115116
|-------------------|-------------|-------|
@@ -174,7 +175,8 @@ isn't extended for a property,
174175
that property will remain constant throughout the simulation
175176
and a warning will be raised.
176177
This function is expected to be extended for the
177-
following properties:
178+
following properties, and may also be extended for any additional
179+
properties needed by a component model.
178180

179181
| Coupler name | Description | Units |
180182
|-------------------|-------------|-------|
@@ -183,8 +185,8 @@ following properties:
183185
| `liquid_precipitation` | liquid precipitation at the surface | kg m^-2 s^-1 |
184186
| `radiative_energy_flux_sfc` | net radiative flux at the surface | W m^-2 |
185187
| `snow_precipitation` | snow precipitation at the surface | kg m^-2 s^-1 |
186-
| `turbulent_energy_flux` | aerodynamic turbulent surface fluxes of energy (sensible and latent heat) | W m^-2 |
187-
| `turbulent_moisture_flux` | aerodynamic turbulent surface fluxes of energy (evaporation) | kg m^-2 s^-1 |
188+
| `turbulent_energy_flux` | aerodynamic turbulent surface fluxes of energy (sensible and latent heat); only required when using `CombinedStateFluxes` option - see our `FluxCalculator` module docs for more information | W m^-2 |
189+
| `turbulent_moisture_flux` | aerodynamic turbulent surface fluxes of energy (evaporation); only required when using `CombinedStateFluxes` option - see our `FluxCalculator` module docs for more information | kg m^-2 s^-1 |
188190
| `surface_direct_albedo` | bulk direct surface albedo; needed if calculated externally of the surface model (e.g. ocean albedo from the atmospheric state) | |
189191
| `surface_diffuse_albedo` | bulk diffuse surface albedo; needed if calculated externally of the surface model (e.g. ocean albedo from the atmospheric state) | |
190192

‎experiments/ClimaCore/Manifest-v1.11.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ version = "0.4.7"
171171

172172
[[deps.BandedMatrices]]
173173
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "PrecompileTools"]
174-
git-tree-sha1 = "4a591da886b61415e2c0dea130d28da1e9077cfb"
174+
git-tree-sha1 = "614c6aba1d562191d9832df2af24f594aa7ebf61"
175175
uuid = "aae01518-5342-5314-be14-df237901396f"
176-
version = "1.9.2"
176+
version = "1.9.3"
177177
weakdeps = ["SparseArrays"]
178178

179179
[deps.BandedMatrices.extensions]
@@ -591,9 +591,9 @@ version = "1.11.0"
591591

592592
[[deps.Distributions]]
593593
deps = ["AliasTables", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsAPI", "StatsBase", "StatsFuns"]
594-
git-tree-sha1 = "03aa5d44647eaec98e1920635cdfed5d5560a8b9"
594+
git-tree-sha1 = "0b4190661e8a4e51a842070e7dd4fae440ddb7f4"
595595
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
596-
version = "0.25.117"
596+
version = "0.25.118"
597597

598598
[deps.Distributions.extensions]
599599
DistributionsChainRulesCoreExt = "ChainRulesCore"
@@ -1506,9 +1506,9 @@ version = "0.8.1+2"
15061506

15071507
[[deps.OpenMPI_jll]]
15081508
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"]
1509-
git-tree-sha1 = "6c1cf6181ffe0aa33eb33250ca2a60e54a15ea66"
1509+
git-tree-sha1 = "da913f03f17b449951e0461da960229d4a3d1a8c"
15101510
uuid = "fe0851c0-eecd-5654-98d4-656369965a5c"
1511-
version = "5.0.7+0"
1511+
version = "5.0.7+1"
15121512

15131513
[[deps.OpenSSL_jll]]
15141514
deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -1941,9 +1941,9 @@ version = "0.1.1"
19411941

19421942
[[deps.Static]]
19431943
deps = ["CommonWorldInvalidations", "IfElse", "PrecompileTools"]
1944-
git-tree-sha1 = "87d51a3ee9a4b0d2fe054bdd3fc2436258db2603"
1944+
git-tree-sha1 = "f737d444cb0ad07e61b3c1bef8eb91203c321eff"
19451945
uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
1946-
version = "1.1.1"
1946+
version = "1.2.0"
19471947

19481948
[[deps.StaticArrayInterface]]
19491949
deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "PrecompileTools", "Static"]

‎experiments/ClimaCore/Manifest.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ version = "0.4.7"
170170

171171
[[deps.BandedMatrices]]
172172
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "PrecompileTools"]
173-
git-tree-sha1 = "4a591da886b61415e2c0dea130d28da1e9077cfb"
173+
git-tree-sha1 = "614c6aba1d562191d9832df2af24f594aa7ebf61"
174174
uuid = "aae01518-5342-5314-be14-df237901396f"
175-
version = "1.9.2"
175+
version = "1.9.3"
176176
weakdeps = ["SparseArrays"]
177177

178178
[deps.BandedMatrices.extensions]
@@ -586,9 +586,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
586586

587587
[[deps.Distributions]]
588588
deps = ["AliasTables", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsAPI", "StatsBase", "StatsFuns"]
589-
git-tree-sha1 = "03aa5d44647eaec98e1920635cdfed5d5560a8b9"
589+
git-tree-sha1 = "0b4190661e8a4e51a842070e7dd4fae440ddb7f4"
590590
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
591-
version = "0.25.117"
591+
version = "0.25.118"
592592

593593
[deps.Distributions.extensions]
594594
DistributionsChainRulesCoreExt = "ChainRulesCore"
@@ -1491,9 +1491,9 @@ version = "0.8.1+2"
14911491

14921492
[[deps.OpenMPI_jll]]
14931493
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"]
1494-
git-tree-sha1 = "6c1cf6181ffe0aa33eb33250ca2a60e54a15ea66"
1494+
git-tree-sha1 = "da913f03f17b449951e0461da960229d4a3d1a8c"
14951495
uuid = "fe0851c0-eecd-5654-98d4-656369965a5c"
1496-
version = "5.0.7+0"
1496+
version = "5.0.7+1"
14971497

14981498
[[deps.OpenSSL_jll]]
14991499
deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -1916,9 +1916,9 @@ version = "0.1.1"
19161916

19171917
[[deps.Static]]
19181918
deps = ["CommonWorldInvalidations", "IfElse", "PrecompileTools"]
1919-
git-tree-sha1 = "87d51a3ee9a4b0d2fe054bdd3fc2436258db2603"
1919+
git-tree-sha1 = "f737d444cb0ad07e61b3c1bef8eb91203c321eff"
19201920
uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
1921-
version = "1.1.1"
1921+
version = "1.2.0"
19221922

19231923
[[deps.StaticArrayInterface]]
19241924
deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "PrecompileTools", "Static"]

0 commit comments

Comments
 (0)