Remove branches (except TieLines) before connectables

Signed-off-by: Florian Dupuy <[email protected]>
powsybl · Jan 21, 2025 · ff6a39c · ff6a39c
1 parent 981d2e8
commit ff6a39c
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/...modification/src/main/java/com/powsybl/iidm/modification/topology/RemoveVoltageLevel.java b/...modification/src/main/java/com/powsybl/iidm/modification/topology/RemoveVoltageLevel.java
@@ -55,15 +55,18 @@ public void apply(Network network, NamingStrategy namingStrategy, boolean throwE
             }
         });
 
+        voltageLevel.getLines().forEach(line ->
+                new RemoveFeederBayBuilder().withConnectableId(line.getId()).build().apply(network, throwException, computationManager, reportNode));
+        voltageLevel.getTwoWindingsTransformers().forEach(transformer ->
+                new RemoveFeederBayBuilder().withConnectableId(transformer.getId()).build().apply(network, throwException, computationManager, reportNode));
+        voltageLevel.getThreeWindingsTransformers().forEach(transformer ->
+                new RemoveFeederBayBuilder().withConnectableId(transformer.getId()).build().apply(network, throwException, computationManager, reportNode));
+
         voltageLevel.getConnectables().forEach(connectable -> {
-            if (connectable instanceof Injection) {
-                String connectableId = connectable.getId();
-                connectable.remove();
-                removedConnectableReport(reportNode, connectableId);
-                LOGGER.info("Connectable {} removed", connectableId);
-            } else {
-                new RemoveFeederBayBuilder().withConnectableId(connectable.getId()).build().apply(network, throwException, computationManager, reportNode);
-            }
+            String connectableId = connectable.getId();
+            connectable.remove();
+            removedConnectableReport(reportNode, connectableId);
+            LOGGER.info("Connectable {} removed", connectableId);
         });
 
         voltageLevel.remove();