py-ewr 2.1.5__py3-none-any.whl → 2.1.7__py3-none-any.whl

py_ewr/model_metadata/SiteID_MDBA.csv

@@ -386,6 +386,7 @@ BREMWAR,Bremer River U/S Wandstead Road,Bremer River us Wandstead Road,A4261173,
 BREMWKR,Bremer River at Woodstock Road,Bremer River at Woodstock Road,A4261071,5
 BRENDA,Culgoa River at Brenda,BSMS EOV target site,422015,2
 422015_,Culgoa River at Brenda,BSMS EOV target site,422015,2
+422015A,Culgoa River at Brenda,BSMS EOV target site,422015,2
 422013A,BIRRIE RIVER AT NEAR GOODOOGA,BSMS EOV target site,422013,2
 BRESDRN,BERRI EAST DRAINAGE OUTFALL,BERRI EAST DRAINAGE OUTFALL DIRECTLY TO R.MURRAY,,5
 BRESTP,Brewarrina STP,,,2
@@ -493,8 +494,10 @@ CAPELXG,Barr Ck at Capels Crossing,Barr Ck at Capels Crossing (not the flume),40
 CAPFSTP,Captain's Flat STP,,,2
 CARCOAR,Carcoar Reservoir on Lachlan System,,,2
 CARIMAR,Marthaguy Creek at Carinda,,421011,2
+8CARMAR,Marthaguy Creek at Carinda,,421011,2
 CARIMET,Carinda (Post Office),,51007,2
 CARINDA,Macquarie River at Carinda (Bells Bridge),,421012,2
+8FGCARR,Macquarie River at Carinda (Bells Bridge),,421012,2
 CAROLE,Carole Creek Outflow -Gwydir System,Carole Creek @ near Garah,418052,2
 CAROMET,Walgett (Old Boorooma),,48231,2
 CARYELT,Carwarp/Yelta WWD,Carwarp/Yelta WWD - Sunraysia,,
@@ -911,6 +914,7 @@ GOLHGT,Golden Heights - Major Pumping Stattion,Major Irrigation Pumping Station
 GOLWAB2,Goolwa Vertical Slot No 2,,,
 GOMUBRC,Goulburn �to River Murray via Broken Ck,Goulburn Valley Account Transfer to River Murray,,4
 GONGOLG,Bogan River at Gongolgon,,421023,2
+8GONGOG,Bogan River at Gongolgon,,421023,2
 GOOBMET,Goolwa Barrages - BOM station,,23825,5
 GOOCHBD,Goolwa Channel at Goolwa Barrage (D/S),Goolwa Channel at Goolwa Barrage (D/S),A4261035,5
 GOOCOT,Water transferred from Googong Dam to Cotter Sys,Water transferred from Googong Dam to Cotter System,,3
@@ -1627,6 +1631,7 @@ MUNDDS,LAKE ALEXANDRINA D/S MUNDOO BARRAGES,,A4260526,5
 MUNDIWA,CULGOA RIVER U/S COLLERINA (MUNDIWA),,422011,2
 MUNDOO,LAKE ALEXANDRINA U/S MUNDOO BARRAGES,,A4261042,5
 MUNGIND,Barwon River - Mungindi,,416001,1
+9INMUNG,Barwon River - Mungindi,,416001,1
 MUNGMET,Mungindi (Post Office),,52020,2
 MUNGSTP,Mungallala STP,,,1
 MUPCRDS,Upper Potterwalkage Creek Regulator D/S,,,
@@ -2268,6 +2273,7 @@ TUMSTP,Tumut STP,,,2
 TUMURDS,Tumudgery Regulator D/S,Millewa monitoring site,40922002,
 TUMUREG,Tumudgery River Regulator,River Regulator settings - Edward River - NSW National Parks,40922002,2
 TUMUT,Tumut River @ Tumut,,410006,2
+11GFTUM,Tumut River @ Tumut,,410006,2
 TUMUT1,Release From TumutT 1 Power Station,RECEIVED FROM SMHEA COOMA,,2
 TUMUTPD,Tumut Pondage,Snowy Hydro Limited,,2
 TUNGAMA,Boosey Creek at Tungamah (ML),,,4

py_ewr/observed_handling.py

@@ -12,6 +12,7 @@ from mdba_gauge_getter import gauge_getter as gg
 log = logging.getLogger(__name__)
 log.addHandler(logging.NullHandler())
 
