Index: wflow-py/Sandbox/wflow_topoflex/reservoir_Sf.py =================================================================== diff -u -r5f72a83356683168a37f127593b6f33c4eccd3b5 -r878b78ee5bcc03356fd85011b4da54a9d9636813 --- wflow-py/Sandbox/wflow_topoflex/reservoir_Sf.py (.../reservoir_Sf.py) (revision 5f72a83356683168a37f127593b6f33c4eccd3b5) +++ wflow-py/Sandbox/wflow_topoflex/reservoir_Sf.py (.../reservoir_Sf.py) (revision 878b78ee5bcc03356fd85011b4da54a9d9636813) @@ -28,8 +28,20 @@ name = 'fastRunoff_lag2' return name -def fastRunoff_lag2(self,k): +def fastRunoff_no_reservoir(self, k): """ + This function is used when no unsaturated zone reservoir is used and only + passes fluxes from the upper reservoirs to the lower + Qf = 0. + Storage in fast reservoir = 0. + """ + self.Qfin_[k] = self.Qu * (1 - self.D) + self.Qf_[k] = self.Qfin_[k] + self.Sf_[k] = 0. + self.wbSf_[k] = self.Qfin_[k] - self.Qf_[k] - self.Sf[k] + self.Sf_t[k] + +def fastRunoff_lag2(self, k): + """ - Lag is applied before inflow into the fast reservoir - Lag formula is derived from Fenicia (2011) - Outgoing fluxes are determined based on (value in previous timestep + inflow)