Index: wflow-py/wflow/pcrglobwb/routing.py =================================================================== diff -u -ra2d9fd6c2cd20323a4d1f2407dff1b8d8fec4208 -r636d2d27ab8caccfff8829482438d46951527efd --- wflow-py/wflow/pcrglobwb/routing.py (.../routing.py) (revision a2d9fd6c2cd20323a4d1f2407dff1b8d8fec4208) +++ wflow-py/wflow/pcrglobwb/routing.py (.../routing.py) (revision 636d2d27ab8caccfff8829482438d46951527efd) @@ -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 @@ -456,60 +459,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: @@ -579,15 +582,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") @@ -597,7 +600,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)