use specific humidity as precipitation threshold

CliMA · Mar 31, 2024 · a22cb81 · a22cb81
1 parent 0eade97
commit a22cb81
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 87 deletions.
diff --git a/.buildkite/longruns_gpu/pipeline.yml b/.buildkite/longruns_gpu/pipeline.yml
@@ -42,55 +42,55 @@ steps:
   - group: "Targeted resolution long runs"
     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
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          JOB_NAME: "longrun_sphere_hydrostatic_balance_rhoe"
-
-      - label: ":computer: dry baroclinic wave"
-        command:
-          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          JOB_NAME: "longrun_bw_rhoe_highres"
-
-      - label: ":computer: baroclinic wave equilmoist"
-        command:
-          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          JOB_NAME: "longrun_bw_rhoe_equil_highres"
-
-      - label: ":computer: dry held-suarez"
-        command:
-          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          JOB_NAME: "longrun_hs_rhoe_dry_55km_nz63"
-
-      - label: ":computer: held-suarez, equilmoist"
-        command:
-          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          JOB_NAME: "longrun_hs_rhoe_equil_55km_nz63_0M"
+      # - label: ":computer: hydrostatic balance (ρe_tot)"
+      #   command:
+      #     - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+      #   artifact_paths: "$$JOB_NAME/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 12:00:00
+      #   env:
+      #     JOB_NAME: "longrun_sphere_hydrostatic_balance_rhoe"
+
+      # - label: ":computer: dry baroclinic wave"
+      #   command:
+      #     - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+      #   artifact_paths: "$$JOB_NAME/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 12:00:00
+      #   env:
+      #     JOB_NAME: "longrun_bw_rhoe_highres"
+
+      # - label: ":computer: baroclinic wave equilmoist"
+      #   command:
+      #     - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+      #   artifact_paths: "$$JOB_NAME/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 12:00:00
+      #   env:
+      #     JOB_NAME: "longrun_bw_rhoe_equil_highres"
+
+      # - label: ":computer: dry held-suarez"
+      #   command:
+      #     - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+      #   artifact_paths: "$$JOB_NAME/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 12:00:00
+      #   env:
+      #     JOB_NAME: "longrun_hs_rhoe_dry_55km_nz63"
+
+      # - label: ":computer: held-suarez, equilmoist"
+      #   command:
+      #     - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+      #   artifact_paths: "$$JOB_NAME/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 12:00:00
+      #   env:
+      #     JOB_NAME: "longrun_hs_rhoe_equil_55km_nz63_0M"
 
       - label: ":computer: aquaplanet equilmoist gray radiation + 0M microphysics"
         command:
@@ -184,40 +184,40 @@ steps:
         env:
           JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth_sleve"
 
-      - label: ":umbrella: aquaplanet equilmoist clearsky radiation + 1M microphysics"
-        command:
-          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 6:00:00
-        env:
-          JOB_NAME: "longrun_aquaplanet_clearsky_1M"
-
-  - group: "DYAMOND"
-
-    steps:
-
-      - label: ":computer: aquaplanet dyamond"
-        command:
-          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          JOB_NAME: "longrun_aquaplanet_dyamond"
-
-  - group: "atmos-only coupler runs"
-
-    steps:
-
-      - label: ":computer: amip target diagnostic edmf"
-        command:
-          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          JOB_NAME: "amip_target_diagedmf"
+      # - label: ":umbrella: aquaplanet equilmoist clearsky radiation + 1M microphysics"
+      #   command:
+      #     - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+      #   artifact_paths: "$$JOB_NAME/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_time: 6:00:00
+      #   env:
+      #     JOB_NAME: "longrun_aquaplanet_clearsky_1M"
+
+  # - group: "DYAMOND"
+
+  #   steps:
+
+  #     - label: ":computer: aquaplanet dyamond"
+  #       command:
+  #         - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+  #       artifact_paths: "$$JOB_NAME/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 12:00:00
+  #       env:
+  #         JOB_NAME: "longrun_aquaplanet_dyamond"
+
+  # - group: "atmos-only coupler runs"
+
+  #   steps:
+
+  #     - label: ":computer: amip target diagnostic edmf"
+  #       command:
+  #         - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+  #       artifact_paths: "$$JOB_NAME/*"
+  #       agents:
+  #         slurm_gpus: 1
+  #         slurm_time: 12:00:00
+  #       env:
+  #         JOB_NAME: "amip_target_diagedmf"
diff --git a/src/parameterized_tendencies/microphysics/microphysics_wrappers.jl b/src/parameterized_tendencies/microphysics/microphysics_wrappers.jl
@@ -58,7 +58,6 @@ function q_tot_precipitation_sources(
         -CM0.remove_precipitation(
             cmp,
             PP(thp, ts),
-            TD.q_vap_saturation(thp, ts),
         ),
     )
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,6 @@ function q_tot_precipitation_sources( @@
             -CM0.remove_precipitation(
                 cmp,
                 PP(thp, ts),
-                TD.q_vap_saturation(thp, ts),
             ),
         )
     end
@@ Expand Down @@