Update powsybl dependencies (#837)

* Update powsybl dependencies Signed-off-by: Sébastien Murgey <[email protected]> * fix parallel computations --------- Signed-off-by: Sébastien Murgey <[email protected]> Co-authored-by: Peter Mitri <[email protected]>
powsybl · Nov 21, 2023 · 290a1d0 · 290a1d0
1 parent 76abc96
commit 290a1d0
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -109,9 +109,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.0.1</powsybl.core.version>
-        <powsybl.glsk.version>2.6.0</powsybl.glsk.version>
-        <powsybl.openloadflow.version>1.3.0</powsybl.openloadflow.version>
+        <powsybl.core.version>6.0.2</powsybl.core.version>
+        <powsybl.glsk.version>2.6.2</powsybl.glsk.version>
+        <powsybl.openloadflow.version>1.4.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
@@ -87,7 +87,7 @@
           "open-load-flow-parameters" : {
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
-            "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+            "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 5000.0,
@@ -129,7 +129,16 @@
             "actionableSwitchesIds" : [ ],
             "asymmetrical" : false,
             "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
-            "outerLoopNames" : null
+            "outerLoopNames" : null,
+            "useActiveLimits" : true,
+            "lineSearchStateVectorScalingMaxIteration" : 10,
+            "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+            "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+            "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+            "linePerUnitMode" : "IMPEDANCE",
+            "useLoadModel" : false,
+            "dcApproximationType" : "IGNORE_R",
+            "simulateAutomationSystems" : 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
@@ -75,7 +75,7 @@
           "open-load-flow-parameters" : {
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
-            "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+            "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 5000.0,
@@ -117,7 +117,16 @@
             "actionableSwitchesIds" : [ ],
             "asymmetrical" : false,
             "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
-            "outerLoopNames" : null
+            "outerLoopNames" : null,
+            "useActiveLimits" : true,
+            "lineSearchStateVectorScalingMaxIteration" : 10,
+            "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+            "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+            "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+            "linePerUnitMode" : "IMPEDANCE",
+            "useLoadModel" : false,
+            "dcApproximationType" : "IGNORE_R",
+            "simulateAutomationSystems" : 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
@@ -87,7 +87,7 @@
           "open-load-flow-parameters" : {
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
-            "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+            "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 5000.0,
@@ -129,7 +129,16 @@
             "actionableSwitchesIds" : [ ],
             "asymmetrical" : false,
             "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
-            "outerLoopNames" : null
+            "outerLoopNames" : null,
+            "useActiveLimits" : true,
+            "lineSearchStateVectorScalingMaxIteration" : 10,
+            "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+            "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+            "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+            "linePerUnitMode" : "IMPEDANCE",
+            "useLoadModel" : false,
+            "dcApproximationType" : "IGNORE_R",
+            "simulateAutomationSystems" : 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
@@ -87,7 +87,7 @@
           "open-load-flow-parameters" : {
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
-            "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+            "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 5000.0,
@@ -129,7 +129,16 @@
             "actionableSwitchesIds" : [ ],
             "asymmetrical" : false,
             "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
-            "outerLoopNames" : null
+            "outerLoopNames" : null,
+            "useActiveLimits" : true,
+            "lineSearchStateVectorScalingMaxIteration" : 10,
+            "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+            "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+            "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+            "linePerUnitMode" : "IMPEDANCE",
+            "useLoadModel" : false,
+            "dcApproximationType" : "IGNORE_R",
+            "simulateAutomationSystems" : 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
@@ -79,7 +79,7 @@
           "open-load-flow-parameters" : {
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
-            "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+            "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 10000.0,

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
@@ -79,7 +79,7 @@
           "open-load-flow-parameters" : {
             "slackBusSelectionMode" : "MOST_MESHED",
             "slackBusesIds" : [ ],
-            "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+            "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
             "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
             "loadPowerFactorConstant" : false,
             "plausibleActivePowerLimit" : 10000.0,

diff --git a/...main/java/com/farao_community/farao/sensitivity_analysis/SystematicSensitivityResult.java b/...main/java/com/farao_community/farao/sensitivity_analysis/SystematicSensitivityResult.java
@@ -20,6 +20,7 @@
 import com.powsybl.sensitivity.*;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -64,7 +65,7 @@ public enum SensitivityComputationStatus {
     private final StateResult nStateResult = new StateResult();
     private final Map<Instant, Map<String, StateResult>> postContingencyResults = new EnumMap<>(Instant.class);
 
-    private final Map<Cnec, StateResult> memoizedStateResultPerCnec = new HashMap<>();
+    private final Map<Cnec, StateResult> memoizedStateResultPerCnec = new ConcurrentHashMap<>();
 
     public SystematicSensitivityResult() {
         this.status = SensitivityComputationStatus.SUCCESS;