Index: wflow-py/wflow/wflow_sbm.py =================================================================== diff -u -r112649cb3a6582012cb84f89c21a311a635e2eb3 -r531317c453fb999265e9b1dabd69dfd6532bd4e1 --- wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 112649cb3a6582012cb84f89c21a311a635e2eb3) +++ wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 531317c453fb999265e9b1dabd69dfd6532bd4e1) @@ -203,7 +203,7 @@ RainFall = max(SnowWater - MaxSnowWater, 0.0) # rain + surpluss snowwater SnowWater = SnowWater - RainFall - return Snow, SnowWater, SnowMelt, RainFall + return Snow, SnowWater, SnowMelt, RainFall,SnowFall def GlacierMelt(GlacierStore, Snow, Temperature, TT, Cfmax): @@ -304,11 +304,16 @@ :var self.FirstZoneDepth: Water in the saturated store [mm] :var self.CanopyStorage: Amount of water on the Canopy [mm] :var self.ReservoirVolume: Volume of each reservoir [m^3] + :var self.GlacierStore: Thickness of the Glacier in a gridcell [mm] """ states = ['SurfaceRunoff', 'WaterLevel', 'FirstZoneDepth','Snow', 'TSoil','UStoreDepth','SnowWater', 'CanopyStorage','ReservoirVolume','GlacierStore'] + defaults = [0.0,0.0, + 0.0, 0.0, + 10.0,0.0,0.0, + 0.0,0.0,0.0] return states @@ -400,8 +405,6 @@ table is above the lowest part of the roots. A less negative number smooths this. [mm] (default = -80000) - - *Canopy* :var CanopyGapFraction.tbl: Fraction of precipitation that does not hit the canopy directly [-] @@ -999,7 +1002,7 @@ if self.modelSnow: self.TSoil = self.TSoil + self.w_soil * (self.Temperature - self.TSoil) # return Snow,SnowWater,SnowMelt,RainFall - self.Snow, self.SnowWater, self.SnowMelt, self.PrecipitationPlusMelt = SnowPackHBV(self.Snow, self.SnowWater, + self.Snow, self.SnowWater, self.SnowMelt, self.PrecipitationPlusMelt,self.SnowFall = SnowPackHBV(self.Snow, self.SnowWater, self.Precipitation, self.Temperature, self.TTI, self.TT, self.Cfmax, self.WHC)