floodmodeller-api 0.4.3__py3-none-any.whl → 0.4.4.post1__py3-none-any.whl

floodmodeller_api/test/test_data/conveyance_test.feb

@@ -0,0 +1,116 @@
+
+#REVISION#1
+         7     0.750     0.900     0.100     0.001        12SI
+    10.000     0.010     0.010     0.700     0.100     0.700     0.000
+RAD FILE
+
+END GENERAL
+RIVER
+SECTION
+a
+     0.000              0.0001      1000
+         6
+     0.000     3.000     0.030     1.000               0.000     0.000          
+     1.000     2.500     0.030     1.000               0.000     0.000          
+     2.000     2.200     0.030     1.000               0.000     0.000          
+     3.000     1.800     0.030     1.000               0.000     0.000          
+     4.000     3.500     0.030     1.000               0.000     0.000          
+     5.000     4.000     0.030     1.000               0.000     0.000          
+RIVER
+SECTION
+a2
+     0.000              0.0001      1000
+         6
+     0.000     3.000     0.030*    1.000               0.000     0.000          
+     1.000     2.500     0.030*    1.000               0.000     0.000          
+     2.000     2.200     0.030*    1.000               0.000     0.000          
+     3.000     1.800     0.030*    1.000               0.000     0.000          
+     4.000     3.500     0.030*    1.000               0.000     0.000          
+     5.000     4.000     0.030*    1.000               0.000     0.000          
+RIVER
+SECTION
+b
+     0.000              0.0001      1000
+         7
+     0.000     3.000     0.020     1.000               0.000     0.000          
+     0.000     2.300     0.040     1.000               0.000     0.000          
+     2.000     2.200     0.015     1.000               0.000     0.000          
+     3.000     1.800     0.015     1.000               0.000     0.000          
+     3.500     2.200     0.030     1.000               0.000     0.000          
+     4.000     3.500     0.030     1.000               0.000     0.000          
+     4.000     4.000     0.030     1.000               0.000     0.000          
+RIVER
+SECTION
+b2
+     0.000              0.0001      1000
+         7
+     0.000     3.000     0.020     1.000               0.000     0.000          
+     0.000     2.300     0.040     1.000               0.000     0.000          
+     2.000     2.200     0.015*    1.000               0.000     0.000          
+     3.000     1.800     0.015     1.000               0.000     0.000          
+     3.500     2.200     0.030     1.000               0.000     0.000          
+     4.000     3.500     0.030     1.000               0.000     0.000          
+     4.000     4.000     0.030     1.000               0.000     0.000          
+RIVER
+SECTION
+c
+     0.000              0.0001      1000
+         5
+     0.000     4.000     0.080     1.000               0.000     0.000          
+     1.000     3.000     0.050     1.000               0.000     0.000          
+     2.000     2.000     0.015     1.000               0.000     0.000          
+     3.000     3.000     0.100     1.000               0.000     0.000          
+     4.000     4.000     0.500     1.000               0.000     0.000          
+RIVER
+SECTION
+d
+     0.000              0.0001      1000
+        13
+     0.000     5.000     0.040     1.000               0.000     0.000          
+     1.000     2.000     0.040     1.000               0.000     0.000          
+     2.000     1.000     0.040     1.000               0.000     0.000          
+     3.000     0.500     0.040     1.000               0.000     0.000          
+     4.000     1.000     0.040     1.000               0.000     0.000          
+     5.000     4.000     0.100     1.000               0.000     0.000          
+     5.200     4.000     0.070     1.000               0.000     0.000          
+     6.000     1.000     0.070     1.000               0.000     0.000          
+     7.000     1.500     0.070     1.000               0.000     0.000          
+     8.000     2.000     0.070     1.000               0.000     0.000          
+     9.000     3.000     0.070     1.000               0.000     0.000          
+    10.000     4.500     0.070     1.000               0.000     0.000          
+    11.000     5.000     0.070     1.000               0.000     0.000          
+RIVER
+SECTION
+d2
+     0.000              0.0001      1000
+        13
+     0.000     5.000     0.040     1.000               0.000     0.000          
+     1.000     2.000     0.040     1.000               0.000     0.000          
+     2.000     1.000     0.040     1.000               0.000     0.000          
+     3.000     0.500     0.040     1.000               0.000     0.000          
+     4.000     1.000     0.040     1.000               0.000     0.000          
+     5.000     4.000     0.100*    1.000               0.000     0.000          
+     5.200     4.000     0.070     1.000               0.000     0.000          
+     6.000     1.000     0.070     1.000               0.000     0.000          
+     7.000     1.500     0.070     1.000               0.000     0.000          
+     8.000     2.000     0.070     1.000               0.000     0.000          
+     9.000     3.000     0.070     1.000               0.000     0.000          
+    10.000     4.500     0.070     1.000               0.000     0.000          
+    11.000     5.000     0.070     1.000               0.000     0.000          
+INITIAL CONDITIONS
+ label   ?      flow     stage froude no  velocity     umode    ustate         z
+a            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+a2           y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+b            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+b2           y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+c            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+d            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+d2           y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+GISINFO
+RIVER SECTION a 0 0 0 0 0
+RIVER SECTION a2 0 0 0 0 0
+RIVER SECTION b 0 0 0 0 0
+RIVER SECTION b2 0 0 0 0 0
+RIVER SECTION c 0 0 0 0 0
+RIVER SECTION d 0 0 0 0 0
+RIVER SECTION d2 0 0 0 0 0

