Merge pull request #3665 from CliMA/aj/explicit_tracer_vadv

Move vertical passive tracer advection to explicit tendency

Author: trontrytel

reproducibility_tests/ref_counter.jl

@@ -1,4 +1,4 @@
-218
+219
 
 # **README**
 #
@@ -20,6 +20,8 @@
 
 
 #=
+219
+- Change the operations order in vertical advection upwinding
 
 218
 - Change surface flux tendency to fully explicit
@@ -37,7 +39,7 @@
 214
 - Rename some config files
 
-213 
+213
 - Update to deep-atmos eqns by default, fix vorticity diagnostic
 
 212

src/prognostic_equations/advection.jl

@@ -115,21 +115,27 @@ NVTX.@annotate function explicit_vertical_advection_tendency!(Yₜ, Y, p, t)
     # Without the CT12(), the right-hand side would be a CT1 or CT2 in 2D space.
 
     ᶜρ = Y.c.ρ
-    if :ρe_tot in propertynames(Yₜ.c)
+
+    # Full vertical advection of passive tracers (like liq, rai, etc) ...
+    for (ᶜρχₜ, ᶜχ, χ_name) in matching_subfields(Yₜ.c, ᶜspecific)
+        χ_name in (:e_tot, :q_tot) && continue
+        vtt = vertical_transport(ᶜρ, ᶠu³, ᶜχ, float(dt), tracer_upwinding)
+        @. ᶜρχₜ += vtt
+    end
+    # ... and upwinding correction of energy and total water.
+    # (The central advection of energy and total water is done implicitly.)
+    if energy_upwinding != Val(:none)
         (; ᶜh_tot) = p.precomputed
-        for (coeff, upwinding) in ((1, energy_upwinding), (-1, Val(:none)))
-            energy_upwinding isa Val{:none} && continue
-            vtt = vertical_transport(ᶜρ, ᶠu³, ᶜh_tot, float(dt), upwinding)
-            @. Yₜ.c.ρe_tot += coeff * vtt
-        end
+        vtt = vertical_transport(ᶜρ, ᶠu³, ᶜh_tot, float(dt), energy_upwinding)
+        vtt_central = vertical_transport(ᶜρ, ᶠu³, ᶜh_tot, float(dt), Val(:none))
+        @. Yₜ.c.ρe_tot += vtt - vtt_central
     end
-    for (ᶜρχₜ, ᶜχ, χ_name) in matching_subfields(Yₜ.c, ᶜspecific)
-        χ_name == :e_tot && continue
-        for (coeff, upwinding) in ((1, tracer_upwinding), (-1, Val(:none)))
-            tracer_upwinding isa Val{:none} && continue
-            vtt = vertical_transport(ᶜρ, ᶠu³, ᶜχ, float(dt), upwinding)
-            @. ᶜρχₜ += coeff * vtt
-        end
+
+    if !(p.atmos.moisture_model isa DryModel) && tracer_upwinding != Val(:none)
+        ᶜq_tot = ᶜspecific.q_tot
+        vtt = vertical_transport(ᶜρ, ᶠu³, ᶜq_tot, float(dt), tracer_upwinding)
+        vtt_central = vertical_transport(ᶜρ, ᶠu³, ᶜq_tot, float(dt), Val(:none))
+        @. Yₜ.c.ρq_tot += vtt - vtt_central
     end
 
     if isnothing(ᶠf¹²)

src/prognostic_equations/implicit/implicit_tendency.jl

@@ -126,18 +126,18 @@ function implicit_vertical_advection_tendency!(Yₜ, Y, p, t)
 
     @. Yₜ.c.ρ -= ᶜdivᵥ(ᶠinterp(Y.c.ρ * ᶜJ) / ᶠJ * ᶠu³)
 
-    # Central advection of active tracers (e_tot and all the q_...)
+    # Central vertical advection of active tracers (e_tot and q_tot)
     vtt = vertical_transport(Y.c.ρ, ᶠu³, ᶜh_tot, dt, Val(:none))
     @. Yₜ.c.ρe_tot += vtt
-
-    for (ᶜρχₜ, ᶜχ, χ_name) in matching_subfields(Yₜ.c, ᶜspecific)
-        χ_name == :e_tot && continue
-        vtt = vertical_transport(Y.c.ρ, ᶠu³, ᶜχ, dt, Val(:none))
-        @. ᶜρχₜ += vtt
+    if !(moisture_model isa DryModel)
+        vtt = vertical_transport(Y.c.ρ, ᶠu³, ᶜspecific.q_tot, dt, Val(:none))
+        @. Yₜ.c.ρq_tot += vtt
     end
 
-    #vertical_advection_of_water_tendency!(Yₜ, Y, p, t)
-
+    # Vertical advection of passive tracers with the mean flow
+    # is done in the explicit tendency.
+    # Here we add the vertical advection with precipitation terminal velocity
+    # using downward biasing and free outflow bottom boundary condition
     if moisture_model isa NonEquilMoistModel
         (; ᶜwₗ, ᶜwᵢ) = p.precomputed
         @. Yₜ.c.ρq_liq -= ᶜprecipdivᵥ(
@@ -149,12 +149,7 @@ function implicit_vertical_advection_tendency!(Yₜ, Y, p, t)
             ᶠright_bias(Geometry.WVector(-(ᶜwᵢ)) * ᶜspecific.q_ice),
         )
     end
-
     if precip_model isa Microphysics1Moment
-        # Advection of precipitation with the mean flow
-        # is done with other passive tracers in the explicit tendency.
-        # Here we add the advection with precipitation terminal velocity
-        # using downward biasing and free outflow bottom boundary condition
         (; ᶜwᵣ, ᶜwₛ) = p.precomputed
         @. Yₜ.c.ρq_rai -= ᶜprecipdivᵥ(
             ᶠinterp(Y.c.ρ * ᶜJ) / ᶠJ *
@@ -166,6 +161,9 @@ function implicit_vertical_advection_tendency!(Yₜ, Y, p, t)
         )
     end
 
+    # TODO - decide if this needs to be explicit or implicit
+    #vertical_advection_of_water_tendency!(Yₜ, Y, p, t)
+
     @. Yₜ.f.u₃ -= ᶠgradᵥ(ᶜp) / ᶠinterp(Y.c.ρ) + ᶠgradᵥ_ᶜΦ
 
     if rayleigh_sponge isa RayleighSponge