Merge branch 'refs/heads/main' into connectivity-loss-in-connectivity-break-analysis

Author: p-arvy

README.md

@@ -100,12 +100,12 @@ dependencies to respectively have access to network model, IEEE test networks an
 <dependency>
     <groupId>com.powsybl</groupId>
     <artifactId>powsybl-iidm-impl</artifactId>
-    <version>6.6.0</version>
+    <version>6.7.0</version>
 </dependency>
 <dependency>
     <groupId>com.powsybl</groupId>
     <artifactId>powsybl-ieee-cdf-converter</artifactId>
-    <version>6.6.0</version>
+    <version>6.7.0</version>
 </dependency>
 <dependency>
     <groupId>org.slf4j</groupId>
@@ -124,7 +124,7 @@ After adding a last Maven dependency on Open Load Flow implementation:
 <dependency>
     <groupId>com.powsybl</groupId>
     <artifactId>powsybl-open-loadflow</artifactId>
-    <version>1.14.1</version>
+    <version>1.15.0</version>
 </dependency>
 ```
 

pom.xml

@@ -19,7 +19,7 @@
     </parent>
 
     <artifactId>powsybl-open-loadflow</artifactId>
-    <version>1.15.0-SNAPSHOT</version>
+    <version>1.16.0-SNAPSHOT</version>
 
     <name>powsybl open loadflow</name>
     <description>An open source loadflow based on PowSyBl</description>
@@ -53,7 +53,7 @@
         <slf4jtoys.version>1.6.3</slf4jtoys.version>
         <asciitable.version>0.3.2</asciitable.version>
 
-        <powsybl-core.version>6.7.0-RC1</powsybl-core.version>
+        <powsybl-core.version>6.7.0</powsybl-core.version>
     </properties>
 
     <build>

src/main/java/com/powsybl/openloadflow/dc/DcLoadFlowEngine.java

@@ -74,7 +74,9 @@ public static double distributeSlack(LfNetwork network, Collection<LfBus> buses,
     public static double getActivePowerMismatch(Collection<LfBus> buses) {
         double mismatch = 0;
         for (LfBus b : buses) {
-            mismatch += b.getGenerationTargetP() - b.getLoadTargetP();
+            if (!b.isDisabled()) {
+                mismatch += b.getGenerationTargetP() - b.getLoadTargetP();
+            }
         }
         return -mismatch;
     }

src/test/java/com/powsybl/openloadflow/sa/WoodburyDcSecurityAnalysisWithActionsTest.java

@@ -219,9 +219,9 @@ void testSaDcPhaseTapChangerTapPositionChangeAlphaOnly(boolean dcFastMode) {
         assertEquals(network.getTwoWindingsTransformer("PS1").getTerminal2().getP(), brRelPS1.getP2(), LoadFlowAssert.DELTA_POWER);
     }
 
-    // TODO Does not work in DC mode - to fix in a separate PR
-    @Test
-    void testSaDcPhaseTapChangerTapPositionChangeWithConnectivityBreak() {
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    void testSaDcPhaseTapChangerTapPositionChangeWithConnectivityBreak(boolean fastDcMode) {
         Network network = PhaseControlFactory.createNetworkWith3Buses();
 
         List<StateMonitor> monitors = createAllBranchesMonitors(network);
@@ -235,6 +235,8 @@ void testSaDcPhaseTapChangerTapPositionChangeWithConnectivityBreak() {
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusId("VL2_0")
                 .setSlackBusSelectionMode(SlackBusSelectionMode.NAME);
+        securityAnalysisParameters.getExtension(OpenSecurityAnalysisParameters.class)
+                .setDcFastMode(fastDcMode);
         SecurityAnalysisResult result = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters,
                 operatorStrategies, actions, ReportNode.NO_OP);