floodmodeller-api 0.5.3.post1__py3-none-any.whl → 0.5.3.post2__py3-none-any.whl

floodmodeller_api/dat.py

@@ -453,12 +453,14 @@ class DAT(FMFile):
             "losses": [],
             "connectors": [],
             "controls": [],
+            "_unsupported": [],
         }
 
         for block in self._dat_struct:
             # Check for all supported boundary types
-            if block["Type"] not in units.SUPPORTED_UNIT_TYPES:
+            if block["Type"] not in units.ALL_UNIT_TYPES:
                 continue
+            unit_type = block["Type"]
             # clause for when unit has been inserted into the dat file
             if "new_insert" in block:
                 block["start"] = prev_block_end + 1
@@ -474,24 +476,26 @@ class DAT(FMFile):
                 ]
                 prev_block_len = len(unit_data)
 
-                if block["Type"] == "INITIAL CONDITIONS":
+                if unit_type == "INITIAL CONDITIONS":
                     new_unit_data = self.initial_conditions._write()
-                elif block["Type"] == "COMMENT":
+                elif unit_type == "COMMENT":
                     comment = comment_units[comment_tracker]
                     new_unit_data = comment._write()
                     comment_tracker += 1
 
-                elif block["Type"] == "VARIABLES":
+                elif unit_type == "VARIABLES":
                     new_unit_data = self.variables._write()
 
                 else:
-                    if units.SUPPORTED_UNIT_TYPES[block["Type"]]["has_subtype"]:
-                        unit_name = unit_data[2][: self._label_len].strip()
+                    if unit_type in units.SUPPORTED_UNIT_TYPES:
+                        unit_name = self._get_supported_unit_name(unit_type, unit_data)
+                        unit_group_str = units.SUPPORTED_UNIT_TYPES[unit_type]["group"]
                     else:
-                        unit_name = unit_data[1][: self._label_len].strip()
+                        unit_name, _ = self._get_unsupported_unit_name(unit_type, unit_data)
+                        unit_name = f"{unit_name} ({unit_type})"
+                        unit_group_str = "_unsupported"
 
                     # Get unit object
-                    unit_group_str = units.SUPPORTED_UNIT_TYPES[block["Type"]]["group"]
                     unit_group = getattr(self, unit_group_str)
                     if unit_name in unit_group:
                         # block still exists
@@ -577,14 +581,25 @@ class DAT(FMFile):
     def _process_unsupported_unit(self, unit_type, unit_data) -> None:
         # Check to see whether unit type has associated subtypes so that unit name can be correctly assigned
         unit_name, subtype = self._get_unsupported_unit_name(unit_type, unit_data)
