Skip to content

sync with develop branch for bug fix of SLUCM and INFIL #50

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 3 commits into from
Oct 3, 2022
Merged

sync with develop branch for bug fix of SLUCM and INFIL #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0081f82
bug fix for LCZ urban type for SLUCM in noahmp driver
cenlinhe Oct 2, 2022
72ce65e
bug fix for max infiltration in run_off=3
cenlinhe Oct 2, 2022
67e0a5f
bug fix for LCZ declaration
cenlinhe Oct 3, 2022
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
10 changes: 7 additions & 3 deletions drivers/wrf/module_sf_noahmpdrv.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3024,7 +3024,9 @@ SUBROUTINE noahmp_urban(sf_urban_physics, NSOIL, IVGTYP, ITIMESTEP,
USE module_sf_bep, only: bep
USE module_sf_bep_bem, only: bep_bem
USE module_ra_gfdleta, only: cal_mon_day
USE NOAHMP_TABLES, ONLY: ISURBAN_TABLE
USE NOAHMP_TABLES, ONLY: ISURBAN_TABLE,LCZ_1_TABLE,LCZ_2_TABLE,LCZ_3_TABLE,LCZ_4_TABLE, &
LCZ_5_TABLE,LCZ_6_TABLE,LCZ_7_TABLE,LCZ_8_TABLE, &
LCZ_9_TABLE,LCZ_10_TABLE,LCZ_11_TABLE
USE module_model_constants, only: KARMAN, CP, XLV
!----------------------------------------------------------------
IMPLICIT NONE
Expand Down Expand Up @@ -3345,8 +3347,10 @@ SUBROUTINE noahmp_urban(sf_urban_physics, NSOIL, IVGTYP, ITIMESTEP,
ILOOP : DO I = its, ite


IF( IVGTYP(I,J) == ISURBAN_TABLE .or. IVGTYP(I,J) == 31 .or. &
IVGTYP(I,J) == 32 .or. IVGTYP(I,J) == 33 ) THEN
IF( IVGTYP(I,J) == ISURBAN_TABLE .or. IVGTYP(I,J) == LCZ_1_TABLE .or. IVGTYP(I,J) == LCZ_2_TABLE .or. &
IVGTYP(I,J) == LCZ_3_TABLE .or. IVGTYP(I,J) == LCZ_4_TABLE .or. IVGTYP(I,J) == LCZ_5_TABLE .or. &
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

UTYPE_URB = UTYPE_URB2D(I,J) !urban type (low, high or industrial)

Expand Down
2 changes: 1 addition & 1 deletion src/module_sf_noahmplsm.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7696,7 +7696,7 @@ SUBROUTINE INFIL (parameters,NSOIL ,DT ,ZSOIL ,SH2O ,SICE , & !in

CALL WDFCND2 (parameters,WDF,WCND,SH2O(1),SICEMAX,1)
INFMAX = MAX (INFMAX,WCND)
INFMAX = MIN (INFMAX,PX)
INFMAX = MIN (INFMAX,PX/DT)

RUNSRF= MAX(0.0, QINSUR - INFMAX)
PDDUM = QINSUR - RUNSRF
Expand Down