diff --git a/physics/GFS_debug.F90 b/physics/GFS_debug.F90
index eea4c58da..4a096449d 100644
--- a/physics/GFS_debug.F90
+++ b/physics/GFS_debug.F90
@@ -18,6 +18,7 @@ module GFS_diagtoscreen
 
       interface print_var
         module procedure print_logic_0d
+        module procedure print_logic_1d
         module procedure print_int_0d
         module procedure print_int_1d
         module procedure print_real_0d
@@ -116,6 +117,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
          do impi=0,mpisize-1
              do iomp=0,ompsize-1
                  if (mpirank==impi .and. omprank==iomp) then
+                     call print_var(mpirank,omprank, blkno, 'Model%kdt'        , Model%kdt)
                      ! Sfcprop
                      call print_var(mpirank,omprank, blkno, 'Sfcprop%slmsk'    , Sfcprop%slmsk)
                      call print_var(mpirank,omprank, blkno, 'Sfcprop%oceanfrac', Sfcprop%oceanfrac)
@@ -552,6 +554,30 @@ subroutine print_int_0d(mpirank,omprank,blkno,name,var)
 
       end subroutine print_int_0d
 
+      subroutine print_logic_1d(mpirank,omprank,blkno,name,var)
+
+          use machine,               only: kind_phys
+
+          implicit none
+
+          integer, intent(in) :: mpirank, omprank, blkno
+          character(len=*), intent(in) :: name
+          logical, intent(in) :: var(:)
+
+          integer :: i
+
+#ifdef PRINT_SUM
+          write(0,'(2a,3i6,2i8)') 'XXX: ', trim(name), mpirank, omprank, blkno, size(var), count(var)
+#elif defined(PRINT_CHKSUM)
+          write(0,'(2a,3i6,2i8)') 'XXX: ', trim(name), mpirank, omprank, blkno, size(var), count(var)
+#else
+          do i=ISTART,min(IEND,size(var(:)))
+              write(0,'(2a,3i6,i6,1x,l)') 'XXX: ', trim(name), mpirank, omprank, blkno, i, var(i)
+          end do
+#endif
+
+      end subroutine print_logic_1d
+
       subroutine print_int_1d(mpirank,omprank,blkno,name,var)
 
           use machine,               only: kind_phys
diff --git a/physics/samfdeepcnv.f b/physics/samfdeepcnv.f
index 03f5f05ef..9ec9ba7f3 100644
--- a/physics/samfdeepcnv.f
+++ b/physics/samfdeepcnv.f
@@ -71,7 +71,7 @@ end subroutine samfdeepcnv_finalize
       subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
      &    eps,epsm1,fv,grav,hvap,rd,rv,                                 &
      &    t0c,delt,ntk,ntr,delp,                                        &
-     &    prslp,psp,phil,qtr,q1,t1,u1,v1,fscav,                         &
+     &    prslp,psp,phil,qtr,q1,t1,u1,v1,fscav,hwrf_samfdeep,           &
      &    cldwrk,rn,kbot,ktop,kcnv,islimsk,garea,                       &
      &    dot,ncloud,ud_mf,dd_mf,dt_mf,cnvw,cnvc,                       &
      &    QLCN, QICN, w_upi, cf_upi, CNV_MFD,                           &
@@ -94,6 +94,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
       real(kind=kind_phys), intent(in) :: psp(im), delp(ix,km),         &
      &   prslp(ix,km),  garea(im), dot(ix,km), phil(ix,km)
       real(kind=kind_phys), dimension(:), intent(in) :: fscav
+      logical, intent(in)  :: hwrf_samfdeep
       real(kind=kind_phys), intent(in) :: nthresh
       real(kind=kind_phys), intent(in) :: ca_deep(ix)
       real(kind=kind_phys), intent(out) :: rainevap(ix)
@@ -119,7 +120,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
       ! *GJF
       integer :: mp_phys, mp_phys_mg
 
-      real(kind=kind_phys), intent(in) :: clam,    c0s,     c1,         &
+      real(kind=kind_phys), intent(in) :: clam,  c0s,  c1,              &
      &                     betal,   betas,   asolfac,                   &
      &                     evfact,  evfactl, pgcon
       character(len=*), intent(out) :: errmsg
@@ -132,8 +133,10 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
       real(kind=kind_phys) clamd,   tkemx,   tkemn,   dtke,
      &                     beta,    dbeta,   betamx,  betamn,
      &                     cxlame,  cxlamd,
+     &                     cxlamu,  
      &                     xlamde,  xlamdd,
-     &                     crtlame, crtlamd
+     &                     crtlamd,
+     &                     crtlame
 !
 !     real(kind=kind_phys) detad
       real(kind=kind_phys) adw,     aup,     aafac,   d0,
@@ -141,7 +144,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
      &                     dh,      dhh,     dp,
      &                     dq,      dqsdp,   dqsdt,   dt,
      &                     dt2,     dtmax,   dtmin,
-     &                     dxcrtas, dxcrtuf,
+     &                     dxcrtas, dxcrtuf, 
      &                     dv1h,    dv2h,    dv3h,
      &                     dv1q,    dv2q,    dv3q,
      &                     dz,      dz1,     e1,      edtmax,
@@ -184,8 +187,8 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
      &                     rntot(im),   vshear(im), xaa0(im),
      &                     xlamd(im),   xk(im),     cina(im),
      &                     xmb(im),     xmbmax(im), xpwav(im),
-!    &                     xpwev(im),   xlamx(im),  delebar(im,ntr),
-     &                     xpwev(im),   delebar(im,ntr),
+     &                     xpwev(im),   xlamx(im),  delebar(im,ntr),
+!     &                     xpwev(im),   delebar(im,ntr),
      &                     delubar(im), delvbar(im)
 !
       real(kind=kind_phys) c0(im)
@@ -196,12 +199,11 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 !
 !  parameters for updraft velocity calculation
       real(kind=kind_phys) bet1,    cd1,     f1,      gam1,
