hspf 2.1.1__py3-none-any.whl → 2.1.2__py3-none-any.whl

hspf/bin/WinHSPFLt/hspfmsg.wdu

@@ -0,0 +1 @@
+WDM WDM1 C:\Program Files (x86)\HSPEXP+\WinHSPFLt\hspfmsg.wdm

hspf/build_warehouse.py

@@ -281,12 +281,49 @@ for key,ts_names in outputs.items():
     dfs.append(df)
 output_df = pd.concat(dfs).reset_index(drop=True)
 
+dfs = []
+for key,data in hbn.hbns[0].data_frames.items():
+    keys = key.split('_')
+    operation = keys[0]
+    activity = keys[1]
+    opnid = int(keys[2])
+    t_code = keys[3]
+    data.reset_index(inplace=True)
+    data.rename(columns={'index': 'datetime'}, inplace=True)
+    data = data.melt(id_vars = ['datetime'],var_name = 'ts_name', value_name = 'value')
+    data['operation'] = operation
+    data['activity'] = activity
+    data['opnid'] = opnid
+    data['t_code'] = t_code
+    data['model_name'] = model_name
+    dfs.append(data)
+output_df = pd.concat(dfs).reset_index(drop=True)
+
+
+
+# Write to Parquet with DuckDB, including "t_code" as a partition
+output_path = "model_outputs"
+
+con = duckdb.connect(database=':memory:')  # Temporary in-memory database
+con.execute(f"""
+    COPY output_df
+    TO '{output_path}'
+    (FORMAT 'parquet', PARTITION_BY ('model_name','operation', 'opnid'))
+""")
+
+print(f"Data written to {output_path}")
 
-ts_name = 'PERO'
-op_type = 'PERLND'
-t_code = 4
 
 
+['PERO',
+'SURO',
+'IFWO',
+'AGWO']
+
+for constituent in ['Q','TSS','TP','N','OP','BOD','TKN']:
+    t_cons = helpers.get_tcons(constituent,'RCHRES','lb')
+    df = hbn.get_rechres_data(constituent, units='lb', freq='daily').reset_index()
+
 
 pero = hbn.get_multiple_timeseries(op_type,t_code,ts_name).reset_index().rename(columns={'index': 'datetime'})
 pero = pero.melt(id_vars = ['datetime'],var_name = 'operation_id', value_name = 'value')
@@ -295,15 +332,58 @@ pero['t_code'] = t_code
 pero['model_name'] = model_name
 
 
+db_path = 'c:/Users/mfratki/Documents/ucis.duckdb'
 with duckdb.connect(db_path) as con:
     warehouse.insert_model_run(con, model_name, run_id)
 
+db_path = 'c:/Users/mfratki/Documents/ucis.duckdb'
+with duckdb.connect(db_path) as conn:
+    conn.execute("CREATE SCHEMA if not exists reports")
+    conn.execute("CREATE TABLE if not exists reports.catchment_loading AS SELECT * FROM df")
+    conn.close()
+
 
+# Average annual loading by catchment 
+db_path = 'c:/Users/mfratki/Documents/ucis.duckdb'
+with duckdb.connect(db_path) as conn:
+    query = f"""
+    SELECT 
+        model_name,
+        operation AS operation_type,
+        opnid AS operation_id,
+        t_code,
+        ts_name AS constituent,
+        AVG(value) * 365.25 AS annual_loading
+    FROM reports.catchment_loading
+    WHERE t_code = 'PERLND' AND constituent IN ('Q','TP','TSS','N','OP','BOD','TKN')
+    GROUP BY model_name, TVOLNO, constituent
+    """
+    annual_loadings = conn.execute(query).fetchdf()
+    conn.close()
+
+hbn.hbns[0].data_frames.keys()
+
+
+
+import duckdb
+import pandas as pd
 
 
+# Convert to DataFrame
+df = pd.DataFrame(data)
+df['datetime'] = pd.to_datetime(df['datetime'])  # Ensure datetime column is formatted properly
 
+# Write to Parquet with DuckDB, including "t_code" as a partition
+output_path = "model_outputs"
 
