diff --git a/src/cache/diagnostic_edmf_precomputed_quantities.jl b/src/cache/diagnostic_edmf_precomputed_quantities.jl index b174d814b8..3daa4f5d09 100644 --- a/src/cache/diagnostic_edmf_precomputed_quantities.jl +++ b/src/cache/diagnostic_edmf_precomputed_quantities.jl @@ -306,16 +306,17 @@ function set_diagnostic_edmf_precomputed_quantities!(Y, p, t) local_geometry_prev_halflevel, ), TD.relative_humidity(thermo_params, tsʲ_prev_level), - ᶜbuoyancy(params, ρ_ref_prev_level, ρʲ_prev_level), + ᶜphysical_buoyancy(params, ρ_ref_prev_level, ρʲ_prev_level), get_physical_w( u³⁰_prev_halflevel, local_geometry_prev_halflevel, ), TD.relative_humidity(thermo_params, ts_prev_level), - ᶜbuoyancy(params, ρ_ref_prev_level, ρ_prev_level), + ᶜphysical_buoyancy(params, ρ_ref_prev_level, ρ_prev_level), dt, ) + # TODO: use updraft top instead of scale height @. nh_pressureʲ_prev_level = ᶠupdraft_nh_pressure( params, p.atmos.edmfx_nh_pressure, @@ -588,7 +589,6 @@ function set_diagnostic_edmf_precomputed_quantities!(Y, p, t) turbconv_params = CAP.turbconv_params(params) c_m = TCP.tke_ed_coeff(turbconv_params) @. ᶜK_u = c_m * ᶜmixing_length * sqrt(max(ᶜtke⁰, 0)) - # TODO: add Prantdl number @. ᶜK_h = ᶜK_u / ᶜprandtl_nvec ρatke_flux_values = Fields.field_values(ρatke_flux) diff --git a/src/cache/edmf_precomputed_quantities.jl b/src/cache/edmf_precomputed_quantities.jl index 6729c6d1f9..0e98e7add8 100644 --- a/src/cache/edmf_precomputed_quantities.jl +++ b/src/cache/edmf_precomputed_quantities.jl @@ -159,10 +159,10 @@ function set_edmf_precomputed_quantities!(Y, p, ᶠuₕ³, t) Y.c.sgsʲs.:($$j).ρa / ᶜρʲs.:($$j), get_physical_w(ᶜuʲs.:($$j), ᶜlg), TD.relative_humidity(thermo_params, ᶜtsʲs.:($$j)), - ᶜbuoyancy(params, ᶜρ_ref, ᶜρʲs.:($$j)), + ᶜphysical_buoyancy(params, ᶜρ_ref, ᶜρʲs.:($$j)), get_physical_w(ᶜu⁰, ᶜlg), TD.relative_humidity(thermo_params, ᶜts⁰), - ᶜbuoyancy(params, ᶜρ_ref, ᶜρ⁰), + ᶜphysical_buoyancy(params, ᶜρ_ref, ᶜρ⁰), dt, ) end diff --git a/src/prognostic_equations/edmfx_closures.jl b/src/prognostic_equations/edmfx_closures.jl index 2623b9bf57..37ecd8383a 100644 --- a/src/prognostic_equations/edmfx_closures.jl +++ b/src/prognostic_equations/edmfx_closures.jl @@ -9,7 +9,7 @@ import ClimaCore.Fields as Fields """ Return buoyancy on cell centers. """ -function ᶜbuoyancy(params, ᶜρ_ref::FT, ᶜρ::FT) where {FT} +function ᶜphysical_buoyancy(params, ᶜρ_ref::FT, ᶜρ::FT) where {FT} # TODO - replace by ᶜgradᵥᶠΦ when we move to deep atmosphere g = CAP.grav(params) return (ᶜρ_ref - ᶜρ) / ᶜρ * g