pyhcal 1.1.2__tar.gz → 1.1.4__tar.gz

{pyhcal-1.1.2 → pyhcal-1.1.4}/PKG-INFO

@@ -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.4/demo.py

@@ -0,0 +1,52 @@
+#%%
+from pyhcal.calibrators import calibrator
+from pyhcal import metrics
+from pyhcal import figures
+#%%
+cal = calibrator('C:/Users/mfratki/Documents/Calibrations/Nemadji')
+cal.load_model(0)
+
+# %% Outlets
+
+cal.get_outlets()
+
+station_ids = ['S007-571', 'W28068001', 'S005-671', 'S008-051', 'S012-414']
+reach_ids = [417]
+
+df = cal.compare_simulated_observed(station_ids,reach_ids,'WT','h')
+#
+
+figures.contTimeseries(df.dropna(subset=['observed']),station_ids,'WT','degf')
+
+
+#%% Mapping
+cal.mapper.map_parameter('PERLND',
+                         'PWAT-PARM2',
+                         'LZSN')
+cal.mapper.map_parameter('PERLND',
+                         'PWAT-PARM2',
+                         'LZSN',
+                         weight_by_area=False)
+
+cal.mapper.map_output('PERLND','PERO')
+
+#%% Reports
+
+# loading at catchment and watershed
+cal.reports
+
+
+# Total amount of constituent contributed from the landscape to channels
+
+cal.model.reports.contributions('Q',630)
+
+
+cal.model.reports.landcover_contributions('Q',417)
+
+
+
+#%% Data
+
+cal.dm.constituent_summary('Q','h')
+cal.dm.reports.outlet_summary()
+

pyhcal-1.1.4/examples/PstFrom.log

@@ -0,0 +1,8 @@
+2026-02-04 16:48:27.489460 starting: opening PstFrom.log for logging
+2026-02-04 16:48:27.489629 starting PstFrom process
+2026-02-04 16:48:27.489740 starting: setting up dirs
+2026-02-04 16:48:27.489948 starting: removing existing new_d 'C:\Users\mfratki\Documents\Projects\Tests\Nemadji\pest'
+2026-02-04 16:48:27.492489 finished: removing existing new_d 'C:\Users\mfratki\Documents\Projects\Tests\Nemadji\pest' took: 0:00:00.002541
+2026-02-04 16:48:27.492551 starting: copying original_d 'C:\Users\mfratki\Documents\Projects\Tests\Nemadji\model' to new_d 'C:\Users\mfratki\Documents\Projects\Tests\Nemadji\pest'
+2026-02-04 16:48:27.919204 finished: copying original_d 'C:\Users\mfratki\Documents\Projects\Tests\Nemadji\model' to new_d 'C:\Users\mfratki\Documents\Projects\Tests\Nemadji\pest' took: 0:00:00.426653
+2026-02-04 16:48:27.920766 finished: setting up dirs took: 0:00:00.431026

{pyhcal-1.1.2 → pyhcal-1.1.4}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "pyhcal"
 urls = { "Homepage" = "https://github.com/mfratkin1/pyhcal" }  # ? Add this!
-version = "1.1.2"
+version = "1.1.4"
 dependencies = [
   "hspf",
   "mpcaHydro",

{pyhcal-1.1.2 → pyhcal-1.1.4}/src/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-1.1.2 → pyhcal-1.1.4}/src/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-1.1.2 → pyhcal-1.1.4}/src/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