Index: wflow-py/wflow/wflow_routing.py
===================================================================
diff -u -r8359d6f1f8eb9aae3ad66ca48311a86f45a2b946 -r5a35482661552a440f090200fcdf0d0f5b14729a
--- wflow-py/wflow/wflow_routing.py	(.../wflow_routing.py)	(revision 8359d6f1f8eb9aae3ad66ca48311a86f45a2b946)
+++ wflow-py/wflow/wflow_routing.py	(.../wflow_routing.py)	(revision 5a35482661552a440f090200fcdf0d0f5b14729a)
@@ -531,9 +531,8 @@
         modelparameters.append(self.ParamType(name="ResMaxVolume",stack='intbl/ResMaxVolume.tbl',type="statictbl",default=0.0,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map']))
         modelparameters.append(self.ParamType(name="ResMaxRelease",stack='intbl/ResMaxRelease.tbl',type="statictbl",default=1.0,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map']))
         modelparameters.append(self.ParamType(name="ResDemand",stack='intbl/ResMaxRelease.tbl',type="statictbl",default=1.0,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map']))
-        modelparameters.append(self.ParamType(name="ResDemand",stack='intbl/ResMaxRelease.tbl',type="statictbl",default=1.0,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map']))
-        # XXXXXXXXXXXXXXXXXx Add monthly climatology tbl files (append month to filename??)
 
+
         return modelparameters
 
     def resume(self):
@@ -544,6 +543,7 @@
             self.WaterLevelFP   = self.ZeroMap
             self.SurfaceRunoff = self.ZeroMap
             self.WaterLevel = self.WaterLevelCH + self.WaterLevelFP
+            self.ReservoirVolume = self.ZeroMap
         else:
             self.logger.info("Setting initial conditions from state files")
             self.wf_resume(os.path.join(self.Dir,"instate"))
@@ -608,7 +608,10 @@
 
         #only run the reservoir module if needed
         if self.nrres > 0:
-            self.ReservoirVolume, self.Outflow = self.reallysimpelreservoir(self.ReservoirVolume,self.SurfaceRunoff,self.ReservoirK,self.DeadVolume)
+            self.ReservoirVolume, self.Outflow,self.ResPecrFull,self.DemandRelease = self.simpelreservoir(self.ReservoirVolume,self.SurfaceRunoff,
+                                                                      self.ResMaxVolume,self.ResTargetFullFrac,
+                                                                      self.ResMaxRelease, self.ResDemand,
+                                                                      self.ResTargetMinFrac)
             self.OutflowDwn = upstream(self.TopoLddOrg,cover(self.Outflow,scalar(0.0)))
             self.Inflow = cover(self.OutflowDwn,self.Inflow)