Update powsybl core to 6.2.0 (#878)

Update to PowSyBl 6.2.0
powsybl · Jan 31, 2024 · 2d02cd9 · 2d02cd9
1 parent 8779169
commit 2d02cd9
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 18 deletions.
diff --git a/...src/test/java/com/powsybl/openrao/data/craccreation/util/cgmes/CgmesBranchHelperTest.java b/...src/test/java/com/powsybl/openrao/data/craccreation/util/cgmes/CgmesBranchHelperTest.java
@@ -33,6 +33,7 @@ class CgmesBranchHelperTest {
     public static void setUp() {
         Properties importParams = new Properties();
         importParams.put("iidm.import.cgmes.source-for-iidm-id", "rdfID");
+        importParams.put("iidm.import.cgmes.cgm-with-subnetworks", false);
         network = Network.read(Paths.get(new File(CgmesBranchHelperTest.class.getResource("/MicroGrid.zip").getFile()).toString()), LocalComputationManager.getDefault(), Suppliers.memoize(ImportConfig::load).get(), importParams);
     }
 

diff --git a/...nrao/data/craccreation/creator/csaprofile/craccreator/CsaProfileCracCreationTestUtil.java b/...nrao/data/craccreation/creator/csaprofile/craccreator/CsaProfileCracCreationTestUtil.java
@@ -223,6 +223,8 @@ public static CsaProfileCracCreationContext getCsaCracCreationContext(String csa
     }
 
     public static Network getNetworkFromResource(String filename) {
-        return Network.read(Paths.get(new File(CsaProfileCracCreatorTest.class.getResource(filename).getFile()).toString()), LocalComputationManager.getDefault(), Suppliers.memoize(ImportConfig::load).get(), new Properties());
+        Properties importParams = new Properties();
+        importParams.put("iidm.import.cgmes.cgm-with-subnetworks", false);
+        return Network.read(Paths.get(new File(CsaProfileCracCreatorTest.class.getResource(filename).getFile()).toString()), LocalComputationManager.getDefault(), Suppliers.memoize(ImportConfig::load).get(), importParams);
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -113,9 +113,9 @@
         <maven.source.version>3.2.1</maven.source.version>
         <maven.templating.version>1.0.0</maven.templating.version>
         <mockito.inline.version>5.2.0</mockito.inline.version>
-        <powsybl.core.version>6.1.0</powsybl.core.version>
-        <powsybl.entsoe.version>2.7.0</powsybl.entsoe.version>
-        <powsybl.openloadflow.version>1.5.0</powsybl.openloadflow.version>
+        <powsybl.core.version>6.2.0</powsybl.core.version>
+        <powsybl.entsoe.version>2.8.0</powsybl.entsoe.version>
+        <powsybl.openloadflow.version>1.7.0</powsybl.openloadflow.version>
         <slf4j.version>1.7.36</slf4j.version>
         <xmlunit.core.version>2.8.1</xmlunit.core.version>
     </properties>

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json
@@ -88,6 +88,7 @@
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
             "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
+            "voltageRemoteControl" : true,
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 5000.0,
@@ -100,6 +101,8 @@
             "maxSusceptanceMismatch" : 1.0E-4,
             "slackBusPMaxMismatch" : 1.0,
             "voltagePerReactivePowerControl" : false,
+            "generatorReactivePowerRemoteControl" : false,
+            "transformerReactivePowerControl" : false,
             "maxNewtonRaphsonIterations" : 15,
             "maxOuterLoopIterations" : 20,
             "newtonRaphsonConvEpsPerEq" : 1.0E-4,
@@ -118,7 +121,7 @@
             "stateVectorScalingMode" : "NONE",
             "maxSlackBusCount" : 1,
             "debugDir" : null,
-            "incrementalTransformerVoltageControlOuterLoopMaxTapShift" : 3,
+            "incrementalTransformerRatioTapControlOuterLoopMaxTapShift" : 3,
             "secondaryVoltageControl" : false,
             "reactiveLimitsMaxPqPvSwitch" : 3,
             "phaseShifterControlMode" : "CONTINUOUS_WITH_DISCRETISATION",
@@ -131,6 +134,7 @@
             "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
             "outerLoopNames" : null,
             "useActiveLimits" : true,
+            "disableVoltageControlOfGeneratorsOutsideActivePowerLimits" : false,
             "lineSearchStateVectorScalingMaxIteration" : 10,
             "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
             "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
@@ -140,8 +144,10 @@
             "dcApproximationType" : "IGNORE_R",
             "simulateAutomationSystems" : false,
             "acSolverType" : "NEWTON_RAPHSON",
-            "maxNewtowKrylovIterations" : 100,
-            "newtowKrylovLineSearch" : false
+            "maxNewtonKrylovIterations" : 100,
+            "newtonKrylovLineSearch" : false,
+            "referenceBusSelectionMode" : "FIRST_SLACK",
+            "writeReferenceTerminals" : false
           }
         }
       },

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json
@@ -76,6 +76,7 @@
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
             "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
