pyhcal 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

pyhcal/calibrators.py

@@ -159,7 +159,8 @@ class calibrator:
             outlets[int(outlet_id)] = {}
             df_outlet = df.loc[df['outlet_id'] == outlet_id]
             outlets[int(outlet_id)]['station_ids'] = list(set(df_outlet['station_id']))
-            outlets[int(outlet_id)]['reach_ids'] = list(set(df_outlet['reach_id']))
+            outlets[int(outlet_id)]['reach_ids'] = list([int(reach_id) for reach_id in set(df_outlet['reach_id'])])
+            outlets[int(outlet_id)]['true_reach_id'] = list([int(reach_id) for reach_id in set(df_outlet['reach_id'])])
             outlets[int(outlet_id)]['model_name'] = df_outlet['repository_name'].iloc[0]
         return outlets
     

pyhcal/mappers.py

@@ -47,7 +47,7 @@ class uciMapper():
         tables = [mapper.join_table(operation,table_name,table_id) for mapper in self.mappers]
         table = pd.concat(tables)
         return table
-    
+
 class Mapper():
     def __init__(self,model_name,uci,subwatershed_gdf,hbn = None):
         self.model_name = model_name
@@ -63,7 +63,7 @@ class Mapper():
 
     def map_parameter(self,operation,table_name,parameter,table_id=0,weight_by_area = True):
         fig, ax = plt.subplots()
-        self.join_table(operation,table_name,parameter,table_id).plot(column = parameter,ax = ax,cmap='viridis',legend=True)
+        self.join_table(operation,table_name,parameter,table_id,weight_by_area).plot(column = parameter,ax = ax,cmap='viridis',legend=True)
         plt.title(parameter)
         
     def join_table(self,operation,table_name,parameter,table_id=0,weight_by_area = True):

pyhcal/setup_utils.py

@@ -4,9 +4,11 @@ Created on Wed Jun 15 15:21:35 2022
 
 @author: mfratki
 """
+from operator import mod
 from mpcaHydro.data_manager import dataManager
 from hspf.wdmReader import readWDM
 from hspf.uci import UCI
+from hspf.hspfModel import hspfModel
 from pyhcal.repository import Repository
 from mpcaHydro import outlets
 
@@ -41,7 +43,7 @@ class Builder():
         self.new_uci = None
         self.uci = None
         self.dm = None
-        self.calibration_reaches = outlets.wplmn_station_opnids(model_name)
+        self.calibration_reaches = [abs(opnid) for opnid in outlets.wplmn_station_opnids(model_name)]
         self.oracle_username = oracle_username
         self.oracle_password = oracle_password
     
@@ -113,32 +115,10 @@ class Builder():
                     copy_path.joinpath(wdm_file.name.replace('.wdm','.hdf5').replace('.WDM','hdf5')))
         
     def run_model(self, wait_for_completion=True):
-        #run_model(self.new_uci, wait_for_completion)
         # Run the uci file
-        winHSPF = str(Path(__file__).resolve().parent.parent) + '\\bin\\WinHSPFLt\\WinHspfLt.exe'     
+        winHSPF = hspfModel.winHSPF #TODO: fix this hardcoding
         subprocess.run([winHSPF,self.new_uci]) #, stdout=subprocess.PIPE, creationflags=0x08000000)    
         
-def run_model(uci_file, wait_for_completion=True):
-    winHSPF = str(Path(__file__).resolve().parent.parent) + '\\bin\\WinHSPFlt\\WinHspfLt.exe'
-    
-    # Arguments for the subprocess
-    args = [winHSPF, uci_file.as_posix()]
-
-    if wait_for_completion:
-        # Use subprocess.run to wait for the process to complete (original behavior)
-        subprocess.run(args)
-    else:
-        # Use subprocess.Popen to run the process in the background without waiting
-        # On Windows, you can use creationflags to prevent a console window from appearing
-        if sys.platform.startswith('win'):
-            # Use a variable for the flag to ensure it's only used on Windows
-            creationflags = subprocess.CREATE_NO_WINDOW
-            subprocess.Popen(args, creationflags=creationflags)
-        else:
-            # For other platforms (like Linux/macOS), Popen without special flags works fine
-            subprocess.Popen(args)
-
-
 
 ### functions for setting up the UCI file properly 
 def setup(uci,name,run = 0,reach_ids = None,n = 1,time_step = 3):
@@ -222,7 +202,6 @@ def setup_binaryinfo(uci,default_output = 4,reach_ids = None):
         uci.update_table(2,'RCHRES','BINARY-INFO',0,columns = ['HEATPR','HYDRPR'],opnids = reach_ids,operator = 'set')
     return uci     
 
-
 def setup_qualid(uci):
     #### Standardize QUAL-ID Names
     # Perlands

{pyhcal-1.1.2.dist-info → pyhcal-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhcal
-Version: 1.1.2
+Version: 1.1.4
 Summary: Python package for calibrating MPCA HSPF models
 Project-URL: Homepage, https://github.com/mfratkin1/pyhcal
 Author-email: Mulu Fratkin <michael.fratkin@state.mn.us>

{pyhcal-1.1.2.dist-info → pyhcal-1.1.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pyhcal/ERROR.FIL,sha256=w35iHJYKYpcU9lrmU4FqLGMlKLabOOX-_Z567kHF8CA,5018
 pyhcal/__init__.py,sha256=4TEpGD-PfEY8yK-od8DpEMA4_iQ-q9y0PBvROXSPdB0,94
-pyhcal/calibrators.py,sha256=J_RdArI5FAAiU-tEnvSQxiRtIBv3ol13vOJmb34CuGk,27964
+pyhcal/calibrators.py,sha256=rGtqn1FDgBBVT-y7jWal47AVDZCIQhyC24aXjR2AE60,28117
 pyhcal/figures.py,sha256=Iu7LaN_i2IuDA_nfxj-a8AkG-FTLZVicJ3-efIs5OiE,45534
-pyhcal/mappers.py,sha256=bAeBb-_EbhegPTn4sR4elRyQNrcBpr9CFzNoZcMDng8,5674
+pyhcal/mappers.py,sha256=yRc0mYoe9QSK6Z0e5C0DzEA7UHRr0S3nwsUNzkugDbw,5685
 pyhcal/metrics.py,sha256=GUGHd-op-g1Foj8wnS_JVURSms4ifcC0a5h8ketQ29I,17911
 pyhcal/repository.py,sha256=cZfAZRCI99_rhCSHi58_O6pV8aAofXuvQHrao0B5CzI,4606
-pyhcal/setup_utils.py,sha256=YyFpOUlyzsJySrnBBnLs3CPLs3al93Mez_H69di4yeo,31145
+pyhcal/setup_utils.py,sha256=aB49tm2Q48FdXvg7p83yK77tGy8wA2b9g6hL9NV7yZo,30177
 pyhcal/data/HUC_Names.csv,sha256=UGmd3Q5E8DyFWggXzaXWpsRze7sFyrlpYqaYpMWAiGM,18946
-pyhcal-1.1.2.dist-info/METADATA,sha256=CNDp8wMXQJNlttSLA9uI_z9zjImiZrY6lRTisF7_3jQ,560
-pyhcal-1.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-pyhcal-1.1.2.dist-info/RECORD,,
+pyhcal-1.1.4.dist-info/METADATA,sha256=EgdrYOn4IxhVeSEt5acNBv-U91BlNC5KwBW_MXUtqyw,560
+pyhcal-1.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pyhcal-1.1.4.dist-info/RECORD,,