Integrate powsybl-dependencies 2024.3.1 (#886)

Signed-off-by: Hugo KULESZA <hugo.kulesza@rte-france.com>
(cherry picked from commit 72c6dfe)

Author: HugoKulesza

docs/user_guide/security.rst

@@ -52,13 +52,13 @@ Information can be obtained on buses, branches and three windings transformers.
 .. doctest:: security.monitored_elements
     :options: +NORMALIZE_WHITESPACE
 
-    >>> network = pp.network.create_eurostag_tutorial_example1_network()
+    >>> network = pp.network.create_eurostag_tutorial_example1_with_more_generators_network()
     >>> security_analysis = pp.security.create_analysis()
     >>> security_analysis.add_single_element_contingency('NHV1_NHV2_1', 'NHV1_NHV2_1')
-    >>> security_analysis.add_single_element_contingency('NGEN_NHV1', 'NGEN_NHV1')
+    >>> security_analysis.add_single_element_contingency('GEN', 'GEN')
     >>> security_analysis.add_monitored_elements(voltage_level_ids=['VLHV2'])
-    >>> security_analysis.add_postcontingency_monitored_elements(branch_ids=['NHV1_NHV2_2'], contingency_ids=['NHV1_NHV2_1', 'NGEN_NHV1'])
-    >>> security_analysis.add_postcontingency_monitored_elements(branch_ids=['NHV1_NHV2_1'], contingency_ids='NGEN_NHV1')
+    >>> security_analysis.add_postcontingency_monitored_elements(branch_ids=['NHV1_NHV2_2'], contingency_ids=['NHV1_NHV2_1', 'GEN'])
+    >>> security_analysis.add_postcontingency_monitored_elements(branch_ids=['NHV1_NHV2_1'], contingency_ids='GEN')
     >>> security_analysis.add_precontingency_monitored_elements(branch_ids=['NHV1_NHV2_2'])
     >>> results = security_analysis.run_ac(network)
     >>> results.bus_results
@@ -69,8 +69,8 @@ Information can be obtained on buses, branches and three windings transformers.
                                                         p1     q1       i1      p2      q2       i2  flow_transfer
     contingency_id operator_strategy_id branch_id
                                         NHV1_NHV2_2 302.44  98.74   456.77 -300.43 -137.19   488.99            NaN
-    NGEN_NHV1                           NHV1_NHV2_1 301.06   0.00   302.80 -300.19 -116.60   326.75            NaN
-                                        NHV1_NHV2_2 301.06   0.00   302.80 -300.19 -116.60   326.75            NaN
+    GEN                                 NHV1_NHV2_1 302.44  98.74   456.77 -300.43 -137.19   488.99            NaN
+                                        NHV1_NHV2_2 302.44  98.74   456.77 -300.43 -137.19   488.99            NaN
     NHV1_NHV2_1                         NHV1_NHV2_2 610.56 334.06 1,008.93 -601.00 -285.38 1,047.83            NaN
 
 It also possible to get flow transfer on monitored branches in case of N-1 branch contingencies:

java/pom.xml

@@ -68,7 +68,7 @@
         <junit-jupiter.version>5.10.0</junit-jupiter.version>
         <mapdb.version>3.0.8</mapdb.version>
         <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
-        <powsybl-dependencies.version>2024.3.0</powsybl-dependencies.version>
+        <powsybl-dependencies.version>2024.3.1</powsybl-dependencies.version>
         <powsybl-open-reac.version>0.7.0</powsybl-open-reac.version>
         <zstdjni.version>1.5.5-3</zstdjni.version>
     </properties>

java/src/main/java/com/powsybl/python/network/Networks.java

@@ -98,6 +98,11 @@ public static Network createEurostagTutorialExample1() {
         return fix(network);
     }
 
+    public static Network createEurostagTutorialExampleWithMoreGenerators() {
+        Network network = EurostagTutorialExample1Factory.createWithMoreGenerators();
+        return fix(network);
+    }
+
     public static Network createEurostagTutorialExample1WithFixedCurrentLimits() {
         Network network = EurostagTutorialExample1Factory.createWithFixedCurrentLimits();
         return fix(network);

java/src/main/java/com/powsybl/python/network/PyPowsyblNetworksProvider.java

@@ -37,6 +37,7 @@ public class PyPowsyblNetworksProvider implements Networks.NetworksProvider {
             factory("four_substations_node_breaker", (Supplier<Network>) FourSubstationsNodeBreakerFactory::create),
             factory("four_substations_node_breaker_with_extensions", (Supplier<Network>) FourSubstationsNodeBreakerWithExtensionsFactory::create),
             factory("eurostag_tutorial_example1", Networks::createEurostagTutorialExample1WithFixedCurrentLimits),
+            factory("eurostag_tutorial_example1_with_more_generators", Networks::createEurostagTutorialExampleWithMoreGenerators),
             factory("eurostag_tutorial_example1_with_power_limits", Networks::createEurostagTutorialExample1WithFixedPowerLimits),
             factory("eurostag_tutorial_example1_with_apc_extension", Networks::createEurostagTutorialExample1WithApcExtension),
             factory("eurostag_tutorial_example1_with_entsoe_category", Networks::eurostagWithEntsoeCategory),

pypowsybl/network/__init__.py

@@ -26,6 +26,7 @@
     create_ieee118,
     create_ieee300,
     create_eurostag_tutorial_example1_network,
+    create_eurostag_tutorial_example1_with_more_generators_network,
     create_eurostag_tutorial_example1_with_power_limits_network,
     create_eurostag_tutorial_example1_with_tie_lines_and_areas,
     create_four_substations_node_breaker_network_with_extensions,

pypowsybl/network/impl/network_creation_util.py

@@ -102,6 +102,15 @@ def create_eurostag_tutorial_example1_network() -> Network:
     """
     return _create_network('eurostag_tutorial_example1')
 
+def create_eurostag_tutorial_example1_with_more_generators_network() -> Network:
+    """
+    Create an instance of example 1 network of Eurostag tutorial, with a second generator
+
+    Returns:
+        a new instance of example 1 network of Eurostag tutorial with a second generator
+    """
+    return _create_network('eurostag_tutorial_example1_with_more_generators')
+
 
 def create_eurostag_tutorial_example1_with_power_limits_network() -> Network:
     """

tests/test_security_analysis.py

@@ -78,13 +78,13 @@ def test_variant():
 
 
 def test_monitored_elements():
-    n = pp.network.create_eurostag_tutorial_example1_network()
+    n = pp.network.create_eurostag_tutorial_example1_with_more_generators_network()
     sa = pp.security.create_analysis()
     sa.add_single_element_contingency('NHV1_NHV2_1', 'NHV1_NHV2_1')
-    sa.add_single_element_contingency('NGEN_NHV1', 'NGEN_NHV1')
+    sa.add_single_element_contingency('GEN', 'GEN')
     sa.add_monitored_elements(voltage_level_ids=['VLHV2'])
-    sa.add_postcontingency_monitored_elements(branch_ids=['NHV1_NHV2_2'], contingency_ids=['NHV1_NHV2_1', 'NGEN_NHV1'])
-    sa.add_postcontingency_monitored_elements(branch_ids=['NHV1_NHV2_1'], contingency_ids='NGEN_NHV1')
+    sa.add_postcontingency_monitored_elements(branch_ids=['NHV1_NHV2_2'], contingency_ids=['NHV1_NHV2_1', 'GEN'])
+    sa.add_postcontingency_monitored_elements(branch_ids=['NHV1_NHV2_1'], contingency_ids='GEN')
     sa.add_precontingency_monitored_elements(branch_ids=['NHV1_NHV2_2'])
 
     sa_result = sa.run_ac(n)
@@ -100,8 +100,8 @@ def test_monitored_elements():
     assert branch_results.columns.tolist() == ['p1', 'q1', 'i1', 'p2', 'q2', 'i2', 'flow_transfer']
     assert len(branch_results) == 4
     assert branch_results.loc['', '', 'NHV1_NHV2_2']['p1'] == pytest.approx(302.44, abs=1e-2)
-    assert branch_results.loc['NGEN_NHV1', '', 'NHV1_NHV2_1']['p1'] == pytest.approx(301.05, abs=1e-2)
-    assert branch_results.loc['NGEN_NHV1', '', 'NHV1_NHV2_2']['p1'] == pytest.approx(301.05, abs=1e-2)
+    assert branch_results.loc['GEN', '', 'NHV1_NHV2_1']['p1'] == pytest.approx(302.44, abs=1e-2)
+    assert branch_results.loc['GEN', '', 'NHV1_NHV2_2']['p1'] == pytest.approx(302.44, abs=1e-2)
     assert branch_results.loc['NHV1_NHV2_1', '', 'NHV1_NHV2_2']['p1'] == pytest.approx(610.56, abs=1e-2)