Index: wflow/reservoir_Sa.py =================================================================== diff -u -rfbd077ecd824c16e9e207b542e5ee2f9f9ff92dd -rf215675cc1a3820198cc622db77b70668f4e83b9 --- wflow/reservoir_Sa.py (.../reservoir_Sa.py) (revision fbd077ecd824c16e9e207b542e5ee2f9f9ff92dd) +++ wflow/reservoir_Sa.py (.../reservoir_Sa.py) (revision f215675cc1a3820198cc622db77b70668f4e83b9) @@ -105,20 +105,20 @@ ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Fa = ( self.Fa1 - + (self.Fa1 / ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) + + (self.Fa1 / pcr.ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) * self.Sa_diff ) self.Ea = ( self.Ea1 - + (self.Ea1 / ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) + + (self.Ea1 / pcr.ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) - self.Ea - self.Fa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = self.Pe - self.Ea - self.Qa - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -138,7 +138,7 @@ - Code for ini-file: 2 """ JarvisCoefficients.calcEp(self, k) - self.PotEvaporation = cover(ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) + self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) self.Qa = max(self.Pe - (self.samax[k] - self.Sa_t[k]), 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) @@ -154,20 +154,20 @@ ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Fa = ( self.Fa1 - + (self.Fa1 / ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) + + (self.Fa1 / pcr.ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) * self.Sa_diff ) self.Ea = ( self.Ea1 - + (self.Ea1 / ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) + + (self.Ea1 / pcr.ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) - self.Ea - self.Fa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = self.Pe - self.Ea - self.Qa - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -188,7 +188,7 @@ - Code for ini-file: 3 """ JarvisCoefficients.calcEp(self, k) - self.PotEvaporation = cover(ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) + self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) self.Qa = max(self.Pe - (self.samax[k] - self.Sa_t[k]), 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) @@ -199,28 +199,28 @@ self.Sa[k] / (self.samax[k] * self.LP[k]), 1 ) - self.Fa1 = ifthenelse( + self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), 0, ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Fa = ( self.Fa1 - + (self.Fa1 / ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) + + (self.Fa1 / pcr.ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) * self.Sa_diff ) self.Ea = ( self.Ea1 - + (self.Ea1 / ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) + + (self.Ea1 / pcr.ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) - self.Ea - self.Fa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = self.Pe - self.Ea - self.Qa - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -241,7 +241,7 @@ - Code for ini-file: 4 """ JarvisCoefficients.calcEp(self, k) - self.PotEvaporation = cover(ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) + self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) self.samax2 = self.samax[k] * self.cropG self.Qaadd = max(self.Sa_t[k] - self.samax2, 0) @@ -255,28 +255,28 @@ self.Sa[k] / (self.samax2 * self.LP[k]), 1 ) - self.Fa1 = ifthenelse( + self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), 0, ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Fa = ( self.Fa1 - + (self.Fa1 / ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) + + (self.Fa1 / pcr.ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) * self.Sa_diff ) self.Ea = ( self.Ea1 - + (self.Ea1 / ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) + + (self.Ea1 / pcr.ifthenelse(self.Fa1 + self.Ea1 > 0, self.Fa1 + self.Ea1, 1)) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qa) - self.Ea - self.Fa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = self.Pe - self.Ea - self.Qa - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -298,7 +298,7 @@ """ JarvisCoefficients.calcEp(self, k) - self.PotEvaporation = cover(ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) + self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) self.samax2 = self.samax[k] * self.cropG self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) @@ -311,20 +311,20 @@ self.Sa[k] / (self.samax2 * self.LP[k]), 1 ) self.Qa1 = (self.Pe - self.Qaadd) * (1 - (1 - self.SaN) ** self.beta[k]) - self.Fa1 = ifthenelse( + self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), 0, ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -334,7 +334,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -344,15 +344,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -376,9 +376,9 @@ """ JarvisCoefficients.calcEp(self, k) - self.PotEvaporation = cover(ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) + self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) - self.samax2 = self.samax[k] * scalar(self.catchArea) + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) @@ -389,20 +389,20 @@ self.Sa[k] / (self.samax2 * self.LP[k]), 1 ) self.Qa1 = (self.Pe - self.Qaadd) * (1 - (1 - self.SaN) ** self.beta[k]) - self.Fa1 = ifthenelse( + self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), 0, ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -412,7 +412,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -422,15 +422,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -454,9 +454,9 @@ """ # JarvisCoefficients.calcEp(self,k) - # self.PotEvaporation = cover(ifthenelse(self.EpHour >= 0, self.EpHour, 0),0) + # self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour >= 0, self.EpHour, 0),0) - self.samax2 = self.samax[k] * scalar(self.catchArea) + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) @@ -467,20 +467,20 @@ self.Sa[k] / (self.samax2 * self.LP[k]), 1 ) self.Qa1 = (self.Pe - self.Qaadd) * (1 - (1 - self.SaN) ** self.beta[k]) - self.Fa1 = ifthenelse( + self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), 0, ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -490,7 +490,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -500,15 +500,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -535,7 +535,7 @@ JarvisCoefficients.calcEp(self, k) self.PotEvaporation = self.EpHour - self.samax2 = self.samax[k] * scalar(self.catchArea) + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.FrDur[k] = min( self.FrDur[k] @@ -559,7 +559,7 @@ ), 1, ) - self.Fa1 = self.Ft * ifthenelse( + self.Fa1 = self.Ft * pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), @@ -568,12 +568,12 @@ self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -583,7 +583,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -593,15 +593,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -629,7 +629,7 @@ # JarvisCoefficients.calcEp(self,k) # self.PotEvaporation = self.EpHour - self.samax2 = self.samax[k] * scalar(self.catchArea) + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.FrDur[k] = min( self.FrDur[k] + (self.Temperature) / 86400 * self.timestepsecs * self.dayDeg[k], @@ -652,7 +652,7 @@ ), 1, ) - self.Fa1 = self.Ft * ifthenelse( + self.Fa1 = self.Ft * pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), @@ -661,12 +661,12 @@ self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -676,7 +676,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -686,15 +686,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -732,7 +732,7 @@ 1, ) - self.samax2 = self.samax[k] * scalar(self.catchArea) * self.Ft + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) * self.Ft self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) @@ -743,7 +743,7 @@ self.Sa[k] / (self.samax2 * self.LP[k]), 1 ) self.Qa1 = (self.Pe - self.Qaadd) * (1 - (1 - self.SaN) ** self.beta[k]) - self.Fa1 = ifthenelse( + self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), @@ -752,12 +752,12 @@ self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -767,7 +767,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -777,15 +777,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -811,11 +811,11 @@ """ JarvisCoefficients.calcEp(self, k) - self.PotEvaporation = cover(ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) + self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour >= 0, self.EpHour, 0), 0) self.FrDur[k] = min( self.FrDur[k] - + ifthenelse( + + pcr.ifthenelse( self.Temperature > 0, self.ratFT[k] * self.Temperature, self.Temperature ) * self.dayDeg[k], @@ -830,7 +830,7 @@ 1, ) - self.samax2 = self.samax[k] * scalar(self.catchArea) * self.Ft + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) * self.Ft self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) @@ -842,7 +842,7 @@ ) self.Qa1 = (self.Pe - self.Qaadd) * (1 - (1 - self.SaN) ** self.beta[k]) - self.Fa1 = ifthenelse( + self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), @@ -851,12 +851,12 @@ self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -866,7 +866,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -876,15 +876,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -914,7 +914,7 @@ self.FrDur[k] = min( self.FrDur[k] - + ifthenelse(self.TempSurf > 0, self.ratFT[k] * self.TempSurf, self.TempSurf) + + pcr.ifthenelse(self.TempSurf > 0, self.ratFT[k] * self.TempSurf, self.TempSurf) * self.dayDeg[k], 0, ) @@ -927,7 +927,7 @@ 1, ) - self.samax2 = self.samax[k] * scalar(self.catchArea) * self.Ft + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) * self.Ft self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) @@ -939,7 +939,7 @@ ) self.Qa1 = (self.Pe - self.Qaadd) * (1 - (1 - self.SaN) ** self.beta[k]) - self.Fa1 = ifthenelse( + self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), @@ -948,12 +948,12 @@ self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -963,7 +963,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -973,15 +973,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -1008,7 +1008,7 @@ JarvisCoefficients.calcEp(self, k) self.PotEvaporation = self.EpHour - self.samax2 = self.samax[k] * scalar(self.catchArea) + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) @@ -1019,20 +1019,20 @@ self.Sa[k] / (self.samax2 * self.LP[k]), 1 ) self.Qa1 = (self.Pe - self.Qaadd) * (1 - (1 - self.SaN) ** self.beta[k]) - self.Fa1 = self.cropG * ifthenelse( + self.Fa1 = self.cropG * pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), 0, ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -1042,7 +1042,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -1052,15 +1052,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k] @@ -1086,7 +1086,7 @@ # JarvisCoefficients.calcEp(self,k) # self.PotEvaporation = self.EpHour - self.samax2 = self.samax[k] * scalar(self.catchArea) + self.samax2 = self.samax[k] * pcr.scalar(self.catchArea) self.Qaadd = max(self.Sa_t[k] + self.Pe - self.samax2, 0) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) @@ -1097,20 +1097,20 @@ self.Sa[k] / (self.samax2 * self.LP[k]), 1 ) self.Qa1 = (self.Pe - self.Qaadd) * (1 - (1 - self.SaN) ** self.beta[k]) - self.Fa1 = self.cropG * ifthenelse( + self.Fa1 = self.cropG * pcr.ifthenelse( self.SaN > 0, self.Fmin[k] + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), 0, ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Qa1 - self.Fa1 - self.Ea1 - self.Sa_diff = ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) + self.Sa_diff = pcr.ifthenelse(self.Sa[k] < 0, self.Sa[k], 0) self.Qa = ( self.Qa1 + ( self.Qa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -1120,7 +1120,7 @@ self.Fa1 + ( self.Fa1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) @@ -1130,15 +1130,15 @@ self.Ea1 + ( self.Ea1 - / ifthenelse( + / pcr.ifthenelse( self.Fa1 + self.Ea1 + self.Qa1 > 0, self.Fa1 + self.Ea1 + self.Qa1, 1 ) ) * self.Sa_diff ) self.Sa[k] = self.Sa_t[k] + (self.Pe - self.Qaadd) - self.Ea - self.Fa - self.Qa - self.Sa[k] = ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) - self.Sa_diff2 = ifthen(self.Sa[k] < 0, self.Sa[k]) + self.Sa[k] = pcr.ifthenelse(self.Sa[k] < 0, 0, self.Sa[k]) + self.Sa_diff2 = pcr.ifthen(self.Sa[k] < 0, self.Sa[k]) self.wbSa_[k] = ( self.Pe - self.Ea - self.Qa - self.Qaadd - self.Fa - self.Sa[k] + self.Sa_t[k]