Bug fixes from merge of main into gsl/develop

NOAA-GSL · May 21, 2021 · 1da8710 · 1da8710
1 parent 94bf989
commit 1da8710
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/physics/GFS_DCNV_generic.F90 b/physics/GFS_DCNV_generic.F90
@@ -99,8 +99,8 @@ end subroutine GFS_DCNV_generic_post_finalize
 !> \section arg_table_GFS_DCNV_generic_post_run Argument Table
 !! \htmlinclude GFS_DCNV_generic_post_run.html
 !!
-    subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv,   &
-      frain, rain1, dtf, cld1d, save_u, save_v, save_t, gu0, gv0, gt0,            &
+    subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, &
+      cscnv, frain, rain1, dtf, cld1d, save_u, save_v, save_t, gu0, gv0, gt0,     &
       ud_mf, dd_mf, dt_mf, con_g, npdf3d, num_p3d, ncnvcld3d, nsamftrac,          &
       rainc, cldwrk, upd_mf, dwn_mf, det_mf, dtend, dtidx, index_of_process_dcnv, &
       index_of_temperature, index_of_x_wind, index_of_y_wind, ntqv, gq0, save_q,  &
@@ -113,7 +113,7 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv,   &
       implicit none
 
       integer, intent(in) :: im, levs, nsamftrac
-      logical, intent(in) :: lssav, ldiag3d, ras, cscnv
+      logical, intent(in) :: lssav, ldiag3d, qdiag3d, ras, cscnv
       logical, intent(in) :: flag_for_dcnv_generic_tend
 
       real(kind=kind_phys), intent(in) :: frain, dtf
@@ -205,15 +205,13 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv,   &
 
           ! convective mass fluxes
           if(qdiag3d) then
-             do k=1,levs
-                do i=1,im
-                   dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k)-save_qv(i,k)) * frain
-                   ! convective mass fluxes
-                   upd_mf(i,k)  = upd_mf(i,k)  + ud_mf(i,k) * (con_g*frain)
-                   dwn_mf(i,k)  = dwn_mf(i,k)  + dd_mf(i,k) * (con_g*frain)
-                   det_mf(i,k)  = det_mf(i,k)  + dt_mf(i,k) * (con_g*frain)
-                enddo
-             enddo
+            do k=1,levs
+              do i=1,im
+                upd_mf(i,k)  = upd_mf(i,k)  + ud_mf(i,k) * (con_g*frain)
+                dwn_mf(i,k)  = dwn_mf(i,k)  + dd_mf(i,k) * (con_g*frain)
+                det_mf(i,k)  = det_mf(i,k)  + dt_mf(i,k) * (con_g*frain)
+              enddo
+            enddo
           endif
         endif ! if (ldiag3d)
 

diff --git a/physics/GFS_DCNV_generic.meta b/physics/GFS_DCNV_generic.meta
@@ -228,6 +228,14 @@
   type = logical
   intent = in
   optional = F
+[qdiag3d]
+  standard_name = flag_tracer_diagnostics_3D
+  long_name = flag for 3d tracer diagnostic fields
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
+  optional = F
 [ras]
   standard_name = flag_for_ras_deep_convection
   long_name = flag for ras convection scheme

diff --git a/physics/GFS_suite_interstitial.F90 b/physics/GFS_suite_interstitial.F90
@@ -315,7 +315,7 @@ subroutine GFS_suite_interstitial_2_run (im, levs, lssav, ldiag3d, lsidea, flag_
             idtend = dtidx(index_of_temperature,index_of_process_longwave)
             if(idtend>=1) then
               if (use_LW_jacobian) then
-                dtend(:,:,idtend)) = dtend(:,:,idtend) + htrlwu(:,:)*dtf
+                dtend(:,:,idtend) = dtend(:,:,idtend) + htrlwu(:,:)*dtf
               else
                 dtend(:,:,idtend) = dtend(:,:,idtend) + htrlw(:,:)*dtf
               endif