Skip to content

FPS-URB-RCC Stage-1 bug fixes #4

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
jesusff merged 13 commits into from
May 28, 2025
Merged

FPS-URB-RCC Stage-1 bug fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
94ad1e4
The net longwave flux absorbed by the building wall, RB2, in module_s…
joshi994 Mar 15, 2024
7c5f7c7
Fix for a do loop index in bep_bem urban code (#2196)
LluisFB Apr 10, 2025
39ea5f0
Update urban LCZ parameter table with more reasonable values (#1969)
cenlinhe Jan 23, 2024
6826794
Update WRF develop with bug fix for LAI initialization for urban pxie…
cenlinhe Jan 24, 2024
9e8acb1
Bug fix for Noah-MP vegetation and urban (NCAR/noahmp#91, NCAR/noahmp…
cenlinhe Jan 13, 2024
565c186
Remove arbitrary limiting of heat fluxes (#1924)
rjdave Jan 13, 2024
fc22ac2
Fixing issue #2039 focing the reading of urbfrac from 'URBPARM_LCZ.TBL'
Feb 24, 2025
d826f50
Bug fix for overwriting of LCZ urban cells in LU_INDEX with default U…
lpilz Jan 17, 2025
1998044
Fix for a do loop index in bep_bem urban code (#2196)
LluisFB Apr 10, 2025
a03eaf8
Bug fix in module_sf_noahdrv.F (A.Martilli)
yoselita May 12, 2025
3d3c973
Near-surface diagnostics in BEP+BEM redefined (A.Martilli)
yoselita May 12, 2025
00cf7ff
Point phys/noahmp to the latest version before merging
jesusff May 28, 2025
fe1e11f
Merge branch 'v4.5.1.7-devel' into bug-fixes
jesusff May 28, 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
4 changes: 2 additions & 2 deletions dyn_em/module_initialize_real.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3097,11 +3097,11 @@ SUBROUTINE init_domain_rk ( grid &
(grid%ivgtyp(i,j).NE.13 .AND. grid%ivgtyp(i,j).NE.24 .AND. grid%ivgtyp(i,j).NE.25 .AND. grid%ivgtyp(i,j).NE.26 .AND. grid%ivgtyp(i,j).LT.30)) grid%ivgtyp(i,j)=13
ELSE IF ( MMINLU == "USGS" ) THEN
IF ( grid%FRC_URB2D(i,j) .GE. 0.5 .AND. &
grid%ivgtyp(i,j).NE.1 ) grid%ivgtyp(i,j)=1
grid%ivgtyp(i,j).NE.1 .AND. grid%ivgtyp(i,j).LT.30) grid%ivgtyp(i,j)=1
ENDIF

IF ( grid%FRC_URB2D(i,j) == 0. ) THEN
IF ( (MMINLU == 'NLCD40' .OR. MMINLU == 'MODIFIED_IGBP_MODIS_NOAH') .AND. &
IF ( (MMINLU == 'NLCD40') .AND. &
(grid%ivgtyp(i,j)==24 .OR. grid%ivgtyp(i,j)==25 .OR. grid%ivgtyp(i,j)==26 .OR. grid%ivgtyp(i,j)==13) ) grid%FRC_URB2D(i,j) = 0.9
IF ( MMINLU == 'USGS' .AND. grid%ivgtyp(i,j)==1 ) grid%FRC_URB2D(i,j) = 0.9
ENDIF
Expand Down
2 changes: 1 addition & 1 deletion phys/module_sf_bep_bem.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@ subroutine BEP1D(itimestep,ix,iy,iurb,kms,kme,kts,kte,z,dt,ua,va,pt,da,pr,pt0,



do iz=1,nz_um !Compute the outdoor temperature
do iz=1,nzu !Compute the outdoor temperature
tmp_u(iz)=pt_u(iz)*(pr_u(iz)/p0)**(rcp_u)
end do

Expand Down
15 changes: 15 additions & 0 deletions phys/module_sf_noahdrv.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,11 @@ SUBROUTINE lsm(DZ8W,QV3D,P8W3D,T3D,TSK, &
REAL :: frc_urb,lb_urb
REAL :: check
!CORDEX
<<<<<<< HEAD
real aa_veg,a2_veg,ptg_rur,zhalf
=======
real aa_veg,a2_veg
>>>>>>> v4.5.1.7-devel
!CORDEX
! ----------------------------------------------------------------------
! DECLARATIONS END - urban
Expand Down Expand Up @@ -1776,6 +1780,16 @@ SUBROUTINE lsm(DZ8W,QV3D,P8W3D,T3D,TSK, &
! endif
!CORDEX here I do a simple log interpolation between the surface temperature of the vegetated frction, tsk_rural, and the lowest
!model level value of temperature
<<<<<<< HEAD
zhalf=dz8w(i,1,j)/2.
aa_veg=0.4/alog(zhalf/znt(i,j))
a2_veg=0.4/alog(2./znt(i,j))
ptg_rur=tsk_rural(i,j)*(1.e5/p_phy(i,1,j))**0.286
t2veg_urb2d(i,j)=(1.-aa_veg/a2_veg)*ptg_rur+aa_veg/a2_veg*th_phy(i,1,j)
t2veg_urb2d(i,j)=t2veg_urb2d(i,j)*(p_phy(i,1,j)/1.e5)**0.286


=======
aa_veg=alog(dz8w(i,1,j)/2./znt(i,j))
a2_veg=alog(2/znt(i,j))
t2veg_urb2d(i,j)=(1.-aa_veg/a2_veg)*tsk_rural(i,j)+aa_veg/a2_veg*th_phy(i,1,j)
Expand All @@ -1787,6 +1801,7 @@ SUBROUTINE lsm(DZ8W,QV3D,P8W3D,T3D,TSK, &
! write(*,*)'p_phy=',p_phy(i,1,j)

t2veg_urb2d(i,j)=t2veg_urb2d(i,j)*(p_phy(i,1,j)/1.e5)**0.286
>>>>>>> v4.5.1.7-devel
!CORDEX
else
SH_URB2D(I,J) = 0.
Expand Down
4 changes: 2 additions & 2 deletions phys/module_sf_sfclay.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ SUBROUTINE SFCLAY1D(J,UX,VX,T1D,QV1D,P1D,dz8w1d, &
!
DO 370 I=its,ite
QFX(I)=FLQC(I)*(QSFC(I)-QX(I))
QFX(I)=AMAX1(QFX(I),0.)
! QFX(I)=AMAX1(QFX(I),0.)
LH(I)=XLV*QFX(I)
370 CONTINUE

Expand All @@ -910,7 +910,7 @@ SUBROUTINE SFCLAY1D(J,UX,VX,T1D,QV1D,P1D,dz8w1d, &
! ENDIF
ELSEIF(XLAND(I)-1.5.LT.0.)THEN
HFX(I)=FLHC(I)*(THGB(I)-THX(I))
HFX(I)=AMAX1(HFX(I),-250.)
! HFX(I)=AMAX1(HFX(I),-250.)
ENDIF
400 CONTINUE

Expand Down
4 changes: 2 additions & 2 deletions phys/module_sf_sfclayrev.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ SUBROUTINE SFCLAYREV1D(J,UX,VX,T1D,QV1D,P1D,dz8w1d, &

DO 370 I=its,ite
QFX(I)=FLQC(I)*(QSFC(I)-QX(I))
QFX(I)=AMAX1(QFX(I),0.)
! QFX(I)=AMAX1(QFX(I),0.)
LH(I)=XLV*QFX(I)
370 CONTINUE

Expand All @@ -1059,7 +1059,7 @@ SUBROUTINE SFCLAYREV1D(J,UX,VX,T1D,QV1D,P1D,dz8w1d, &
! ENDIF
ELSEIF(XLAND(I)-1.5.LT.0.)THEN
HFX(I)=FLHC(I)*(THGB(I)-THX(I))
HFX(I)=AMAX1(HFX(I),-250.)
! HFX(I)=AMAX1(HFX(I),-250.)
ENDIF
400 CONTINUE

Expand Down
4 changes: 2 additions & 2 deletions phys/module_sf_urban.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@ SUBROUTINE urban(LSOLAR, & ! L
RB2=EPSB*( (1.-EPSG)*VFWG*VFGS*RX &
+(1.-EPSG)*EPSB*VFGW*VFWG*SIG*(TBP**4.)/60. &
+(1.-EPSB)*VFWS*(1.-2.*VFWS)*RX &
+(1.-EPSB)*VFWG*(1.-2.*VFWS)*EPSG*SIG*EPSG*TGP**4./60. &
+(1.-EPSB)*VFWG*(1.-2.*VFWS)*SIG*EPSG*TGP**4./60. &
+EPSB*(1.-EPSB)*(1.-2.*VFWS)*(1.-2.*VFWS)*SIG*TBP**4./60. )

RG=RG1+RG2
Expand Down Expand Up @@ -1416,7 +1416,7 @@ SUBROUTINE urban(LSOLAR, & ! L
RB2=EPSB*( (1.-EPSG)*VFWG*VFGS*RX &
+(1.-EPSG)*EPSB*VFGW*VFWG*SIG*(TBP**4.)/60. &
+(1.-EPSB)*VFWS*(1.-2.*VFWS)*RX &
+(1.-EPSB)*VFWG*(1.-2.*VFWS)*EPSG*SIG*EPSG*TGP**4./60. &
+(1.-EPSB)*VFWG*(1.-2.*VFWS)*SIG*EPSG*TGP**4./60. &
+EPSB*(1.-EPSB)*(1.-2.*VFWS)*(1.-2.*VFWS)*SIG*TBP**4./60. )

RG=RG1+RG2
Expand Down
10 changes: 5 additions & 5 deletions phys/module_surface_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3038,7 +3038,8 @@ SUBROUTINE surface_driver( &
IVGTYP(I,J) == LCZ_3 .or. IVGTYP(I,J) == LCZ_4 .or. IVGTYP(I,J) == LCZ_5 .or. &
IVGTYP(I,J) == LCZ_6 .or. IVGTYP(I,J) == LCZ_7 .or. IVGTYP(I,J) == LCZ_8 .or. &
IVGTYP(I,J) == LCZ_9 .or. IVGTYP(I,J) == LCZ_10 .or. IVGTYP(I,J) == LCZ_11 )THEN
T2(I,J) = TH_PHY(i,1,j)/((1.E5/PSFC(I,J))**RCP) !urban
! T2(I,J) = TH_PHY(i,1,j)/((1.E5/PSFC(I,J))**RCP) !urban
T2(I,J)=FRC_URB2D(I,J)*T2G_URB2D(I,J)+(1.-FRC_URB2D(I,J))*T2VEG_URB2D(I,J)
TH2(I,J) = TH_PHY(i,1,j) !urban
Q2(I,J) = qv_curr(i,1,j) !urban
U10(I,J) = U_phy(I,1,J) !urban
Expand Down Expand Up @@ -3453,14 +3454,13 @@ SUBROUTINE surface_driver( &
IVGTYP(I,J) == LCZ_6_TABLE .or. IVGTYP(I,J) == LCZ_7_TABLE .or. IVGTYP(I,J) == LCZ_8_TABLE .or. &
IVGTYP(I,J) == LCZ_9_TABLE .or. IVGTYP(I,J) == LCZ_10_TABLE .or. IVGTYP(I,J) == LCZ_11_TABLE )THEN
!CORDEX - BUG
T2(I,J) = TH_PHY(i,1,j)/((1.E5/PSFC(I,J))**RCP) !urban
T2VEG_URB2D(I,J) = FVEGXY(I,J)*T2MVXY(I,J) + (1.-FVEGXY(I,J))*T2MBXY(I,J)
! T2(I,J) = TH_PHY(i,1,j)/((1.E5/PSFC(I,J))**RCP) !urban
T2(I,J)=FRC_URB2D(I,J)*T2G_URB2D(I,J)+(1.-FRC_URB2D(I,J))*T2VEG_URB2D(I,J)
TH2(I,J) = TH_PHY(i,1,j) !urban
Q2(I,J) = qv_curr(i,1,j) !urban
U10(I,J) = U_phy(I,1,J) !urban
V10(I,J) = V_phy(I,1,J) !urban
!CORDEX
T2VEG_URB2D(I,J) = FVEGXY(I,J)*T2MVXY(I,J) + (1.-FVEGXY(I,J))*T2MBXY(I,J)
!CORDEX
!CORDEX ! for non urban points put 1.e20 for urban diagnostic variables
else
tsk_rural(i,j)=1.e20
Expand Down
2 changes: 1 addition & 1 deletion phys/noahmp
Open in desktop
Submodule noahmp updated 2 files
+6 −2 drivers/wrf/module_sf_noahmpdrv.F
+15 −7 src/module_sf_noahmplsm.F
Loading