pyhcal 1.0.0__tar.gz → 1.0.2__tar.gz

pyhcal-1.0.2/.gitignore

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

{pyhcal-1.0.0 → pyhcal-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhcal
-Version: 1.0.0
+Version: 1.0.2
 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>
@@ -12,4 +12,6 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.8
 Requires-Dist: geopandas
 Requires-Dist: hspf
+Requires-Dist: matplotlib
 Requires-Dist: mpcahydro
+Requires-Dist: scipy

{pyhcal-1.0.0 → pyhcal-1.0.2}/pyproject.toml

@@ -5,11 +5,13 @@ build-backend = "hatchling.build"
 [project]
 name = "pyhcal"
 urls = { "Homepage" = "https://github.com/mfratkin1/pyhcal" }  # ? Add this!
-version = "1.0.0"
+version = "1.0.2"
 dependencies = [
   "hspf",
   "mpcaHydro",
-  "geopandas"
+  "geopandas",
+  "scipy",
+  "matplotlib"
 ]
 requires-python = ">=3.8"
 authors = [
@@ -25,4 +27,9 @@ keywords = ["HSPF","Hydrology"]
 classifiers = [
   "Development Status :: 3 - Alpha",
   "Programming Language :: Python"
+]
+
+[tool.hatch.build]
+exclude = [
+  "/tests"
 ]

{pyhcal-1.0.0 → pyhcal-1.0.2}/src/pyhcal/calibrators.py

@@ -17,9 +17,9 @@ import numpy as np
 from pathlib import Path
 
 #My packages
-from pyhspf.hspfModel import hspfModel
-from pyhspf.wdm import wdmInterface
-from pyhspf import helpers
+from hspf.hspfModel import hspfModel
+from hspf.wdm import wdmInterface
+from hspf import helpers
 from mpcaHydro import data_manager as dm
 from pyhcal import metrics
 from pyhcal import figures
@@ -271,7 +271,34 @@ class calibrator:
 
         return df_agg
 
-    def landcover(self,constituent):
+    def landcover(cal,constituent,ref_landcover = None):
+        def normalize_group(group, ref_landcover):
+            if ref_landcover in group['LSID'].to_list():
+                ref_value = group.loc[group['LSID'] == ref_landcover, 'mean'].values[0]
+                group['mean_norm'] = group['mean'] / ref_value
+            else:
+                group['mean_norm'] = pd.NA
+            return group
+
+        if ref_landcover is None:
+            ref_landcover = cal.targets['uci_name'][cal.targets['dom_lc']==1].values[0]
+
+        df = cal.model.hbns.get_perlnd_data(constituent)*2000 #tons/ac/yr to lbs/acr/year
+        df = df[(df.index >= cal.start_date) & (df.index <= cal.end_date)]
+        df = df.mean().rename('mean').to_frame()
+        df = pd.merge(df, cal.uci.opnid_dict['PERLND'], left_index = True,right_on='TOPFST', how='inner')
+        df_normalized = pd.concat([normalize_group(group, ref_landcover) for _, group in list(df.groupby('metzone'))])
+        
+        targets = cal.targets.set_index('uci_name')[constituent]
+        targets = targets/targets.loc[ref_landcover]
+        
+        df_normalized['target'] = targets.loc[df_normalized['LSID']].values/df_normalized['mean_norm']
+        df_normalized = df_normalized.fillna(1) #don't make any changes to 0 concentration perlands
+        return df_normalized
+
+
+
+    def landcover_legacy(self,constituent):
         perlnd_names = self.model.uci.table('PERLND','GEN-INFO')['LSID']
         df = self.model.hbns.get_perlnd_data(constituent)*2000 #tons/ac/yr to lbs/acr/year
         df = df[(df.index >= self.start_date) & (df.index <= self.end_date)]

{pyhcal-1.0.0 → pyhcal-1.0.2}/src/pyhcal/repository.py

@@ -11,7 +11,7 @@ from pathlib import Path
 import shutil
 
 
-DEFUALT_REPOSITORY_PATH = Path('X:\Databases2\Water_Quality\Watershed_Modeling\MPCA_HSPF_Model_Repository') #could point to the github website if it becomes public?
+DEFUALT_REPOSITORY_PATH = Path('X:/Databases2/Water_Quality/Watershed_Modeling/MPCA_HSPF_Model_Repository') #could point to the github website if it becomes public?
 
 class Repository():
     

{pyhcal-1.0.0 → pyhcal-1.0.2}/src/pyhcal/setup_utils.py

@@ -5,8 +5,8 @@ Created on Wed Jun 15 15:21:35 2022
 @author: mfratki
 """
 from mpcaHydro.data_manager import dataManager
-from pyhspf.wdmReader import readWDM
-from pyhspf.uci import UCI
+from hspf.wdmReader import readWDM
+from hspf.uci import UCI
 from pyhcal.repository import Repository
 
 import numpy as np

pyhcal-1.0.0/.gitignore

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