bug fix in HWRF RRTMG

NCAR · Apr 30, 2020 · d35fad0 · d35fad0
1 parent b084396
commit d35fad0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/physics/radlw_main.F90 b/physics/radlw_main.F90
@@ -670,7 +670,7 @@ subroutine rrtmg_lw_run                                           &
 
       real (kind=kind_phys), dimension(nlay,nbands) :: htrb
       real (kind=kind_phys), dimension(nbands,nlay) :: taucld, tauaer
-      real (kind=kind_phys), dimension(nbands,1,nlay) :: taucld3
+      real (kind=kind_phys), dimension(nbands,npts,nlay) :: taucld3
       real (kind=kind_phys), dimension(ngptlw,nlay) :: fracs, tautot
       real (kind=kind_phys), dimension(nlay,ngptlw) :: fracs_r
 !mz rtrnmc_mcica
@@ -1175,7 +1175,7 @@ subroutine rrtmg_lw_run                                           &
           call cldprop                                                  &
 !  ---  inputs:
      &     ( cldfrc,clwp,relw,ciwp,reiw,cda1,cda2,cda3,cda4,            &
-     &       nlay, nlp1, ipseed(iplon), dz, delgth,                     &
+     &       nlay, nlp1, ipseed(iplon), dz, delgth,iovrlw,              &
 !  ---  outputs:
      &       cldfmc, taucld                                             &
      &     )
@@ -1668,7 +1668,7 @@ end subroutine rlwinit
 !> @{
       subroutine cldprop                                                &
      &     ( cfrac,cliqp,reliq,cicep,reice,cdat1,cdat2,cdat3,cdat4,     & !  ---  inputs
-     &       nlay, nlp1, ipseed, dz, de_lgth,                           &
+     &       nlay, nlp1, ipseed, dz, de_lgth, iovrlw,                    &
      &       cldfmc, taucld                                             & !  ---  outputs
      &     )
 
@@ -1768,7 +1768,7 @@ subroutine cldprop                                                &
       use module_radlw_cldprlw
 
 !  ---  inputs:
-      integer, intent(in) :: nlay, nlp1, ipseed
+      integer, intent(in) :: nlay, nlp1, ipseed, iovrlw
 
       real (kind=kind_phys), dimension(0:nlp1), intent(in) :: cfrac
       real (kind=kind_phys), dimension(nlay),   intent(in) :: cliqp,    &
@@ -1946,6 +1946,8 @@ subroutine cldprop                                                &
 
 !  --- ...  call sub-column cloud generator
 
+!mz*
+      if (iovrlw .ne. 4) then
         call mcica_subcol                                               &
 !  ---  inputs:
      &     ( cldf, nlay, ipseed, dz, de_lgth,                           &
@@ -1962,6 +1964,7 @@ subroutine cldprop                                                &
             endif
           enddo
         enddo
+      endif  !iovrlw
 
       endif   ! end if_isubclw_block
 

diff --git a/physics/radsw_main.F90 b/physics/radsw_main.F90
@@ -720,9 +720,9 @@ subroutine rrtmg_sw_run                                           &
 
 !  ---  locals:
 !mz* HWRF -- input of mcica_subcol_sw
-      real(kind=kind_phys),dimension(1,nlay) :: hgt
+      real(kind=kind_phys),dimension(npts,nlay) :: hgt
       real(kind=kind_phys) :: dzsum
-      real(kind=kind_phys),dimension( nbdsw, 1, nlay )  ::     taucld3, &
+      real(kind=kind_phys),dimension( nbdsw, npts, nlay )  ::  taucld3, &
                                                                ssacld3, &
                                                                asmcld3, &
                                                                fsfcld3