Merge pull request #4115 from CliMA/aj/bg_bug_vol2

Using liquid fraction

Author: szy21

config/model_configs/prognostic_edmfx_rico_implicit_column.yml

@@ -31,7 +31,7 @@ y_elem: 2
 z_elem: 100
 z_stretch: false
 perturb_initstate: false
-dt: "100secs"
+dt: "60secs"
 t_end: "24hours"
 dt_save_state_to_disk: "60mins"
 toml: [toml/prognostic_edmfx_1M.toml]

src/prognostic_equations/eddy_diffusion_closures.jl

@@ -154,17 +154,10 @@ function buoyancy_gradients(
 
         t_sat = get_t_sat(thermo_params, bg_model)
         phase_part = TD.PhasePartition(thermo_params, ts_sat)
+        λ = TD.liquid_fraction(thermo_params, ts_sat)
         lh =
-            (
-                get_ql_sat(thermo_params, bg_model) *
-                TD.latent_heat_vapor(thermo_params, t_sat) +
-                get_qi_sat(thermo_params, bg_model) *
-                TD.latent_heat_sublim(thermo_params, t_sat)
-            ) /
-            (
-                get_ql_sat(thermo_params, bg_model) +
-                get_qi_sat(thermo_params, bg_model) + sqrt(eps(FT))
-            )
+            λ * TD.latent_heat_vapor(thermo_params, t_sat) +
+            (1 - λ) * TD.latent_heat_sublim(thermo_params, t_sat)
         cp_m = TD.cp_m(thermo_params, ts_sat)
         qv_sat = get_qv_sat(thermo_params, bg_model)
         ∂b∂θli_sat = (