Ci changes needed for the upcoming working fluid PR

.buildkite/longruns_gpu/pipeline.yml

@@ -187,17 +187,6 @@ steps:
           CLIMACOMMS_DEVICE: "CUDA"
           JOB_NAME: "longrun_aquaplanet_allsky_1M"
 
-      - label: ":umbrella: aquaplanet non-equilmoist allsky radiation + 1M microphysics"
-        command:
-          - srun julia --color=yes --project=.buildkite 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_noneq"
-
       - label: ":computer: aquaplanet equilmoist allsky radiation + time-varying insolation + 0M microphysics + slab ocean"
         command:
           - srun julia --color=yes --project=.buildkite examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME

.buildkite/pipeline.yml

@@ -314,16 +314,16 @@ steps:
   - group: "Sphere Examples (Aquaplanet)"
     steps:
 
-      - label: ":umbrella: aquaplanet (ρe_tot) equil allsky monin_obukhov varying insol gravity wave (gfdl_restart) high top 1-moment"
+      - label: ":umbrella: aquaplanet (ρe_tot) nonequil allsky monin_obukhov varying insol gravity wave (gfdl_restart) high top 1-moment"
         command: >
           julia --color=yes --project=.buildkite examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml
-          --job_id sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res
+          --config_file $CONFIG_PATH/sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res.yml
+          --job_id sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res
 
           julia --color=yes --project=.buildkite reproducibility_tests/test_mse.jl
-          --job_id sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res
-          --out_dir sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res/output_active
-        artifact_paths: "sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res/output_active/*"
+          --job_id sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res
+          --out_dir sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res/output_active
+        artifact_paths: "sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res/output_active/*"
         agents:
           slurm_mem: 20GB
 
@@ -341,7 +341,7 @@ steps:
           slurm_mem: 20GB
           slurm_constraint: icelake|cascadelake|skylake|epyc
 
-      - label: ":computer: aquaplanet (ρe_tot) nonequilmoist allsky radiation monin_obukhov varying insolation high top 1-moment"
+      - label: ":umbrella: aquaplanet (ρe_tot) nonequilmoist allsky radiation monin_obukhov varying insolation high top 1-moment"
         command: >
           julia --color=yes --project=.buildkite examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml
@@ -771,6 +771,7 @@ steps:
         artifact_paths: "prognostic_edmfx_rico_column/output_active/*"
         agents:
           slurm_mem: 20GB
+        soft_fail: true
 
       - label: ":umbrella: Prognostic EDMFX TRMM in a column"
         command: >
@@ -780,6 +781,7 @@ steps:
         artifact_paths: "prognostic_edmfx_trmm_column/output_active/*"
         agents:
           slurm_mem: 20GB
+        soft_fail: true
 
       - label: ":genie: Prognostic EDMFX TRMM with 0-moment in a column"
         command: >

config/default_configs/default_config.yml

@@ -194,7 +194,7 @@ apply_limiter:
   help: "Apply a horizontal limiter to every tracer [`false` (default), `true`]"
   value: false
 precip_model:
-  help: "Precipitation model [`nothing` (default), `0M`]"
+  help: "Precipitation model [`nothing` (default), `0M`, `1M`]"
   value: ~
 cloud_model:
   help: "Cloud model [`grid_scale`, `quadrature` (default), `quadrature_sgs`]"

config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml

@@ -7,7 +7,7 @@ dz_bottom: 30.0
 rayleigh_sponge: true
 viscous_sponge: true
 moist: equil
-precip_model: 1M
+precip_model: 0M
 rad: allskywithclear
 co2_model: fixed
 idealized_insolation: false

config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml

@@ -8,7 +8,7 @@ dz_bottom: 30.0
 rayleigh_sponge: true
 viscous_sponge: true
 moist: "equil"
-precip_model: "1M"
+precip_model: "0M"
 rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"

config/gpu_configs/gpu_aquaplanet_dyamond_summer.yml

@@ -7,7 +7,7 @@ dz_bottom: 30.0
 rayleigh_sponge: true
 viscous_sponge: true
 moist: "equil"
-precip_model: "1M"
+precip_model: "0M"
 rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"

config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml

@@ -8,7 +8,7 @@ dz_bottom: 30.0
 rayleigh_sponge: true
 viscous_sponge: true
 moist: "equil"
