Added generic draft_sum (as comment for now)

Remove from ᶜρa⁰

Fixed syntax errors

Removed ᶜρ⁰ from precomputed

Remove ᶜq_tot⁰ (and fix forgotten ᶜρa⁰

Introduced helper functions to compute sums over draft, environmental volumetric variables, and specific env variables

Use new helper functions to simplify calculation of ᶜq_tot⁰

Remove redundant draft sum functions

Added specific_env_mse helper

Removed ᶜmse⁰ from precomputed

Remove ᶜq_liq⁰, ᶜq_ice⁰, ᶜq_rai⁰, ᶜq_sno⁰ from precomputed

Remove redundant draft sum helper functions; docstrings

Added TODO

Renamed specific_gs to all_specific_gs; specific_sgs to all_specific_sgs; added docstrings

Added new helper specific_sgs to cleanly extract specific SGS quantities; use it to get env TKE

Change specific_sgs to use ClimaCore>MatrixFIelds for type stability

Removed ᶜspecific (GS precomputed specific quantities); caveat lector [lots of changes]

Correcting errors in previous commit removing gs precomputed quantities

Removed a few more instances of ᶜspecific from precomputed quantities; removed ᶜtke⁰

Missing ᶜtke⁰ removal

Another ᶜtke⁰ fix

Introduced helper function for specific_tke and used it where needed

Corrections of rebasing mistakes; updates to variable_manipulations for clarity.

Removing some more ᶜspecific

Added ᶜtke⁰ computations

Removal of more specifics

Remove h_tot

Syntax corrections

Fixes in cloud fraction

Syntax error fix in jacobian

Remove specific in precomputed_quantities; syntax error corrections

Author: tapios

src/ClimaAtmos.jl

@@ -8,6 +8,8 @@ import LazyBroadcast
 import LazyBroadcast: lazy
 import Thermodynamics as TD
 import Thermodynamics
+import ClimaCore.MatrixFields: @name
+
 
 include("compat.jl")
 include(joinpath("parameters", "Parameters.jl"))

src/cache/cloud_fraction.jl

@@ -62,14 +62,16 @@ NVTX.@annotate function set_cloud_fraction!(
             TD.PhasePartition(thermo_params, ᶜts).ice,
         )
     else
+        q_liq = @. lazy(specific(Y.c.ρq_liq, Y.c.ρ))
+        q_ice = @. lazy(specific(Y.c.ρq_ice, Y.c.ρ))
         @. cloud_diagnostics_tuple = make_named_tuple(
             ifelse(
-                specific(Y.c.ρq_liq, Y.c.ρ) + specific(Y.c.ρq_ice, Y.c.ρ) > 0,
+                q_liq + q_ice > 0,
                 1,
                 0,
             ),
-            specific(Y.c.ρq_liq, Y.c.ρ),
-            specific(Y.c.ρq_ice, Y.c.ρ),
+            q_liq,
+            q_ice,
         )
     end
 end
@@ -89,6 +91,16 @@ NVTX.@annotate function set_cloud_fraction!(
     (; turbconv_model) = p.atmos
 
     if isnothing(turbconv_model)
+        (;
+            ᶜlinear_buoygrad,
+            ᶜstrain_rate_norm,
+            ᶠu³⁰,
+            ᶠu³,
+            ᶜentrʲs, 
+            ᶜdetrʲs, 
+            ᶠu³ʲs,
+        ) = p.precomputed
+        ᶜρa⁰ = @.lazy(ρa⁰(Y.c))
         if p.atmos.call_cloud_diagnostics_per_stage isa
            CallCloudDiagnosticsPerStage
             (; ᶜgradᵥ_θ_virt, ᶜgradᵥ_q_tot, ᶜgradᵥ_θ_liq_ice) = p.precomputed
@@ -193,8 +205,9 @@ NVTX.@annotate function set_cloud_fraction!(
     FT = eltype(params)
     thermo_params = CAP.thermodynamics_params(params)
     (; ᶜts⁰, ᶜmixing_length, cloud_diagnostics_tuple) = p.precomputed
-    (; ᶜρʲs, ᶜtsʲs, ᶜρa⁰, ᶜρ⁰) = p.precomputed
+    (; ᶜρʲs, ᶜtsʲs) = p.precomputed
     (; turbconv_model) = p.atmos
+    ᶜρa⁰ = @.lazy(ρa⁰(Y.c))
 
     # TODO - we should make this default when using diagnostic edmf
     # environment
@@ -213,9 +226,9 @@ NVTX.@annotate function set_cloud_fraction!(
     # weight cloud diagnostics by environmental area
     @. cloud_diagnostics_tuple *= NamedTuple{(:cf, :q_liq, :q_ice)}(
         tuple(
-            draft_area(ᶜρa⁰, ᶜρ⁰),
-            draft_area(ᶜρa⁰, ᶜρ⁰),
-            draft_area(ᶜρa⁰, ᶜρ⁰),
+            draft_area(ᶜρa⁰, TD.air_density(thermo_params, ᶜts⁰)),
+            draft_area(ᶜρa⁰, TD.air_density(thermo_params, ᶜts⁰)),
+            draft_area(ᶜρa⁰, TD.air_density(thermo_params, ᶜts⁰)),
         ),
     )
     # updrafts

src/cache/diagnostic_edmf_precomputed_quantities.jl

@@ -61,7 +61,7 @@ NVTX.@annotate function set_diagnostic_edmfx_env_quantities_level!(
     local_geometry_halflevel,
     turbconv_model,
 )
-    @. u³⁰_halflevel = divide_by_ρa(
+    @. u³⁰_halflevel = specific(
         ρ_level * u³_halflevel -
         unrolled_dotproduct(ρaʲs_level, u³ʲs_halflevel),
         ρ_level,
@@ -93,16 +93,20 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_bottom_bc!(
     FT = eltype(Y)
     n = n_mass_flux_subdomains(turbconv_model)
     (; ᶜΦ) = p.core
-    (; ᶜp, ᶠu³, ᶜh_tot, ᶜK) = p.precomputed
-    (; q_tot) = p.precomputed.ᶜspecific
+    (; ᶜp, ᶠu³, ᶜK) = p.precomputed
     (; ustar, obukhov_length, buoyancy_flux, ρ_flux_h_tot, ρ_flux_q_tot) =
         p.precomputed.sfc_conditions
     (; ᶜρaʲs, ᶠu³ʲs, ᶜKʲs, ᶜmseʲs, ᶜq_totʲs, ᶜtsʲs, ᶜρʲs) = p.precomputed
     (; ᶠu³⁰, ᶜK⁰) = p.precomputed
 
     (; params) = p
+  
     thermo_params = CAP.thermodynamics_params(params)
     turbconv_params = CAP.turbconv_params(params)
+    ᶜts = p.precomputed.ᶜts   #TODO replace
+
+    q_tot = specific(Y.c.ρq_tot, Y.c.ρ)
+    ᶜh_tot = @. lazy(TD.total_specific_enthalpy(thermo_params, ᶜts, specific(Y.c.ρe_tot, Y.c.ρ)))
 
     ρ_int_level = Fields.field_values(Fields.level(Y.c.ρ, 1))
     uₕ_int_level = Fields.field_values(Fields.level(Y.c.uₕ, 1))
@@ -305,8 +309,7 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_do_integral!(
     (; dt) = p
     dt = float(dt)
     (; ᶜΦ, ᶜgradᵥ_ᶠΦ) = p.core
-    (; ᶜp, ᶠu³, ᶜts, ᶜh_tot, ᶜK) = p.precomputed
-    (; q_tot) = p.precomputed.ᶜspecific
+    (; ᶜp, ᶠu³, ᶜts, ᶜK) = p.precomputed
     (;
         ᶜρaʲs,
         ᶠu³ʲs,
@@ -324,10 +327,8 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_do_integral!(
     (; ᶠu³⁰, ᶜK⁰, ᶜtke⁰) = p.precomputed
 
     if microphysics_model isa Microphysics1Moment
-        ᶜq_liqʲs = p.precomputed.ᶜq_liqʲs
-        ᶜq_iceʲs = p.precomputed.ᶜq_iceʲs
-        q_rai = p.precomputed.ᶜqᵣ
-        q_sno = p.precomputed.ᶜqₛ
+        q_rai = @. lazy(specific(Y.c.ρq_rai, Y.c.ρ))
+        q_sno = @. lazy(specific(Y.c.ρq_sno, Y.c.ρ))
     end
 
     thermo_params = CAP.thermodynamics_params(params)
@@ -347,6 +348,7 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_do_integral!(
         Fields.field_values(Fields.level(Fields.coordinate_field(Y.f).z, half))
 
     # integral
+    q_tot = specific(Y.c.ρq_tot, Y.c.ρ)
     for i in 2:Spaces.nlevels(axes(Y.c))
         ρ_level = Fields.field_values(Fields.level(Y.c.ρ, i))
         uₕ_level = Fields.field_values(Fields.level(Y.c.uₕ, i))
@@ -965,7 +967,6 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_env_closures!
     (; dt) = p
     (; ᶜp, ᶜu, ᶜts) = p.precomputed
     (; ustar, obukhov_length) = p.precomputed.sfc_conditions
-    (; ᶜtke⁰) = p.precomputed
     (;
         ᶜlinear_buoygrad,
         ᶜstrain_rate_norm,
@@ -1083,6 +1084,7 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_env_precipita
     (; ᶜts, ᶜSqₜᵖ⁰) = p.precomputed
 
     # Environment precipitation sources (to be applied to grid mean)
+    q_tot = @. lazy(specific(Y.c.ρq_tot, Y.c.ρ))
     @. ᶜSqₜᵖ⁰ = q_tot_0M_precipitation_sources(
         thermo_params,
         microphys_0m_params,
@@ -1126,4 +1128,4 @@ NVTX.@annotate function set_diagnostic_edmf_precomputed_quantities_env_precipita
     #    thermo_params,
     #)
     return nothing
-end
+end

src/cache/precipitation_precomputed_quantities.jl

@@ -112,6 +112,11 @@ function set_precipitation_velocities!(
     cm2p = CAP.microphysics_2m_params(p.params)
     thp = CAP.thermodynamics_params(p.params)
 
+    q_liq = @. lazy(specific(Y.c.ρq_liq, Y.c.ρ))
+    q_ice = @. lazy(specific(Y.c.ρq_ice, Y.c.ρ))
+    q_rai = @. lazy(specific(Y.c.ρq_rai, Y.c.ρ))
+    q_sno = @. lazy(specific(Y.c.ρq_sno, Y.c.ρ))
+
     # compute the precipitation terminal velocity [m/s]
     # TODO sedimentation of snow is based on the 1M scheme
     @. ᶜwnᵣ = getindex(
@@ -253,10 +258,11 @@ function set_precipitation_cache!(
     ::PrognosticEDMFX,
 )
     (; ᶜΦ) = p.core
-    (; ᶜSqₜᵖ⁰, ᶜSqₜᵖʲs, ᶜρa⁰) = p.precomputed
+    (; ᶜSqₜᵖ⁰, ᶜSqₜᵖʲs) = p.precomputed
     (; ᶜS_ρq_tot, ᶜS_ρe_tot) = p.precomputed
     (; ᶜts⁰, ᶜtsʲs) = p.precomputed
     thermo_params = CAP.thermodynamics_params(p.params)
+    ᶜρa⁰ = @.lazy(ρa⁰(Y.c))
 
     n = n_mass_flux_subdomains(p.atmos.turbconv_model)
 
@@ -283,7 +289,8 @@ function set_precipitation_cache!(Y, p, ::Microphysics1Moment, _)
     (; ᶜts, ᶜwᵣ, ᶜwₛ, ᶜu) = p.precomputed
     (; ᶜSqₗᵖ, ᶜSqᵢᵖ, ᶜSqᵣᵖ, ᶜSqₛᵖ) = p.precomputed
 
-    (; q_tot, q_liq, q_ice, q_rai, q_sno) = p.precomputed.ᶜspecific
+    q_rai = specific(Y.c.ρq_rai, Y.c.ρ)
+    q_sno = specific(Y.c.ρq_sno, Y.c.ρ)
 
     ᶜSᵖ = p.scratch.ᶜtemp_scalar
     ᶜSᵖ_snow = p.scratch.ᶜtemp_scalar_2
@@ -357,6 +364,11 @@ function set_precipitation_cache!(Y, p, ::Microphysics2Moment, _)
     (; ᶜSqₗᵖ, ᶜSqᵢᵖ, ᶜSqᵣᵖ, ᶜSqₛᵖ) = p.precomputed
     (; ᶜSnₗᵖ, ᶜSnᵣᵖ) = p.precomputed
 
+    q_liq = specific(Y.c.ρq_liq, Y.c.ρ)
+    q_rai = specific(Y.c.ρq_rai, Y.c.ρ)
+    n_liq = specific(Y.c.ρn_liq, Y.c.ρ)
+    n_rai = specific(Y.c.ρn_rai, Y.c.ρ)
+
     ᶜSᵖ = p.scratch.ᶜtemp_scalar
     ᶜS₂ᵖ = p.scratch.ᶜtemp_scalar_2
 
@@ -469,14 +481,26 @@ function set_precipitation_surface_fluxes!(
     sfc_ρ = @. lazy(int_ρ * int_J / sfc_J)
 
     # Constant extrapolation to surface, consistent with simple downwinding
-    sfc_wᵣ = sfc_lev(ᶜwᵣ)
-    sfc_wₛ = sfc_lev(ᶜwₛ)
-    sfc_wₗ = sfc_lev(ᶜwₗ)
-    sfc_wᵢ = sfc_lev(ᶜwᵢ)
-    sfc_qᵣ = lazy.(specific.(sfc_lev(Y.c.ρq_rai), sfc_ρ))
-    sfc_qₛ = lazy.(specific.(sfc_lev(Y.c.ρq_sno), sfc_ρ))
-    sfc_qₗ = lazy.(specific.(sfc_lev(Y.c.ρq_liq), sfc_ρ))
-    sfc_qᵢ = lazy.(specific.(sfc_lev(Y.c.ρq_ice), sfc_ρ))
+    sfc_qᵣ = Fields.Field(
+        Fields.field_values(Fields.level(specific(Y.c.ρq_rai, Y.c.ρ), 1)),
+        sfc_space,
+    )
+    sfc_qₛ = Fields.Field(
+        Fields.field_values(Fields.level(specific(Y.c.ρq_sno, Y.c.ρ), 1)),
+        sfc_space,
+    )
+    sfc_qₗ = Fields.Field(
+        Fields.field_values(Fields.level(specific(Y.c.ρq_liq, Y.c.ρ), 1)),
+        sfc_space,
+    )
+    sfc_qᵢ = Fields.Field(
+        Fields.field_values(Fields.level(specific(Y.c.ρq_ice, Y.c.ρ), 1)),
+        sfc_space,
+    )
+    sfc_wᵣ = Fields.Field(Fields.field_values(Fields.level(ᶜwᵣ, 1)), sfc_space)
+    sfc_wₛ = Fields.Field(Fields.field_values(Fields.level(ᶜwₛ, 1)), sfc_space)
+    sfc_wₗ = Fields.Field(Fields.field_values(Fields.level(ᶜwₗ, 1)), sfc_space)
+    sfc_wᵢ = Fields.Field(Fields.field_values(Fields.level(ᶜwᵢ, 1)), sfc_space)
 
     @. surface_rain_flux = sfc_ρ * (sfc_qᵣ * (-sfc_wᵣ) + sfc_qₗ * (-sfc_wₗ))
     @. surface_snow_flux = sfc_ρ * (sfc_qₛ * (-sfc_wₛ) + sfc_qᵢ * (-sfc_wᵢ))

src/cache/precomputed_quantities.jl

@@ -11,28 +11,20 @@ Allocates precomputed quantities that are treated implicitly (i.e., updated
 on each iteration of the implicit solver). This includes all quantities related
 to velocity and thermodynamics that are used in the implicit tendency.
 
-The following grid-scale quantities are treated implicitly:
-    - `ᶜspecific`: specific quantities on cell centers (for every prognostic
-        quantity `ρχ`, there is a corresponding specific quantity `χ`)
+The following grid-scale quantities are treated implicitly and are precomputed:
     - `ᶜu`: covariant velocity on cell centers
     - `ᶠu`: contravariant velocity on cell faces
     - `ᶜK`: kinetic energy on cell centers
     - `ᶜts`: thermodynamic state on cell centers
     - `ᶜp`: air pressure on cell centers
-    - `ᶜh_tot`: total enthalpy on cell centers
 If the `turbconv_model` is `PrognosticEDMFX`, there also two SGS versions of
 every quantity except for `ᶜp` (which is shared across all subdomains):
     - `_⁰`: value for the environment
     - `_ʲs`: a tuple of values for the mass-flux subdomains
 In addition, there are several other SGS quantities for `PrognosticEDMFX`:
-    - `ᶜtke⁰`: turbulent kinetic energy of the environment on cell centers
-    - `ᶜρa⁰`: area-weighted air density of the environment on cell centers
-    - `ᶜmse⁰`: moist static energy of the environment on cell centers
-    - `ᶜq_tot⁰`: total specific humidity of the environment on cell centers
-    - `ᶜρ⁰`: air density of the environment on cell centers
     - `ᶜρʲs`: a tuple of the air densities of the mass-flux subdomains on cell
         centers
-For every other `AbstractEDMF`, only `ᶜtke⁰` is added as a precomputed quantity.
+
 
 TODO: Rename `ᶜK` to `ᶜκ`.
 """
@@ -48,43 +40,25 @@ function implicit_precomputed_quantities(Y, atmos)
         ᶠu = similar(Y.f, CT123{FT}),
         ᶜK = similar(Y.c, FT),
         ᶜts = similar(Y.c, TST),
-        ᶜp = similar(Y.c, FT),
-        ᶜh_tot = similar(Y.c, FT),
+        ᶜp = similar(Y.c, FT)
     )
     sgs_quantities =
-        turbconv_model isa AbstractEDMF ? (; ᶜtke⁰ = similar(Y.c, FT)) : (;)
-    moisture_sgs_quantities =
-        (
-            turbconv_model isa PrognosticEDMFX &&
-            moisture_model isa NonEquilMoistModel &&
-            microphysics_model isa Microphysics1Moment
-        ) ?
-        (;
-            ᶜq_liq⁰ = similar(Y.c, FT),
-            ᶜq_ice⁰ = similar(Y.c, FT),
-            ᶜq_rai⁰ = similar(Y.c, FT),
-            ᶜq_sno⁰ = similar(Y.c, FT),
-        ) : (;)
+        turbconv_model isa AbstractEDMF ? (;) : (;)
     prognostic_sgs_quantities =
         turbconv_model isa PrognosticEDMFX ?
         (;
-            ᶜρa⁰ = similar(Y.c, FT),
-            ᶜmse⁰ = similar(Y.c, FT),
-            ᶜq_tot⁰ = similar(Y.c, FT),
             ᶠu₃⁰ = similar(Y.f, C3{FT}),
             ᶜu⁰ = similar(Y.c, C123{FT}),
             ᶠu³⁰ = similar(Y.f, CT3{FT}),
             ᶜK⁰ = similar(Y.c, FT),
             ᶜts⁰ = similar(Y.c, TST),
-            ᶜρ⁰ = similar(Y.c, FT),
             ᶜuʲs = similar(Y.c, NTuple{n, C123{FT}}),
             ᶠu³ʲs = similar(Y.f, NTuple{n, CT3{FT}}),
             ᶜKʲs = similar(Y.c, NTuple{n, FT}),
             ᶠKᵥʲs = similar(Y.f, NTuple{n, FT}),
             ᶜtsʲs = similar(Y.c, NTuple{n, TST}),
             ᶜρʲs = similar(Y.c, NTuple{n, FT}),
             ᶠnh_pressure₃_dragʲs = similar(Y.f, NTuple{n, C3{FT}}),
-            moisture_sgs_quantities...,
         ) : (;)
     return (; gs_quantities..., sgs_quantities..., prognostic_sgs_quantities...)
 end
@@ -194,7 +168,6 @@ function precomputed_quantities(Y, atmos)
         atmos.turbconv_model isa EDOnlyEDMFX ?
         (;
             ᶜmixing_length_tuple = similar(Y.c, MixingLength{FT}),
-            ᶜtke⁰ = similar(Y.c, FT),
             ᶜK_u = similar(Y.c, FT),
             ρatke_flux = similar(Fields.level(Y.f, half), C3{FT}),
             ᶜK_h = similar(Y.c, FT),
@@ -399,18 +372,23 @@ function thermo_state(
     return get_ts(ρ, p, θ, e_int, q_tot, q_pt)
 end
 
-function thermo_vars(moisture_model, microphysics_model, ᶜY, K, Φ)
-    energy_var = (; e_int = specific(ᶜY.ρe_tot, ᶜY.ρ) - K - Φ)
+function thermo_vars(moisture_model, microphysics_model, Y_c, K, Φ)
+    # Compute specific quantities on-the-fly
+    e_tot = @. lazy(specific(Y_c.ρe_tot, Y_c.ρ))
+    energy_var = (; e_int = e_tot - K - Φ)
+    
     moisture_var = if moisture_model isa DryModel
         (;)
     elseif moisture_model isa EquilMoistModel
-        (; q_tot = specific(ᶜY.ρq_tot, ᶜY.ρ))
+        q_tot = @. lazy(specific(Y_c.ρq_tot, Y_c.ρ))
+        (; q_tot)
     elseif moisture_model isa NonEquilMoistModel
-        q_pt_args = (;
-            q_tot = specific(ᶜY.ρq_tot, ᶜY.ρ),
-            q_liq = specific(ᶜY.ρq_liq, ᶜY.ρ) + specific(ᶜY.ρq_rai, ᶜY.ρ),
-            q_ice = specific(ᶜY.ρq_ice, ᶜY.ρ) + specific(ᶜY.ρq_sno, ᶜY.ρ),
-        )
+        q_tot = @. lazy(specific(Y_c.ρq_tot, Y_c.ρ))
+        q_liq = @. lazy(specific(Y_c.ρq_liq, Y_c.ρ))
+        q_ice = @. lazy(specific(Y_c.ρq_ice, Y_c.ρ))
+        q_rai = @. lazy(specific(Y_c.ρq_rai, Y_c.ρ))
+        q_sno = @. lazy(specific(Y_c.ρq_sno, Y_c.ρ))
+        q_pt_args = (q_tot, q_liq + q_rai, q_ice + q_sno)
         (; q_pt = TD.PhasePartition(q_pt_args...))
     end
     return (; energy_var..., moisture_var...)
@@ -458,7 +436,7 @@ quantities are updated.
 NVTX.@annotate function set_implicit_precomputed_quantities!(Y, p, t)
     (; turbconv_model, moisture_model, microphysics_model) = p.atmos
     (; ᶜΦ) = p.core
-    (; ᶜspecific, ᶜu, ᶠu³, ᶠu, ᶜK, ᶜts, ᶜp, ᶜh_tot) = p.precomputed
+    (; ᶜu, ᶠu³, ᶠu, ᶜK, ᶜts, ᶜp) = p.precomputed
     ᶠuₕ³ = p.scratch.ᶠtemp_CT3
     n = n_mass_flux_subdomains(turbconv_model)
     thermo_params = CAP.thermodynamics_params(p.params)
@@ -492,19 +470,15 @@ NVTX.@annotate function set_implicit_precomputed_quantities!(Y, p, t)
     end
     @. ᶜts = ts_gs(thermo_args..., Y.c, ᶜK, ᶜΦ, Y.c.ρ)
     @. ᶜp = TD.air_pressure(thermo_params, ᶜts)
-    @. ᶜh_tot = TD.total_specific_enthalpy(
-        thermo_params,
-        ᶜts,
-        specific(Y.c.ρe_tot, Y.c.ρ),
-    )
 
     if turbconv_model isa PrognosticEDMFX
         set_prognostic_edmf_precomputed_quantities_draft!(Y, p, ᶠuₕ³, t)
         set_prognostic_edmf_precomputed_quantities_environment!(Y, p, ᶠuₕ³, t)
         set_prognostic_edmf_precomputed_quantities_implicit_closures!(Y, p, t)
-    elseif turbconv_model isa AbstractEDMF
-        (; ᶜtke⁰) = p.precomputed
-        @. ᶜtke⁰ = Y.c.sgs⁰.ρatke / Y.c.ρ
+    elseif turbconv_model isa DiagnosticEDMFX
+        set_diagnostic_edmf_precomputed_quantities!(Y, p, t)
+    elseif !(isnothing(turbconv_model))
+        # Do nothing for other turbconv models for now
     end
 end