-     &                     bb1,     bb2
-!    &                     bb1,     bb2,     wucb
+!     &                     bb1,     bb2
+     &                     bb1,     bb2,     wucb
 !
 c  physical parameters
 !     parameter(grav=grav,asolfac=0.958)
-!     parameter(grav=grav)
 !     parameter(elocp=hvap/cp,el2orc=hvap*hvap/(rv*cp))
 !     parameter(c0s=.002,c1=.002,d0=.01)
 !     parameter(d0=.01)
@@ -276,16 +278,20 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
       errmsg = ''
       errflg = 0
 
+
       elocp = hvap/cp
       el2orc = hvap*hvap/(rv*cp)
 
       fact1 = (cvap-cliq)/rv
       fact2 = hvap/rv-fact1*t0c
-!
 c-----------------------------------------------------------------------
 !>  ## Determine whether to perform aerosol transport
-      do_aerosols = (itc > 0) .and. (ntc > 0) .and. (ntr > 0)
-      if (do_aerosols) do_aerosols = (ntr >= itc + ntc - 3)
+      if(hwrf_samfdeep) then
+        do_aerosols = .false.
+      else
+        do_aerosols = (itc > 0) .and. (ntc > 0) .and. (ntr > 0)
+        if (do_aerosols) do_aerosols = (ntr >= itc + ntc - 3)
+      endif
 !
 c-----------------------------------------------------------------------
 !>  ## Compute preliminary quantities needed for static, dynamic, and feedback control portions of the algorithm.
@@ -335,6 +341,14 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         rainevap(i) = 0.
         gdx(i) = sqrt(garea(i))
       enddo
+!
+      if (hwrf_samfdeep) then
+        do i=1,im
+          scaldfunc(i)=-1.0
+          sigmagfm(i)=-1.0
+!         sigmuout(i)=-1.0
+        enddo
+      endif
 !
 !>  - determine aerosol-aware rain conversion parameter over land
       do i=1,im
@@ -404,22 +418,15 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 !  model tunable parameters are all here
       edtmaxl = .3
       edtmaxs = .3
-!     clam    = .1
-!     aafac   = .1
-      aafac   = .05
-!     betal   = .15
-!     betas   = .15
-!     betal   = .05
-!     betas   = .05
-!     evef    = 0.07
-!     evfact  = 0.3
-!     evfactl = 0.3
-!
-      crtlame = 1.0e-4
+      if (hwrf_samfdeep) then
+        aafac   = .1
+        cxlamu  = 1.0e-3
+      else
+        aafac   = .05
+        crtlame = 1.0e-4
+        cxlame  = 1.0e-4
+      endif
       crtlamd = 1.0e-4
-!
-!     cxlame  = 1.0e-3
-      cxlame  = 1.0e-4
       cxlamd  = 1.0e-4
       xlamde  = 1.0e-4
       xlamdd  = 1.0e-4
@@ -471,10 +478,17 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
       enddo
 !>  - Calculate interface height
       do k = 1, km1
+      do i=1,im
+        zi(i,k) = 0.5*(zo(i,k)+zo(i,k+1))
+      enddo
+      enddo
+      if (hwrf_samfdeep) then
+        do k = 1, km1
         do i=1,im
-          zi(i,k) = 0.5*(zo(i,k)+zo(i,k+1))
+          xlamue(i,k) = clam / zi(i,k)
         enddo
-      enddo
+        enddo
+      endif
 c
 c!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 c   convert surface pressure to mb from cb
@@ -520,6 +534,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 !
 !  initialize tracer variables
 !
+      if(.not.hwrf_samfdeep) then
       do n = 3, ntr+2
         kk = n-2
         do k = 1, km
@@ -533,6 +548,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           enddo
         enddo
       enddo
+      endif
 !
 !>  - Calculate saturation specific humidity and enforce minimum moisture values.
       do k = 1, km
@@ -629,6 +645,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
+      if (.not.hwrf_samfdeep) then
       do n = 1, ntr
       do k = 1, km1
         do i=1,im
@@ -638,6 +655,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         enddo
       enddo
       enddo
+      endif
 c
 c  look for the level of free convection as cloud base
 c
@@ -739,7 +757,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 ! turbulent entrainment rate assumed to be proportional
 !   to subcloud mean TKE
 !
-      if(ntk > 0) then
+      if(.not. hwrf_samfdeep .and. ntk > 0) then
 !
         do i= 1, im
           if(cnvflg(i)) then
@@ -795,7 +813,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
             enddo
          endif
 !
-      endif
+      endif !(.not. hwrf_samfdeep .and. ntk > 0)
 !
 !  also initially assume updraft entrainment rate
 !     is an inverse function of height
@@ -812,39 +830,49 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 c  assume that updraft entrainment rate above cloud base is
 c    same as that at cloud base
 c
-!> - Calculate the entrainment rate according to Han and Pan (2011) \cite han_and_pan_2011 , equation 8, after Bechtold et al. (2008) \cite bechtold_et_al_2008, equation 2 given by:
+!> - In HWRF samfdeep, calculate the entrainment rate according to Han and Pan (2011) \cite han_and_pan_2011 , equation 8, after Bechtold et al. (2008) \cite bechtold_et_al_2008, equation 2 given by:
 !!  \f[
 !!  \epsilon = \epsilon_0F_0 + d_1\left(1-RH\right)F_1
 !!  \f]
 !!  where \f$\epsilon_0\f$ is the cloud base entrainment rate, \f$d_1\f$ is a tunable constant, and \f$F_0=\left(\frac{q_s}{q_{s,b}}\right)^2\f$ and \f$F_1=\left(\frac{q_s}{q_{s,b}}\right)^3\f$ where \f$q_s\f$ and \f$q_{s,b}\f$ are the saturation specific humidities at a given level and cloud base, respectively. The detrainment rate in the cloud is assumed to be equal to the entrainment rate at cloud base.