+            "voltageRemoteControl" : true,
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 5000.0,
@@ -88,6 +89,8 @@
             "maxSusceptanceMismatch" : 1.0E-4,
             "slackBusPMaxMismatch" : 1.0,
             "voltagePerReactivePowerControl" : false,
+            "generatorReactivePowerRemoteControl" : false,
+            "transformerReactivePowerControl" : false,
             "maxNewtonRaphsonIterations" : 111,
             "maxOuterLoopIterations" : 20,
             "newtonRaphsonConvEpsPerEq" : 1.0E-4,
@@ -106,7 +109,7 @@
             "stateVectorScalingMode" : "NONE",
             "maxSlackBusCount" : 1,
             "debugDir" : null,
-            "incrementalTransformerVoltageControlOuterLoopMaxTapShift" : 3,
+            "incrementalTransformerRatioTapControlOuterLoopMaxTapShift" : 3,
             "secondaryVoltageControl" : false,
             "reactiveLimitsMaxPqPvSwitch" : 3,
             "phaseShifterControlMode" : "CONTINUOUS_WITH_DISCRETISATION",
@@ -119,6 +122,7 @@
             "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
             "outerLoopNames" : null,
             "useActiveLimits" : true,
+            "disableVoltageControlOfGeneratorsOutsideActivePowerLimits" : false,
             "lineSearchStateVectorScalingMaxIteration" : 10,
             "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
             "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
@@ -128,8 +132,10 @@
             "dcApproximationType" : "IGNORE_R",
             "simulateAutomationSystems" : false,
             "acSolverType" : "NEWTON_RAPHSON",
-            "maxNewtowKrylovIterations" : 100,
-            "newtowKrylovLineSearch" : false
+            "maxNewtonKrylovIterations" : 100,
+            "newtonKrylovLineSearch" : false,
+            "referenceBusSelectionMode" : "FIRST_SLACK",
+            "writeReferenceTerminals" : false
           }
         }
       },

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json
@@ -88,6 +88,7 @@
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
             "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
+            "voltageRemoteControl" : true,
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 5000.0,
@@ -100,6 +101,8 @@
             "maxSusceptanceMismatch" : 1.0E-4,
             "slackBusPMaxMismatch" : 1.0,
             "voltagePerReactivePowerControl" : false,
+            "generatorReactivePowerRemoteControl" : false,
+            "transformerReactivePowerControl" : false,
             "maxNewtonRaphsonIterations" : 15,
             "maxOuterLoopIterations" : 20,
             "newtonRaphsonConvEpsPerEq" : 1.0E-4,
@@ -118,7 +121,7 @@
             "stateVectorScalingMode" : "NONE",
             "maxSlackBusCount" : 1,
             "debugDir" : null,
-            "incrementalTransformerVoltageControlOuterLoopMaxTapShift" : 3,
+            "incrementalTransformerRatioTapControlOuterLoopMaxTapShift" : 3,
             "secondaryVoltageControl" : false,
             "reactiveLimitsMaxPqPvSwitch" : 3,
             "phaseShifterControlMode" : "CONTINUOUS_WITH_DISCRETISATION",
