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

floodmodeller_api/zzn.py

@@ -24,7 +24,8 @@ import numpy as np
 import pandas as pd
 
 from ._base import FMFile
-from .util import is_windows
+from .to_from_json import to_json
+from .util import handle_exception, is_windows
 
 
 class ZZN(FMFile):
@@ -40,156 +41,151 @@ class ZZN(FMFile):
     _filetype: str = "ZZN"
     _suffix: str = ".zzn"
 
+    @handle_exception(when="read")
     def __init__(  # noqa: PLR0915
         self,
         zzn_filepath: str | Path | None = None,
         from_json: bool = False,
     ):
-        try:
-            if from_json:
-                return
-            FMFile.__init__(self, zzn_filepath)
-
-            # Get zzn_dll path
-            lib = "zzn_read.dll" if is_windows() else "libzzn_read.so"
-            zzn_dll = Path(__file__).resolve().parent / "libs" / lib
-
-            # Catch LD_LIBRARY_PATH error for linux
-            try:
-                zzn_read = ct.CDLL(str(zzn_dll))
-            except OSError as e:
-                msg_1 = "libifport.so.5: cannot open shared object file: No such file or directory"
-                if msg_1 in str(e):
-                    msg_2 = "Set LD_LIBRARY_PATH environment variable to be floodmodeller_api/lib"
-                    raise OSError(msg_2) from e
-                raise
-
-            # Get zzl path
-            zzn = self._filepath
-            zzl = zzn.with_suffix(".zzl")
-            if not zzl.exists():
-                raise FileNotFoundError(
-                    "Error: Could not find associated .ZZL file. Ensure that the zzn results have an associated zzl file with matching name.",
-                )
+        if from_json:
+            return
+        FMFile.__init__(self, zzn_filepath)
 