-        self._unsupported[f"{unit_name} ({unit_type})"] = units.UNSUPPORTED(
+        unit_name_and_type = f"{unit_name} ({unit_type})"
+        if unit_name_and_type in self._unsupported:
+            msg = (
+                f"Duplicate label ({unit_name_and_type}) encountered within category: _unsupported"
+            )
+            raise Exception(msg)
+        self._unsupported[unit_name_and_type] = units.UNSUPPORTED(
             unit_data,
             self._label_len,
             unit_name=unit_name,
             unit_type=unit_type,
             subtype=subtype,
         )
-        self._all_units.append(self._unsupported[f"{unit_name} ({unit_type})"])
+        self._all_units.append(self._unsupported[unit_name_and_type])
+
+    def _get_supported_unit_name(self, unit_type: str, unit_data: list[str]) -> str:
+        if units.SUPPORTED_UNIT_TYPES[unit_type]["has_subtype"]:
+            return unit_data[2][: self._label_len].strip()
+        return unit_data[1][: self._label_len].strip()
 
     def _get_unsupported_unit_name(self, unit_type: str, unit_data: list[str]) -> tuple[str, bool]:
         # Check if the unit type has associated subtypes
@@ -708,6 +723,19 @@ class DAT(FMFile):
 
         return unit_block, in_block
 
+    @property
+    def node_labels(self):
+        all_labels = set()
+        for unit in self._all_units:
+            all_labels.update(unit.all_labels)
+        return all_labels
+
+    def _get_unit_group_name(self, unit: Unit) -> str:
+        unit_type = unit.unit
+        if unit_type in units.SUPPORTED_UNIT_TYPES:
+            return units.SUPPORTED_UNIT_TYPES[unit_type]["group"]
+        return "_unsupported"
+
     @handle_exception(when="remove unit from")
     def remove_unit(self, unit: Unit) -> None:
         """Remove a unit from the dat file.
@@ -732,19 +760,23 @@ class DAT(FMFile):
         # remove from raw data
         del self._raw_data[dat_struct_unit["start"] : dat_struct_unit["end"] + 1]
         # remove from unit group
-        unit_group_name = units.SUPPORTED_UNIT_TYPES[unit._unit]["group"]
+        unit_group_name = self._get_unit_group_name(unit)
         unit_group = getattr(self, unit_group_name)
-        del unit_group[unit.name]
-        # remove from ICs
-        self.initial_conditions.data = self.initial_conditions.data.loc[
-            self.initial_conditions.data["label"] != unit.name
-        ]
+        if unit_group_name == "_unsupported":
+            del unit_group[f"{unit.name} ({unit.unit})"]
+        else:
+            del unit_group[unit.name]
+        # remove from ICs if no more labels
+        if unit.name not in self.node_labels:
+            self.initial_conditions.data = self.initial_conditions.data.loc[
+                self.initial_conditions.data["label"] != unit.name
+            ]
+            self.general_parameters["Node Count"] -= 1
 
         self._update_dat_struct()
-        self.general_parameters["Node Count"] -= 1
 
     @handle_exception(when="insert unit into")
-    def insert_unit(  # noqa: C901, PLR0912
+    def insert_unit(
         self,
         unit: Unit,
         add_before: Unit | None = None,
@@ -767,6 +799,48 @@ class DAT(FMFile):
             NameError: Raised if unit name already appears in unit group.
         """
         # catch errors
+        self._validate_insert_unit_params(unit, add_before, add_after, add_at)
+
+        unit_class = unit._unit
+        if unit_class != "COMMENT":
+            _validate_unit(unit)
+            unit_group_name = self._get_unit_group_name(unit)
+            unit_group = getattr(self, unit_group_name)
+            if unit.name in unit_group:
+                msg = "Name already appears in unit group. Cannot have two units with same name in same group"
+                raise NameError(msg)
+
+        insert_index = self._get_insert_index(add_before, add_after, add_at)
+
+        unit_data = unit._write()
+        if unit._unit != "COMMENT":
+            if unit_group_name == "_unsupported":
+                unit_group[f"{unit.name} ({unit.unit})"] = unit
+            else:
+                unit_group[unit.name] = unit
+        self._dat_struct.insert(
+            insert_index + 1,
+            {"Type": unit_class, "new_insert": unit_data},
+        )  # add to dat struct without unit.name
+
+        if unit._unit != "COMMENT" and unit.name not in self.node_labels:
+            # update the iic's tables
+            iic_data = [unit.name, "y", 00.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+            self.initial_conditions.data.loc[len(self.initial_conditions.data)] = iic_data  # flaged
+            self.general_parameters["Node Count"] += 1  # flag no update for comments
+
+        self._all_units.insert(insert_index, unit)
+        if not defer_update:
+            self._update_raw_data()
+            self._update_dat_struct()
+
+    def _validate_insert_unit_params(
+        self,
+        unit: Unit,
+        add_before: Unit | None,
+        add_after: Unit | None,
+        add_at: int | None,
+    ):
         provided_params = sum(arg is not None for arg in (add_before, add_after, add_at))
         if provided_params == 0:
             msg = "No positional argument given. Please provide either add_before, add_at or add_after"
@@ -781,15 +855,12 @@ class DAT(FMFile):
             msg = "add_before or add_after argument must be a Flood Modeller Unit type"
             raise TypeError(msg)
 
-        unit_class = unit._unit
-        if unit_class != "COMMENT":
-            _validate_unit(unit)
-            unit_group_name = units.SUPPORTED_UNIT_TYPES[unit._unit]["group"]
-            unit_group = getattr(self, unit_group_name)
-            if unit.name in unit_group:
-                msg = "Name already appears in unit group. Cannot have two units with same name in same group"
-                raise NameError(msg)
-
+    def _get_insert_index(
+        self,
+        add_before: Unit | None,
+        add_after: Unit | None,
+        add_at: int | None,
+    ) -> int:
         # positional argument
         if add_at is not None:
             insert_index = add_at
@@ -810,28 +881,7 @@ class DAT(FMFile):
                     f"{check_unit} not found in dat network, so cannot be used to add before/after"
                 )
                 raise Exception(msg)
-
-        unit_data = unit._write()
-        self._all_units.insert(insert_index, unit)
-        if unit._unit != "COMMENT":
-            unit_group[unit.name] = unit
-        self._dat_struct.insert(
-            insert_index + 1,
-            {"Type": unit_class, "new_insert": unit_data},
-        )  # add to dat struct without unit.name
-
-        if unit._unit != "COMMENT":
-            # update the iic's tables
-            iic_data = [unit.name, "y", 00.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
-            self.initial_conditions.data.loc[len(self.initial_conditions.data)] = iic_data  # flaged
-
-        # update all
-        if unit._unit != "COMMENT":
-            self.general_parameters["Node Count"] += 1  # flag no update for comments
-
-        if not defer_update:
-            self._update_raw_data()
-            self._update_dat_struct()
+        return insert_index
 
     def insert_units(
         self,

floodmodeller_api/test/test_dat.py

@@ -5,7 +5,7 @@ from unittest.mock import patch
 import pytest
 
 from floodmodeller_api import DAT
-from floodmodeller_api.units import JUNCTION, LATERAL, QTBDY, RESERVOIR
+from floodmodeller_api.units import JUNCTION, LATERAL, QTBDY, RESERVOIR, UNSUPPORTED
 from floodmodeller_api.util import FloodModellerAPIError
 
 
@@ -42,6 +42,28 @@ def dat_ex6(test_workspace):
         yield dat
 
 
+@pytest.fixture()
+def unsupported_dummy_unit():
+    data = [
+        "APITESTDUMMY Dummy unnsupported unit for testing purposes",
+        "LBL001      LBL002",
+        "arbitrary data",
+        "        table01234",
+        "    -0.500     0.000     0.000    0.000091000000.0",
+        "     0.000     1.000     1.000    0.0000 910000000",
+        "     1.000     2.000     2.000    0.000091000000.0",
+        "     2.000     3.000     3.000    0.000091000000.0",
+        "     5.000     3.000     3.000    0.000091000000.0",
+    ]
+    return UNSUPPORTED(
+        data,
+        12,
+        unit_name="LBL001",
+        unit_type="APITESTDUMMY",
+        subtype=False,
+    )
+
+
 def test_changing_section_and_dist_works(dat_fp, data_before):
     """DAT: Test changing and reverting section name and dist to next makes no changes"""
     dat = DAT(dat_fp)
@@ -74,6 +96,9 @@ def test_changing_and_reverting_qtbdy_hydrograph_works(dat_fp, data_before):
 def test_dat_read_doesnt_change_data(test_workspace, tmp_path):
     """DAT: Check all '.dat' files in folder by reading the _write() output into a new DAT instance and checking it stays the same."""
     for datfile in Path(test_workspace).glob("*.dat"):
+        if datfile.name.startswith("duplicate_unit_test"):
+            # Skipping as invalid DAT (duplicate units)
+            continue
         dat = DAT(datfile)
         first_output = dat._write()
         new_path = tmp_path / "tmp.dat"
@@ -380,3 +405,50 @@ def test_encoding(test_workspace: Path, dat_str: str, label: str, tmp_path: Path
 
     assert label in dat_read.sections
     assert label in dat_write.sections  # remains as \xc3\xa5 even for utf8
+
+
+def test_insert_unsupported_unit(tmp_path: Path, unsupported_dummy_unit):
+    new_dat = DAT()
+    new_dat.insert_unit(unsupported_dummy_unit, add_at=-1)
+    assert unsupported_dummy_unit in new_dat._unsupported.values()
+    assert len(new_dat._all_units) == 1
+    filepath = tmp_path / "insert_dummy_test.dat"
+    new_dat.save(filepath)
+
+    dat = DAT(filepath)
+    assert unsupported_dummy_unit in dat._unsupported.values()
+    assert len(dat._all_units) == 1
+
+
+def test_remove_unsupported_unit(test_workspace, unsupported_dummy_unit):
+    dat = DAT(test_workspace / "remove_dummy_test.dat")
+    assert len(dat._all_units) == 1
+    assert len(dat._dat_struct) == 3
+    assert len(dat.initial_conditions.data) == 1
+    assert "LBL001 (APITESTDUMMY)" in dat._unsupported
+    dat.remove_unit(unsupported_dummy_unit)
+    assert len(dat._all_units) == 0
+    assert len(dat._dat_struct) == 2
+    assert len(dat.initial_conditions.data) == 0
+    assert "LBL001 (APITESTDUMMY)" not in dat._unsupported
+    dat._write()
+    assert len(dat._all_units) == 0
+    assert len(dat._dat_struct) == 2
+    assert len(dat.initial_conditions.data) == 0
+    assert "LBL001 (APITESTDUMMY)" not in dat._unsupported
+
+
+def test_duplicate_unit_raises_error(test_workspace):
+    msg = (
+        r"\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+        r"\nAPI Error: Problem encountered when trying to read DAT file .*\."
+        r"\n"
+        r"\nDetails: .*-floodmodeller_api/dat\.py-\d+"
+        r"\nMsg: Duplicate label (.*) encountered within category: .*"
+        r"\n"
+        r"\nFor additional support, go to: https://github\.com/People-Places-Solutions/floodmodeller-api"
+    )
+    with pytest.raises(FloodModellerAPIError, match=msg):
+        DAT(test_workspace / "duplicate_unit_test.dat")
+    with pytest.raises(FloodModellerAPIError, match=msg):
+        DAT(test_workspace / "duplicate_unit_test_unsupported.dat")

floodmodeller_api/test/test_data/All Units 4_6.DAT

@@ -715,8 +715,6 @@ YARNELL
      4.000     5.000     6.000     5.000
 GERRBDY
 Gerry46
-GERRBDY
-Gerry46
 #COMMENT
 
 ##CATCHMENT DETAILS

floodmodeller_api/test/test_data/All Units 4_6.feb

@@ -715,8 +715,6 @@ YARNELL
      4.000     5.000     6.000     5.000
 GERRBDY
 Gerry46
-GERRBDY
-Gerry46
 #COMMENT
 
 ##CATCHMENT DETAILS

floodmodeller_api/test/test_data/duplicate_unit_test.dat

@@ -0,0 +1,18 @@
+duplicate units for test
+#REVISION#1
+         1     0.750     0.900     0.100     0.001        12
+    10.000     0.010     0.010     0.700     0.100     0.700     0.000
+RAD FILE
+
+END GENERAL
+QTBDY
+qtboundary
+         1     0.000     0.000   seconds    EXTEND    LINEAR     1.000
+    20.000     0.000
+QTBDY
+qtboundary
+         1     0.000     0.000   seconds    EXTEND    LINEAR     1.000
+    20.000     0.000
+GISINFO
+QTBDY 0 478 986 0 0 1
+0 0 0 0 0 0

floodmodeller_api/test/test_data/duplicate_unit_test_unsupported.dat

@@ -0,0 +1,28 @@
+duplicate units for test
+#REVISION#1
+         2     0.750     0.900     0.100     0.001        12
+    10.000     0.010     0.010     0.700     0.100     0.700     0.000
+RAD FILE
+
+END GENERAL
+APITESTDUMMY Dummy unnsupported unit for testing purposes
+LBL001      LBL002
+arbitrary data
+        table01234
+    -0.500     0.000     0.000    0.000091000000.0
+     0.000     1.000     1.000    0.0000 910000000
+     1.000     2.000     2.000    0.000091000000.0
+     2.000     3.000     3.000    0.000091000000.0
+     5.000     3.000     3.000    0.000091000000.0
+APITESTDUMMY Dummy unnsupported unit for testing purposes
+LBL001      LBL002
+arbitrary data
+        table01234
+    -0.500     0.000     0.000    0.000091000000.0
+     0.000     1.000     1.000    0.0000 910000000
+     1.000     2.000     2.000    0.000091000000.0
+     2.000     3.000     3.000    0.000091000000.0
+     5.000     3.000     3.000    0.000091000000.0
+GISINFO
+APITESTDUMMY 0 478 986 0 0 1
+0 0 0 0 0 0

floodmodeller_api/test/test_data/encoding_test_cp1252.dat

@@ -715,8 +715,6 @@ YARNELL
      4.000     5.000     6.000     5.000
 GERRBDY
 Gerry46
-GERRBDY
-Gerry46
 #COMMENT
 
 ##CATCHMENT DETAILS

floodmodeller_api/test/test_data/encoding_test_utf8.dat

@@ -715,8 +715,6 @@ YARNELL
      4.000     5.000     6.000     5.000
 GERRBDY
 Gerry46
-GERRBDY
-Gerry46
 #COMMENT
 
 ##CATCHMENT DETAILS

floodmodeller_api/test/test_data/remove_dummy_test.dat

@@ -0,0 +1,19 @@
+
+#REVISION#1
+         1     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
+APITESTDUMMY Dummy unnsupported unit for testing purposes
+LBL001      LBL002
+arbitrary data
+        table01234
+    -0.500     0.000     0.000    0.000091000000.0
+     0.000     1.000     1.000    0.0000 910000000
+     1.000     2.000     2.000    0.000091000000.0
+     2.000     3.000     3.000    0.000091000000.0
+     5.000     3.000     3.000    0.000091000000.0
+INITIAL CONDITIONS
+ label   ?      flow     stage froude no  velocity     umode    ustate         z
+LBL001       y     0.000     0.000     0.000     0.000     0.000     0.000     0.000

floodmodeller_api/test/test_json.py

@@ -105,6 +105,9 @@ def test_obj_reproduces_from_json_for_all_test_api_files(
 ):
     """JSON:  To test the from_json function,  It should produce the same dat file from a json file"""
     for file in Path(test_workspace).glob(file_extension_glob):
+        if file.name.startswith("duplicate_unit_test"):
+            # Skipping as invalid DAT (duplicate units)
+            continue
         assert api_class(file) == api_class.from_json(api_class(file).to_json())
 
 

floodmodeller_api/test/test_read_file.py

@@ -6,6 +6,9 @@ from floodmodeller_api.util import FloodModellerAPIError
 
 def test_read_file(test_workspace):
     for file in test_workspace.glob("*"):
+        if file.name.startswith("duplicate_unit_test"):
+            # Skipping as invalid DAT (duplicate units)
+            continue
         if (
             file.suffix.lower()
             in [

floodmodeller_api/units/units.py

@@ -89,6 +89,7 @@ UNSUPPORTED_UNIT_TYPES: dict[str, UnsupportedUnitTypes] = {
     "SCWEIR": {"group": "structures", "has_subtype": False},  # sharp crested weir
     "SYPHON": {"group": "structures", "has_subtype": False},  # syphon unit
     "TIDBDY": {"group": "boundaries", "has_subtype": False},  # tidal
+    "APITESTDUMMY": {"group": None, "has_subtype": False},  # Made up for API testing
 }
 
 ALL_UNIT_TYPES = set(SUPPORTED_UNIT_TYPES.keys()).union(UNSUPPORTED_UNIT_TYPES)

floodmodeller_api/version.py

@@ -1 +1 @@
-__version__ = "0.5.3.post1"
+__version__ = "0.5.3.post2"

{floodmodeller_api-0.5.3.post1.dist-info → floodmodeller_api-0.5.3.post2.dist-info}/METADATA

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

{floodmodeller_api-0.5.3.post1.dist-info → floodmodeller_api-0.5.3.post2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 floodmodeller_api/__init__.py,sha256=gPtU8nKJL-XHb19XuMryUpwlYNA3dlHlxl8xy69KPQA,400
 floodmodeller_api/_base.py,sha256=XY5bxyGzppQnY1SSL9qqBK0wCmvC9t3lQnj-jfnRLBU,7971
 floodmodeller_api/backup.py,sha256=Pdqq3VF-aiEuLOGFyoEINLc_vauhUeaNedJTa1cWDLI,11139
-floodmodeller_api/dat.py,sha256=S5bH9vxR-yINMpNeLuH1iUe3s_vKfq69TToID13PWRw,40061
+floodmodeller_api/dat.py,sha256=6RFMs3QX-6zNX7uKdzcw6I6qrTHOFhFysg3itNQG0UE,41949
 floodmodeller_api/diff.py,sha256=y7W5l-03iYdm-YPcwrbHZMdlXFhBe0JEl-WahWL_pi8,5208
 floodmodeller_api/ied.py,sha256=q8FWV2cQso7Tt9m73XGnK_5ZHTfQGW_LLtxwsY2sTus,12313
 floodmodeller_api/ief.py,sha256=u_VYIGkBQwHY7nSXVhT0G6-UkWmlpPLzkzodi9OPrIg,31891
@@ -11,7 +11,7 @@ floodmodeller_api/mapping.py,sha256=eHbGYd7lFptmRvPYi4PxkvbD72w953RUb6KXKeiHTwg,
 floodmodeller_api/to_from_json.py,sha256=qyRKRe4mpdNBo6XgXVrP9dI3oqYY8Px5YcGm690F-jg,7427
 floodmodeller_api/tool.py,sha256=Lpx4LiF_OhCqt8KiXNtOrYx1K0tSwxig2ZJcGU3gbM4,11330
 floodmodeller_api/util.py,sha256=16oY6ia5SJjyjKYIoxa8jMw_sZ828y73NWbpe31ig-w,4590
-floodmodeller_api/version.py,sha256=vAhdketIKWmjUuWZ8PfKJlRx4zq5ctgCLf0t58Wuui0,28
+floodmodeller_api/version.py,sha256=zKeBz8S6Z0KUv148ZHc0BBoYP3-sYyz8NYODGVCk8SQ,28
 floodmodeller_api/xml2d.py,sha256=MvH0oftUAdQRrsvxifXQOFwk0eB3sQOUX3qwU-58W6s,25698
 floodmodeller_api/xml2d_template.py,sha256=lu0tM7-YysYniqAw331bhvulH0Ha5xKsgtIo9KTnyNw,1806
 floodmodeller_api/xsd_backup.xml,sha256=hRZYhpNcucT7TgFPhuINMAEJOkds-lg6n7RH3b2jeq4,28430
@@ -36,7 +36,7 @@ floodmodeller_api/test/__init__.py,sha256=H_reXbKdnzqlFWBdfJIPsgtRIXY7BxM1_p4oOv
 floodmodeller_api/test/conftest.py,sha256=_qZ3fepZ6TM-IbieVDIzHt5R8u-BybUbhGAZgdFKdzA,301
 floodmodeller_api/test/test_backup.py,sha256=_hGjDladK-EXa9uqzMlW7pJMvCldxiYdJn7dtqVQJq4,4221
 floodmodeller_api/test/test_conveyance.py,sha256=Urw85ev6aDMfKKwL4qG0pKSutnlPP9ZlXyag538kqQI,4075
-floodmodeller_api/test/test_dat.py,sha256=3-uQLydWsakqAZ50xIPvQGfDYlXklqp_8RQTb4TDSnE,14661
+floodmodeller_api/test/test_dat.py,sha256=fSJNqyo-CrQBItKQnQZT9Rmm084V49hQr-B7W3H5lIM,17395
 floodmodeller_api/test/test_flowtimeprofile.py,sha256=yB70e_1SEjfbk1mmqtGRWHt8KYs_FgFjHfdUiAGWR0g,4114
 floodmodeller_api/test/test_fmfile.py,sha256=RTe1Rpy1sRK-_QzStrTJe7GNlC0ruURMdkoHZ2kozrY,550
 floodmodeller_api/test/test_hydrology_plus_export.py,sha256=USY-mqqNkmagkd_gfKGGj0ZTASQHQ30LKRBFBKTKKaw,7350
@@ -44,9 +44,9 @@ floodmodeller_api/test/test_ied.py,sha256=VRscnsFPdYEVHNeJpUZW-ftUKvSBl4y_NjjsLX
 floodmodeller_api/test/test_ief.py,sha256=uhcljtMgyW2wAx9T7Ccq37hvQAYVZlTiSVz7kea2cXs,8377
 floodmodeller_api/test/test_inp.py,sha256=2KYo3cgvngZrXblL8Xtqpl2bJS9nCOog3rDtqHem3gg,1493
 floodmodeller_api/test/test_integrated_bridge.py,sha256=m81pA5AQpfVPvG8OX9NlsXD_8Z8MIoa8SIGrdmTMV28,5157
-floodmodeller_api/test/test_json.py,sha256=EMTOAbBnmGuH8AwLV526dxyhvrcDX1icpv7D6e1uXtI,4247
+floodmodeller_api/test/test_json.py,sha256=ndsBPAYh6zIfDluSyOa0YqKzH_qlVFF3N8GViV-RSPc,4380
 floodmodeller_api/test/test_logs_lf.py,sha256=gODj_Ysm_hf-upScPKpCDkuoTZFUgr5-FdB5hM7Y2iw,5290
-floodmodeller_api/test/test_read_file.py,sha256=EcIOf37-1ZGcx5bzUkrAWUkrjrHOoJU-71KqG-UUTwA,778
+floodmodeller_api/test/test_read_file.py,sha256=3gOz7sl1zQUwg6MCBDTFOcZDtldpQbWa0mi51zcFKPQ,911
 floodmodeller_api/test/test_river.py,sha256=hZXATFm2chYr0OlJQgEsa30o__X-hhGSvKYpV7iWlQU,8620
 floodmodeller_api/test/test_sluice.py,sha256=-t_3k2QZahJCTG3U60buUfFpUfA0ANngRABhMb8oM1w,1241
 floodmodeller_api/test/test_tool.py,sha256=izvi9YF4hVqP57uVFkmBMD2wJvd93LeIo7XF-JZ2RZM,4245
@@ -55,8 +55,8 @@ floodmodeller_api/test/test_unit.py,sha256=PNyJDwhlVfT0nMWLrhi8HeeM7dstRPRlzse9f
 floodmodeller_api/test/test_xml2d.py,sha256=pMwNySpxuCkidFimdD-0kQSYGc3jJFdak98nUZGwmqo,5149
 floodmodeller_api/test/test_zz.py,sha256=DVmossrrOI5fnXi8V8KWvzCmgOaZeobxcxT7G7OY53s,4414
 floodmodeller_api/test/test_data/7082.ief,sha256=IfH9Oybu3Mwemt1WLjLF_B3_7gud4O673R4QajvUIuU,748
-floodmodeller_api/test/test_data/All Units 4_6.DAT,sha256=msMjN2BGkekw-fdtZGPE0U4cMwYEZHKoKUNMMFwSY8w,32585
-floodmodeller_api/test/test_data/All Units 4_6.feb,sha256=msMjN2BGkekw-fdtZGPE0U4cMwYEZHKoKUNMMFwSY8w,32585
+floodmodeller_api/test/test_data/All Units 4_6.DAT,sha256=udlIuVTtCJXFAFKZwS3AgPjr0EuVVOa9L3sEjWU6604,32569
+floodmodeller_api/test/test_data/All Units 4_6.feb,sha256=udlIuVTtCJXFAFKZwS3AgPjr0EuVVOa9L3sEjWU6604,32569
 floodmodeller_api/test/test_data/BRIDGE.DAT,sha256=tJZgLmKyzErVpj0rYIQfWBUJHBsGETkMY01CJvEfGJA,31756
 floodmodeller_api/test/test_data/BaseModel_2D_Q100.ief,sha256=BrotqABIiDabs-DmNwlrjD-u-Twud5Sz2wyArzoVq0Q,660
 floodmodeller_api/test/test_data/Baseline_unchecked.csv,sha256=uakQjcVVCbafCOAhPuoT-Zgkf-9HyvJ4GHubB-ZzFjs,9049
@@ -120,8 +120,10 @@ floodmodeller_api/test/test_data/defaultUnits.feb,sha256=GM6Ne-6Ce3tf6BhHJm0XpPA
 floodmodeller_api/test/test_data/defaultUnits.fmpx,sha256=DF9E6x38IlhwMS2ENva62kwM-kerj9FqVZAT5ozNOB0,2392
 floodmodeller_api/test/test_data/defaultUnits.gxy,sha256=H4cuPLiGSXxr4OtgK2-q3oRfssa4BPU730hiJd7K1c8,972
 floodmodeller_api/test/test_data/df_flows_hplus.csv,sha256=1mXiFFjw7aqdd-QsmSH8bKgwCR2hBGxkiyuHyEd97X4,7703
-floodmodeller_api/test/test_data/encoding_test_cp1252.dat,sha256=Rpoei0XM1yU48lkw2an2Gt1Ck9zJ8juR9sbNJVMF7bY,32585
-floodmodeller_api/test/test_data/encoding_test_utf8.dat,sha256=w3pPk1hoP72WKuBpr2GivzVyyzN6pXKyGz4q8W_yHGQ,32586
+floodmodeller_api/test/test_data/duplicate_unit_test.dat,sha256=62fT73-6hiW9biH-hLQF8Q3d7Eed427O-iilVGs2oRQ,450
+floodmodeller_api/test/test_data/duplicate_unit_test_unsupported.dat,sha256=EWEleUjncQJdBkvFklAoliFfICG3hTwdPrZdKmJJ0F4,971
+floodmodeller_api/test/test_data/encoding_test_cp1252.dat,sha256=fwcE38umUj4cR4vCxfnhxhyxzZurfhtK9ZTWPUfvQGI,32569
+floodmodeller_api/test/test_data/encoding_test_utf8.dat,sha256=XPcvlF6hUwGxL0V1bvME5dFZCpxda4jyNCtXPMlnme4,32570
 floodmodeller_api/test/test_data/event_hplus.csv,sha256=C2pDyjnQs0pte2Zh6jft00Y5j6qNWzkSKrHd6Yx7iXY,523
 floodmodeller_api/test/test_data/ex3.ief,sha256=fnNuyiIRry7-onvcTkA_IOJF2VHnCzxzB-IMb5vqXtM,361
 floodmodeller_api/test/test_data/ex3.lf1,sha256=nM6Sh9mw1oo-FVZbqurZu_YSCODlhMGW4mEgXgoSFTg,91578
@@ -170,6 +172,7 @@ floodmodeller_api/test/test_data/network.zzx,sha256=aT1RW2nerZuCOtcvxJ8VJqL-Ly8I
 floodmodeller_api/test/test_data/network_dat_expected.json,sha256=usRioM5sXeMSgwTfNCKYN4jO3E4uQu69zwBtSmqUXvM,623625
 floodmodeller_api/test/test_data/network_ied_expected.json,sha256=6ng9RLh4D2--8oxVZBdlJBec2z1W3ZL3FDTvZFMZ8HA,8409
 floodmodeller_api/test/test_data/network_with_comments.ied,sha256=bIbV_wJ_BDb5Zx2V_w82VtVtmNJYptH9RVF2VTZ7dPE,1003
+floodmodeller_api/test/test_data/remove_dummy_test.dat,sha256=6hZYi7pD_IStMJjhB4XXhwgH0gB8Z__NKIGDjMIjZV8,739
 floodmodeller_api/test/test_data/rnweir.dat,sha256=GM6Ne-6Ce3tf6BhHJm0XpPA6aRtNTCqhckfkO-UI0Sw,269
 floodmodeller_api/test/test_data/rnweir.ext,sha256=QW8XUTJuO9SWT6DCkgUvePXIJb2B9vsD4ppo46yywtk,468
 floodmodeller_api/test/test_data/rnweir.feb,sha256=GM6Ne-6Ce3tf6BhHJm0XpPA6aRtNTCqhckfkO-UI0Sw,269
@@ -233,7 +236,7 @@ floodmodeller_api/units/iic.py,sha256=3fl_90HETaIdVSlJexBKiLtJ473sT4UEusS1k5Dd-W
 floodmodeller_api/units/losses.py,sha256=pl5eNKUmnWjmyH03B0A5YhzgLTn1APuXYgr1VIrSut8,11972
 floodmodeller_api/units/sections.py,sha256=ntunzD9ePp3z2Qw5XKlwJ468EP7eOPC8ZoGEhpRawIM,19795
 floodmodeller_api/units/structures.py,sha256=3KsZs3XX3ztJv_HddONIiEDNdZ0Fp3Pw8kE8RFOuIAg,67375
-floodmodeller_api/units/units.py,sha256=WFWD4kvCJNstHeN553zTdDHc_bFgRyHpIDSAd6zv-10,5309
+floodmodeller_api/units/units.py,sha256=pKofHXAVClcOsoypPx_sAOwXa6B-Geoz3WT0_fWvL5M,5395
 floodmodeller_api/units/unsupported.py,sha256=TtNJjLiJt1dqYmIYxj799TM5HXjN_imR51CkzkK7B9I,1770
 floodmodeller_api/units/variables.py,sha256=g1VCxgJbd5Tv9Njn4B_UBTo1Sa8eBP3j8Efko8p0lgI,3061
 floodmodeller_api/urban1d/__init__.py,sha256=7-_TpJTV8N2SoTEOpHUo0pi87ue8BqBii5FldTc_SjA,192
@@ -250,9 +253,9 @@ floodmodeller_api/validation/__init__.py,sha256=sUMqShUGLnuQjmxKN3wAR7XpDVYsSFn4
 floodmodeller_api/validation/parameters.py,sha256=VG6wlDiA5A5cm3TEhYCJ4dNqzm8Hl1X7CMpohBIdOjQ,16585
 floodmodeller_api/validation/urban_parameters.py,sha256=tD4ORsexmvvVZhDxbRyDlYyEH4uswySxiTIs2JWZwKs,11391
 floodmodeller_api/validation/validation.py,sha256=rwNNmUP2VSfv196Iv6HbGI-PeC_YxTCQM_4stcEB5lk,4665
-floodmodeller_api-0.5.3.post1.dist-info/licenses/LICENSE.txt,sha256=las1guEzggQukja_R_nI5E6jGEYEnpQdJoTZvup2e5E,920
-floodmodeller_api-0.5.3.post1.dist-info/METADATA,sha256=pl4oOBBBx1iWjPPPntrLJU0-YCyiZ_o5Zihs97aseZo,5794
-floodmodeller_api-0.5.3.post1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-floodmodeller_api-0.5.3.post1.dist-info/entry_points.txt,sha256=RQFzb_zf1hNv2uNRfoCD3nRzyzGi8vPvj7VGOhrOjtI,198
-floodmodeller_api-0.5.3.post1.dist-info/top_level.txt,sha256=x10nxct120kv2PpqYA2lhiwrYre3wKyic2wcUyNWWRw,18
-floodmodeller_api-0.5.3.post1.dist-info/RECORD,,
+floodmodeller_api-0.5.3.post2.dist-info/licenses/LICENSE.txt,sha256=las1guEzggQukja_R_nI5E6jGEYEnpQdJoTZvup2e5E,920
+floodmodeller_api-0.5.3.post2.dist-info/METADATA,sha256=fvv-0Y4rDuNinDEr6VVjaNY5n8smA1u6nHKGo3esVvs,5794
+floodmodeller_api-0.5.3.post2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+floodmodeller_api-0.5.3.post2.dist-info/entry_points.txt,sha256=RQFzb_zf1hNv2uNRfoCD3nRzyzGi8vPvj7VGOhrOjtI,198
+floodmodeller_api-0.5.3.post2.dist-info/top_level.txt,sha256=x10nxct120kv2PpqYA2lhiwrYre3wKyic2wcUyNWWRw,18
+floodmodeller_api-0.5.3.post2.dist-info/RECORD,,