Update DC opf with changes in DC dataframes

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

Author: Denis Bonnand

java/pom.xml

@@ -81,6 +81,11 @@
                 <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

@@ -47,7 +47,9 @@
     create_dc_detailed_lcc_bipole_ground_return_with_dc_line_segments_network,
     create_dc_detailed_lcc_bipole_metallic_return_network,
     create_dc_detailed_vsc_symmetrical_monopole_network,
-    create_dc_detailed_vsc_asymmetrical_monopole_network
+    create_dc_detailed_vsc_asymmetrical_monopole_network,
+    create_ac_dc_bipolar_network,
+    create_ac_dc_bipolar_network_with_metallic_return
 )
 from .impl.util import (
     get_extensions_names,

pypowsybl/network/impl/network_creation_util.py

@@ -292,13 +292,13 @@ def create_ac_dc_bipolar_network(allow_variant_multi_thread_access: bool = False
     n.create_dc_lines(id='dlGn', dc_node1_id='dnGn', dc_node2_id='dnGr', r=1000000)
     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_converter(id='conv23', voltage_level_id='vl2', dc_node1_id='dn3p', dc_node2_id='dn3n',
-                                      bus_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,
+    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)
-    n.create_voltage_source_converter(id='conv45', voltage_level_id='vl5', dc_node1_id='dn4p', dc_node2_id='dn4n',
-                                      bus_id='b5', voltage_regulator_on=0, control_mode='V_DC', target_q=0.0,
-                                      target_v_dc=400.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
+    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,
                                       dc_connected1=1, dc_connected2=1)
     return n
 
@@ -335,21 +335,21 @@ def create_ac_dc_bipolar_network_with_metallic_return(allow_variant_multi_thread
     n.create_dc_lines(id='dlG4r', dc_node1_id='dnGr', dc_node2_id='dn4r', 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_converter(id='conv23p', voltage_level_id='vl2', dc_node1_id='dn3p', dc_node2_id='dn3r',
-                                      bus_id='b2', voltage_regulator_on=0, control_mode='P_PCC', target_p=-25.0,
-                                      target_q=0.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
+    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,
                                       dc_connected1=1, dc_connected2=1)
-    n.create_voltage_source_converter(id='conv23n', voltage_level_id='vl2', dc_node1_id='dn3n', dc_node2_id='dn3r',
-                                      bus_id='b2', voltage_regulator_on=0, control_mode='P_PCC', target_p=-25.0,
-                                      target_q=0.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
+    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,
                                       dc_connected1=1, dc_connected2=1)
-    n.create_voltage_source_converter(id='conv45p', voltage_level_id='vl5', dc_node1_id='dn4p', dc_node2_id='dn4r',
-                                      bus_id='b5', voltage_regulator_on=0, control_mode='V_DC', target_q=0.0,
-                                      target_v_dc=200.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
+    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,
                                       dc_connected1=1, dc_connected2=1)
-    n.create_voltage_source_converter(id='conv45n', voltage_level_id='vl5', dc_node1_id='dn4n', dc_node2_id='dn4r',
-                                      bus_id='b5', voltage_regulator_on=0, control_mode='V_DC', target_q=0.0,
-                                      target_v_dc=-200.0, idle_loss=0.5, switching_loss=1.0, resistive_loss=0.2,
+    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,
                                       dc_connected1=1, dc_connected2=1)
 
     return n

pypowsybl/opf/impl/bounds/dc_line_current_bounds.py

@@ -15,7 +15,7 @@ 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(-100, 100)
+            i_bounds = Bounds(-10, 10)
             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/constraints/dc_current_balance_constraints.py

@@ -55,6 +55,6 @@ def create_dc_node_expr_list(cls, network_cache, variable_context):
             if row.dc_connected2:
                 conv_index = variable_context.conv_num_2_index[conv_num]
                 dc_node2_num = network_cache.dc_nodes.index.get_loc(dc_node2_id)
-                dc_nodes_balance.i_out[dc_node2_num] = variable_context.conv_i_vars[conv_index]
+                dc_nodes_balance.i_in[dc_node2_num].append(-variable_context.conv_i_vars[conv_index])
 
         return dc_nodes_balance.to_expr()

pypowsybl/opf/impl/constraints/power_balance_constraints.py

@@ -170,10 +170,10 @@ def create_bus_expr_list(cls, network_cache, variable_context):
 
         # voltage source converters
         for conv_num, row in enumerate(network_cache.voltage_source_converters.itertuples(index=False)):
-            bus_id = row.bus_id
-            if bus_id:
+            bus1_id = row.bus1_id
+            if bus1_id:
                 conv_index = variable_context.conv_num_2_index[conv_num]
-                bus_num = network_cache.buses.index.get_loc(bus_id)
+                bus_num = network_cache.buses.index.get_loc(bus1_id)
                 buses_balance.p_load[bus_num]+= variable_context.conv_p_vars[conv_index]
                 buses_balance.q_load[bus_num]+= variable_context.conv_q_vars[conv_index]
 

pypowsybl/opf/impl/constraints/voltage_source_converter_constraints.py

@@ -11,7 +11,7 @@ def add(self, parameters: ModelParameters, network_cache: NetworkCache, variable
             model: ipopt.Model) -> None:
         for converter_num, converter_row in enumerate(network_cache.voltage_source_converters.itertuples(index=False)):
             with nl.graph():
-                dc_node1_id, dc_node2_id, bus_id = converter_row.dc_node1_id, converter_row.dc_node2_id, converter_row.bus_id
+                dc_node1_id, dc_node2_id, bus1_id = converter_row.dc_node1_id, converter_row.dc_node2_id, converter_row.bus1_id
                 voltage_regulator_on, control_mode = converter_row.voltage_regulator_on, converter_row.control_mode
                 target_p, target_q, target_v_dc, target_v_ac = (converter_row.target_p, converter_row.target_q,
                                                                 converter_row.target_v_dc, converter_row.target_v_ac)
@@ -21,11 +21,11 @@ def add(self, parameters: ModelParameters, network_cache: NetworkCache, variable
 
                 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)
-                bus_num = network_cache.buses.index.get_loc(bus_id)
+                bus1_num = network_cache.buses.index.get_loc(bus1_id)
                 v1_var = variable_context.v_dc_vars[dc_node1_num]
                 v2_var = variable_context.v_dc_vars[dc_node2_num]
 
-                bus_v_var = variable_context.v_vars[bus_num]
+                bus1_v_var = variable_context.v_vars[bus1_num]
                 conv_q_var = variable_context.conv_q_vars[converter_num]
                 conv_p_var = variable_context.conv_p_vars[converter_num]
                 conv_i_var = variable_context.conv_i_vars[converter_num]
@@ -35,10 +35,13 @@ 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:
-                    bus_v_eq = bus_v_var - target_v_ac
-                    model.add_nl_constraint(bus_v_eq == 0.0)
+                    bus1_v_eq = bus1_v_var - target_v_ac
+                    model.add_nl_constraint(bus1_v_eq == 0.0)
                 else:
                     q_ac_eq = conv_q_var - target_q
                     model.add_nl_constraint(q_ac_eq == 0.0)

pypowsybl/opf/impl/model/network_cache.py

@@ -26,10 +26,10 @@ def __init__(self, network: Network) -> None:
         self._branches = self._build_branches(network, self.buses)
         self._dangling_lines = self._build_dangling_lines(network, self.buses)
         self._batteries = self._build_batteries(network, self.buses)
-        self._current_limits1, self._current_limits2 = self._build_current_limits(network)
+        # self._current_limits1, self._current_limits2 = self._build_current_limits(network)
         self._slack_terminal = self._build_stack_terminal(network, self.buses)
-        self._slack_terminal = self._network.get_extensions('slackTerminal')
-        self._dc_nodes = self._build_dc_nodes(network)
+        self._dc_buses = self._build_dc_buses(network)
+        self._dc_nodes = self._build_dc_nodes(network, self.dc_buses)
         self._dc_lines = self._build_dc_lines(network)
         self._voltage_source_converters = self._build_voltage_source_converters(network)
         self._dc_grounds = self._build_dc_grounds(network)
@@ -160,7 +160,8 @@ def _build_generators(network: Network, buses: DataFrame):
     @staticmethod
     def _build_buses(network: Network, voltage_levels: DataFrame):
         buses = network.get_buses(attributes=['voltage_level_id', 'connected_component', 'synchronous_component'])
-        buses = buses[(buses['synchronous_component'] == 0) & (buses['connected_component'] == 0)]
+        # buses = buses[(buses['synchronous_component'] == 0) & (buses['connected_component'] == 0)]
+        buses = buses[buses['connected_component'] == 0]
         return pd.merge(buses, voltage_levels, left_on='voltage_level_id', right_index=True, how='left')
 
     @staticmethod
@@ -196,20 +197,30 @@ def _build_stack_terminal(network, buses: DataFrame):
         slack_terminal = network.get_extensions('slackTerminal')
         return NetworkCache._filter_injections(slack_terminal, buses)
 
+    @staticmethod
+    def _build_dc_buses(network: Network):
+        dc_buses = network.get_dc_buses(attributes=['connected_component', 'dc_component'])
+        return dc_buses[dc_buses['connected_component'] == 0]
+
+    @staticmethod
+    def _build_dc_nodes(network: Network, dc_buses: DataFrame):
+        dc_nodes = network.get_dc_nodes(attributes=['dc_bus_id', 'nominal_v'])
+        return pd.merge(dc_nodes, dc_buses, left_on='bus_id', right_index=True, how='left')
+
     @staticmethod
     def _build_dc_lines(network: Network):
         return network.get_dc_lines(attributes=['dc_node1_id', 'dc_node2_id', 'r'])
 
     @staticmethod
-    def _build_dc_nodes(network: Network):
-        return network.get_dc_nodes(attributes=['nominal_v'])
+    def _build_dc_nodes(network: Network, dc_buses: DataFrame):
+        return network.get_dc_nodes(attributes=['dc_bus_id', 'nominal_v'])
 
     @staticmethod
     def _build_voltage_source_converters(network: Network):
-        return network.get_voltage_source_converters(attributes=['dc_node1_id', 'dc_node2_id', 'bus_id', 'voltage_regulator_on',
-                                                                 'control_mode', 'target_p', 'target_q', 'target_v_dc', 'target_v_ac',
-                                                                 'idle_loss', 'switching_loss', 'resistive_loss',
-                                                                 'dc_connected1', 'dc_connected2'])
+        return network.get_voltage_source_converters(attributes=['voltage_level_id', 'bus1_id', 'bus2_id', 'dc_node1_id', 'dc_node2_id',
+                                     'dc_connected1', 'dc_connected2', 'pcc_terminal_id', 'voltage_regulator_on',
+                                     'control_mode', 'target_v_dc', 'target_v_ac', 'target_p', 'target_q', 'idle_loss',
+                                     'switching_loss', 'resistive_loss'])
 
     @staticmethod
     def _build_dc_grounds(network: Network):
@@ -287,6 +298,10 @@ def current_limits2(self) -> DataFrame:
     def slack_terminal(self) -> DataFrame:
         return self._slack_terminal
 
+    @property
+    def dc_buses(self) -> DataFrame:
+        return self._dc_buses
+
     @property
     def dc_lines(self) -> DataFrame:
         return self._dc_lines
@@ -500,3 +515,39 @@ def update_dangling_lines(self,
                                                           angle=[math.nan] * len(disconnected_dl_ids))
 
         self._dangling_lines = self._build_dangling_lines(self._network, self._buses)
+
+    def update_dc_nodes(self,
+                     dc_node_ids: list[str],
+                     dc_node_v: list[float]):
+        self._network.update_dc_nodes(id=dc_node_ids, v=dc_node_v)
+        self._dc_nodes = self._build_dc_nodes(self._network)
+
+    def update_dc_lines(self,
+                        dc_line_ids: list[str],
+                        dc_line_i1: list[float],
+                        dc_line_i2: list[float]):
+        self._network.update_dc_lines(id=dc_line_ids,
+                                      i1=dc_line_i1,
+                                      i2=dc_line_i2)
+        self._dc_lines = self._build_dc_lines(self._network)
+
+    def update_voltage_source_converters(self,
+                                         conv_ids: list[str],
+                                         conv_p: list[float],
+                                         conv_q: list[float],
+                                         conv_p_dc1: list[float],
+                                         conv_p_dc2: list[float],
+                                         conv_target_p: list[float],
+                                         conv_target_q:list[float],
+                                         conv_target_v_dc: list[float],
+                                         conv_target_v_ac: list[float]):
+        self._network.update_voltage_source_converters(id=conv_ids,
+                                                       p_ac=conv_p,
+                                                       q_ac=conv_q,
+                                                       p_dc1=conv_p_dc1,
+                                                       p_dc2=conv_p_dc2,
+                                                       target_p=conv_target_p,
+                                                       target_q=conv_target_q,
+                                                       target_v_dc=conv_target_v_dc,
+                                                       target_v_ac=conv_target_v_ac)
+        self._voltage_source_converters = self._build_voltage_source_converters(self._network)