Skip to content
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

Jump to bottom

change integer to logical for flag #193

Merged
merged 1 commit into from
Aug 22, 2021
Merged

change integer to logical for flag #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 route/build/src/dataTypes.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ MODULE dataTypes
real(dp) :: H06_D_Nov ! Hanasaki 2006; Average November demand [m3/s]
real(dp) :: H06_D_Dec ! Hanasaki 2006; Average December demand [m3/s]
integer(i4b) :: H06_purpose ! Hanasaki 2006; reservoir purpose; (0= non-irrigation, 1=irrigation) [-]
integer(i4b) :: H06_I_mem_F ! Hanasaki 2006; Flag to transition to modelled inflow [-]
integer(i4b) :: H06_D_mem_F ! Hanasaki 2006; Flag to transition to modelled/provided demand [-]
logical(lgt) :: H06_I_mem_F ! Hanasaki 2006; Flag to transition to modelled inflow [-]
logical(lgt) :: H06_D_mem_F ! Hanasaki 2006; Flag to transition to modelled/provided demand [-]
integer(i4b) :: H06_I_mem_L ! Hanasaki 2006; Memory length in years for inflow [year]
integer(i4b) :: H06_D_mem_L ! Hanasaki 2006; Memory length in years for demand [year]
end type RCHPRP
Expand Down
8 changes: 4 additions & 4 deletions route/build/src/process_ntopo.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ subroutine put_data_struct(nSeg, structSEG, structNTOPO, &
RPARAM_in(iSeg)%R_SLOPE = max(structSEG(iSeg)%var(ixSEG%slope)%dat(1), min_slope)
RPARAM_in(iSeg)%R_MAN_N = structSEG(iSeg)%var(ixSEG%man_n)%dat(1)
RPARAM_in(iSeg)%R_WIDTH = structSEG(iSeg)%var(ixSEG%width)%dat(1)

if (is_lake_sim) then
RPARAM_in(iSeg)%D03_MaxStorage = structSEG(iSeg)%var(ixSEG%D03_MaxStorage)%dat(1)
RPARAM_in(iSeg)%D03_Coefficient = structSEG(iSeg)%var(ixSEG%D03_Coefficient)%dat(1)
Expand Down Expand Up @@ -455,12 +455,12 @@ subroutine put_data_struct(nSeg, structSEG, structNTOPO, &
RPARAM_in(iSeg)%H06_D_Nov = structSEG(iSeg)%var(ixSEG%H06_D_Nov)%dat(1)
RPARAM_in(iSeg)%H06_D_Dec = structSEG(iSeg)%var(ixSEG%H06_D_Dec)%dat(1)
RPARAM_in(iSeg)%H06_purpose = structSEG(iSeg)%var(ixSEG%H06_purpose )%dat(1)
RPARAM_in(iSeg)%H06_I_mem_F = structSEG(iSeg)%var(ixSEG%H06_I_mem_F )%dat(1)
RPARAM_in(iSeg)%H06_D_mem_F = structSEG(iSeg)%var(ixSEG%H06_D_mem_F )%dat(1)
RPARAM_in(iSeg)%H06_I_mem_F = (structSEG(iSeg)%var(ixSEG%H06_I_mem_F)%dat(1)==1)
RPARAM_in(iSeg)%H06_D_mem_F = (structSEG(iSeg)%var(ixSEG%H06_D_mem_F)%dat(1)==1)
RPARAM_in(iSeg)%H06_I_mem_L = structSEG(iSeg)%var(ixSEG%H06_I_mem_L )%dat(1)
RPARAM_in(iSeg)%H06_D_mem_L = structSEG(iSeg)%var(ixSEG%H06_D_mem_L )%dat(1)
end if

! compute variables
RPARAM_in(iSeg)%BASAREA = structSEG(iSeg)%var(ixSEG%basArea)%dat(1)
RPARAM_in(iSeg)%UPSAREA = structSEG(iSeg)%var(ixSEG%upsArea)%dat(1)
Expand Down