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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: py_ewr
-Version: 2.3.3
+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.3 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.3 → py_ewr-2.3.4}/README.md

@@ -3,7 +3,7 @@
 [![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.3 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.3 → py_ewr-2.3.4}/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

{py_ewr-2.3.3 → py_ewr-2.3.4}/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-2.3.3 → py_ewr-2.3.4}/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.3 → py_ewr-2.3.4}/py_ewr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: py_ewr
-Version: 2.3.3
+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.3 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.3 → py_ewr-2.3.4}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="py_ewr",
-    version="2.3.3",
+    version="2.3.4",
     author="Martin Job",
     author_email="Martin.Job@mdba.gov.au",
     description="Environmental Water Requirement calculator",

{py_ewr-2.3.3 → py_ewr-2.3.4}/tests/test_scenario_handling.py

@@ -257,7 +257,7 @@ def test_match_NSW_nodes():
     df = pd.DataFrame(data = data_df)
     df = df.set_index('Date')
     
-    df_F, df_L = scenario_handling.match_NSW_nodes(df, model_metadata)
+    df_F, df_L = scenario_handling.match_NSW_nodes(df, model_metadata,None)
     
     # Set up expected outputs and test:
     data_expected_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))}
@@ -407,14 +407,13 @@ def test_cleaner_netcdf_werp():
     1. check ncdf is unpacked correctly
     '''
     df = scenario_handling.unpack_netcdf_as_dataframe('unit_testing_files/werp_ncdf.nc')
-    df_F, df_L = scenario_handling.cleaner_netcdf_werp(df, data_inputs.get_iqqm_codes())
+    df_F, df_L = scenario_handling.cleaner_netcdf_werp(df, data_inputs.get_iqqm_codes(), None)
 
     # the test ncdf is too big to mock, so check properties
     assert df_F.dtypes.iloc[0] == 'float32'
     assert isinstance(df_F.index, pd.DatetimeIndex)
     assert all(df_F.columns == ['421001', '421004', '421012', '421019', '421022', '421023', '421090', '421146'])
 
-
 def test_csv_input():
     '''
     1. check we can feed scenario_handling a csv that looks like gauge data