Skip to content

Sync with Develop branch for bug fix of crop and LCZ #52

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 14, 2022
Merged

Sync with Develop branch for bug fix of crop and LCZ #52

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
0d98d19
bug fix for LAI/SAI inout variable for carbon
cenlinhe Oct 10, 2022
26de0b1
bug fix for crop carbon flux for unit conversion and diagnostic varia…
cenlinhe Oct 10, 2022
5059a53
bug fix for urban pixel if-statement in noahmp driver
cenlinhe Oct 14, 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
28 changes: 25 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 @@ -1972,6 +1972,7 @@ SUBROUTINE NOAHMP_INIT ( MMINLU, SNOW , SNOWH , CANWAT , ISLTYP , IVGTYP, XLAT
REAL, DIMENSION(ims:ime,jms:jme), INTENT(INOUT) :: chstarxy !dummy
!jref:end

logical :: urbanpt_flag ! added to identify urban pixels by accounting for LCZ

REAL, DIMENSION(1:NSOIL) :: ZSOIL ! Depth of the soil layer bottom (m) from
! the surface (negative)
Expand Down Expand Up @@ -2150,8 +2151,17 @@ SUBROUTINE NOAHMP_INIT ( MMINLU, SNOW , SNOWH , CANWAT , ISLTYP , IVGTYP, XLAT
areaxy (I,J) = (DX * DY) / ( MSFTX(I,J) * MSFTY(I,J) )
endif

! add urban flag to include LCZ
urbanpt_flag = .false.
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
urbanpt_flag = .true.
ENDIF

IF(IVGTYP(I,J) == ISBARREN_TABLE .OR. IVGTYP(I,J) == ISICE_TABLE .OR. &
( SF_URBAN_PHYSICS == 0 .AND. IVGTYP(I,J) == ISURBAN_TABLE ) .OR. &
( SF_URBAN_PHYSICS == 0 .AND. urbanpt_flag ) .OR. &
IVGTYP(I,J) == ISWATER_TABLE ) THEN

lai (I,J) = 0.0
Expand Down Expand Up @@ -2439,7 +2449,9 @@ SUBROUTINE GROUNDWATER_INIT ( &


USE NOAHMP_TABLES, ONLY : BEXP_TABLE,SMCMAX_TABLE,PSISAT_TABLE,SMCWLT_TABLE,DWSAT_TABLE,DKSAT_TABLE, &
ISURBAN_TABLE, ISICE_TABLE ,ISWATER_TABLE
ISURBAN_TABLE, ISICE_TABLE ,ISWATER_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_sf_noahmp_groundwater, ONLY : LATERALFLOW
USE module_domain, only: domain
#if (EM_CORE == 1)
Expand Down Expand Up @@ -2490,6 +2502,7 @@ SUBROUTINE GROUNDWATER_INIT ( &
REAL, DIMENSION(1:NSOIL) :: SMCEQ,ZSOIL
REAL, DIMENSION( ims:ime, jms:jme ) :: QLAT, QRF
INTEGER, DIMENSION( ims:ime, jms:jme ) :: LANDMASK !-1 for water (ice or no ice) and glacial areas, 1 for land where the LSM does its soil moisture calculations
logical :: urbanpt_flag ! added to identify urban pixels by accounting for LCZ

! Given the soil layer thicknesses (in DZS), calculate the soil layer
! depths from the surface.
Expand Down Expand Up @@ -2635,7 +2648,16 @@ SUBROUTINE GROUNDWATER_INIT ( &
BEXP = BEXP_TABLE(ISLTYP(I,J))
SMCMAX = SMCMAX_TABLE(ISLTYP(I,J))
SMCWLT = SMCWLT_TABLE(ISLTYP(I,J))
IF(IVGTYP(I,J)==ISURBAN_TABLE)THEN
! add urban flag to include LCZ
urbanpt_flag = .false.
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
urbanpt_flag = .true.
ENDIF
!IF(IVGTYP(I,J)==ISURBAN_TABLE)THEN
IF (urbanpt_flag) THEN
SMCMAX = 0.45
SMCWLT = 0.40
ENDIF
Expand Down
Loading