-precip_model: "1M"
+precip_model: "0M"
 rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"

config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml

@@ -8,7 +8,7 @@ dz_bottom: 30.0
 rayleigh_sponge: true
 viscous_sponge: true
 moist: "equil"
-precip_model: "1M"
+precip_model: "0M"
 rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"

config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml

@@ -8,7 +8,7 @@ dz_bottom: 30.0
 rayleigh_sponge: true
 viscous_sponge: true
 moist: "equil"
-precip_model: "1M"
+precip_model: "0M"
 rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"

config/longrun_configs/longrun_aquaplanet_allsky_1M.yml

@@ -9,11 +9,11 @@ approximate_linear_solve_iters: 2
 dt: "120secs"
 t_end: "360days"
 dt_save_state_to_disk: "10days"
-moist: "equil"
+moist: "nonequil"
 rad: "allskywithclear"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
 surface_setup: "DefaultMoninObukhov"
 vert_diff: "DecayWithHeightDiffusion"
 precip_model: "1M"
-toml: [toml/longrun_aquaplanet.toml]
+toml: [toml/longrun_aquaplanet_1M.toml]

config/longrun_configs/longrun_moist_baroclinic_wave.yml

@@ -4,10 +4,9 @@ dz_bottom: 30.0
 dt: "90secs"
 t_end: "120days"
 initial_condition: "MoistBaroclinicWave"
-moist: "equil"
-precip_model: "0M"
+moist: "nonequil"
+precip_model: "1M"
 dt_save_state_to_disk: "10days"
-toml: [toml/longrun_baroclinic_wave.toml]
 diagnostics:
-  - short_name: [pfull, wa, va, rv, hus, ke]
+  - short_name: [pfull, wa, va, ua, ta, rhoa, rv, hus, ke, clw, cli, husra, hussn]
     period: 1days

config/model_configs/diagnostic_edmfx_aquaplanet.yml

@@ -17,8 +17,8 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 cloud_model: "quadrature_sgs"
-precip_model: 1M
+precip_model: 0M
 dt: 120secs
 t_end: 3hours
 reproducibility_test: true
-toml: [toml/diagnostic_edmfx.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]

config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml

@@ -16,7 +16,7 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 cloud_model: "quadrature_sgs"
-precip_model: 1M
+precip_model: 0M
 dt: 120secs
 t_end: 12hours
-toml: [toml/diagnostic_edmfx.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]

config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml

@@ -15,7 +15,7 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 cloud_model: "quadrature_sgs"
-precip_model: "1M"
+precip_model: "0M"
 call_cloud_diagnostics_per_stage: true
 config: box
 x_max: 1e8
@@ -28,12 +28,10 @@ z_stretch: false
 dt: 100secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
-toml: [toml/diagnostic_edmfx.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]
 netcdf_interpolation_num_points: [8, 8, 30]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-  - short_name: [husra, hussn]
-    period: 10mins

config/model_configs/diagnostic_edmfx_rico_box.yml

@@ -14,7 +14,7 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 cloud_model: "quadrature_sgs"
-precip_model: "1M"
+precip_model: "0M"
 call_cloud_diagnostics_per_stage: true
 config: box
 x_max: 1e8
@@ -27,12 +27,10 @@ z_stretch: false
 dt: 100secs
 t_end: 8hours
 dt_save_state_to_disk: 10mins
-toml: [toml/diagnostic_edmfx.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]
 netcdf_interpolation_num_points: [8, 8, 100]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-  - short_name: [husra, hussn]
-    period: 10mins

config/model_configs/diagnostic_edmfx_trmm_box.yml

@@ -15,7 +15,7 @@ moist: equil
 cloud_model: "quadrature_sgs"
 call_cloud_diagnostics_per_stage: true
 apply_limiter: false
-precip_model: "1M"
+precip_model: "0M"
 config: box
 x_max: 1e8
 y_max: 1e8
@@ -28,12 +28,10 @@ dt: 200secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
-toml: [toml/diagnostic_edmfx.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]
 netcdf_interpolation_num_points: [8, 8, 82]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-  - short_name: [husra, hussn]
-    period: 10mins

config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml

@@ -15,7 +15,7 @@ edmfx_sgs_diffusive_flux: true
 moist: equil
 cloud_model: "quadrature_sgs"
 call_cloud_diagnostics_per_stage: true
