py-ewr 2.3.2__py3-none-any.whl → 2.3.4__py3-none-any.whl

py_ewr/evaluate_EWRs.py

@@ -1148,7 +1148,6 @@ def barrage_level_handle(PU: str, gauge: str, EWR: str, EWR_table: pd.DataFrame,
     Returns:
         tuple[pd.DataFrame, tuple[dict]]: EWR results for the current planning unit iteration (updated); dictionary of EWR event information
     """
-    print(df_L.head())
     barrage_level_gauges = data_inputs.get_barrage_level_gauges()
     all_required_gauges = barrage_level_gauges.get(gauge)
     # if all_required_gauges:

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
@@ -2696,7 +2697,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/parameter_metadata/ewr_calc_config.json

@@ -517,7 +517,19 @@
         "BF4-single-F",
         "BF5-single-F",
         "BF_FD1-single-F",
-        "BF_FD2-single-F"
+        "BF_FD2-single-F",
+        "BF1_1-single-F",
+        "BF1_2-single-F",
+        "BF1_3-single-F",
+        "BF1_4-single-F",
+        "BF1_5-single-F",
+        "BF1_6-single-F",
+        "BF1_7-single-F",
+        "BF1_8-single-F",
+        "BF1_9-single-F",
+        "BF1_10-single-F",
+        "BF1_11-single-F",
+        "BF1_12-single-F"
     ],
     "ctf_handle_multi": [
         "CF-multigauge-F"
@@ -663,4 +675,4 @@
     "level_change_handle": [
         "FLR-single-L"
     ]
-}
+}

py_ewr/scenario_handling.py

@@ -336,7 +336,7 @@ def cleaner_standard_timeseries(input_df: pd.DataFrame, ewr_table_path: str = No
             log.info('Could not identify gauge in column name:', gauge, ', skipping analysis of data in this column.')
     return df_flow, df_level
 
-def cleaner_netcdf_werp(input_df: pd.DataFrame, stations: dict) -> pd.DataFrame:
+def cleaner_netcdf_werp(input_df: pd.DataFrame, stations: dict,  ewr_table_path: str) -> pd.DataFrame:
 
     '''Ingests dataframe, cleans up into a format matching IQQM csv
     
@@ -370,8 +370,8 @@ def cleaner_netcdf_werp(input_df: pd.DataFrame, stations: dict) -> pd.DataFrame:
     cleaned_df.index.names = ['Date']
 
     # Split gauges into flow and level, allocate to respective dataframe
-    flow_gauges = data_inputs.get_gauges('flow gauges')
-    level_gauges = data_inputs.get_gauges('level gauges')
+    flow_gauges = data_inputs.get_gauges('flow gauges', ewr_table_path=ewr_table_path)
+    level_gauges = data_inputs.get_gauges('level gauges', ewr_table_path=ewr_table_path)
     df_flow = pd.DataFrame(index = cleaned_df.index)
     df_level = pd.DataFrame(index = cleaned_df.index)
     for gauge in cleaned_df.columns:
@@ -455,7 +455,7 @@ def match_MDBA_nodes(input_df: pd.DataFrame, model_metadata: pd.DataFrame, ewr_t
     df_flow = pd.DataFrame(index = input_df.index)
     df_level = pd.DataFrame(index = input_df.index)
 
-    unique_gauges = data_inputs.get_gauges('all gauges')
+    unique_gauges = data_inputs.get_gauges('all gauges', ewr_table_path=ewr_table_path)
     flow_gauges = data_inputs.get_gauges('flow gauges', ewr_table_path=ewr_table_path)
     level_gauges = data_inputs.get_gauges('level gauges', ewr_table_path=ewr_table_path)
     
@@ -534,7 +534,7 @@ def match_MDBA_nodes(input_df: pd.DataFrame, model_metadata: pd.DataFrame, ewr_t
 
 #     return df_flow, df_level
 
-def match_NSW_nodes(input_df: pd.DataFrame, model_metadata: pd.DataFrame) -> tuple:
+def match_NSW_nodes(input_df: pd.DataFrame, model_metadata: pd.DataFrame, ewr_table_path: str) -> tuple:
     '''Checks if the source file columns have EWRs available, returns a flow and level dataframe with only 
     the columns with EWRs available. Renames columns to gauges
     
@@ -546,8 +546,8 @@ def match_NSW_nodes(input_df: pd.DataFrame, model_metadata: pd.DataFrame) -> tup
         tuple[pd.DataFrame, pd.DataFrame]: flow dataframe, water level dataframe
     
     '''
-    flow_gauges = data_inputs.get_gauges('flow gauges')
-    level_gauges = data_inputs.get_gauges('level gauges')
+    flow_gauges = data_inputs.get_gauges('flow gauges', ewr_table_path=ewr_table_path)
+    level_gauges = data_inputs.get_gauges('level gauges', ewr_table_path=ewr_table_path)
     df_flow = pd.DataFrame(index = input_df.index)
     df_level = pd.DataFrame(index = input_df.index)
     for col in input_df.columns:
@@ -622,7 +622,7 @@ class ScenarioHandler:
 
             elif self.model_format == 'IQQM - netcdf':
                 df_unpacked = unpack_netcdf_as_dataframe(scenarios[scenario])
-                df_F, df_L = cleaner_netcdf_werp(df_unpacked, data_inputs.get_iqqm_codes())
+                df_F, df_L = cleaner_netcdf_werp(df_unpacked, data_inputs.get_iqqm_codes(),self.parameter_sheet)
 
             elif self.model_format == 'ten thousand year':
                 df = pd.read_csv(scenarios[scenario], index_col = 'Date')
@@ -808,4 +808,4 @@ class ScenarioHandler:
         if not self.pu_ewr_statistics:
             self.process_scenarios()
 
-        return summarise_results.summarise(self.pu_ewr_statistics , self.yearly_events, parameter_sheet_path=self.parameter_sheet)
+        return summarise_results.summarise(self.pu_ewr_statistics , self.yearly_events, parameter_sheet_path=self.parameter_sheet)

{py_ewr-2.3.2.dist-info → py_ewr-2.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: py_ewr
-Version: 2.3.2
+Version: 2.3.4
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -28,13 +28,22 @@ Requires-Dist: xarray
 Requires-Dist: h5py
 Requires-Dist: netCDF4
 Requires-Dist: numpy<2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary
 
 [![CI](https://github.com/MDBAuth/EWR_tool/actions/workflows/test-release.yml/badge.svg)]()
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/py-ewr)](https://pypi.org/project/py-ewr/)
 [![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.2 README**
+### **EWR tool version 2.3.4 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. 

{py_ewr-2.3.2.dist-info → py_ewr-2.3.4.dist-info}/RECORD

@@ -1,20 +1,20 @@
 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=KESFs1boNuq2FPPgoZY_fqWpENFI39taPyv-0ePAD3s,231607
+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/scenario_handling.py,sha256=D4P1rqrD6_3pwhifHCVVdLSEKsNI4VVzPu60g7ZyRXk,35982
 py_ewr/summarise_results.py,sha256=rFaAUVR4jIsjeRl4ocPFE2RUoJJBZgZ2wPEBh-dfEsc,31761
-py_ewr/model_metadata/SiteID_MDBA.csv,sha256=X5bFFYRkmQWqV05tWtij9OphwlonzxcpzYebTz4waqI,168474
+py_ewr/model_metadata/SiteID_MDBA.csv,sha256=orbh3QIRbOkUjCB2hcdpeUvhepnY_3ywldu22s45d5Y,168771
 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
-py_ewr/parameter_metadata/ewr_calc_config.json,sha256=l1AgIRlf7UUmk3BNQ4r3kutU48pYHHVKmLELjoB-8rQ,17664
+py_ewr/parameter_metadata/ewr_calc_config.json,sha256=NbhbB_fO0j191XDiz-2TxNasQGGe69FdhLyD0ZMj2eg,17980
 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.2.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
-py_ewr-2.3.2.dist-info/METADATA,sha256=7SxKbPMv5Ue-p95_mUws2xSs11TrHAOzfDAIeXi3CIE,12709
-py_ewr-2.3.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-py_ewr-2.3.2.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
-py_ewr-2.3.2.dist-info/RECORD,,
+py_ewr-2.3.4.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
+py_ewr-2.3.4.dist-info/METADATA,sha256=dcU2egWhsIje0d-nFTKImRkNusWuguvndhV40ixSqVg,12902
+py_ewr-2.3.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+py_ewr-2.3.4.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
+py_ewr-2.3.4.dist-info/RECORD,,

{py_ewr-2.3.2.dist-info → py_ewr-2.3.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any