Clean up code, fix not working tests

Signed-off-by: Denis Bonnand <[email protected]>

Author: Denis Bonnand

java/pom.xml

@@ -81,11 +81,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-open-loadflow</artifactId>
-                <version>2.0.0-CUSTOM</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

pypowsybl/network/__init__.py

@@ -48,6 +48,7 @@
     create_dc_detailed_lcc_bipole_metallic_return_network,
     create_dc_detailed_vsc_symmetrical_monopole_network,
     create_dc_detailed_vsc_asymmetrical_monopole_network,
+    create_ac_dc_monopolar_network,
     create_ac_dc_bipolar_network,
     create_ac_dc_bipolar_network_with_metallic_return
 )

pypowsybl/network/impl/network_creation_util.py

@@ -256,6 +256,43 @@ def create_dc_detailed_vsc_asymmetrical_monopole_network(allow_variant_multi_thr
     """
     return _create_network('dc_detailed_vsc_asymmetrical_monopole', '', allow_variant_multi_thread_access)
 
+def create_ac_dc_monopolar_network(allow_variant_multi_thread_access: bool = False) -> Network:
+    """
+Create an instance of an AC DC monopolar network case, for AC DC loadflow
+
+Returns:
+    a new instance of an AC DC monopolar network case
+"""
+    n = pp.network.create_empty()
+    n.create_dc_nodes(id='dn3p', nominal_v=400)
+    n.create_dc_nodes(id='dn3n', nominal_v=400)
+    n.create_dc_nodes(id='dn4p', nominal_v=400)
+    n.create_dc_nodes(id='dn4n', nominal_v=400)
+    n.create_dc_grounds(id='dg3', r=0.0, dc_node_id='dn3n')
+    n.create_dc_grounds(id='dg4', r=0.0, dc_node_id='dn4n')
+    n.create_voltage_levels(id='vl1', topology_kind='BUS_BREAKER', nominal_v=400)
+    n.create_buses(id='b1', voltage_level_id='vl1')
+    n.create_generators(id='g1', voltage_level_id='vl1', bus_id='b1', target_p=102.56, min_p=0, max_p=500,
+                        target_v=390,
+                        voltage_regulator_on=True)
+    n.create_voltage_levels(id='vl2', topology_kind='BUS_BREAKER', nominal_v=400)
+    n.create_buses(id='b2', voltage_level_id='vl2')
+    n.create_loads(id='ld2', voltage_level_id='vl2', bus_id='b2', p0=20, q0=10)
+    n.create_voltage_levels(id='vl5', topology_kind='BUS_BREAKER', nominal_v=400)
+    n.create_buses(id='b5', voltage_level_id='vl5')
+    n.create_loads(id='ld5', voltage_level_id='vl5', bus_id='b5', p0=50, q0=10)
+    n.create_dc_lines(id='dl34p', dc_node1_id='dn3p', dc_node2_id='dn4p', r=0.1)
+    n.create_lines(id='l12', voltage_level1_id='vl1', bus1_id='b1', voltage_level2_id='vl2', bus2_id='b2', r=1, x=3)
+    n.create_lines(id='l25', voltage_level1_id='vl2', bus1_id='b2', voltage_level2_id='vl5', bus2_id='b5', r=1, x=3)
+    n.create_voltage_source_converters(id='conv23', voltage_level_id='vl2', dc_node1_id='dn3p', dc_node2_id='dn3n',
+                                      bus1_id='b2', voltage_regulator_on=0, control_mode='P_PCC', target_p=-50.0,
+                                       target_q=0.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
+                                       dc_connected1=1, dc_connected2=1)
+    n.create_voltage_source_converters(id='conv45', voltage_level_id='vl5', dc_node1_id='dn4p', dc_node2_id='dn4n',
+                                       bus1_id='b5', voltage_regulator_on=0, control_mode='V_DC', target_v_dc=400.0,
+                                       target_q=0.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
+                                       dc_connected1=1, dc_connected2=1)
+    return n
 
 def create_ac_dc_bipolar_network(allow_variant_multi_thread_access: bool = False) -> Network:
     """
@@ -294,11 +331,11 @@ def create_ac_dc_bipolar_network(allow_variant_multi_thread_access: bool = False
     n.create_lines(id='l25', voltage_level1_id='vl2', bus1_id='b2', voltage_level2_id='vl5', bus2_id='b5', r=1, x=3)
     n.create_voltage_source_converters(id='conv23', voltage_level_id='vl2', dc_node1_id='dn3p', dc_node2_id='dn3n',
                                       bus1_id='b2', voltage_regulator_on=0, control_mode='P_PCC', target_p=-50.0,
-                                      target_q=0.0, idle_loss=0.0, switching_loss=0.0, resistive_loss=0.0,
-                                      dc_connected1=1, dc_connected2=1)
+                                       target_q=0.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
+                                       dc_connected1=1, dc_connected2=1)
     n.create_voltage_source_converters(id='conv45', voltage_level_id='vl5', dc_node1_id='dn4p', dc_node2_id='dn4n',
                                       bus1_id='b5', voltage_regulator_on=0, control_mode='V_DC', target_q=0.0,
-                                      target_v_dc=400.0, idle_loss=0.0, switching_loss=0.0, resistive_loss=0.0,
+                                      target_v_dc=400.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
                                       dc_connected1=1, dc_connected2=1)
     return n
 
@@ -337,19 +374,19 @@ def create_ac_dc_bipolar_network_with_metallic_return(allow_variant_multi_thread
     n.create_lines(id='l25', voltage_level1_id='vl2', bus1_id='b2', voltage_level2_id='vl5', bus2_id='b5', r=1, x=3)
     n.create_voltage_source_converters(id='conv23p', voltage_level_id='vl2', dc_node1_id='dn3p', dc_node2_id='dn3r',
                                       bus1_id='b2', voltage_regulator_on=0, control_mode='P_PCC', target_p=-25.0,
-                                      target_q=0.0, idle_loss=0.0, switching_loss=0.0, resistive_loss=0.0,
+                                      target_q=0.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
                                       dc_connected1=1, dc_connected2=1)
     n.create_voltage_source_converters(id='conv23n', voltage_level_id='vl2', dc_node1_id='dn3n', dc_node2_id='dn3r',
                                       bus1_id='b2', voltage_regulator_on=0, control_mode='P_PCC', target_p=-25.0,
-                                      target_q=0.0, idle_loss=0.0, switching_loss=0.0, resistive_loss=0.0,
+                                      target_q=0.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
                                       dc_connected1=1, dc_connected2=1)
     n.create_voltage_source_converters(id='conv45p', voltage_level_id='vl5', dc_node1_id='dn4p', dc_node2_id='dn4r',
                                       bus1_id='b5', voltage_regulator_on=0, control_mode='V_DC', target_q=0.0,
-                                      target_v_dc=200.0, idle_loss=0.0, switching_loss=0.0, resistive_loss=0.0,
+                                      target_v_dc=200.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
                                       dc_connected1=1, dc_connected2=1)
     n.create_voltage_source_converters(id='conv45n', voltage_level_id='vl5', dc_node1_id='dn4n', dc_node2_id='dn4r',
                                       bus1_id='b5', voltage_regulator_on=0, control_mode='V_DC', target_q=0.0,
-                                      target_v_dc=-200.0, idle_loss=0.0, switching_loss=0.0, resistive_loss=0.0,
+                                      target_v_dc=-200.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
                                       dc_connected1=1, dc_connected2=1)
 
     return n

pypowsybl/opf/impl/bounds/dc_line_current_bounds.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2025, SuperGrid Institute (http://www.supergrid-institute.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+#
 import logging
 
 from pyoptinterface import ipopt
@@ -15,7 +21,8 @@ class DcLineCurrentBounds(VariableBounds):
     def add(self, parameters: ModelParameters, network_cache: NetworkCache,
             variable_context: VariableContext, model: ipopt.Model):
         for dc_line_num, row in enumerate(network_cache.dc_lines.itertuples()):
-            i_bounds = Bounds(-10, 10)
+            #TODO add current limits in DC line core modelization
+            i_bounds = Bounds(-2, 2)
             logger.log(TRACE_LEVEL, f"Add current bounds {i_bounds} to dc line '{row.Index}' (num={dc_line_num})'")
             dc_line_index = variable_context.dc_line_num_2_index[dc_line_num]
             model.set_variable_bounds(variable_context.closed_dc_line_i1_vars[dc_line_index],

pypowsybl/opf/impl/bounds/dc_node_voltage_bounds.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2025, SuperGrid Institute (http://www.supergrid-institute.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+#
 import logging
 
 from pyoptinterface import ipopt
@@ -15,9 +21,9 @@ class DcNodeVoltageBounds(VariableBounds):
     def add(self, parameters: ModelParameters, network_cache: NetworkCache,
             variable_context: VariableContext, model: ipopt.Model):
         for dc_node_num, row in enumerate(network_cache.dc_nodes.itertuples()):
-            #TODO add voltage limits in DC NODE core modelization
-            low_voltage_limit = -1
-            high_voltage_limit = 1
+            #TODO add voltage limits in DC node core modelization
+            low_voltage_limit = -2.0
+            high_voltage_limit = 2.0
             v_bounds = Bounds(low_voltage_limit, high_voltage_limit)
             logger.log(TRACE_LEVEL, f"Add voltage magnitude bounds {v_bounds} to dc_node '{row.Index}' (num={dc_node_num})'")
             model.set_variable_bounds(variable_context.v_dc_vars[dc_node_num],

pypowsybl/opf/impl/bounds/voltage_source_converter_power_bounds.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2025, SuperGrid Institute (http://www.supergrid-institute.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+#
 import logging
 
 from pyoptinterface import ipopt

pypowsybl/opf/impl/constraints/dc_current_balance_constraints.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2025, SuperGrid Institute (http://www.supergrid-institute.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+#
 import pyoptinterface as poi
 from pyoptinterface import ipopt
 
@@ -14,7 +20,6 @@ def add(self, parameters: ModelParameters, network_cache: NetworkCache,
         for dc_node_expr in self.create_dc_node_expr_list(network_cache, variable_context):
             model.add_linear_constraint(dc_node_expr, poi.Eq, 0.0)
 
-
     class DcNodesBalance:
         def __init__(self, dc_node_count: int):
             self.i_in = [[] for _ in range(dc_node_count)]
@@ -28,7 +33,6 @@ def _to_expr(dc_node_i_in: list, dc_node_i_out: list) -> list[poi.ExprBuilder]:
         def to_expr(self) -> list[poi.ExprBuilder]:
             return self._to_expr(self.i_in, self.i_out)
 
-
     @classmethod
     def create_dc_node_expr_list(cls, network_cache, variable_context):
         dc_node_grounded_ids = [row.dc_node_id for row in network_cache.dc_grounds.itertuples(index=False)]
@@ -46,15 +50,13 @@ def create_dc_node_expr_list(cls, network_cache, variable_context):
 
         # voltage source converters
         for conv_num, row in enumerate(network_cache.voltage_source_converters.itertuples(index=False)):
-            dc_node1_id = row.dc_node1_id
-            dc_node2_id = row.dc_node2_id
-            if row.dc_connected1:
+            if row.dc_node1_id not in dc_node_grounded_ids:
                 conv_index = variable_context.conv_num_2_index[conv_num]
-                dc_node1_num = network_cache.dc_nodes.index.get_loc(dc_node1_id)
+                dc_node1_num = network_cache.dc_nodes.index.get_loc(row.dc_node1_id)
                 dc_nodes_balance.i_in[dc_node1_num].append(variable_context.conv_i_vars[conv_index])
-            if row.dc_connected2:
+            if row.dc_node2_id not in dc_node_grounded_ids:
                 conv_index = variable_context.conv_num_2_index[conv_num]
-                dc_node2_num = network_cache.dc_nodes.index.get_loc(dc_node2_id)
+                dc_node2_num = network_cache.dc_nodes.index.get_loc(row.dc_node2_id)
                 dc_nodes_balance.i_in[dc_node2_num].append(-variable_context.conv_i_vars[conv_index])
 
-        return dc_nodes_balance.to_expr()
+        return dc_nodes_balance.to_expr()

pypowsybl/opf/impl/constraints/dc_ground_constraints.py

@@ -1,5 +1,9 @@
-from math import hypot, atan2
-
+# Copyright (c) 2025, SuperGrid Institute (http://www.supergrid-institute.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+#
 from pyoptinterface import ipopt, nl
 
 from pypowsybl.opf.impl.model.constraints import Constraints

pypowsybl/opf/impl/constraints/dc_line_constraints.py

@@ -1,5 +1,9 @@
-from math import hypot, atan2
-
+# Copyright (c) 2025, SuperGrid Institute (http://www.supergrid-institute.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+#
 from pyoptinterface import ipopt, nl
 
 from pypowsybl.opf.impl.model.constraints import Constraints

pypowsybl/opf/impl/constraints/voltage_source_converter_constraints.py

@@ -1,10 +1,15 @@
+# Copyright (c) 2025, SuperGrid Institute (http://www.supergrid-institute.com)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+#
 from pyoptinterface import ipopt, nl
 
 from pypowsybl.opf.impl.model.constraints import Constraints
 from pypowsybl.opf.impl.model.model_parameters import ModelParameters
 from pypowsybl.opf.impl.model.network_cache import NetworkCache
 from pypowsybl.opf.impl.model.variable_context import VariableContext
-import math
 
 class VoltageSourceConverterConstraints(Constraints):
     def add(self, parameters: ModelParameters, network_cache: NetworkCache, variable_context: VariableContext,
@@ -17,7 +22,6 @@ def add(self, parameters: ModelParameters, network_cache: NetworkCache, variable
                                                                 converter_row.target_v_dc, converter_row.target_v_ac)
                 idle_loss, switching_loss, resistive_loss = (converter_row.idle_loss, converter_row.switching_loss,
                                                              converter_row.resistive_loss)
-                dc_connected1, dc_connected2 = converter_row.dc_connected1, converter_row.dc_connected2
 
                 dc_node1_num = network_cache.dc_nodes.index.get_loc(dc_node1_id)
                 dc_node2_num = network_cache.dc_nodes.index.get_loc(dc_node2_id)
@@ -35,9 +39,6 @@ def add(self, parameters: ModelParameters, network_cache: NetworkCache, variable
                     model.add_nl_constraint(p_ac_eq == 0.0)
 
                 # if control_mode == "V_DC", we let the opf determine the value of U
-                # if control_mode == "V_DC":
-                #     v_dc_eq = v1_var - v2_var - target_v_dc
-                #     model.add_nl_constraint(v_dc_eq == 0.0)
 
                 if voltage_regulator_on:
                     bus1_v_eq = bus1_v_var - target_v_ac
@@ -50,13 +51,9 @@ def add(self, parameters: ModelParameters, network_cache: NetworkCache, variable
                 i_ac_var = nl.sqrt(nl.pow(conv_p_var,2) + nl.pow(conv_q_var,2))/1000.0
                 p_loss = idle_loss + switching_loss*i_ac_var + resistive_loss*nl.pow(i_ac_var,2)
 
-                u_var = 0
-                if dc_connected1:
-                    u_var+= v1_var
-                if dc_connected2:
-                    u_var-= v2_var
                 # P_dc = -P_ac - P_loss because we consider that the power P_dc injected in DC is positive,
                 # and the power P_ac flowing out of AC is negative
-                conv_p_dc_eq = (-conv_p_var - p_loss) - conv_i_var * (u_var + 0.001)
+                # FIXME : I needed to add 0.01 because at the initialization v1_var = v2_var and the opf never converge
+                conv_p_dc_eq = (-conv_p_var - p_loss) - conv_i_var * (v1_var - v2_var + 0.01)
 
                 model.add_nl_constraint(conv_p_dc_eq == 0.0)