floodmodeller-api 0.5.0__tar.gz → 0.5.0.post1__tar.gz

{floodmodeller_api-0.5.0/floodmodeller_api.egg-info → floodmodeller_api-0.5.0.post1}/PKG-INFO

@@ -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 → floodmodeller_api-0.5.0.post1}/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-0.5.0 → floodmodeller_api-0.5.0.post1}/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-0.5.0 → floodmodeller_api-0.5.0.post1}/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-0.5.0.post1/floodmodeller_api/version.py

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

{floodmodeller_api-0.5.0 → floodmodeller_api-0.5.0.post1/floodmodeller_api.egg-info}/PKG-INFO

@@ -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/floodmodeller_api/version.py

@@ -1 +0,0 @@
-__version__ = "0.5.0"