Skip to content

Sync with updated develop branch #31

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 2 commits into from
Jan 28, 2022
Merged

Sync with updated develop branch #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f0b966
Fix nonstandard unary operator uses: *-
davegill Jan 28, 2022
0c04aea
Merge pull request #30 from davegill/unary_operator_bf
cenlinhe Jan 28, 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
22 changes: 11 additions & 11 deletions src/module_sf_noahmplsm.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8010,8 +8010,8 @@ SUBROUTINE COMPUTE_VIC_SURFRUNOFF(parameters,DT,NSOIL,SMC,ZSOIL,QINSUR,ASAT,RUNS
RUNSRF = 0.0

DO IZ=1,NSOIL-2
TOP_MOIST = TOP_MOIST + (SMC(IZ)*-1.0*ZSOIL(IZ)) ! m
TOP_MAX_MOIST = TOP_MAX_MOIST + (parameters%SMCMAX(IZ)*-1.0*ZSOIL(IZ)) ! m
TOP_MOIST = TOP_MOIST + (SMC(IZ)*(-1.0)*ZSOIL(IZ)) ! m
TOP_MAX_MOIST = TOP_MAX_MOIST + (parameters%SMCMAX(IZ)*(-1.0)*ZSOIL(IZ)) ! m
END DO

! Saturated area from soil moisture
Expand Down Expand Up @@ -8091,13 +8091,13 @@ SUBROUTINE COMPUTE_XAJ_SURFRUNOFF(parameters,DT,FCR,NSOIL,SMC,ZSOIL,QINSUR,RUNSR

DO IZ=1,NSOIL-2
IF ((SMC(IZ)-parameters%SMCREF(IZ)) .GT. 0.0) THEN ! soil moisture greater than field capacity
SM = SM + (SMC(IZ) - parameters%SMCREF(IZ) )*-1.0*ZSOIL(IZ) !m
WM = WM + (parameters%SMCREF(IZ)*-1.0*ZSOIL(IZ)) !m
SM = SM + (SMC(IZ) - parameters%SMCREF(IZ) )*(-1.0)*ZSOIL(IZ) !m
WM = WM + (parameters%SMCREF(IZ)*(-1.0)*ZSOIL(IZ)) !m
ELSE
WM = WM + (SMC(IZ)*-1.0*ZSOIL(IZ))
WM = WM + (SMC(IZ)*(-1.0)*ZSOIL(IZ))
END IF
WM_MAX = WM_MAX + (parameters%SMCREF(IZ)*-1.0*ZSOIL(IZ))
SM_MAX = SM_MAX + (parameters%SMCMAX(IZ) - parameters%SMCREF(IZ))*-1.0*ZSOIL(IZ)
WM_MAX = WM_MAX + (parameters%SMCREF(IZ)*(-1.0)*ZSOIL(IZ))
SM_MAX = SM_MAX + (parameters%SMCMAX(IZ) - parameters%SMCREF(IZ))*(-1.0)*ZSOIL(IZ)
END DO
WM = MIN(WM,WM_MAX) ! tension water (m)
SM = MIN(SM,SM_MAX) ! free water (m)
Expand Down Expand Up @@ -8194,8 +8194,8 @@ SUBROUTINE DYNAMIC_VIC(parameters,DT,SMC,SH2O,SICE,SICEMAX,NSOIL,ZSOIL,QINSUR,F
BB = parameters%BBVIC

DO IZ=1,NSOIL-2
TOP_MOIST = TOP_MOIST + (SMC(IZ)*-1.0*ZSOIL(IZ)) ! actual moisture in top layers, [m]
TOP_MAX_MOIST = TOP_MAX_MOIST + (parameters%SMCMAX(IZ)*-1.0*ZSOIL(IZ)) ! maximum moisture in top layers, [m]
TOP_MOIST = TOP_MOIST + (SMC(IZ)*(-1.0)*ZSOIL(IZ)) ! actual moisture in top layers, [m]
TOP_MAX_MOIST = TOP_MAX_MOIST + (parameters%SMCMAX(IZ)*(-1.0)*ZSOIL(IZ)) ! maximum moisture in top layers, [m]
END DO

IF(TOP_MOIST .GT. TOP_MAX_MOIST) TOP_MOIST = TOP_MAX_MOIST
Expand Down Expand Up @@ -9295,8 +9295,8 @@ SUBROUTINE TRIGGER_IRRIGATION(parameters,NSOIL,ZSOIL,SH2O,FVEG,
SMCAVL = 0.0
SMCLIM = 0.0
! estimate available water and field capacity for the root zone
SMCAVL = (SH2O(1)-parameters%SMCWLT(1))*-1.0*ZSOIL(1) ! current soil water (m)
SMCLIM = (parameters%SMCREF(1)-parameters%SMCWLT(1))*-1.0*ZSOIL(1) ! available water (m)
SMCAVL = (SH2O(1)-parameters%SMCWLT(1))*(-1.0)*ZSOIL(1) ! current soil water (m)
SMCLIM = (parameters%SMCREF(1)-parameters%SMCWLT(1))*(-1.0)*ZSOIL(1) ! available water (m)
DO K = 2, parameters%NROOT
SMCAVL = SMCAVL + (SH2O(K)-parameters%SMCWLT(K))*(ZSOIL(K-1) - ZSOIL(K))
SMCLIM = SMCLIM + (parameters%SMCREF(K)-parameters%SMCWLT(K))*(ZSOIL(K-1) - ZSOIL(K))
Expand Down