feat: Split HVDC range action into a network action and a range action

data/crac/crac-api/src/main/java/com/powsybl/openrao/data/crac/api/networkaction/NetworkAction.java

@@ -10,6 +10,7 @@
 import com.powsybl.action.*;
 import com.powsybl.openrao.data.crac.api.RemedialAction;
 import com.powsybl.iidm.network.Network;
+import com.powsybl.openrao.data.crac.api.usagerule.UsageRule;
 import org.apache.commons.lang3.NotImplementedException;
 
 import java.util.Set;
@@ -95,8 +96,12 @@ static String getNetworkElementId(Action elementaryAction) {
             return terminalsConnectionAction.getElementId();
         } else if (elementaryAction instanceof SwitchAction switchAction) {
             return switchAction.getSwitchId();
+        } else if (elementaryAction instanceof HvdcAction hvdcAction) {
+            return hvdcAction.getHvdcId();
         } else {
             throw new NotImplementedException();
         }
     }
+
+    void addUsageRule(UsageRule usageRule);
 }

data/crac/crac-api/src/main/java/com/powsybl/openrao/data/crac/api/rangeaction/HvdcRangeAction.java

@@ -24,4 +24,6 @@ public interface HvdcRangeAction extends StandardRangeAction<HvdcRangeAction> {
     NetworkElement getNetworkElement();
 
     boolean isAngleDroopActivePowerControlEnabled(Network network);
+
+    void setInitialSetpoint(double initialSetpoint);
 }

data/crac/crac-api/src/test/java/com/powsybl/openrao/data/crac/api/NetworkActionUtils.java

@@ -141,6 +141,11 @@ public boolean canBeApplied(Network network) {
             return false;
         }
 
