Updating settings files in tests

ec-jrc · Nov 22, 2024 · 55b6248 · 55b6248
1 parent 98c9b00
commit 55b6248
Show file tree

Hide file tree

Showing 47 changed files with 1,051 additions and 1,839 deletions.
diff --git a/src/lisfloodSettings_reference.xml b/src/lisfloodSettings_reference.xml
diff --git a/...erence/output_reference_kin_6h/chanqX.tss → ...ence/output_reference_kin_6h/chanqWin.tss b/...erence/output_reference_kin_6h/chanqX.tss → ...ence/output_reference_kin_6h/chanqWin.tss
diff --git a/...eference/output_reference_kin_6h/disX.tss → ...erence/output_reference_kin_6h/disWin.tss b/...eference/output_reference_kin_6h/disX.tss → ...erence/output_reference_kin_6h/disWin.tss
diff --git a/...nce/output_reference_kin_6h_1h/chanqX.tss → ...e/output_reference_kin_6h_1h/chanqWin.tss b/...nce/output_reference_kin_6h_1h/chanqX.tss → ...e/output_reference_kin_6h_1h/chanqWin.tss
diff --git a/...rence/output_reference_kin_6h_1h/disX.tss → ...nce/output_reference_kin_6h_1h/disWin.tss b/...rence/output_reference_kin_6h_1h/disX.tss → ...nce/output_reference_kin_6h_1h/disWin.tss
diff --git a/...nce/output_reference_kin_daily/chanqX.tss → ...e/output_reference_kin_daily/chanqWin.tss b/...nce/output_reference_kin_daily/chanqX.tss → ...e/output_reference_kin_daily/chanqWin.tss
diff --git a/...rence/output_reference_kin_daily/disX.tss → ...nce/output_reference_kin_daily/disWin.tss b/...rence/output_reference_kin_daily/disX.tss → ...nce/output_reference_kin_daily/disWin.tss
diff --git a/.../output_reference_kin_daily_1h/chanqX.tss → ...utput_reference_kin_daily_1h/chanqWin.tss b/.../output_reference_kin_daily_1h/chanqX.tss → ...utput_reference_kin_daily_1h/chanqWin.tss
diff --git a/...ce/output_reference_kin_daily_1h/disX.tss → .../output_reference_kin_daily_1h/disWin.tss b/...ce/output_reference_kin_daily_1h/disX.tss → .../output_reference_kin_daily_1h/disWin.tss
diff --git a/.../output_reference_kin_daily_6h/chanqX.tss → ...utput_reference_kin_daily_6h/chanqWin.tss b/.../output_reference_kin_daily_6h/chanqX.tss → ...utput_reference_kin_daily_6h/chanqWin.tss
diff --git a/...ce/output_reference_kin_daily_6h/disX.tss → .../output_reference_kin_daily_6h/disWin.tss b/...ce/output_reference_kin_daily_6h/disX.tss → .../output_reference_kin_daily_6h/disWin.tss
diff --git a/...erence/output_reference_mct_6h/chanqX.tss → ...ence/output_reference_mct_6h/chanqWin.tss b/...erence/output_reference_mct_6h/chanqX.tss → ...ence/output_reference_mct_6h/chanqWin.tss
diff --git a/...eference/output_reference_mct_6h/disX.tss → ...erence/output_reference_mct_6h/disWin.tss b/...eference/output_reference_mct_6h/disX.tss → ...erence/output_reference_mct_6h/disWin.tss
diff --git a/...nce/output_reference_mct_6h_1h/chanqX.tss → ...e/output_reference_mct_6h_1h/chanqWin.tss b/...nce/output_reference_mct_6h_1h/chanqX.tss → ...e/output_reference_mct_6h_1h/chanqWin.tss
diff --git a/...rence/output_reference_mct_6h_1h/disX.tss → ...nce/output_reference_mct_6h_1h/disWin.tss b/...rence/output_reference_mct_6h_1h/disX.tss → ...nce/output_reference_mct_6h_1h/disWin.tss
diff --git a/...nce/output_reference_mct_daily/chanqX.tss → ...e/output_reference_mct_daily/chanqWin.tss b/...nce/output_reference_mct_daily/chanqX.tss → ...e/output_reference_mct_daily/chanqWin.tss
diff --git a/...rence/output_reference_mct_daily/disX.tss → ...nce/output_reference_mct_daily/disWin.tss b/...rence/output_reference_mct_daily/disX.tss → ...nce/output_reference_mct_daily/disWin.tss
diff --git a/.../output_reference_mct_daily_1h/chanqX.tss → ...utput_reference_mct_daily_1h/chanqWin.tss b/.../output_reference_mct_daily_1h/chanqX.tss → ...utput_reference_mct_daily_1h/chanqWin.tss
diff --git a/...ce/output_reference_mct_daily_1h/disX.tss → .../output_reference_mct_daily_1h/disWin.tss b/...ce/output_reference_mct_daily_1h/disX.tss → .../output_reference_mct_daily_1h/disWin.tss
diff --git a/.../output_reference_mct_daily_6h/chanqX.tss → ...utput_reference_mct_daily_6h/chanqWin.tss b/.../output_reference_mct_daily_6h/chanqX.tss → ...utput_reference_mct_daily_6h/chanqWin.tss
diff --git a/...ce/output_reference_mct_daily_6h/disX.tss → .../output_reference_mct_daily_6h/disWin.tss b/...ce/output_reference_mct_daily_6h/disX.tss → .../output_reference_mct_daily_6h/disWin.tss
diff --git a/...rence/output_reference_mcts_6h/chanqX.tss → ...nce/output_reference_mcts_6h/chanqWin.tss b/...rence/output_reference_mcts_6h/chanqX.tss → ...nce/output_reference_mcts_6h/chanqWin.tss
diff --git a/...ference/output_reference_mcts_6h/disX.tss → ...rence/output_reference_mcts_6h/disWin.tss b/...ference/output_reference_mcts_6h/disX.tss → ...rence/output_reference_mcts_6h/disWin.tss
diff --git a/...ce/output_reference_mcts_6h_1h/chanqX.tss → .../output_reference_mcts_6h_1h/chanqWin.tss b/...ce/output_reference_mcts_6h_1h/chanqX.tss → .../output_reference_mcts_6h_1h/chanqWin.tss
diff --git a/...ence/output_reference_mcts_6h_1h/disX.tss → ...ce/output_reference_mcts_6h_1h/disWin.tss b/...ence/output_reference_mcts_6h_1h/disX.tss → ...ce/output_reference_mcts_6h_1h/disWin.tss
diff --git a/...ce/output_reference_mcts_daily/chanqX.tss → .../output_reference_mcts_daily/chanqWin.tss b/...ce/output_reference_mcts_daily/chanqX.tss → .../output_reference_mcts_daily/chanqWin.tss
diff --git a/...ence/output_reference_mcts_daily/disX.tss → ...ce/output_reference_mcts_daily/disWin.tss b/...ence/output_reference_mcts_daily/disX.tss → ...ce/output_reference_mcts_daily/disWin.tss
diff --git a/...output_reference_mcts_daily_1h/chanqX.tss → ...tput_reference_mcts_daily_1h/chanqWin.tss b/...output_reference_mcts_daily_1h/chanqX.tss → ...tput_reference_mcts_daily_1h/chanqWin.tss
diff --git a/...e/output_reference_mcts_daily_1h/disX.tss → ...output_reference_mcts_daily_1h/disWin.tss b/...e/output_reference_mcts_daily_1h/disX.tss → ...output_reference_mcts_daily_1h/disWin.tss
diff --git a/...output_reference_mcts_daily_6h/chanqX.tss → ...tput_reference_mcts_daily_6h/chanqWin.tss b/...output_reference_mcts_daily_6h/chanqX.tss → ...tput_reference_mcts_daily_6h/chanqWin.tss
diff --git a/...e/output_reference_mcts_daily_6h/disX.tss → ...output_reference_mcts_daily_6h/disWin.tss b/...e/output_reference_mcts_daily_6h/disX.tss → ...output_reference_mcts_daily_6h/disWin.tss
diff --git a/...ence/output_reference_split_6h/chanqX.tss → ...ce/output_reference_split_6h/chanqWin.tss b/...ence/output_reference_split_6h/chanqX.tss → ...ce/output_reference_split_6h/chanqWin.tss
diff --git a/...erence/output_reference_split_6h/disX.tss → ...ence/output_reference_split_6h/disWin.tss b/...erence/output_reference_split_6h/disX.tss → ...ence/output_reference_split_6h/disWin.tss
diff --git a/...e/output_reference_split_6h_1h/chanqX.tss → ...output_reference_split_6h_1h/chanqWin.tss b/...e/output_reference_split_6h_1h/chanqX.tss → ...output_reference_split_6h_1h/chanqWin.tss
diff --git a/...nce/output_reference_split_6h_1h/disX.tss → ...e/output_reference_split_6h_1h/disWin.tss b/...nce/output_reference_split_6h_1h/disX.tss → ...e/output_reference_split_6h_1h/disWin.tss
diff --git a/...e/output_reference_split_daily/chanqX.tss → ...output_reference_split_daily/chanqWin.tss b/...e/output_reference_split_daily/chanqX.tss → ...output_reference_split_daily/chanqWin.tss
diff --git a/...nce/output_reference_split_daily/disX.tss → ...e/output_reference_split_daily/disWin.tss b/...nce/output_reference_split_daily/disX.tss → ...e/output_reference_split_daily/disWin.tss
diff --git a/...utput_reference_split_daily_1h/chanqX.tss → ...put_reference_split_daily_1h/chanqWin.tss b/...utput_reference_split_daily_1h/chanqX.tss → ...put_reference_split_daily_1h/chanqWin.tss
diff --git a/.../output_reference_split_daily_1h/disX.tss → ...utput_reference_split_daily_1h/disWin.tss b/.../output_reference_split_daily_1h/disX.tss → ...utput_reference_split_daily_1h/disWin.tss
diff --git a/...utput_reference_split_daily_6h/chanqX.tss → ...put_reference_split_daily_6h/chanqWin.tss b/...utput_reference_split_daily_6h/chanqX.tss → ...put_reference_split_daily_6h/chanqWin.tss
diff --git a/.../output_reference_split_daily_6h/disX.tss → ...utput_reference_split_daily_6h/disWin.tss b/.../output_reference_split_daily_6h/disX.tss → ...utput_reference_split_daily_6h/disWin.tss
diff --git a/tests/data/LF_MCT_UseCase/settings/mct_cold.xml b/tests/data/LF_MCT_UseCase/settings/mct_cold.xml
diff --git a/tests/data/LF_MCT_UseCase/settings/mct_cold_for_results_generation.xml b/tests/data/LF_MCT_UseCase/settings/mct_cold_for_results_generation.xml
diff --git a/tests/data/LF_MCT_UseCase/settings/mct_inflow.xml b/tests/data/LF_MCT_UseCase/settings/mct_inflow.xml
diff --git a/tests/data/LF_MCT_UseCase/settings/mct_warm.xml b/tests/data/LF_MCT_UseCase/settings/mct_warm.xml
diff --git a/tests/test_mct_dyn_inflow.py b/tests/test_mct_dyn_inflow.py
@@ -88,8 +88,8 @@ def run(self, date_start, date_end, dtsec, type):
         # output_tss =  os.path.join(out_path_run, 'dis.tss')
 
         # test when DtSec != DtSecChannel
-        reference =  os.path.join(out_path_ref, 'chanqX.tss')
-        output_tss =  os.path.join(out_path_run, 'chanqX.tss')
+        reference =  os.path.join(out_path_ref, 'chanqWin.tss')
+        output_tss =  os.path.join(out_path_run, 'chanqWin.tss')
 
         comparator.compare_files(reference, output_tss)
 

diff --git a/tests/test_mct_results.py b/tests/test_mct_results.py
@@ -43,13 +43,13 @@ def run_mct(self, date_start, date_end, dtsec, dtsec_chan, type):
         comparator = TSSComparator(atol,rtol)
 
         # compare results for average discharge output
-        reference =  os.path.join(out_path_ref, 'disX.tss')
-        output_tss =  os.path.join(self.out_path_run, 'disX.tss')
+        reference =  os.path.join(out_path_ref, 'disWin.tss')
+        output_tss =  os.path.join(self.out_path_run, 'disWin.tss')
         comparator.compare_files(reference, output_tss)
 
         # compare results for instant discharge output
-        reference =  os.path.join(out_path_ref, 'chanqX.tss')
-        output_tss =  os.path.join(self.out_path_run, 'chanqX.tss')
+        reference =  os.path.join(out_path_ref, 'chanqWin.tss')
+        output_tss =  os.path.join(self.out_path_run, 'chanqWin.tss')
         comparator.compare_files(reference, output_tss)
 
         # compare mass balance error
@@ -82,13 +82,13 @@ def run_mcts(self, date_start, date_end, dtsec, dtsec_chan, type):
         comparator = TSSComparator(atol,rtol)
 
         # compare results for average discharge output
-        reference =  os.path.join(out_path_ref, 'disX.tss')
-        output_tss =  os.path.join(self.out_path_run, 'disX.tss')
+        reference =  os.path.join(out_path_ref, 'disWin.tss')
+        output_tss =  os.path.join(self.out_path_run, 'disWin.tss')
         comparator.compare_files(reference, output_tss)
 
         # compare results for instant discharge output
-        reference =  os.path.join(out_path_ref, 'chanqX.tss')
-        output_tss =  os.path.join(self.out_path_run, 'chanqX.tss')
+        reference =  os.path.join(out_path_ref, 'chanqWin.tss')
+        output_tss =  os.path.join(self.out_path_run, 'chanqWin.tss')
         comparator.compare_files(reference, output_tss)
 
         # compare mass balance error
@@ -131,13 +131,13 @@ def run_kin(self, date_start, date_end, dtsec, dtsec_chan, type):
         comparator = TSSComparator(atol,rtol)
 
         # compare results for average discharge output
-        reference =  os.path.join(out_path_ref, 'disX.tss')
-        output_tss =  os.path.join(self.out_path_run, 'disX.tss')
+        reference =  os.path.join(out_path_ref, 'disWin.tss')
+        output_tss =  os.path.join(self.out_path_run, 'disWin.tss')
         comparator.compare_files(reference, output_tss)
 
         # compare results for instant discharge output
