Index: wflow-py/wflow/JarvisCoefficients.py =================================================================== diff -u -r978510e581d205d904b07bc305a5d0550779c581 -r9cda4f050ab505ec75d1cf9064980e9182f83aca --- wflow-py/wflow/JarvisCoefficients.py (.../JarvisCoefficients.py) (revision 978510e581d205d904b07bc305a5d0550779c581) +++ wflow-py/wflow/JarvisCoefficients.py (.../JarvisCoefficients.py) (revision 9cda4f050ab505ec75d1cf9064980e9182f83aca) @@ -238,7 +238,7 @@ #teller = numpy.nanmax(pcr2numpy(self.thestep,nan)) teller = pcr2numpy(self.thestep,nan)[0,0] - x = teller - floor(teller/24) * 24 * scalar(self.TopoId) + x = teller - floor(teller/24) * 24 * scalar(self.catchArea) DL = self.DE - self.DS + 1 P = 2 * pi / (2 * DL) # period SH = DL - 12 #horizontal shift of new signal @@ -261,7 +261,7 @@ """ teller = pcr2numpy(self.thestep,nan)[0,0] - x = teller - floor(teller/24) * 24 * scalar(self.TopoId) + x = teller - floor(teller/24) * 24 * scalar(self.catchArea) DL = self.DE - self.DS + 1 P = 2 * pi / (2 * DL) # period SH = DL - 12 #horizontal shift of new signal