-!     do i=1,im
-!       if(cnvflg(i)) then
-!         xlamx(i) = xlamue(i,kbcon(i))
-!       endif
-!     enddo
-!     do k = 2, km1
-!       do i=1,im
-!         if(cnvflg(i).and.
-!    &      (k > kbcon(i) .and. k < kmax(i))) then
-!             xlamue(i,k) = xlamx(i)
-!         endif
-!       enddo
-!     enddo
+      if (hwrf_samfdeep) then
+      do i=1,im
+       if(cnvflg(i)) then
+         xlamx(i) = xlamue(i,kbcon(i))
+       endif
+      enddo
+      do k = 2, km1
+       do i=1,im
+         if(cnvflg(i).and.                                              &
+     &      (k > kbcon(i) .and. k < kmax(i))) then
+             xlamue(i,k) = xlamx(i)
+         endif
+       enddo
+      enddo
+      endif
 c
 c  specify detrainment rate for the updrafts
 c
 !! (The updraft detrainment rate is set constant and equal to the entrainment rate at cloud base.)
 !!
 !> - The updraft detrainment rate is vertically constant and proportional to clamt
-      do k = 1, km1
+      if (hwrf_samfdeep) then
+       do k = 1, km1
         do i=1,im
           if(cnvflg(i) .and. k < kmax(i)) then
-!           xlamud(i,k) = xlamx(i)
-!           xlamud(i,k) = crtlamd
-            xlamud(i,k) = 0.001 * clamt(i)
+                xlamud(i,k) = xlamx(i)
           endif
         enddo
-      enddo
+       enddo
+      else
+       do k = 1, km1
+        do i=1,im
+          if(cnvflg(i) .and. k < kmax(i)) then
+                xlamud(i,k) = 0.001 * clamt(i)
+          endif
+        enddo
+       enddo
+      endif
 c
 c  entrainment functions decreasing with height (fent),
 c    mimicking a cloud ensemble
@@ -865,7 +893,18 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 c    organized one depending on the environmental relative humidity
 c    (Bechtold et al., 2008; Derbyshire et al., 2011)
 c
-      do k = 2, km1
+      if (hwrf_samfdeep) then
+        do k = 2, km1
+        do i=1,im
+          if(cnvflg(i) .and.
+     &      (k > kbcon(i) .and. k < kmax(i))) then
+              tem = cxlamu * frh(i,k) * fent2(i,k)
+              xlamue(i,k) = xlamue(i,k)*fent1(i,k) + tem
+          endif
+        enddo
+        enddo
+      else
+        do k = 2, km1
         do i=1,im
           if(cnvflg(i) .and.
      &      (k > kbcon(i) .and. k < kmax(i))) then
@@ -875,7 +914,8 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
               xlamud(i,k) = xlamud(i,k) + tem1
           endif
         enddo
-      enddo
+        enddo
+      endif
 !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 c
@@ -934,15 +974,17 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           pwavo(i)     = 0.
         endif
       enddo
+      if (.not.hwrf_samfdeep) then
 !  for tracers
-      do n = 1, ntr
+       do n = 1, ntr
         do i = 1, im
           if(cnvflg(i)) then
             indx = kb(i)
             ecko(i,indx,n) = ctro(i,indx,n)
           endif
         enddo
-      enddo
+       enddo
+      endif
 c
 c  cloud property is modified by the entrainment process
 c
@@ -973,8 +1015,9 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
-      do n = 1, ntr
-      do k = 2, km1
+      if (.not.hwrf_samfdeep) then
+       do n = 1, ntr
+       do k = 2, km1
         do i = 1, im
           if (cnvflg(i)) then
             if(k > kb(i) .and. k < kmax(i)) then
@@ -986,8 +1029,9 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
             endif
           endif
         enddo
-      enddo
-      enddo
+       enddo
+       enddo
+      endif
 c
 c   taking account into convection inhibition due to existence of
 c    dry layers below cloud base
@@ -1062,9 +1106,16 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         enddo
       enddo
 !> - Turn off convection if the CIN is less than a critical value (cinacr) which is inversely proportional to the large-scale vertical velocity.
-      do i = 1, im
+      if(hwrf_samfdeep) then
+       do i = 1, im
+        if(cnvflg(i)) then
+          cinacr = cinacrmx
+          if(cina(i) < cinacr) cnvflg(i) = .false.
+        endif
+       enddo
+      else   !gfs_samfdeep
+       do i = 1, im
         if(cnvflg(i)) then
-!
           if(islimsk(i) == 1) then
             w1 = w1l
             w2 = w2l
@@ -1091,11 +1142,10 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           tem = 1. - tem
           tem1= .5*(cinacrmx-cinacrmn)
           cinacr = cinacrmx - tem * tem1
-!
-!         cinacr = cinacrmx
           if(cina(i) < cinacr) cnvflg(i) = .false.
         endif
-      enddo
+       enddo
+      endif !hwrf_samfdeep
 !!
       if(do_ca .and. ca_trigger)then
       do i=1,im
@@ -1189,22 +1239,23 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 c  specify upper limit of mass flux at cloud base
 c
 !> - Calculate the maximum value of the cloud base mass flux using the CFL-criterion-based formula of Han and Pan (2011) \cite han_and_pan_2011, equation 7.
-      do i = 1, im
+      if(hwrf_samfdeep) then
+       do i = 1, im
+        if(cnvflg(i)) then
+          k = kbcon(i)
+          dp = 1000. * del(i,k)
+          xmbmax(i) = dp / (grav * dt2)
+        endif
+       enddo
+      else
+       do i = 1, im
         if(cnvflg(i)) then
-!         xmbmax(i) = .1
-!
           k = kbcon(i)
           dp = 1000. * del(i,k)
           xmbmax(i) = dp / (2. * grav * dt2)
-!
-!         xmbmax(i) = dp / (grav * dt2)
-!
-!         mbdt(i) = 0.1 * dp / grav
-!
-!         tem = dp / (grav * dt2)
-!         xmbmax(i) = min(tem, xmbmax(i))
         endif
-      enddo
+       enddo
+      endif
 c
 c  compute cloud moisture property and precipitation
 c
