py-ewr 2.3.3__py3-none-any.whl → 2.3.5__py3-none-any.whl

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]]
         

py_ewr/model_metadata/SiteID_MDBA.csv

@@ -847,7 +847,7 @@ EUROBIN,Ovens River at Eurobin,,403250A,4
 EURSTP,Euroa STP,,,4
 EUS2MIL,Euston to Mildura Reach,,,
 EUSTDS,River Murray D/S Euston Weir,,414203,4
-EUSTON ,River Murray U/S Euston Weir,,414209,4
+EUSTON,River Murray U/S Euston Weir,,414209,4
 EUSTUS,River Murray U/S Euston Weir,,414209,4
 EWDFFCL,Env water Flora Fauna -Cardross Lakes,Environmental Water Deliveries from Flora & Fauna Ent,,4
 EWEI,Lake Alexandrina U/S Ewe Island and Barrages,Ewe Island Dual Vertical Slot fishway,,5
@@ -1348,8 +1348,9 @@ LOCK7US,River Murray U/S Lock 7,,A4260508,5
 LOCK8DS,River Murray D/S Lock 8,,4260507,5
 LOCK8US,River Murray U/S Lock 8,,426506,5
 LOCK8US,River Murray U/S Lock 8,,A426506,5
+LOCK8US,River Murray U/S Lock 8,,A4260506,5
 LOCK9DS,River Murray D/S Lock 9,,4260505,5
-LOCK 9 ,River Murray U/S Lock 9,SAMPLE AT GAUGING STATION,A4260501,5
+LOCK 9,River Murray U/S Lock 9,SAMPLE AT GAUGING STATION,A4260501,5
 LOCK9US,River Murray U/S Lock 9,SAMPLE AT GAUGING STATION,A4260501,5
 LOCKING,Lockington Main Drain,Lockington Main Drain Shepparton,407712,4
 LOCKRIC,Lockington Main Drain adj to Richardsons,Lockington Main Drain adjacent to Richardsons,,4