Index: wflow/pcrglobwb/groundwater.py =================================================================== diff -u -r8dbcfd5d238baa9609c6e4269b228278b5edb89c -r6f91818718234a2b316afcf26fa8b1938695b672 --- wflow/pcrglobwb/groundwater.py (.../groundwater.py) (revision 8dbcfd5d238baa9609c6e4269b228278b5edb89c) +++ wflow/pcrglobwb/groundwater.py (.../groundwater.py) (revision 6f91818718234a2b316afcf26fa8b1938695b672) @@ -23,11 +23,9 @@ # along with this program. If not, see . import logging -import math -import os -import pcraster as pcr -from wflow.wf_DynamicFramework import configget, configset +from pcraster.framework import * +from wflow.wf_DynamicFramework import configget from .ncConverter import * @@ -926,7 +924,7 @@ # factor for perturbing the initial storGroundwater self.storGroundwater = self.storGroundwater * ( - pcr.mapnormal() * parameters["standard_deviation"] + 1 + mapnormal() * parameters["standard_deviation"] + 1 ) self.storGroundwater = pcr.max(0.0, self.storGroundwater) @@ -1169,7 +1167,7 @@ self.netcdfObj.data2NetCDF( str(self.outNCDir) + "/" + str(var) + "_dailyTot.nc", var, - pcr.pcr2numpy(self.__getattribute__(var), vos.MV), + pcr2numpy(self.__getattribute__(var), vos.MV), timeStamp, timestepPCR - 1, ) @@ -1192,7 +1190,7 @@ self.netcdfObj.data2NetCDF( str(self.outNCDir) + "/" + str(var) + "_monthTot.nc", var, - pcr.pcr2numpy(self.__getattribute__(var + "MonthTot"), vos.MV), + pcr2numpy(self.__getattribute__(var + "MonthTot"), vos.MV), timeStamp, currTimeStep.monthIdx - 1, ) @@ -1217,7 +1215,7 @@ self.netcdfObj.data2NetCDF( str(self.outNCDir) + "/" + str(var) + "_monthAvg.nc", var, - pcr.pcr2numpy(self.__getattribute__(var + "MonthAvg"), vos.MV), + pcr2numpy(self.__getattribute__(var + "MonthAvg"), vos.MV), timeStamp, currTimeStep.monthIdx - 1, ) @@ -1230,7 +1228,7 @@ self.netcdfObj.data2NetCDF( str(self.outNCDir) + "/" + str(var) + "_monthEnd.nc", var, - pcr.pcr2numpy(self.__getattribute__(var), vos.MV), + pcr2numpy(self.__getattribute__(var), vos.MV), timeStamp, currTimeStep.monthIdx - 1, ) @@ -1253,7 +1251,7 @@ self.netcdfObj.data2NetCDF( str(self.outNCDir) + "/" + str(var) + "_annuaTot.nc", var, - pcr.pcr2numpy(self.__getattribute__(var + "AnnuaTot"), vos.MV), + pcr2numpy(self.__getattribute__(var + "AnnuaTot"), vos.MV), timeStamp, currTimeStep.annuaIdx - 1, ) @@ -1277,7 +1275,7 @@ self.netcdfObj.data2NetCDF( str(self.outNCDir) + "/" + str(var) + "_annuaAvg.nc", var, - pcr.pcr2numpy(self.__getattribute__(var + "AnnuaAvg"), vos.MV), + pcr2numpy(self.__getattribute__(var + "AnnuaAvg"), vos.MV), timeStamp, currTimeStep.annuaIdx - 1, ) @@ -1290,7 +1288,7 @@ self.netcdfObj.data2NetCDF( str(self.outNCDir) + "/" + str(var) + "_annuaEnd.nc", var, - pcr.pcr2numpy(self.__getattribute__(var), vos.MV), + pcr2numpy(self.__getattribute__(var), vos.MV), timeStamp, currTimeStep.annuaIdx - 1, )