@@ -1436,31 +1487,24 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 !
 !  compute updraft velocity square(wu2)
 !> - Calculate updraft velocity square(wu2) according to Han et al.'s (2017) \cite han_et_al_2017 equation 7.
-!
-!     bb1 = 2. * (1.+bet1*cd1)
-!     bb2 = 2. / (f1*(1.+gam1))
-!
-!     bb1 = 3.9
-!     bb2 = 0.67
-!
-!     bb1 = 2.0
-!     bb2 = 4.0
 !
       bb1 = 4.0
       bb2 = 0.8
+      if (hwrf_samfdeep) then
+      do i = 1, im
+        if (cnvflg(i)) then
+          k = kbcon1(i)
+          tem = po(i,k) / (rd * to(i,k))
+          wucb = -0.01 * dot(i,k) / (tem * grav)
+          if(wucb.gt.0.) then
+            wu2(i,k) = wucb * wucb
+          else
+            wu2(i,k) = 0.
+          endif
+        endif
+      enddo
+      endif
 !
-!     do i = 1, im
-!       if (cnvflg(i)) then
-!         k = kbcon1(i)
-!         tem = po(i,k) / (rd * to(i,k))
-!         wucb = -0.01 * dot(i,k) / (tem * grav)
-!         if(wucb > 0.) then
-!           wu2(i,k) = wucb * wucb
-!         else
-!           wu2(i,k) = 0.
-!         endif
-!       endif
-!     enddo
       do k = 2, km1
         do i = 1, im
           if (cnvflg(i)) then
@@ -1611,28 +1655,41 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         endif
       enddo
       enddo
-      do i = 1, im
+
+      if (hwrf_samfdeep) then
+       do i = 1, im
+        beta = betas
+        if(islimsk(i) == 1) beta = betal
         if(cnvflg(i)) then
-          betamn = betas
-          if(islimsk(i) == 1) betamn = betal
-          if(ntk > 0) then
-            betamx = betamn + dbeta
-            if(tkemean(i) > tkemx) then
-              beta = betamn
-            else if(tkemean(i) < tkemn) then
-              beta = betamx
-            else
-              tem = (betamx - betamn) * (tkemean(i) - tkemn)
-              beta = betamx - tem  / dtke
-            endif
-          else
-            beta = betamn
-          endif
           dz  = (sumx(i)+zi(i,1))/float(kbcon(i))
           tem = 1./float(kbcon(i))
           xlamd(i) = (1.-beta**tem)/dz
         endif
-      enddo
+       enddo
+      else
+        do i = 1, im
+          if(cnvflg(i)) then
+            betamn = betas
+            if(islimsk(i) == 1) betamn = betal
+            if(ntk > 0) then
+              betamx = betamn + dbeta
+              if(tkemean(i) > tkemx) then
+                beta = betamn
+              else if(tkemean(i) < tkemn) then
+                beta = betamx
+              else
+                tem = (betamx - betamn) * (tkemean(i) - tkemn)
+                beta = betamx - tem  / dtke
+              endif
+            else
+              beta = betamn
+            endif
+            dz  = (sumx(i)+zi(i,1))/float(kbcon(i))
+            tem = 1./float(kbcon(i))
+            xlamd(i) = (1.-beta**tem)/dz
+          endif
+        enddo
+      endif
 c
 c  determine downdraft mass flux
 c
@@ -1668,6 +1725,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         endif
       enddo
 ! for tracers
+      if (.not.hwrf_samfdeep) then
       do n = 1, ntr
         do i = 1, im
           if(cnvflg(i)) then
@@ -1676,6 +1734,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
+      endif
 cj
 !> - Calculate the cloud properties as a parcel descends, modified by entrainment and detrainment. Discretization follows Appendix B of Grell (1993) \cite grell_1993 .
       do k = km1, 1, -1
@@ -1705,6 +1764,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
+      if(.not.hwrf_samfdeep) then
       do n = 1, ntr
       do k = km1, 1, -1
         do i = 1, im
@@ -1718,6 +1778,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         enddo
       enddo
       enddo
+      endif
 c
 !> - Compute the amount of moisture that is necessary to keep the downdraft saturated.
       do k = km1, 1, -1
@@ -1820,6 +1881,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
+      if (.not.hwrf_samfdeep) then
       do n = 1, ntr
       do k = 1, km
         do i = 1, im
@@ -1829,6 +1891,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         enddo
       enddo
       enddo
+      endif
       do i = 1, im
         if(cnvflg(i)) then
           dp = 1000. * del(i,1)
@@ -1842,6 +1905,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
      &                   - vo(i,1)) * grav / dp
         endif
       enddo
+      if (.not.hwrf_samfdeep) then
       do n = 1, ntr
       do i = 1, im
         if(cnvflg(i)) then
@@ -1851,6 +1915,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         endif
       enddo
       enddo
+      endif
 c
 c--- changed due to subsidence and entrainment
 c
@@ -1915,6 +1980,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
+      if (.not.hwrf_samfdeep) then
       do n = 1, ntr
       do k = 2, km1
         do i = 1, im
@@ -1936,6 +2002,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         enddo
       enddo
       enddo
+      endif
 c
 c------- cloud top
 c
@@ -1960,6 +2027,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
      &                     qlko_ktcon(i) * grav / dp
         endif
       enddo
+      if (.not.hwrf_samfdeep) then
       do n = 1, ntr
       do i = 1, im
         if(cnvflg(i)) then
@@ -1970,6 +2038,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         endif
       enddo
       enddo
+      endif
 c
 c------- final changed variable per unit mass flux
 c
@@ -2336,7 +2405,17 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 !  compute convective turn-over time
 !
 !> - Following Bechtold et al. (2008) \cite bechtold_et_al_2008, the convective adjustment time (dtconv) is set to be proportional to the convective turnover time, which is computed using the mean updraft velocity (wc) and the cloud depth. It is also proportional to the grid size (gdx).
