hspf 2.0.0__tar.gz → 2.0.2__tar.gz

hspf-2.0.2/.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+*.whl
+*.gz

{hspf-2.0.0 → hspf-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hspf
-Version: 2.0.0
+Version: 2.0.2
 Summary: Python package for downloading and running HSPF models
 Project-URL: Homepage, https://github.com/mfratkin1/pyHSPF
 Author-email: Mulu Fratkin <michael.fratkin@state.mn.us>

{hspf-2.0.0 → hspf-2.0.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "hspf"
 urls = { "Homepage" = "https://github.com/mfratkin1/pyHSPF" }  # ? Add this!
-version = "2.0.0"
+version = "2.0.2"
 dependencies = [
   "pandas",
   "requests",

{hspf-2.0.0 → hspf-2.0.2}/src/hspf/hbn.py

@@ -6,15 +6,14 @@ nutrients relevant for our current calibration methods. (See calibration_helpers
 
 @author: mfratki
 """
-from pyhspf import helpers
+from . import helpers
 import pandas as pd
 import math
 from struct import unpack
 from numpy import fromfile
 from pandas import DataFrame
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta #, timezone
 from collections import defaultdict
-import numpy as np
 #from pathlib import Path
 
 
@@ -350,11 +349,13 @@ class hbnClass:
         rows = []
         times = []
         nvals = len(self.mapn[operation, id, activity]) # number constituent timeseries
-        utc_offset = timezone(timedelta(hours=-6)) #UTC is 6hours ahead of CST
+        #utc_offset = timezone(timedelta(hours=-6)) #UTC is 6hours ahead of CST
         for (index, reclen) in self.mapd[operation, id, activity, tcode]:
             yr, mo, dy, hr, mn = unpack('5I', self.data[index + 36: index + 56])
             hr = hr-1
-            dt = datetime(yr, mo, dy, 0, mn ,tzinfo=utc_offset) + timedelta(hours=hr)
+            #dt = datetime(yr, mo, dy, 0, mn ,tzinfo=utc_offset) + timedelta(hours=hr)
+            dt = datetime(yr, mo, dy, 0, mn ) + timedelta(hours=hr)
+
             times.append(dt)
 
             index += 56

{hspf-2.0.0 → hspf-2.0.2}/src/hspf/hspfModel.py

@@ -8,11 +8,11 @@ from pathlib import Path
 import os.path
 import subprocess
 
-from pyhspf.uci import UCI
-from pyhspf import hbn
-from pyhspf.reports import Reports
-from pyhspf.wdm import wdmInterface
-from pyhspf import wdmReader
+from .uci import UCI
+from . import hbn
+from .reports import Reports
+from .wdm import wdmInterface
+from . import wdmReader
 
 
 

{hspf-2.0.0 → hspf-2.0.2}/src/hspf/parser/graph.py

@@ -332,6 +332,14 @@ CREATE TABLE GenInfo (
 
 #%% Methods using universal node id
 
+# def bypass_node(G, node):
+#     preds = list(G.predecessors(node))
+#     succs = list(G.successors(node))
+#     for u in preds:
+#         for v in succs:
+#             if 
+#             G.add_edge(u, v)
+#     G.remove_node(node)
 
 def _add_subgraph_labels(G,G_sub):
     G_sub.labels = {label:node for label, node in G.labels.items() if node in G_sub.nodes}
@@ -519,7 +527,24 @@ def paths(G,reach_id,source_type = 'RCHRES'):
 def count_ancestors(G,node_type,ancestor_node_type):
     return {node['type_id']:len(ancestors(G,node['id'],ancestor_node_type)) for node in get_nodes(G,node_type)}
 
-
+# def catchment_ids(G):
+#     result = []
+#     for node in get_node_ids(G,'RCHRES'):
+#         upstream_nodes = G.predecessors(node)
+#         if any([G.nodes[up]['type'] in ['PERLND','IMPLND'] for up in upstream_nodes]):
+#             result.append(G.nodes[node]['type_id'])
+#     return result
+
+# Very expensive. Should probably standardize it so routing reaches have no implnds/perlnds
+def catchment_ids(G):
+    result = []
+    for node in get_node_ids(G,'RCHRES'):
+        upstream_nodes = G.predecessors(node)
+        if any([G.nodes[up]['type'] in ['PERLND','IMPLND'] for up in upstream_nodes]):
+            cat = make_catchment(G,G.nodes[node]['type_id'])
+            if area(cat) > 0:
+                result.append(G.nodes[node]['type_id'])
+    return result
 
 # Catchment constructor
 def make_catchment(G,reach_id):
@@ -550,8 +575,28 @@ def make_watershed(G,reach_ids):
     return watershed
 
 
-def catcments(G):
-    return None
+# def catcments(G):
+#     cats = [Catchment(graph.make_catchment(G,reach_id) for reach_id in graph.get_node_type_ids(G,'RCHRES'))]
+
+#     return 
+        
+#         for u, v, edge_data in graph.make_catchment(G,reach_id).edges(data=True):
+#             source_node_attributes = G.nodes[u]
+#             # Add or update edge attributes with source node attributes
+#             edge_data["source_type"] = source_node_attributes.get("type")
+#             edge_data["source_name"] = source_node_attributes.get("name")
+#             edge_data["source_type_id"] = source_node_attributes.get("type_id")
+#             cats.append(edge_data)
+        
+#     return pd.DataFrame(cats)
+                     
+                     
+#                      for node in G.nodes:
+#         upstream_nodes = G.predecessors(node)
+#         if any(G.nodes[up]['type'] in ['PELND','IMPLND'] for up in upstream_nodes):
+#             result.append(node)
+
+#     return None
 # Catchment selectors
 
 '''
@@ -637,9 +682,12 @@ class Catchment():
 #%% Legacy Methods for Backwards compatability
 class reachNetwork():
     def __init__(self,uci,reach_id = None):
+        self.uci = uci
         self.G = create_graph(uci)
+        self.catchment_ids = catchment_ids(self.G)
+        self.routing_reaches = self._routing_reaches()
+        self.lakes = self._lakes()
         self.schematic = uci.table('SCHEMATIC').astype({'TVOLNO': int, "SVOLNO": int, 'AFACTR':float})
-        self.uci = uci
     
     def get_node_type_ids(self,node_type):
         return get_node_type_ids(self.G, node_type)
@@ -709,15 +757,18 @@ class reachNetwork():
     
     def subwatersheds(self,reach_ids = None):
         df = subwatersheds(self.uci)
-        if reach_ids is not None:
-            df = df.loc[df.index.intersection(reach_ids)]
-        return df
+        if reach_ids is None:
+            reach_ids = get_node_type_ids(self.G,'RCHRES')
+        return df.loc[df.index.intersection(reach_ids)]
     
     def subwatershed(self,reach_id):
         return subwatershed(self.uci,reach_id) #.loc[reach_id]
     
     def subwatershed_area(self,reach_id):
-        return self.drainage(reach_id).query("source_type in ['PERLND','IMPLND']")['area'].sum()
+        area = self.drainage(reach_id).query("source_type in ['PERLND','IMPLND']")['area'].sum()
+        # if (reach_id in self.lakes()) & (f'FTABLE{reach_id}' in self.uci.table_names('FTABLES')):
+        #     area = area + self.lake_area(reach_id)
+        return area
     
     def reach_contributions(self,operation,opnids):
         return reach_contributions(self.uci,operation,opnids)
@@ -736,6 +787,15 @@ class reachNetwork():
     def outlets(self):
         return [self.G.nodes[node]['type_id'] for node, out_degree in self.G.out_degree() if (out_degree == 0) & (self.G.nodes[node]['type'] == 'RCHRES')]
 
+    def _lakes(self):
+        return list(self.uci.table('RCHRES','GEN-INFO').query('LKFG == 1',engine = 'python').index.astype(int))        
+    
+    def lake_area(self,reach_id):
+        return self.uci.table('FTABLES',f'FTABLE{reach_id}')['Area'].max()
+    
+    def _routing_reaches(self):
+        return [reach_id for reach_id in self.get_node_type_ids('RCHRES') if reach_id not in self.catchment_ids]
+
     def paths(self,reach_id):
         return paths(self.G,reach_id)
     
@@ -799,6 +859,7 @@ def subwatersheds(uci):
     schematic = schematic[schematic['TVOL'] == 'RCHRES'][['SVOLNO','TVOLNO','AFACTR','MLNO']].astype({'SVOLNO':int,'TVOLNO':int,'AFACTR':float,'MLNO':int})
     schematic.reset_index(inplace=True,drop=False)
     schematic.set_index('TVOLNO',inplace=True)
+    schematic = schematic.loc[catchment_ids(uci.network.G)]
     
     dfs = []
     for operation in ['PERLND','IMPLND']:

{hspf-2.0.0 → hspf-2.0.2}/src/hspf/reports.py

@@ -6,7 +6,7 @@ Created on Mon Apr 11 08:26:04 2022
 """
 import numpy as np
 import pandas as pd
-from pyhspf import helpers
+from . import helpers
 from pathlib import Path
 
 #timeseries_catalog = pd.read_csv(Path(__file__).parent/'TIMESERIES_CATALOG.csv')

{hspf-2.0.0 → hspf-2.0.2}/src/hspf/uci.py

@@ -78,7 +78,7 @@ class UCI():
                  
     def table(self,block,table_name = 'na',table_id = 0,drop_comments = True):
         # Dynamic parsing of tables when called by user
-        assert block in ['FILES','PERLND','IMPLND','RCHRES','SCHEMATIC','OPN SEQUENCE','MASS-LINK','EXT SOURCES','NETWORK','GENER','MONTH-DATA','EXT TARGETS','COPY']
+        assert block in ['FILES','PERLND','IMPLND','RCHRES','SCHEMATIC','OPN SEQUENCE','MASS-LINK','EXT SOURCES','NETWORK','GENER','MONTH-DATA','EXT TARGETS','COPY','FTABLES']
         
         table = self.uci[(block,table_name,table_id)] #[block][table_name][table_id]
         #TODO move the format_opnids into the Table class?

hspf-2.0.0/.gitignore

@@ -1 +0,0 @@
-*.pyc