Index: examples/wflow_routing/intbl/ResDemand.tbl =================================================================== diff -u --- examples/wflow_routing/intbl/ResDemand.tbl (revision 0) +++ examples/wflow_routing/intbl/ResDemand.tbl (revision ff596787764e8625c7d923eec003f0de94287449) @@ -0,0 +1,3 @@ +1 1200 +2 1000 +3 300 Index: examples/wflow_routing/intbl/ResMaxRelease.tbl =================================================================== diff -u --- examples/wflow_routing/intbl/ResMaxRelease.tbl (revision 0) +++ examples/wflow_routing/intbl/ResMaxRelease.tbl (revision ff596787764e8625c7d923eec003f0de94287449) @@ -0,0 +1,3 @@ +1 1200 +2 1000 +3 300 Index: examples/wflow_routing/intbl/ResMaxVolume.tbl =================================================================== diff -u --- examples/wflow_routing/intbl/ResMaxVolume.tbl (revision 0) +++ examples/wflow_routing/intbl/ResMaxVolume.tbl (revision ff596787764e8625c7d923eec003f0de94287449) @@ -0,0 +1,3 @@ +1 1000000000 +2 2000000000 +3 3000000000 Index: examples/wflow_routing/wflow_routing.ini =================================================================== diff -u -r5a35482661552a440f090200fcdf0d0f5b14729a -rff596787764e8625c7d923eec003f0de94287449 --- examples/wflow_routing/wflow_routing.ini (.../wflow_routing.ini) (revision 5a35482661552a440f090200fcdf0d0f5b14729a) +++ examples/wflow_routing/wflow_routing.ini (.../wflow_routing.ini) (revision ff596787764e8625c7d923eec003f0de94287449) @@ -67,3 +67,10 @@ [summary] self.TopoLdd=ldd.map + + +[outputtss_0] +samplemap=staticmaps/wflow_reservoirlocs.map +self.ReservoirVolume=resvol.tss +self.ResPecrFull=pec.tss +self.Outflow=of.tss Index: wflow-py/wflow/wflow_routing.py =================================================================== diff -u -r5a35482661552a440f090200fcdf0d0f5b14729a -rff596787764e8625c7d923eec003f0de94287449 --- wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 5a35482661552a440f090200fcdf0d0f5b14729a) +++ wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision ff596787764e8625c7d923eec003f0de94287449) @@ -526,11 +526,11 @@ modelparameters.append(self.ParamType(name="InwaterForcing",stack=self.IW_mapstack ,type="timeseries",default=0.0,verbose=True,lookupmaps=[])) modelparameters.append(self.ParamType(name="Inflow",stack=self.Inflow_mapstack,type="timeseries",default=0.0,verbose=False,lookupmaps=[])) modelparameters.append(self.ParamType(name="ReserVoirLocs",stack='staticmaps/wflow_reservoirlocs.map',type="staticmap",default=0.0,verbose=False,lookupmaps=[])) - modelparameters.append(self.ParamType(name="ResTargetFullFrac",stack='intbl/ResTargetFullFrac.tbl',type="statictbl",default=0.8,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map'])) - modelparameters.append(self.ParamType(name="ResTargetMinFrac",stack='intbl/ResTargetMinFrac.tbl',type="statictbl",default=0.4,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map'])) - 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="ResTargetFullFrac",stack='intbl/ResTargetFullFrac.tbl',type="tbl",default=0.8,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map'])) + modelparameters.append(self.ParamType(name="ResTargetMinFrac",stack='intbl/ResTargetMinFrac.tbl',type="tbl",default=0.4,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map'])) + modelparameters.append(self.ParamType(name="ResMaxVolume",stack='intbl/ResMaxVolume.tbl',type="tbl",default=0.0,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map'])) + modelparameters.append(self.ParamType(name="ResMaxRelease",stack='intbl/ResMaxRelease.tbl',type="tbl",default=1.0,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map'])) + modelparameters.append(self.ParamType(name="ResDemand",stack='intbl/ResDemand.tbl',type="tbl",default=1.0,verbose=False,lookupmaps=['staticmaps/wflow_reservoirlocs.map'])) return modelparameters @@ -543,7 +543,7 @@ self.WaterLevelFP = self.ZeroMap self.SurfaceRunoff = self.ZeroMap self.WaterLevel = self.WaterLevelCH + self.WaterLevelFP - self.ReservoirVolume = self.ZeroMap + self.ReservoirVolume = self.ResMaxVolume * self.ResTargetFullFrac else: self.logger.info("Setting initial conditions from state files") self.wf_resume(os.path.join(self.Dir,"instate"))