From c2e8e15df4f72c2393efec0ffadb356dbeadf3bc Mon Sep 17 00:00:00 2001 From: Cinzia Mazzetti Date: Fri, 13 Sep 2024 12:28:25 +0000 Subject: [PATCH] Added riverbed roughness parameter for MCT --- src/lisflood/hydrological_modules/routing.py | 4 ++-- src/lisfloodSettings_reference.xml | 15 ++++++++++++++- .../maps/parameters/params_CalChanMan3.nc | Bin 0 -> 15467 bytes 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 tests/data/MCT_UseCase/maps/parameters/params_CalChanMan3.nc diff --git a/src/lisflood/hydrological_modules/routing.py b/src/lisflood/hydrological_modules/routing.py index a42b7ae..a44e6d7 100644 --- a/src/lisflood/hydrological_modules/routing.py +++ b/src/lisflood/hydrological_modules/routing.py @@ -49,7 +49,7 @@ class routing(HydroModule): 'ChanSdXdY', 'TotalCrossSectionAreaInitValue', 'PrevDischarge'], 'SplitRouting': ['CrossSection2AreaInitValue', 'PrevSideflowInitValue', 'CalChanMan2'], 'dynamicWave': ['ChannelsDynamic'], - 'MCTRouting': ['ChannelsMCT', 'ChanGradMaxMCT', 'PrevCmMCTInitValue', 'PrevDmMCTInitValue']} + 'MCTRouting': ['ChannelsMCT', 'ChanGradMaxMCT', 'PrevCmMCTInitValue', 'PrevDmMCTInitValue','CalChanMan3']} module_name = 'Routing' def __init__(self, routing_variable): @@ -568,7 +568,7 @@ def initialMCT(self): # cmcheck # This could become a calibration parameter if we want to use MCT+SplitRouting - self.var.ChanManMCT = (self.var.ChanMan / self.var.CalChanMan) * loadmap('CalChanMan2') + self.var.ChanManMCT = (self.var.ChanMan / self.var.CalChanMan) * loadmap('CalChanMan3') # Mannings coefficient for MCT pixels (same as second line of split routing) PrevCmMCT = loadmap('PrevCmMCTInitValue') diff --git a/src/lisfloodSettings_reference.xml b/src/lisfloodSettings_reference.xml index d0decbb..9eda0bd 100644 --- a/src/lisfloodSettings_reference.xml +++ b/src/lisfloodSettings_reference.xml @@ -439,6 +439,13 @@ Multiplier [-] applied to Channel Manning's n for second line of routing + + +default: 3.0 [-] +Multiplier [-] applied to Channel Manning's n for MCT routing + + + default: 1.0 [-] @@ -1446,7 +1453,7 @@ Minimum slope gradient [-] (for kin. wave: slope cannot be 0) - + Minimum channel gradient [-] (for kin. wave: slope cannot be 0) @@ -2130,6 +2137,12 @@ Multiplier applied to Channel Manning's n for second routing line + + +Multiplier applied to Channel Manning's n for MCT routing + + + Multiplier applied to average Q to split into a second line of routing diff --git a/tests/data/MCT_UseCase/maps/parameters/params_CalChanMan3.nc b/tests/data/MCT_UseCase/maps/parameters/params_CalChanMan3.nc new file mode 100644 index 0000000000000000000000000000000000000000..dd862fc05bad01a6e97a25dad5a5f265d7027241 GIT binary patch literal 15467 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 literal 0 HcmV?d00001