-            self.meta: dict[str, Any] = {}  # Dict object to hold all metadata
-            self.data = {}  # Dict object to hold all data
-
-            # PROCESS_ZZL
-            self.meta["zzl_name"] = ct.create_string_buffer(bytes(str(zzl), "utf-8"), 255)
-            self.meta["zzn_name"] = ct.create_string_buffer(bytes(str(zzn), "utf-8"), 255)
-            self.meta["model_title"] = ct.create_string_buffer(b"", 128)
-            self.meta["nnodes"] = ct.c_int(0)
-            self.meta["label_length"] = ct.c_int(0)
-            self.meta["dt"] = ct.c_float(0.0)
-            self.meta["timestep0"] = ct.c_int(0)
-            self.meta["ltimestep"] = ct.c_int(0)
-            self.meta["save_int"] = ct.c_float(0.0)
-            self.meta["is_quality"] = ct.c_bool(False)
-            self.meta["nvars"] = ct.c_int(0)
-            self.meta["tzero"] = (ct.c_int * 5)()
-            self.meta["errstat"] = ct.c_int(0)
-            zzn_read.process_zzl(
-                ct.byref(self.meta["zzl_name"]),
-                ct.byref(self.meta["model_title"]),
-                ct.byref(self.meta["nnodes"]),
-                ct.byref(self.meta["label_length"]),
-                ct.byref(self.meta["dt"]),
-                ct.byref(self.meta["timestep0"]),
-                ct.byref(self.meta["ltimestep"]),
-                ct.byref(self.meta["save_int"]),
-                ct.byref(self.meta["is_quality"]),
-                ct.byref(self.meta["nvars"]),
-                ct.byref(self.meta["tzero"]),
-                ct.byref(self.meta["errstat"]),
-            )
-            # PROCESS_LABELS
-            self.meta["labels"] = (
-                ct.c_char * self.meta["label_length"].value * self.meta["nnodes"].value
-            )()
-            zzn_read.process_labels(
-                ct.byref(self.meta["zzl_name"]),
-                ct.byref(self.meta["nnodes"]),
-                ct.byref(self.meta["label_length"]),
-                ct.byref(self.meta["errstat"]),
-            )
-            for i in range(self.meta["nnodes"].value):
-                zzn_read.get_zz_label(
-                    ct.byref(ct.c_int(i + 1)),
-                    ct.byref(self.meta["labels"][i]),
-                    ct.byref(self.meta["errstat"]),
-                )
-            # PREPROCESS_ZZN
-            last_hr = (
-                (self.meta["ltimestep"].value - self.meta["timestep0"].value)
-                * self.meta["dt"].value
-                / 3600
-            )
-            self.meta["output_hrs"] = (ct.c_float * 2)(0.0, last_hr)
-            self.meta["aitimestep"] = (ct.c_int * 2)(
-                self.meta["timestep0"].value,
-                self.meta["ltimestep"].value,
-            )
-            self.meta["isavint"] = (ct.c_int * 2)()
-            zzn_read.preprocess_zzn(
-                ct.byref(self.meta["output_hrs"]),
-                ct.byref(self.meta["aitimestep"]),
-                ct.byref(self.meta["dt"]),
-                ct.byref(self.meta["timestep0"]),
-                ct.byref(self.meta["ltimestep"]),
-                ct.byref(self.meta["save_int"]),
-                ct.byref(self.meta["isavint"]),
-            )
-            # PROCESS_ZZN
-            self.meta["node_ID"] = ct.c_int(-1)
-            self.meta["savint_skip"] = ct.c_int(1)
-            self.meta["savint_range"] = ct.c_int(
-                int(
-                    (self.meta["isavint"][1] - self.meta["isavint"][0])
-                    / self.meta["savint_skip"].value,
-                ),
+        # Get zzn_dll path
+        lib = "zzn_read.dll" if is_windows() else "libzzn_read.so"
+        zzn_dll = Path(__file__).resolve().parent / "libs" / lib
+
+        # Catch LD_LIBRARY_PATH error for linux
+        try:
+            zzn_read = ct.CDLL(str(zzn_dll))
+        except OSError as e:
+            msg_1 = "libifport.so.5: cannot open shared object file: No such file or directory"
+            if msg_1 in str(e):
+                msg_2 = "Set LD_LIBRARY_PATH environment variable to be floodmodeller_api/lib"
+                raise OSError(msg_2) from e
+            raise
+
+        # Get zzl path
+        zzn = self._filepath
+        zzl = zzn.with_suffix(".zzl")
+        if not zzl.exists():
+            raise FileNotFoundError(
+                "Error: Could not find associated .ZZL file. Ensure that the zzn results have an associated zzl file with matching name.",
             )
-            nx = self.meta["nnodes"].value
-            ny = self.meta["nvars"].value
-            nz = self.meta["savint_range"].value + 1
-            self.data["all_results"] = (ct.c_float * nx * ny * nz)()
-            self.data["max_results"] = (ct.c_float * nx * ny)()
-            self.data["min_results"] = (ct.c_float * nx * ny)()
-            self.data["max_times"] = (ct.c_int * nx * ny)()
-            self.data["min_times"] = (ct.c_int * nx * ny)()
-            zzn_read.process_zzn(
-                ct.byref(self.meta["zzn_name"]),
-                ct.byref(self.meta["node_ID"]),
-                ct.byref(self.meta["nnodes"]),
-                ct.byref(self.meta["is_quality"]),
-                ct.byref(self.meta["nvars"]),
-                ct.byref(self.meta["savint_range"]),
-                ct.byref(self.meta["savint_skip"]),
-                ct.byref(self.data["all_results"]),
-                ct.byref(self.data["max_results"]),
-                ct.byref(self.data["min_results"]),
-                ct.byref(self.data["max_times"]),
-                ct.byref(self.data["min_times"]),
+
+        self.meta: dict[str, Any] = {}  # Dict object to hold all metadata
+        self.data = {}  # Dict object to hold all data
+
+        # PROCESS_ZZL
+        self.meta["zzl_name"] = ct.create_string_buffer(bytes(str(zzl), "utf-8"), 255)
+        self.meta["zzn_name"] = ct.create_string_buffer(bytes(str(zzn), "utf-8"), 255)
+        self.meta["model_title"] = ct.create_string_buffer(b"", 128)
+        self.meta["nnodes"] = ct.c_int(0)
+        self.meta["label_length"] = ct.c_int(0)
+        self.meta["dt"] = ct.c_float(0.0)
+        self.meta["timestep0"] = ct.c_int(0)
+        self.meta["ltimestep"] = ct.c_int(0)
+        self.meta["save_int"] = ct.c_float(0.0)
+        self.meta["is_quality"] = ct.c_bool(False)
+        self.meta["nvars"] = ct.c_int(0)
+        self.meta["tzero"] = (ct.c_int * 5)()
+        self.meta["errstat"] = ct.c_int(0)
+        zzn_read.process_zzl(
+            ct.byref(self.meta["zzl_name"]),
+            ct.byref(self.meta["model_title"]),
+            ct.byref(self.meta["nnodes"]),
+            ct.byref(self.meta["label_length"]),
+            ct.byref(self.meta["dt"]),
+            ct.byref(self.meta["timestep0"]),
+            ct.byref(self.meta["ltimestep"]),
+            ct.byref(self.meta["save_int"]),
+            ct.byref(self.meta["is_quality"]),
+            ct.byref(self.meta["nvars"]),
+            ct.byref(self.meta["tzero"]),
+            ct.byref(self.meta["errstat"]),
+        )
+        # PROCESS_LABELS
+        self.meta["labels"] = (
+            ct.c_char * self.meta["label_length"].value * self.meta["nnodes"].value
+        )()
+        zzn_read.process_labels(
+            ct.byref(self.meta["zzl_name"]),
+            ct.byref(self.meta["nnodes"]),
+            ct.byref(self.meta["label_length"]),
+            ct.byref(self.meta["errstat"]),
+        )
+        for i in range(self.meta["nnodes"].value):
+            zzn_read.get_zz_label(
+                ct.byref(ct.c_int(i + 1)),
+                ct.byref(self.meta["labels"][i]),
                 ct.byref(self.meta["errstat"]),
-                ct.byref(self.meta["isavint"]),
             )
+        # PREPROCESS_ZZN
+        last_hr = (
+            (self.meta["ltimestep"].value - self.meta["timestep0"].value)
+            * self.meta["dt"].value
+            / 3600
+        )
+        self.meta["output_hrs"] = (ct.c_float * 2)(0.0, last_hr)
+        self.meta["aitimestep"] = (ct.c_int * 2)(
+            self.meta["timestep0"].value,
+            self.meta["ltimestep"].value,
+        )
+        self.meta["isavint"] = (ct.c_int * 2)()
+        zzn_read.preprocess_zzn(
+            ct.byref(self.meta["output_hrs"]),
+            ct.byref(self.meta["aitimestep"]),
+            ct.byref(self.meta["dt"]),
+            ct.byref(self.meta["timestep0"]),
+            ct.byref(self.meta["ltimestep"]),
+            ct.byref(self.meta["save_int"]),
+            ct.byref(self.meta["isavint"]),
+        )
+        # PROCESS_ZZN
+        self.meta["node_ID"] = ct.c_int(-1)
+        self.meta["savint_skip"] = ct.c_int(1)
+        self.meta["savint_range"] = ct.c_int(
+            int(
+                (self.meta["isavint"][1] - self.meta["isavint"][0])
+                / self.meta["savint_skip"].value,
+            ),
+        )
+        nx = self.meta["nnodes"].value
+        ny = self.meta["nvars"].value
+        nz = self.meta["savint_range"].value + 1
+        self.data["all_results"] = (ct.c_float * nx * ny * nz)()
+        self.data["max_results"] = (ct.c_float * nx * ny)()
+        self.data["min_results"] = (ct.c_float * nx * ny)()
+        self.data["max_times"] = (ct.c_int * nx * ny)()
+        self.data["min_times"] = (ct.c_int * nx * ny)()
+        zzn_read.process_zzn(
+            ct.byref(self.meta["zzn_name"]),
+            ct.byref(self.meta["node_ID"]),
+            ct.byref(self.meta["nnodes"]),
+            ct.byref(self.meta["is_quality"]),
+            ct.byref(self.meta["nvars"]),
+            ct.byref(self.meta["savint_range"]),
+            ct.byref(self.meta["savint_skip"]),
+            ct.byref(self.data["all_results"]),
+            ct.byref(self.data["max_results"]),
+            ct.byref(self.data["min_results"]),
+            ct.byref(self.data["max_times"]),
+            ct.byref(self.data["min_times"]),
+            ct.byref(self.meta["errstat"]),
+            ct.byref(self.meta["isavint"]),
+        )
 
-            # Convert useful metadata from C types into python types
-
-            self.meta["dt"] = self.meta["dt"].value
-            self.meta["nnodes"] = self.meta["nnodes"].value
-            self.meta["save_int"] = self.meta["save_int"].value
-            self.meta["nvars"] = self.meta["nvars"].value
-            self.meta["savint_range"] = self.meta["savint_range"].value
+        # Convert useful metadata from C types into python types
 
-            self.meta["zzn_name"] = self.meta["zzn_name"].value.decode()
-            self.meta["labels"] = [
-                label.value.decode().strip() for label in list(self.meta["labels"])
-            ]
-            self.meta["model_title"] = self.meta["model_title"].value.decode()
+        self.meta["dt"] = self.meta["dt"].value
+        self.meta["nnodes"] = self.meta["nnodes"].value
+        self.meta["save_int"] = self.meta["save_int"].value
+        self.meta["nvars"] = self.meta["nvars"].value
+        self.meta["savint_range"] = self.meta["savint_range"].value
 
-        except Exception as e:
-            self._handle_exception(e, when="read")
+        self.meta["zzn_name"] = self.meta["zzn_name"].value.decode()
+        self.meta["labels"] = [label.value.decode().strip() for label in list(self.meta["labels"])]
+        self.meta["model_title"] = self.meta["model_title"].value.decode()
 
     def to_dataframe(  # noqa: PLR0911
         self,
@@ -385,3 +381,34 @@ class ZZN(FMFile):
                 if var not in input_vars:
                     del output[var]
         return output
+
+    def to_json(
+        self,
+        result_type: str = "all",
+        variable: str = "all",
+        include_time: bool = False,
+        multilevel_header: bool = True,
+    ) -> str:
+        """Loads zzn results to JSON object.
+
+        Args:
+            result_type (str, optional): {'all'} | 'max' | 'min'
+                Define whether to return all timesteps or just max/min results. Defaults to 'all'.
+            variable (str, optional): {'all'} | 'Flow' | 'Stage' | 'Froude' | 'Velocity' | 'Mode' | 'State'
+                Specify a single output variable (e.g 'flow' or 'stage'). Defaults to 'all'.
+            include_time (bool, optional):
+                Whether to include the time of max or min results. Defaults to False.
+            multilevel_header (bool, optional): If True, the returned dataframe will have multi-level column
+                headers with the variable as first level and node label as second header. If False, the column
+                names will be formatted "{node label}_{variable}". Defaults to True.
+
+        Returns:
+            str: A JSON string representing the ZZN results.
+        """
+        df = self.to_dataframe(result_type, variable, include_time, multilevel_header)
+        return to_json(df)
+
+    @classmethod
+    def from_json(cls, json_string: str = ""):
+        # Not possible
+        raise NotImplementedError("It is not possible to build a ZZN class instance from JSON")

{floodmodeller_api-0.4.3.dist-info → floodmodeller_api-0.4.4.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: floodmodeller_api
-Version: 0.4.3
+Version: 0.4.4.post1
 Summary: Extends the functionality of Flood Modeller to python users
 Author: Jacobs
 Author-email: joe.pierce@jacobs.com
@@ -15,6 +15,9 @@ Requires-Dist: lxml ==5.*
 Requires-Dist: tqdm ==4.*
 Requires-Dist: pytest <8,>4
 Requires-Dist: pytest-mock ==3.*
+Requires-Dist: shapely ==2.*
+Requires-Dist: scipy ==1.*
+Requires-Dist: freezegun ==1.*
 
 ![FM Logo](https://raw.githubusercontent.com/People-Places-Solutions/floodmodeller-api/main/docs/source/_static/flood-modeller-logo-hero-image.png)
 

{floodmodeller_api-0.4.3.dist-info → floodmodeller_api-0.4.4.post1.dist-info}/RECORD

@@ -1,20 +1,20 @@
 floodmodeller_api/__init__.py,sha256=VOWWU7wv1Ds2v9I5ZyHX24faD46zjZ6lUx4VfVx4c7w,190
-floodmodeller_api/_base.py,sha256=Zz2bJYPzyNlvhWMLrpD0_jMaGYuq6UyTvtZUh1hEx1U,7748
+floodmodeller_api/_base.py,sha256=r1TlppIIY0EV1fRBwZtrAztygAIG6qFq0OROybjwe-o,7101
 floodmodeller_api/backup.py,sha256=PqxPhtM3HYyKmRE7Gks1hlkPsGoc-a58VD2jXTtPis0,11444
-floodmodeller_api/dat.py,sha256=CvBSjnSg5_IER5cWb2yb7C5aUtY7mqjHZzw-ORhvm_A,37223
+floodmodeller_api/dat.py,sha256=XPF-yiyKXUIDfCEfUy-XOj17JW7GtWbEON0x2Ws2Lis,36255
 floodmodeller_api/diff.py,sha256=AjNEqS1SNWGIdheKKsbcqVfXmR-m1UeGdasp7TR-yhM,5183
-floodmodeller_api/ied.py,sha256=OUEBP_BHhw8ALNARGfh9em-12LgTlbcOUnVvfxLz_Jc,13489
-floodmodeller_api/ief.py,sha256=hGEkkVdoKD-NIczZyA5A6AmipabuAbBOdH22pNGwbdg,26136
+floodmodeller_api/ied.py,sha256=Uhjey-FuLLFZq8L3_x9sqPUYKGmduL3-doWLQRHXBRU,13112
+floodmodeller_api/ief.py,sha256=15_sviEJ_Y6wenLTfwOY8bnRRFiRWXKUEzg7i6suZVo,23109
 floodmodeller_api/ief_flags.py,sha256=CIH8zNcyTDu_MG6N6n7OBDkjawI5eJSHBPvIpJtAEp4,11305
-floodmodeller_api/inp.py,sha256=ZyDE-CPBsEyMHKQSkgQsJ5rtCbpynIRVcfxfsoS90dc,11529
+floodmodeller_api/inp.py,sha256=iUoymM-Y_2KYa7ZOloocj-TzpaN0-Ng35GoEchLpGUE,11179
 floodmodeller_api/mapping.py,sha256=tcCCajcqkhXt9-MFawkfkQJ-s5xtLl_Ap2jA4pBHRTg,3309
-floodmodeller_api/to_from_json.py,sha256=NBBHkGwoeGOWz-I3bW-LecbLMHaOT-qohWf6Ffr_8FY,6882
+floodmodeller_api/to_from_json.py,sha256=AjWJnzlLOQCuWZGQLThNCizepb5ay-P71qtJAiSBI0U,7209
 floodmodeller_api/tool.py,sha256=jxAWFAivWJE0mzHw9FwH9wSgn_Zuo01eJ97951LSgAU,11377
-floodmodeller_api/util.py,sha256=tndEG4UqbM0f-7eqUTZ4sgd0Fi24OxBS61kQmRw82Uo,2485
-floodmodeller_api/version.py,sha256=Nyg0pmk5ea9-SLCAFEIF96ByFx4-TJFtrqYPN-Zn6g4,22
-floodmodeller_api/xml2d.py,sha256=vqVmNLLXn-FMNtXc_mTzZv4dr6tjgYBUeY80CZrQFpg,27689
+floodmodeller_api/util.py,sha256=s93Wxg3F43mpm3gq3_UBbgqiZ4T0HTW2osqNG6kuIJE,3905
+floodmodeller_api/version.py,sha256=4ZEzfisb7CBE8mZJHsVVkqSmecAalLdtwfQHDTnpWTw,28
+floodmodeller_api/xml2d.py,sha256=YOapObFoF-UrhsOlu35GcJ_EmdAS9S-n8OxJaXRI44w,25548
 floodmodeller_api/xml2d_template.py,sha256=iaPdZHN6pEHf-QDSDwfUeDhd9QyuQPY_NUz7cvZLs7g,1806
-floodmodeller_api/zzn.py,sha256=H_Jy9TOv8nGAKn5Odqvk5ptqNEm2eaNgSDBFXBVCc3Y,16546
+floodmodeller_api/zzn.py,sha256=d9N8-HMBFV7zdv7W_GgitSz2K-vyOXfWdE0SRP3gk8Y,17418
 floodmodeller_api/libs/libifcoremd.dll,sha256=kef4LcAB6uORn3tjPwlLngTMQRcJ5gbY2P_U7r29lho,1341056
 floodmodeller_api/libs/libifcoremt.so.5,sha256=vKK1nJ9OLlS6qshCh8uoOGdmJdXR1bsxVwJF8BruX-A,1259936
 floodmodeller_api/libs/libifport.so.5,sha256=ZvM9s0pRqv0KPwTBpUG1YlDHn2DaZ8Hyr2sqdhrEaD8,176840
@@ -24,19 +24,20 @@ floodmodeller_api/libs/libmmd.dll,sha256=Qn7wGNSUv2y4Uxqzu8tQHtTIx8ZHkJezOrTRV1D
 floodmodeller_api/libs/libsvml.so,sha256=tWR5ky0SlmJgWS8IGpRhtsD29pO-AU91hyUg866m9Ts,26483632
 floodmodeller_api/libs/libzzn_read.so,sha256=hXX6heYoSDrn-2HmBQW8XNhO2wegq_Nrn_EjHjaN154,38696
 floodmodeller_api/libs/zzn_read.dll,sha256=XWNCUM7bm1exlOYfJd3tx7x6o-hy0x7hOEI34zT9R5E,84992
-floodmodeller_api/logs/__init__.py,sha256=tjyzpPvEyc55M_j640mUhRKKVAKg1o48u2OEhnp28Qg,74
-floodmodeller_api/logs/lf.py,sha256=61kQuvUlSixp-8pwTTgHPnmMfKbE12lhJAOXhEKvfFo,10902
+floodmodeller_api/logs/__init__.py,sha256=nKqaEXuZ7ejfxlxb1-eINb-YiHon4eJjwiz_76aF4wQ,73
+floodmodeller_api/logs/lf.py,sha256=GNKPAYDvXkDcKZIIFwaktRl-YGAZNyYPG-zeLLoBXnc,12203
 floodmodeller_api/logs/lf_helpers.py,sha256=wyw9Vdd-n3Nf9VMOmwr22iQbkQ-Jm4op5lXRZIEFeS8,10227
 floodmodeller_api/logs/lf_params.py,sha256=gLogRIqxT-Q-9oAjlf2XPCsgWwnnS716pbxpGTJ6KP8,18858
 floodmodeller_api/test/__init__.py,sha256=YolvBwdsReqIBbcB2t-WfXSNhvcVIWbSH3qr5PX5lJw,85
-floodmodeller_api/test/conftest.py,sha256=BqaxNpfG-yTUWGc61ipsIz8krKhAT_6eZW0XiLwM1dQ,163
+floodmodeller_api/test/conftest.py,sha256=Ko5tTc2jjIY2sijvJsNiGzhQKC1iaL0SCxdfWQGy8jM,312
 floodmodeller_api/test/test_backup.py,sha256=OVxRdiXdfgpHEnzN52PDoHFwCNlB-PLgUbUQzvjoA54,4217
-floodmodeller_api/test/test_dat.py,sha256=9nJP5f7SOHaefQS3bbn95rfrtrgoVF0xR4kzJhbfOOM,8478
+floodmodeller_api/test/test_conveyance.py,sha256=eznbDlg40MHb5jrz2Om9nZF35wu9Zg1h-qqynOuBeSs,4104
+floodmodeller_api/test/test_dat.py,sha256=eeEndHNC8JnOtF80XKCjpiCNH7ohIlpP0ySWte4a1ws,8569
 floodmodeller_api/test/test_ied.py,sha256=J4yvZLqBLNdOVyj_eXQ6raEXENe1FLkSth_-qvvH-oA,799
-floodmodeller_api/test/test_ief.py,sha256=YzsqeWESSaB37Al9yEqdrFS-vOTChQjjCEgYF_bKwO8,4189
+floodmodeller_api/test/test_ief.py,sha256=Pb8QPuJiMWA9JV-mJ8rHK4Ce0ZP05--xSPF-9aoNu7Y,4346
 floodmodeller_api/test/test_inp.py,sha256=k6Unz41_CjcUEzRtg_KiQ4G2o3tA5iEK8Zx64Nfxwpk,1489
 floodmodeller_api/test/test_json.py,sha256=fuUDB0jFIRCBvtFtqKhjU-fW6nKv9oARd-9HV2bhvvc,4007
-floodmodeller_api/test/test_logs_lf.py,sha256=qQE-FYYlASPUYXo4dvK5KVLGObzD8A0ltFk-UW6kQFg,1267
+floodmodeller_api/test/test_logs_lf.py,sha256=bLsvSTy3e_NcE0338DdfyDEFn6CfQXfbmPQElMpfakw,2890
 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
@@ -88,6 +89,9 @@ floodmodeller_api/test/test_data/blockage.dat,sha256=Cg3QTAtNHqYLiJjbUbNNW7lBgiM
 floodmodeller_api/test/test_data/blockage.ext,sha256=vW4KJCP1YBKQrJM50XGDq7HG84bIqwc5_d-fxf2FSGU,493
 floodmodeller_api/test/test_data/blockage.feb,sha256=GM6Ne-6Ce3tf6BhHJm0XpPA6aRtNTCqhckfkO-UI0Sw,269
 floodmodeller_api/test/test_data/blockage.gxy,sha256=cDaJzM8izySup9mGskJGSX0GcSUHuz8bKWAKB-iPip8,850
+floodmodeller_api/test/test_data/conveyance_test.dat,sha256=-g5baIH8zjksWLChQCOwSdnSQ3YVwhGIkaXXmppWh5E,8482
+floodmodeller_api/test/test_data/conveyance_test.feb,sha256=5MJpWCyN5UQ3GniAa1vAInG4471M3s5fPo_kDakrGgA,6153
+floodmodeller_api/test/test_data/conveyance_test.gxy,sha256=_1CrYOCEakLdQWy58LJmOspsWBKtKboP2lZzf2YsrHA,920
 floodmodeller_api/test/test_data/defaultUnits.dat,sha256=obTJrSPVxiItf5zOO1ERuX-RVwyGgIKpDO4Z18Clk_o,6480
 floodmodeller_api/test/test_data/defaultUnits.ext,sha256=fqPWbW1l4WLuoVjwYIHW4xyLLT-kmY2bnuETIp3JNCI,491
 floodmodeller_api/test/test_data/defaultUnits.feb,sha256=GM6Ne-6Ce3tf6BhHJm0XpPA6aRtNTCqhckfkO-UI0Sw,269
@@ -103,6 +107,7 @@ floodmodeller_api/test/test_data/example3.inp,sha256=TuW5aJGW9wYQsFa52qn4NsCLKx5
 floodmodeller_api/test/test_data/example4.inp,sha256=Ibg0WJz7cxGiAy4F-vjFOreRAnvgveQyXbhY4DaXCWo,19091
 floodmodeller_api/test/test_data/example5.inp,sha256=QFvmwBbYbELBExe-n-QoGzOreElhk7EpyTv6adJpDks,5486
 floodmodeller_api/test/test_data/example6.inp,sha256=dSLr6vCG-a5bFxWIPGKGWysn638mO6LdjDBqi4bFATQ,6274
+floodmodeller_api/test/test_data/expected_conveyance.csv,sha256=JzUbMw0EbM6uelMUbly8S5uUl3V_XvWEwZAKIz2z_94,7302
 floodmodeller_api/test/test_data/jump.dat,sha256=MnTs3xHJkZNPkNs0a7G-rSz5r51hmYNnREwyocVuohY,4737
 floodmodeller_api/test/test_data/network.dat,sha256=vULB-pUNwRWTfzDEQSaVgkp5FWnyrgCC3PORbgVwu0A,82923
 floodmodeller_api/test/test_data/network.ext,sha256=7z7-mNqWkJETpMASav3BRGq_3DqJd9l5Mnv7DqGtECk,493
@@ -146,13 +151,14 @@ floodmodeller_api/toolbox/model_review/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 floodmodeller_api/toolbox/results_analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 floodmodeller_api/units/__init__.py,sha256=WraRzDUiHxXY8wOcHYh5oqDx9IhOc-E4OVdHHZWbBko,471
 floodmodeller_api/units/_base.py,sha256=Zxug0OgdZ5Hu3Qoj_ukR75GLotFGNtHnfbil2kCvBhE,8441
-floodmodeller_api/units/boundaries.py,sha256=HH0HT1-3u1eIzVJv3-IK-qkI01EPoSxVzfW1FuoiqF4,19550
+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=IQIvNTK8Y9ujvuwZTwKOf28gJFpcKmU4uC2aHjOHHVM,10828
 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=k6w5v35p5aqH-GmJHf_ZwOoKdhfN099ULBg2cdgSGM4,15255
+floodmodeller_api/units/sections.py,sha256=nTsCvitcKLTnH-YZ6kQbWJ1kzfYIFa1j4sv5B075gAE,16142
 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
@@ -171,9 +177,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.4.3.dist-info/LICENSE.txt,sha256=tH7I97hBX5QUpGGDbkiWdqJuWgMsBZDA8zEd_029-cM,920
-floodmodeller_api-0.4.3.dist-info/METADATA,sha256=oPZTwgcZ9wbRBguqeIp3VelDC561Syq7rcGbWXhiNiE,4863
-floodmodeller_api-0.4.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-floodmodeller_api-0.4.3.dist-info/entry_points.txt,sha256=RQFzb_zf1hNv2uNRfoCD3nRzyzGi8vPvj7VGOhrOjtI,198
-floodmodeller_api-0.4.3.dist-info/top_level.txt,sha256=x10nxct120kv2PpqYA2lhiwrYre3wKyic2wcUyNWWRw,18
-floodmodeller_api-0.4.3.dist-info/RECORD,,
+floodmodeller_api-0.4.4.post1.dist-info/LICENSE.txt,sha256=tH7I97hBX5QUpGGDbkiWdqJuWgMsBZDA8zEd_029-cM,920
+floodmodeller_api-0.4.4.post1.dist-info/METADATA,sha256=2430GH87InVB-FCBKztPcxw1QCBRBUlDgNL9ayFlA2k,4956
+floodmodeller_api-0.4.4.post1.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+floodmodeller_api-0.4.4.post1.dist-info/entry_points.txt,sha256=RQFzb_zf1hNv2uNRfoCD3nRzyzGi8vPvj7VGOhrOjtI,198
+floodmodeller_api-0.4.4.post1.dist-info/top_level.txt,sha256=x10nxct120kv2PpqYA2lhiwrYre3wKyic2wcUyNWWRw,18
+floodmodeller_api-0.4.4.post1.dist-info/RECORD,,

{floodmodeller_api-0.4.3.dist-info → floodmodeller_api-0.4.4.post1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any