Merge branch 'main' into gb/leaderboard

CliMA · Mar 28, 2024 · 57b520d · 57b520d
2 parents 747dc6e + 4e528c2
commit 57b520d
Show file tree

Hide file tree

Showing 43 changed files with 913 additions and 578 deletions.
diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
@@ -1,7 +1,7 @@
 agents:
   queue: new-central
   slurm_time: 24:00:00
-  modules: climacommon/2024_02_27
+  modules: climacommon/2024_03_18
 
 env:
   JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
@@ -45,7 +45,12 @@ steps:
       JULIA_NUM_PRECOMPILE_TASKS: 8
       JULIA_MAX_NUM_PRECOMPILE_FILES: 50
 
-  # DYAMOND AMIP: 1 day (convection resolving)
+    concurrency: 1
+    concurrency_group: 'depot/climacoupler-longruns'
+
+  - wait
+
+  # DYAMOND AMIP: 1 day (convection resolving) - running on clima, so need to instantiate again
   - label: "GPU AMIP SUPERFINE: dyamond_target"
     key: "gpu_dyamond_target"
     command:
@@ -62,6 +67,7 @@ steps:
       - "julia --project=artifacts -e 'using Pkg; Pkg.status()'"
       - "julia --project=artifacts artifacts/download_artifacts.jl"
 
+      - echo "--- Run simulation"
       - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_dyamond_target.yml"
     artifact_paths: "experiments/AMIP/output/amip/gpu_dyamond_target_artifacts/*"
     agents:
@@ -70,8 +76,6 @@ steps:
       slurm_gpus: 1
       modules: common
 
-  - wait
-
   - group: "Coupler integration and conservation tests"
 
     steps:

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,7 +1,7 @@
 agents:
   queue: new-central
   slurm_time: 24:00:00
-  modules: climacommon/2024_02_27
+  modules: climacommon/2024_03_18
 
 env:
   JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
@@ -66,6 +66,8 @@ steps:
       - "julia --project=artifacts -e 'using Pkg; Pkg.status()'"
       - "julia --project=artifacts artifacts/download_artifacts.jl"
 
+    concurrency: 1
+    concurrency_group: 'depot/climacoupler-ci'
     agents:
       slurm_cpus_per_task: 12
       slurm_gpus: 1

diff --git a/Project.toml b/Project.toml
@@ -4,12 +4,12 @@ authors = ["CliMA Contributors <clima-software@caltech.edu>"]
 version = "0.1.0"
 
 [deps]
-CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
 ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
 ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
 ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70"
 ClimaLand = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
+ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8"
@@ -24,22 +24,22 @@ TempestRemap_jll = "8573a8c5-1df0-515e-a024-abad257ee284"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
 [compat]
-CLIMAParameters = "0.9"
-ClimaAtmos = "0.21"
+ClimaAtmos = "0.22"
 ClimaComms = "0.5.6"
-ClimaCore = "0.12"
+ClimaCore = "0.13"
 ClimaCoreTempestRemap = "0.3"
-ClimaLand = "0.10"
+ClimaLand = "0.11"
+ClimaParams = "0.10"
 Dates = "1"
 DocStringExtensions = "0.8, 0.9"
-Insolation = "0.9"
+Insolation = "0.9.2"
 JLD2 = "0.4"
 NCDatasets = "0.11, 0.12, 0.13, =0.14.1"
 Plots = "1.39.0"
 SciMLBase = "1, 2"
 StaticArrays = "1"
 Statistics = "1"
-SurfaceFluxes = "0.9"
+SurfaceFluxes = "0.11"
 TempestRemap_jll = "2"
-Thermodynamics = "< 0.12.4"
+Thermodynamics = "0.12.4"
 julia = "1.8"
diff --git a/artifacts/Artifacts.toml b/artifacts/Artifacts.toml
@@ -4,11 +4,11 @@ git-tree-sha1 = "0c6039bfcc39f6c6cb20fb331a71f6a381d93f24"
 [land_mask]
 git-tree-sha1 = "e41bc8c44124f867b64a9d70f1599515ae27f38a"
 
+[pr_obs_data]
+git-tree-sha1 = "7486bf32e9352493f69364aead26f01eaf90d2af"
+
 [sic]
 git-tree-sha1 = "139d23f6de29900917d79b41a87a8ee6483c72d0"
 
 [sst]
 git-tree-sha1 = "9969543acd3c9084b8238b7858d0c76aa0bf98a7"
