Skip to content

sync with urban bug fix included in WRF and Noah-MP bug fix #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cenlinhe merged 5 commits into from
Jan 30, 2025
Merged

sync with urban bug fix included in WRF and Noah-MP bug fix #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8a5c5a
bug fix for Stability function correction for momentum in SLUCM
cenlinhe Jan 29, 2025
8805bc1
bug fix for heat transfer coefficient correlation parameters in BEM
cenlinhe Jan 29, 2025
07a70ed
Corrected LECH stability functions in SLUCM
cenlinhe Jan 29, 2025
21b77eb
bug fix for missing reflected radiation reflection from the wall in S…
cenlinhe Jan 29, 2025
273df1c
sync with Noah-MP source code for recent bug fix
cenlinhe Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion noahmp
Open in desktop
Submodule noahmp updated 31 files
+15 −3 README.md
+1 −1 drivers/hrldas/ConfigVarInTransferMod.F90
+4 −2 drivers/hrldas/NoahmpDriverMainMod.F90
+151 −0 drivers/lis/BiochemVarInTransferMod.F90
+55 −0 drivers/lis/BiochemVarOutTransferMod.F90
+172 −0 drivers/lis/ConfigVarInTransferMod.F90
+46 −0 drivers/lis/ConfigVarOutTransferMod.F90
+157 −0 drivers/lis/EnergyVarInTransferMod.F90
+192 −0 drivers/lis/EnergyVarOutTransferMod.F90
+69 −0 drivers/lis/ForcingVarInTransferMod.F90
+44 −0 drivers/lis/ForcingVarOutTransferMod.F90
+245 −0 drivers/lis/LisNoahmpParamType.F90
+76 −0 drivers/lis/Makefile
+247 −0 drivers/lis/NoahmpDriverMainMod.F90
+324 −0 drivers/lis/NoahmpGroundwaterInitMod.F90
+861 −0 drivers/lis/NoahmpIOVarInitMod.F90
+960 −0 drivers/lis/NoahmpIOVarType.F90
+272 −0 drivers/lis/NoahmpInitMainMod.F90
+1,192 −0 drivers/lis/NoahmpReadTableMod.F90
+117 −0 drivers/lis/NoahmpSnowInitMod.F90
+210 −0 drivers/lis/PedoTransferSR2006Mod.F90
+244 −0 drivers/lis/WaterVarInTransferMod.F90
+155 −0 drivers/lis/WaterVarOutTransferMod.F90
+1 −1 parameters/NoahmpTable.TBL
+1 −1 src/AtmosForcingMod.F90
+1 −0 src/GroundWaterTopModelMod.F90
+1 −1 src/PhenologyMainMod.F90
+2 −2 src/ResistanceAboveCanopyChen97Mod.F90
+3 −2 src/ResistanceBareGroundChen97Mod.F90
+3 −3 src/SurfaceAlbedoGlacierMod.F90
+3 −3 src/SurfaceAlbedoMod.F90
2 changes: 1 addition & 1 deletion urban/wrf/module_sf_bem.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ subroutine hsfluxpv(nz,n,bl,bw,albr,rs,swddif,emr,rl,tr,tair,sigma,hspv,eppv,pv_
uroof=(uout(n+1)**2+vout(n+1)**2)**0.5
deltat=tpv-tair(n+1)
hf=2.5*(40./100.*uroof)**(0.5)
hc=9.842*abs(deltat)**(1./3.)/(7.283-abs(cos(tiltangle)))
hc=9.482*abs(deltat)**(1./3.)/(7.238-abs(cos(tiltangle)))
hup=sqrt(hc**2.+(hf)**2.)
hc=1.810*abs(deltat)**(1./3.)/(1.382+abs(cos(tiltangle)))
hdown=sqrt(hc**2.+(hf)**2.)
Expand Down
12 changes: 6 additions & 6 deletions urban/wrf/module_sf_urban.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ SUBROUTINE urban(LSOLAR, & ! L
SG1=SX*VFGS*(1.-ALBG)
SB1=SX*VFWS*(1.-ALBB)
SG2=SB1*ALBB/(1.-ALBB)*VFGW*(1.-ALBG)
SB2=SG1*ALBG/(1.-ALBG)*VFWG*(1.-ALBB)
SB2=SG1*ALBG/(1.-ALBG)*VFWG*(1.-ALBB) + SB1*ALBB*VFWW

ELSE ! shadow effects model

Expand Down Expand Up @@ -923,7 +923,7 @@ SUBROUTINE urban(LSOLAR, & ! L
SG1=SD*(RW-SLX)/RW*(1.-ALBG)+SQ*VFGS*(1.-ALBG)
SB1=SD*SLX/W*(1.-ALBB)+SQ*VFWS*(1.-ALBB)
SG2=SB1*ALBB/(1.-ALBB)*VFGW*(1.-ALBG)
SB2=SG1*ALBG/(1.-ALBG)*VFWG*(1.-ALBB)
SB2=SG1*ALBG/(1.-ALBG)*VFWG*(1.-ALBB) + SB1*ALBB*VFWW

END IF

Expand Down Expand Up @@ -1133,7 +1133,7 @@ SUBROUTINE urban(LSOLAR, & ! L

CALL TDFCND (DF1,SMR(KZ), QUARTZ, SMCMAX )
DF1 = DF1 * EXP(-2.0 * SHDFAC)
RGR = EPSV*(RX-SIG*(TGRP**4.)/60.)
RGR = EPSV*(RX-SIG*(TA**4.)/60.)
RGRR= (SGR+RGR) * 697.7 * 60.
RCH = RHOO*CPP*CHGR
RR1 = EPSV*(TA**4) * 6.48E-8 / (PS* CHGR) + 1.0
Expand Down Expand Up @@ -1635,7 +1635,7 @@ SUBROUTINE mos(XXX,ALPHA,CD,B1,RIB,Z,Z0,UA,TA,TSF,RHO)
PSIM=ALOG((Z+Z0)/Z0) &
-ALOG((X+1.)**2.*(X**2.+1.)) &
+2.*ATAN(X) &
+ALOG((X+1.)**2.*(X0**2.+1.)) &
+ALOG((X0+1.)**2.*(X0**2.+1.)) &
-2.*ATAN(X0)
FAIH=1./SQRT(1.-16.*XXX)
PSIH=ALOG((Z+Z0)/Z0)+0.4*B1 &
Expand Down Expand Up @@ -3057,13 +3057,13 @@ SUBROUTINE SFCDIF_URB (ZLM,Z0,THZ0,THLM,SFCSPD,AKANDA,AKMS,AKHS,RLMO,CD)
! LECH'S SURFACE FUNCTIONS
! ----------------------------------------------------------------------
PSLMU (ZZ)= -0.96* log (1.0-4.5* ZZ)
PSLMS (ZZ)= ZZ * RRIC -2.076* (1. -1./ (ZZ +1.))
PSLMS (ZZ)= (ZZ/RFC) -2.076* (1. -1./ (ZZ +1.))
PSLHU (ZZ)= -0.96* log (1.0-4.5* ZZ)

! ----------------------------------------------------------------------
! PAULSON'S SURFACE FUNCTIONS
! ----------------------------------------------------------------------
PSLHS (ZZ)= ZZ * RFAC -2.076* (1. -1./ (ZZ +1.))
PSLHS (ZZ)= ZZ * RFAC -2.076* (1. - exp(-1.2 * ZZ))
PSPMU (XX)= -2.* log ( (XX +1.)*0.5) - log ( (XX * XX +1.)*0.5) &
& +2.* ATAN (XX) &
&- PIHF
Expand Down