py-ewr 2.3.9__py3-none-any.whl → 2.4.0__py3-none-any.whl

py_ewr/model_metadata/EWR_Sitelist_FIRM_20250718.csv

@@ -46,7 +46,7 @@ N/A,410014,11CLMOR,Colombo Creek @ Morundah,,F
 410015,410015,11YNMOR,Yanco Creek @ Morundah,1,F
 410016,410016,11FGJER,Billabong Creek at Jerilderie,1,F
 410021,410021,11GFDAR,Murrumbidgee River at Darlington Point,1,F
-N/A,410033,11UBMIT,Murrumbidgee River at Mittagang,,F
+410033,410033,11UBMIT,Murrumbidgee River at Mittagang,1,F
 410040,410040,11FGMAU,Murrumbidgee River D/S Maude Weir,1,F
 410093,410093,11GFKYW,Old Man Ck @ Kywong,1,F
 410130,410130,11FGBLW,Murrumbidgee River D/S Balranald,1,F
@@ -84,7 +84,7 @@ ASHFDG,416006,5ASHFDG,Severn River @ Ashford,1,F
 BONSHW,416007,5BONSHW,Dumaresq River @ Bonshaw Weir,1,F
 HAYSTCK,416008,5BEARRI,Beardy River at Haystack,1,F
 FWALLG,416010,5FWALLG,Macintyre River @ Wallangra,1,F
-ROSEN2,416011,5ROSEN2,Dumaresq River @ Roseneath,1,F
+ROSEN2,416011,5ROSEN2,Dumaresq River @ Roseneath (416011),1,F
 N/A,416011,,Dumaresq River @ Roseneath,,L
 HOLDFG,416012,5HOLDFG,Macintyre River @ Holdfast (Yelarbon Crossing),1,F
 BOOBSND,416415A,,Macintyre River @ Booba Sands,1,F
@@ -253,3 +253,12 @@ N/A,,WMWIMM,Wimmera - Private Unreg. Irrigation,,
 ,__WRBC2,__WRBC2,Wimmera River System Model Node WR_BC2,,
 ,__WRMK1,__WRMK1,Wimmera River System Model Node WR_MK1,,
 ,__WRYC1,__WRYC1,Wimmera River System Model Node WR_YC1,,
+MTWLKLD,415203,,Mt William Creek @ Lake Lonsdale Tail Gauge 415203: Downstream Flow,1,F
+GOWANG,404224,404224,,1,F
+406201,406201,406201,,1,F
+MTWLKLD,415203,415203,,1,F
+WIMLOC,415246,415246,,1,F
+MCKENCK,415251,415251,,1,F
+WAKJUNC,414200,414200,,1,F
+COLGNAN,414207,414207,,1,F
+COLGNAN,414207,414207,,35,L

py_ewr/observed_handling.py

@@ -168,6 +168,7 @@ class ObservedHandler:
         self.calc_config_path = calc_config_path
         self.flow_data = None
         self.level_data = None
+        self.gauge_data =None
 
     def process_gauges(self):
         '''ingests a list of gauges and user defined parameters
@@ -186,10 +187,12 @@ class ObservedHandler:
         # Call state API for flow and level gauge data, then combine to single dataframe
         log.info(f'Including gauges: flow gauges: { ", ".join(flow_gauges)} level gauges: { ", ".join(level_gauges)} lake level gauges: { ", ".join(lake_level_gauges)}')
         
-        flows = gg.gauge_pull(flow_gauges, start_time_user = self.dates['start_date'], end_time_user = self.dates['end_date'], var = 'F')
-        levels = gg.gauge_pull(level_gauges, start_time_user = self.dates['start_date'], end_time_user = self.dates['end_date'], var = 'L')
-        lake_levels = gg.gauge_pull(lake_level_gauges, start_time_user=self.dates['start_date'], end_time_user=self.dates['end_date'], var='LL')
+        flows = gg.gauge_pull(flow_gauges, start_time_user = self.dates['start_date'], end_time_user = self.dates['end_date'], var = 'F' )#data_source="BOM")
+        levels = gg.gauge_pull(level_gauges, start_time_user = self.dates['start_date'], end_time_user = self.dates['end_date'], var = 'L')# data_source="BOM")
+        lake_levels = gg.gauge_pull(lake_level_gauges, start_time_user=self.dates['start_date'], end_time_user=self.dates['end_date'], var='LL')# data_source="BOM")
 
+        self.gauge_data=pd.concat([flows,levels,lake_levels])
+        
         # Clean observed data:
         df_F = observed_cleaner(flows, self.dates)
         df_L = observed_cleaner(levels, self.dates)
@@ -217,7 +220,21 @@ class ObservedHandler:
         self.flow_data = df_F
         self.level_data = df_L
 
-
+    def get_gauge_data(self)-> pd.DataFrame:
+        if not self.yearly_events:
+            self.process_gauges()
+        return self.gauge_data
+    
+    def get_gauge_data_flow(self)-> pd.DataFrame:
+        if not self.yearly_events:
+            self.process_gauges()
+        return self.flow_data
+    
+    def get_gauge_data_level(self)-> pd.DataFrame:
+        if not self.yearly_events:
+            self.process_gauges()
+        return self.level_data
+        
     def get_all_events(self)-> pd.DataFrame:
 
         if not self.yearly_events:
@@ -379,4 +396,4 @@ class ObservedHandler:
         if not self.pu_ewr_statistics:
             self.process_gauges()
 
-        return summarise_results.summarise(self.pu_ewr_statistics , self.yearly_events)
+        return summarise_results.summarise(self.pu_ewr_statistics , self.yearly_events)

py_ewr/parameter_metadata/ewr_calc_config.json

@@ -24,6 +24,7 @@
         "LF1_S-single-F",
         "LF1_P-single-F",
         "LF2-single-F",
+        "BK-single-F",
         "BK1-single-F",
         "OB1-single-F",
         "OB1_a-single-F",
@@ -42,12 +43,15 @@
         "OB4_S-single-F",
         "AC1-single-F",
         "OB5-single-F",
+        "OB6-single-F",
+        "OB7-single-F",
         "LF3_P-single-F",
         "LF3_S-single-F",
         "OB4-single-F",
         "DSF-single-F",
         "OB-WS3_S-single-F",
         "OB-WS3_P-single-F",
+        "SF-single-F",
         "SF1-single-F",
         "LF1-single-F",
         "OB-WS3-single-F",
@@ -113,8 +117,11 @@
         "OB2-WHA_S-single-F",
         "SF1_a_P-single-F",
         "SF1_a_S-single-F",
+        "SF1_a-single-F",
         "SF1_b_P-single-F",
         "SF1_b_S-single-F",
+        "SF1_b-single-F",
+        "SF1_c-single-F",
         "LF5_P-single-F",
         "LF5_S-single-F",
         "OB-S2-single-F",
@@ -427,6 +434,7 @@
         "Wetland1-single-F",
         "Wetland2-single-F",
         "Wetland3-single-F",
+        "Wetland-single-F",
         "F4-single-F",
         "F5-single-F",
         "F6-single-F",