added estimation of water levels in settings

menta78 · Jun 12, 2018 · 0358638 · 0358638
1 parent 72f1c08
commit 0358638
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/lisfloodRunManager.py b/lisfloodRunManager.py
@@ -299,7 +299,7 @@ def iterateRun(self):
       endtime = time.time()
       print('All done. Elapsed time = ' + str(int(round(endtime - starttime))) + ' s')
     finally:
-      os.rmtree(self.tmpOutDir, True)
+      shutil.rmtree(self.tmpOutDir, True)
 
 
 

diff --git a/template/settingsEurope.xml b/template/settingsEurope.xml
@@ -153,6 +153,7 @@ NEW 26/7/2005: includes reservoirs, inflow hydrographs
 <setoption choice="1" name="simulateLakes"/>
 <setoption choice="1" name="simulateReservoirs"/> 
 <setoption choice="1" name="simulatePF"/>
+<setoption choice="1" name="simulateWaterLevels"/>
 
 <setoption choice="1" name="SplitRouting"/>
 <setoption choice="0" name="InitLisflood"/>
@@ -164,9 +165,10 @@ NEW 26/7/2005: includes reservoirs, inflow hydrographs
 <setoption choice="1" name="repTopSoilMoistureMaps"/>
 <setoption choice="1" name="repSurfaceSoilMoistureMaps"/>
 <setoption choice="1" name="repDischargeMaps"/>
-<setoption choice="0" name="repsimulateLakes"/>
-<setoption choice="0" name="repsimulateReservoirs"/>
+<setoption choice="1" name="repsimulateLakes"/>
+<setoption choice="1" name="repsimulateReservoirs"/>
 <setoption choice="1" name="repSurfaceRunoffMaps"/>
+<setoption choice="1" name="repWaterLevelMaps"/>
 
 <!-- menta -->
 <setoption choice="1" name="repSnowMaps"/>

diff --git a/template/settingsEurope_cold.xml b/template/settingsEurope_cold.xml
@@ -153,6 +153,7 @@ NEW 26/7/2005: includes reservoirs, inflow hydrographs
 <setoption choice="1" name="simulateLakes"/>
 <setoption choice="1" name="simulateReservoirs"/> 
 <setoption choice="1" name="simulatePF"/>
+<setoption choice="1" name="simulateWaterLevels"/>
 
 <setoption choice="1" name="SplitRouting"/>
 <setoption choice="0" name="InitLisflood"/>
@@ -164,9 +165,10 @@ NEW 26/7/2005: includes reservoirs, inflow hydrographs
 <setoption choice="1" name="repTopSoilMoistureMaps"/>
 <setoption choice="1" name="repSurfaceSoilMoistureMaps"/>
 <setoption choice="1" name="repDischargeMaps"/>
-<setoption choice="0" name="repsimulateLakes"/>
-<setoption choice="0" name="repsimulateReservoirs"/>
+<setoption choice="1" name="repsimulateLakes"/>
+<setoption choice="1" name="repsimulateReservoirs"/>
 <setoption choice="1" name="repSurfaceRunoffMaps"/>
+<setoption choice="1" name="repWaterLevelMaps"/>
 
 <!-- menta -->
 <setoption choice="1" name="repSnowMaps"/>

diff --git a/template/settingsEurope_preliminary.xml b/template/settingsEurope_preliminary.xml
@@ -153,6 +153,7 @@ NEW 26/7/2005: includes reservoirs, inflow hydrographs
 <setoption choice="1" name="simulateLakes"/>
 <setoption choice="1" name="simulateReservoirs"/> 
 <setoption choice="1" name="simulatePF"/>
+<setoption choice="1" name="simulateWaterLevels"/>
 
 <setoption choice="1" name="SplitRouting"/>
 <setoption choice="1" name="InitLisflood"/>
@@ -167,6 +168,7 @@ NEW 26/7/2005: includes reservoirs, inflow hydrographs
 <setoption choice="0" name="repsimulateLakes"/>
 <setoption choice="0" name="repsimulateReservoirs"/>
 <setoption choice="0" name="repSurfaceRunoffMaps"/>
+<setoption choice="1" name="repWaterLevelMaps"/>
 
 <!-- menta -->
 <setoption choice="0" name="repSnowMaps"/>