Index: wflow-py/wflow/pcrglobwb/groundwater.py =================================================================== diff -u -r58f139b2afc2424fc9f8796934878bd6e49c31de -r3d36073f779f6d9a5a34f6304d8e901b65061154 --- wflow-py/wflow/pcrglobwb/groundwater.py (.../groundwater.py) (revision 58f139b2afc2424fc9f8796934878bd6e49c31de) +++ wflow-py/wflow/pcrglobwb/groundwater.py (.../groundwater.py) (revision 3d36073f779f6d9a5a34f6304d8e901b65061154) @@ -76,9 +76,6 @@ self.inputDir = os.path.join( os.path.abspath(Dir), staticmaps ) # iniItems.globalOptions['inputDir'] - self.stateDir = os.path.join( - os.path.abspath(Dir), 'instate' - ) self.landmask = landmask # configuration from the ini file @@ -229,10 +226,14 @@ ) # calculate the reccession coefficient based on the given parameters - if isinstance(self.recessionCoeff,type(None)) and\ - 'recessionCoeff' not in iniItems._sections['groundwaterOptions']: + if ( + isinstance(self.recessionCoeff, type(None)) + and "recessionCoeff" not in iniItems._sections["groundwaterOptions"] + ): - msg = "Calculating the groundwater linear reccesion coefficient based on the given parameters." + msg = ( + "Calculating the groundwater linear reccesion coefficient based on the given parameters." + ) logger.info(msg) # reading the 'aquiferWidth' value from the landSurfaceOptions (slopeLength) @@ -732,7 +733,7 @@ configget(iniItems, "groundwaterOptions", "storGroundwaterIni", "0.0"), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) self.avgAbstraction = vos.readPCRmapClone( configget( @@ -743,7 +744,7 @@ ), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) self.avgAllocation = vos.readPCRmapClone( configget( @@ -754,7 +755,7 @@ ), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) self.avgAllocationShort = vos.readPCRmapClone( configget( @@ -765,7 +766,7 @@ ), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) self.avgNonFossilAllocation = vos.readPCRmapClone( configget( @@ -776,7 +777,7 @@ ), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) self.avgNonFossilAllocationShort = vos.readPCRmapClone( configget( @@ -787,7 +788,7 @@ ), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) # additional initial conditions (needed ONLY for the online coupling between PCR-GLOBWB and MODFLOW)) @@ -801,15 +802,15 @@ iniItems.get("groundwaterOptions", "relativeGroundwaterHeadIni"), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) else: self.relativeGroundwaterHead = self.storGroundwater / self.specificYield self.baseflow = vos.readPCRmapClone( configget(iniItems, "groundwaterOptions", "baseflowIni", "0.0"), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) else: # during/after spinUp @@ -861,7 +862,7 @@ iniItems.get("groundwaterOptions", "storGroundwaterFossilIni"), self.cloneMap, self.tmpDir, - self.stateDir, + self.inputDir, ) # if (