floodmodeller-api 0.5.0__py3-none-any.whl → 0.5.0.post1__py3-none-any.whl

floodmodeller_api/test/test_river.py

@@ -167,3 +167,80 @@ def test_create_from_blank_with_params():
         "     1.000     2.000     0.010     0.000               0.000     0.000                    ",
         "     2.000     5.000     0.010     0.000               0.000     0.000                    ",
     ]
+
+
+def test_set_river_dataframe_correct():
+    unit = RIVER(
+        [
+            "RIVER normal case",
+            "SECTION",
+            "SomeUnit",
+            "     0.000            0.000100  1000.000",
+            "        5",
+            "     0.000        10     0.030",
+            "     1.000         9     0.030",
+            "     2.000         5     0.030",
+            "     3.000         6     0.030",
+            "     4.000        10     0.030",
+        ],
+    )
+
+    df = pd.DataFrame(
+        {
+            "X": [0.0, 1.0, 2.0],
+            "Y": [5.0, 2.0, 5.0],
+            "Mannings n": [0.01, 0.01, 0.01],
+            "Panel": ["", "", ""],
+            "RPL": [0.0, 0.0, 0.0],
+            "Marker": ["", "", ""],
+            "Easting": [0.0, 0.0, 0.0],
+            "Northing": [0.0, 0.0, 0.0],
+            "Deactivation": ["", "", ""],
+            "SP. Marker": ["", "", ""],
+        },
+    )
+
+    unit.data = df.copy()
+    pd.testing.assert_frame_equal(unit._data, df.copy())
+
+
+def test_set_river_dataframe_incorrect():
+    unit = RIVER()
+
+    df = pd.DataFrame(
+        {
+            "X": [0.0, 1.0, 2.0],
+            "Y": [5.0, 2.0, 5.0],
+            "Mannings n": [0.01, 0.01, 0.01],
+            "RPL": [0.0, 0.0, 0.0],
+            "Marker": ["", "", ""],
+            "Easting": [0.0, 0.0, 0.0],
+            "Deactivation": ["", "", ""],
+            "SP. Marker": ["", "", ""],
+        },
+    )
+
+    with pytest.raises(ValueError):
+        unit.data = df.copy()
+
+
+def test_set_river_dataframe_case_sensitivity():
+    unit = RIVER()
+
+    df = pd.DataFrame(
+        {
+            "x": [0.0, 1.0, 2.0],
+            "Y": [5.0, 2.0, 5.0],
+            "mANNINGs n": [0.01, 0.01, 0.01],
+            "Panel": ["", "", ""],
+            "RPL": [0.0, 0.0, 0.0],
+            "Marker": ["", "", ""],
+            "Easting": [0.0, 0.0, 0.0],
+            "Northing": [0.0, 0.0, 0.0],
+            "Deactivation": ["", "", ""],
+            "SP. Marker": ["", "", ""],
+        },
+    )
+
+    unit.data = df.copy()
+    pd.testing.assert_frame_equal(unit._data, df.copy())

floodmodeller_api/units/conveyance.py

