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

py_ewr/evaluate_EWRs.py

@@ -1150,31 +1150,34 @@ def barrage_level_handle(PU: str, gauge: str, EWR: str, EWR_table: pd.DataFrame,
     """
     barrage_level_gauges = data_inputs.get_barrage_level_gauges()
     all_required_gauges = barrage_level_gauges.get(gauge)
+    # if all_required_gauges:
+    #     all_required_gauges_in_df_L = all(gauge in df_L.columns for gauge in all_required_gauges)
     if all_required_gauges:
-        all_required_gauges_in_df_L = all(gauge in df_L.columns for gauge in all_required_gauges)
-    # check if current gauge is the main barrage gauge
-        if all_required_gauges_in_df_L:
-            pull = data_inputs.get_EWR_components('barrage-level')
-            EWR_info = get_EWRs(PU, gauge, EWR, EWR_table, pull)
-            masked_dates = mask_dates(EWR_info, df_L)
-            # Extract a daily timeseries for water years:
-            water_years = wateryear_daily(df_L, EWR_info)
-            # If there is no level data loaded in, let user know and skip the analysis
-            df = df_L.copy(deep=True)
-            # calculate 5 day moving average and average of all required gauges
-            df_5_day_averages = calculate_n_day_moving_average(df,5)
-            df_5_day_averages['mean'] = df[all_required_gauges].mean(axis=1)
-            cllmm_type = what_cllmm_type(EWR_info)
-            if cllmm_type == 'c':
-                E, D = lower_lakes_level_calc(EWR_info, df_5_day_averages['mean'], water_years, df_L.index, masked_dates)
-            if cllmm_type == 'd':
-                E, D = coorong_level_calc(EWR_info, df_5_day_averages['mean'], water_years, df_L.index, masked_dates)
+        all_required_gauges_in_df_L = [gauge for gauge in all_required_gauges if gauge in df_L.columns] 
+        #NOTE as all_required_gauges_in_df_L is boolean, the indexing is stil including all gauges in all_required_gauges.
+        # directly subset and use all_required_gauges_in_df_L as the new list. 
+    if all_required_gauges_in_df_L:
+        pull = data_inputs.get_EWR_components('barrage-level')
+        EWR_info = get_EWRs(PU, gauge, EWR, EWR_table, pull)
+        masked_dates = mask_dates(EWR_info, df_L)
+        # Extract a daily timeseries for water years:
+        water_years = wateryear_daily(df_L, EWR_info)
+        # If there is no level data loaded in, let user know and skip the analysis
+        df = df_L.copy(deep=True)
+        # calculate 5 day moving average and average of all required gauges
+        df_5_day_averages = calculate_n_day_moving_average(df,5)
+        df_5_day_averages['mean'] = df[all_required_gauges_in_df_L].mean(axis=1)
+        cllmm_type = what_cllmm_type(EWR_info)
+        if cllmm_type == 'c':
+            E, D = lower_lakes_level_calc(EWR_info, df_5_day_averages['mean'], water_years, df_L.index, masked_dates)
+        if cllmm_type == 'd':
+            E, D = coorong_level_calc(EWR_info, df_5_day_averages['mean'], water_years, df_L.index, masked_dates)
         
         PU_df = event_stats(df_L, PU_df, gauge, EWR, EWR_info, E, D, water_years)    
         return PU_df, tuple([E])
 
     else:
-        print(f'skipping calculation because gauge {" ".join(all_required_gauges)} is not the main barrage level gauge ')
+        print(f'skipping calculation because gauge {" ".join(all_required_gauges)} is not the main barrage level gauge ') #TODO: improve error message
         return PU_df, None
 
 def rise_and_fall_handle(PU: str, gauge: str, EWR: str, EWR_table: pd.DataFrame, df_F: pd.DataFrame, df_L: pd.DataFrame, PU_df: pd.DataFrame) -> tuple:

py_ewr/model_metadata/SiteID_MDBA.csv

@@ -1347,6 +1347,7 @@ LOCK7US,River Murray U/S Lock 7,,426508,5
 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
 LOCK9DS,River Murray D/S Lock 9,,4260505,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
@@ -2695,7 +2696,9 @@ Pattos Pipe,Pattos Pipe,North Redbank,Pattos Pipe,2
 Pump direct from river,Pump direct from river,"North Redbank, pumped direct from river",Pump direct from river,2
 Pumped from Yanga Lake,Pumped from Yanga Lake,Yanga (South  Redbank),Pumped from Yanga Lake,2
 410738,Murrumbidgee River at Mt. MacDonald,"ACT - Environment, Planning and Sustainable Development Directorate",410738,3
+11UBMAC,Murrumbidgee River at Mt. MacDonald,"ACT - Environment, Planning and Sustainable Development Directorate",410738,3
 410761,Murrumbidgee River below Lobbs Hole Creek,"ACT - Environment, Planning and Sustainable Development Directorate",410761,3
+11UBLOB,Murrumbidgee River below Lobbs Hole Creek,"ACT - Environment, Planning and Sustainable Development Directorate",410761,3
 410700,Cotter River at Kiosk,ACT - Icon Water Limited,410700,3
 410747,Cotter River below Bendora Dam,ACT - Icon Water Limited,410747,3
 410752,Cotter River below Corin Dam,ACT - Icon Water Limited,410752,3

{py_ewr-2.3.1.dist-info → py_ewr-2.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_ewr
-Version: 2.3.1
+Version: 2.3.3
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -34,9 +34,10 @@ Requires-Dist: numpy<2
 [![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.1 README**
+### **EWR tool version 2.3.3 README**
 
 ### **Notes on recent version updates**
+- 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
 - Adding handling for cases where there are single MDBA bigmod site IDs mapping to multiple different gauges

{py_ewr-2.3.1.dist-info → py_ewr-2.3.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 py_ewr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_ewr/data_inputs.py,sha256=oUiEiLY_CmbvqF5GlV-3Yfz_JZ1qZNvta-VEYCzAcso,20124
-py_ewr/evaluate_EWRs.py,sha256=bAhFZTQZkoAE2eKgNIomm1LJdZ2HihoygUnXybtEdm4,231326
+py_ewr/evaluate_EWRs.py,sha256=pCIqWysUuM-HbYn6U9bQnrHMhTl2CVhjWanpGJ6l0pc,231584
 py_ewr/io.py,sha256=Is0xPAzLx6-ylpTFyYJxMimkNVxxoTxUcknTk6bQbgs,840
 py_ewr/observed_handling.py,sha256=JTSK_2obhqNWJ2QknykywevNMN0fsvGXSejFwUSpMoA,18112
 py_ewr/scenario_handling.py,sha256=veaiQ6vfQX40laUk3eEUFWqO3wceP76Wh92HhJFsl8A,35762
 py_ewr/summarise_results.py,sha256=rFaAUVR4jIsjeRl4ocPFE2RUoJJBZgZ2wPEBh-dfEsc,31761
-py_ewr/model_metadata/SiteID_MDBA.csv,sha256=QDIW21IFX1MYxDvs6Aja-OOUBhgnNa8l-NnCpQMmBl4,168430
+py_ewr/model_metadata/SiteID_MDBA.csv,sha256=1g1PtqDNXl-8B-BGBd6BhUZfD2ZobftEjq97E5PNwkQ,168728
 py_ewr/model_metadata/SiteID_NSW.csv,sha256=UVBxN43Z5KWCvWhQ5Rh6TNEn35q4_sjPxKyHg8wPFws,6805
 py_ewr/model_metadata/iqqm_stations.csv,sha256=vl4CPtPslG5VplSzf_yLZulTrmab-mEBHOfzFtS1kf4,110
 py_ewr/parameter_metadata/ewr2obj.csv,sha256=r2uXzhZ-Rd1u3RLhNXmJnPYcHwouHBehEPnvednfz-I,3948677
@@ -13,8 +13,8 @@ py_ewr/parameter_metadata/ewr_calc_config.json,sha256=l1AgIRlf7UUmk3BNQ4r3kutU48
 py_ewr/parameter_metadata/obj2target.csv,sha256=f6kLVyBhXUpGR4b0dzLbBvZbfpn3OxOhaB4aouO6Bvw,1593877
 py_ewr/parameter_metadata/obj2yrtarget.csv,sha256=G8XgdCrOpB0xhp6n7DIS4Vcq69Kpgb1Pum7Ay3a_YPU,54882
 py_ewr/parameter_metadata/parameter_sheet.csv,sha256=MxKE-649bIC6HGqh87MT_fR3Lmew8n10Oi6OsAF1N0Q,768524
-py_ewr-2.3.1.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
-py_ewr-2.3.1.dist-info/METADATA,sha256=QAW_W9RLEq6SXwpl68WRObU7cEUq_MCpygk8cDkAFtQ,12585
-py_ewr-2.3.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-py_ewr-2.3.1.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
-py_ewr-2.3.1.dist-info/RECORD,,
+py_ewr-2.3.3.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
+py_ewr-2.3.3.dist-info/METADATA,sha256=S6B3jls9O5zaR0E8__GRzvcTToKrpqeSh6QgKSCWop0,12709
+py_ewr-2.3.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+py_ewr-2.3.3.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
+py_ewr-2.3.3.dist-info/RECORD,,