diff --git a/wntr/stormwater/metrics.py b/wntr/stormwater/metrics.py index 0dbe10d2..35e88739 100644 --- a/wntr/stormwater/metrics.py +++ b/wntr/stormwater/metrics.py @@ -49,7 +49,6 @@ def headloss(head, swn, link_names=None): return headloss - def pump_power(flowrate, headloss, flow_units, efficiency=100): """ Pump power [kW] @@ -254,7 +253,6 @@ def conduit_time_to_capacity(volume, flowrate, flow_units, connected=False): return time_to_capacity - def shortest_path_nodes(G, source_node, target_node): """ Nodes along the shortest path from a source to target node diff --git a/wntr/stormwater/network.py b/wntr/stormwater/network.py index ee09c748..6bf72e2e 100644 --- a/wntr/stormwater/network.py +++ b/wntr/stormwater/network.py @@ -91,11 +91,11 @@ def __init__(self, inp_file_name): 'pumps', 'orifices', 'weirs', - 'xsections', # requires udpate to swmmio + 'xsections', 'streets', 'inlets', 'inlet_usage', - 'controls', # requires udpate to swmmio + 'controls', # Quality 'pollutants', @@ -103,13 +103,13 @@ def __init__(self, inp_file_name): 'coverages', 'buildup', 'washoff', - 'inflows', # requires udpate to swmmio + 'inflows', 'dwf', # Curves, timeseries, patterns - 'curves', # requires udpate to swmmio + 'curves', 'timeseries', - 'patterns', # requires udpate to swmmio + 'patterns', # Map 'polygons',