floodmodeller_api/test/test_data/conveyance_test.gxy

@@ -0,0 +1,85 @@
+[RIVER_SECTION_a]
+X=57008.207
+Y=262998.625
+
+[RIVER_SECTION_a2]
+X=72138.8805
+Y=270141.307
+
+[RIVER_SECTION_b]
+X=87269.554
+Y=277283.989
+
+[RIVER_SECTION_b2]
+X=107076.983
+Y=278669.505
+
+[RIVER_SECTION_c]
+X=118631.316
+Y=256396.149
+
+[RIVER_SECTION_d]
+X=141189.775
+Y=254195.323
+
+[RIVER_SECTION_d2]
+X=167049.472
+Y=255275.736
+
+[RIVER_SECTION_e]
+X=99646.567
+Y=264175.832
+
+[RIVER_SECTION_e2]
+X=99646.567
+Y=264155.832
+
+[RIVER_SECTION_e3]
+X=99646.567
+Y=264135.832
+
+[VISTEXT]
+VISTEXTCOUNT=0
+
+[Font]
+Font name=Segoe UI
+Charset=1
+Height=-12
+Bold=0
+Italic=0
+Underline=0
+Strikeout=0
+
+[Text]
+Layout=1
+
+[Display]
+MiniNodes=0
+MiniStructureNodes=0
+NodeLabels=0
+Connections=1
+
+[General]
+UnitMove=0
+ExportConnections=0
+GeneralConnectionsColour=0
+LateralConnectionsColour=16711680
+SpillConnectionsColour=8421504
+
+[Grid]
+Show=0
+X=25
+Y=25
+
+[RWC]
+Top=400000
+Left=-108053.691275168
+Right=467462.127156744
+Bottom=0
+
+[PC]
+Top=0
+Left=0
+Right=0
+Bottom=0
+

floodmodeller_api/test/test_data/expected_conveyance.csv

