pyhcal 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

pyhcal/calibrators.py

@@ -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.1.dist-info → pyhcal-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhcal
-Version: 1.0.1
+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>

{pyhcal-1.0.1.dist-info → pyhcal-1.0.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyhcal/__init__.py,sha256=4TEpGD-PfEY8yK-od8DpEMA4_iQ-q9y0PBvROXSPdB0,94
-pyhcal/calibrators.py,sha256=PIQ32zVmZlgKCg3XTyEKfPyYFvtQYgdal1QOrVf918I,29958
+pyhcal/calibrators.py,sha256=O2m29Qat74g0AVPFABPoQXDCqosWqh1YBJfFdiWPdxU,31328
 pyhcal/figures.py,sha256=Iu7LaN_i2IuDA_nfxj-a8AkG-FTLZVicJ3-efIs5OiE,45534
 pyhcal/metrics.py,sha256=GUGHd-op-g1Foj8wnS_JVURSms4ifcC0a5h8ketQ29I,17911
 pyhcal/modl_db.py,sha256=0NoWNNxfbF1fy43geOO4EJt-Uev6Og4Hw-KNn9xvAys,3163
@@ -9,6 +9,6 @@ pyhcal/data/HUC_Names.csv,sha256=UGmd3Q5E8DyFWggXzaXWpsRze7sFyrlpYqaYpMWAiGM,189
 pyhcal/data/WISKI_EQUIS_XREF.csv,sha256=bPYq-f4-Qc6jsvUgl81lwXBeFamfDe5TjohqUV1XJlg,1244704
 pyhcal/data/stations_EQUIS.gpkg,sha256=KyWMRbNoSSMDB1IweoLhyFeKu1P-YoYpQbXna6VYp8I,3284992
 pyhcal/data/stations_wiski.gpkg,sha256=HlH5EwUo9qEEoxtbEpL0cJZHEW57XEUA-ROy4sN7eE4,892928
-pyhcal-1.0.1.dist-info/METADATA,sha256=N4mSt9_1dhUsS8i7_61Fv6JPFfaAnteTJrrr0qkBFDU,560
-pyhcal-1.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pyhcal-1.0.1.dist-info/RECORD,,
+pyhcal-1.0.2.dist-info/METADATA,sha256=WAKZkD6p_xoX6-cX3EM3d7-zFGO_ANJzlNvbSvozQFE,560
+pyhcal-1.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pyhcal-1.0.2.dist-info/RECORD,,