Merge pull request #575 from dlohmeier/fix/graph_cp

small fixes for graph creation
e2nIEE · Dec 19, 2023 · e4895bc · e4895bc
2 parents d1e61ad + 0a9584c
commit e4895bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pandapipes/converter/stanet/table_creation.py b/pandapipes/converter/stanet/table_creation.py
@@ -663,7 +663,7 @@ def create_heat_exchangers_stanet(net, stored_data, index_mapping, add_layers, a
         # TODO: there is no qext given!!!
         pandapipes.create_heat_exchanger(
             net, node_mapping[from_stanet_nr], node_mapping[to_stanet_nr], qext_w=qext,
-            diameter_m=float(row.DM / 1000), loss_coefficient=row.ZETA, std_type=row.ROHRTYP,
+            diameter_m=float(row.DM / 1000), loss_coefficient=row.ZETA,
             in_service=bool(row.ISACTIVE), name="heat_exchanger_%s_%s" % (row.ANFNAM, row.ENDNAM),
             stanet_nr=int(row.RECNO), stanet_id=str(row.STANETID), v_stanet=row.VM,
             stanet_active=bool(row.ISACTIVE), **add_info

diff --git a/pandapipes/topology/create_graph.py b/pandapipes/topology/create_graph.py
@@ -113,7 +113,7 @@ def create_nxgraph(net, include_pipes=True, respect_status_pipes=True,
     loc = locals()
     branch_params.update({"%s_%s" % (par, bc): loc.get("%s_%s" % (par, bc)) for par in branch_kw
                           for bc in ["pipes", "valves", "pumps", "press_controls",
-                                     "mass_circ_pumps", "press_circ_pumps", "valve_pipes",
+                                     "mass_circ_pumps", "pressure_circ_pumps", "valve_pipes",
                                      "flow_controls"]})
 
     for comp in net.component_list: