VeraGridEngine 5.4.9__tar.gz → 5.4.10__tar.gz

{veragridengine-5.4.9 → veragridengine-5.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGridEngine
-Version: 5.4.9
+Version: 5.4.10
 Summary: VeraGrid is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/VeraGrid
 Author: Santiago Peñate Vera et. Al.

{veragridengine-5.4.9 → veragridengine-5.4.10}/VeraGridEngine/Compilers/circuit_to_data.py

@@ -1131,10 +1131,17 @@ def fill_generator_parent(
         data.p3_star[3 * k + idx3] = data.p[k] / 3.0
 
     # reactive power-sharing data
+    # We use P as a reference for scaling, hence issues may arise if P = 0.0
+    # Thus we add a small value to compensate for that
+    # The small value cannot be 1e-20, as then the split of Q 
+    # would be half the value (1e-20/1e-20). 
+    # A value of 1e-14 seems a sweet compromise.
     if data.active[k]:
         if data.controllable[k]:
-            bus_data.q_shared_total[i] += data.pmax[k]
-            data.q_share[k] = data.pmax[k]
+            bus_data.q_shared_total[i] += data.p[k] + 1e-14
+            data.q_share[k] = data.p[k] + 1e-14
+            # bus_data.q_shared_total[i] += data.p[k]
+            # data.q_share[k] = data.p[k]
         else:
             bus_data.q_fixed[i] += data.get_q_at(k)
 

{veragridengine-5.4.9 → veragridengine-5.4.10}/VeraGridEngine/Devices/Branches/branch.py

@@ -418,7 +418,7 @@ class Branch(BranchParent):
         """
         return [self.bus_from.get_coordinates(), self.bus_to.get_coordinates()]
 
-    def get_equivalent_transformer(self) -> Transformer2W:
+    def get_equivalent_transformer(self, index: pd.DatetimeIndex | None = None) -> Transformer2W:
         """
         Convert this line into a transformer
         This is necessary if the buses' voltage differ too much
@@ -446,13 +446,19 @@ class Branch(BranchParent):
                             temp_oper=self.temp_oper,
                             alpha=self.alpha,
                             template=self.template)
-        elm.rate_prof = self.rate_prof
-        elm.Cost_prof = self.Cost_prof
-        elm.active_prof = self.active_prof
-        elm.temp_oper_prof = self.temp_oper_prof
+
+        if index is not None:
+            elm.ensure_profiles_exist(index=index)
+            elm.active_prof = self.active_prof
+            elm.rate_prof = self.rate_prof
+            elm.contingency_factor_prof = self.contingency_factor_prof
+            elm.protection_rating_factor_prof = self.protection_rating_factor_prof
+            elm.temp_oper_prof = self.temp_oper_prof
+            elm.Cost_prof = self.Cost_prof
+
         return elm
 
-    def get_equivalent_line(self) -> Line:
+    def get_equivalent_line(self, index: pd.DatetimeIndex | None = None) -> Line:
         """
         Get the equivalent line object
         :return:
@@ -477,10 +483,14 @@ class Branch(BranchParent):
                    temp_oper=self.temp_oper,
                    alpha=self.alpha)
 
-        elm.rate_prof = self.rate_prof
-        elm.Cost_prof = self.Cost_prof
-        elm.active_prof = self.active_prof
-        elm.temp_oper_prof = self.temp_oper_prof
+        if index is not None:
+            elm.ensure_profiles_exist(index=index)
+            elm.active_prof = self.active_prof
+            elm.rate_prof = self.rate_prof
+            elm.contingency_factor_prof = self.contingency_factor_prof
+            elm.protection_rating_factor_prof = self.protection_rating_factor_prof
+            elm.temp_oper_prof = self.temp_oper_prof
+            elm.Cost_prof = self.Cost_prof
 
         return elm
 

{veragridengine-5.4.9 → veragridengine-5.4.10}/VeraGridEngine/Devices/Injections/battery.py

@@ -132,3 +132,11 @@ class Battery(Generator):
         self.register(key='charge_efficiency', units='p.u.', tpe=float, definition='Charging efficiency.')
         self.register(key='discharge_efficiency', units='p.u.', tpe=float, definition='Discharge efficiency.')
         self.register(key='discharge_per_cycle', units='p.u.', tpe=float, definition='')
+
+    def __iadd__(self, other: "Battery"):
+        """
+        Add another generator here
+        :param other: Generator to add
+        """
+        super().__iadd__(other)
+        self.Enom += other.Enom

{veragridengine-5.4.9 → veragridengine-5.4.10}/VeraGridEngine/Devices/Injections/generator.py

@@ -489,7 +489,25 @@ class Generator(GeneratorParent):
         """
         self._Snom = val
 
+    def __iadd__(self, other: "Generator"):
+        """
+        Add another generator here
+        :param other: Generator to add
+        """
+
+        self.P += other.P
+        self.P_prof = self.P_prof.toarray() + other.P_prof.toarray()
+
+        self.Pmax += other.Pmax
+        self.Pmin += other.Pmin
+
+        self.Qmax += other.Qmax
+        self.Qmin += other.Qmin
+
     def initialize_rms(self):
+        """
+        Initialize the RMS model
+        """
         if self.rms_model.empty():
 
             delta = Var("delta")

{veragridengine-5.4.9 → veragridengine-5.4.10}/VeraGridEngine/Devices/Parents/load_parent.py

@@ -327,3 +327,15 @@ class LoadParent(InjectionParent):
 
             if show_fig:
                 plt.show()
+
+    def __iadd__(self, other: "LoadParent"):
+        """
+        Add another generator here
+        :param other: Generator to add
+        """
+
+        self.P += other.P
+        self.P_prof = self.P_prof.toarray() + other.P_prof.toarray()
+
+        self.Q += other.Q
+        self.Q_prof = self.Q_prof.toarray() + other.Q_prof.toarray()

{veragridengine-5.4.9 → veragridengine-5.4.10}/VeraGridEngine/Devices/multi_circuit.py

@@ -293,7 +293,9 @@ class MultiCircuit(Assets):
                  and that [5, 6, 7, 8] are represented by the topology of 5
         """
 
-        return find_different_states(states_array=self.get_branch_active_time_array())
+        groups, mapping = find_different_states(states_array=self.get_branch_active_time_array())
+
+        return groups
 
     def copy(self) -> "MultiCircuit":
         """
@@ -1688,7 +1690,7 @@ class MultiCircuit(Assets):
         for elm in self.get_injection_devices_iter():
             if elm.bus is not None:
                 k = bus_dict[elm.bus]
-                val[k] = elm.get_S()
+                val[k] += elm.get_S()
 
         return val
 
@@ -1704,7 +1706,7 @@ class MultiCircuit(Assets):
         for elm in self.get_injection_devices_iter():
             if elm.bus is not None:
                 k = bus_dict[elm.bus]
-                val[:, k] = elm.get_Sprof()
+                val[:, k] += elm.get_Sprof()
 
         return val
 
@@ -1720,13 +1722,13 @@ class MultiCircuit(Assets):
         for elm in self.get_load_like_devices():
             if elm.bus is not None:
                 k = bus_dict[elm.bus]
-                val[:, k] = elm.get_Sprof()
+                val[:, k] += elm.get_Sprof()
 
         for elm in self.get_generation_like_devices():
             if elm.bus is not None:
                 if not elm.enabled_dispatch:
                     k = bus_dict[elm.bus]
-                    val[:, k] = elm.get_Sprof()
+                    val[:, k] += elm.get_Sprof()
 
         return val
 
@@ -1743,7 +1745,7 @@ class MultiCircuit(Assets):
             if elm.bus is not None:
                 if elm.enabled_dispatch:
                     k = bus_dict[elm.bus]
-                    val[:, k] = elm.get_Sprof()
+                    val[:, k] += elm.get_Sprof()
 
         return val
 
@@ -2753,6 +2755,9 @@ class MultiCircuit(Assets):
         for i, elm in enumerate(self.get_loads()):
             elm.P_prof.set(results.load_power[:, i])
 
+        for i, elm in enumerate(self.get_hvdc()):
+            elm.Pset_prof.set(results.hvdc_Pf[:, i])
+
     def set_opf_snapshot_results(self, results: OptimalPowerFlowResults):
         """
         Assign OptimalPowerFlowResults to the objects
@@ -2765,8 +2770,11 @@ class MultiCircuit(Assets):
         for i, elm in enumerate(self.get_batteries()):
             elm.P = results.battery_power[i]
 
-        # for i, elm in enumerate(self.get_loads()):
-        #     elm.P = results.load_power[i]
+        for i, elm in enumerate(self.get_loads()):
+            elm.P = results.load_power[i]
+
+        for i, elm in enumerate(self.get_hvdc()):
+            elm.Pset.set(results.hvdc_Pf[i])
 
     def get_reduction_sets(self, reduction_bus_indices: Sequence[int],
                            add_vsc=False, add_hvdc=False, add_switch=True) -> Tuple[IntVec, IntVec, IntVec, IntVec]:

{veragridengine-5.4.9 → veragridengine-5.4.10}/VeraGridEngine/IO/file_handler.py

@@ -267,7 +267,7 @@ class FileOpen:
 
                     elif data_dictionary['version'] == 3.0:
                         self.circuit = MultiCircuit()
-                        interpret_excel_v3(self.circuit, data_dictionary)
+                        interpret_excel_v3(self.circuit, data_dictionary, logger=self.logger)
 
                     elif data_dictionary['version'] == 4.0:
                         if data_dictionary is not None:

{veragridengine-5.4.9 → veragridengine-5.4.10}/VeraGridEngine/IO/others/helper_pow2pp.py

@@ -1,18 +1,23 @@
 import traceback
 
 import numpy as np
-import pandapower
+
 import pandas as pd
-import pypowsybl
-from pypowsybl import PyPowsyblError
-from pypowsybl.network import Network
+
+# import pandapower
+# import pypowsybl
+# from pypowsybl import PyPowsyblError
+# from pypowsybl.network import Network
+
 from collections.abc import Sequence
 from VeraGridEngine.basic_structures import Logger
 
 IDENTIFIER_COLUMN_NAME = "uuid"
-empty_net = pandapower.create_empty_network()
+# empty_net = pandapower.create_empty_network()
 EXPECTED_COLUMNS: dict[str, list[str]] = {}
 logger = Logger()
+
+
 def catch_exceptions(func):
     def wrapper(*args, **kwargs):
         try:
@@ -24,8 +29,9 @@ def catch_exceptions(func):
 
     return wrapper
 
+
 def drop_irrelevant_columns(
-    element_table: pd.DataFrame, element_type: str
+        element_table: pd.DataFrame, element_type: str
 ) -> pd.DataFrame:
     if element_type not in EXPECTED_COLUMNS:
         # keep all columns if in doubt
@@ -34,9 +40,10 @@ def drop_irrelevant_columns(
     columns_to_keep = list(set(element_table.columns).intersection(expected_columns))
     return element_table.loc[:, columns_to_keep].reset_index(drop=True)
 
+
 @catch_exceptions
 def create_switches(
-        pandapower_net: pandapower.pandapowerNet, powsybl_net: Network
+        pandapower_net: "pandapower.pandapowerNet", powsybl_net: "Network"
 ) -> None:
     """
 
@@ -146,6 +153,11 @@ def create_and_match_buses_for_switches(pandapower_net, powsybl_net) -> pd.DataF
 
     """
 
+    try:
+        from pypowsybl import PyPowsyblError
+    except ImportError:
+        return
+
     new_columns = ["bus", "element", "et", IDENTIFIER_COLUMN_NAME]
     all_switches = pd.DataFrame(columns=new_columns)
     elements_connected_to_switches = pd.DataFrame(columns=["type", "bus_id", "side"])
@@ -202,7 +214,7 @@ def create_and_match_buses_for_switches(pandapower_net, powsybl_net) -> pd.DataF
 def connect_elements_to_switches_bus_breaker(
         all_switches: pd.DataFrame,
         elements_connected_to_switches: pd.DataFrame,
-        pandapower_net: pandapower.pandapowerNet,
+        pandapower_net: "pandapower.pandapowerNet",
 ):
     # 1. map bus-breaker-ids to bus-indices
     bus_breaker_id_to_bus_index = {
@@ -276,8 +288,15 @@ def connect_elements_to_switches_bus_breaker(
 
 
 def find_voltage_levels(
-        element_table: pd.DataFrame, powsybl_net: Network
+        element_table: pd.DataFrame, powsybl_net: "Network"
 ) -> pd.DataFrame:
+
+    try:
+        from pypowsybl import PyPowsyblError
+    except ImportError:
+        return
+
+
     if "voltage_level_id" not in element_table.columns:
         raise PyPowsyblError(
             "Column voltage_level_id is not defined in provided element-table!"
@@ -319,8 +338,8 @@ def set_index_as_column(dataframe):
 def create_and_match_buses_for_switches_per_voltage_level_bus_breaker(
         all_switches: pd.DataFrame,
         elements_connected_to_switches: pd.DataFrame,
-        pandapower_net: pandapower.pandapowerNet,
-        powsybl_net: pypowsybl.network.Network,
+        pandapower_net: "pandapower.pandapowerNet",
+        powsybl_net: "pypowsybl.network.Network",
         voltage_level: pd.Series,
 ) -> tuple[pd.DataFrame, pd.DataFrame]:
     bb = powsybl_net.get_bus_breaker_topology(voltage_level.name)
@@ -349,8 +368,8 @@ def create_and_match_buses_for_switches_per_voltage_level_bus_breaker(
 
 def create_and_match_buses_for_switches_per_voltage_level_node_breaker(
         all_switches: pd.DataFrame,
-        pandapower_net: pandapower.pandapowerNet,
-        powsybl_net: pypowsybl.network.Network,
+        pandapower_net: "pandapower.pandapowerNet",
+        powsybl_net: "pypowsybl.network.Network",
         voltage_level: pd.Series,
 ) -> pd.DataFrame:
     nb = powsybl_net.get_node_breaker_topology(voltage_level.name)
@@ -472,8 +491,9 @@ def create_and_match_buses_for_switches_per_voltage_level_node_breaker(
 
     return all_switches
 
+
 def connect_elements_to_switches_node_breaker(
-    all_switches: pd.DataFrame, pandapower_net: pandapower.pandapowerNet
+        all_switches: pd.DataFrame, pandapower_net: "pandapower.pandapowerNet"
 ):
     conn1_to_bus = (
         all_switches.loc[
@@ -514,8 +534,8 @@ def connect_elements_to_switches_node_breaker(
     bus_target_column = "bus"
     for table in ["load", "gen", "sgen", "ext_grid", "busbarsection", "shunt"]:
         if (
-            table not in pandapower_net
-            or IDENTIFIER_COLUMN_NAME not in pandapower_net[table].columns
+                table not in pandapower_net
+                or IDENTIFIER_COLUMN_NAME not in pandapower_net[table].columns
         ):
             continue
         new_buses = pandapower_net[table][IDENTIFIER_COLUMN_NAME].map(conn_to_bus)
@@ -524,8 +544,8 @@ def connect_elements_to_switches_node_breaker(
 
     for table, element_type in [("trafo", "t"), ("trafo3w", "t3"), ("line", "l")]:
         if (
-            table not in pandapower_net
-            or IDENTIFIER_COLUMN_NAME not in pandapower_net[table].columns
+                table not in pandapower_net
+                or IDENTIFIER_COLUMN_NAME not in pandapower_net[table].columns
         ):
             continue
         # These elements can be connected by referencing the element-index in column 'element' and  setting the correct
@@ -556,6 +576,7 @@ def connect_elements_to_switches_node_breaker(
             )
     all_switches["et"] = all_switches["et"].fillna("b")
 
+
 def initialise_new_columns(switches):
     switches["element"] = np.nan
     switches["bus"] = np.nan
@@ -563,6 +584,7 @@ def initialise_new_columns(switches):
     switches[IDENTIFIER_COLUMN_NAME] = switches.index.values
     return switches.astype({"element": "object", "bus": "object", "et": "object"})
 
+
 def create_new_buses(
         nodes: Sequence, highest_bus_index: int
 ) -> tuple[pd.DataFrame, int]:
@@ -575,11 +597,12 @@ def create_new_buses(
         return buses, highest_bus_index
     return buses, buses.index.max()
 
+
 def add_new_buses_to_pandapower_net(
-    new_buses,
-    pandapower_net,
-    voltage_level: pd.Series,
-    assign_id_column_if_not_set=True,
+        new_buses,
+        pandapower_net,
+        voltage_level: pd.Series,
+        assign_id_column_if_not_set=True,
 ):
     if new_buses.empty:
         return
@@ -606,4 +629,3 @@ def add_new_buses_to_pandapower_net(
             ],
             axis=0,
         )
-