Skip to content

Commit

Permalink
Merge pull request #988 from grantfirl/ufs-dev-PR23
Browse files Browse the repository at this point in the history
UFS/dev PR#23
  • Loading branch information
grantfirl authored Dec 16, 2022
2 parents fc1d621 + c0e416d commit 05b1682
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
6 changes: 3 additions & 3 deletions physics/module_sf_noahmplsm.f90
Original file line number Diff line number Diff line change
Expand Up @@ -5437,7 +5437,7 @@ subroutine thermalz0(parameters,fveg,z0m,z0mg,zlvl,zpd,ezpd,ustarx, & !
z0ht = z0mt
elseif (opt_trs == 2) then
z0mt = fveg * z0m + (1.0 - fveg) * z0mg
czil1=10.0 ** (- (0.40/0.07) * parameters%hvt)
czil1=10.0 ** (- 0.4 * parameters%hvt)
z0ht = fveg * z0m*exp(-czil1*0.4*258.2*sqrt(ustarx*z0m)) &
+(1.0 - fveg) * z0mg*exp(-czil1*0.4*258.2*sqrt(ustarx*z0mg))
elseif (opt_trs == 3) then
Expand Down Expand Up @@ -5473,7 +5473,7 @@ subroutine thermalz0(parameters,fveg,z0m,z0mg,zlvl,zpd,ezpd,ustarx, & !
if (opt_trs == 1) then
z0ht = z0mt
elseif (opt_trs == 2) then
czil1=10.0 ** (- (0.40/0.07) * parameters%hvt)
czil1=10.0 ** (- 0.4 * parameters%hvt)
z0ht =z0mt*exp(-czil1*0.4*258.2*sqrt(ustarx*z0mt))
elseif (opt_trs == 3) then
if (vegtyp.le.5) then
Expand All @@ -5499,7 +5499,7 @@ subroutine thermalz0(parameters,fveg,z0m,z0mg,zlvl,zpd,ezpd,ustarx, & !
if (opt_trs == 1) then
z0ht = z0mt
elseif (opt_trs == 2) then
czil1= 10.0 ** (- (0.40/0.07) * parameters%hvt)
czil1= 10.0 ** (- 0.4 * parameters%hvt)
z0ht = z0mt*exp(-czil1*0.4*258.2*sqrt(ustarx*z0mt))
elseif (opt_trs == 3) then
if (vegtyp.le.5) then
Expand Down
4 changes: 3 additions & 1 deletion physics/noahmpdrv.F90
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ subroutine noahmpdrv_run &
sncovr1, qsurf, gflux, drain, evap, hflx, ep, runoff, &
cmm, chh, evbs, evcw, sbsno, pah, ecan, etran, edir, snowc,&
stm, snohf,smcwlt2, smcref2, wet1, t2mmp, q2mp,zvfun, &
errmsg, errflg)
ztmax, errmsg, errflg)

use machine , only : kind_phys
use funcphys, only : fpvs
Expand Down Expand Up @@ -360,6 +360,7 @@ subroutine noahmpdrv_run &
real(kind=kind_phys), dimension(:) , intent(out) :: t2mmp ! combined T2m from tiles
real(kind=kind_phys), dimension(:) , intent(out) :: q2mp ! combined q2m from tiles
real(kind=kind_phys), dimension(:) , intent(out) :: zvfun !
real(kind=kind_phys), dimension(:) , intent(out) :: ztmax ! thermal roughness length
character(len=*) , intent(out) :: errmsg
integer , intent(out) :: errflg

Expand Down Expand Up @@ -956,6 +957,7 @@ subroutine noahmpdrv_run &
cmxy (i) = cm_noahmp
chxy (i) = ch_noahmp
zorl (i) = z0_total * 100.0 ! convert to cm
ztmax (i) = z0h_total

smc (i,:) = soil_moisture_vol
slc (i,:) = soil_liquid_vol
Expand Down
8 changes: 8 additions & 0 deletions physics/noahmpdrv.meta
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,14 @@
type = real
kind = kind_phys
intent = out
[ztmax]
standard_name = bounded_surface_roughness_length_for_heat_over_land
long_name = bounded surface roughness length for heat over land
units = m
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = out
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
Expand Down

0 comments on commit 05b1682

Please sign in to comment.