-      do i= 1, im
+      if(hwrf_samfdeep) then
+       do i= 1, im
+        if(cnvflg(i)) then
+          tem = zi(i,ktcon1(i)) - zi(i,kbcon1(i))
+          dtconv(i) = tem / wc(i)
+          dtconv(i) = max(dtconv(i),dtmin)
+          dtconv(i) = min(dtconv(i),dtmax)
+        endif
+       enddo
+      else
+       do i= 1, im
         if(cnvflg(i)) then
           tem = zi(i,ktcon1(i)) - zi(i,kbcon1(i))
           dtconv(i) = tem / wc(i)
@@ -2345,7 +2424,8 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           dtconv(i) = max(dtconv(i),dtmin)
           dtconv(i) = min(dtconv(i),dtmax)
         endif
-      enddo
+       enddo
+      endif
 !
 !> - Calculate advective time scale (tauadv) using a mean cloud layer wind speed.
       do i= 1, im
@@ -2424,7 +2504,6 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           tfac = tauadv(i) / dtconv(i)
           tfac = min(tfac, 1.)
           xmb(i) = -tfac * fld(i) / xk(i)
-!         xmb(i) = min(xmb(i),xmbmax(i))
         endif
       enddo
 !!
@@ -2438,6 +2517,18 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 !!
 !
 !> - For scale-aware parameterization, the updraft fraction (sigmagfm) is first computed as a function of the lateral entrainment rate at cloud base (see Han et al.'s (2017) \cite han_et_al_2017 equation 4 and 5), following the study by Grell and Freitas (2014) \cite grell_and_freitas_2014.
+      if(hwrf_samfdeep) then
+      do i = 1, im
+        if(cnvflg(i)) then
+          tem = min(max(xlamx(i), 7.e-5), 3.e-4)
+          tem = 0.2 / tem
+          tem1 = 3.14 * tem * tem
+          sigmagfm(i) = tem1 / garea(i)
+          sigmagfm(i) = max(sigmagfm(i), 0.001)
+          sigmagfm(i) = min(sigmagfm(i), 0.999)
+        endif
+      enddo
+      else
       do i = 1, im
         if(cnvflg(i)) then
           tem = min(max(xlamue(i,kbcon(i)), 7.e-5), 3.e-4)
@@ -2448,6 +2539,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           sigmagfm(i) = min(sigmagfm(i), 0.999)
         endif
       enddo
+      endif
 !
 !> - Then, calculate the reduction factor (scaldfunc) of the vertical convective eddy transport of mass flux as a function of updraft fraction from the studies by Arakawa and Wu (2013) \cite arakawa_and_wu_2013 (also see Han et al.'s (2017) \cite han_et_al_2017 equation 1 and 2). The final cloud base mass flux with scale-aware parameterization is obtained from the mass flux when sigmagfm << 1, multiplied by the reduction factor (Han et al.'s (2017) \cite han_et_al_2017 equation 2).
       do i = 1, im
@@ -2498,15 +2590,17 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
-      do n = 1, ntr
-      do k = 1, km
+      if (.not.hwrf_samfdeep) then
+        do n = 1, ntr
+        do k = 1, km
         do i = 1, im
           if (cnvflg(i) .and. k <= kmax(i)) then
             ctro(i,k,n) = ctr(i,k,n)
           endif
         enddo
-      enddo
-      enddo
+        enddo
+        enddo
+      endif
 c!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 c
 c--- feedback: simply the changes from the cloud with unit mass flux
@@ -2525,11 +2619,13 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
         delvbar(i) = 0.
         qcond(i) = 0.
       enddo
-      do n = 1, ntr
-      do i = 1, im
-        delebar(i,n) = 0.
-      enddo
-      enddo
+      if (.not.hwrf_samfdeep) then
+        do n = 1, ntr
+        do i = 1, im
+          delebar(i,n) = 0.
+        enddo
+        enddo
+      endif
       do k = 1, km
         do i = 1, im
           if (cnvflg(i) .and. k <= kmax(i)) then
@@ -2552,9 +2648,10 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
-      do n = 1, ntr
-         kk = n+2
-      do k = 1, km
+      if (.not.hwrf_samfdeep) then
+       do n = 1, ntr
+        kk = n+2
+        do k = 1, km
         do i = 1, im
           if (cnvflg(i) .and. k <= kmax(i)) then
             if(k <= ktcon(i)) then
@@ -2564,8 +2661,9 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
             endif
           endif
         enddo
-      enddo
-      enddo
+        enddo
+       enddo
+      endif
 !> - Recalculate saturation specific humidity using the updated temperature.
       do k = 1, km
         do i = 1, im
@@ -2757,6 +2855,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           endif
         enddo
       enddo
+      if (.not.hwrf_samfdeep) then
       do n = 1, ntr
          kk = n+2
       do k = 1, km
@@ -2784,6 +2883,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           enddo
         enddo
        endif
+      endif
 !
 ! hchuang code change
 !
@@ -2819,6 +2919,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
 !
 !   include TKE contribution from deep convection
 !
+      if (.not.hwrf_samfdeep) then
       if (ntk > 0) then
 !
       do k = 2, km1
@@ -2866,6 +2967,7 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap,        &
           enddo
         enddo
       endif
+      endif ! (.not.hwrf_samfdeep)
       return
       end subroutine samfdeepcnv_run
 
diff --git a/physics/samfdeepcnv.meta b/physics/samfdeepcnv.meta
index 215026eb2..d76348ca8 100644
--- a/physics/samfdeepcnv.meta
+++ b/physics/samfdeepcnv.meta
@@ -265,6 +265,12 @@
   kind = kind_phys
   intent = in
   optional = F
+[hwrf_samfdeep]
+  standard_name = flag_for_hwrf_samfdeepcnv_scheme
+  long_name = flag for hwrf samfdeepcnv scheme 
+  units = flag
+  dimensions = ()
+  type = logical
 [nthresh]
   standard_name = threshold_for_perturbed_vertical_velocity
   long_name = threshold used for perturbed vertical velocity
diff --git a/physics/samfshalcnv.f b/physics/samfshalcnv.f
index ed80a2f54..7a6db70f0 100644
--- a/physics/samfshalcnv.f
+++ b/physics/samfshalcnv.f
@@ -55,7 +55,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
      &     prslp,psp,phil,qtr,q1,t1,u1,v1,fscav,                        &
      &     rn,kbot,ktop,kcnv,islimsk,garea,                             &
      &     dot,ncloud,hpbl,ud_mf,dt_mf,cnvw,cnvc,                       &
-     &     clam,c0s,c1,pgcon,asolfac,errmsg,errflg)
+     &     clam,c0s,c1,pgcon,asolfac,hwrf_samfshal,errmsg,errflg)
 !
       use machine , only : kind_phys
       use funcphys , only : fpvs
