Skip to content

Commit 0cf0271

Browse files
author
Cinzia Mazzetti
committed
Fixing conflicts
2 parents bf55623 + 9bf9419 commit 0cf0271

30 files changed

+3790
-3792
lines changed

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/chanq.nc

-15.7 MB
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/chanqWin.tss

100644100755
+723-723
Large diffs are not rendered by default.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/dis.nc

100644100755
-673 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/dis.tss

100644100755
+726-726
Large diffs are not rendered by default.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/lz.nc

100644100755
210 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/mbError.tss

+730-730
Large diffs are not rendered by default.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/mbErrorSplitRoutingM3.tss

+730-730
Large diffs are not rendered by default.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/tha.nc

100644100755
-20 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/thc.nc

100644100755
-20 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/thfa.nc

100644100755
-20 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/thfc.nc

100644100755
-20 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/thia.nc

100644100755
-4.77 KB
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/thic.nc

100644100755
101 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_6h/tws.nc

100644100755
137 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_daily/chanq.nc

-3.94 MB
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_daily/chanqWin.tss

100644100755
+175-175
Large diffs are not rendered by default.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_daily/dis.nc

100644100755
-422 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_daily/dis.tss

100644100755
+183-183
Large diffs are not rendered by default.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_daily/lz.nc

100644100755
2 Bytes
Binary file not shown.

‎tests/data/LF_ETRS89_UseCase/reference/output_reference_daily/mbError.tss

