addressing some review comments

physics/progsigma_calc.f90

@@ -180,7 +180,7 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,           &
                 form(i,k)=-1.0*inbu(i,k)*(omega_u(i,k)*delt)
                 fdqb=0.5*((form(i,k)*zdqca(i,k)))
                 termC(i)=termC(i)+inbu(i,k)*   &
-                     (fdqb+fdqa(i))*hvap*zeta(i,k))
+                     (fdqb+fdqa(i))*hvap*zeta(i,k)
                 fdqa(i)=fdqb
              endif
          enddo

physics/samfdeepcnv.f

@@ -79,7 +79,7 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
      &    tmf,qmicro,itc,ntc,cliq,cp,cvap,                              &
      &    eps,epsm1,fv,grav,hvap,rd,rv,                                 &
      &    t0c,delt,ntk,ntr,delp,                                        &
-     &    prslp,psp,phil,qtr,prevsq,q,q1,t1,u1,v1,fscav,            &
+     &    prslp,psp,phil,qtr,prevsq,q,q1,t1,u1,v1,fscav,                &
      &    hwrf_samfdeep,progsigma,wclosureflg,cldwrk,rn,kbot,ktop,kcnv, &
      &    islimsk,garea,dot,ncloud,hpbl,ud_mf,dd_mf,dt_mf,cnvw,cnvc,    &
      &    QLCN, QICN, w_upi, cf_upi, CNV_MFD,                           &

physics/samfdeepcnv.meta

@@ -78,7 +78,7 @@
   kind = kind_phys
   intent = in
 [qmicro]
-  standard_name = instantaneous_moisture_tendency_due_to_microphysics
+  standard_name = instantaneous_tendency_of_specific_humidity_due_to_microphysics
   long_name = moisture tendency due to microphysics
   units = kg kg-1 s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)

physics/samfshalcnv.f

@@ -59,7 +59,7 @@ subroutine samfshalcnv_run(im,km,itc,ntc,cliq,cp,cvap,            &
      &     eps,epsm1,fv,grav,hvap,rd,rv,                                &
      &     t0c,delt,ntk,ntr,delp,first_time_step,restart,               & 
      &     tmf,qmicro,progsigma,                                        &
-     &     prslp,psp,phil,qtr,prevsq,q,q1,t1,u1,v1,fscav,           &
+     &     prslp,psp,phil,qtr,prevsq,q,q1,t1,u1,v1,fscav,               &
      &     rn,kbot,ktop,kcnv,islimsk,garea,                             &
      &     dot,ncloud,hpbl,ud_mf,dt_mf,cnvw,cnvc,                       &
      &     clam,c0s,c1,evef,pgcon,asolfac,hwrf_samfshal,

physics/samfshalcnv.meta

@@ -78,7 +78,7 @@
   kind = kind_phys
   intent = in
 [qmicro]
-  standard_name = instantaneous_moisture_tendency_due_to_microphysics
+  standard_name = instantaneous_tendency_of_specific_humidity_due_to_microphysics
   long_name = moisture tendency due to microphysics
   units = kg kg-1 s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)

physics/satmedmfvdifq.F

@@ -67,8 +67,8 @@ end subroutine satmedmfvdifq_finalize
 !! (mfscuq.f).
 !! \section detail_satmedmfvidfq GFS satmedmfvdifq Detailed Algorithm 
 !! @{
-      subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntrw,ntiw,ntke,     &
-     &     grav,rd,cp,rv,hvap,hfus,fv,eps,epsm1,                        &
+      subroutine satmedmfvdifq_run(im,km,progsigma,ntrac,ntcw,ntrw,     &
+     &     ntiw,ntke,grav,rd,cp,rv,hvap,hfus,fv,eps,epsm1,              &
      &     dv,du,tdt,rtg,tmf,u1,v1,t1,q1,swh,hlw,xmu,garea,zvfun,       &
      &     psk,rbsoil,zorl,u10m,v10m,fm,fh,                             &
      &     tsea,heat,evap,stress,spd1,kpbl,                             &
@@ -91,7 +91,7 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntrw,ntiw,ntke,     &
       integer, intent(in)  :: sfc_rlm
       integer, intent(in)  :: kinver(:)
       integer, intent(out) :: kpbl(:)
-      logical, intent(in)  :: gen_tend,ldiag3d
+      logical, intent(in)  :: gen_tend,ldiag3d,progsigma
 !
       real(kind=kind_phys), intent(in) :: grav,rd,cp,rv,hvap,hfus,fv,   &
      &                                    eps,epsm1
@@ -299,7 +299,6 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntrw,ntiw,ntke,     &
           xmfd(i,k) = 0.
           buou(i,k) = 0.
           buod(i,k) = 0.
-          tmf(i,k) = 0.
           ckz(i,k) = ck1
           chz(i,k) = ch1
           rlmnz(i,k) = rlmn0
@@ -313,6 +312,14 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntrw,ntiw,ntke,     &
           zm(i,k) = zi(i,k+1)
         enddo
       enddo
+!>  - Initialize variables needed for prognostic cumulus closure
+      if(progsigma)then
+         do k=1,km
+            do i=1,im
+               tmf(i,k) = 0.
+            enddo
+         enddo
+      endif
 !>  - Compute horizontal grid size (\p gdx)
       do i=1,im
         gdx(i) = sqrt(garea(i))
@@ -2115,11 +2122,19 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntrw,ntiw,ntke,     &
             qtend      = (f2(i,k)-q1(i,k,1))*rdt
             tdt(i,k)   = tdt(i,k)+ttend
             rtg(i,k,1) = rtg(i,k,1)+qtend
-            tmf(i,k)   = qtend
 !           dtsfc(i)   = dtsfc(i)+cont*del(i,k)*ttend
 !           dqsfc(i)   = dqsfc(i)+conq*del(i,k)*qtend
          enddo
       enddo
+
+      if(progsigma)then
+         do  k = 1,km
+            do i = 1,im
+               tmf(i,k)=(f2(i,k)-q1(i,k,1))*rdt
+            enddo
+         enddo
+      endif
+
       do i = 1,im
         dtsfc(i) = rho_a(i) * cp * heat(i)
         dqsfc(i) = rho_a(i) * hvap * evap(i)

physics/satmedmfvdifq.meta

@@ -62,6 +62,13 @@
   dimensions = ()
   type = integer
   intent = in
+[progsigma]
+  standard_name = do_prognostic_updraft_area_fraction
+  long_name = flag for prognostic sigma in cumuls scheme
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
 [ntrac]
   standard_name = number_of_vertical_diffusion_tracers
   long_name = number of tracers to diffuse vertically