Skip to content

Commit

Permalink
Merge pull request #21 from snaeimi/master
Browse files Browse the repository at this point in the history 
Fix Problems with E16 example
  • Loading branch information
@fmckenna
fmckenna authored May 10, 2024
2 parents 0243a92 + a8163c3 commit 89a8404
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion E16WDNRecoveryAndPerformanceAssessment/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ In the following steps, we will guide you through each stage of the assessment.

#. **ASD** A Water Distribution Network (WDN) consists of pipes, pumps, tanks, valves, and junctions (also known as nodes). This information can be provided in many formats, but the **EPANET** file format (**INP**) is widely used in the industry and research. Thus, REWET uses this format for input. Consequently, the INP to GEOJSON tool is selected to translate the INP file to the R2D internal format. Then, the path to the INP file must be provided. Since the INP file format does not contain projection system information, the projection system must be defined by the user. This projection system aligns with the coordinates defined for the system components in the INP file. Furthermore, the user may select the assets for which the loss estimation will be performed using the filter functionality.

.. note:: We enter **1** in the filter value for junction and reservoir since the damage of those is not being modeled for this example. Also, we enter **1-100** to limit the damage modeling to the first 100 pipes in our asset list, so that the damage modeling is kept short.
.. note:: We enter **1** in the filter value for junction and reservoir since the damage of those is not being modeled for this example. Also, we enter **1-200** to limit the damage modeling to the first 200 pipes in our asset list, so that the damage modeling is kept short.

