Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions seismic/power_network/portfolio/Hazus v5.1/pelicun_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def auto_populate(aim): # noqa: C901
dl_ap = {
"Asset": {
"ComponentAssignmentFile": "CMP_QNT.csv",
"ComponentDatabase": "Hazus Earthquake - Power",
"ComponentDatabase": "Hazus Earthquake - Electric Power",
"Substation Voltage": ep_s_size,
"Substation Anchored": ep_s_anchored,
},
Expand Down Expand Up @@ -307,7 +307,7 @@ def auto_populate(aim): # noqa: C901
dl_ap = {
"Asset": {
"ComponentAssignmentFile": "CMP_QNT.csv",
"ComponentDatabase": "Hazus Earthquake - Power",
"ComponentDatabase": "Hazus Earthquake - Electric Power",
"Circuit Anchored": ep_c_anchored,
},
"Damage": {"DamageProcess": "Hazus Earthquake"},
Expand Down Expand Up @@ -475,7 +475,7 @@ def auto_populate(aim): # noqa: C901
dl_ap = {
"Asset": {
"ComponentAssignmentFile": "CMP_QNT.csv",
"ComponentDatabase": "Hazus Earthquake - Power",
"ComponentDatabase": "Hazus Earthquake - Electric Power",
"Generation Size": ep_g_size,
"Generation Anchored": ep_g_anchored,
},
Expand Down
7 changes: 3 additions & 4 deletions seismic/water_network/portfolio/Hazus v6.1/pelicun_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def auto_populate(aim): # noqa: C901
dl_ap = {
'Asset': {
'ComponentAssignmentFile': 'CMP_QNT.csv',
'ComponentDatabase': 'Hazus Earthquake - Water',
'ComponentDatabase': 'Hazus Earthquake - Potable Water',
'Material Flexibility': pipe_flexibility,
'PlanArea': '1', # Sina: does not make sense for water.
# Kept it here since it was also
Expand Down Expand Up @@ -376,22 +376,21 @@ def auto_populate(aim): # noqa: C901
dl_ap = {
'Asset': {
'ComponentAssignmentFile': 'CMP_QNT.csv',
'ComponentDatabase': 'Hazus Earthquake - Water',
'ComponentDatabase': 'Hazus Earthquake - Potable Water',
'Material': tank_material,
'Location': tank_location,
'Anchored': tank_anchored,
'PlanArea': '1', # Sina: does not make sense for water.
# Kept it here since it was also kept here for
# Transportation
},
'Damage': {'DamageProcess': 'Hazus Earthquake'},
'Demands': {},
}

else:
print(
f'Water Distribution network element type {wdn_element_type} '
f'is not supported in Hazus Earthquake IM DL method'
f'is not supported in Hazus Earthquake - Potable Water'
)
dl_ap = 'N/A'
comp = None
Expand Down
Loading