@@ -0,0 +1,60 @@
+a_conveyance,a_stage,a2_conveyance,a2_stage,b_conveyance,b_stage,b2_conveyance,b2_stage,c_conveyance,c_stage,d_conveyance,d_stage,d2_conveyance,d2_stage,e_conveyance,e_stage,e2_conveyance,e2_stage,e3_conveyance,e3_stage
+0,1.8,0,1.8,0,1.8,0,1.8,0,2,0,0.5,0,0.5,0,39.5,0,39.5,0,39.5
+0.005,1.84,0.005,1.84,0.013,1.84,0.013,1.84,0.003,2.038,0.039,0.583,0.039,0.583,0.069,39.55,0.069,39.55,0.066,39.55
+0.033,1.88,0.034,1.88,0.085,1.88,0.085,1.88,0.016,2.077,0.246,0.667,0.246,0.667,0.441,39.6,0.441,39.6,0.421,39.6
+0.098,1.92,0.101,1.92,0.252,1.92,0.252,1.92,0.049,2.115,0.725,0.75,0.725,0.75,1.3,39.65,1.3,39.65,1.24,39.65
+0.211,1.96,0.218,1.96,0.543,1.96,0.543,1.96,0.105,2.154,1.562,0.833,1.562,0.833,2.799,39.7,2.799,39.7,2.671,39.7
+0.383,2,0.395,2,0.984,2,0.984,2,0.19,2.192,2.832,0.917,2.832,0.917,4.953,39.75,4.953,39.75,5.292,39.75
+0.622,2.04,0.643,2.04,1.601,2.04,1.601,2.04,0.308,2.231,4.605,1,4.605,1,8.186,39.8,8.186,39.8,8.988,39.8
+0.939,2.08,0.97,2.08,2.414,2.08,2.414,2.08,0.465,2.269,4.605,1,4.605,1,13.338,39.85,13.338,39.85,14.068,39.85
+1.34,2.12,1.385,2.12,3.447,2.12,3.447,2.12,0.664,2.308,7.106,1.083,7.106,1.083,19.682,39.9,19.682,39.9,20.404,39.9
+1.835,2.16,1.896,2.16,4.719,2.16,4.719,2.16,0.909,2.346,10.067,1.167,10.067,1.167,27.24,39.95,27.24,39.95,28.002,39.95
+2.43,2.2,2.511,2.2,6.25,2.2,6.25,2.2,1.204,2.385,13.501,1.25,13.501,1.25,36.043,40,36.043,40,36.89,40
+3.16,2.243,3.454,2.243,6.25,2.2,6.25,2.2,1.552,2.423,17.424,1.333,17.424,1.333,47.444,40.053,47.444,40.053,48.142,40.053
+4.039,2.286,4.553,2.286,4.669,2.267,7.838,2.233,1.957,2.462,21.854,1.417,21.854,1.417,60.078,40.105,60.078,40.105,60.739,40.105
+5.08,2.329,5.824,2.329,5.325,2.3,9.596,2.267,2.423,2.5,26.811,1.5,26.811,1.5,73.898,40.158,73.898,40.158,74.626,40.158
+6.293,2.371,7.28,2.371,7.945,2.344,11.563,2.3,2.952,2.538,32.316,1.583,32.316,1.583,88.867,40.211,88.867,40.211,89.762,40.211
+7.69,2.414,8.934,2.414,10.935,2.388,14.585,2.344,3.549,2.577,38.39,1.667,38.39,1.667,104.955,40.263,104.955,40.263,106.113,40.263
+9.281,2.457,10.797,2.457,14.261,2.431,17.949,2.388,4.215,2.615,45.053,1.75,45.053,1.75,122.135,40.316,122.135,40.316,123.654,40.316
+11.078,2.5,12.881,2.5,17.896,2.475,21.612,2.431,4.955,2.654,52.328,1.833,52.328,1.833,140.39,40.368,140.39,40.368,142.362,40.368
+13.149,2.542,15.256,2.542,21.817,2.519,25.546,2.475,5.771,2.692,60.234,1.917,60.234,1.917,159.702,40.421,159.702,40.421,162.218,40.421
+15.403,2.583,17.858,2.583,26.005,2.562,29.729,2.519,6.666,2.731,68.792,2,68.792,2,180.058,40.474,180.058,40.474,183.208,40.474
+17.844,2.625,20.688,2.625,30.443,2.606,34.143,2.562,7.643,2.769,68.792,2,68.792,2,201.448,40.526,201.448,40.526,205.32,40.526
+20.477,2.667,23.751,2.667,35.118,2.65,38.775,2.606,8.704,2.808,78.313,2.083,78.313,2.083,223.862,40.579,223.862,40.579,228.54,40.579
+23.305,2.708,27.048,2.708,40.017,2.694,43.613,2.65,9.854,2.846,88.348,2.167,88.348,2.167,247.293,40.632,247.293,40.632,252.86,40.632
+26.331,2.75,30.583,2.75,45.13,2.737,48.647,2.694,11.094,2.885,98.893,2.25,98.893,2.25,271.736,40.684,271.736,40.684,278.273,40.684
+29.561,2.792,34.359,2.792,50.446,2.781,53.869,2.737,12.428,2.923,109.947,2.333,109.947,2.333,297.187,40.737,297.187,40.737,304.773,40.737
+32.999,2.833,38.38,2.833,55.957,2.825,59.271,2.781,13.857,2.962,121.51,2.417,121.51,2.417,323.644,40.789,323.644,40.789,332.353,40.789
+36.647,2.875,42.649,2.875,61.654,2.869,64.847,2.825,15.385,3,133.581,2.5,133.581,2.5,351.103,40.842,351.103,40.842,361.011,40.842
+40.511,2.917,47.169,2.917,67.532,2.912,70.591,2.869,15.385,3,146.163,2.583,146.163,2.583,379.563,40.895,379.563,40.895,390.741,40.895
+44.595,2.958,51.944,2.958,73.583,2.956,76.498,2.912,15.967,3.038,159.258,2.667,159.258,2.667,409.025,40.947,409.025,40.947,421.541,40.947
+48.902,3,56.978,3,79.802,3,82.563,2.956,16.643,3.077,172.868,2.75,172.868,2.75,439.488,41,439.488,41,453.41,41
+54.08,3.042,62.443,3.042,86.139,3.042,88.781,3,17.4,3.115,186.997,2.833,186.997,2.833,442.334,41.053,475.171,41.053,488.022,41.053
+59.461,3.083,68.164,3.083,92.65,3.083,94.961,3.042,18.232,3.154,201.649,2.917,201.649,2.917,449.99,41.105,512.112,41.105,523.854,41.105
+65.039,3.125,74.136,3.125,99.334,3.125,101.294,3.083,19.132,3.192,216.826,3,216.826,3,461.753,41.158,550.398,41.158,560.992,41.158
+70.812,3.167,80.354,3.167,106.185,3.167,107.779,3.125,20.097,3.231,232.612,3.083,232.612,3.083,477.158,41.211,590.1,41.211,599.507,41.211
+76.777,3.208,86.814,3.208,113.202,3.208,114.413,3.167,21.125,3.269,248.899,3.167,248.899,3.167,495.89,41.263,631.279,41.263,639.462,41.263
+82.93,3.25,93.513,3.25,120.38,3.25,121.195,3.208,22.213,3.308,265.687,3.25,265.687,3.25,517.734,41.316,673.992,41.316,680.913,41.316
+89.268,3.292,100.448,3.292,127.718,3.292,128.125,3.25,23.361,3.346,282.978,3.333,282.978,3.333,542.552,41.368,718.29,41.368,723.913,41.368
+95.789,3.333,107.615,3.333,135.212,3.333,135.199,3.292,24.567,3.385,300.776,3.417,300.776,3.417,570.251,41.421,764.222,41.421,768.512,41.421
+102.491,3.375,115.013,3.375,142.861,3.375,142.417,3.333,25.831,3.423,319.081,3.5,319.081,3.5,600.776,41.474,811.836,41.474,814.757,41.474
+109.371,3.417,122.639,3.417,150.661,3.417,149.779,3.375,27.153,3.462,337.898,3.583,337.898,3.583,634.096,41.526,861.179,41.526,862.698,41.526
+116.427,3.458,130.49,3.458,158.611,3.458,157.282,3.417,28.532,3.5,357.228,3.667,357.228,3.667,670.203,41.579,912.289,41.579,912.372,41.579
+123.658,3.5,138.565,3.5,166.708,3.5,164.925,3.458,29.969,3.538,377.075,3.75,377.075,3.75,709.103,41.632,965.212,41.632,963.827,41.632
+130.383,3.542,147.13,3.542,174.998,3.542,172.709,3.5,31.464,3.577,397.441,3.833,397.441,3.833,750.809,41.684,1019.986,41.684,1017.102,41.684
+137.342,3.583,155.931,3.583,183.399,3.583,180.715,3.542,33.017,3.615,418.329,3.917,418.329,3.917,795.35,41.737,1076.653,41.737,1072.241,41.737
+144.538,3.625,164.977,3.625,191.907,3.625,188.817,3.583,34.628,3.654,439.744,4,439.744,4,842.762,41.789,1135.253,41.789,1129.283,41.789
+151.975,3.667,174.274,3.667,200.519,3.667,197.014,3.625,36.298,3.692,439.744,4,439.744,4,893.079,41.842,1195.824,41.842,1188.267,41.842
+159.657,3.708,183.827,3.708,209.231,3.708,205.302,3.667,38.027,3.731,426.312,4.167,461.827,4.083,946.341,41.895,1258.402,41.895,1249.232,41.895
+167.586,3.75,193.642,3.75,218.041,3.75,213.681,3.708,39.816,3.769,450.518,4.25,487.595,4.167,1002.596,41.947,1323.025,41.947,1312.216,41.947
+175.766,3.792,203.721,3.792,226.946,3.792,222.15,3.75,41.665,3.808,475.304,4.333,513.966,4.25,1061.897,42,1389.731,42,1377.258,42
+184.201,3.833,214.071,3.833,235.943,3.833,230.707,3.792,43.575,3.846,500.669,4.417,540.939,4.333,1121.642,42.05,1457.364,42.05,1443.44,42.05
+192.892,3.875,224.695,3.875,245.03,3.875,239.35,3.833,45.546,3.885,526.611,4.5,568.512,4.417,1184.196,42.1,1527.027,42.1,1511.628,42.1
+201.844,3.917,235.596,3.917,254.203,3.917,248.079,3.875,47.58,3.923,550.867,4.583,596.684,4.5,1249.604,42.15,1598.754,42.15,1581.853,42.15
+211.059,3.958,246.779,3.958,263.461,3.958,256.892,3.917,49.675,3.962,575.889,4.667,624.458,4.583,1317.908,42.2,1672.564,42.2,1654.136,42.2
+220.542,4,258.247,4,272.801,4,265.789,3.958,51.833,4,601.69,4.75,652.996,4.667,,,,,,
+,,,,,,274.768,4,51.833,4,628.277,4.833,682.307,4.75,,,,,,
+,,,,,,,,,,655.662,4.917,712.398,4.833,,,,,,
+,,,,,,,,,,683.856,5,743.277,4.917,,,,,,
+,,,,,,,,,,683.856,5,774.952,5,,,,,,
+,,,,,,,,,,,,774.952,5,,,,,,

