Index: wflow-py/wflow/pcrglobwb/routing.py =================================================================== diff -u -r92ec93127ab3b6921806d3ce96dcdb9ee5ce96fa -r831722412888fabe904a22d2548ac77be2c1a5f4 --- wflow-py/wflow/pcrglobwb/routing.py (.../routing.py) (revision 92ec93127ab3b6921806d3ce96dcdb9ee5ce96fa) +++ wflow-py/wflow/pcrglobwb/routing.py (.../routing.py) (revision 831722412888fabe904a22d2548ac77be2c1a5f4) @@ -124,6 +124,9 @@ self.inputDir = os.path.join( os.path.abspath(Dir), staticmaps ) # iniItems.globalOptions['inputDir'] + self.stateDir = os.path.join( + os.path.abspath(Dir), 'instate' + ) # option to activate water balance check self.debugWaterBalance = True @@ -450,60 +453,60 @@ iniItems.get("routingOptions", "timestepsToAvgDischargeIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) self.channelStorage = vos.readPCRmapClone( iniItems.get("routingOptions", "channelStorageIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) self.readAvlChannelStorage = vos.readPCRmapClone( iniItems.get("routingOptions", "readAvlChannelStorageIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) self.avgDischarge = vos.readPCRmapClone( iniItems.get("routingOptions", "avgDischargeLongIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) self.m2tDischarge = vos.readPCRmapClone( iniItems.get("routingOptions", "m2tDischargeLongIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) self.avgBaseflow = vos.readPCRmapClone( iniItems.get("routingOptions", "avgBaseflowLongIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) self.riverbedExchange = vos.readPCRmapClone( iniItems.get("routingOptions", "riverbedExchangeIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) # New initial condition variable introduced in the version 2.0.2: avgDischargeShort self.avgDischargeShort = vos.readPCRmapClone( iniItems.get("routingOptions", "avgDischargeShortIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) # Initial conditions needed for kinematic wave methods self.subDischarge = vos.readPCRmapClone( configget(iniItems, "routingOptions", "subDischargeIni", "0.0"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) else: @@ -573,15 +576,15 @@ ), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) self.avgOutflow = vos.readPCRmapClone( configget( iniItems, "routingOptions", "avgLakeReservoirOutflowLongIni", "0.0" ), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) if ( configget(iniItems, "routingOptions", "waterBodyStorageIni", "None") @@ -591,7 +594,7 @@ iniItems.get("routingOptions", "waterBodyStorageIni"), self.cloneMap, self.tmpDir, - self.inputDir, + self.stateDir, ) self.waterBodyStorage = pcr.ifthen( self.landmask, pcr.cover(self.waterBodyStorage, 0.0)