-precip_model: "1M"
+precip_model: "0M"
 config: box
 x_max: 1e8
 y_max: 1e8
@@ -28,12 +28,10 @@ dt: 300secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
-toml: [toml/diagnostic_edmfx.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]
 netcdf_interpolation_num_points: [8, 8, 30]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-  - short_name: [husra, hussn]
-    period: 10mins

config/model_configs/gpu_aquaplanet_dyamond.yml

@@ -5,7 +5,7 @@ z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 moist: "equil"
-precip_model: "1M"
+precip_model: "0M"
 rad: "allskywithclear"
 insolation: "timevarying"
 dt_rad: "1hours"

config/model_configs/les_isdac_box.yml

@@ -1,32 +1,32 @@
 # ISDAC config
 reference_job_id: "les_box"  # for plotting
-initial_condition: "ISDAC" 
-subsidence: "ISDAC" 
+initial_condition: "ISDAC"
+subsidence: "ISDAC"
 surface_setup: "ISDAC"
 external_forcing: "ISDAC"
 rad: "ISDAC"
 config: "box"
 # microphysics
-moist: "equil"
+moist: "nonequil"
 precip_model: "1M"
 # diffusion
 implicit_diffusion: false
 approximate_linear_solve_iters: 2
-hyperdiff: "false" 
+hyperdiff: "false"
 apply_limiter: false
 smagorinsky_lilly: true
 # time- and spatial discretization
 x_elem: 10
 x_max: 3.2e3
 y_elem: 10
-y_max: 3.2e3 
+y_max: 3.2e3
 z_elem: 15
 z_max: 2.5e3
 z_stretch: false
 rayleigh_sponge: true
 toml: [toml/les_isdac.toml]  # sponge height
-dt: "0.05secs" 
-t_end: "2mins" 
+dt: "0.05secs"
+t_end: "2mins"
 dt_cloud_fraction: "10mins"
 restart_file: "/groups/esm/hervik/climaatmos-les-artifacts/les_isdac_day0.0.hdf5"
 # diagnostics

config/model_configs/prognostic_edmfx_aquaplanet.yml

@@ -17,7 +17,7 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 cloud_model: "quadrature_sgs"
-precip_model: 1M
+precip_model: 0M
 dt: 10secs
 t_end: 1hours
 dt_save_state_to_disk: 600secs

config/model_configs/prognostic_edmfx_rico_column.yml

@@ -14,7 +14,7 @@ edmfx_sgs_diffusive_flux: true
 edmfx_nh_pressure: true
 edmfx_filter: true
 prognostic_tke: true
-moist: "equil"
+moist: "nonequil"
 cloud_model: "quadrature_sgs"
 call_cloud_diagnostics_per_stage: true
 precip_model: "1M"
@@ -28,7 +28,7 @@ perturb_initstate: false
 dt: "10secs"
 t_end: "6hours"
 dt_save_state_to_disk: "10mins"
-toml: [toml/prognostic_edmfx.toml]
+toml: [toml/prognostic_edmfx_1M.toml]
 netcdf_interpolation_num_points: [8, 8, 100]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]

config/model_configs/prognostic_edmfx_trmm_column.yml

@@ -13,7 +13,7 @@ edmfx_sgs_diffusive_flux: true
 edmfx_nh_pressure: true
 edmfx_filter: true
 prognostic_tke: true
-moist: equil
+moist: nonequil
 cloud_model: "quadrature_sgs"
 apply_limiter: false
 precip_model: "1M"
@@ -28,7 +28,7 @@ dt: 10secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
-toml: [toml/prognostic_edmfx.toml]
+toml: [toml/prognostic_edmfx_1M.toml]
 netcdf_interpolation_num_points: [8, 8, 82]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]

config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml

@@ -9,9 +9,9 @@ implicit_diffusion: true
 approximate_linear_solve_iters: 2
 cloud_model: "grid_scale"
 moist: "nonequil"
-precip_model: "nothing"
+precip_model: "1M"
 rad: "allskywithclear"
 insolation: "timevarying"
 rayleigh_sponge: true
 surface_setup: "DefaultMoninObukhov"
-toml: [toml/sphere_aquaplanet.toml]
+toml: [toml/sphere_aquaplanet_1M.toml]