@@ -82,6 +82,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 !
       real(kind=kind_phys), intent(in) :: clam,    c0s,     c1,         &
      &                     asolfac, pgcon
+      logical,          intent(in)  :: hwrf_samfshal      
       character(len=*), intent(out) :: errmsg
       integer,          intent(out) :: errflg
 !
@@ -140,8 +141,8 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 !
 !  parameters for updraft velocity calculation
       real(kind=kind_phys) bet1,    cd1,     f1,      gam1,
-     &                     bb1,     bb2
-!    &                     bb1,     bb2,     wucb
+!     &                     bb1,     bb2
+     &                     bb1,     bb2,     wucb
 
 cc
 c  physical parameters
@@ -167,8 +168,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
       parameter(dtke=tkemx-tkemn)
       parameter(dthk=25.)
       parameter(cinpcrmx=180.,cinpcrmn=120.)
-!     parameter(cinacrmx=-120.,cinacrmn=-120.)
-      parameter(cinacrmx=-120.,cinacrmn=-80.)
+      parameter(cinacrmx=-120.)
       parameter(crtlamd=3.e-4)
       parameter(dtmax=10800.,dtmin=600.)
       parameter(bet1=1.875,cd1=.506,f1=2.0,gam1=.5)
@@ -202,7 +202,8 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 !
       real(kind=kind_phys) tf, tcr, tcrf
       parameter (tf=233.16, tcr=263.16, tcrf=1.0/(tcr-tf))
-!
+
+
 c-----------------------------------------------------------------------
 !
 ! Initialize CCPP error handling variables
@@ -215,10 +216,16 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
       fact1 = (cvap-cliq)/rv
       fact2 = hvap/rv-fact1*t0c
 
+      if (.not.hwrf_samfshal) then
+             cinacrmn=-80.
+      endif
+
 c-----------------------------------------------------------------------
+      if (.not.hwrf_samfshal) then
 !>  ## Determine whether to perform aerosol transport
-      do_aerosols = (itc > 0) .and. (ntc > 0) .and. (ntr > 0)
-      if (do_aerosols) do_aerosols = (ntr >= itc + ntc - 3)
+        do_aerosols = (itc > 0) .and. (ntc > 0) .and. (ntr > 0)
+        if (do_aerosols) do_aerosols = (ntr >= itc + ntc - 3)
+      endif
 !
 !************************************************************************
 !     convert input Pa terms to Cb terms  -- Moorthi
@@ -234,7 +241,8 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 c  initialize arrays
 c
 !>  - Initialize column-integrated and other single-value-per-column variable arrays.
-      do i=1,im
+      if(hwrf_samfshal) then
+       do i=1,im
         cnvflg(i) = .true.
         if(kcnv(i) == 1) cnvflg(i) = .false.
         if(cnvflg(i)) then
@@ -253,7 +261,32 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
         cina(i) = 0.
         vshear(i) = 0.
         gdx(i) = sqrt(garea(i))
-      enddo
+          scaldfunc(i)=-1.0  ! wang initialized
+          sigmagfm(i)=-1.0
+       enddo
+
+      else !gfs_samfshal
+       do i=1,im
+        cnvflg(i) = .true.
+        if(kcnv(i) == 1) cnvflg(i) = .false.
+        if(cnvflg(i)) then
+          kbot(i)=km+1
+          ktop(i)=0
+        endif
+        rn(i)=0.
+        kbcon(i)=km
+        ktcon(i)=1
+        ktconn(i)=1
+        kb(i)=km
+        pdot(i) = 0.
+        qlko_ktcon(i) = 0.
+        edt(i)  = 0.
+        aa1(i)  = 0.
+        cina(i) = 0.
+        vshear(i) = 0.
+        gdx(i) = sqrt(garea(i))
+       enddo
+      endif
 !!
 !>  - Return to the calling routine if deep convection is present or the surface buoyancy flux is negative.
       totflg = .true.
@@ -303,15 +336,15 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
       dt2   = delt
 !
 c  model tunable parameters are all here
-!     clam    = .3
-!     aafac   = .1
-      aafac   = .05
+      if (hwrf_samfshal) then
+        aafac   = .1
+      else
+        aafac   = .05
+      endif
 c     evef    = 0.07
       evfact  = 0.3
       evfactl = 0.3
 !
-!     pgcon   = 0.7     ! Gregory et al. (1997, QJRMS)
-!     pgcon   = 0.55    ! Zhang & Wu (2003,JAS)
       w1l     = -8.e-3
       w2l     = -4.e-2
       w3l     = -5.e-3
@@ -351,11 +384,23 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
         enddo
       enddo
 !>  - Calculate interface height
-      do k = 1, km1
+      if(hwrf_samfshal) then
+       do k = 1, km1
         do i=1,im
           zi(i,k) = 0.5*(zo(i,k)+zo(i,k+1))
+          xlamue(i,k) = clam / zi(i,k)
         enddo
-      enddo
+       enddo
+       do i=1,im
+        xlamue(i,km) = xlamue(i,km1)
+       enddo
+      else
+       do k = 1, km1
+        do i=1,im
+          zi(i,k) = 0.5*(zo(i,k)+zo(i,k+1))
+        enddo
+       enddo
+      endif
 c
 c  pbl height
 c
@@ -410,8 +455,9 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 !
 !  initialize tracer variables
 !
-      do n = 3, ntr+2
-        kk = n-2
+      if (.not.hwrf_samfshal) then
+        do n = 3, ntr+2
+          kk = n-2
         do k = 1, km
           do i = 1, im
             if (cnvflg(i) .and. k <= kmax(i)) then
