Merge branch 'rrtmgp-dev2' of https://github.com/dustinswales/ccpp-ph…

…ysics into rrtmgp-dev2-no-mpi_bcast

physics/GFS_rrtmgp_sw_pre.F90

@@ -69,7 +69,7 @@ subroutine GFS_rrtmgp_sw_pre_run(doLWrad, do_sfcperts, ncol, nlev, ntrac, nsfcpe
          facwf,            & ! Fractional coverage with weak cosz dependency
          fice,             & ! Ice fraction over open water
          tisfc               ! Sea ice surface skin temperature
-    real(kind_phys), dimension(ncol,nmtvr), intent(in) :: &
+    real(kind_phys), dimension(ncol), intent(in) :: &
          hprime               ! orographic metrics 
     real(kind_phys), dimension(ncol,nlev),intent(in) :: &
          p_lay,             & ! Layer pressure
@@ -147,7 +147,7 @@ subroutine GFS_rrtmgp_sw_pre_run(doLWrad, do_sfcperts, ncol, nlev, ntrac, nsfcpe
     ! #######################################################################################
     ! Call module_radiation_surface::setalb() to setup surface albedo.
     ! #######################################################################################
-    call setalb (slmsk, snowd, sncovr, snoalb, zorl, coszen, tsfc, tsfc, hprime(:,1), alvsf,     &
+    call setalb (slmsk, snowd, sncovr, snoalb, zorl, coszen, tsfc, tsfc, hprime, alvsf,     &
          alnsf, alvwf, alnwf, facsf, facwf, fice, tisfc, NCOL, alb1d, pertalb, sfcalb)
 
     ! Approximate mean surface albedo from vis- and nir-  diffuse values.

physics/GFS_rrtmgp_sw_pre.meta

@@ -165,10 +165,10 @@
   intent = in
   optional = F
 [hprime]
-  standard_name = statistical_measures_of_subgrid_orography
-  long_name = orographic metrics
-  units = various
-  dimensions = (horizontal_dimension,number_of_statistical_measures_of_subgrid_orography)
+  standard_name = standard_deviation_of_subgrid_orography
+  long_name = standard deviation of subgrid orography
+  units = m
+  dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys
   intent = in

physics/rrtmgp_lw_pre.F90

@@ -46,7 +46,7 @@ subroutine rrtmgp_lw_pre_run (doLWrad, nCol, lon, lat, lsmask, zorl, snowd, snco
          snowd,             & ! water equivalent snow depth (mm)
          sncovr,            & ! Surface snow are fraction (1)
          tsfc                 ! Surface skin temperature (K)
-    real(kind_phys), dimension(nCol,nmtvr), intent(in) :: &
+    real(kind_phys), dimension(nCol), intent(in) :: &
          hprime               ! Standard deviation of subgrid orography
 
     type(ty_gas_optics_rrtmgp),intent(in) :: &
@@ -72,7 +72,7 @@ subroutine rrtmgp_lw_pre_run (doLWrad, nCol, lon, lat, lsmask, zorl, snowd, snco
     ! #######################################################################################
     ! Call module_radiation_surface::setemis(),to setup surface emissivity for LW radiation.
     ! #######################################################################################
-    call setemis (lon, lat, lsmask, snowd, sncovr, zorl, tsfc, tsfc, hprime(:,1), nCol, sfc_emiss)
+    call setemis (lon, lat, lsmask, snowd, sncovr, zorl, tsfc, tsfc, hprime, nCol, sfc_emiss)
 
     ! Assign same emissivity to all bands
     do iBand=1,lw_gas_props%get_nband()

physics/rrtmgp_lw_pre.meta

@@ -89,10 +89,10 @@
   intent = in
   optional = F
 [hprime]
-  standard_name = statistical_measures_of_subgrid_orography
-  long_name = orographic metrics
-  units = various
-  dimensions = (horizontal_dimension,number_of_statistical_measures_of_subgrid_orography)
+  standard_name = standard_deviation_of_subgrid_orography
+  long_name = standard deviation of subgrid orography
+  units = m
+  dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys
   intent = in