+con = duckdb.connect(database=':memory:')  # Temporary in-memory database
+con.execute(f"""
+    COPY df
+    TO '{output_path}'
+    (FORMAT 'parquet', PARTITION_BY ('operation_type', 'operation_id', 't_code'))
+""")
 
+print(f"Data written to {output_path}")
 
 
 

hspf/hbn.py

@@ -140,8 +140,15 @@ def get_simulated_flow(hbn,time_step,reach_ids,unit = None):
     flows.attrs['unit'] = unit
     return flows
 
-def get_simulated_temperature(hbn,units,time_step,reach_ids):
-    raise NotImplementedError()
+def get_simulated_temperature(hbn,time_step,reach_ids):
+    assert len(reach_ids) == 1, "Temperature can only be retreived for one reach at a time."
+
+
+    wt = hbn.get_multiple_timeseries('RCHRES',time_step,'TW', reach_ids)
+    wt = wt.sum(axis=1)
+    wt.attrs['unit'] = 'degf'
+    
+    return wt
     
 
 def get_simulated_reach_constituent(hbn,constituent,time_step,reach_ids,unit = None):
@@ -152,11 +159,11 @@ def get_simulated_reach_constituent(hbn,constituent,time_step,reach_ids,unit = N
     if unit is None:
         unit = UNIT_DEFAULTS[constituent]
     else:
-        assert(unit in ['mg/l','lb','cfs','degF'])
+        assert(unit in ['mg/l','lb'])
         
     t_cons = helpers.get_tcons(constituent,'RCHRES','lb')
     
-    # Correct instances when a flow needs to be subtracted (rare)
+    # Correct instances when a reach output needs to be subtracted (rare)
     df = pd.concat([hbn.get_multiple_timeseries('RCHRES',time_step,t_con,[abs(reach_id) for reach_id in reach_ids])*sign for t_con in t_cons],axis=1).sum(axis=1)
     
     if constituent == 'TSS':

hspf/helpers.py

@@ -48,9 +48,10 @@ def get_tcons(nutrient_name,operation,units = 'mg/l'):
                   'N' :['NO3OUTTOT','NO2OUTTOT'], # N
                   'OP' :['PO4OUTDIS'], # Ortho
                   'TP' :['PTOTOUT'],
-                  'BOD' :['BODOUTTOT']},
+                  'BOD' :['BODOUTTOT'],},
         'cfs': {'Q': ['ROVOL']},
-        'acrft' : {'Q': ['ROVOL']}}
+        'acrft' : {'Q': ['ROVOL']},
+        'degf' : {'WT': ['TW']}}
         
         t_cons = MAP[units]
     elif operation == 'PERLND':

hspf/reports.py

@@ -125,6 +125,8 @@ def scour(hbn,uci,start_year = '1996',end_year = '2030'):
     # schematic block will have all the possible perlands while sosed only has perlands that were simulated
     # in other words information from sosed is a subset of schematic
     for tvolno in lakeflag.index: #schematic['TVOLNO'].unique():
+        implnd_load = 0
+        prlnd_load = 0
         reach_load = depscr.loc[tvolno].values[0]
         schem_sub = schematic[schematic['TVOLNO'] == tvolno]
         if len(schem_sub) == 0:
@@ -944,7 +946,8 @@ def total_phosphorous(uci,hbn,t_code,operation = 'PERLND'):
     totals = []
     for mlno in opnids['MLNO'].unique():
         total = dissolved_orthophosphate(uci,hbn,operation,mlno,t_code) + particulate_orthophosphate(uci,hbn,operation,mlno, t_code) + organic_refactory_phosphorous(uci,hbn,operation,mlno,t_code) + labile_oxygen_demand(uci,hbn,operation,mlno,t_code)*0.007326 # Conversation factor to P
-        totals.append(total[opnids['SVOLNO'].loc[opnids['MLNO'] == mlno].to_list()])
+        if not isinstance(total,float): #TODO fix for when no data is present. Don't like this workaround.
+            totals.append(total[opnids['SVOLNO'].loc[opnids['MLNO'] == mlno].to_list()])
     
     total = pd.concat(totals,axis=1)
     total = total.T.groupby(total.columns).sum().T
