Index: wflow/wflow_topoflex.py =================================================================== diff -u -ra9498adee6baab0a0abaa331041be8948510167b -r327cf67207b7d3dfb5a3fecab60c9706a313f1f5 --- wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision a9498adee6baab0a0abaa331041be8948510167b) +++ wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision 327cf67207b7d3dfb5a3fecab60c9706a313f1f5) @@ -16,13 +16,24 @@ """ +import wflow.reservoir_Si as reservoir_Si +import wflow.reservoir_Sa as reservoir_Sa +import wflow.reservoir_Sw as reservoir_Sw +import wflow.reservoir_Su as reservoir_Su +import wflow.reservoir_Sf as reservoir_Sf +import wflow.reservoir_Ss as reservoir_Ss +import wflow.JarvisCoefficients as JarvisCoefficients + + import os.path from copy import deepcopy as copylist import pcraster.framework from wflow.wf_DynamicFramework import * from wflow.wflow_adapt import * +import pcraster as pcr + # TODO: see below """ Verwijderen IRURFR_L statements? @@ -1281,7 +1292,7 @@ self.PrecipTotal = ( self.Precipitation ) # NB: self.PrecipTotal is the precipitation as in the inmaps and self.Precipitation is in fact self.Rainfall !!!! - if self.selectSw[0] > 0: + if self.selectSw[0] is not None: self.Precipitation = pcr.ifthenelse( self.Temperature >= self.Tt[0], self.PrecipTotal, 0 )