Merge pull request #2592 from CliMA/aj/rain_diff_fixes

fixes to rain diff

Author: trontrytel

src/prognostic_equations/hyperdiffusion.jl

@@ -219,9 +219,11 @@ NVTX.@annotate function tracer_hyperdiffusion_tendency!(Yₜ, Y, p, t)
     # by the limiter. Is this a significant problem?
     # TODO: Figure out why caching the duplicated tendencies in ᶜtemp_scalar
     # triggers allocations.
-    for (ᶜρχₜ, ᶜ∇²χ, _) in matching_subfields(Yₜ.c, ᶜ∇²specific_tracers)
+    for (ᶜρχₜ, ᶜ∇²χ, χ_name) in matching_subfields(Yₜ.c, ᶜ∇²specific_tracers)
         @. ᶜρχₜ -= ν₄_scalar * wdivₕ(Y.c.ρ * gradₕ(ᶜ∇²χ))
-        @. Yₜ.c.ρ -= ν₄_scalar * wdivₕ(Y.c.ρ * gradₕ(ᶜ∇²χ))
+        if !(χ_name in (:q_rai, :q_sno))
+            @. Yₜ.c.ρ -= ν₄_scalar * wdivₕ(Y.c.ρ * gradₕ(ᶜ∇²χ))
+        end
     end
     if turbconv_model isa PrognosticEDMFX
         for j in 1:n

src/prognostic_equations/vertical_diffusion_boundary_layer.jl

@@ -96,6 +96,8 @@ function vertical_diffusion_boundary_layer_tendency!(
             ),
         )
         @. ᶜρχₜ[colidx] -= ᶜρχₜ_diffusion[colidx]
-        @. Yₜ.c.ρ[colidx] -= ᶜρχₜ_diffusion[colidx]
+        if !(χ_name in (:q_rai, :q_sno))
+            @. Yₜ.c.ρ[colidx] -= ᶜρχₜ_diffusion[colidx]
+        end
     end
 end