Fix

Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>

Author: geofjamg

src/main/java/com/powsybl/openloadflow/network/action/AbstractLfAction.java

@@ -8,7 +8,6 @@
 package com.powsybl.openloadflow.network.action;
 
 import com.powsybl.action.Action;
-import com.powsybl.iidm.network.Network;
 
 import java.util.Objects;
 
@@ -32,9 +31,4 @@ public String getId() {
     public String getType() {
         return action.getType();
     }
-
-    @Override
-    public boolean checkErrorForWoodbury(Network network) {
-        return false;
-    }
 }

src/main/java/com/powsybl/openloadflow/network/action/LfAction.java

@@ -7,8 +7,9 @@
  */
 package com.powsybl.openloadflow.network.action;
 
-import com.powsybl.iidm.network.Network;
-import com.powsybl.openloadflow.network.*;
+import com.powsybl.openloadflow.network.LfContingency;
+import com.powsybl.openloadflow.network.LfNetwork;
+import com.powsybl.openloadflow.network.LfNetworkParameters;
 
 /**
  * @author Bertrand Rix {@literal <bertrand.rix at artelys.com>}
@@ -21,7 +22,5 @@ public interface LfAction {
 
     boolean isValid();
 
-    boolean checkErrorForWoodbury(Network network);
-
     boolean apply(LfNetwork network, LfContingency contingency, LfNetworkParameters networkParameters);
 }

src/main/java/com/powsybl/openloadflow/network/action/LfSwitchAction.java

@@ -9,10 +9,6 @@
 package com.powsybl.openloadflow.network.action;
 
 import com.powsybl.action.SwitchAction;
-import com.powsybl.iidm.network.Bus;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.Switch;
-import com.powsybl.iidm.network.VoltageLevel;
 import com.powsybl.openloadflow.network.LfBranch;
 import com.powsybl.openloadflow.network.LfNetwork;
 import org.slf4j.Logger;
@@ -40,26 +36,8 @@ void findEnabledDisabledBranches(LfNetwork lfNetwork) {
             } else {
                 setEnabledBranch(branch);
             }
+        } else {
+            LOGGER.warn("Switch action {}: branch matching switch id {} not found", action.getId(), action.getSwitchId());
         }
     }
-
-    @Override
-    public boolean checkErrorForWoodbury(Network network) {
-        Switch sw = network.getSwitch(action.getSwitchId());
-        boolean error;
-        error = false;
-        if (action.isOpen() != sw.isOpen()) {
-            VoltageLevel vl = sw.getVoltageLevel();
-            Bus bus1 = vl.getBusBreakerView().getBus1(sw.getId());
-            Bus bus2 = vl.getBusBreakerView().getBus1(sw.getId());
-            if (bus1 == bus2) {
-                LOGGER.error("Switch '{}' connected at both sides to same bus", action.getId());
-            } else {
-                LOGGER.trace("Switch '{}' is {} in the network and action is to {}", action.getId(), sw.isOpen() ? "opened" : "closed",
-                        action.isOpen() ? "open" : "close");
-                error = true;
-            }
-        }
-        return error;
-    }
 }

src/main/java/com/powsybl/openloadflow/network/action/LfTerminalsConnectionAction.java

@@ -9,8 +9,6 @@
 package com.powsybl.openloadflow.network.action;
 
 import com.powsybl.action.TerminalsConnectionAction;
-import com.powsybl.iidm.network.Branch;
-import com.powsybl.iidm.network.Network;
 import com.powsybl.openloadflow.network.LfBranch;
 import com.powsybl.openloadflow.network.LfNetwork;
 import org.slf4j.Logger;
@@ -41,24 +39,8 @@ void findEnabledDisabledBranches(LfNetwork lfNetwork) {
             } else {
                 setEnabledBranch(branch);
             }
+        } else {
+            LOGGER.warn("TerminalsConnectionAction action {}: branch matching element id {} not found", action.getId(), action.getElementId());
         }
     }
-
-    @Override
-    public boolean checkErrorForWoodbury(Network network) {
-        Branch<?> branch = network.getBranch(action.getElementId());
-        boolean branchOpen1 = !branch.getTerminal1().isConnected();
-        boolean branchOpen2 = !branch.getTerminal2().isConnected();
-        boolean branchOpen = branchOpen1 || branchOpen2;
-        boolean error = action.isOpen() != branchOpen;
-        if (error) {
-            if (branchOpen1 ^ branchOpen2) {
-                LOGGER.error("Branch '{}' is open at one side in the network: unsupported in Woodbury", action.getId());
-            } else {
-                LOGGER.trace("Branch '{}' is {} in the network and action is to {}", action.getId(), branchOpen ? "opened" : "closed",
-                        action.isOpen() ? "open" : "close");
-            }
-        }
-        return error;
-    }
 }

src/main/java/com/powsybl/openloadflow/sensi/DcSensitivityAnalysis.java

@@ -488,13 +488,6 @@ public void analyse(Network network, String workingVariantId, List<Contingency>
                     OperatorStrategies.indexByContingencyId(propagatedContingencies, operatorStrategies, actionsById, true);
             Set<Action> neededActions = OperatorStrategies.getNeededActions(operatorStrategiesByContingencyId, actionsById);
             Map<String, LfAction> lfActionById = LfActionUtils.createLfActions(lfNetwork, neededActions, network); // only convert needed actions
-            for (LfAction lfAction : lfActionById.values()) {
-                if (!lfAction.isValid()) {
-                    if (lfAction.checkErrorForWoodbury(network)) {
-                        LOGGER.error("Action '{}' is invalid", lfAction.getId());
-                    }
-                }
-            }
 
             Map<String, SensitivityVariableSet> variableSetsById = variableSets.stream().collect(Collectors.toMap(SensitivityVariableSet::getId, Function.identity()));
             SensitivityFactorHolder<DcVariableType, DcEquationType> allFactorHolder = readAndCheckFactors(network, variableSetsById, factorReader, lfNetwork, breakers);