Make precipitation part of the working fluid. Wip, [ci skip]

Author: trontrytel

.buildkite/pipeline.yml

@@ -322,16 +322,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=examples 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=examples 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
 
@@ -349,7 +349,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=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml

Project.toml

@@ -45,7 +45,7 @@ ClimaComms = "0.6.4"
 ClimaCore = "0.14.19"
 ClimaDiagnostics = "0.2.4"
 ClimaParams = "0.10.17"
-ClimaTimeSteppers = "0.7.39"
+ClimaTimeSteppers = "0.7, 0.8"
 ClimaUtilities = "0.1.14"
 CloudMicrophysics = "0.22.3"
 Dates = "1"

config/longrun_configs/longrun_moist_baroclinic_wave.yml

@@ -1,14 +1,17 @@
-h_elem: 30
-z_elem: 43
-dz_bottom: 30.0
-dt: "90secs"
-t_end: "120days"
+h_elem: 6   #30
+z_elem: 10  #43
+dz_bottom: 300.0
+dt: "200secs"
+approximate_linear_solve_iters: 3
+max_newton_iters_ode: 1
+rayleigh_sponge: true
+t_end: "10days"
 ode_algo: ARS343
 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]
-    period: 1days
+  - short_name: [pfull, wa, va, ua, ta, rhoa, rv, hus, ke, clw, cli, husra, hussn, ]
+    period: 600secs

config/model_configs/diagnostic_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: 120secs
 t_end: 3hours
 reproducibility_test: true

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
@@ -35,6 +35,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-  - short_name: [husra, hussn]
-    period: 10mins
 ode_algo: ARS343

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
@@ -34,6 +34,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-  - short_name: [husra, hussn]
-    period: 10mins
 ode_algo: ARS343

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
@@ -35,6 +35,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-  - short_name: [husra, hussn]
-    period: 10mins
 ode_algo: ARS343

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
@@ -35,6 +35,4 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-  - short_name: [husra, hussn]
-    period: 10mins
 ode_algo: ARS343

config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml

@@ -9,7 +9,7 @@ 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

config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml renamed to config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res.yml

@@ -8,7 +8,7 @@ dt_save_state_to_disk: "24hours"
 vert_diff: "FriersonDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
-moist: "equil"
+moist: "nonequil"
 precip_model: "1M"
 rad: "allskywithclear"
 aerosol_radiation: true