double line removed

Author: jaapschellekens

doc/index.rst

@@ -293,6 +293,20 @@ References
     initial reference to northern Costa Rica.,, 2006.
 
 
+Papers/reports using wflow
+==========================
+
+Jeuken, A., L. Bouaziz, G. Corzo, and L. Alfonso, 2016: Analyzing Needs for Climate Change Adaptation
+   in the Magdalena River Basin in Colombia. Climate Change Adaptation, Resilience and Hazards, W.L. Filho,
+   H. Musa, G. Cavan, P. O’Hare, and J. Seixas, Eds., Climate Change Management, Springer International Publishing,
+   329–344 http://link.springer.com/chapter/10.1007/978-3-319-39880-8_20 (Accessed September 26, 2016).
+
+Lopez Lopez, P., N. Wanders, J. Schellekens, L. J. Renzullo, E. H. Sutanudjaja, and M. F. P. Bierkens, 2015: Improved
+ large-scale hydrological modelling through the assimilation of streamflow and downscaled satellite soil moisture
+ observations. Hydrology and Earth System Sciences Discussions, 12, 10559–10601, doi:10.5194/hessd-12-10559-2015.
+
+
+
 TODO
 ====
 

wflow-py/wflow/wflow_funcs.py

@@ -120,7 +120,7 @@ def rainfall_interception_modrut(Precipitation,PotEvap,CanopyStorage,CanopyGapFr
     Pfrac = (1 - p -pt) * Precipitation
 
     # S cannot be larger than Cmax, no gravity drainage below that
-    DD = ifthenelse (CanopyStorage > Cmax , Cmax - CanopyStorage , 0.0)
+    DD = ifthenelse (CanopyStorage > Cmax , CanopyStorage - Cmax , 0.0)
     CanopyStorage = CanopyStorage - DD
 
     # Add the precipitation that falls on the canopy to the store

wflow-py/wflow/wflow_sbm.py

@@ -1263,10 +1263,9 @@ def dynamic(self):
         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 @@ def dynamic(self):
 
         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 @@ def dynamic(self):
                 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 @@ def dynamic(self):
 
 
         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 -\

wflow-py/wflow/wflow_sbm2.py

@@ -1005,8 +1005,9 @@ def resume(self):
             self.logger.info("Setting initial conditions to default")
             self.SatWaterDepth = self.SoilWaterCapacity * 0.85
 
-            for n in arange(0,self.nrLayers):
-                self.UStoreLayerDepth[n]
+            #for n in arange(0,self.nrLayers):
+            #    self.UStoreLayerDepth[n] = self.ZeroMap
+            # TODO: move UStoreLayerDepth from initial to here
 
             self.WaterLevel = self.ZeroMap
             self.SurfaceRunoff = self.ZeroMap
@@ -1793,6 +1794,7 @@ def dynamic(self):
 
             # update/nudge self.UStoreDepth for the whole upstream area,
             # not sure how much this helps or worsens things
+            # TODO: FIx this for multiple layers
             UpdSoil = True
             if UpdSoil:
                 toadd = (self.UStoreDepth * UpRatioSoil) - self.UStoreDepth