@@ -131,6 +134,7 @@
             "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
             "outerLoopNames" : null,
             "useActiveLimits" : true,
+            "disableVoltageControlOfGeneratorsOutsideActivePowerLimits" : false,
             "lineSearchStateVectorScalingMaxIteration" : 10,
             "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
             "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
@@ -140,8 +144,10 @@
             "dcApproximationType" : "IGNORE_R",
             "simulateAutomationSystems" : false,
             "acSolverType" : "NEWTON_RAPHSON",
-            "maxNewtowKrylovIterations" : 100,
-            "newtowKrylovLineSearch" : false
+            "maxNewtonKrylovIterations" : 100,
+            "newtonKrylovLineSearch" : false,
+            "referenceBusSelectionMode" : "FIRST_SLACK",
+            "writeReferenceTerminals" : false
           }
         }
       },

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json
@@ -88,6 +88,7 @@
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
             "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
+            "voltageRemoteControl" : true,
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 5000.0,
@@ -100,6 +101,8 @@
             "maxSusceptanceMismatch" : 1.0E-4,
             "slackBusPMaxMismatch" : 1.0,
             "voltagePerReactivePowerControl" : false,
+            "generatorReactivePowerRemoteControl" : false,
+            "transformerReactivePowerControl" : false,
             "maxNewtonRaphsonIterations" : 15,
             "maxOuterLoopIterations" : 20,
             "newtonRaphsonConvEpsPerEq" : 1.0E-4,
@@ -118,7 +121,7 @@
             "stateVectorScalingMode" : "NONE",
             "maxSlackBusCount" : 1,
             "debugDir" : null,
-            "incrementalTransformerVoltageControlOuterLoopMaxTapShift" : 3,
+            "incrementalTransformerRatioTapControlOuterLoopMaxTapShift" : 3,
             "secondaryVoltageControl" : false,
             "reactiveLimitsMaxPqPvSwitch" : 3,
             "phaseShifterControlMode" : "CONTINUOUS_WITH_DISCRETISATION",
@@ -131,6 +134,7 @@
             "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
             "outerLoopNames" : null,
             "useActiveLimits" : true,
+            "disableVoltageControlOfGeneratorsOutsideActivePowerLimits" : false,
             "lineSearchStateVectorScalingMaxIteration" : 10,
             "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
             "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
@@ -140,8 +144,10 @@
             "dcApproximationType" : "IGNORE_R",
             "simulateAutomationSystems" : false,
             "acSolverType" : "NEWTON_RAPHSON",
-            "maxNewtowKrylovIterations" : 100,
-            "newtowKrylovLineSearch" : false
+            "maxNewtonKrylovIterations" : 100,
+            "newtonKrylovLineSearch" : false,
+            "referenceBusSelectionMode" : "FIRST_SLACK",
+            "writeReferenceTerminals" : false
           }
         }
       },

diff --git a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json
@@ -80,6 +80,7 @@
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
             "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
+            "voltageRemoteControl" : true,
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 10000.0,
@@ -101,7 +102,7 @@
             "stateVectorScalingMode" : "NONE",
             "maxSlackBusCount" : 1,
             "debugDir" : null,
-            "incrementalTransformerVoltageControlOuterLoopMaxTapShift" : 3,
+            "incrementalTransformerRatioTapControlOuterLoopMaxTapShift" : 3,
             "secondaryVoltageControl" : false,
             "reactiveLimitsMaxPqPvSwitch" : 3
           }

diff --git a/...misation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json b/...misation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json
@@ -80,6 +80,7 @@
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
             "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
+            "voltageRemoteControl" : true,
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 10000.0,
@@ -101,7 +102,7 @@
             "stateVectorScalingMode" : "NONE",
             "maxSlackBusCount" : 1,
             "debugDir" : null,
-            "incrementalTransformerVoltageControlOuterLoopMaxTapShift" : 3,
+            "incrementalTransformerRatioTapControlOuterLoopMaxTapShift" : 3,
             "secondaryVoltageControl" : false,
             "reactiveLimitsMaxPqPvSwitch" : 3
           }