Index: wflow-py/wflow/reservoir_Si.py =================================================================== diff -u -r5304872d008eedd1549905bf187ecd067a92a73a -r978510e581d205d904b07bc305a5d0550779c581 --- wflow-py/wflow/reservoir_Si.py (.../reservoir_Si.py) (revision 5304872d008eedd1549905bf187ecd067a92a73a) +++ wflow-py/wflow/reservoir_Si.py (.../reservoir_Si.py) (revision 978510e581d205d904b07bc305a5d0550779c581) @@ -17,19 +17,6 @@ import JarvisCoefficients -def selectSiR(i): - """ - not all functions are still in this file, the older functions can be found - (with the same numbering) in h:\My Documents\memo's\python scripts\wflow\ - """ - if i == 1: - name = 'interception_overflow' - if i == 2: - name = 'interception_overflow2' - if i == 3: - name = 'interception_overflow_Ep' - return name - def interception_no_reservoir(self, k): """ Effective rainfall = rainfall @@ -45,7 +32,6 @@ """ - Effective rainfall is all that does not fit into the interception reservoir - Outgoing fluxes are determined separately - - Code for ini-file: 2 """ self.Pe = max(self.Precipitation - (self.imax[k] - self.Si_t[k]),0) @@ -56,7 +42,7 @@ self.wbSi_[k] = self.Precipitation - self.Ei - self.Pe - self.Si[k] + self.Si_t[k] self.Pe = self.Pe + self.Qw_[k] #added on 3-11-2015 for snow module - self.Ei = self.Ei + self.Ew_[k] + self.Ei = self.Ei + (self.Ew_[k] / self.lamda * self.lamdaS) #lambda added on 31-3-2016 self.Ei_[k]=self.Ei self.Pe_[k]=self.Pe @@ -74,21 +60,20 @@ - Effective rainfall is all that does not fit into the interception reservoir - Outgoing fluxes are determined separately - this version cannot be run with Su averaged (for the current code) - - Code for ini-file: 3 """ JarvisCoefficients.calcEp(self,k) self.PotEvaporation = cover(ifthenelse(self.EpHour >= 0, self.EpHour, 0),0) self.Pe = max(self.Precipitation - (self.imax[k] - self.Si_t[k]),0) self.Si[k] = self.Si_t[k] + (self.Precipitation - self.Pe) - self.Ei = ifthenelse(self.Sw[k] == 0, min(self.PotEvaporation, self.Si[k]), 0) #ifstatement added on 3-11-2015 for snow module + self.Ei = ifthenelse(self.Sw[k] == 0, min((self.PotEvaporation - (self.Ew_[k] / self.lamda * self.lamdaS)), self.Si[k]), 0) #ifstatement added on 3-11-2015 for snow module, '-self.Ew_[k]' added on 17-2-2016 self.Si[k] = self.Si[k] - self.Ei self.wbSi_[k] = self.Precipitation - self.Ei - self.Pe - self.Si[k] + self.Si_t[k] self.Pe = self.Pe + self.Qw_[k] #added on 3-11-2015 for snow module - self.Ei = self.Ei + self.Ew_[k] + self.Ei = self.Ei + (self.Ew_[k] / self.lamda * self.lamdaS) #lambda added on 17-2-2016 self.Ei_[k]=self.Ei self.Pe_[k]=self.Pe