Reduce use of ᶜspecific

Author: charleskawczynski

src/prognostic_equations/hyperdiffusion.jl

@@ -85,7 +85,7 @@ NVTX.@annotate function prep_hyperdiffusion_tendency!(Yₜ, Y, p, t)
 
     n = n_mass_flux_subdomains(turbconv_model)
     diffuse_tke = use_prognostic_tke(turbconv_model)
-    (; ᶜp, ᶜspecific) = p.precomputed
+    (; ᶜp) = p.precomputed
     (; ᶜ∇²u, ᶜ∇²specific_energy) = p.hyperdiff
     if turbconv_model isa PrognosticEDMFX
         (; ᶜ∇²uₕʲs, ᶜ∇²uᵥʲs, ᶜ∇²uʲs, ᶜ∇²mseʲs) = p.hyperdiff
@@ -137,7 +137,7 @@ NVTX.@annotate function apply_hyperdiffusion_tendency!(Yₜ, Y, p, t)
     diffuse_tke = use_prognostic_tke(turbconv_model)
     ᶜJ = Fields.local_geometry_field(Y.c).J
     point_type = eltype(Fields.coordinate_field(Y.c))
-    (; ᶜp, ᶜspecific) = p.precomputed
+    (; ᶜp) = p.precomputed
     (; ᶜ∇²u, ᶜ∇²specific_energy) = p.hyperdiff
     if turbconv_model isa PrognosticEDMFX
         (; ᶜρa⁰) = p.precomputed
@@ -240,11 +240,13 @@ NVTX.@annotate function prep_tracer_hyperdiffusion_tendency!(Yₜ, Y, p, t)
     (; hyperdiff, turbconv_model) = p.atmos
     isnothing(hyperdiff) && return nothing
 
-    (; ᶜspecific) = p.precomputed
     (; ᶜ∇²specific_tracers) = p.hyperdiff
 
-    for χ_name in propertynames(ᶜ∇²specific_tracers)
-        @. ᶜ∇²specific_tracers.:($$χ_name) = wdivₕ(gradₕ(ᶜspecific.:($$χ_name)))
+    for ρχ_name in filter(is_tracer_var, propertynames(Y.c))
+        χ_name = specific_name(ρχ_name)
+        ᶜρχ = getproperty(Y.c, ρχ_name)
+        ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
+        @. ᶜ∇²specific_tracers.:($$χ_name) = wdivₕ(gradₕ(ᶜχ))
     end
 
     if turbconv_model isa PrognosticEDMFX

src/utils/variable_manipulations.jl

@@ -42,6 +42,27 @@ Arguments:
 """
 @inline specific(ρχ, ρ) = ρχ / ρ
 
+@inline specific_name(ρχ_name::Symbol) =
+    if ρχ_name == :ρe_tot
+        return :e_tot
+    elseif ρχ_name == :ρq_tot
+        return :q_tot
+    elseif ρχ_name == :ρq_liq
+        return :q_liq
+    elseif ρχ_name == :ρq_ice
+        return :q_ice
+    elseif ρχ_name == :ρq_rai
+        return :n_liq
+    elseif ρχ_name == :ρn_liq
+        return :n_rai
+    elseif ρχ_name == :ρn_rai
+        return :q_rai
+    elseif ρχ_name == :ρq_sno
+        return :q_sno
+    else
+        error("Uncaught name: $ρχ_name")
+    end
+
 @inline function specific(ρaχ, ρa, ρχ, ρ, turbconv_model)
     # TODO: Replace turbconv_model struct by parameters, and include a_half in
     # parameters, not in config