Start using columnwise

Author: charleskawczynski

src/prognostic_equations/remaining_tendency.jl

@@ -10,9 +10,81 @@ NVTX.@annotate function hyperdiffusion_tendency!(Yₜ, Yₜ_lim, Y, p, t)
     apply_hyperdiffusion_tendency!(Yₜ, Y, p, t)
 end
 
+prognostic_nt(::Val{names}, tends...) where {names} =
+    NamedTuple{names}(tends)
+
+function ᶜremaining_tendency(ᶜY, ᶠY, p, t)
+    names = propertynames(ᶜY)
+    tends = (
+            ᶜremaining_tendency_ρ(ᶜY, ᶠY, p, t)...,
+            ᶜremaining_tendency_uₕ(ᶜY, ᶠY, p, t)...,
+            ᶜremaining_tendency_ρe_tot(ᶜY, ᶠY, p, t)...,
+            ᶜremaining_tendency_ρq_tot(ᶜY, ᶠY, p, t)...,
+            ᶜremaining_tendency_sgsʲs(ᶜY, ᶠY, p, t)...,
+    )
+    return lazy.(prognostic_nt.(Val(names), tends...))
+end
+function ᶠremaining_tendency(ᶜY, ᶠY, p, t)
+    names = propertynames(ᶠY)
+    tends = (
+            ᶠremaining_tendency_u₃(ᶜY, ᶠY, p, t)...,
+            ᶠremaining_tendency_sgsʲs(ᶜY, ᶠY, p, t)...,
+    )
+    return lazy.(prognostic_nt.(Val(names), tends...))
+end
+
+function ᶜremaining_tendency_ρ(ᶜY, ᶠY, p, t)
+    :ρ in propertynames(ᶜY) || return ()
+    ∑tendencies = zero(eltype(ᶜY.ρ))
+    return (;ρ=∑tendencies)
+end
+function ᶜremaining_tendency_uₕ(ᶜY, ᶠY, p, t)
+    :uₕ in propertynames(ᶜY) || return ()
+    ∑tendencies = zero(eltype(ᶜY.uₕ))
+    return (;uₕ=∑tendencies)
+end
+function ᶜremaining_tendency_ρe_tot(ᶜY, ᶠY, p, t)
+    :ρe_tot in propertynames(ᶜY) || return ()
+    ∑tendencies = zero(eltype(ᶜY.ρe_tot))
+    return (;ρe_tot=∑tendencies)
+end
+function ᶜremaining_tendency_ρq_tot(ᶜY, ᶠY, p, t)
+    :ρq_tot in propertynames(ᶜY) || return ()
+    ∑tendencies = zero(eltype(ᶜY.ρq_tot))
+    return (;ρq_tot=∑tendencies)
+end
+function ᶜremaining_tendency_sgsʲs(ᶜY, ᶠY, p, t)
+    :sgsʲs in propertynames(ᶜY) || return ()
+    ∑tendencies = zero(eltype(ᶜY.sgsʲs))
+    return (;sgsʲs=∑tendencies)
+end
+function ᶠremaining_tendency_u₃(ᶜY, ᶠY, p, t)
+    :u₃ in propertynames(ᶠY) || return ()
+    ∑tendencies = zero(eltype(ᶠY.u₃))
+    return (;u₃=∑tendencies)
+end
+function ᶠremaining_tendency_sgsʲs(ᶜY, ᶠY, p, t)
+    :sgsʲs in propertynames(ᶠY) || return ()
+    ∑tendencies = zero(eltype(ᶠY.sgsʲs))
+    return (;sgsʲs=∑tendencies)
+end
+
+
 NVTX.@annotate function remaining_tendency!(Yₜ, Yₜ_lim, Y, p, t)
     Yₜ_lim .= zero(eltype(Yₜ_lim))
-    Yₜ .= zero(eltype(Yₜ))
+    device = ClimaComms.device(axes(Y.c))
+    p_kernel = (;)
+    Operators.columnwise!(
+        device,
+        ᶜremaining_tendency,
+        ᶠremaining_tendency,
+        Yₜ.c,
+        Yₜ.f,
+        Y.c,
+        Y.f,
+        p_kernel,
+        t,
+    )
     horizontal_tracer_advection_tendency!(Yₜ_lim, Y, p, t)
     fill_with_nans!(p)
     horizontal_advection_tendency!(Yₜ, Y, p, t)