Merge pull request NCAR#1040 from grantfirl/ufs-dev-PR118

UFS-dev PR#118

physics/GFS_surface_generic_post.F90

@@ -130,6 +130,8 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl
 
         if (cplflx .or. cpllnd) then
           do i=1,im
+            dlwsfci_cpl (i) = adjsfcdlw(i)
+            dswsfci_cpl (i) = adjsfcdsw(i)
             dlwsfc_cpl  (i) = dlwsfc_cpl(i) + adjsfcdlw(i)*dtf
             dswsfc_cpl  (i) = dswsfc_cpl(i) + adjsfcdsw(i)*dtf
             psurfi_cpl  (i) = pgr(i)
@@ -138,8 +140,6 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl
 
         if (cplflx) then
           do i=1,im
-            dlwsfci_cpl (i) = adjsfcdlw(i)
-            dswsfci_cpl (i) = adjsfcdsw(i)
             dnirbmi_cpl (i) = adjnirbmd(i)
             dnirdfi_cpl (i) = adjnirdfd(i)
             dvisbmi_cpl (i) = adjvisbmd(i)
@@ -242,7 +242,7 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl
             tedir(i)   = tedir(i)   + edir(i) * dtf
             if (lsm == lsm_noahmp) then
              paha(i)    = paha(i)    + pah(i)   * dtf
-             twa(i)     = waxy(i) 
+             twa(i)     = waxy(i)
             endif
           enddo
         endif
@@ -252,7 +252,7 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl
 !    heat torage parameterization the kinematic sensible heat flux
 !    (hflx) as surface boundary forcing to the pbl scheme is
 !    reduced in a factor of hffac given as a function of surface roughness &
-!    green vegetation fraction (zvfun) 
+!    green vegetation fraction (zvfun)
 !
         do i=1,im
           hflxq(i) = hflx(i)

physics/module_mp_thompson.F90

@@ -1509,6 +1509,14 @@ SUBROUTINE mp_gt_driver(qv, qc, qr, qi, qs, qg, ni, nr, nc,     &
             enddo
          endif
 
+         if (merra2_aerosol_aware) then
+            do k = kts, kte
+               nc(i,k,j) = nc1d(k)
+               nwfa(i,k,j) = nwfa1d(k)
+               nifa(i,k,j) = nifa1d(k)
+            enddo
+         endif
+
          do k = kts, kte
             qv(i,k,j) = qv1d(k)
             qc(i,k,j) = qc1d(k)