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