.. figure:: figures/r2dt-0015-ASD.png
:width: 800px
Expand Down
Binary file modified E16WDNRecoveryAndPerformanceAssessment/figures/r2dt-0015-ASD.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions E16WDNRecoveryAndPerformanceAssessment/input.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"filter": "1"
},
"Pipe": {
"filter": "1-10"
"filter": "1-200"
},
"Reservoir": {
"filter": "1"
Expand Down Expand Up @@ -179,11 +179,11 @@
"eventFile": "EventGrid.csv",
"eventFilePath": "{Current_Dir}/input_data/IMs",
"units": {
"PGA": "g",
"PGD_h": "m",
"PGD_v": "cmps",
"SA_0.3": "g",
"SA_1.0": "g"
"PGA": "inchps2",
"PGD_h": "inch",
"PGD_v": "inchps",
"SA_0.3": "inchps2",
"SA_1.0": "inchps2"
}
},
"RegionalMapping": {
Expand Down
72 changes: 36 additions & 36 deletions E16WDNRecoveryAndPerformanceAssessment/input_data/waterNetwork.inp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1667,9 +1667,9 @@
BOHEMIA_2 node_1279 node_1283 61.99992985 6 100 0 Open ;
BOHOL_CIRCLE node_1311 node_1310 267.68138318 6 100 0 Open ;
BOSSHARD node_1265 node_1266 84.52794652 6 100 0 Open ;
BRIDGE_VIEW_ISLE node_366 node_367 176.26434012 6 100 0 Open ;
BRIDGE_VIEW_ISLE_1 node_367 node_368 106.00736663 6 100 0 Open ;
BRIDGE_VIEW_ISLE_2 node_368 node_969 180.63101847 6 100 0 Open ;
BVI node_366 node_367 176.26434012 6 100 0 Open ;
BVI_1 node_367 node_368 106.00736663 6 100 0 Open ;
BVI_2 node_368 node_969 180.63101847 6 100 0 Open ;
BRIGGS node_185 node_965 1244.2193791 6 100 0 Open ;
BROADWAY node_50 node_51 288.39181928 16 100 0 Open ;
BROADWAY_1 node_97 node_98 184.87406494 16 100 0 Open ;
Expand Down Expand Up @@ -2935,12 +2935,12 @@
RAINBOW node_89 node_90 301.79540527 6 100 0 Open ;
RAINBOW_1 node_547 node_993 300.09072168 6 100 0 Open ;
RALIEGH node_728 node_94 595.22934282 6 100 0 Open ;
RALPH_APPEZZATO_MEMORIAL node_498 node_499 367.63216641 12 100 0 Open ;
RALPH_APPEZZATO_MEMORIAL_1 node_557 node_498 666.36973106 12 100 0 Open ;
RALPH_APPEZZATO_MEMORIAL_2 node_499 node_877 625.24704207 12 100 0 Open ;
RALPH_APPEZZATO_MEMORIAL_3 node_984 node_557 988.64538774 12 100 0 Open ;
RALPH_APPEZZATO_MEMORIAL_4 node_877 node_1029 618.6645701 12 100 0 Open ;
RALPH_APPEZZATO_MEMORIAL_5 node_33 node_984 988.27552759 12 100 0 Open ;
RAM node_498 node_499 367.63216641 12 100 0 Open ;
RAM_1 node_557 node_498 666.36973106 12 100 0 Open ;
RAM_2 node_499 node_877 625.24704207 12 100 0 Open ;
RAM_3 node_984 node_557 988.64538774 12 100 0 Open ;
RAM_4 node_877 node_1029 618.6645701 12 100 0 Open ;
RAM_5 node_33 node_984 988.27552759 12 100 0 Open ;
RANGER node_356 node_881 414.17995729 6 100 0 Open ;
RANGER_1 node_907 node_1156 396.94321399 6 100 0 Open ;
RANGER_2 node_1156 node_356 798.10867936 6 100 0 Open ;
Expand All @@ -2965,10 +2965,10 @@
REGENT_8 node_501 node_896 240.6537116 6 100 0 Open ;
REGULUS node_631 node_1254 465.02958605 6 100 0 Open ;
ROARK node_740 node_741 217.47411942 6 100 0 Open ;
ROBERT_LOUIS_STEVENSON node_442 node_443 128.61753486 6 100 0 Open ;
ROBERT_LOUIS_STEVENSON_1 node_1093 node_442 106.79316652 6 100 0 Open ;
ROBERT_LOUIS_STEVENSON_2 node_443 node_803 597.91760648 6 100 0 Open ;
ROBERT_LOUIS_STEVENSON_3 node_803 node_1039 659.2337786 6 100 0 Open ;
RLS node_442 node_443 128.61753486 6 100 0 Open ;
RLS_1 node_1093 node_442 106.79316652 6 100 0 Open ;
RLS_2 node_443 node_803 597.91760648 6 100 0 Open ;
RLS_3 node_803 node_1039 659.2337786 6 100 0 Open ;
ROCK_ISLE node_620 node_621 332.52722486 6 100 0 Open ;
ROOSEVELT node_494 node_493 376.70832468 6 100 0 Open ;
ROOSEVELT_1 node_932 node_494 244.17012714 6 100 0 Open ;
Expand Down Expand Up @@ -3295,17 +3295,17 @@
UNION_8 node_566 node_565 495.55139897 6 100 0 Open ;
UNION_9 node_735 node_736 357.50414121 6 100 0 Open ;
UNNAMED node_718 node_719 105.81584678 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA node_177 node_178 233.23273686 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_1 node_812 node_177 351.63536388 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_10 node_815 node_812 4316.6328047 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_2 node_813 node_814 6138.9592156 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_3 node_887 node_888 182.61713815 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_4 node_177 node_813 11035.808304 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_5 node_981 node_982 408.52632251 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_6 node_813 node_1075 1435.2230405 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_7 node_812 node_1076 178.53031206 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_8 node_1203 node_1043 187.21071786 6 100 0 Open ;
USN_AIR_STATION_ALAMEDA_9 node_1204 node_66 185.12383917 6 100 0 Open ;
UASA node_177 node_178 233.23273686 6 100 0 Open ;
UASA_1 node_812 node_177 351.63536388 6 100 0 Open ;
UASA_10 node_815 node_812 4316.6328047 6 100 0 Open ;
UASA_2 node_813 node_814 6138.9592156 6 100 0 Open ;
UASA_3 node_887 node_888 182.61713815 6 100 0 Open ;
UASA_4 node_177 node_813 11035.808304 6 100 0 Open ;
UASA_5 node_981 node_982 408.52632251 6 100 0 Open ;
UASA_6 node_813 node_1075 1435.2230405 6 100 0 Open ;
UASA_7 node_812 node_1076 178.53031206 6 100 0 Open ;
UASA_8 node_1203 node_1043 187.21071786 6 100 0 Open ;
UASA_9 node_1204 node_66 185.12383917 6 100 0 Open ;
VAN_BUREN node_135 node_136 414.03367401 6 100 0 Open ;
VAN_BUREN_1 node_152 node_153 293.43862699 6 100 0 Open ;
VAN_BUREN_2 node_174 node_135 431.06829919 6 100 0 Open ;
Expand Down Expand Up @@ -3404,18 +3404,18 @@
WHITEHALL_3 node_168 node_605 705.89434522 6 100 0 Open ;
WICHITA node_1008 node_1197 252.16771358 6 100 0 Open ;
WILLET node_622 node_1223 136.23016084 6 100 0 Open ;
WILLIE_STARGELL node_329 node_330 229.2627204 6 100 0 Open ;
WILLIE_STARGELL_1 node_776 node_236 151.24344351 6 100 0 Open ;
WILLIE_STARGELL_10 node_1176 node_1340 459.56240438 6 100 0 Open ;
WILLIE_STARGELL_11 node_966 node_1340 238.52539933 6 100 0 Open ;
WILLIE_STARGELL_2 node_543 node_873 130.8235327 6 100 0 Open ;
WILLIE_STARGELL_3 node_873 node_329 164.48898966 6 100 0 Open ;
WILLIE_STARGELL_4 node_922 node_684 651.53326973 6 100 0 Open ;
WILLIE_STARGELL_5 node_330 node_776 249.74630906 6 100 0 Open ;
WILLIE_STARGELL_6 node_236 node_922 599.8985002 6 100 0 Open ;
WILLIE_STARGELL_7 node_684 node_1304 325.74980664 6 100 0 Open ;
WILLIE_STARGELL_8 node_1304 node_1314 348.35361104 6 100 0 Open ;
WILLIE_STARGELL_9 node_1314 node_1340 1005.9431407 6 100 0 Open ;
WS node_329 node_330 229.2627204 6 100 0 Open ;
WS_1 node_776 node_236 151.24344351 6 100 0 Open ;
WS_10 node_1176 node_1340 459.56240438 6 100 0 Open ;
WS_11 node_966 node_1340 238.52539933 6 100 0 Open ;
WS_2 node_543 node_873 130.8235327 6 100 0 Open ;
WS_3 node_873 node_329 164.48898966 6 100 0 Open ;
WS_4 node_922 node_684 651.53326973 6 100 0 Open ;
WS_5 node_330 node_776 249.74630906 6 100 0 Open ;
WS_6 node_236 node_922 599.8985002 6 100 0 Open ;
WS_7 node_684 node_1304 325.74980664 6 100 0 Open ;
WS_8 node_1304 node_1314 348.35361104 6 100 0 Open ;
WS_9 node_1314 node_1340 1005.9431407 6 100 0 Open ;
WILLOW node_40 node_41 870.95560626 6 100 0 Open ;
WILLOW_1 node_219 node_220 265.88539371 6 100 0 Open ;
WILLOW_10 node_510 node_978 495.38322778 6 100 0 Open ;
Expand Down

0 comments on commit 89a8404

Please sign in to comment.