+        @Override
+        public void addUsageRule(UsageRule usageRule) {
+            // not used
+        }
+
         @Override
         public <E extends Extension<NetworkAction>> void addExtension(Class<? super E> aClass, E e) {
             //not used
@@ -165,6 +170,7 @@ public <E extends Extension<NetworkAction>> boolean removeExtension(Class<E> aCl
         public <E extends Extension<NetworkAction>> Collection<E> getExtensions() {
             return null;
         }
+
     }
 
     public static class NetworkElementImplTest implements NetworkElement {

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/crac/impl/HvdcRangeActionImpl.java

@@ -9,6 +9,7 @@
 
 import com.powsybl.action.HvdcActionBuilder;
 import com.powsybl.commons.report.ReportNode;
+import com.powsybl.openrao.commons.OpenRaoException;
 import com.powsybl.openrao.data.crac.api.NetworkElement;
 import com.powsybl.openrao.data.crac.api.range.StandardRange;
 import com.powsybl.openrao.data.crac.api.rangeaction.HvdcRangeAction;
@@ -24,8 +25,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.powsybl.openrao.commons.logs.OpenRaoLoggerProvider.TECHNICAL_LOGS;
-
 /**
  * Elementary HVDC range remedial action.
  *
@@ -36,7 +35,7 @@ public class HvdcRangeActionImpl extends AbstractRangeAction<HvdcRangeAction> im
 
     private final NetworkElement networkElement;
     private final List<StandardRange> ranges;
-    private final Double initialSetpoint;
+    private Double initialSetpoint;
 
     HvdcRangeActionImpl(String id, String name, String operator, Set<UsageRule> usageRules, List<StandardRange> ranges,
                         Double initialSetpoint, NetworkElement networkElement, String groupId, Integer speed, Double activationCost, Map<VariationDirection, Double> variationCosts) {
@@ -78,24 +77,25 @@ public Double getInitialSetpoint() {
 
     @Override
     public void apply(Network network, double targetSetpoint) {
-        logDisableHvdcAngleDroopActivePowerControl(network);
-        HvdcActionBuilder actionBuilder = new HvdcActionBuilder()
-            .withId("")
-            .withHvdcId(networkElement.getId())
-            .withActivePowerSetpoint(Math.abs(targetSetpoint))
-            .withAcEmulationEnabled(false);
-        if (targetSetpoint < 0) {
-            actionBuilder.withConverterMode(HvdcLine.ConvertersMode.SIDE_1_INVERTER_SIDE_2_RECTIFIER);
+        // Possible only if the network element associated is NOT in ac emulation mode (ie. fixed active power setpoint operation only)
+        HvdcActionBuilder actionBuilder = null;
+        if (!isAngleDroopActivePowerControlEnabled(network)) {
+            actionBuilder = new HvdcActionBuilder()
+                .withId("")
+                .withHvdcId(networkElement.getId())
+                .withActivePowerSetpoint(Math.abs(targetSetpoint));
+            if (targetSetpoint < 0) {
+                actionBuilder.withConverterMode(HvdcLine.ConvertersMode.SIDE_1_INVERTER_SIDE_2_RECTIFIER);
+            } else {
+                actionBuilder.withConverterMode(HvdcLine.ConvertersMode.SIDE_1_RECTIFIER_SIDE_2_INVERTER);
+            }
+            actionBuilder.build().toModification().apply(network, true, ReportNode.NO_OP);
         } else {
-            actionBuilder.withConverterMode(HvdcLine.ConvertersMode.SIDE_1_RECTIFIER_SIDE_2_INVERTER);
-        }
-        actionBuilder.build().toModification().apply(network, true, ReportNode.NO_OP);
-    }
-
-    public void logDisableHvdcAngleDroopActivePowerControl(Network network) {
-        if (isAngleDroopActivePowerControlEnabled(network)) {
-            HvdcLine hvdcLine = IidmHvdcHelper.getHvdcLine(network, networkElement.getId());
-            TECHNICAL_LOGS.debug("Disabling HvdcAngleDroopActivePowerControl on HVDC line {}", hvdcLine.getId());
+            throw new OpenRaoException(String.format(
+                "Unable to set an active power setpoint for HVDC line %s because it is operating in AC Emulation mode.",
+                networkElement.getId()
+                )
+            );
         }
     }
 
@@ -135,4 +135,9 @@ public int hashCode() {
         hashCode += 31 * networkElement.hashCode();
         return hashCode;
     }
+
+    @Override
+    public void setInitialSetpoint(double initialSetpoint) {
+        this.initialSetpoint = initialSetpoint;
+    }
 }

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/crac/impl/NetworkActionImpl.java

@@ -31,8 +31,8 @@ public class NetworkActionImpl extends AbstractRemedialAction<NetworkAction> imp
     private final Set<Action> elementaryActions;
     private final Set<NetworkElement> networkElements;
 
-    NetworkActionImpl(String id, String name, String operator, Set<UsageRule> usageRules,
-                      Set<Action> elementaryNetworkActions, Integer speed, Double activationCost, Set<NetworkElement> networkElements) {
+    public NetworkActionImpl(String id, String name, String operator, Set<UsageRule> usageRules,
+                             Set<Action> elementaryNetworkActions, Integer speed, Double activationCost, Set<NetworkElement> networkElements) {
         super(id, name, operator, usageRules, speed, activationCost);
         this.elementaryActions = new HashSet<>(elementaryNetworkActions);
         this.networkElements = new HashSet<>(networkElements);
@@ -76,6 +76,11 @@ public boolean canBeApplied(Network network) {
         });
     }
 
+    @Override
+    public void addUsageRule(UsageRule usageRule) {
+        this.usageRules.add(usageRule);
+    }
+
     @Override
     public Set<NetworkElement> getNetworkElements() {
         return this.networkElements;

data/crac/crac-impl/src/test/java/com/powsybl/openrao/data/crac/impl/HvdcRangeActionImplTest.java

@@ -17,7 +17,6 @@
 import com.powsybl.iidm.network.Country;
 import com.powsybl.iidm.network.HvdcLine;
 import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.extensions.HvdcAngleDroopActivePowerControl;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -33,7 +32,6 @@ class HvdcRangeActionImplTest {
     private Network network;
     private Network networkWithAngleDroop;
     private HvdcLine hvdcLine;
-    private HvdcLine hvdcLineWithAngleDroop;
 
     @BeforeEach
     public void setUp() {
@@ -51,37 +49,47 @@ public void setUp() {
             .newOnInstantUsageRule().withInstant("preventive").add();
 
         hvdcLine = network.getHvdcLine(networkElementId);
-        hvdcLineWithAngleDroop = networkWithAngleDroop.getHvdcLine(networkElementId);
-        hvdcLineWithAngleDroop.getExtension(HvdcAngleDroopActivePowerControl.class).setEnabled(true);
     }
 
     @Test
     void getInitialSetpoint() {
         HvdcRangeAction hvdcRa = hvdcRangeActionAdder.newRange().withMin(-5).withMax(10).add()
                 .add();
         assertEquals(0, hvdcRa.getCurrentSetpoint(network), 1e-6);
+        assertEquals(0, hvdcRa.getCurrentSetpoint(networkWithAngleDroop), 1e-6);
+    }
+
+    @Test
+    void testSetInitialSetpoint() {
+        HvdcRangeAction hvdcRa = hvdcRangeActionAdder.newRange().withMin(-5).withMax(10).add()
+            .add();
+        hvdcRa.setInitialSetpoint(10.0);
+        assertEquals(10.0, hvdcRa.getInitialSetpoint(), 1e-6);
     }
 
     @Test
     void applyPositiveSetpoint() {
         HvdcRangeAction hvdcRa = hvdcRangeActionAdder.newRange().withMin(-5).withMax(10).add()
                 .add();
         hvdcRa.apply(network, 5);
-        hvdcRa.apply(networkWithAngleDroop, 6);
         assertEquals(5, hvdcRa.getCurrentSetpoint(network), 1e-6);
-        assertEquals(6, hvdcRa.getCurrentSetpoint(networkWithAngleDroop), 1e-6);
-        assertFalse(hvdcLineWithAngleDroop.getExtension(HvdcAngleDroopActivePowerControl.class).isEnabled());
+
+        // Not allowed to change HVDC line's active setpoint if the line is in AC emulation mode.
+        OpenRaoException exception = assertThrows(OpenRaoException.class, () -> hvdcRa.apply(networkWithAngleDroop, 6));
+        assertEquals("Unable to set an active power setpoint for HVDC line BBE2AA11 FFR3AA11 1 because it is operating in AC Emulation mode.", exception.getMessage());
+
     }
 
     @Test
     void applyNegativeSetpoint() {
         HvdcRangeAction hvdcRa = hvdcRangeActionAdder.newRange().withMin(-5).withMax(10).add()
                 .add();
         hvdcRa.apply(network, -3);
-        hvdcRa.apply(networkWithAngleDroop, -4);
         assertEquals(-3, hvdcRa.getCurrentSetpoint(network), 1e-6);
-        assertEquals(-4, hvdcRa.getCurrentSetpoint(networkWithAngleDroop), 1e-6);
-        assertFalse(hvdcLineWithAngleDroop.getExtension(HvdcAngleDroopActivePowerControl.class).isEnabled());
+
+        // Not allowed to change HVDC line's active setpoint if the line is in AC emulation mode.
+        OpenRaoException exception = assertThrows(OpenRaoException.class, () -> hvdcRa.apply(networkWithAngleDroop, -4));
+        assertEquals("Unable to set an active power setpoint for HVDC line BBE2AA11 FFR3AA11 1 because it is operating in AC Emulation mode.", exception.getMessage());
     }
 
     @Test

data/crac/crac-io/crac-io-commons/src/main/java/com/powsybl/openrao/data/crac/io/commons/iidm/IidmHvdcHelper.java

@@ -34,4 +34,17 @@ public static double getCurrentSetpoint(Network network, String networkElementId
             return -getHvdcLine(network, networkElementId).getActivePowerSetpoint();
         }
     }
+
+    public static double computeActivePowerSetpointOnHvdcLine(HvdcLine hvdcLine) {
+        if (hvdcLine.getConvertersMode().equals(HvdcLine.ConvertersMode.SIDE_1_INVERTER_SIDE_2_RECTIFIER)) {
+            return hvdcLine.getConverterStation2().getTerminal().getP();
+        } else {
+            return hvdcLine.getConverterStation1().getTerminal().getP();
+        }
+    }
+
+    public static void setActivePowerSetpointOnHvdcLine(HvdcLine hvdcLine, double activePowerSetpoint) {
+        hvdcLine.setConvertersMode(activePowerSetpoint > 0 ? HvdcLine.ConvertersMode.SIDE_1_RECTIFIER_SIDE_2_INVERTER : HvdcLine.ConvertersMode.SIDE_1_INVERTER_SIDE_2_RECTIFIER);
+        hvdcLine.setActivePowerSetpoint(Math.abs(activePowerSetpoint));
+    }
 }

data/crac/crac-io/crac-io-commons/src/test/java/com/powsybl/openrao/data/crac/io/commons/iidm/IidmHvdcHelperTest.java

@@ -7,8 +7,10 @@
 
 package com.powsybl.openrao.data.crac.io.commons.iidm;
 
+import com.powsybl.iidm.network.HvdcConverterStation;
 import com.powsybl.iidm.network.HvdcLine;
 import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.Terminal;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
@@ -32,4 +34,48 @@ void testAddWithInitialSetpointFromNetwork() {
         when(hvdcLine.getConvertersMode()).thenReturn(HvdcLine.ConvertersMode.SIDE_1_INVERTER_SIDE_2_RECTIFIER);
         assertEquals(-50, IidmHvdcHelper.getCurrentSetpoint(network, "hvdc"));
     }
+
+    @Test
+    void computeActivePowerSetpointOnHvdcLine() {
+        // Mocks
+        HvdcLine hvdcLine = Mockito.mock(HvdcLine.class);
+        HvdcConverterStation station2 = Mockito.mock(HvdcConverterStation.class);
+        Terminal terminal2 = Mockito.mock(Terminal.class);
+
+        when(hvdcLine.getConvertersMode()).thenReturn(HvdcLine.ConvertersMode.SIDE_1_INVERTER_SIDE_2_RECTIFIER);
+        when(hvdcLine.getConverterStation2()).thenReturn(station2);
+        when(station2.getTerminal()).thenReturn(terminal2);
+        when(terminal2.getP()).thenReturn(123.45);
+
+        double result = IidmHvdcHelper.computeActivePowerSetpointOnHvdcLine(hvdcLine);
+
+        assertEquals(123.45, result, 1e-6);
+
+        // Mocks
+        HvdcConverterStation station1 = Mockito.mock(HvdcConverterStation.class);
+        Terminal terminal1 = Mockito.mock(Terminal.class);
+
+        when(hvdcLine.getConvertersMode()).thenReturn(HvdcLine.ConvertersMode.SIDE_1_RECTIFIER_SIDE_2_INVERTER);
+        when(hvdcLine.getConverterStation1()).thenReturn(station1);
+        when(station1.getTerminal()).thenReturn(terminal1);
+        when(terminal1.getP()).thenReturn(-55.0);
+
+        result = IidmHvdcHelper.computeActivePowerSetpointOnHvdcLine(hvdcLine);
+
+        assertEquals(-55.0, result, 1e-6);
+    }
+
+    @Test
+    void setActivePowerSetpointOnHvdcLine() {
+        Network network = Network.read("TestCase16NodesWithHvdc.xiidm", getClass().getResourceAsStream("/TestCase16NodesWithHvdc.xiidm"));
+        HvdcLine hvdcLine = network.getHvdcLine("BBE2AA11 FFR3AA11 1");
+        // Positive setpoint
+        IidmHvdcHelper.setActivePowerSetpointOnHvdcLine(hvdcLine, 60.0);
+        assertEquals(60.0, hvdcLine.getActivePowerSetpoint(), 60.0);
+        assertEquals(HvdcLine.ConvertersMode.SIDE_1_RECTIFIER_SIDE_2_INVERTER, hvdcLine.getConvertersMode());
+        // Negative setpoint
+        IidmHvdcHelper.setActivePowerSetpointOnHvdcLine(hvdcLine, -60.0);
+        assertEquals(60, hvdcLine.getActivePowerSetpoint());
+        assertEquals(HvdcLine.ConvertersMode.SIDE_1_INVERTER_SIDE_2_RECTIFIER, hvdcLine.getConvertersMode());
+    }
 }

data/crac/crac-io/crac-io-json/src/main/java/com/powsybl/openrao/data/crac/io/json/deserializers/HvdcRangeActionArrayDeserializer.java

@@ -44,6 +44,7 @@ public static void deserialize(JsonParser jsonParser, String version, Crac crac,
                 }
             }
             double initialSetpoint = IidmHvdcHelper.getCurrentSetpoint(network, networkElementId);
+            // initial set point of HVDC range action pointing to a HVDC line in AC emulation will be updated after running an initial load flow before launching rao.
             hvdcRangeActionAdder.withInitialSetpoint(initialSetpoint);
             hvdcRangeActionAdder.add();
         }