Index: wflow-py/wflow/wflow_sbm.py =================================================================== diff -u -r5d605630d76fdf5cbb379ff4202bd428dbbaa566 -re14061eac25a80485dc43ebab91c0f5b07649a78 --- wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 5d605630d76fdf5cbb379ff4202bd428dbbaa566) +++ wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision e14061eac25a80485dc43ebab91c0f5b07649a78) @@ -1263,10 +1263,9 @@ self.waterSlope = max(0.000001, slope(self.WaterDem) * celllength() / self.reallength) if self.waterdem: self.waterLdd = lddcreate(self.WaterDem, 1E35, 1E35, 1E35, 1E35) - #waterLdd = lddcreate(waterDem,1,1,1,1) - #TODO: We should make a couple ot itterations here... + #TODO: We should make a couple ot iterations here... if self.waterdem: Lateral = self.FirstZoneKsatVer * self.FirstZoneKsatHorFrac * self.waterSlope * exp(-self.SaturationDeficit / self.M) MaxHor = max(0.0, min(Lateral, self.FirstZoneDepth)) @@ -1300,7 +1299,6 @@ Ksat = self.FirstZoneKsatVer * exp(-self.f * self.zi) - # Estimate water that may reinfilt SurfaceWater = self.WaterLevel/1000.0 # SurfaceWater (mm) self.CumSurfaceWater = self.CumSurfaceWater + SurfaceWater @@ -1401,8 +1399,6 @@ self.InflowKinWaveCell = upstream(self.TopoLdd, self.OldSurfaceRunoff) deltasup = float(mapmaximum(abs(oldsup - self.SurfaceWaterSupply))) - - if deltasup < self.breakoff or self.nrit >= self.maxitsupply: break @@ -1501,7 +1497,7 @@ self.SoilWatbal = self.ActInfilt + self.reinfiltwater + CellInFlow - self.Transpiration - self.soilevap -\ - self.ExfiltWater - self.SubCellGWRunoff - self.DeltaStorage -\ + self.ExfiltWater - self.SubCellGWRunoff - self.DeltaStorage -\ self.FirstZoneFlux self.InterceptionWatBal = self.PrecipitationPlusMelt - self.Interception -self.StemFlow - self.ThroughFall -\