From ab6c12eb92075fbaa7bb0babee68b1326385ed23 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 18 Feb 2020 14:23:43 -0700 Subject: [PATCH] Switch back hprime to hprime(:,1) --- physics/rrtmgp_lw_pre.F90 | 4 ++-- physics/rrtmgp_lw_pre.meta | 8 ++++---- physics/rrtmgp_lw_rte.F90 | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/physics/rrtmgp_lw_pre.F90 b/physics/rrtmgp_lw_pre.F90 index 6508e4a10..dfc07ff2b 100644 --- a/physics/rrtmgp_lw_pre.F90 +++ b/physics/rrtmgp_lw_pre.F90 @@ -46,7 +46,7 @@ subroutine rrtmgp_lw_pre_run (doLWrad, nCol, lon, lat, slmsk, zorl, snowd, sncov snowd, & ! water equivalent snow depth (mm) sncovr, & ! Surface snow are fraction (1) tsfc ! Surface skin temperature (K) - real(kind_phys), dimension(nCol), intent(in) :: & + real(kind_phys), dimension(nCol,nmtvr), 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, slmsk, zorl, snowd, sncov ! ####################################################################################### ! Call module_radiation_surface::setemis(),to setup surface emissivity for LW radiation. ! ####################################################################################### - call setemis (lon, lat, slmsk, snowd, sncovr, zorl, tsfc, tsfc, hprime, nCol, sfc_emiss) + call setemis (lon, lat, slmsk, snowd, sncovr, zorl, tsfc, tsfc, hprime(:,1), nCol, sfc_emiss) ! Assign same emissivity to all bands do iBand=1,lw_gas_props%get_nband() diff --git a/physics/rrtmgp_lw_pre.meta b/physics/rrtmgp_lw_pre.meta index 23036653a..667020d59 100644 --- a/physics/rrtmgp_lw_pre.meta +++ b/physics/rrtmgp_lw_pre.meta @@ -89,10 +89,10 @@ intent = in optional = F [hprime] - standard_name = standard_deviation_of_subgrid_orography - long_name = standard deviation of subgrid orography - units = m - dimensions = (horizontal_dimension) + standard_name = statistical_measures_of_subgrid_orography + long_name = orographic metrics + units = various + dimensions = (horizontal_dimension,number_of_statistical_measures_of_subgrid_orography) type = real kind = kind_phys intent = in diff --git a/physics/rrtmgp_lw_rte.F90 b/physics/rrtmgp_lw_rte.F90 index 66371f06b..94c9b741e 100644 --- a/physics/rrtmgp_lw_rte.F90 +++ b/physics/rrtmgp_lw_rte.F90 @@ -136,11 +136,11 @@ subroutine rrtmgp_lw_rte_run(doLWrad, nCol, nLev, p_lay, t_lay, p_lev, skt, lw_g ! ! Apply diffusivity angle adjustment (RRTMG legacy) - do iCol=1,nCol - do iBand=1,lw_gas_props%get_nband() - lw_optical_props_clouds%tau(iCol,1:nLev,iBand) = lw_optical_props_clouds%tau(iCol,1:nLev,iBand)*secdiff(iBand,iCol) - enddo - enddo + !do iCol=1,nCol + ! do iBand=1,lw_gas_props%get_nband() + ! lw_optical_props_clouds%tau(iCol,1:nLev,iBand) = lw_optical_props_clouds%tau(iCol,1:nLev,iBand)*secdiff(iBand,iCol) + ! enddo + !enddo ! Add cloud optics to clear-sky optics call check_error_msg('rrtmgp_lw_rte_run',lw_optical_props_clouds%increment(lw_optical_props_clrsky))