diff --git a/route/build/src/dataTypes.f90 b/route/build/src/dataTypes.f90 index c942b925..91aa90bb 100644 --- a/route/build/src/dataTypes.f90 +++ b/route/build/src/dataTypes.f90 @@ -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 diff --git a/route/build/src/process_ntopo.f90 b/route/build/src/process_ntopo.f90 index a5d339c4..ba95a1b7 100644 --- a/route/build/src/process_ntopo.f90 +++ b/route/build/src/process_ntopo.f90 @@ -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) @@ -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)