explicit surface flux

CliMA · Mar 2, 2025 · 8b0dbf0 · 8b0dbf0
1 parent 48b6e9f
commit 8b0dbf0
Show file tree

Hide file tree

Showing 12 changed files with 274 additions and 210 deletions.
diff --git a/.buildkite/longruns_gpu/pipeline.yml b/.buildkite/longruns_gpu/pipeline.yml
@@ -35,143 +35,143 @@ steps:
 
   - wait
 
-  - group: "helem 30 dycore"
-    steps:
-
-      - label: ":computer: hydrostatic balance"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_hydrostatic_balance"
-
-      - label: ":computer: dry baroclinic wave"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_dry_baroclinic_wave"
-
-      - label: ":computer: dry baroclinic wave high res"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_dry_baroclinic_wave_he60"
-
-      - label: ":computer: baroclinic wave equilmoist"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_moist_baroclinic_wave"
-
-      - label: ":computer: baroclinic wave equilmoist high res"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_moist_baroclinic_wave_he60"
-
-      - label: ":computer: dry held-suarez"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_dry_held_suarez"
-
-      - label: ":computer: held-suarez, equilmoist"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_moist_held_suarez"
+  # - group: "helem 30 dycore"
+  #   steps:
+
+  #     - label: ":computer: hydrostatic balance"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 12:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_hydrostatic_balance"
+
+  #     - label: ":computer: dry baroclinic wave"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 12:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_dry_baroclinic_wave"
+
+  #     - label: ":computer: dry baroclinic wave high res"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 12:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_dry_baroclinic_wave_he60"
+
+  #     - label: ":computer: baroclinic wave equilmoist"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 12:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_moist_baroclinic_wave"
+
+  #     - label: ":computer: baroclinic wave equilmoist high res"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 24:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_moist_baroclinic_wave_he60"
+
+  #     - label: ":computer: dry held-suarez"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 12:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_dry_held_suarez"
+
+  #     - label: ":computer: held-suarez, equilmoist"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 24:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_moist_held_suarez"
 
   - group: "helem 16 aquaplanet"
     steps:
 
-      - label: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_allsky_0M"
-
-      - label: ":computer: aquaplanet equilmoist allsky radiation + diagnostic edmf + 0M microphysics"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_allsky_diagedmf_0M"
-
-      - label: ":computer: aquaplanet equilmoist allsky radiation + prognostic edmf diffusion only + 0M microphysics"
-        command:
-          - srun julia --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_allsky_progedmf_diffonly_0M"
-
-      - label: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics + earth topography"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_allsky_0M_earth"
-
-      - label: ":umbrella: aquaplanet equilmoist allsky radiation + 1M microphysics"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_allsky_1M"
+      # - label: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics"
+      #   command:
+      #     - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+      #   artifact_paths: "$$JOB_NAME/output_active/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 24:00:00
+      #   env:
+      #     CLIMACOMMS_DEVICE: "CUDA"
+      #     JOB_NAME: "longrun_aquaplanet_allsky_0M"
+
+      # - label: ":computer: aquaplanet equilmoist allsky radiation + diagnostic edmf + 0M microphysics"
+      #   command:
+      #     - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+      #   artifact_paths: "$$JOB_NAME/output_active/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 24:00:00
+      #   env:
+      #     CLIMACOMMS_DEVICE: "CUDA"
+      #     JOB_NAME: "longrun_aquaplanet_allsky_diagedmf_0M"
+
+      # - label: ":computer: aquaplanet equilmoist allsky radiation + prognostic edmf diffusion only + 0M microphysics"
+      #   command:
+      #     - srun julia --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+      #   artifact_paths: "$$JOB_NAME/output_active/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 24:00:00
+      #   env:
+      #     CLIMACOMMS_DEVICE: "CUDA"
+      #     JOB_NAME: "longrun_aquaplanet_allsky_progedmf_diffonly_0M"
+
+      # - label: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics + earth topography"
+      #   command:
+      #     - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+      #   artifact_paths: "$$JOB_NAME/output_active/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 24:00:00
+      #   env:
+      #     CLIMACOMMS_DEVICE: "CUDA"
+      #     JOB_NAME: "longrun_aquaplanet_allsky_0M_earth"
+
+      # - label: ":umbrella: aquaplanet equilmoist allsky radiation + 1M microphysics"
+      #   command:
+      #     - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+      #   artifact_paths: "$$JOB_NAME/output_active/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 24:00:00
+      #   env:
+      #     CLIMACOMMS_DEVICE: "CUDA"
+      #     JOB_NAME: "longrun_aquaplanet_allsky_1M"
 
       - label: ":computer: aquaplanet equilmoist allsky radiation + time-varying insolation + 0M microphysics + slab ocean"
         command:
@@ -184,43 +184,43 @@ steps:
           CLIMACOMMS_DEVICE: "CUDA"
           JOB_NAME: "longrun_aquaplanet_allsky_tvinsol_0M_slabocean"
 
-  - group: "DYAMOND"
-
-    steps:
-
-      - label: ":computer: aquaplanet dyamond"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_dyamond"
-
-  - group: "atmos-only coupler runs"
-
-    steps:
-
-      - label: ":computer: amip target diagnostic edmf"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "amip_target_diagedmf"
-
-      - label: ":computer: amip target edonly edmf"
-        command:
-          - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 24:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "amip_target_edonly"
+  # - group: "DYAMOND"
+
+  #   steps:
+
+  #     - label: ":computer: aquaplanet dyamond"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 24:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_aquaplanet_dyamond"
+
+  # - group: "atmos-only coupler runs"
+
+  #   steps:
+
+  #     - label: ":computer: amip target diagnostic edmf"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 24:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "amip_target_diagedmf"
+
+  #     - label: ":computer: amip target edonly edmf"
+  #       command:
+  #         - srun julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 24:00:00
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "amip_target_edonly"
diff --git a/config/model_configs/aquaplanet_equil_clearsky_tvinsol_0M_slabocean.yml b/config/model_configs/aquaplanet_equil_clearsky_tvinsol_0M_slabocean.yml
@@ -11,4 +11,4 @@ rad: "clearsky"
 insolation: "timevarying"
 dt_rad: "1hours"
 prognostic_surface: "PrognosticSurfaceTemperature"
-#check_conservation: true
+check_conservation: true
diff --git a/src/ClimaAtmos.jl b/src/ClimaAtmos.jl
@@ -116,6 +116,7 @@ include(
 include(
     joinpath("prognostic_equations", "vertical_diffusion_boundary_layer.jl"),
 )
+include(joinpath("prognostic_equations", "surface_flux.jl"))
 include(joinpath("parameterized_tendencies", "sponge", "rayleigh_sponge.jl"))
 include(joinpath("parameterized_tendencies", "sponge", "viscous_sponge.jl"))
 include(

diff --git a/src/parameters/create_parameters.jl b/src/parameters/create_parameters.jl
@@ -1,5 +1,6 @@
 import ClimaParams as CP
 import RRTMGP.Parameters.RRTMGPParameters
+import SurfaceFluxes as SF
 import SurfaceFluxes.Parameters.SurfaceFluxesParameters
 import SurfaceFluxes.UniversalFunctions as UF
 import Insolation.Parameters.InsolationParameters