ci fixes

CliMA · Jan 23, 2025 · 71eb4c9 · 71eb4c9
1 parent 2b0aede
commit 71eb4c9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/.buildkite/pipeline.yml b/.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
 

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
@@ -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

diff --git a/src/cache/cloud_fraction.jl b/src/cache/cloud_fraction.jl
@@ -59,9 +59,14 @@ NVTX.@annotate function set_cloud_fraction!(
         ),
         NamedTuple{(:cf, :q_liq, :q_ice)}(
             tuple(
-                ifelse(p.ᶜspecific.q_liq + p.ᶜspecific.q_ice > 0, 1, 0),
-                p.ᶜspecific.q_liq,
-                p.ᶜspecific.q_ice,
+                ifelse(
+                    p.precomputed.ᶜspecific.q_liq +
+                    p.precomputed.ᶜspecific.q_ice > 0,
+                    1,
+                    0,
+                ),
+                p.precomputed.ᶜspecific.q_liq,
+                p.precomputed.ᶜspecific.q_ice,
             ),
         ),
     )

diff --git a/src/cache/diagnostic_edmf_precomputed_quantities.jl b/src/cache/diagnostic_edmf_precomputed_quantities.jl
@@ -535,8 +535,7 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_do_integral!(
             # To be applied in updraft continuity, moisture and energy
             # for updrafts and grid mean
             if precip_model isa Microphysics0Moment
-                @. S_q_totʲ_prev_level = q_tot_precipitation_sources(
-                    precip_model,
+                @. S_q_totʲ_prev_level = q_tot_0M_precipitation_sources(
                     thermo_params,
                     microphys_0m_params,
                     dt,
@@ -1034,8 +1033,7 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_env_precipita
     (; q_tot) = p.precomputed.ᶜspecific
 
     # Environment precipitation sources (to be applied to grid mean)
-    @. ᶜSqₜᵖ⁰ = q_tot_precipitation_sources(
-        precip_model,
+    @. ᶜSqₜᵖ⁰ = q_tot_0M_precipitation_sources(
         thermo_params,
         microphys_0m_params,
         dt,

diff --git a/src/cache/precomputed_quantities.jl b/src/cache/precomputed_quantities.jl
@@ -318,6 +318,9 @@ function thermo_vars(moisture_model, precip_model, specific, K, Φ)
     energy_var = (; e_int = specific.e_tot - K - Φ)
     moisture_var = if moisture_model isa DryModel
         (;)
+    elseif moisture_model isa EquilMoistModel &&
+           precip_model isa NoPrecipitation
+        (; specific.q_tot)
     elseif moisture_model isa EquilMoistModel &&
            precip_model isa Microphysics0Moment
         (; specific.q_tot)