floodmodeller_api/test/test_ief.py

@@ -4,6 +4,7 @@ from unittest.mock import call, patch
 import pytest
 
 from floodmodeller_api import IEF
+from floodmodeller_api.util import FloodModellerAPIError
 
 
 @pytest.fixture()
@@ -30,11 +31,24 @@ def exe_bin(tmpdir) -> Path:
     return Path(tmpdir)
 
 
+@pytest.fixture()
+def p_open():
+    with patch("floodmodeller_api.ief.Popen") as p_open:
+        yield p_open
+
+
+@pytest.fixture()
+def sleep():
+    with patch("floodmodeller_api.ief.time.sleep") as sleep:
+        yield sleep
+
+
 def test_ief_open_does_not_change_data(ief: IEF, data_before: str):
     """IEF: Test str representation equal to ief file with no changes"""
     assert ief._write() == data_before
 
 
+@pytest.mark.usefixtures("log_timeout")
 @pytest.mark.parametrize(
     ("precision", "method", "amend", "exe"),
     [
@@ -56,6 +70,8 @@ def test_simulate(
     ief: IEF,
     ief_fp: Path,
     exe_bin: Path,
+    p_open,
+    sleep,
     precision: str,
     method: str,
     amend: bool,
@@ -64,21 +80,16 @@ def test_simulate(
     if amend:
         ief.launchdoubleprecisionversion = 1
 
-    with (
-        patch("floodmodeller_api.ief.Popen") as p_open,
-        patch("floodmodeller_api.ief.IEF.LOG_TIMEOUT", new=0),
-        patch("floodmodeller_api.ief.time.sleep") as sleep,
-    ):
-        p_open.return_value.poll.side_effect = [None, None, 0]
+    p_open.return_value.poll.side_effect = [None, None, 0]
 
-        exe_path = Path(exe_bin, exe)
-        ief.simulate(method=method, precision=precision, enginespath=str(exe_bin))
+    exe_path = Path(exe_bin, exe)
+    ief.simulate(method=method, precision=precision, enginespath=str(exe_bin))
 
-        p_open.assert_called_once_with(f'"{exe_path}" -sd "{ief_fp}"', cwd=str(ief_fp.parent))
+    p_open.assert_called_once_with(f'"{exe_path}" -sd "{ief_fp}"', cwd=str(ief_fp.parent))
 
-        if method == "WAIT":
-            assert p_open.return_value.poll.call_count == 3
-            assert sleep.call_args_list[-3:] == [call(0.1), call(1), call(1)]
+    if method == "WAIT":
+        assert p_open.return_value.poll.call_count == 3
+        assert sleep.call_args_list[-3:] == [call(0.1), call(1), call(1)]
 
 
 def test_simulate_error_without_bin(tmpdir, ief: IEF):
@@ -91,7 +102,7 @@ def test_simulate_error_without_bin(tmpdir, ief: IEF):
         r"\n"
         r"\nFor additional support, go to: https://github\.com/People-Places-Solutions/floodmodeller-api"
     )
-    with pytest.raises(Exception, match=msg):
+    with pytest.raises(FloodModellerAPIError, match=msg):
         ief.simulate(enginespath=str(Path(tmpdir, "bin")))
 
 
@@ -105,7 +116,7 @@ def test_simulate_error_without_exe(tmpdir, ief: IEF):
         r"\n"
         r"\nFor additional support, go to: https://github\.com/People-Places-Solutions/floodmodeller-api"
     )
-    with pytest.raises(Exception, match=msg):
+    with pytest.raises(FloodModellerAPIError, match=msg):
         ief.simulate(enginespath=str(tmpdir))
 
 
@@ -121,5 +132,5 @@ def test_simulate_error_without_save():
         r"\n"
         r"\nFor additional support, go to: https://github\.com/People-Places-Solutions/floodmodeller-api"
     )
-    with pytest.raises(Exception, match=msg):
+    with pytest.raises(FloodModellerAPIError, match=msg):
         ief.simulate()

floodmodeller_api/test/test_logs_lf.py

@@ -1,9 +1,12 @@
 from pathlib import Path
+from unittest.mock import MagicMock, patch
 
 import pandas as pd
 import pytest
+from freezegun import freeze_time
 
 from floodmodeller_api import IEF, LF1
+from floodmodeller_api.logs import create_lf
 
 
 @pytest.fixture
@@ -46,3 +49,54 @@ def test_lf1_from_ief(lf1_fp, test_workspace):
     assert lf1._filepath == lf1_from_ief._filepath
     assert lf1.info == lf1_from_ief.info
     pd.testing.assert_frame_equal(lf1.to_dataframe(), lf1_from_ief.to_dataframe())
+
+
+def test_log_file_unsupported(capsys):
+    lf = create_lf(None, "lf3")
+
+    assert lf is None
+    assert (
+        capsys.readouterr().out
+        == "No progress bar as log file must have suffix lf1 or lf2. Simulation will continue as usual.\n"
+    )
+
+
+@pytest.mark.usefixtures("log_timeout")
+def test_log_file_timeout(capsys):
+    lf_filepath = MagicMock()
+    lf_filepath.is_file.return_value = False
+    lf = create_lf(lf_filepath, "lf1")
+
+    assert lf is None
+    assert (
+        capsys.readouterr().out
+        == "No progress bar as log file is expected but not detected. Simulation will continue as usual.\n"
+    )
+
+
+@pytest.mark.usefixtures("log_timeout")
+@freeze_time("1970-01-01 00:00:00", tick=True)
+def test_log_file_from_old_run(capsys):
+    lf_filepath = MagicMock()
+    lf_filepath.is_file.return_value = True
+    lf_filepath.stat.return_value.st_mtime = -10
+    lf = create_lf(lf_filepath, "lf1")
+
+    assert lf is None
+    assert (
+        capsys.readouterr().out
+        == "No progress bar as log file is from previous run. Simulation will continue as usual.\n"
+    )
+
+
+@pytest.mark.usefixtures("log_timeout")
+@freeze_time("1970-01-01 00:00:00", tick=True)
+def test_log_file_found():
+    lf_filepath = MagicMock()
+    lf_filepath.is_file.return_value = True
+    lf_filepath.stat.return_value.st_mtime = -1
+    with patch("floodmodeller_api.logs.lf.LF1") as lf1:
+        lf = create_lf(lf_filepath, "lf1")
+
+    assert lf is not None
+    lf1.assert_called_once_with(lf_filepath)

floodmodeller_api/to_from_json.py

@@ -14,9 +14,11 @@ If you have any query about this program or this License, please contact us at s
 address: Jacobs UK Limited, Flood Modeller, Cottons Centre, Cottons Lane, London, SE1 2QG, United Kingdom.
 """
 
+from __future__ import annotations
+
 import json
 from pathlib import Path
-from typing import Any, Union
+from typing import Any
 
 import pandas as pd
 from pandas import Index
@@ -45,6 +47,23 @@ def is_jsonable(obj: Any) -> bool:
         return False
 
 
+def pandas_to_json(obj: pd.DataFrame | pd.Series) -> dict:
+    if isinstance(obj, pd.DataFrame):
+        if isinstance(obj.columns, pd.MultiIndex):
+            # Handle multi index columns (i.e. ZZN dataframe results)
+            obj.columns = pd.Index(map(str, obj.columns.values))
+
+        return {"class": "pandas.DataFrame", "object": obj.to_dict()}
+
+    # otherwise returns as series
+    return {
+        "class": "pandas.Series",
+        "variable_name": obj.name,
+        "index_name": obj.index.name,
+        "object": obj.to_dict(),
+    }
+
+
 def recursive_to_json(obj: Any, is_top_level: bool = True) -> Any:  # noqa: PLR0911
     """
     Function to undertake a recursion through the different elements of the python object
@@ -65,15 +84,8 @@ def recursive_to_json(obj: Any, is_top_level: bool = True) -> Any:  # noqa: PLR0
     if is_jsonable(obj):
         return obj
 
-    if isinstance(obj, pd.DataFrame):
-        return {"class": "pandas.DataFrame", "object": obj.to_dict()}
-    if isinstance(obj, pd.Series):
-        return {
-            "class": "pandas.Series",
-            "variable_name": obj.name,
-            "index_name": obj.index.name,
-            "object": obj.to_dict(),
-        }
+    if isinstance(obj, (pd.DataFrame, pd.Series)):
+        return pandas_to_json(obj)
 
     # To convert WindowsPath, no serializable, objects to string, serializable.
     if isinstance(obj, Path):
@@ -107,7 +119,7 @@ def recursive_to_json(obj: Any, is_top_level: bool = True) -> Any:  # noqa: PLR0
         return return_dict
 
 
-def from_json(obj: Union[str, dict]) -> dict:
+def from_json(obj: str | dict) -> dict:
     """
     Function to convert a JSON string back into Python objects
 
@@ -126,7 +138,7 @@ def from_json(obj: Union[str, dict]) -> dict:
     return recursive_from_json(obj_dict)
 
 
-def recursive_from_json(obj: Union[dict, Any]) -> Any:
+def recursive_from_json(obj: dict | Any) -> Any:
     """
     Function to undertake a recursion through the different elements of the JSON object
 

floodmodeller_api/units/boundaries.py

@@ -17,6 +17,7 @@ address: Jacobs UK Limited, Flood Modeller, Cottons Centre, Cottons Lane, London
 import pandas as pd
 
 from floodmodeller_api.validation import _validate_unit
+from floodmodeller_api.validation.parameters import parameter_options
 
 from ._base import Unit
 from .helpers import (
@@ -212,6 +213,11 @@ class HTBDY(Unit):
         self.data = self.data.set_index("Time")
         self.data = self.data["Stage"]  # Convert to series
 
+        # Fix legacy Flood Modeller bug where timeunit is present in extendmethod place
+        if self.extendmethod in parameter_options["timeunit"]["options"][1]:
+            self.timeunit = self.extendmethod
+            self.extendmethod = "EXTEND"
+
     def _write(self):
         """Function to write a valid HTBDY block"""
         _validate_unit(self)  # Function to check the params are valid for HTBDY