@@ -421,7 +467,8 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
             endif
           enddo
         enddo
-      enddo
+        enddo
+      endif
 !>  - Calculate saturation specific humidity and enforce minimum moisture values.
       do k = 1, km
         do i=1,im
@@ -517,15 +564,18 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           endif
         enddo
       enddo
-      do n = 1, ntr
-      do k = 1, km1
+
+      if (.not.hwrf_samfshal) then
+       do n = 1, ntr
+       do k = 1, km1
         do i=1,im
           if (cnvflg(i) .and. k <= kmax(i)-1) then
             ctro(i,k,n) = .5 * (ctro(i,k,n) + ctro(i,k+1,n))
           endif
         enddo
-      enddo
-      enddo
+       enddo
+       enddo
+      endif
 c
 c  look for the level of free convection as cloud base
 c
@@ -597,6 +647,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           ptem1= .5*(cinpcrmx-cinpcrmn)
           cinpcr = cinpcrmx - ptem * ptem1
           tem1 = pfld(i,kb(i)) - pfld(i,kbcon(i))
+
           if(tem1 > cinpcr) then
              cnvflg(i) = .false.
           endif
@@ -612,14 +663,27 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 ! turbulent entrainment rate assumed to be proportional
 !   to subcloud mean TKE
 !
-      if(ntk > 0) then
 !
+
+!c
+!c  specify the detrainment rate for the updrafts
+!c
+      if (hwrf_samfshal) then
+       do i = 1, im
+        if(cnvflg(i)) then
+          xlamud(i) = xlamue(i,kbcon(i))
+!         xlamud(i) = crtlamd
+        endif
+       enddo
+      else
+      if(ntk > 0) then
         do i= 1, im
           if(cnvflg(i)) then
             sumx(i) = 0.
             tkemean(i) = 0.
           endif
         enddo
+
         do k = 1, km1
           do i = 1, im
             if(cnvflg(i)) then
@@ -687,6 +751,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           xlamud(i) = 0.001 * clamt(i)
         endif
       enddo
+      endif    ! hwrf_samfshal
 c
 c  determine updraft mass flux for the subcloud layers
 c
@@ -742,6 +807,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
         endif
       enddo
 !  for tracers
+      if (.not. hwrf_samfshal) then
       do n = 1, ntr
         do i = 1, im
           if(cnvflg(i)) then
@@ -750,6 +816,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           endif
         enddo
       enddo
+      endif
 c
 !  cm is an enhancement factor in entrainment rates for momentum
 !
@@ -778,8 +845,10 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           endif
         enddo
       enddo
-      do n = 1, ntr
-      do k = 2, km1
+
+      if (.not.hwrf_samfshal) then
+       do n = 1, ntr
+       do k = 2, km1
         do i = 1, im
           if (cnvflg(i)) then
             if(k > kb(i) .and. k < kmax(i)) then
@@ -791,8 +860,9 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
             endif
           endif
         enddo
-      enddo
-      enddo
+       enddo
+       enddo
+      endif
 c
 c   taking account into convection inhibition due to existence of
 c    dry layers below cloud base
@@ -859,9 +929,17 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
         enddo
       enddo
 !> - Turn off convection if the CIN is less than a critical value (cinacr) which is inversely proportional to the large-scale vertical velocity.
-      do i = 1, im
+
+      if (hwrf_samfshal) then
+       do i = 1, im
+        if(cnvflg(i)) then
+          cinacr = cinacrmx
+          if(cina(i) < cinacr) cnvflg(i) = .false.
+        endif
+       enddo
+      else
+       do i = 1, im
         if(cnvflg(i)) then
-!
           if(islimsk(i) == 1) then
             w1 = w1l
             w2 = w2l
@@ -888,11 +966,10 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           tem = 1. - tem
           tem1= .5*(cinacrmx-cinacrmn)
           cinacr = cinacrmx - tem * tem1
-!
-!         cinacr = cinacrmx
           if(cina(i) < cinacr) cnvflg(i) = .false.
-        endif
-      enddo
+         endif
+       enddo
+      endif
 !!
       totflg = .true.
       do i=1,im
@@ -923,20 +1000,23 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 c  specify upper limit of mass flux at cloud base
 c
 !> - Calculate the maximum value of the cloud base mass flux using the CFL-criterion-based formula of Han and Pan (2011) \cite han_and_pan_2011, equation 7.
-      do i = 1, im
+      if(hwrf_samfshal) then
+       do i = 1, im
+        if(cnvflg(i)) then
+          k = kbcon(i)
+          dp = 1000. * del(i,k)
+          xmbmax(i) = dp / (grav * dt2)
+        endif
+       enddo
+      else
+       do i = 1, im
         if(cnvflg(i)) then
-!         xmbmax(i) = .1
-!
           k = kbcon(i)
           dp = 1000. * del(i,k)
           xmbmax(i) = dp / (2. * grav * dt2)
-!
-!         xmbmax(i) = dp / (grav * dt2)
-!
-!         tem = dp / (grav * dt2)
-!         xmbmax(i) = min(tem, xmbmax(i))
         endif
-      enddo
+       enddo
+      endif
 c
 c  compute cloud moisture property and precipitation
 c
@@ -1156,31 +1236,24 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 !
 !  compute updraft velocity square(wu2)
 !> - Calculate updraft velocity square(wu2) according to Han et al.'s (2017) \cite han_et_al_2017 equation 7.
-!
-!     bb1 = 2. * (1.+bet1*cd1)
-!     bb2 = 2. / (f1*(1.+gam1))
-!
-!     bb1 = 3.9
-!     bb2 = 0.67
-!
-!     bb1 = 2.0
-!     bb2 = 4.0
 !
       bb1 = 4.0
       bb2 = 0.8
 !
