Merge pull request #1646 from CliMA/zs/cc/surface_flux

update surface fluxes and update dependencies

Author: szy21

.buildkite/pipeline.yml

@@ -31,14 +31,12 @@ steps:
       - "julia --project -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Instantiate ClimaEarth experiments env"
-      - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.develop(path=\".\")'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(\"MPI\")'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.precompile()'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Instantiate ClimaCore experiments env"
-      - "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.develop(path=\".\")'"
       - "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
       - "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.add(\"MPI\")'"
       - "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.precompile()'"
@@ -357,6 +355,7 @@ steps:
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
+        soft_fail: true
 
       - label: "GPU CMIP: ClimaAtmos + bucket land + Oceananigans + ClimaSeaIce"
         key: "gpu_cmip_oceananigans_climaseaice_bucket"
@@ -367,6 +366,7 @@ steps:
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
+        soft_fail: true
 
       - label: "GPU CMIP: ClimaAtmos + integrated land + Oceananigans + PrescribedSeaIce"
         key: "gpu_cmip_oceananigans_prescrseaice"
@@ -377,6 +377,7 @@ steps:
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
+        soft_fail: true
 
       - label: "GPU CMIP: ClimaAtmos + integrated land + Oceananigans + ClimaSeaIce"
         key: "gpu_cmip_oceananigans_climaseaice"
@@ -387,6 +388,7 @@ steps:
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
+        soft_fail: true
 
   - group: "Calibration experiments"
     steps:

NEWS.md

@@ -6,7 +6,11 @@ ClimaCoupler.jl Release Notes
 
 ### ClimaCoupler features
 
-#### Change default simulation output directory PRPR[#1653](https://github.com/CliMA/ClimaCoupler.jl/pull/1653)
+#### Update interfaces to surface flux calculator PR[#1646](https://github.com/CliMA/ClimaCoupler.jl/pull/1646)
+Uses new interface in SurfaceFluxes v0.15 to calculate surface fluxes. For the bucket model, call the
+turbulent_fluxes! function in ClimaLand directly for surface flux calculation.
+
+#### Change default simulation output directory PR[#1653](https://github.com/CliMA/ClimaCoupler.jl/pull/1653)
 Changes the default output directory from `experiments/ClimaEarth/output/` to `output`.
 The internal structure within the output directory remains the same.
 

Project.toml

@@ -36,26 +36,26 @@ ClimaCouplerOceananigansMakieExt = ["CairoMakie", "ClimaCoreMakie", "GeoMakie",
 
 [compat]
 ArgParse = "1"
-CairoMakie = "0.12"
+CairoMakie = "0.15"
 ClimaAnalysis = "0.5.10"
-ClimaAtmos = "0.33"
+ClimaAtmos = "0.34"
 ClimaComms = "0.6.2"
-ClimaCore = "0.14.25"
+ClimaCore = "0.14.46"
 ClimaCoreMakie = "0.4"
 ClimaDiagnostics = "0.2.6"
 ClimaUtilities = "0.1.22"
 Dates = "1"
 GeoMakie = "0.7"
 JLD2 = "0.5, 0.6"
 Logging = "1"
-Makie = "0.21"
-Oceananigans = "0.100"
+Makie = "0.24"
+Oceananigans = "0.101.3, 0.102, 0.103"
 Poppler_jll = "24"
 Printf = "1"
 SciMLBase = "~2.110, ~2.111, ~2.112"
 StaticArrays = "1.9.8"
 Statistics = "1"
-SurfaceFluxes = "0.12.3, 0.13, 0.14.1"
+SurfaceFluxes = "0.15.0"
 Thermodynamics = "0.14.1, 0.15"
 YAML = "0.4"
 julia = "1.10"

docs/src/fluxcalculator.md

@@ -37,7 +37,6 @@ fluxes and the CoupledSimulation object's fluxes fields.
 - the Obukhov length, `L_MO`;
 - the buoyancy flux, `buoyancy_flux`;
 - the roughness lengths for momentum and buoyancy, `z0m` and `z0b`;
-- the evaporation scaling factor, `beta`,
 - the frictional velocity `ustar`.
 
 !!! note

docs/src/interfacer.md

@@ -279,7 +279,6 @@ overwritten or used as-is. These currently include the following:
 
 | Coupler name  | Description                                                               | Units | Default value |
 |---------------|---------------------------------------------------------------------------|-------|---------------|
-| `beta`        | factor that scales evaporation based on its estimated level of saturation |       |             1 |
 | `emissivity`  | measure of how much energy a surface radiates                             |       |             1 |
 | `height_disp` | displacement height relative to the surface                               | m     |             0 |
 
@@ -300,7 +299,6 @@ coupler.
 
 ```
 get_field(sim::AbstractSurfaceStub, ::Val{:area_fraction}) = sim.cache.area_fraction
-get_field(sim::AbstractSurfaceStub, ::Val{:beta}) = sim.cache.beta
 get_field(sim::AbstractSurfaceStub, ::Val{:roughness_buoyancy}) = sim.cache.z0b
 get_field(sim::AbstractSurfaceStub, ::Val{:roughness_momentum}) = sim.cache.z0m
 get_field(sim::AbstractSurfaceStub, ::Val{:surface_direct_albedo}) = sim.cache.α_direct