add back convectively-transported tracer tendency changes

Author: grantfirl

physics/CONV/nTiedtke/cu_ntiedtke.F90

@@ -210,7 +210,7 @@ subroutine cu_ntiedtke_run(pu,pv,pt,pqv,ntqv,tdi,qvdi,pqvf,ptf,clw,poz,pzz,prsl,
       real(kind=kind_phys), dimension(:,:),intent(in) :: pzz, prsi
 
 !--- inout arguments:
-      real(kind=kind_phys), dimension(:,:,:), intent(inout) :: clw
+      real(kind=kind_phys), dimension(:,:,:), intent(in) :: clw
       real(kind=kind_phys), dimension(:,:), intent(in) :: pu, pv, pt, pqv
 
 !--- output arguments:
@@ -390,10 +390,10 @@ subroutine cu_ntiedtke_run(pu,pv,pt,pqv,ntqv,tdi,qvdi,pqvf,ptf,clw,poz,pzz,prsl,
       if(pcte(j,k1).gt.0.) then
         fliq=foealfa(ztp1(j,k1))
         fice=1.0-fliq
-        clw(j,k,2)=clw(j,k,2)+fliq*pcte(j,k1)*ztmst
-        clw(j,k,1)=clw(j,k,1)+fice*pcte(j,k1)*ztmst
-        !dclw_l(j,k) = fliq*pcte(j,k1)
-        !dclw_i(j,k) = fice*pcte(j,k1)
+        !clw(j,k,2)=clw(j,k,2)+fliq*pcte(j,k1)*ztmst
+        !clw(j,k,1)=clw(j,k,1)+fice*pcte(j,k1)*ztmst
+        dclw_l(j,k) = fliq*pcte(j,k1)
+        dclw_i(j,k) = fice*pcte(j,k1)
       endif
       end do
       end do

physics/CONV/nTiedtke/cu_ntiedtke.meta

@@ -149,7 +149,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers_for_convective_transport)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = in
 [poz]
   standard_name = geopotential
   long_name = geopotential at model layer centers

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90

@@ -73,30 +73,30 @@ subroutine GFS_DCNV_generic_post_run (im, levs, tracers_total, otsptflag,     &
       errmsg = ''
       errflg = 0
 
-      ! !ten_q(:,:,1) already has a value from the deep convection scheme
-      ! if (tracers_total > 0) then
-      !   tracers = 2
-      !   do n=2,ntrac
-      !     if ( otsptflag(n) ) then                                                    
-      !       tracers = tracers + 1
-      !       ten_q(1:im,:,n) = dclw(1:im,:,tracers)
-      !     endif
-      !   enddo
-      ! endif
-      ! if (ntcw > 0) then
-      !   if (imp_physics == imp_physics_zhao_carr     .or. &
-      !       imp_physics == imp_physics_zhao_carr_pdf .or. &
-      !       imp_physics == imp_physics_gfdl) then
-      !     ten_q(1:im,:,ntcw) = dclw(1:im,:,1) + dclw(1:im,:,2)
-      !   elseif (ntiw > 0) then
-      !     ten_q(1:im,:,ntiw) = dclw(1:im,:,1)
-      !     ten_q(1:im,:,ntcw) = dclw(1:im,:,2)
-      !   else
-      !     ten_q(1:im,:,ntcw) = dclw(1:im,:,1) + dclw(1:im,:,2)
-      !   endif   ! end if_ntiw
-      ! endif   ! end if_ntcw
-      ! 
-      ! 
+      !ten_q(:,:,1) already has a value from the deep convection scheme
+      if (tracers_total > 0) then
+        tracers = 2
+        do n=2,ntrac
+          if ( otsptflag(n) ) then                                                    
+            tracers = tracers + 1
+            ten_q(1:im,:,n) = dclw(1:im,:,tracers)
+          endif
+        enddo
+      endif
+      if (ntcw > 0) then
+        if (imp_physics == imp_physics_zhao_carr     .or. &
+            imp_physics == imp_physics_zhao_carr_pdf .or. &
+            imp_physics == imp_physics_gfdl) then
+          ten_q(1:im,:,ntcw) = dclw(1:im,:,1) + dclw(1:im,:,2)
+        elseif (ntiw > 0) then
+          ten_q(1:im,:,ntiw) = dclw(1:im,:,1)
+          ten_q(1:im,:,ntcw) = dclw(1:im,:,2)
+        else
+          ten_q(1:im,:,ntcw) = dclw(1:im,:,1) + dclw(1:im,:,2)
+        endif   ! end if_ntiw
+      endif   ! end if_ntcw
+      
+      
       case_DCNV_ten: select case (tend_opt_dcnv)
         case (1) !immediately apply tendencies
                   !Current state = current state + dt*current tendency