-!     do i = 1, im
-!       if (cnvflg(i)) then
-!         k = kbcon1(i)
-!         tem = po(i,k) / (rd * to(i,k))
-!         wucb = -0.01 * dot(i,k) / (tem * grav)
-!         if(wucb > 0.) then
-!           wu2(i,k) = wucb * wucb
-!         else
-!           wu2(i,k) = 0.
-!         endif
-!       endif
-!     enddo
+      if (hwrf_samfshal) then
+      do i = 1, im
+       if (cnvflg(i)) then
+         k = kbcon1(i)
+         tem = po(i,k) / (rd * to(i,k))
+         wucb = -0.01 * dot(i,k) / (tem * grav)
+         if(wucb > 0.) then
+           wu2(i,k) = wucb * wucb
+         else
+           wu2(i,k) = 0.
+         endif
+       endif
+      enddo
+      endif
       do k = 2, km1
         do i = 1, im
           if (cnvflg(i)) then
@@ -1314,15 +1387,17 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           endif
         enddo
       enddo
-      do n = 1, ntr
-      do k = 1, km
+      if (.not.hwrf_samfshal) then
+       do n = 1, ntr
+       do k = 1, km
         do i = 1, im
           if(cnvflg(i) .and. k <= kmax(i)) then
             dellae(i,k,n) = 0.
           endif
         enddo
-      enddo
-      enddo
+       enddo
+       enddo
+      endif
 c
 c--- changed due to subsidence and entrainment
 c
@@ -1367,8 +1442,9 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           endif
         enddo
       enddo
-      do n = 1, ntr
-      do k = 2, km1
+      if(.not.hwrf_samfshal) then
+       do n = 1, ntr
+       do k = 2, km1
         do i = 1, im
           if (cnvflg(i)) then
             if(k > kb(i) .and. k < ktcon(i)) then
@@ -1381,8 +1457,9 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
             endif
           endif
         enddo
-      enddo
-      enddo
+       enddo
+       enddo
+      endif
 c
 c------- cloud top
 c
@@ -1407,6 +1484,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
      &                     qlko_ktcon(i) * grav / dp
         endif
       enddo
+      if (.not.hwrf_samfshal) then
       do n = 1, ntr
       do i = 1, im
         if(cnvflg(i)) then
@@ -1417,6 +1495,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
         endif
       enddo
       enddo
+      endif
 !
 !  compute convective turn-over time
 !
@@ -1425,8 +1504,10 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
         if(cnvflg(i)) then
           tem = zi(i,ktcon1(i)) - zi(i,kbcon1(i))
           dtconv(i) = tem / wc(i)
-          tfac = 1. + gdx(i) / 75000.
-          dtconv(i) = tfac * dtconv(i)
+          if (.not.hwrf_samfshal) then
+            tfac = 1. + gdx(i) / 75000.
+            dtconv(i) = tfac * dtconv(i)
+          endif
           dtconv(i) = max(dtconv(i),dtmin)
           dtconv(i) = max(dtconv(i),dt2)
           dtconv(i) = min(dtconv(i),dtmax)
@@ -1503,13 +1584,15 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 !
 !> - Transport aerosols if present
 !
-      if (do_aerosols)
+      if (.not.hwrf_samfshal) then
+       if (do_aerosols)
      &  call samfshalcnv_aerosols(im, ix, km, itc, ntc, ntr, delt,
 !    &  xlamde, xlamdd, cnvflg, jmin, kb, kmax, kbcon, ktcon, fscav,
      &  cnvflg, kb, kmax, kbcon, ktcon, fscav,
 !    &  edto, xlamd, xmb, c0t, eta, etad, zi, xlamue, xlamud, delp,
      &  xmb, c0t, eta, zi, xlamue, xlamud, delp,
      &  qtr, qaero)
+      endif
 !
 !> ## For the "feedback control", calculate updated values of the state variables by multiplying the cloud base mass flux and the tendencies calculated per unit cloud base mass flux from the static control.
 !! - Recalculate saturation specific humidity.
@@ -1539,11 +1622,13 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
         delvbar(i) = 0.
         qcond(i) = 0.
       enddo
-      do n = 1, ntr
-      do i = 1, im
+      if (.not. hwrf_samfshal) then
+       do n = 1, ntr
+       do i = 1, im
         delebar(i,n) = 0.
-      enddo
-      enddo
+       enddo
+       enddo
+      endif
       do k = 1, km
         do i = 1, im
           if (cnvflg(i)) then
@@ -1566,6 +1651,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           endif
         enddo
       enddo
+      if (.not.hwrf_samfshal) then
       do n = 1, ntr
          kk = n+2
       do k = 1, km
@@ -1580,6 +1666,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
         enddo
       enddo
       enddo
+      endif
 !
 !> - Recalculate saturation specific humidity using the updated temperature.
       do k = 1, km
@@ -1750,7 +1837,8 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 !
       endif
 !> - Store aerosol concentrations if present
-      if (do_aerosols) then
+      if (.not. hwrf_samfshal) then
+       if (do_aerosols) then
         do n = 1, ntc
           kk = n + itc - 1
           do k = 1, km
@@ -1762,6 +1850,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
           enddo
         enddo
        endif
+      endif
 !
 ! hchuang code change
 !
@@ -1787,6 +1876,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
 !
 !   include TKE contribution from shallow convection
 !
+      if (.not.hwrf_samfshal) then
       if (ntk > 0) then
 !
       do k = 2, km1
@@ -1804,6 +1894,7 @@ subroutine samfshalcnv_run(im,ix,km,itc,ntc,cliq,cp,cvap,         &
       enddo
 !
       endif
+      endif
 !!
       return
       end subroutine samfshalcnv_run
diff --git a/physics/samfshalcnv.meta b/physics/samfshalcnv.meta
index 5189afd95..4e7fd3898 100644
--- a/physics/samfshalcnv.meta
+++ b/physics/samfshalcnv.meta
@@ -422,6 +422,14 @@
   kind = kind_phys
   intent = in
   optional = F
+[hwrf_samfshal]
+  standard_name = flag_for_hwrf_samfshalcnv_scheme
+  long_name = flag for hwrf samfshalcnv scheme
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
+  optional = F
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP