Skip to content

Commit 55b6248

Browse files
author
Cinzia Mazzetti
committed
Updating settings files in tests
1 parent 98c9b00 commit 55b6248

File tree

47 files changed

+1051
-1839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1051
-1839
lines changed

src/lisfloodSettings_reference.xml

+169-174
Large diffs are not rendered by default.

tests/data/LF_MCT_UseCase/settings/mct_cold.xml

+215-385
Large diffs are not rendered by default.

tests/data/LF_MCT_UseCase/settings/mct_cold_for_results_generation.xml

+212-440
Large diffs are not rendered by default.

tests/data/LF_MCT_UseCase/settings/mct_inflow.xml

+208-364
Large diffs are not rendered by default.

tests/data/LF_MCT_UseCase/settings/mct_warm.xml

+229-458
Large diffs are not rendered by default.

tests/test_mct_dyn_inflow.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ def run(self, date_start, date_end, dtsec, type):
8888
# output_tss = os.path.join(out_path_run, 'dis.tss')
8989

9090
# test when DtSec != DtSecChannel
91-
reference = os.path.join(out_path_ref, 'chanqX.tss')
92-
output_tss = os.path.join(out_path_run, 'chanqX.tss')
91+
reference = os.path.join(out_path_ref, 'chanqWin.tss')
92+
output_tss = os.path.join(out_path_run, 'chanqWin.tss')
9393

9494
comparator.compare_files(reference, output_tss)
9595

tests/test_mct_results.py

+16-16
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ def run_mct(self, date_start, date_end, dtsec, dtsec_chan, type):
4343
comparator = TSSComparator(atol,rtol)
4444

4545
# compare results for average discharge output
46-
reference = os.path.join(out_path_ref, 'disX.tss')
47-
output_tss = os.path.join(self.out_path_run, 'disX.tss')
46+
reference = os.path.join(out_path_ref, 'disWin.tss')
47+
output_tss = os.path.join(self.out_path_run, 'disWin.tss')
4848
comparator.compare_files(reference, output_tss)
4949

5050
# compare results for instant discharge output
51-
reference = os.path.join(out_path_ref, 'chanqX.tss')
52-
output_tss = os.path.join(self.out_path_run, 'chanqX.tss')
51+
reference = os.path.join(out_path_ref, 'chanqWin.tss')
52+
output_tss = os.path.join(self.out_path_run, 'chanqWin.tss')
5353
comparator.compare_files(reference, output_tss)
5454

5555
# compare mass balance error
@@ -82,13 +82,13 @@ def run_mcts(self, date_start, date_end, dtsec, dtsec_chan, type):
8282
comparator = TSSComparator(atol,rtol)
8383

8484
# compare results for average discharge output
85-
reference = os.path.join(out_path_ref, 'disX.tss')
86-
output_tss = os.path.join(self.out_path_run, 'disX.tss')
85+
reference = os.path.join(out_path_ref, 'disWin.tss')
86+
output_tss = os.path.join(self.out_path_run, 'disWin.tss')
8787
comparator.compare_files(reference, output_tss)
8888

8989
# compare results for instant discharge output
90-
reference = os.path.join(out_path_ref, 'chanqX.tss')
91-
output_tss = os.path.join(self.out_path_run, 'chanqX.tss')
90+
reference = os.path.join(out_path_ref, 'chanqWin.tss')
91+
output_tss = os.path.join(self.out_path_run, 'chanqWin.tss')
9292
comparator.compare_files(reference, output_tss)
9393

9494
# compare mass balance error
@@ -131,13 +131,13 @@ def run_kin(self, date_start, date_end, dtsec, dtsec_chan, type):
131131
comparator = TSSComparator(atol,rtol)
132132

133133
# compare results for average discharge output
134-
reference = os.path.join(out_path_ref, 'disX.tss')
135-
output_tss = os.path.join(self.out_path_run, 'disX.tss')
134+
reference = os.path.join(out_path_ref, 'disWin.tss')
135+
output_tss = os.path.join(self.out_path_run, 'disWin.tss')
136136
comparator.compare_files(reference, output_tss)
137137

138138
# compare results for instant discharge output
139-
reference = os.path.join(out_path_ref, 'chanqX.tss')
140-
output_tss = os.path.join(self.out_path_run, 'chanqX.tss')
139+
reference = os.path.join(out_path_ref, 'chanqWin.tss')
140+
output_tss = os.path.join(self.out_path_run, 'chanqWin.tss')
141141
comparator.compare_files(reference, output_tss)
142142

143143
# compare mass balance error
@@ -170,13 +170,13 @@ def run_split(self, date_start, date_end, dtsec, dtsec_chan, type):
170170
comparator = TSSComparator(atol,rtol)
171171

172172
# compare results for average discharge output
173-
reference = os.path.join(out_path_ref, 'disX.tss')
174-
output_tss = os.path.join(self.out_path_run, 'disX.tss')
173+
reference = os.path.join(out_path_ref, 'disWin.tss')
174+
output_tss = os.path.join(self.out_path_run, 'disWin.tss')
175175
comparator.compare_files(reference, output_tss)
176176

177177
# compare results for instant discharge output
178-
reference = os.path.join(out_path_ref, 'chanqX.tss')
179-
output_tss = os.path.join(self.out_path_run, 'chanqX.tss')
178+
reference = os.path.join(out_path_ref, 'chanqWin.tss')
179+
output_tss = os.path.join(self.out_path_run, 'chanqWin.tss')
180180
comparator.compare_files(reference, output_tss)
181181

182182
# compare mass balance error

0 commit comments

Comments
 (0)