@@ -974,6 +977,7 @@ MASSLINK_SCHEME = {'dissolved_orthophosphate': {'tmemn': 'NUIF1',
                                          'tmemsb2':''}}
 
 
+
 def qualprop_transform(uci,hbn,operation,mlno,tmemn,tmemsb1,tmemsb2 = '',t_code = 4):
     masslink = uci.table('MASS-LINK',f'MASS-LINK{mlno}')
     masslink = masslink.loc[(masslink['TMEMN'] == tmemn) & (masslink['TMEMSB1'] == tmemsb1) & (masslink['TMEMSB2'] == tmemsb2)]

hspf/warehouse.py

@@ -46,41 +46,48 @@ def create_hspf_model_hierarchy_tables(con: duckdb.DuckDBPyConnection):
     -- Level 1: The overall Model (e.g., for a specific basin)
     CREATE TABLE IF NOT EXISTS hspf.models (
         model_pk        BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_seq'),
-        model_name      VARCHAR NOT NULL UNIQUE, -- e.g., 'Nemadji River Basin Model'
-        description     VARCHAR
-    );
-
-    -- Level 2: A specific Version of a Model
-    CREATE TABLE IF NOT EXISTS hspf.model_versions (
-        model_version_pk BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_version_seq'),
-        model_pk         BIGINT NOT NULL REFERENCES hspf.models(model_pk),
+        model_name      VARCHAR NOT NULL, -- e.g., 'Nemadji River Basin Model'
         version_name     VARCHAR NOT NULL, -- e.g., 'v2.1', '2025_Update'
-        release_date     DATE,
-        description      VARCHAR,
-        UNIQUE (model_pk, version_name)
-    );
-
-    -- Level 3: A Scenario within a Model Version
-    CREATE TABLE IF NOT EXISTS hspf.scenarios (
-        scenario_pk      BIGINT PRIMARY KEY DEFAULT nextval('hspf.scenario_seq'),
-        model_version_pk BIGINT NOT NULL REFERENCES hspf.model_versions(model_version_pk),
-        scenario_name    VARCHAR NOT NULL, -- e.g., 'Baseline_2020', 'Future_Climate_BMPs'
-        description      VARCHAR,
-        UNIQUE (model_version_pk, scenario_name)
-    );
-
-    -- Level 4: A single execution (Run) of a Scenario
-    CREATE TABLE IF NOT EXISTS hspf.model_runs (
-        model_run_pk   BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_run_seq'),
-        scenario_pk    BIGINT NOT NULL REFERENCES hspf.scenarios(scenario_pk),
-        run_id         BIGINT,
-        run_name       VARCHAR,          -- e.g., 'Run_1995-2015', 'Calibration_Run_A'
-        start_year     INTEGER,
-        end_year       INTEGER,
-        run_timestamp  TIMESTAMP DEFAULT current_timestamp,
-        notes          VARCHAR
-    );
-    ''')
+        --last_extension   DATE,
+        --last_update      DATE,
+        --last_calibration DATE,
+        description      VARCHAR
+        -- release_date     DATE,
+        UNIQUE (model_name, version_name)
+                );
+                ''')
+
+    # -- Level 2: A specific Version of a Model
+    # CREATE TABLE IF NOT EXISTS hspf.model_versions (
+    #     model_version_pk BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_version_seq'),
+    #     model_pk         BIGINT NOT NULL REFERENCES hspf.models(model_pk),
+    #     version_name     VARCHAR NOT NULL, -- e.g., 'v2.1', '2025_Update'
+    #     release_date     DATE,
+    #     description      VARCHAR,
+    #     UNIQUE (model_pk, version_name)
+    # );
+
+    # -- Level 3: A Scenario within a Model Version
+    # CREATE TABLE IF NOT EXISTS hspf.scenarios (
+    #     scenario_pk      BIGINT PRIMARY KEY DEFAULT nextval('hspf.scenario_seq'),
+    #     model_version_pk BIGINT NOT NULL REFERENCES hspf.model_versions(model_version_pk),
+    #     scenario_name    VARCHAR NOT NULL, -- e.g., 'Baseline_2020', 'Future_Climate_BMPs'
+    #     description      VARCHAR,
+    #     UNIQUE (model_version_pk, scenario_name)
+    # );
+
+    # -- Level 4: A single execution (Run) of a Scenario
+    # CREATE TABLE IF NOT EXISTS hspf.model_runs (
+    #     model_run_pk   BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_run_seq'),
+    #     scenario_pk    BIGINT NOT NULL REFERENCES hspf.scenarios(scenario_pk),
+    #     run_id         BIGINT,
+    #     run_name       VARCHAR,          -- e.g., 'Run_1995-2015', 'Calibration_Run_A'
+    #     start_year     INTEGER,
+    #     end_year       INTEGER,
+    #     run_timestamp  TIMESTAMP DEFAULT current_timestamp,
+    #     notes          VARCHAR
+    # );
+    # ''')
 
 def create_model_run_table(con: duckdb.DuckDBPyConnection):
     """

{hspf-2.1.1.dist-info → hspf-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hspf
-Version: 2.1.1
+Version: 2.1.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.1.1.dist-info → hspf-2.1.2.dist-info}/RECORD

@@ -1,20 +1,30 @@
 hspf/Masslink_Timeseries.csv,sha256=TOV6PpR0SBI0FaAU1T-qyD2DyGsBFjUWZenvWXiS3wA,4985
 hspf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hspf/build_warehouse.py,sha256=J3fgycY9xkZdY3C9u0wDaEX1n6satr1t0mQmfg4Fh6E,20205
-hspf/hbn.py,sha256=xUvovcAXXLLLE_ID9kejjiyaAqnh-vwmDLdPLjsGQ8A,19401
+hspf/build_warehouse.py,sha256=y91vNmdt918H5_jx9nxMUVmRG9ORdChYWEqQbbi3YKs,22861
+hspf/hbn.py,sha256=g09tEQE196JA_f-4txISr3TA7aq98bv2SxEwNw0gkDA,19606
 hspf/hbn2.py,sha256=OmuTVDxd0Boyd3GvBgzEfqvP7CTeYIJYPC7EXPgYu30,13190
 hspf/hbn_cy.c,sha256=ZIJwWxyGx8fE5nM1HBd8-zNotmStGZscqXijl3KSRdI,593464
 hspf/hbn_cy.html,sha256=o8wMdvEE547DRXcUHFPgAkkyJ665b6rloGL-qKClaTo,137735
 hspf/hbn_cy.pyx,sha256=T-itpkvHlxHzQHKtJBS-M8_ToLBa1U_ajpV53hh_oI8,4323
-hspf/helpers.py,sha256=cd8J3XfCFmpER475Mk5aFL29612rgop75GRGxlofXQo,3242
+hspf/helpers.py,sha256=Jv5lSUKVqML8iJOFfBPcA3bgHn9MbFZC4OO-9YHHP_w,3277
 hspf/hspfModel.py,sha256=K_xF7HtuMpDMod56Z3IXDCeGsnUi8KGhly_9tm-mxoY,9070
-hspf/reports.py,sha256=bU9rU9qaffXosxyA3H5OWi4SqQVPiQh6709tTCMYeeU,46286
+hspf/reports.py,sha256=UzEDkgrmUNncPHFzOkbYoGFUFXVlFuEu_BE0Nh_qhSw,46449
 hspf/uci.py,sha256=rsi_KJqdfBFp0rlKCHyhmQGdB_rgNE8k6abTjH26UqE,33982
 hspf/validations.py,sha256=BcNT0h5QDZW9lHpXk8KuHQvycl8a_4jQ91srwWFodRo,6666
-hspf/warehouse.py,sha256=1zm1uu_QvevIuAMNPOkzspnFhNpLQrvkq3x3HXSypGg,11898
+hspf/warehouse.py,sha256=12Scro1a_hK5IvE9FENAMQv9jKWgtMYtAftJZ4p3nTQ,12239
 hspf/wdm.py,sha256=q0hNqsMNrTkxHtKEX0q0wWlIZabXv6UX2HjNCF9WEW4,12734
 hspf/wdmReader.py,sha256=-akKWB9SpUzXvXoQMeHLZNi_u584KaeEOyHB-YolTWM,22848
+hspf/bin/WinHSPFLt/ATCoRend.dbf,sha256=3bHSDSpL__z1syz6nXlhPrPLnmcsaKDSG1xaiESHwpQ,17743
+hspf/bin/WinHSPFLt/ATCoUnits.mdb,sha256=vJMovhTfyY_2hzzeqLdh-UjId1GV_pVPfesp29J2N18,114688
+hspf/bin/WinHSPFLt/ERROR.FIL,sha256=XKxOp21R0aCEd-ofy3UEQ91XH0V8cxgiURp4Z7J8E6M,1523002
+hspf/bin/WinHSPFLt/LF90.EER,sha256=VpQ92SHdRvIm-OxGMKawKn56ij3-6owFXsYHoZN9mVM,41040
+hspf/bin/WinHSPFLt/LF90WIOD.DLL,sha256=loIi_u234J-fbXq_s_ajMEjalyX3cdnFFtsH6Hm48C4,90112
+hspf/bin/WinHSPFLt/MapWinUtility.dll,sha256=oEcJfvQS7zIGHg5HcRHFv105pySy_V1g2LHwC3zy29o,83456
+hspf/bin/WinHSPFLt/StatusMonitor.exe,sha256=euLR4tKiMYoc7by6Rmem4CAk41Jjecsy4sgUOrRZHFA,39424
 hspf/bin/WinHSPFLt/WinHspfLt.exe,sha256=Afs_nJ62r1VnTL2P4XfiRJ1sH2If5DeGTbcCzoqlanE,74752
+hspf/bin/WinHSPFLt/hass_ent.dll,sha256=jvm_xLGSci4Sm1VSIVy8dS2-wgNn1dqkcth3vkm9IG0,4904448
+hspf/bin/WinHSPFLt/hspfmsg.wdm,sha256=cfUDyfYKX7Lsrlnu9kDylQNhD1X5lFWVqmLyXMLD5m0,1392640
+hspf/bin/WinHSPFLt/hspfmsg.wdu,sha256=Zl04zGkVN_1ifjsHmDyHFYUC3q6bojWm-vzXoXgJOv0,63
 hspf/data/HSPFParameterRanges.csv,sha256=PKz1DRIgpsgTEDrVaSHB9SAGMa5yUBRpyZDc9-CKJJo,28357
 hspf/data/LandUseNames_Mappings.csv,sha256=Bb2toZn6FkPfZ6_8SnzIQvXJ03ycwCuc8uyv4cUowNY,75899
 hspf/data/ParseTable.csv,sha256=ExqUaZg_uUPF5XHGLJEk5_jadnDenKjbwqC4d-iNX_M,193609
@@ -40,6 +50,6 @@ hspf/data/Timeseries Catalog/RCHRES/SEDTRN.txt,sha256=SiTgD4_YWctTgEfhoMymZfv8ay
 hspf/parser/__init__.py,sha256=2HvprGVCaJ9L-egvTj1MI-bekq5CNjtSBZfrCtQi3fs,92
 hspf/parser/graph.py,sha256=jvkjz9eNtBFEmxUeQosuQE7XgsIRlrNH-rSny5KBDoE,33046
 hspf/parser/parsers.py,sha256=x3othxQogUmGNe_ctCU20atDrRM_B4lEbVJb3EMbwto,20850
-hspf-2.1.1.dist-info/METADATA,sha256=KtAPnc8v-bT8ow30iHdN1lCm2asH22rvOyKgDGS_kL0,605
-hspf-2.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hspf-2.1.1.dist-info/RECORD,,
+hspf-2.1.2.dist-info/METADATA,sha256=vjAn3jjlUlIIHBwJ43d-ut130cS-tR4QmmUwaAfFIa8,605
+hspf-2.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hspf-2.1.2.dist-info/RECORD,,