-        reference =  os.path.join(out_path_ref, 'chanqX.tss')
-        output_tss =  os.path.join(self.out_path_run, 'chanqX.tss')
+        reference =  os.path.join(out_path_ref, 'chanqWin.tss')
+        output_tss =  os.path.join(self.out_path_run, 'chanqWin.tss')
         comparator.compare_files(reference, output_tss)
 
         # compare mass balance error
@@ -170,13 +170,13 @@ def run_split(self, date_start, date_end, dtsec, dtsec_chan, type):
         comparator = TSSComparator(atol,rtol)
 
         # compare results for average discharge output
-        reference =  os.path.join(out_path_ref, 'disX.tss')
-        output_tss =  os.path.join(self.out_path_run, 'disX.tss')
+        reference =  os.path.join(out_path_ref, 'disWin.tss')
+        output_tss =  os.path.join(self.out_path_run, 'disWin.tss')
         comparator.compare_files(reference, output_tss)
 
         # compare results for instant discharge output
-        reference =  os.path.join(out_path_ref, 'chanqX.tss')
-        output_tss =  os.path.join(self.out_path_run, 'chanqX.tss')
+        reference =  os.path.join(out_path_ref, 'chanqWin.tss')
+        output_tss =  os.path.join(self.out_path_run, 'chanqWin.tss')
         comparator.compare_files(reference, output_tss)
 
         # compare mass balance error