From a97992f28e1646abdc17029de77ee7e94633e87f Mon Sep 17 00:00:00 2001 From: Adam Zsarnoczay <33822153+zsarnoczay@users.noreply.github.com> Date: Fri, 16 May 2025 20:39:49 -0700 Subject: [PATCH] bugfix in method name in water and power config files --- .../power_network/portfolio/Hazus v5.1/pelicun_config.py | 6 +++--- .../water_network/portfolio/Hazus v6.1/pelicun_config.py | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/seismic/power_network/portfolio/Hazus v5.1/pelicun_config.py b/seismic/power_network/portfolio/Hazus v5.1/pelicun_config.py index 92a3e9f1..a0e1dff8 100644 --- a/seismic/power_network/portfolio/Hazus v5.1/pelicun_config.py +++ b/seismic/power_network/portfolio/Hazus v5.1/pelicun_config.py @@ -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, }, @@ -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"}, @@ -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, }, diff --git a/seismic/water_network/portfolio/Hazus v6.1/pelicun_config.py b/seismic/water_network/portfolio/Hazus v6.1/pelicun_config.py index d510c32e..60a3eb20 100644 --- a/seismic/water_network/portfolio/Hazus v6.1/pelicun_config.py +++ b/seismic/water_network/portfolio/Hazus v6.1/pelicun_config.py @@ -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 @@ -376,7 +376,7 @@ 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, @@ -384,14 +384,13 @@ def auto_populate(aim): # noqa: C901 # 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