@@ -72,11 +72,12 @@ def calculate_cross_section_conveyance(
             total_length = np.where(in_panel_and_section, length, 0).sum(axis=1)
             total_mannings = np.where(in_panel_and_section, mannings, 0).sum(axis=1)
 
-            conveyance += np.where(
-                total_length >= MINIMUM_PERIMETER_THRESHOLD,
-                total_area ** (5 / 3) * total_length ** (1 / 3) / (total_mannings * rpl_panel),
-                0,
-            )
+            with np.errstate(invalid="ignore"):
+                conveyance += np.where(
+                    total_length >= MINIMUM_PERIMETER_THRESHOLD,
+                    total_area ** (5 / 3) * total_length ** (1 / 3) / (total_mannings * rpl_panel),
+                    0,
+                )
 
     return pd.Series(conveyance, index=water_levels)
 
@@ -116,9 +117,10 @@ def calculate_geometry(
     is_submerged_on_right = (h1 <= 0) & (h2 > 0)
     conditions = [is_submerged, is_submerged_on_left, is_submerged_on_right]
 
-    # needed for partially submerged sections
-    dx_left = dx * h1 / (h1 - h2)
-    dx_right = dx * h2 / (h2 - h1)
+    with np.errstate(divide="ignore", invalid="ignore"):
+        # needed for partially submerged sections
+        dx_left = dx * h1 / (h1 - h2)
+        dx_right = dx * h2 / (h2 - h1)
 
     area = np.select(
         conditions,

floodmodeller_api/units/sections.py

@@ -260,7 +260,7 @@ class RIVER(Unit):
             raise ValueError(
                 "The updated data table for a cross section must be a pandas DataFrame.",
             )
-        if new_df.columns != self._required_columns:
+        if list(map(str.lower, new_df.columns)) != list(map(str.lower, self._required_columns)):
             raise ValueError(f"The DataFrame must only contain columns: {self._required_columns}")
         self._data = new_df
 

floodmodeller_api/version.py

@@ -1 +1 @@
-__version__ = "0.5.0"
+__version__ = "0.5.0.post1"

{floodmodeller_api-0.5.0.dist-info → floodmodeller_api-0.5.0.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: floodmodeller_api
-Version: 0.5.0
+Version: 0.5.0.post1
 Summary: Extends the functionality of Flood Modeller to python users
 Author: Jacobs
 Author-email: joe.pierce@jacobs.com

{floodmodeller_api-0.5.0.dist-info → floodmodeller_api-0.5.0.post1.dist-info}/RECORD

@@ -11,7 +11,7 @@ floodmodeller_api/mapping.py,sha256=hCZbQ-_v6dEHxkFkG0cjkeI7FCHSi5UqDk49yBjzZO0,
 floodmodeller_api/to_from_json.py,sha256=3UNBEOmh717cyDoylmFCngwokXu9b2Jm3FKk1Oum9wk,7287
 floodmodeller_api/tool.py,sha256=brN4A2NR08W1xDnyoniHJo1MYchAVNs9Nif5mwebRPs,11284
 floodmodeller_api/util.py,sha256=vfU2GDK2ozrsQonwP3jeeEvjACqKlTWECTa-r5VIgoI,3994
-floodmodeller_api/version.py,sha256=LBK46heutvn3KmsCrKIYu8RQikbfnjZaj2xFrXaeCzQ,22
+floodmodeller_api/version.py,sha256=J1kBZAgpuK-WFUqCCzGZrBt454s_I5sVWXeEXZ7DyLQ,28
 floodmodeller_api/xml2d.py,sha256=lJ7oL9u7YMXc9Eimpv8c44d-MN5IWtu7VsGRNW26pSY,25710
 floodmodeller_api/xml2d_template.py,sha256=iaPdZHN6pEHf-QDSDwfUeDhd9QyuQPY_NUz7cvZLs7g,1806
 floodmodeller_api/xsd_backup.xml,sha256=hRZYhpNcucT7TgFPhuINMAEJOkds-lg6n7RH3b2jeq4,28430
@@ -45,7 +45,7 @@ floodmodeller_api/test/test_inp.py,sha256=k6Unz41_CjcUEzRtg_KiQ4G2o3tA5iEK8Zx64N
 floodmodeller_api/test/test_json.py,sha256=LrCGDgz_3Ajv7J0LtJOB24M-cXPlQtTGlpg6oE4-ieo,4084
 floodmodeller_api/test/test_logs_lf.py,sha256=bLsvSTy3e_NcE0338DdfyDEFn6CfQXfbmPQElMpfakw,2890
 floodmodeller_api/test/test_read_file.py,sha256=vA_qRtq1ffkp5zOrzAXBwIjPYNHtEV_HVRP3hgilPRc,754
-floodmodeller_api/test/test_river.py,sha256=AUi0FaLJ2WyFx4wT6c1_TC39qNWHWoCcswVulrbXJs0,6459
+floodmodeller_api/test/test_river.py,sha256=g7O1n6GTmexV1o3g_5zOUw601Gf6CX2_RVSvdshgluo,8534
 floodmodeller_api/test/test_tool.py,sha256=Or7nQ6XZIglpYbvKyIlvG9aERiTXtSRomeByTsP1VQ4,4058
 floodmodeller_api/test/test_toolbox_structure_log.py,sha256=GQP5L3rvdtCMEeG5QTFYmcXzdS-ISs3agmbGj0SeVdU,7255
 floodmodeller_api/test/test_xml2d.py,sha256=_Z7FI86EkfsGZkEC5Vr8RwBOdAZ3kDJF15VOhOANKrs,5091
@@ -188,11 +188,11 @@ floodmodeller_api/units/_base.py,sha256=Zxug0OgdZ5Hu3Qoj_ukR75GLotFGNtHnfbil2kCv
 floodmodeller_api/units/boundaries.py,sha256=Mf7KQKVKCNMur23OW5JutMC-whm4LQuxNmBOVgUSFbk,19873
 floodmodeller_api/units/comment.py,sha256=2RmAm0Ef8pUVBng2xoGD0R3gzaq1x7xku2bRtkhDUqA,1864
 floodmodeller_api/units/conduits.py,sha256=Pmbw7R2_FP048YzmRhrKM1Cw_UY5rNPme8PliAkdlQA,17039
-floodmodeller_api/units/conveyance.py,sha256=A1nckSXkJHryQmCAyegqUAcVe83OwsqSqbTn1Spu0zU,6170
+floodmodeller_api/units/conveyance.py,sha256=m0L-cwwHfopr-Y3No_3wpEh0IIOlMn-MZXrM7T4fJ78,6307
 floodmodeller_api/units/helpers.py,sha256=yUAdhu1Fg3PmL_DhODzgkktwwzYYzQ6yItb0INmMJus,4068
 floodmodeller_api/units/iic.py,sha256=PHkqWLK51Trzjr5FHt84sYT-WVaPbgt_hHBSqHlbIFQ,3875
 floodmodeller_api/units/losses.py,sha256=el97L6ZATgaL7C2VTqtpmUHcR1GztkOTJpVMoXiSTko,12137
-floodmodeller_api/units/sections.py,sha256=Tl4T1qCZ-KwgotHJ9XkgicV8KsEzx7ZPh6qX-QuGz7c,19750
+floodmodeller_api/units/sections.py,sha256=AVoa8ZmnWL5BpVTGu18KCQSY0LYrvMHeCH4G5H-vAcw,19794
 floodmodeller_api/units/structures.py,sha256=x8bIlkZmxpWBkfv1vvH-2_i8gVcqs26NyM5P03m9CRg,70960
 floodmodeller_api/units/units.py,sha256=yBN0spwgjW4vDiRr8lapwpOVKgTIvWH_LEp6zXA38fI,5053
 floodmodeller_api/units/unsupported.py,sha256=WYynzkwQcYO_9_BPRKg9RVH2NnxDX-0wy4zOr7cJtso,1917
@@ -211,9 +211,9 @@ floodmodeller_api/validation/__init__.py,sha256=sUMqShUGLnuQjmxKN3wAR7XpDVYsSFn4
 floodmodeller_api/validation/parameters.py,sha256=qnDGZLzW2Bfd7hf-IF_s-smfZfKdQieweyJo_RxDhfQ,16101
 floodmodeller_api/validation/urban_parameters.py,sha256=ChK8pSFsX6Ndl5-xw8mlNJJ2oJ-6cqc9OYE2gGP2WZk,11757
 floodmodeller_api/validation/validation.py,sha256=GH7KsrbHmTnCg_vfazKnCakbvkwua0cw6hAGStKWemg,4447
-floodmodeller_api-0.5.0.dist-info/LICENSE.txt,sha256=tH7I97hBX5QUpGGDbkiWdqJuWgMsBZDA8zEd_029-cM,920
-floodmodeller_api-0.5.0.dist-info/METADATA,sha256=jS74pT_e9H2r4hzbJsb4tpyAYWY8ngPgsTwUPBMBy9k,4980
-floodmodeller_api-0.5.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-floodmodeller_api-0.5.0.dist-info/entry_points.txt,sha256=RQFzb_zf1hNv2uNRfoCD3nRzyzGi8vPvj7VGOhrOjtI,198
-floodmodeller_api-0.5.0.dist-info/top_level.txt,sha256=x10nxct120kv2PpqYA2lhiwrYre3wKyic2wcUyNWWRw,18
-floodmodeller_api-0.5.0.dist-info/RECORD,,
+floodmodeller_api-0.5.0.post1.dist-info/LICENSE.txt,sha256=tH7I97hBX5QUpGGDbkiWdqJuWgMsBZDA8zEd_029-cM,920
+floodmodeller_api-0.5.0.post1.dist-info/METADATA,sha256=f68Gsskfm_z2j2w2oLcxBYmdOwsMN4xDkomzDaP_XwA,4986
+floodmodeller_api-0.5.0.post1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+floodmodeller_api-0.5.0.post1.dist-info/entry_points.txt,sha256=RQFzb_zf1hNv2uNRfoCD3nRzyzGi8vPvj7VGOhrOjtI,198
+floodmodeller_api-0.5.0.post1.dist-info/top_level.txt,sha256=x10nxct120kv2PpqYA2lhiwrYre3wKyic2wcUyNWWRw,18
+floodmodeller_api-0.5.0.post1.dist-info/RECORD,,