rashdf 0.7.1__py3-none-any.whl → 0.8.0__py3-none-any.whl

cli.py

@@ -21,6 +21,7 @@ COMMANDS = [
     "mesh_cell_faces",
     "refinement_regions",
     "bc_lines",
+    "ic_points",
     "breaklines",
     "reference_lines",
     "reference_points",

rashdf/geom.py

@@ -41,6 +41,7 @@ class RasGeomHdf(RasHdf):
     GEOM_STRUCTURES_PATH = f"{GEOM_PATH}/Structures"
     FLOW_AREA_2D_PATH = f"{GEOM_PATH}/2D Flow Areas"
     BC_LINES_PATH = f"{GEOM_PATH}/Boundary Condition Lines"
+    IC_POINTS_PATH = f"{GEOM_PATH}/IC Points"
     BREAKLINES_PATH = f"{GEOM_PATH}/2D Flow Area Break Lines"
     REFERENCE_LINES_PATH = f"{GEOM_PATH}/Reference Lines"
     REFERENCE_POINTS_PATH = f"{GEOM_PATH}/Reference Points"
@@ -408,7 +409,10 @@ class RasGeomHdf(RasHdf):
         GeoDataFrame
             A GeoDataFrame containing the model structures if they exist.
         """
-        if self.GEOM_STRUCTURES_PATH not in self:
+        if (
+            self.GEOM_STRUCTURES_PATH not in self
+            or f"{self.GEOM_STRUCTURES_PATH}/Attributes" not in self
+        ):
             return GeoDataFrame()
         struct_data = self[self.GEOM_STRUCTURES_PATH]
         v_conv_val = np.vectorize(convert_ras_hdf_value)
@@ -438,7 +442,32 @@ class RasGeomHdf(RasHdf):
         raise NotImplementedError
 
     def ic_points(self) -> GeoDataFrame:  # noqa D102
-        raise NotImplementedError
+        """Return initial conditions points.
+
+        Returns
+        -------
+        GeoDataFrame
+            A GeoDataFrame containing the initial condition points if they exist.
+        """
+        if self.IC_POINTS_PATH not in self:
+            return GeoDataFrame()
+        ic_data = self[self.IC_POINTS_PATH]
+        v_conv_str = np.vectorize(convert_ras_hdf_string)
+        names = v_conv_str(ic_data["Attributes"][()]["Name"])
+        mesh_names = v_conv_str(ic_data["Attributes"][()]["SA/2D"])
+        cell_ids = ic_data["Attributes"][()]["Cell Index"]
+        points = ic_data["Points"][()]
+        return GeoDataFrame(
+            {
+                "icpt_id": range(len(names)),
+                "icpt_name": names,
+                "mesh_name": mesh_names,
+                "cell_id": cell_ids,
+                "geometry": list(map(Point, points)),
+            },
+            geometry="geometry",
+            crs=self.projection(),
+        )
 
     def _reference_lines_points_names(
         self, reftype: str = "lines", mesh_name: Optional[str] = None

rashdf/plan.py

@@ -160,7 +160,7 @@ class RasPlanHdf(RasGeomHdf):
     OBS_DATA_PATH = "Event Conditions/Observed Data"
     RESULTS_UNSTEADY_PATH = "Results/Unsteady"
     RESULTS_UNSTEADY_SUMMARY_PATH = f"{RESULTS_UNSTEADY_PATH}/Summary"
-    VOLUME_ACCOUNTING_PATH = f"{RESULTS_UNSTEADY_PATH}/Volume Accounting"
+    VOLUME_ACCOUNTING_PATH = f"{RESULTS_UNSTEADY_SUMMARY_PATH}/Volume Accounting"
     BASE_OUTPUT_PATH = f"{RESULTS_UNSTEADY_PATH}/Output/Output Blocks/Base Output"
     SUMMARY_OUTPUT_2D_FLOW_AREAS_PATH = (
         f"{BASE_OUTPUT_PATH}/Summary Output/2D Flow Areas"
@@ -168,6 +168,7 @@ class RasPlanHdf(RasGeomHdf):
     UNSTEADY_TIME_SERIES_PATH = f"{BASE_OUTPUT_PATH}/Unsteady Time Series"
     REFERENCE_LINES_OUTPUT_PATH = f"{UNSTEADY_TIME_SERIES_PATH}/Reference Lines"
     REFERENCE_POINTS_OUTPUT_PATH = f"{UNSTEADY_TIME_SERIES_PATH}/Reference Points"
+    BOUNDARY_CONDITIONS_OUTPUT_PATH = f"{UNSTEADY_TIME_SERIES_PATH}/Boundary Conditions"
     OBS_FLOW_OUTPUT_PATH = f"{OBS_DATA_PATH}/Flow"
     OBS_STAGE_OUTPUT_PATH = f"{OBS_DATA_PATH}/Stage"
 
@@ -1121,6 +1122,81 @@ class RasPlanHdf(RasGeomHdf):
         """
         return self.reference_timeseries_output(reftype="lines")
 
+    def bc_line_timeseries_output(self, bc_line_name: str) -> xr.Dataset:
+        """Return timeseries output data for a specific boundary condition line from a HEC-RAS HDF plan file.
+
+        Parameters
+        ----------
+        bc_line_name : str
+            The name of the boundary condition line.
+
+        Returns
+        -------
+        xr.Dataset
+            An xarray Dataset with timeseries output data for the specified boundary condition line.
+        """
+        path = f"{self.BOUNDARY_CONDITIONS_OUTPUT_PATH}/{bc_line_name}"
+        dataset = self.get(path)
+        if dataset is None:
+            raise RasPlanHdfError(
+                f"Could not find HDF group at path '{path}'."
+                f" Does the Plan HDF file contain boundary condition output data for '{bc_line_name}'?"
+            )
+        columns = [c.decode("utf-8") for c in dataset.attrs["Columns"]]
+        ds = xr.Dataset()
+        try:
+            import dask.array as da
+
+            # TODO: user-specified chunks?
+            values = da.from_array(dataset, chunks=dataset.chunks)
+        except ImportError:
+            values = dataset[:]
+        for i, col in enumerate(columns):
+            units = dataset.attrs.get(col, None)
+            if units is not None:
+                units = units.decode("utf-8")
+            da = xr.DataArray(
+                values[:, i],
+                name=col,
+                dims=["time"],
+                coords={
+                    "time": self.unsteady_datetimes(),
+                },
+                attrs={
+                    "units": units,
+                    "hdf_path": f"{path}",
+                },
+            )
+            ds[col] = da
+        return ds
+
+    def bc_lines_timeseries_output(self) -> xr.Dataset:
+        """Return timeseries output data for boundary conditions lines from a HEC-RAS HDF plan file.
+
+        Returns
+        -------
+        xr.Dataset
+            An xarray Dataset with timeseries output data for boundary conditions lines.
+        """
+        df_bc_lines = self.bc_lines()
+        bc_lines_names = df_bc_lines["name"]
+        datasets = []
+        for bc_line_name in bc_lines_names:
+            ds_bc_line = self.bc_line_timeseries_output(bc_line_name)
+            datasets.append(ds_bc_line)
+        bc_line_ids = df_bc_lines["bc_line_id"].values
+        ds: xr.Dataset = xr.concat(
+            datasets, dim=pd.Index(bc_line_ids, name="bc_line_id")
+        )
+        ds = ds.assign_coords(
+            {
+                "bc_line_name": ("bc_line_id", bc_lines_names),
+                "bc_line_type": ("bc_line_id", df_bc_lines["type"]),
+                "mesh_name": ("bc_line_id", df_bc_lines["mesh_name"]),
+            }
+        )
+        return ds
+
     def observed_timeseries_input(self, vartype: str = "Flow") -> xr.DataArray:
         """Return observed timeseries input data for reference lines and points from a HEC-RAS HDF plan file.
 
@@ -1381,10 +1457,49 @@ class RasPlanHdf(RasGeomHdf):
         """
         return self.get_attrs(self.VOLUME_ACCOUNTING_PATH)
 
-    def enroachment_points(self) -> GeoDataFrame:  # noqa: D102
-        raise NotImplementedError
+    def encroachment_points(self, profile_name: str) -> GeoDataFrame:
+        """Return encroachment points from a HEC-RAS plan HDF file based on a user-specified flow profile.
+
+        Returns
+        -------
+        GeoDataframe
+            A GeoDataFrame with cross-section encroachments represented as Point geometry features along with pertinent attributes.
+        """
+        cross_sections = self.cross_sections()
+        cross_sections["Enc_Profile"] = profile_name
+
+        leftmost_sta = self.cross_sections_elevations()["elevation info"].apply(
+            lambda x: x[0][0]
+        )
+        left_enc_sta = self.cross_sections_additional_enc_station_left()[profile_name]
+        left_enc_points = GeoDataFrame(
+            pd.concat(
+                [
+                    cross_sections[["River", "Reach", "RS", "Enc_Profile"]],
+                    left_enc_sta.rename("Enc_Sta", inplace=False),
+                ],
+                axis=1,
+            ),
+            geometry=cross_sections.geometry.interpolate(left_enc_sta - leftmost_sta),
+        )
+        left_enc_points["Side"] = "Left"
+
+        right_enc_sta = self.cross_sections_additional_enc_station_right()[profile_name]
+        right_enc_points = GeoDataFrame(
+            pd.concat(
+                [
+                    cross_sections[["River", "Reach", "RS", "Enc_Profile"]],
+                    right_enc_sta.rename("Enc_Sta", inplace=False),
+                ],
+                axis=1,
+            ),
+            geometry=cross_sections.geometry.interpolate(right_enc_sta - leftmost_sta),
+        )
+        right_enc_points["Side"] = "Right"
+
+        return GeoDataFrame(pd.concat([left_enc_points, right_enc_points]))
 
-    def steady_flow_names(self) -> list:
+    def steady_flow_names(self) -> List[str]:
         """Return the profile information for each steady flow event.
 
         Returns
@@ -1393,7 +1508,7 @@ class RasPlanHdf(RasGeomHdf):
             A Dataframe containing the profile names for each event
         """
         if self.STEADY_PROFILES_PATH not in self:
-            return pd.DataFrame()
+            return []
 
         profile_data = self[self.STEADY_PROFILES_PATH]
         profile_attrs = profile_data["Profile Names"][()]
@@ -1511,7 +1626,7 @@ class RasPlanHdf(RasGeomHdf):
     def _zmeta(self, ds: xr.Dataset) -> Dict:
         """Given a xarray Dataset, return kerchunk-style zarr reference metadata."""
         from kerchunk.hdf import SingleHdf5ToZarr
-        import zarr
+        from zarr.storage import MemoryStore
         import base64
 
         encoding = {}
@@ -1546,7 +1661,7 @@ class RasPlanHdf(RasGeomHdf):
                 chunk_meta[chunk_key] = [str(self._loc), value["offset"], value["size"]]
         # "Write" the Dataset to a temporary in-memory zarr store (which
         # is the same a Python dictionary)
-        zarr_tmp = zarr.MemoryStore()
+        zarr_tmp = MemoryStore()
         # Use compute=False here because we don't _actually_ want to write
         # the data to the zarr store, we just want to generate the metadata.
         ds.to_zarr(zarr_tmp, mode="w", compute=False, encoding=encoding)

{rashdf-0.7.1.dist-info → rashdf-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: rashdf
-Version: 0.7.1
+Version: 0.8.0
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -23,15 +23,17 @@ Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: kerchunk; extra == "dev"
-Requires-Dist: zarr; extra == "dev"
+Requires-Dist: zarr==2.18.2; extra == "dev"
 Requires-Dist: dask; extra == "dev"
 Requires-Dist: fsspec; extra == "dev"
 Requires-Dist: s3fs; extra == "dev"
 Requires-Dist: fiona==1.9.6; extra == "dev"
+Requires-Dist: numcodecs<0.16; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: numpydoc; extra == "docs"
 Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Dynamic: license-file
 
 # rashdf
 [![CI](https://github.com/fema-ffrd/rashdf/actions/workflows/continuous-integration.yml/badge.svg?branch=main)](https://github.com/fema-ffrd/rashdf/actions/workflows/continuous-integration.yml)

rashdf-0.8.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+cli.py,sha256=HbyrdUVKfrmtU2T9ljKTPQ-ugomJqYbCA26ghGJDJh0,6588
+rashdf/__init__.py,sha256=XXFtJDgLPCimqAhfsFz_pTWYECJiRT0i-Kb1uflXmVU,156
+rashdf/base.py,sha256=cAQJX1aeBJKb3MJ06ltpbRTUaZX5NkuxpR1J4f7FyTU,2507
+rashdf/geom.py,sha256=XAs6HQQaLkFlic60xUO0R2MuTi71H6f3WoEfNBlaxYU,27146
+rashdf/plan.py,sha256=d8YhpC6cV8rhh3qf1o12TbhUvo_4pMh75vIdDkcAvjE,63971
+rashdf/utils.py,sha256=Cba6sULF0m0jg6CQass4bPm2oxTd_avoe1pRQxq082c,10896
+rashdf-0.8.0.dist-info/licenses/LICENSE,sha256=L_0QaLpQVHPcglVjiaJPnOocwzP8uXevDRjUPr9DL1Y,1065
+rashdf-0.8.0.dist-info/METADATA,sha256=gw9owwT8skbZ7kupdYi8McfwMRXqk9PtXYWptJiTuQQ,6062
+rashdf-0.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rashdf-0.8.0.dist-info/entry_points.txt,sha256=LHHMR1lLy4wRyscMuW1RlYDXemtPgqQhNcILz0DtStY,36
+rashdf-0.8.0.dist-info/top_level.txt,sha256=SrmLb6FFTJtM_t6O1v0M0JePshiQJMHr0yYVkHL7ztk,11
+rashdf-0.8.0.dist-info/RECORD,,

{rashdf-0.7.1.dist-info → rashdf-0.8.0.dist-info}/WHEEL

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

rashdf-0.7.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-cli.py,sha256=yItWmCxnYLcuOpJVRpUsfv_NLS9IxLjojZB9GrxfKAU,6571
-rashdf/__init__.py,sha256=XXFtJDgLPCimqAhfsFz_pTWYECJiRT0i-Kb1uflXmVU,156
-rashdf/base.py,sha256=cAQJX1aeBJKb3MJ06ltpbRTUaZX5NkuxpR1J4f7FyTU,2507
-rashdf/geom.py,sha256=2aTfj6mqZGP6rysflQ5L8FeItlYJsknO00sKHo-yaTw,26090
-rashdf/plan.py,sha256=FUfLhGs0a87GKaNzR9sdm1qzYVhpXhq_cHTlP4oRJo8,59530
-rashdf/utils.py,sha256=Cba6sULF0m0jg6CQass4bPm2oxTd_avoe1pRQxq082c,10896
-rashdf-0.7.1.dist-info/LICENSE,sha256=L_0QaLpQVHPcglVjiaJPnOocwzP8uXevDRjUPr9DL1Y,1065
-rashdf-0.7.1.dist-info/METADATA,sha256=T9ClhfBiqw26Ib_kWuZln-V2XpbjJ0m3_16FwFI7X24,5986
-rashdf-0.7.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-rashdf-0.7.1.dist-info/entry_points.txt,sha256=LHHMR1lLy4wRyscMuW1RlYDXemtPgqQhNcILz0DtStY,36
-rashdf-0.7.1.dist-info/top_level.txt,sha256=SrmLb6FFTJtM_t6O1v0M0JePshiQJMHr0yYVkHL7ztk,11
-rashdf-0.7.1.dist-info/RECORD,,