py-ewr 2.3.4__tar.gz → 2.3.6__tar.gz

{py_ewr-2.3.4 → py_ewr-2.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: py_ewr
-Version: 2.3.4
+Version: 2.3.6
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -43,9 +43,10 @@ Dynamic: summary
 [![PyPI](https://img.shields.io/pypi/v/py-ewr)](https://pypi.org/project/py-ewr/)
 [![DOI](https://zenodo.org/badge/342122359.svg)](https://zenodo.org/badge/latestdoi/342122359)
 
-### **EWR tool version 2.3.4 README**
+### **EWR tool version 2.3.6 README**
 
 ### **Notes on recent version updates**
+- Including metadata report (this is still being ironed out and tested)
 - CLLMM_c and CLLMM_d ewrs are now able to be calculated without all barrage level gauges being present in the model file. 
 - Including draft objective mapping files in the package (see below sub heading **Objective mapping** for more information). Objective mapping has been therefore pulled out of the parameter sheet
 - Including an example parallel processing script for running the EWR tool

{py_ewr-2.3.4 → py_ewr-2.3.6}/README.md

@@ -3,9 +3,10 @@
 [![PyPI](https://img.shields.io/pypi/v/py-ewr)](https://pypi.org/project/py-ewr/)
 [![DOI](https://zenodo.org/badge/342122359.svg)](https://zenodo.org/badge/latestdoi/342122359)
 
-### **EWR tool version 2.3.4 README**
+### **EWR tool version 2.3.6 README**
 
 ### **Notes on recent version updates**
+- Including metadata report (this is still being ironed out and tested)
 - CLLMM_c and CLLMM_d ewrs are now able to be calculated without all barrage level gauges being present in the model file. 
 - Including draft objective mapping files in the package (see below sub heading **Objective mapping** for more information). Objective mapping has been therefore pulled out of the parameter sheet
 - Including an example parallel processing script for running the EWR tool

{py_ewr-2.3.4 → py_ewr-2.3.6}/py_ewr/evaluate_EWRs.py

@@ -837,6 +837,7 @@ def weirpool_handle(PU: str, gauge: str, EWR: str, EWR_table: pd.DataFrame, df_F
         tuple[pd.DataFrame, tuple[dict]]: EWR results for the current planning unit iteration (updated); dictionary of EWR event information
     
     '''
+
     # Get information about EWR (changes depending on the weirpool type):
     weirpool_type = data_inputs.weirpool_type(EWR)
     if weirpool_type == 'raising':
@@ -851,6 +852,7 @@ def weirpool_handle(PU: str, gauge: str, EWR: str, EWR_table: pd.DataFrame, df_F
     # If there is no level data loaded in, let user know and skip the analysis
     try:
         levels = df_L[EWR_info['weirpool_gauge']].values
+        
     except KeyError:
         print(f'''Cannot evaluate this ewr for {gauge} {EWR}, due to missing data. Specifically this EWR 
         also needs data for level gauge {EWR_info.get('weirpool_gauge', 'no wp gauge')}''')
@@ -4965,8 +4967,8 @@ def merge_weirpool_with_freshes(wp_freshes:List, PU_df:pd.DataFrame)-> pd.DataFr
         pd.DataFrame: Return Dataframe with the statistics of the merged EWR
     """
 
-    weirpool_pair = {'SF_WP':'WP3',
-                      'LF2_WP': 'WP4' }
+    weirpool_pair = {'SF-WP':'WP3',
+                      'LF2-WP': 'WP4' }
 
     for fresh in wp_freshes:
         try:
@@ -5006,7 +5008,7 @@ def merge_weirpool_with_freshes(wp_freshes:List, PU_df:pd.DataFrame)-> pd.DataFr
             column_attributes = list(set([col.split("_")[-1] for col in PU_df.columns if "eventYears" not in col]))
             for col in column_attributes:
                 PU_df[f"{fresh}/{weirpool_pair[fresh]}_{col}"] = np.nan
-
+    
     return PU_df
 
 # make handling function available to process
@@ -5133,6 +5135,7 @@ def calc_sorter(df_F:pd.DataFrame, df_L:pd.DataFrame, gauge:str, EWR_table:pd.Da
         EWR_codes = PU_table['Code']
         PU_df = pd.DataFrame()
         PU_events = {}
+
         for i, EWR in enumerate(EWR_codes):
             events = {}
 
@@ -5165,10 +5168,10 @@ def calc_sorter(df_F:pd.DataFrame, df_L:pd.DataFrame, gauge:str, EWR_table:pd.Da
             PU_df, events = handle_function(**kwargs)
             if events != {}:
                 PU_events[str(EWR)]=events
-        
-        wp_freshes = [ewr for ewr in EWR_codes if ewr in ["SF_WP","LF2_WP"]]
-        if wp_freshes:
-            PU_df = merge_weirpool_with_freshes(wp_freshes, PU_df)
+
+        # wp_freshes = [ewr for ewr in EWR_codes.to_list() if ewr in ["SF-WP","LF2-WP"]]
+        # if wp_freshes:
+        #     PU_df = merge_weirpool_with_freshes(wp_freshes, PU_df)
             
         PU_name = PU_items['PlanningUnitName'].loc[PU_items[PU_items['PlanningUnitID'] == PU].index[0]]