Index: doc/wflow_building.rst =================================================================== diff -u -rfb630c9f28a399af8c0a201eafe11e4b26d9a7dd -rbfd6062f8b703e72a68d1e058949a2c9cf749e0c --- doc/wflow_building.rst (.../wflow_building.rst) (revision fb630c9f28a399af8c0a201eafe11e4b26d9a7dd) +++ doc/wflow_building.rst (.../wflow_building.rst) (revision bfd6062f8b703e72a68d1e058949a2c9cf749e0c) @@ -9,7 +9,7 @@ - Static data - - Digital Evelevation Model (DEM) + - Digital Elevation Model (DEM) - A Land Cover map Index: doc/wflow_floodmap.rst =================================================================== diff -u -r84c0cd7354293655dcc19dac4658662996d8ba86 -rbfd6062f8b703e72a68d1e058949a2c9cf749e0c --- doc/wflow_floodmap.rst (.../wflow_floodmap.rst) (revision 84c0cd7354293655dcc19dac4658662996d8ba86) +++ doc/wflow_floodmap.rst (.../wflow_floodmap.rst) (revision bfd6062f8b703e72a68d1e058949a2c9cf749e0c) @@ -5,15 +5,21 @@ Introduction ------------ The wflow\_floodmap module can generate flood maps from output -of a wflow\_sbm|hbv|wave model. Is needs to be run inside an existing -case and runid of either of these models. +of a wflow\_sbm|hbv| or wflow\_routing model. -.. warning:: +Method +------ +PM - The documentation is incomplete +Configuration +------------- +PM + + + + - Description of the python module Index: wflow-py/wflow/wflow_floodmap.py =================================================================== diff -u -r3f28b3d315ef8871a89ef8575ad2594dd7410b8b -rbfd6062f8b703e72a68d1e058949a2c9cf749e0c --- wflow-py/wflow/wflow_floodmap.py (.../wflow_floodmap.py) (revision 3f28b3d315ef8871a89ef8575ad2594dd7410b8b) +++ wflow-py/wflow/wflow_floodmap.py (.../wflow_floodmap.py) (revision bfd6062f8b703e72a68d1e058949a2c9cf749e0c) @@ -161,6 +161,27 @@ report(ifthen(self.MaxDepth >0.0,self.MaxDepth),os.path.join(self.SaveDir , "outsum","MaxDepth.map")) report(ifthen(scalar(self.MaxExt) > 0.0,self.MaxExt),os.path.join(self.SaveDir, "outsum","MaxExt.map")) + def parameters(self): + """ + Define all model parameters here that the framework should handle for the model + See wf_updateparameters and the parameters section of the ini file + If you use this make sure to all wf_updateparameters at the start of the dynamic section + and at the start/end of the initial section + """ + modelparameters = [] + + #Static model parameters e.g. + #modelparameters.append(self.ParamType(name="RunoffGeneratingGWPerc",stack="intbl/RunoffGeneratingGWPerc.tbl",type="static",default=0.1)) + # 3: Input time series ################################################### + self.WL_mapstack = self.Dir + configget(self.config, "inputmapstacks", "WaterLevel", + "/inmaps/H") # timeseries for level + + + modelparameters.append(self.ParamType(name="WL",stack=self.WL_mapstack,type="timeseries",default=0.0,verbose=True,lookupmaps=[])) + + + return modelparameters + def initial(self): @@ -186,13 +207,10 @@ self.reinit = int(configget(self.config,"model","reinit","0")) self.fewsrun = int(configget(self.config,"model","fewsrun","0")) - #Qname=configget(self.config,"inputmapstacks","Q","run") - Lname=configget(self.config,"inputmapstacks","H","lev") - + self.wf_updateparameters() + self.basetimestep=86400 self.SaveMapDir = self.Dir + "/" + self.runId + "/outmaps" - self.WL_mapstack=self.Dir + "/" + self.runId + "/outmaps/" + Lname - #self.Q_mapstack=self.Dir + "/" + self.runId + "/outmaps/" + Qname self.Altitude=readmap(self.Dir + "/staticmaps/wflow_dem") self.River=readmap(self.Dir + "/staticmaps/wflow_river") self.Ldd=readmap(self.Dir + "/staticmaps/wflow_ldd") @@ -238,10 +256,9 @@ """ self.FloodDepth = scalar(self.FloodDepth) * 0.0 - - #self.Q = self.wf_readmap(self.Q_mapstack,0.0) - self.WL = scalar(self.wf_readmap(self.WL_mapstack,0.0)) + self.wf_updateparameters() + self.WLatRiver= ifthenelse(scalar(self.River) > 0,self.WL + self.Altitude,scalar(0.0)) # WL surface if level > bankfull. For the eventual surface substract bankfull as measure for river depth self.water_surf = cover(ifthen(self.WLatRiver > (self.BankFull + self.Altitude),self.WLatRiver - self.BankFull),0.0)