Index: wflow/JarvisCoefficients.py =================================================================== diff -u -rf215675cc1a3820198cc622db77b70668f4e83b9 -r79870c854312d1769d6934773180c31f3ab16248 --- wflow/JarvisCoefficients.py (.../JarvisCoefficients.py) (revision f215675cc1a3820198cc622db77b70668f4e83b9) +++ wflow/JarvisCoefficients.py (.../JarvisCoefficients.py) (revision 79870c854312d1769d6934773180c31f3ab16248) @@ -276,8 +276,8 @@ - """ - # teller = numpy.nanmax(pcr.pcr2numpy(self.thestep,nan)) - teller = pcr.pcr2numpy(self.thestep, nan)[0, 0] + # teller = numpy.nanmax(pcr.pcr2numpy(self.thestep,np.nan)) + teller = pcr.pcr2numpy(self.thestep, np.nan)[0, 0] x = teller - floor(teller / 24) * 24 * pcr.scalar(self.catchArea) DL = self.DE - self.DS + 1 P = 2 * pi / (2 * DL) # period @@ -309,7 +309,7 @@ - """ - teller = pcr.pcr2numpy(self.thestep, nan)[0, 0] + teller = pcr.pcr2numpy(self.thestep, np.nan)[0, 0] x = teller - floor(teller / 24) * 24 * pcr.scalar(self.catchArea) DL = self.DE - self.DS + 1 P = 2 * pi / (2 * DL) # period