+
 def categorise_gauges(gauges: list, ewr_table_path:str = None) -> tuple:
     '''Separate gauges into level, flow, or both
     
@@ -28,28 +29,29 @@ def categorise_gauges(gauges: list, ewr_table_path:str = None) -> tuple:
 
     EWR_TABLE, _ = data_inputs.get_EWR_table(ewr_table_path)
     
-    if ewr_table_path:
-        level_gauges_to_add = EWR_TABLE[EWR_TABLE['GaugeType']=='L']['Gauge'].to_list()
-        # only add gauges if in the incoming list
-        for gauge in level_gauges_to_add:
+    # if ewr_table_path:
+    level_gauges_to_add = EWR_TABLE[EWR_TABLE['GaugeType']=='L']['Gauge'].to_list()
+    # only add gauges if in the incoming list
+    for gauge in level_gauges_to_add:
+        if gauge in gauges:
+            level_gauges.append(gauge)
+    lake_level_gauges_to_add = EWR_TABLE[EWR_TABLE['GaugeType']=='LL']['Gauge'].to_list()
+    # print(lake_level_gauges_to_add)
+    for gauge in lake_level_gauges_to_add:
+        if gauge in gauges:
+            lake_level_gauges.append(gauge)
+    flow_gauges_to_add = EWR_TABLE[EWR_TABLE['GaugeType']=='F']['Gauge'].to_list()
+    for gauge in flow_gauges_to_add:
+        if gauge in gauges:
+            flow_gauges.append(gauge)
+
+    weirpool_gauges_to_add = [ i for i in  EWR_TABLE['WeirpoolGauge'].to_list() if type(i) == str]
+    weirpool_gauges_to_add = [i for i in weirpool_gauges_to_add if i ]
+    if weirpool_gauges_to_add:
+        for gauge in weirpool_gauges_to_add:
             if gauge in gauges:
                 level_gauges.append(gauge)
-        lake_level_gauges_to_add = EWR_TABLE[EWR_TABLE['GaugeType']=='LL']['Gauge'].to_list()
-        for gauge in lake_level_gauges_to_add:
-            if gauge in gauges:
-                lake_level_gauges.append(gauge)
-        flow_gauges_to_add = EWR_TABLE[EWR_TABLE['GaugeType']=='F']['Gauge'].to_list()
-        for gauge in flow_gauges_to_add:
-            if gauge in gauges:
-                flow_gauges.append(gauge)
-
-        weirpool_gauges_to_add = [ i for i in  EWR_TABLE['WeirpoolGauge'].to_list() if type(i) == str]
-        weirpool_gauges_to_add = [i for i in weirpool_gauges_to_add if i ]
-        if weirpool_gauges_to_add:
-            for gauge in weirpool_gauges_to_add:
-                if gauge in gauges:
-                    level_gauges.append(gauge)
-                    lake_level_gauges.append(gauge)
+                # lake_level_gauges.append(gauge)
 
     # hard code gauges in data_input module
     sa_barrage_gauges = data_inputs.get_barrage_level_gauges()   
@@ -62,23 +64,14 @@ def categorise_gauges(gauges: list, ewr_table_path:str = None) -> tuple:
         if gauge in multi_gauges.keys():
             flow_gauges.append(gauge)
             flow_gauges.append(multi_gauges[gauge])
-        if gauge in _level_gauges:
-            level_gauges.append(gauge)
         if gauge in weirpool_gauges.keys(): # need level and flow gauges
-            flow_gauges.append(gauge)
-            level_gauges.append(weirpool_gauges[gauge])
-            lake_level_gauges.append(weirpool_gauges[gauge])
+                    flow_gauges.append(gauge)
+                    level_gauges.append(weirpool_gauges[gauge])
 
     # add hard coded gauges only if it int he incoming list
     if any(gauge in gauges for gauge in sa_barrage_gauges):
         lake_level_gauges += sa_barrage_gauges
         level_gauges += sa_barrage_gauges
-    
-    # Then loop through again and allocate remaining gauges to the flow category
-    for gauge in gauges:
-        if ((gauge not in level_gauges) and (gauge not in lake_level_gauges) and (gauge not in flow_gauges)):
-            # Otherwise, assume its a flow gauge and add
-            flow_gauges.append(gauge)
 
     unique_flow_gauges = list(set(flow_gauges))
     unique_level_gauges = list(set(level_gauges))
@@ -186,11 +179,19 @@ class ObservedHandler:
         
         # Classify gauges:
         flow_gauges, level_gauges, lake_level_gauges = categorise_gauges(self.gauges, self.parameter_sheet)
+        print('flow gauges')
+        print(flow_gauges)
+        print('level gauges')
+        print(level_gauges)
+        print('lake level gauges')
+        print(lake_level_gauges)
         # 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')
+
         # Clean observed data:
         df_F = observed_cleaner(flows, self.dates)
         df_L = observed_cleaner(levels, self.dates)

py_ewr/parameter_metadata/ewr_calc_config.json

@@ -515,7 +515,9 @@
         "BF2_c_P-single-F",
         "BF2_c_S-single-F",
         "BF4-single-F",
-        "BF5-single-F"
+        "BF5-single-F",
+        "BF_FD1-single-F",
+        "BF_FD2-single-F"
     ],
     "ctf_handle_multi": [
         "CF-multigauge-F"
@@ -620,7 +622,9 @@
         "DR2-single-F",
         "FR1-single-F",
         "LDF-single-F",
-        "WFT-single-F"
+        "WFT-single-F",
+        "SF_FD1-single-F",
+        "SF_FD2-single-F"
     ],
     "flow_handle_check_ctf": [
         "FD1-single-F",
@@ -641,8 +645,8 @@
         "FrW4-single-F"
     ],
     "water_stability_level_handle": [
-        "FrL1-single-L",
-        "FrL2-single-L"
+        "FrL1-single-F",
+        "FrL2-single-F"
     ],
     "rise_and_fall_handle": [
         "RRF-single-F",