Abstract network update

src/troute-network/troute/AbstractNetwork.py

@@ -10,7 +10,7 @@
 from troute.nhd_network import extract_connections, replace_waterbodies_connections, reverse_network, reachable_network, split_at_waterbodies_and_junctions, split_at_junction, dfs_decomposition
 from troute.nhd_network_utilities_v02 import organize_independent_networks, build_channel_initial_state, build_refac_connections
 import troute.nhd_io as nhd_io 
-from .AbstractRouting import *
+from .AbstractRouting import MCOnly, MCwithDiffusive, MCwithDiffusiveNatlXSectionNonRefactored, MCwithDiffusiveNatlXSectionRefactored
 
 LOG = logging.getLogger('')
 
@@ -20,7 +20,7 @@ class AbstractNetwork(ABC):
     """
     __slots__ = ["_dataframe", "_waterbody_connections", "_gages",  
                 "_terminal_codes", "_connections", "_waterbody_df", 
-                "_waterbody_types_df", "_waterbody_type_specified",
+                "_waterbody_types_df", "_waterbody_type_specified", "_link_gage_df",
                 "_independent_networks", "_reaches_by_tw", "_flowpath_dict",
                 "_reverse_network", "_q0", "_t0", "_link_lake_crosswalk",
                 "_qlateral", "_break_segments", "_segment_index", "_coastal_boundary_depth_df",
@@ -36,6 +36,7 @@ def __init__(self,):
         self._q0 = None
         self._t0 = None
         self._qlateral = None
+        self._link_gage_df = None
         #qlat_const = forcing_parameters.get("qlat_const", 0)
         #FIXME qlat_const
         """ Figure out a good way to default initialize to qlat_const/c
@@ -239,11 +240,11 @@ def reaches_by_tailwater(self):
 
     @property
     def waterbody_dataframe(self):
-        return self._waterbody_df.sort_index()
+        return self._waterbody_df
 
     @property
     def waterbody_types_dataframe(self):
-        return self._waterbody_types_df.sort_index()
+        return self._waterbody_types_df
 
     @property
     def waterbody_type_specified(self):
@@ -319,9 +320,10 @@ def segment_index(self):
 
     @property
     def link_gage_df(self):
-        link_gage_df = pd.DataFrame.from_dict(self._gages)
-        link_gage_df.index.name = 'link'
-        return link_gage_df
+        if self._link_gage_df is None:
+            self._link_gage_df = pd.DataFrame.from_dict(self._gages)
+            self._link_gage_df.index.name = 'link'
+        return self._link_gage_df
 
     @property
     @abstractmethod

src/troute-network/troute/AbstractRouting.py

@@ -108,7 +108,7 @@ def unrefactored_topobathy_df(self):
 class MCOnly(AbstractRouting):
 
     def __init__(self, hybrid_params):
-        self.hybrid_params = hybrid_params
+        self.hybrid_params = None
 
         super().__init__()
 

src/troute-network/troute/HYFeaturesNetwork.py

@@ -3,7 +3,6 @@
 import numpy as np
 import geopandas as gpd
 import time
-import os
 import json
 from pathlib import Path
 import pyarrow.parquet as pq
@@ -54,10 +53,10 @@ def read_ngen_waterbody_df(parm_file, lake_index_field="wb-id", lake_id_mask=Non
     for level-pool reservoir computation.
     """
     def node_key_func(x):
-        return int(x[3:])
-    if os.path.splitext(parm_file)[1]=='.gpkg':
+        return int( x.split('-')[-1] )
+    if Path(parm_file).suffix=='.gpkg':
         df = gpd.read_file(parm_file, layer="lake_attributes").set_index('id')
-    elif os.path.splitext(parm_file)[1]=='.json':
+    elif Path(parm_file).suffix=='.json':
         df = pd.read_json(parm_file, orient="index")
 
     df.index = df.index.map(node_key_func)
@@ -75,11 +74,11 @@ def read_ngen_waterbody_type_df(parm_file, lake_index_field="wb-id", lake_id_mas
     # layer, but as of now (Nov 22, 2022) there doesn't seem to be a differentiation
     # between USGS reservoirs, USACE reservoirs, or RFC reservoirs...
     def node_key_func(x):
-        return int(x[3:])
+        return int( x.split('-')[-1] )
 
-    if os.path.splitext(parm_file)[1]=='.gpkg':
+    if Path(parm_file).suffix=='.gpkg':
         df = gpd.read_file(parm_file, layer="crosswalk").set_index('id')
-    elif os.path.splitext(parm_file)[1]=='.json':
+    elif Path(parm_file).suffix=='.json':
         df = pd.read_json(parm_file, orient="index")
 
     df.index = df.index.map(node_key_func)
@@ -306,6 +305,7 @@ def read_geo_file(self,):
                             self.waterbody_dataframe.reset_index()
                             .drop_duplicates(subset=lake_id)
                             .set_index(lake_id)
+                            .sort_index()
                             )
 
             try:
@@ -319,6 +319,7 @@ def read_geo_file(self,):
                                     self.waterbody_types_dataframe.reset_index()
                                     .drop_duplicates(subset=lake_id)
                                     .set_index(lake_id)
+                                    .sort_index()
                                     )
 
             except ValueError:

src/troute-network/troute/NHDNetwork.py

@@ -270,6 +270,7 @@ def read_geo_file(self,):
                 self.waterbody_dataframe.reset_index()
                 .drop_duplicates(subset="lake_id")
                 .set_index("lake_id")
+                .sort_index()
             )
 
             # Declare empty dataframe

src/troute-network/troute/nhd_io.py

@@ -356,6 +356,7 @@ def read_reservoir_parameter_file(
     df1 = (df1.reset_index()
            .drop_duplicates(subset="lake_id")
            .set_index("lake_id")
+           .sort_index()
           )
 
     # recode to levelpool (1) for reservoir DA types set to false