GFZ/feature/tws

src/lisflood/Lisflood_dynamic.py

@@ -246,6 +246,10 @@ def splitlanduse(array1, array2=None, array3=None):
         # Calculate water level
         self.waterlevel_module.dynamic()
 
+        # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+        # Calculate water storage
+        self.waterstorage_module.dynamic()        
+
         # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
         # ************************************************************

src/lisflood/Lisflood_initial.py

@@ -59,6 +59,7 @@
 from .hydrological_modules.opensealed import opensealed
 from .hydrological_modules.waterbalance import waterbalance
 from .hydrological_modules.waterlevel import waterlevel
+from .hydrological_modules.waterstorage import waterstorage
 from .hydrological_modules.structures import structures
 
 from .global_modules.output import outputTssMap
@@ -150,6 +151,7 @@ def __init__(self):
         self.opensealed_module = opensealed(self)
         self.waterbalance_module = waterbalance(self)
         self.waterlevel_module = waterlevel(self)
+        self.waterstorage_module = waterstorage(self)
         self.structures_module = structures(self)
 
         self.prescribed_vegetation = self.epic_settings.prescribed_vegetation
@@ -204,6 +206,7 @@ def __init__(self):
         self.reservoir_module.initial()
         self.lakes_module.initial()
         self.polder_module.initial()
+        self.waterstorage_module.initial()
 
         self.transmission_module.initial()
 

src/lisflood/global_modules/default_options.py

@@ -1597,3 +1597,12 @@
                    'wateruseRegion': False,
                    'writeNetcdf': False,
                    'writeNetcdfStack': False}
+
+default_options['reportedmaps'].update({'TWSMaps'     : ReportedMap(name='TWSMaps',    output_var='twsstor',       unit='m',     end=[], steps=['repTWSMaps'],                      all=[], restrictoption=[], monthly=False, yearly=False)})
+default_options['reportedmaps'].update({'LakeSMaps'   : ReportedMap(name='LakeSMaps',  output_var='lakestor',      unit='m3',    end=[], steps=['repStorageMaps'],                  all=[], restrictoption=[], monthly=False, yearly=False)})
+default_options['reportedmaps'].update({'RiverSMaps'  : ReportedMap(name='RiverSMaps', output_var='riverstor',     unit='m3',    end=[], steps=['repStorageMaps','repFlowMomMaps'], all=[], restrictoption=[], monthly=False, yearly=False)})
+default_options['reportedmaps'].update({'SoilSMaps'   : ReportedMap(name='SoilSMaps',  output_var='soilstor',      unit='m',     end=[], steps=['repStorageMaps'],                  all=[], restrictoption=[], monthly=False, yearly=False)})
+default_options['reportedmaps'].update({'GWSMaps'     : ReportedMap(name='GWSMaps',    output_var='gwstor',        unit='m',     end=[], steps=['repStorageMaps'],                  all=[], restrictoption=[], monthly=False, yearly=False)})
+default_options['reportedmaps'].update({'SnowSMaps'   : ReportedMap(name='SnowSMaps',  output_var='snowstor',      unit='m',     end=[], steps=['repStorageMaps'],                  all=[], restrictoption=[], monthly=False, yearly=False)})
+default_options['reportedmaps'].update({'CumSMaps '   : ReportedMap(name='CumSMaps',   output_var='cumstor',       unit='m',     end=[], steps=['repStorageMaps'],                  all=[], restrictoption=[], monthly=False, yearly=False)})
+default_options['reportedmaps'].update({'FlowMomMaps' : ReportedMap(name='FlowMomMaps', output_var='FlowMomentum', unit='kgm/s', end=[], steps=['repFlowMomMaps'],                  all=[], restrictoption=[], monthly=False, yearly=False)})

src/lisflood/hydrological_modules/evapowater.py

@@ -60,6 +60,7 @@ def initial(self):
         maskinfo = MaskInfo.instance()
         if option['openwaterevapo']:
             LakeMask = loadmap('LakeMask', pcr=True)
+            LakeMask = ifthenelse((LakeMask<0)&(LakeMask>-9999), 0, LakeMask)
             # lmask = ifthenelse(LakeMask != 0, self.var.LddStructuresKinematic, 5)
             lmask = ifthenelse(LakeMask != 0, self.var.LddStructuresChan, 5)
             LddEva = lddrepair(lmask)

src/lisflood/hydrological_modules/routing.py

@@ -931,6 +931,11 @@ def dynamic(self, NoRoutingExecuted):
             # if flow is slow, Traveltime=DtSec then TravelDistance=PixelLength
             # maximum set to 30km/day for 5km cell, is at DtSec/Traveltime=6, is at Traveltime<DtSec/6
 
+            ####### added by Robert Dill, 2025/03/13
+            # calculate momentum map flow velocity * rivermass [kgm/s]
+            self.var.FlowMomentum = self.var.TotalCrossSectionArea * self.var.ChanLength * 1000 * self.var.FlowVelocity
+            #######
+
 
     def KinRouting(self,SideflowChan):
         """Kinematic routing based on a 4-point implicit finite-difference numerical solution of the kinematic wave equations.