Merge pull request #2732 from CliMA/as/deepsphere-edmf

deep-sphere branch in edmf advection equation
CliMA · Mar 4, 2024 · 84f7a70 · 84f7a70
2 parents 3ca0ca9 + cdaa4e8
commit 84f7a70
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/prognostic_equations/advection.jl b/src/prognostic_equations/advection.jl
@@ -154,6 +154,11 @@ NVTX.@annotate function explicit_vertical_advection_tendency!(Yₜ, Y, p, t)
                 (ᶜf³[colidx] + ᶜω³[colidx]) × CT12(ᶜu[colidx])
             @. Yₜ.f.u₃[colidx] -=
                 ᶠω¹²[colidx] × ᶠinterp(CT12(ᶜu[colidx])) + ᶠgradᵥ(ᶜK[colidx])
+            for j in 1:n
+                @. Yₜ.f.sgsʲs.:($$j).u₃[colidx] -=
+                    ᶠω¹²ʲs.:($$j)[colidx] × ᶠinterp(CT12(ᶜuʲs.:($$j)[colidx])) +
+                    ᶠgradᵥ(ᶜKʲs.:($$j)[colidx] - ᶜKᵥʲs.:($$j)[colidx])
+            end
         else
             # deep atmosphere
             @. Yₜ.c.uₕ[colidx] -=
@@ -165,11 +170,12 @@ NVTX.@annotate function explicit_vertical_advection_tendency!(Yₜ, Y, p, t)
             @. Yₜ.f.u₃[colidx] -=
                 (ᶠf¹²[colidx] + ᶠω¹²[colidx]) × ᶠinterp(CT12(ᶜu[colidx])) +
                 ᶠgradᵥ(ᶜK[colidx])
-        end
-        for j in 1:n
-            @. Yₜ.f.sgsʲs.:($$j).u₃[colidx] -=
-                ᶠω¹²ʲs.:($$j)[colidx] × ᶠinterp(CT12(ᶜuʲs.:($$j)[colidx])) +
-                ᶠgradᵥ(ᶜKʲs.:($$j)[colidx] - ᶜKᵥʲs.:($$j)[colidx])
+            for j in 1:n
+                @. Yₜ.f.sgsʲs.:($$j).u₃[colidx] -=
+                    (ᶠf¹²[colidx] + ᶠω¹²ʲs.:($$j)[colidx]) ×
+                    ᶠinterp(CT12(ᶜuʲs.:($$j)[colidx])) +
+                    ᶠgradᵥ(ᶜKʲs.:($$j)[colidx] - ᶜKᵥʲs.:($$j)[colidx])
+            end
         end
 
         if use_prognostic_tke(turbconv_model) # advect_tke triggers allocations