Remove is_ρq_tot

Author: charleskawczynski

src/parameterized_tendencies/les_sgs_models/smagorinsky_lilly.jl

@@ -107,12 +107,12 @@ function horizontal_smagorinsky_lilly_tendency!(Yₜ, Y, p, t, ::SmagorinskyLill
     @. Yₜ.c.ρe_tot += wdivₕ(Y.c.ρ * ᶜD_smag * gradₕ(ᶜh_tot))
 
     ## Tracer diffusion and associated mass changes
-    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name, is_ρq_tot
+    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
         ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
         ᶜρχₜ_diffusion = @. lazy(wdivₕ(Y.c.ρ * ᶜD_smag * gradₕ(ᶜχ)))
         @. ᶜρχₜ += ᶜρχₜ_diffusion
         # Rain and snow does not affect the mass
-        if is_ρq_tot
+        if ρχ_name == @name(ρq_tot)
             @. Yₜ.c.ρ += ᶜρχₜ_diffusion
         end
     end
@@ -161,11 +161,11 @@ function vertical_smagorinsky_lilly_tendency!(Yₜ, Y, p, t, ::SmagorinskyLilly)
         bottom = Operators.SetValue(C3(FT(0))),
     )
 
-    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name, is_ρq_tot
+    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
         ᶜ∇ᵥρD∇χₜ = @. lazy(ᶜdivᵥ_ρχ(-(ᶠρ * ᶠD_smag * ᶠgradᵥ(specific(ᶜρχ, Y.c.ρ)))))
         @. ᶜρχₜ -= ᶜ∇ᵥρD∇χₜ
         # Rain and snow does not affect the mass
-        if is_ρq_tot
+        if ρχ_name == @name(ρq_tot)
             @. Yₜ.c.ρ -= ᶜ∇ᵥρD∇χₜ
         end
     end

src/prognostic_equations/advection.jl

@@ -213,8 +213,8 @@ NVTX.@annotate function explicit_vertical_advection_tendency!(Yₜ, Y, p, t)
     ᶜρ = Y.c.ρ
 
     # Full vertical advection of passive tracers (like liq, rai, etc) ...
-    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name, is_ρq_tot
-        if !is_ρq_tot
+    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
+        if !(ρχ_name in (@name(ρe_tot), @name(ρq_tot)))
             ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
             vtt = vertical_transport(ᶜρ, ᶠu³, ᶜχ, float(dt), tracer_upwinding)
             @. ᶜρχₜ += vtt

src/prognostic_equations/remaining_tendency.jl

@@ -166,7 +166,7 @@ NVTX.@annotate function additional_tendency!(Yₜ, Y, p, t)
     @. Yₜ.c.ρe_tot += vst_ρe_tot
 
     # TODO: can we write this out explicitly?
-    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name, is_ρq_tot
+    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
         ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
         vst_tracer = viscous_sponge_tendency_tracer(ᶜρ, ᶜχ, viscous_sponge)
         @. ᶜρχₜ += vst_tracer

src/prognostic_equations/surface_flux.jl

@@ -115,16 +115,16 @@ function surface_flux_tendency!(Yₜ, Y, p, t)
     btt = boundary_tendency_scalar(ᶜh_tot, sfc_conditions.ρ_flux_h_tot)
     @. Yₜ.c.ρe_tot -= btt
     ρ_flux_χ = p.scratch.sfc_temp_C3
-    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name, is_ρq_tot
+    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
         ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
-        if is_ρq_tot
+        if ρχ_name == @name(ρq_tot)
             @. ρ_flux_χ = sfc_conditions.ρ_flux_q_tot
         else
             @. ρ_flux_χ = C3(FT(0))
         end
         btt = boundary_tendency_scalar(ᶜχ, ρ_flux_χ)
         @. ᶜρχₜ -= btt
-        if is_ρq_tot
+        if ρχ_name == @name(ρq_tot)
             @. Yₜ.c.ρ -= btt
         end
     end

src/prognostic_equations/vertical_diffusion_boundary_layer.jl

@@ -100,7 +100,7 @@ function vertical_diffusion_boundary_layer_tendency!(
         top = Operators.SetValue(C3(0)),
         bottom = Operators.SetValue(C3(0)),
     )
-    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name, is_ρq_tot
+    foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
         if ρχ_name in (@name(ρq_rai), @name(ρq_sno), @name(ρn_rai))
             @. ᶜK_h_scaled = α_vert_diff_tracer * ᶜK_h
         else
@@ -111,7 +111,7 @@ function vertical_diffusion_boundary_layer_tendency!(
         @. ᶜρχₜ -= ᶜρχₜ_diffusion
         # Only add contribution from total water diffusion to mass tendency
         # (exclude contributions from diffusion of condensate, precipitation)
-        if is_ρq_tot
+        if ρχ_name == @name(ρq_tot)
             @. Yₜ.c.ρ -= ᶜρχₜ_diffusion
         end
     end

src/utils/variable_manipulations.jl

@@ -86,18 +86,18 @@ the current tracer is `ρq_tot` (to allow for special handling).
 Arguments:
 
 - `f`: A function to apply to each scalar. It must have the signature `f
-  (ᶜρχₜ, ᶜρχ, ρχ_name, is_ρq_tot)`, where `ᶜρχₜ` is the tendency field, `ᶜρχ`
-  is the state field, and `is_ρq_tot` is a `Bool`.
+  (ᶜρχₜ, ᶜρχ, ρχ_name)`, where `ᶜρχₜ` is the tendency field, `ᶜρχ`
+  is the state field, and `ρχ_name` is a `MatrixFields.@name` object.
 - `Yₜ`: The tendency state vector.
 - `Y`: The current state vector.
 
 # Example
 
 ```julia
-foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name, is_ρq_tot
+foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
     # Apply some operation, e.g., a sponge layer
     @. ᶜρχₜ += some_sponge_function(ᶜρχ)
-    if is_ρq_tot
+    if ρχ_name == @name(ρq_tot)
         # Perform an additional operation only for ρq_tot
     end
 end
@@ -107,8 +107,7 @@ foreach_tracer(f::F, Yₜ, Y) where {F} =
     unrolled_foreach(tracer_names(Y.c)) do scalar_name
         ᶜρχₜ = MatrixFields.get_field(Yₜ.c, scalar_name)
         ᶜρχ = MatrixFields.get_field(Y.c, scalar_name)
-        is_ρq_tot = scalar_name == @name(ρq_tot)
-        f(ᶜρχₜ, ᶜρχ, scalar_name, is_ρq_tot)
+        f(ᶜρχₜ, ᶜρχ, scalar_name)
     end
 
 """