py-ewr 2.3.5__py3-none-any.whl → 2.3.7__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/model_metadata/SiteID_MDBA.csv +1 -1
- py_ewr/scenario_handling.py +6 -3
- {py_ewr-2.3.5.dist-info → py_ewr-2.3.7.dist-info}/METADATA +2 -2
- {py_ewr-2.3.5.dist-info → py_ewr-2.3.7.dist-info}/RECORD +7 -7
- {py_ewr-2.3.5.dist-info → py_ewr-2.3.7.dist-info}/LICENSE +0 -0
- {py_ewr-2.3.5.dist-info → py_ewr-2.3.7.dist-info}/WHEEL +0 -0
- {py_ewr-2.3.5.dist-info → py_ewr-2.3.7.dist-info}/top_level.txt +0 -0
|
@@ -2687,7 +2687,7 @@ LOCK6US,A4260509,Murray downstream Lock 7 ,A4260509,5
|
|
|
2687
2687
|
LOCK6US - Natural,A4260509,Murray downstream Lock 7 ,A4260509,5
|
|
2688
2688
|
TAUWDS,A4260527,Barrages near the Murray Mouth,A4260527,5
|
|
2689
2689
|
MOUTH,A4260527,Barrages near the Murray Mouth,A4260527,5
|
|
2690
|
-
FLOWSA
|
|
2690
|
+
FLOWSA,A4261001,Flow at South Australia border,A4261001,5
|
|
2691
2691
|
BARRAGE,A4261002,Barrages near the Murray Mouth,A4261002,5
|
|
2692
2692
|
Bills Pipe,Bills Pipe,North Redbank,Bills Pipe,2
|
|
2693
2693
|
"Eulimbah, Nimmie Creek","Eulimbah, Nimmie Creek","Gayini/ Nimmie-Caira, combined Eulimbah and Nimmie Creek regulators","Eulimbah, Nimmie Creek",2
|
py_ewr/scenario_handling.py
CHANGED
|
@@ -646,9 +646,12 @@ class ScenarioHandler:
|
|
|
646
646
|
all_data = []
|
|
647
647
|
for scenario_file in scenario:
|
|
648
648
|
print(scenario_file)
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
649
|
+
try:
|
|
650
|
+
data, header = unpack_model_file(scenario_file, 'Dy', 'Field')
|
|
651
|
+
data = build_MDBA_columns(data, header)
|
|
652
|
+
all_data.append(data)
|
|
653
|
+
except Exception:
|
|
654
|
+
print(f"failed on {scenario_file}!!")
|
|
652
655
|
|
|
653
656
|
merged_data = all_data[0]
|
|
654
657
|
for i in range(1, len(all_data)):
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.2
|
|
2
2
|
Name: py_ewr
|
|
3
|
-
Version: 2.3.
|
|
3
|
+
Version: 2.3.7
|
|
4
4
|
Summary: Environmental Water Requirement calculator
|
|
5
5
|
Home-page: https://github.com/MDBAuth/EWR_tool
|
|
6
6
|
Author: Martin Job
|
|
@@ -43,7 +43,7 @@ Dynamic: summary
|
|
|
43
43
|
[](https://pypi.org/project/py-ewr/)
|
|
44
44
|
[](https://zenodo.org/badge/latestdoi/342122359)
|
|
45
45
|
|
|
46
|
-
### **EWR tool version 2.3.
|
|
46
|
+
### **EWR tool version 2.3.7 README**
|
|
47
47
|
|
|
48
48
|
### **Notes on recent version updates**
|
|
49
49
|
- Including metadata report (this is still being ironed out and tested)
|
|
@@ -3,9 +3,9 @@ py_ewr/data_inputs.py,sha256=oUiEiLY_CmbvqF5GlV-3Yfz_JZ1qZNvta-VEYCzAcso,20124
|
|
|
3
3
|
py_ewr/evaluate_EWRs.py,sha256=NC6FYWT5jEAEpV3bp5T1CuYUJjnz1bqiamRoKTptpqE,231607
|
|
4
4
|
py_ewr/io.py,sha256=Is0xPAzLx6-ylpTFyYJxMimkNVxxoTxUcknTk6bQbgs,840
|
|
5
5
|
py_ewr/observed_handling.py,sha256=JTSK_2obhqNWJ2QknykywevNMN0fsvGXSejFwUSpMoA,18112
|
|
6
|
-
py_ewr/scenario_handling.py,sha256=
|
|
6
|
+
py_ewr/scenario_handling.py,sha256=G7q2qpRU4xwusUeztDEHkRVdl4vnVaI_EfEchKTRhq0,48878
|
|
7
7
|
py_ewr/summarise_results.py,sha256=rFaAUVR4jIsjeRl4ocPFE2RUoJJBZgZ2wPEBh-dfEsc,31761
|
|
8
|
-
py_ewr/model_metadata/SiteID_MDBA.csv,sha256
|
|
8
|
+
py_ewr/model_metadata/SiteID_MDBA.csv,sha256=-nPEWzqW60HBh3y7u8Ofiq8aYTyZqhQ-8eakuDVdUg4,168770
|
|
9
9
|
py_ewr/model_metadata/SiteID_NSW.csv,sha256=UVBxN43Z5KWCvWhQ5Rh6TNEn35q4_sjPxKyHg8wPFws,6805
|
|
10
10
|
py_ewr/model_metadata/iqqm_stations.csv,sha256=vl4CPtPslG5VplSzf_yLZulTrmab-mEBHOfzFtS1kf4,110
|
|
11
11
|
py_ewr/parameter_metadata/ewr2obj.csv,sha256=qvD-skiQiiMq3YABPUte8OdYGQD5Nesr0UvQMAsXnXU,4509292
|
|
@@ -13,8 +13,8 @@ py_ewr/parameter_metadata/ewr_calc_config.json,sha256=XfaJnFrAkGGBY4MRcsO5CH9SJ_
|
|
|
13
13
|
py_ewr/parameter_metadata/obj2target.csv,sha256=f6kLVyBhXUpGR4b0dzLbBvZbfpn3OxOhaB4aouO6Bvw,1593877
|
|
14
14
|
py_ewr/parameter_metadata/obj2yrtarget.csv,sha256=G8XgdCrOpB0xhp6n7DIS4Vcq69Kpgb1Pum7Ay3a_YPU,54882
|
|
15
15
|
py_ewr/parameter_metadata/parameter_sheet.csv,sha256=-wYjN-5vkYlUCzmsBLIZ1w3BI1RHO1iXMxZAg1inguA,766656
|
|
16
|
-
py_ewr-2.3.
|
|
17
|
-
py_ewr-2.3.
|
|
18
|
-
py_ewr-2.3.
|
|
19
|
-
py_ewr-2.3.
|
|
20
|
-
py_ewr-2.3.
|
|
16
|
+
py_ewr-2.3.7.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
|
|
17
|
+
py_ewr-2.3.7.dist-info/METADATA,sha256=W3D-F0O_zXMDaXgUsCf7zFGWiSKbv64QXh-aFbklSQ0,12974
|
|
18
|
+
py_ewr-2.3.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
|
|
19
|
+
py_ewr-2.3.7.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
|
|
20
|
+
py_ewr-2.3.7.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|