+182-182
Original file line numberDiff line numberDiff line change
@@ -1,187 +1,187 @@
1-
timeseries valuescale.scalar settingsfile: /home/carlo/lisflood_v4/lisflood-code/tests/data/LF_ETRS89_UseCase/settings/base.xml_c35d0d47-bf08-4dab-9b48-bf389f3f2b71.xml date: Mon Aug 1 11:17:53 2022
1+
timeseries valuescale.scalar settingsfile: /hdd2/releases/lisflood_mct_optim/lisflood-code/tests/data/LF_ETRS89_UseCase/settings/base.xml_a63c8d29-5229-47b0-92ec-aca7ad7a0e63.xml date: Fri Jan 31 15:15:40 2025
22
2
33
timestep
44
1
5-
9497 -1390.46
6-
9498 -27.7851
7-
9499 4.52256
8-
9500 5.24996
9-
9501 5.12607
10-
9502 5.3233
11-
9503 -7.37205
12-
9504 -25.6115
13-
9505 -27.2074
14-
9506 -26.9755
15-
9507 -27.0953
16-
9508 -27.113
17-
9509 -27.2765
18-
9510 -27.4236
19-
9511 -27.4928
20-
9512 -27.7173
21-
9513 -30.9863
22-
9514 -31.6862
23-
9515 -31.4361
24-
9516 -31.4345
25-
9517 -31.4213
26-
9518 -31.3984
27-
9519 -31.4148
28-
9520 -31.4219
29-
9521 -40.5241
30-
9522 -31.4649
31-
9523 -31.5706
32-
9524 -31.4397
33-
9525 -31.612
34-
9526 -31.346
35-
9527 -30.9499
36-
9528 -12.0308
37-
9529 27.4036
38-
9530 34.6
39-
9531 34.5218
40-
9532 26.4046
41-
9533 32.0585
42-
9534 36.5949
43-
9535 37.1735
44-
9536 37.0069
45-
9537 36.9496
46-
9538 36.5652
47-
9539 36.1624
48-
9540 35.1055
49-
9541 35.5781
50-
9542 33.4034
51-
9543 32.2682
52-
9544 34.2932
53-
9545 34.7445
54-
9546 34.6048
55-
9547 34.5313
56-
9548 34.2682
57-
9549 29.2324
58-
9550 10.7843
59-
9551 10.548
60-
9552 10.4688
61-
9553 9.78403
62-
9554 37.5071
63-
9555 37.9598
64-
9556 48.7746
65-
9557 49.0821
66-
9558 46.2258
67-
9559 47.7612
68-
9560 43.3857
69-
9561 46.6602
70-
9562 46.6185
71-
9563 46.3466
72-
9564 44.2544
73-
9565 43.3132
74-
9566 43.1216
75-
9567 42.9703
76-
9568 42.9507
77-
9569 42.8433
78-
9570 42.7408
79-
9571 42.4799
80-
9572 45.8255
81-
9573 45.8179
82-
9574 43.3493
83-
9575 42.5324
84-
9576 42.2973
85-
9577 42.0325
86-
9578 41.8239
87-
9579 41.7272
88-
9580 29.2411
89-
9581 40.9067
90-
9582 40.4114
91-
9583 39.8977
92-
9584 39.5905
93-
9585 39.1953
94-
9586 39.197
95-
9587 40.1316
96-
9588 40.5155
97-
9589 40.8892
98-
9590 41.1456
99-
9591 44.3568
100-
9592 45.6976
101-
9593 45.2436
102-
9594 44.597
103-
9595 45.3565
104-
9596 45.0011
105-
9597 43.0515
106-
9598 42.556
107-
9599 38.9635
108-
9600 38.0923
109-
9601 38.4575
110-
9602 37.7787
111-
9603 43.3616
112-
9604 46.9099
113-
9605 48.0398
114-
9606 47.3763
115-
9607 46.2541
116-
9608 45.9742
117-
9609 44.7249
118-
9610 44.3566
119-
9611 40.7306
120-
9612 39.9505
121-
9613 38.8543
122-
9614 38.6537
123-
9615 38.1052
124-
9616 38.2328
125-
9617 38.2715
126-
9618 44.0299
127-
9619 43.9062
128-
9620 43.316
129-
9621 42.4865
130-
9622 41.7841
131-
9623 39.9424
132-
9624 36.6431
133-
9625 40.4914
134-
9626 43.8185
135-
9627 41.6823
136-
9628 50.7461
137-
9629 54.321
138-
9630 54.2122
139-
9631 53.2761
140-
9632 53.0605
141-
9633 51.5502
142-
9634 51.6232
143-
9635 49.8215
144-
9636 52.3225
145-
9637 51.7639
146-
9638 50.4272
147-
9639 50.352
148-
9640 52.5462
149-
9641 52.2538
150-
9642 50.8267
151-
9643 49.986
152-
9644 49.8284
153-
9645 49.8664
154-
9646 50.6434
155-
9647 51.9397
156-
9648 -23.9585
157-
9649 52.0408
158-
9650 50.9929
159-
9651 51.1935
160-
9652 52.2144
161-
9653 51.0604
162-
9654 52.3271
163-
9655 52.8621
164-
9656 51.1976
165-
9657 52.0221
166-
9658 51.9445
167-
9659 50.9375
168-
9660 53.1691
169-
9661 52.6634
170-
9662 52.7647
171-
9663 50.2914
172-
9664 52.7683
173-
9665 53.1747
174-
9666 52.6775
175-
9667 51.8103
176-
9668 51.1449
177-
9669 52.3528
178-
9670 51.903
179-
9671 51.874
180-
9672 51.4143
5+
9497 -1389.86
6+
9498 -27.2191
7+
9499 5.08551
8+
9500 5.81288
9+
9501 5.68902
10+
9502 5.88627
11+
9503 -6.80915
12+
9504 -25.0485
13+
9505 -26.6445
14+
9506 -26.4126
15+
9507 -26.5329
16+
9508 -26.5501
17+
9509 -26.7136
18+
9510 -26.8606
19+
9511 -26.9299
20+
9512 -27.1543
21+
9513 -30.4234
22+
9514 -31.1233
23+
9515 -30.8732
24+
9516 -30.8715
25+
9517 -30.8584
26+
9518 -30.8355
27+
9519 -30.8518
28+
9520 -30.8589
29+
9521 -39.9611
30+
9522 -30.9019
31+
9523 -31.0077
32+
9524 -30.8768
33+
9525 -31.049
34+
9526 -30.783
35+
9527 -30.3873
36+
9528 -11.4678
37+
9529 27.9665
38+
9530 35.1629
39+
9531 35.0847
40+
9532 26.9676
41+
9533 32.6214
42+
9534 37.1579
43+
9535 37.7364
44+
9536 37.5698
45+
9537 37.5126
46+
9538 37.1281
47+
9539 36.7254
48+
9540 35.6684
49+
9541 36.141
50+
9542 33.9663
51+
9543 32.8312
52+
9544 34.8561
53+
9545 35.3074
54+
9546 35.1677
55+
9547 35.0942
56+
9548 34.8311
57+
9549 29.7954
58+
9550 11.3472
59+
9551 11.111
60+
9552 11.0318
61+
9553 10.3469
62+
9554 38.0701
63+
9555 38.5227
64+
9556 49.3375
65+
9557 49.645
66+
9558 46.7887
67+
9559 48.3242
68+
9560 43.9486
69+
9561 47.2231
70+
9562 47.1814
71+
9563 46.9096
72+
9564 44.8173
73+
9565 43.8761
74+
9566 43.6845
75+
9567 43.5332
76+
9568 43.5136
77+
9569 43.4062
78+
9570 43.3037
79+
9571 43.0428
80+
9572 46.3884
81+
9573 46.3809
82+
9574 43.9123
83+
9575 43.0953
84+
9576 42.8602
85+
9577 42.5954
86+
9578 42.3868
87+
9579 42.2901
88+
9580 29.8041
89+
9581 41.4696
90+
9582 40.9743
91+
9583 40.4606
92+
9584 40.1535
93+
9585 39.7582
94+
9586 39.7599
95+
9587 40.6945
96+
9588 41.0784
97+
9589 41.4521
98+
9590 41.7116
99+
9591 44.9229
100+
9592 46.2636
101+
9593 45.8096
102+
9594 45.1631
103+
9595 45.9226
104+
9596 45.5671
105+
9597 43.6175
106+
9598 43.1221
107+
9599 39.5296
108+
9600 38.6583
109+
9601 39.0235
110+
9602 38.3448
111+
9603 43.9276
112+
9604 47.476
113+
9605 48.6058
114+
9606 47.9424
115+
9607 46.8202
116+
9608 46.5402
117+
9609 45.2909
118+
9610 44.9226
119+
9611 41.2967
120+
9612 40.5165
121+
9613 39.4203
122+
9614 39.2198
123+
9615 38.6713
124+
9616 38.7989
125+
9617 38.8376
126+
9618 44.5959
127+
9619 44.4723
128+
9620 43.882
129+
9621 43.0526
130+
9622 42.3501
131+
9623 40.5084
132+
9624 37.2091
133+
9625 41.0575
134+
9626 44.3846
135+
9627 42.2483
136+
9628 51.3121
137+
9629 54.8871
138+
9630 54.7783
139+
9631 53.8422
140+
9632 53.6266
141+
9633 52.1162
142+
9634 52.1892
143+
9635 50.3876
144+
9636 52.8885
145+
9637 52.3299
146+
9638 50.9933
147+
9639 50.918
148+
9640 53.1123
149+
9641 52.8198
150+
9642 51.3928
151+
9643 50.5521
152+
9644 50.3944
153+
9645 50.3935
154+
9646 51.1687
155+
9647 52.0759
156+
9648 -23.9237
157+
9649 52.0786
158+
9650 51.0308
159+
9651 51.2314
160+
9652 52.2523
161+
9653 51.0982
162+
9654 52.3347
163+
9655 52.8685
164+
9656 51.2039
165+
9657 52.0285
166+
9658 51.9509
167+
9659 50.9438
168+
9660 53.1755
169+
9661 52.6697
170+
9662 52.7712
171+
9663 50.2977
172+
9664 52.7747
173+
9665 53.1811
174+
9666 52.6839
175+
9667 51.8167
176+
9668 51.1512
177+
9669 52.3592
178+
9670 51.9093
179+
9671 51.8804
180+
9672 51.4145
181181
9673 51.7178
182-
9674 51.7494
183-
9675 51.5363
184-
9676 50.7265
185-
9677 50.3614
186-
9678 51.0608
182+
9674 51.7506
183+
9675 51.5427
184+
9676 50.7328
185+
9677 50.3617
186+
9678 51.0607
187187
9679 52.6575

0 commit comments

Comments
 (0)