update surface fluxes

Author: szy21

.buildkite/nightly/pipeline.yml

@@ -23,11 +23,12 @@ steps:
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
 
       # For this pipeline, use the main branches of certain upstream packages
-      - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"ClimaAtmos\", rev=\"main\"))'"
+      - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"ClimaAtmos\", rev=\"zs/surface_flux\"))'"
+      - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"ClimaLand\", rev=\"kd/update_surface_fluxes\"))'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"ClimaCore\", rev=\"main\"))'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"ClimaTimeSteppers\", rev=\"main\"))'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"Thermodynamics\", rev=\"main\"))'"
-      # - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"SurfaceFluxes\", rev=\"main\"))'"
+      - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"SurfaceFluxes\", rev=\"main\"))'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name=\"RRTMGP\", rev=\"main\"))'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.resolve()'"
 
@@ -53,7 +54,7 @@ steps:
         command:
           - echo "--- Run simulation"
           - "julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_coarse_diagedmf.yml --job_id amip_coarse_diagedmf"
-        artifact_paths: "experiments/ClimaEarth/output/amip_coarse_diagedmf/artifacts/*"
+        artifact_paths: "output/amip_coarse_diagedmf/artifacts/*"
         timeout_in_minutes: 840
         env:
           CLIMACOMMS_DEVICE: "CUDA"
@@ -68,7 +69,7 @@ steps:
         command:
           - echo "--- Run simulation"
           - "julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_coarse_diagedmf_land.yml --job_id amip_coarse_diagedmf_land"
-        artifact_paths: "experiments/ClimaEarth/output/amip_coarse_diagedmf_land/artifacts/*"
+        artifact_paths: "output/amip_coarse_diagedmf_land/artifacts/*"
         timeout_in_minutes: 840
         env:
           CLIMACOMMS_DEVICE: "CUDA"
@@ -78,44 +79,44 @@ steps:
           slurm_ntasks: 1
           slurm_mem: 30GB
 
-      - label: "Coarse current AMIP: progedmf + 0M + bucket land"
-        key: "amip_progedmf"
-        command:
-          - echo "--- Run simulation"
-          - "julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_coarse_progedmf.yml --job_id amip_coarse_progedmf"
-        artifact_paths: "experiments/ClimaEarth/output/amip_coarse_progedmf/artifacts/*"
-        timeout_in_minutes: 840
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-        agents:
-          slurm_gpus_per_task: 1
-          slurm_cpus_per_task: 4
-          slurm_ntasks: 1
-          slurm_mem: 30GB
-
-      - label: "Coarse current AMIP without convection: edonly + 0M + bucket land"
-        key: "amip_edonly"
-        command:
-          - echo "--- Run simulation"
-          - "julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_coarse_edonly.yml --job_id amip_coarse_edonly"
-        artifact_paths: "experiments/ClimaEarth/output/amip_coarse_edonly/artifacts/*"
-        timeout_in_minutes: 840
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-        agents:
-          slurm_gpus_per_task: 1
-          slurm_cpus_per_task: 4
-          slurm_ntasks: 1
-          slurm_mem: 30GB
-
-      - label: "Flagship AMIP GPU with prognostic EDMF + 1M + integrated land (16 helems)"
-        key: "gpu_amip_progedmf_1M_land_he16"
-        command: "srun julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $BENCHMARK_CONFIG_PATH/amip_progedmf_1m_land_he16.yml --job_id gpu_amip_progedmf_1M_land_he16"
-        artifact_paths: "experiments/ClimaEarth/output/gpu_amip_progedmf_1M_land_he16/artifacts/*"
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-        agents:
-          slurm_gpus_per_task: 1
-          slurm_cpus_per_task: 4
-          slurm_ntasks: 1
-          slurm_mem: 16GB
+      # - label: "Coarse current AMIP: progedmf + 0M + bucket land"
+      #   key: "amip_progedmf"
+      #   command:
+      #     - echo "--- Run simulation"
+      #     - "julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_coarse_progedmf.yml --job_id amip_coarse_progedmf"
+      #   artifact_paths: "experiments/ClimaEarth/output/amip_coarse_progedmf/artifacts/*"
+      #   timeout_in_minutes: 840
+      #   env:
+      #     CLIMACOMMS_DEVICE: "CUDA"
+      #   agents:
+      #     slurm_gpus_per_task: 1
+      #     slurm_cpus_per_task: 4
+      #     slurm_ntasks: 1
+      #     slurm_mem: 30GB
+
+      # - label: "Coarse current AMIP without convection: edonly + 0M + bucket land"
+      #   key: "amip_edonly"
+      #   command:
+      #     - echo "--- Run simulation"
+      #     - "julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_coarse_edonly.yml --job_id amip_coarse_edonly"
+      #   artifact_paths: "experiments/ClimaEarth/output/amip_coarse_edonly/artifacts/*"
+      #   timeout_in_minutes: 840
+      #   env:
+      #     CLIMACOMMS_DEVICE: "CUDA"
+      #   agents:
+      #     slurm_gpus_per_task: 1
+      #     slurm_cpus_per_task: 4
+      #     slurm_ntasks: 1
+      #     slurm_mem: 30GB
+
+      # - label: "Flagship AMIP GPU with prognostic EDMF + 1M + integrated land (16 helems)"
+      #   key: "gpu_amip_progedmf_1M_land_he16"
+      #   command: "srun julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $BENCHMARK_CONFIG_PATH/amip_progedmf_1m_land_he16.yml --job_id gpu_amip_progedmf_1M_land_he16"
+      #   artifact_paths: "experiments/ClimaEarth/output/gpu_amip_progedmf_1M_land_he16/artifacts/*"
+      #   env:
+      #     CLIMACOMMS_DEVICE: "CUDA"
+      #   agents:
+      #     slurm_gpus_per_task: 1
+      #     slurm_cpus_per_task: 4
+      #     slurm_ntasks: 1
+      #     slurm_mem: 16GB

