Feature/channel param (#177)

* added parameters for calibration of channels geometry * fixing sintax error --------- Co-authored-by: Cinzia Mazzetti <mocm@ecmwf.int>
ec-jrc · Nov 11, 2024 · ca77e35 · ca77e35
1 parent c2e8e15
commit ca77e35
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/lisflood/hydrological_modules/routing.py b/src/lisflood/hydrological_modules/routing.py
@@ -46,7 +46,8 @@ class routing(HydroModule):
     """
     input_files_keys = {'all': ['beta', 'ChanLength', 'Ldd', 'Channels', 'ChanGrad', 'ChanGradMin',
                                 'CalChanMan', 'ChanMan', 'ChanBottomWidth', 'ChanDepthThreshold',
-                                'ChanSdXdY', 'TotalCrossSectionAreaInitValue', 'PrevDischarge'],
+                                'ChanSdXdY', 'TotalCrossSectionAreaInitValue', 'PrevDischarge',
+                                'ChanBottomWMult', 'ChanDepthTMult', 'ChanSMult'],
                         'SplitRouting': ['CrossSection2AreaInitValue', 'PrevSideflowInitValue', 'CalChanMan2'],
                         'dynamicWave': ['ChannelsDynamic'],
                         'MCTRouting': ['ChannelsMCT', 'ChanGradMaxMCT', 'PrevCmMCTInitValue', 'PrevDmMCTInitValue','CalChanMan3']}
@@ -214,11 +215,16 @@ def initial(self):
         self.var.ChanMan = self.var.CalChanMan * loadmap('ChanMan')
         # Manning's roughtness coefficient n is multiplied by ChanManCal for calibration
 
-        self.var.ChanBottomWidth = loadmap('ChanBottomWidth')
+        self.var.CalChanBottomWidth = loadmap('ChanBottomWMult')
+        self.var.ChanBottomWidth = self.var.CalChanBottomWidth * loadmap('ChanBottomWidth')
         # Riverbed width [m]
-        ChanDepthThreshold = loadmap('ChanDepthThreshold')
+
+        self.var.CalChanDepthThreshold = loadmap('ChanDepthTMult')
+        ChanDepthThreshold = self.var.CalChanDepthThreshold * loadmap('ChanDepthThreshold')
         # Bankfull river depth [m]
-        self.var.ChanSdXdY = loadmap('ChanSdXdY')
+
+        self.var.CalChanSdXdY= loadmap('ChanSMult')
+        self.var.ChanSdXdY = self.var.CalChanSdXdY * loadmap('ChanSdXdY')
         # Riverbed sides slope
 
         # self.var.ChanSdXdY = maskinfo.in_zero()         # rectangular cross-section

diff --git a/src/lisfloodSettings_reference.xml b/src/lisfloodSettings_reference.xml
@@ -484,20 +484,20 @@ Multiplier applied to average Q to split into a second line of routing
 </comment>
 </textvar>
 
-<textvar name="ChanBottomWMult" value="1.0">
+<textvar name="ChanBottomWMult" value="$(PathParams)/params_ChanBottomWMult">
 <comment>
 PBchange
 Multiplier applied to ChanBottomWidth
 </comment>
 </textvar>
 
-<textvar name="ChanDepthTMult" value="1.0">
+<textvar name="ChanDepthTMult" value="$(PathParams)/params_ChanDepthTMult">
 <comment>
 Multiplier [] applied to ChanDepthThreshold
 </comment>
 </textvar>
 
-<textvar name="ChanSMult" value="1.0">
+<textvar name="ChanSMult" value="$(PathParams)/params_ChanSMult">
 <comment>
 Multiplier []  applied to ChanSdXdY
 </comment>