-
-[pr_obs_data]
-git-tree-sha1 = "7486bf32e9352493f69364aead26f01eaf90d2af"
diff --git a/docs/src/fluxcalculator.md b/docs/src/fluxcalculator.md
@@ -25,6 +25,7 @@ Fluxes over a heterogeneous surface (e.g., from a gridpoint where atmospheric ce
     ClimaCoupler.FluxCalculator.update_turbulent_fluxes_point!
     ClimaCoupler.FluxCalculator.extrapolate_ρ_to_sfc
     ClimaCoupler.FluxCalculator.surface_thermo_state
+    ClimaCoupler.FluxCalculator.water_albedo_from_atmosphere!
 ```
 
 ## FieldExchanger Internal Functions

diff --git a/docs/src/interfacer.md b/docs/src/interfacer.md
@@ -101,11 +101,12 @@ following properties:
 | Coupler name      | Description | Units |
 |-------------------|-------------|-------|
 | `co2`              | global mean co2 | ppm |
-| `surface_albedo`   | bulk surface albedo over the whole surface space | |
+| `surface_direct_albedo`   | bulk direct surface albedo over the whole surface space | |
+| `surface_diffuse_albedo`   | bulk diffuse surface albedo over the whole surface space | |
 | `surface_temperature` | temperature over the combined surface space | K |
 | `turbulent_fluxes` | turbulent fluxes (note: only required when using `PartitionedStateFluxes` option - see our `FluxCalculator` module docs for more information) | W m^-2 |
 
-- `calculate_surface_air_density(atmos_sim::Interfacer.AtmosModelSimulation, T_S::Fields.Field)`:
+- `calculate_surface_air_density(atmos_sim::Interfacer.AtmosModelSimulation, T_S::ClimaCore.Fields.Field)`:
 A function to return the air density of the atmosphere simulation
 extrapolated to the surface, with units of [kg m^-3].
 
@@ -124,7 +125,8 @@ for the following properties:
 | `beta`              | factor that scales evaporation based on its estimated level of saturation | |
 | `roughness_buoyancy` | aerodynamic roughness length for buoyancy | m |
 | `roughness_momentum` | aerodynamic roughness length for momentum | m |
-| `surface_albedo`    | bulk surface albedo | |
+| `surface_direct albedo`    | bulk direct surface albedo | |
+| `surface_diffuse albedo`    | bulk diffuse surface albedo | |
 | `surface_humidity`  | surface humidity | kg kg^-1 |
 | `surface_temperature` | surface temperature | K |
 
@@ -170,7 +172,7 @@ get_field(sim::SurfaceStub, ::Val{:beta}) = sim.cache.beta
 get_field(sim::SurfaceStub, ::Val{:energy}) = nothing
 get_field(sim::SurfaceStub, ::Val{:roughness_buoyancy}) = sim.cache.z0b
 get_field(sim::SurfaceStub, ::Val{:roughness_momentum}) = sim.cache.z0m
-get_field(sim::SurfaceStub, ::Val{:surface_albedo}) = sim.cache.α
+get_field(sim::SurfaceStub, ::Union{Val{:surface_direct_albedo}, Val{:surface_diffuse_albedo}}) = sim.cache.α
 get_field(sim::SurfaceStub, ::Val{:surface_humidity}) = TD.q_vap_saturation_generic.(sim.cache.thermo_params, sim.cache.T_sfc, sim.cache.ρ_sfc, sim.cache.phase)
 get_field(sim::SurfaceStub, ::Val{:surface_temperature}) = sim.cache.T_sfc
 get_field(sim::SurfaceStub, ::Val{:water}) = nothing
@@ -180,10 +182,10 @@ and with the corresponding `update_field!` functions
 function update_field!(sim::SurfaceStub, ::Val{:air_density}, field)
     sim.cache.ρ_sfc .= field
 end
-function update_field!(sim::SurfaceStub, ::Val{:area_fraction}, field::Fields.Field)
+function update_field!(sim::SurfaceStub, ::Val{:area_fraction}, field::ClimaCore.Fields.Field)
     sim.cache.area_fraction .= field
 end
-function update_field!(sim::SurfaceStub, ::Val{:surface_temperature}, field::Fields.Field)
+function update_field!(sim::SurfaceStub, ::Val{:surface_temperature}, field::ClimaCore.Fields.Field)
     sim.cache.T_sfc .= field
 end
 ```