py-ewr 2.2.4__py3-none-any.whl → 2.2.6__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- py_ewr/data_inputs.py +18 -4
- py_ewr/evaluate_EWRs.py +76 -32
- py_ewr/model_metadata/SiteID_MDBA.csv +2695 -2686
- py_ewr/observed_handling.py +6 -7
- py_ewr/parameter_metadata/ewr2obj.csv +40590 -0
- py_ewr/parameter_metadata/obj2target.csv +8962 -0
- py_ewr/parameter_metadata/obj2yrtarget.csv +106 -0
- py_ewr/parameter_metadata/parameter_sheet.csv +3459 -3447
- py_ewr/scenario_handling.py +83 -62
- py_ewr/summarise_results.py +38 -3
- {py_ewr-2.2.4.dist-info → py_ewr-2.2.6.dist-info}/METADATA +50 -26
- py_ewr-2.2.6.dist-info/RECORD +20 -0
- {py_ewr-2.2.4.dist-info → py_ewr-2.2.6.dist-info}/WHEEL +1 -1
- py_ewr-2.2.4.dist-info/RECORD +0 -17
- {py_ewr-2.2.4.dist-info → py_ewr-2.2.6.dist-info}/LICENSE +0 -0
- {py_ewr-2.2.4.dist-info → py_ewr-2.2.6.dist-info}/top_level.txt +0 -0
py_ewr/observed_handling.py
CHANGED
|
@@ -35,7 +35,6 @@ def categorise_gauges(gauges: list, ewr_table_path:str = None) -> tuple:
|
|
|
35
35
|
if gauge in gauges:
|
|
36
36
|
level_gauges.append(gauge)
|
|
37
37
|
lake_level_gauges_to_add = EWR_TABLE[EWR_TABLE['GaugeType']=='LL']['Gauge'].to_list()
|
|
38
|
-
# print(lake_level_gauges_to_add)
|
|
39
38
|
for gauge in lake_level_gauges_to_add:
|
|
40
39
|
if gauge in gauges:
|
|
41
40
|
lake_level_gauges.append(gauge)
|
|
@@ -178,12 +177,12 @@ class ObservedHandler:
|
|
|
178
177
|
|
|
179
178
|
# Classify gauges:
|
|
180
179
|
flow_gauges, level_gauges, lake_level_gauges = categorise_gauges(self.gauges, self.parameter_sheet)
|
|
181
|
-
print('flow gauges')
|
|
182
|
-
print(flow_gauges)
|
|
183
|
-
print('level gauges')
|
|
184
|
-
print(level_gauges)
|
|
185
|
-
print('lake level gauges')
|
|
186
|
-
print(lake_level_gauges)
|
|
180
|
+
# print('flow gauges')
|
|
181
|
+
# print(flow_gauges)
|
|
182
|
+
# print('level gauges')
|
|
183
|
+
# print(level_gauges)
|
|
184
|
+
# print('lake level gauges')
|
|
185
|
+
# print(lake_level_gauges)
|
|
187
186
|
# Call state API for flow and level gauge data, then combine to single dataframe
|
|
188
187
|
log.info(f'Including gauges: flow gauges: { ", ".join(flow_gauges)} level gauges: { ", ".join(level_gauges)} lake level gauges: { ", ".join(lake_level_gauges)}')
|
|
189
188
|
|