.buildkite/pipeline.yml

@@ -31,14 +31,14 @@ 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.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.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()'"

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

experiments/ClimaEarth/Manifest-v1.11.toml

@@ -453,7 +453,9 @@ weakdeps = ["GeoMakie", "Makie"]
 
 [[deps.ClimaAtmos]]
 deps = ["Adapt", "ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaInterpolations", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "Flux", "ForwardDiff", "Insolation", "Interpolations", "JLD2", "LazyArtifacts", "LazyBroadcast", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "NullBroadcasts", "RRTMGP", "Random", "SciMLBase", "SparseMatrixColorings", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
-git-tree-sha1 = "3c5e62e60f8ede3a01ca25f9f3f2be7edcdc606c"
+git-tree-sha1 = "6072575cd403938798d9beb7e5720aeae8c8be43"
+repo-rev = "zs/surface_flux"
+repo-url = "https://github.com/CliMA/ClimaAtmos.jl.git"
 uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
 version = "0.33.1"
 
@@ -531,7 +533,9 @@ weakdeps = ["CUDA"]
 
 [[deps.ClimaLand]]
 deps = ["Adapt", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "DocStringExtensions", "Insolation", "Interpolations", "LazyArtifacts", "LazyBroadcast", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"]
-git-tree-sha1 = "9c21f533594b2a0c8ba80b9eee832bc7b41585e2"
+git-tree-sha1 = "f1dd2d9785dadfd2b168ee3987fe02a7dc491fb3"
+repo-rev = "kd/update_surface_fluxes"
+repo-url = "https://github.com/CliMA/ClimaLand.jl.git"
 uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
 version = "1.3.0"
 
@@ -3393,7 +3397,9 @@ version = "7.7.0+0"
 
 [[deps.SurfaceFluxes]]
 deps = ["RootSolvers", "Thermodynamics"]
-git-tree-sha1 = "bf11863f42e42ff25a4315224cbc0cf2d404879f"
+git-tree-sha1 = "ec413a0c88c12e880fb6cba6c15babee79ecef06"
+repo-rev = "zs/promote"
+repo-url = "https://github.com/CliMA/SurfaceFluxes.jl.git"
 uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
 version = "0.14.2"
 weakdeps = ["ClimaParams"]

experiments/ClimaEarth/components/atmosphere/climaatmos.jl

@@ -367,28 +367,37 @@ function Interfacer.update_field!(
     Interfacer.get_field!(csf.scalar_temp3, sim, Val(:air_density))
     ρ_atmos = csf.scalar_temp3
 
+    surface_fluxes_params = get_surface_params(sim)
+
+    # TODO: fix allocation
+    csf.scalar_temp4 .=
+        SF.surface_density.(
+            surface_fluxes_params,
+            T_atmos,
+            ρ_atmos,
+            csf.T_sfc,
+            csf.height_int .- csf.height_sfc,
+            q_atmos,
+            0,
+            0,
+        )
+    ρ_sfc = csf.scalar_temp4
+
     thermo_params = get_thermo_params(sim)
     FluxCalculator.compute_surface_humidity!(
-        csf.scalar_temp4,
-        T_atmos,
-        q_atmos,
-        ρ_atmos,
+        csf.scalar_temp1,
         csf.T_sfc,
+        ρ_sfc,
         thermo_params,
     )
 
     # Remap surface temperature and humidity to atmosphere surface space
     # NOTE: This is allocating! If we had 2 more scratch fields, we could avoid this
     T_sfc_atmos = Interfacer.remap(atmos_surface_space, csf.T_sfc)
-    q_sfc_atmos = Interfacer.remap(atmos_surface_space, csf.scalar_temp4)
+    q_sfc_atmos = Interfacer.remap(atmos_surface_space, csf.scalar_temp1)
 
     # Store `ρ_sfc_atmos` in an atmosphere scratch field on the surface space
-    temp_field_surface =
-        FluxCalculator.extrapolate_ρ_to_sfc.(
-            thermo_params,
-            sim.integrator.p.precomputed.sfc_conditions.ts,
-            T_sfc_atmos,
-        )
+    temp_field_surface = Interfacer.remap(atmos_surface_space, ρ_sfc)
     ρ_sfc_atmos = temp_field_surface
 
     if sim.integrator.p.atmos.moisture_model isa CA.DryModel
@@ -699,6 +708,14 @@ Returns the thermodynamic parameters from the atmospheric model simulation objec
 get_thermo_params(sim::ClimaAtmosSimulation) =
     CAP.thermodynamics_params(sim.integrator.p.params)
 
+"""
+    get_surface_params(sim::ClimaAtmosSimulation)
+
+Returns the surface parameters from the atmospheric model simulation object.
+"""
+get_surface_params(sim::ClimaAtmosSimulation) =
+    CAP.surface_fluxes_params(sim.integrator.p.params)
+
 """
     dss_state!(sim::ClimaAtmosSimulation)