Index: wflow-py/wflow/reservoir_Su.py =================================================================== diff -u -r2021d28f559d05321903ec806b5dadb39f55b31a -rfacc3a7f729f6910dac37d4761992c70d238fcbd --- wflow-py/wflow/reservoir_Su.py (.../reservoir_Su.py) (revision 2021d28f559d05321903ec806b5dadb39f55b31a) +++ wflow-py/wflow/reservoir_Su.py (.../reservoir_Su.py) (revision facc3a7f729f6910dac37d4761992c70d238fcbd) @@ -78,7 +78,7 @@ self.Qu_[k] = max(self.Pe_[k], 0) self.Eu_[k] = 0. self.Perc_[k] = 0. - self.Su_[k] = 0. + self.Su[k] = 0. self.Cap_[k] = 0. self.wbSu_[k] = self.Pe - self.Eu - self.Qu - self.Perc + self.Cap - self.Su[k] + self.Su_t[k] @@ -225,13 +225,11 @@ JarvisCoefficients.calcEp(self,k) self.PotEvaporation = self.EpHour -# -# pdb.set_trace() + self.cropG_scal = pcr2numpy(self.cropG,NaN) if any(self.cropG_scal == 1): self.sumax2 = self.sumax[k] - elif any(self.cropG_scal > 0): -# pdb.set_trace() + elif any(self.cropG_scal > 0): self.sumax2 = self.sumax[k] * (1 - numpy.max(self.cropG_scal[self.cropG_scal >= 0]) * (1-self.redsu[k])) else: self.sumax2 = self.sumax[k] * self.redsu[k] @@ -591,4 +589,4 @@ self.Qu_[k] = self.Qa + self.Qaadd self.Fa_[k] = self.Fa self.Cap_[k] = self.Cap - self.Perc_[k] = self.Perc + self.Perc_[k] = self.Perc \ No newline at end of file