Remove use of matching subfields

Author: charleskawczynski

src/parameterized_tendencies/les_sgs_models/smagorinsky_lilly.jl

@@ -120,6 +120,8 @@ function horizontal_smagorinsky_lilly_tendency!(Yₜ, Y, p, t, ::SmagorinskyLill
 
 end
 
+import UnrolledUtilities as UU
+
 function vertical_smagorinsky_lilly_tendency!(Yₜ, Y, p, t, ::SmagorinskyLilly)
     FT = eltype(Y)
     (; sfc_temp_C3, ᶠtemp_scalar, ᶜtemp_scalar) = p.scratch
@@ -155,19 +157,23 @@ function vertical_smagorinsky_lilly_tendency!(Yₜ, Y, p, t, ::SmagorinskyLilly)
     @. Yₜ.c.ρe_tot -= ᶜdivᵥ_ρe_tot(-(ᶠρ * ᶠD_smag * ᶠgradᵥ(ᶜh_tot)))
 
     ## Tracer diffusion and associated mass changes
-    for (ᶜρχₜ, ᶜχ, χ_name) in CA.matching_subfields(Yₜ.c, ᶜspecific)
-        χ_name == :e_tot && continue
-
-        ᶜdivᵥ_ρχ = Operators.DivergenceF2C(;
-            top = Operators.SetValue(C3(FT(0))),
-            bottom = Operators.SetValue(C3(FT(0))),
-        )
-
-        ᶜ∇ᵥρD∇χₜ = @. ᶜtemp_scalar = ᶜdivᵥ_ρχ(-(ᶠρ * ᶠD_smag * ᶠgradᵥ(ᶜχ)))
-        @. ᶜρχₜ -= ᶜ∇ᵥρD∇χₜ
-        # Rain and snow does not affect the mass
-        if χ_name == :q_tot
-            @. Yₜ.c.ρ -= ᶜ∇ᵥρD∇χₜ
+    UU.unrolled_foreach(filter(is_tracer_var, propertynames(Yₜ.c))) do ρχ_name
+        if ρχ_name != :ρe_tot
+            ᶜρχ = getproperty(Y.c, ρχ_name)
+            ᶜρχₜ = getproperty(Yₜ.c, ρχ_name)
+            ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
+
+            ᶜdivᵥ_ρχ = Operators.DivergenceF2C(;
+                top = Operators.SetValue(C3(FT(0))),
+                bottom = Operators.SetValue(C3(FT(0))),
+            )
+
+            ᶜ∇ᵥρD∇χₜ = @. ᶜtemp_scalar = ᶜdivᵥ_ρχ(-(ᶠρ * ᶠD_smag * ᶠgradᵥ(ᶜχ)))
+            @. ᶜρχₜ -= ᶜ∇ᵥρD∇χₜ
+            # Rain and snow does not affect the mass
+            if ρχ_name == :ρq_tot
+                @. Yₜ.c.ρ -= ᶜ∇ᵥρD∇χₜ
+            end
         end
     end
 end