prescribe clouds in radiation

CliMA · Oct 28, 2024 · 9afd559 · 9afd559
1 parent 09f7aff
commit 9afd559
Show file tree

Hide file tree

Showing 10 changed files with 262 additions and 171 deletions.
diff --git a/.buildkite/longruns_gpu/pipeline.yml b/.buildkite/longruns_gpu/pipeline.yml
@@ -38,180 +38,180 @@ steps:
 
   - wait
 
-  - group: "helem 30 dycore"
-    steps:
+  # - group: "helem 30 dycore"
+  #   steps:
 
-      - label: ":computer: hydrostatic balance (ρe_tot)"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/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_sphere_hydrostatic_balance_rhoe"
+  #     - label: ":computer: hydrostatic balance (ρe_tot)"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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_sphere_hydrostatic_balance_rhoe"
 
-      - label: ":computer: dry baroclinic wave"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/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"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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=examples examples/hybrid/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: dry baroclinic wave high res"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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=examples examples/hybrid/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"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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=examples examples/hybrid/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_he60"
+  #     - label: ":computer: baroclinic wave equilmoist high res"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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_he60"
 
-      - label: ":computer: dry held-suarez"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/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: dry held-suarez"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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=examples examples/hybrid/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_held_suarez"
+  #     - label: ":computer: held-suarez, equilmoist"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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_held_suarez"
 
-      - label: ":computer: held-suarez equilmoist + deep-atmosphere eqns"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_moist_held_suarez_deepatmos"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
+  #     - label: ":computer: held-suarez equilmoist + deep-atmosphere eqns"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+  #       artifact_paths: "$$JOB_NAME/output_active/*"
+  #       env:
+  #         CLIMACOMMS_DEVICE: "CUDA"
+  #         JOB_NAME: "longrun_moist_held_suarez_deepatmos"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 12:00:00
 
-  - group: "helem 16 aquaplanet"
-    steps:
+  # - group: "helem 16 aquaplanet"
+  #   steps:
 
-      - label: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/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 + 0M microphysics"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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=examples examples/hybrid/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 + diagnostic edmf + 0M microphysics"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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=examples examples/hybrid/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 + prognostic edmf diffusion only + 0M microphysics"
+  #       command:
+  #         - srun julia --project=examples examples/hybrid/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=examples examples/hybrid/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: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics + earth topography"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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=examples examples/hybrid/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: ":umbrella: aquaplanet equilmoist allsky radiation + 1M microphysics"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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:
-          - srun julia --color=yes --project=examples examples/hybrid/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_tvinsol_0M_slabocean"
+  #     - label: ":computer: aquaplanet equilmoist allsky radiation + time-varying insolation + 0M microphysics + slab ocean"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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_tvinsol_0M_slabocean"
 
-  - group: "DYAMOND"
+  # - group: "DYAMOND"
 
-    steps:
+  #   steps:
 
-      - label: ":computer: aquaplanet dyamond"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/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"
+  #     - label: ":computer: aquaplanet dyamond"
+  #       command:
+  #         - srun julia --color=yes --project=examples examples/hybrid/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"
 

diff --git a/Artifacts.toml b/Artifacts.toml
@@ -25,3 +25,13 @@ git-tree-sha1 = "6693f8451b447543952b3d557d733c7e5c670ed3"
     [[ozone_concentrations_lowres.download]]
     sha256 = "908384b32e90c733c2173654afbb974d238a9a516ad8965039077c6ddb29b5f0"
     url = "https://caltech.box.com/shared/static/6c16wt7i1htxq6tadpt1ng2uftjgdtpr.gz"
+
+[era5_cloud]
+git-tree-sha1 = "10742e0a2e343d13bb04df379e300a83402d4106"
+
+    [[era5_cloud.download]]
+    sha256 = "bb51e2f2d315b487e05a8d38944d4ad937ee4a40c43b68541220c5d54425e24a"
+    url = "https://caltech.box.com/shared/static/b6ur4ap4vo04j09vdulem96z9fxqlgyn.gz"
+
+
+
diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -99,6 +99,9 @@ dt_rad:
 idealized_clouds:
   help: "Use idealized clouds in radiation model [`false` (default), `true`]"
   value: false
+prescribed_clouds_in_radiation:
+  help: "Use prescribed clouds in radiation model [`false` (default), `true`]"
+  value: false
 insolation:
   help: "Insolation used in radiation model [`idealized` (default), `timevarying`, `rcemipii`]"
   value: "idealized"

diff --git a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml
@@ -3,7 +3,7 @@ z_elem: 31
 dz_bottom: 50.0
 rayleigh_sponge: true
 dt: "400secs"
-t_end: "1days"
+t_end: "1hours"
 dt_save_state_to_disk: "24hours"
 vert_diff: "FriersonDiffusion"
 implicit_diffusion: true
@@ -12,6 +12,7 @@ moist: "equil"
 precip_model: "1M"
 rad: "allskywithclear"
 aerosol_radiation: true
+prescribed_clouds_in_radiation: true
 insolation: "timevarying"
 non_orographic_gravity_wave: true
 orographic_gravity_wave: "gfdl_restart"