Try revised version of tracer_names

Author: charleskawczynski

src/ClimaAtmos.jl

@@ -6,6 +6,7 @@ import LinearAlgebra
 import NullBroadcasts: NullBroadcasted
 import LazyBroadcast
 import LazyBroadcast: lazy
+import ClimaCore.MatrixFields: @name
 import Thermodynamics as TD
 import Thermodynamics
 

src/utils/utilities.jl

@@ -5,17 +5,19 @@ import ClimaComms
 import ClimaCore: Spaces, Topologies, Fields, Geometry
 import LinearAlgebra: norm_sqr
 
-is_energy_var(symbol) = symbol in (:ρe_tot, :ρae_tot)
-is_momentum_var(symbol) = symbol in (:uₕ, :ρuₕ, :u₃, :ρw)
-is_turbconv_var(symbol) = symbol in (:turbconv, :sgsʲs, :sgs⁰)
-is_tracer_var(symbol) = !(
-    symbol == :ρ ||
-    symbol == :ρa ||
-    is_energy_var(symbol) ||
-    is_momentum_var(symbol) ||
-    is_turbconv_var(symbol)
+is_energy_var(name) = name in (@name(ρe_tot), @name(ρae_tot))
+is_momentum_var(name) = name in (@name(uₕ), @name(ρuₕ), @name(u₃), @name(ρw))
+is_turbconv_var(name) = name in (@name(turbconv), @name(sgsʲs), @name(sgs⁰))
+is_tracer_var(name) = !(
+    name == @name(ρ) ||
+    name == @name(ρa) ||
+    is_energy_var(name) ||
+    is_momentum_var(name) ||
+    is_turbconv_var(name)
 )
 
+is_tracer_var(symbol::Symbol) = is_tracer_var(@name(symbol))
+
 # we may be hitting a slow path:
 # https://stackoverflow.com/questions/14687665/very-slow-stdpow-for-bases-very-close-to-1
 fast_pow(x, y) = exp(y * log(x))

src/utils/variable_manipulations.jl

@@ -68,9 +68,7 @@ Returns:
 - A `Tuple` of `ClimaCore.MatrixFields.FieldName`s corresponding to the tracers.
 """
 tracer_names(field) =
-    unrolled_filter(MatrixFields.top_level_names(field)) do name
-        !(name in (@name(ρ), @name(ρe_tot), @name(uₕ)))
-    end
+    unrolled_filter(is_tracer_var, MatrixFields.top_level_names(field))
 
 """
     foreach_tracer(f::F, Yₜ, Y) where {F}