VeraGridEngine 5.6.1__tar.gz → 5.6.3__tar.gz

{veragridengine-5.6.1 → veragridengine-5.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGridEngine
-Version: 5.6.1
+Version: 5.6.3
 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.6.1 → veragridengine-5.6.3}/VeraGridEngine/Devices/Dynamic/rms_template.py

@@ -3,8 +3,10 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 from __future__ import annotations
+from typing import Dict
 from VeraGridEngine.Devices.Parents.pointer_device_parent import PointerDeviceParent
 from VeraGridEngine.Utils.Symbolic.block import Block
+from VeraGridEngine.Utils.Symbolic.symbolic import Var, Const
 from VeraGridEngine.enumerations import DeviceType, SubObjectType
 
 
@@ -15,7 +17,8 @@ class RmsModelTemplate(PointerDeviceParent):
 
     __slots__ = (
         '_block',
-        '_device_type')
+        '_device_type',
+        '_init_values')
 
     def __init__(self, idtag="", name: str = ""):
         super().__init__(name=name,
@@ -26,6 +29,7 @@ class RmsModelTemplate(PointerDeviceParent):
                          device_type=DeviceType.RmsModelTemplateDevice)
 
         self._block: Block = Block()
+        self._init_values: Dict[Var, Const] = dict()
 
         self.register('block', units="p.u.", tpe=SubObjectType.DaeBlockType,
                       definition='DAE block', editable=False, display=False)
@@ -41,3 +45,15 @@ class RmsModelTemplate(PointerDeviceParent):
     @block.setter
     def block(self, obj: Block):
         self._block = obj
+
+    @property
+    def init_values(self):
+        """
+
+        :return:
+        """
+        return self._init_values
+
+    @init_values.setter
+    def init_values(self, obj: Dict[Var, Const]):
+        self._init_values = obj

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Devices/Injections/generator.py

@@ -627,7 +627,10 @@ class Generator(GeneratorParent):
         Initialize the RMS model
         """
 
+
+        empty = self.rms_model.empty()
         if self.rms_model.empty():
+            empty = True
             delta = Var("delta")
             omega = Var("omega")
             psid = Var("psid")

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Devices/Injections/shunt.py

@@ -72,32 +72,32 @@ class Shunt(ShuntParent):
         self.g = self.G / Sbase
         self.b = self.B / Sbase
 
-    def initialize_rms(self):
-        """
-        Initialize RMS
-        :return:
-        """
-        if self.rms_model.empty():
-            Pshunt = Var("Pshunt")
-            Qshunt = Var("Qshunt")
-
-            Vm = self.bus.rms_model.model.E(VarPowerFlowRefferenceType.Vm)
-
-            # Assign Block
-            self.rms_model.model = Block(
-                algebraic_eqs=[
-                    Pshunt - self.g * Vm ** 2,
-                    Qshunt - self.b * Vm ** 2
-                ],
-                algebraic_vars=[Pshunt, Qshunt],
-                init_eqs={
-                    Pshunt: self.g * Vm ** 2,
-                    Qshunt: self.b * Vm ** 2
-                },
-                init_vars=[Pshunt, Qshunt],
-                parameters=[],
-                external_mapping={
-                    VarPowerFlowRefferenceType.P: Pshunt,
-                    VarPowerFlowRefferenceType.Q: Qshunt
-                }
-            )
+    # def initialize_rms(self):
+    #     """
+    #     Initialize RMS
+    #     :return:
+    #     """
+    #     if self.rms_model.empty():
+    #         Pshunt = Var("Pshunt")
+    #         Qshunt = Var("Qshunt")
+    #
+    #         Vm = self.bus.rms_model.model.E(VarPowerFlowRefferenceType.Vm)
+    #
+    #         # Assign Block
+    #         self.rms_model.model = Block(
+    #             algebraic_eqs=[
+    #                 Pshunt - self.g * Vm ** 2,
+    #                 Qshunt - self.b * Vm ** 2
+    #             ],
+    #             algebraic_vars=[Pshunt, Qshunt],
+    #             init_eqs={
+    #                 Pshunt: self.g * Vm ** 2,
+    #                 Qshunt: self.b * Vm ** 2
+    #             },
+    #             init_vars=[Pshunt, Qshunt],
+    #             parameters=[],
+    #             external_mapping={
+    #                 VarPowerFlowRefferenceType.P: Pshunt,
+    #                 VarPowerFlowRefferenceType.Q: Qshunt
+    #             }
+    #         )

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Devices/Parents/injection_parent.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 from __future__ import annotations
-from typing import Union, List, TYPE_CHECKING
+from typing import Union, List, TYPE_CHECKING, Tuple
 import numpy as np
 
 from VeraGridEngine.Devices.Parents.physical_device import PhysicalDevice
@@ -47,7 +47,8 @@ class InjectionParent(PhysicalDevice):
         'bus_pos',
         '_conn',
         '_rms_model',
-        'time'
+        'time',
+        'color'
     )
 
     def __init__(self,
@@ -64,7 +65,8 @@ class InjectionParent(PhysicalDevice):
                  build_status: BuildStatus,
                  device_type: DeviceType,
                  longitude=0.0,
-                 latitude=0.0):
+                 latitude=0.0,
+                 color: str | None = None):
         """
         InjectionTemplate
         :param name: Name of the device
@@ -125,10 +127,15 @@ class InjectionParent(PhysicalDevice):
 
         self.bus_pos: int = 0
 
+        self.color = color if color is not None else "#909090"  # light gray
+
         self.register(key='bus', units='', tpe=DeviceType.BusDevice, definition='Connection bus', editable=False)
 
         self.register(key='active', units='', tpe=bool, definition='Is the load active?', profile_name='active_prof')
 
+        self.register(key='color', units='', tpe=str, definition='Color to paint the element in the map diagram',
+                      is_color=True)
+
         self.register(key='mttf', units='h', tpe=float, definition='Mean time to failure')
         self.register(key='mttr', units='h', tpe=float, definition='Mean time to recovery')
 
@@ -354,3 +361,31 @@ class InjectionParent(PhysicalDevice):
         :return: bus_pos
         """
         return self.bus_pos
+
+    def try_to_find_coordinates(self) -> Tuple[float, float]:
+        """
+        Get the latitude and
+        :return: longitude, latitude
+        """
+        if self.latitude == 0.0 and self.longitude == 0.0:
+            lon, lat = self.bus.get_coordinates()
+
+            if lon == 0.0 and lat == 0.0:
+                lon, lat = self.bus.try_to_find_coordinates()
+
+                return lon, lat
+            else:
+                return lon, lat
+        else:
+            return self.longitude, self.latitude
+
+    def color_by_main_technology(self):
+        """
+        Set the color of the dominant technology
+        """
+        mx = 0.0
+        col = self.color
+        for _, val in self.technologies.data.items():
+            if val.value > mx:
+                col = val.api_object.color
+        self.color = col

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Devices/Substation/bus.py

@@ -472,7 +472,7 @@ class Bus(PhysicalDevice):
         if show_fig:
             plt.show()
 
-    def get_fault_impedance(self):
+    def get_fault_impedance(self) -> complex:
         """
         Get the fault impedance
         :return: complex value of fault impedance

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Devices/assets.py

@@ -1577,17 +1577,33 @@ class Assets:
         buses_to_remove_set = buses_to_remove
         self._buses = ListSet([b for b in self._buses if b not in buses_to_remove_set])
 
-    def get_buses_by(self, filter_elements: List[Union[dev.Area, dev.Country, dev.Zone]]) -> List[dev.Bus]:
+    def get_buses_by(self, filter_elements: List[Union[dev.Area, dev.Zone,
+    dev.Country, dev.Community,
+    dev.Region, dev.Municipality]]) -> List[dev.Bus]:
         """
         Get a list of buses that can be found in the list of Areas | Zones | Countries
         :param filter_elements: list of Areas | Zones | Countries
         :return: list of buses
         """
         data: List[dev.Bus] = list()
+        filter_elements_set = set(filter_elements)
 
         for bus in self._buses:
 
-            if bus.area in filter_elements or bus.zone in filter_elements or bus.country in filter_elements:
+            ok = bus.area in filter_elements_set
+            ok = ok or bus.zone in filter_elements_set
+            ok = ok or bus.country in filter_elements_set
+
+            if bus.substation is not None:
+                ok = ok or bus.substation.municipality in filter_elements_set
+
+                if bus.substation.municipality is not None:
+                    ok = ok or bus.substation.municipality.region in filter_elements_set
+
+                    if bus.substation.municipality.region is not None:
+                        ok = ok or bus.substation.municipality.region.community in filter_elements_set
+
+            if ok:
                 data.append(bus)
 
         return data
@@ -4136,7 +4152,8 @@ class Assets:
         return logger
 
     def get_contingency_groups_in(self,
-                                  grouping_elements: List[Union[dev.Area, dev.Country, dev.Zone]]
+                                  grouping_elements: List[Union[dev.Area, dev.Zone,
+                                  dev.Country, dev.Community, dev.Region, dev.Municipality]]
                                   ) -> List[dev.ContingencyGroup]:
         """
         Get a filtered set of ContingencyGroups
@@ -5938,6 +5955,17 @@ class Assets:
 
         return n
 
+    def get_load_like_devices_names(self) -> StrVec:
+        """
+        Get a list of names of the load like devices
+        :return: array of str
+        """
+        elms = list()
+        for lst in self.get_load_like_devices_lists():
+            for elm in lst:
+                elms.append(elm.name)
+        return np.array(elms)
+
     # ------------------------------------------------------------------------------------------------------------------
     # Shunt-like devices
     # ------------------------------------------------------------------------------------------------------------------

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Devices/multi_circuit.py

@@ -1617,6 +1617,42 @@ class MultiCircuit(Assets):
 
         return lst
 
+    def get_substations_set_from_grouping(self, selected_objects: List[ALL_DEV_TYPES]) -> Set[dev.Substation]:
+        """
+        Get substation from place
+        :param selected_objects: Regions, Areas, country, etc...
+        :return: Set of substations
+        """
+        elm2se: Dict[ALL_DEV_TYPES, List[dev.Substation]] = dict()
+
+        # Associate country, community, region and municipality to substation
+        for se in self.substations:
+            for elm in [se.country, se.community, se.region, se.municipality]:
+                if elm is not None:
+                    if elm in elm2se:
+                        elm2se[elm].append(se)
+                    else:
+                        elm2se[elm] = [se]
+
+        # associate voltage levels to substations
+        for vl in self.voltage_levels:
+            if vl.substation is not None:
+                elm2se[vl] = [vl.substation]
+
+        # associate buses to substations
+        for bus in self.buses:
+            if bus.substation is not None:
+                elm2se[bus] = [bus.substation]
+
+        substations = set()
+        for sel_obj in selected_objects:
+            se_list = elm2se.get(sel_obj, None)
+            if se_list is not None:
+                for se in se_list:
+                    substations.add(se)
+
+        return substations
+
     def fuse_devices(self) -> List[INJECTION_DEVICE_TYPES]:
         """
         Fuse all the different devices in a node to a single device per node
@@ -2922,73 +2958,77 @@ class MultiCircuit(Assets):
 
         return external, boundary, internal, boundary_branches, internal_branches
 
-    def get_buses_from_objects(self, elements: List[ALL_DEV_TYPES]) -> Set[dev.Bus]:
+    def get_buses_from_objects(self, elements: List[ALL_DEV_TYPES], dtype: DeviceType) -> Set[dev.Bus]:
         """
         Returns set of buses belonging to the list elements
 
         :param elements: list of objects
+        :param dtype: DeviceType of all the elements
         :return: set of buses
         """
 
-        buses = set()
-
-        for sel_obj in elements:
-
-            if isinstance(sel_obj, dev.Bus):
-                root_bus = sel_obj
-
-            elif isinstance(sel_obj, dev.Generator):
-                root_bus = sel_obj.bus
-
-            elif isinstance(sel_obj, dev.Battery):
-                root_bus = sel_obj.bus
+        if dtype == DeviceType.BusDevice:
 
-            elif isinstance(sel_obj, dev.Load):
-                root_bus = sel_obj.bus
+            return set(elements)
 
-            elif isinstance(sel_obj, dev.Shunt):
-                root_bus = sel_obj.bus
+        elif dtype == DeviceType.SubstationDevice:
 
-            elif isinstance(sel_obj, dev.Line):
-                root_bus = sel_obj.bus_from
-
-            elif isinstance(sel_obj, dev.Transformer2W):
-                root_bus = sel_obj.bus_from
-
-            elif isinstance(sel_obj, dev.DcLine):
-                root_bus = sel_obj.bus_from
-
-            elif isinstance(sel_obj, dev.HvdcLine):
-                root_bus = sel_obj.bus_from
-
-            elif isinstance(sel_obj, dev.VSC):
-                root_bus = sel_obj.bus_from
-
-            elif isinstance(sel_obj, dev.UPFC):
-                root_bus = sel_obj.bus_from
+            buses = set()
+            for sel_obj in elements:
+                sel = self.get_substation_buses(substation=sel_obj)
+                for bus in sel:
+                    buses.add(bus)
+            return buses
 
-            elif isinstance(sel_obj, dev.Switch):
-                root_bus = sel_obj.bus_from
+        elif dtype == DeviceType.VoltageLevelDevice:
 
-            elif isinstance(sel_obj, dev.VoltageLevel):
-                root_bus = None
+            buses = set()
+            for sel_obj in elements:
                 sel = self.get_voltage_level_buses(vl=sel_obj)
                 for bus in sel:
                     buses.add(bus)
+            return buses
 
-            elif isinstance(sel_obj, dev.Substation):
-                root_bus = None
-                sel = self.get_substation_buses(substation=sel_obj)
+        elif dtype in [DeviceType.CountryDevice,
+                       DeviceType.CommunityDevice,
+                       DeviceType.RegionDevice,
+                       DeviceType.MunicipalityDevice]:
+
+            se_set = self.get_substations_set_from_grouping(elements)
+            buses = set()
+            for se in se_set:
+                sel = self.get_substation_buses(substation=se)
                 for bus in sel:
                     buses.add(bus)
+            return buses
+
+        elif dtype in [DeviceType.GeneratorDevice,
+                       DeviceType.BatteryDevice,
+                       DeviceType.LoadDevice,
+                       DeviceType.ShuntDevice,
+                       DeviceType.CurrentInjectionDevice,
+                       DeviceType.ControllableShuntDevice,
+                       DeviceType.ExternalGridDevice,
+                       DeviceType.StaticGeneratorDevice]:
+
+            return {sel_obj.bus for sel_obj in elements}
+
+        elif dtype in [DeviceType.LineDevice,
+                       DeviceType.DCLineDevice,
+                       DeviceType.Transformer2WDevice,
+                       DeviceType.HVDCLineDevice,
+                       DeviceType.VscDevice,
+                       DeviceType.SeriesReactanceDevice,
+                       DeviceType.UpfcDevice,
+                       DeviceType.SwitchDevice]:
+
+            buses = set()
+            for sel_obj in elements:
+                buses.add(sel_obj.bus_from)
+            return buses
 
-            else:
-                root_bus = None
-
-            if root_bus is not None:
-                buses.add(root_bus)
-
-        return buses
+        else:
+            return set()
 
     def get_topology_data(self, t_idx: int | None = None):
         """

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Devices/types.py

@@ -122,4 +122,4 @@ ASSOCIATION_TYPES = Union[Fuel, Technology, EmissionGas]
 # this is the data type of the VeraGrid Json
 VERAGRID_FILE_TYPE = Dict[str, Union[str, float, pd.DataFrame, Dict[str, Any], List[Dict[str, Any]]]]
 
-ALL_RMS_TEMPLATES_TYPE = Union[BusRmsTemplate, LoadRmsTemplate, Line_1_RmsTemplate, Generator_1_RmsTemplate, Line_0_RmsTemplate, Generator_0_RmsTemplate]
+# ALL_RMS_TEMPLATES_TYPE = Union[BusRmsTemplate, LoadRmsTemplate, Line_1_RmsTemplate, Generator_1_RmsTemplate, Line_0_RmsTemplate, Generator_0_RmsTemplate]

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/IO/veragrid/catalogue.py

@@ -14,18 +14,8 @@ from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 from VeraGridEngine.enumerations import DeviceType
 from VeraGridEngine.basic_structures import Logger
 
-
-
-from VeraGridEngine.Devices.types import ALL_RMS_TEMPLATES_TYPE
 from VeraGridEngine.enumerations import DeviceType
 
-from VeraGridEngine.Templates.Rms.bus_rms_template import BusRmsTemplate
-from VeraGridEngine.Templates.Rms.generator_0_rms_template import Generator_0_RmsTemplate
-from VeraGridEngine.Templates.Rms.generator_1_rms_template import Generator_1_RmsTemplate
-from VeraGridEngine.Templates.Rms.line_0_rms_template import Line_0_RmsTemplate
-from VeraGridEngine.Templates.Rms.line_1_rms_template import Line_1_RmsTemplate
-from VeraGridEngine.Templates.Rms.load_rms_template import LoadRmsTemplate
-
 
 
 
@@ -88,7 +78,7 @@ def get_wires_catalogue_df(grid: MultiCircuit):
             'Name': elm.name,
             'Stranding': elm.stranding,
             'Material': elm.material,
-            'Diameter [cm]': elm.diameter / 10.0, # mm to cm
+            'Diameter [cm]': elm.diameter / 10.0,  # mm to cm
             'R [Ohm/km]': elm.R,
             'Rating [kA]': elm.max_current
         })
@@ -127,16 +117,16 @@ def parse_transformer_types(df: pd.DataFrame) -> List[TransformerType]:
     """
     lst = list()
     for i, item in df.iterrows():
-        tpe = TransformerType(hv_nominal_voltage=item.get('HV (kV)',0.0),
-                              lv_nominal_voltage=item.get('LV (kV)',0.0),
-                              nominal_power=item.get('Rate (MVA)',0.001),
-                              copper_losses=item.get('Copper losses (kW)',0.0),
-                              iron_losses=item.get('No load losses (kW)',0.0),
-                              no_load_current=item.get('No load current (%)',0.0),
-                              short_circuit_voltage=item.get('V short circuit (%)',0.0),
-                              gr_hv1=item.get("gr_hv1",0.5),
-                              gx_hv1=item.get("gx_hv1",0.5),
-                              name=item.get('Name',"TransformerType_{}".format(i)))
+        tpe = TransformerType(hv_nominal_voltage=item.get('HV (kV)', 0.0),
+                              lv_nominal_voltage=item.get('LV (kV)', 0.0),
+                              nominal_power=item.get('Rate (MVA)', 0.001),
+                              copper_losses=item.get('Copper losses (kW)', 0.0),
+                              iron_losses=item.get('No load losses (kW)', 0.0),
+                              no_load_current=item.get('No load current (%)', 0.0),
+                              short_circuit_voltage=item.get('V short circuit (%)', 0.0),
+                              gr_hv1=item.get("gr_hv1", 0.5),
+                              gx_hv1=item.get("gx_hv1", 0.5),
+                              name=item.get('Name', "TransformerType_{}".format(i)))
         lst.append(tpe)
 
     return lst
@@ -150,15 +140,15 @@ def parse_cable_types(df: pd.DataFrame) -> List[UndergroundLineType]:
     """
     lst = list()
     for i, item in df.iterrows():
-        tpe = UndergroundLineType(name=item.get('Name',"UndergroundLine_{}".format(i)),
-                                  Imax=item.get('Rated current [kA]',1.0),
-                                  Vnom=item.get('Rated voltage [kV]',1.0),
-                                  R=item.get('R [Ohm/km AC@20°C]',0.0),
-                                  X=item.get('X [Ohm/km]',0.0),
+        tpe = UndergroundLineType(name=item.get('Name', "UndergroundLine_{}".format(i)),
+                                  Imax=item.get('Rated current [kA]', 1.0),
+                                  Vnom=item.get('Rated voltage [kV]', 1.0),
+                                  R=item.get('R [Ohm/km AC@20°C]', 0.0),
+                                  X=item.get('X [Ohm/km]', 0.0),
                                   B=item.get('B [uS/km]', 0.0),
-                                  R0=item.get('R0 (AC) [Ohm/km]',0.0),
-                                  X0=item.get('X0  [Ohm/km]',0.0),
-                                  B0=item.get('B0 [uS/km]',0.0))
+                                  R0=item.get('R0 (AC) [Ohm/km]', 0.0),
+                                  X0=item.get('X0  [Ohm/km]', 0.0),
+                                  B0=item.get('B0 [uS/km]', 0.0))
         lst.append(tpe)
 
     return lst
@@ -173,11 +163,11 @@ def parse_wire_types(df: pd.DataFrame) -> List[Wire]:
     lst = list()
     for i, item in df.iterrows():
         tpe = Wire(name=str(item['Stranding']) + '_' + str(item['Material']) + '_' + str(item['Diameter [cm]']),
-                   stranding=item.get('Stranding',""),
-                   material=item.get('Material',""),
-                   diameter=item.get('Diameter [cm]',0.0) * 10.0,  # cm to mm
-                   r=item.get('R [Ohm/km]',0.01),
-                   max_current=item.get('Rating [kA]',1.0))
+                   stranding=item.get('Stranding', ""),
+                   material=item.get('Material', ""),
+                   diameter=item.get('Diameter [cm]', 0.0) * 10.0,  # cm to mm
+                   r=item.get('R [Ohm/km]', 0.01),
+                   max_current=item.get('Rating [kA]', 1.0))
         lst.append(tpe)
 
     return lst
@@ -191,32 +181,19 @@ def parse_sequence_line_types(df: pd.DataFrame) -> List[SequenceLineType]:
     """
     lst = list()
     for i, item in df.iterrows():
-        tpe = SequenceLineType(name=item.get('Name','SequenceLine_{}'.format(i)),
-                               Vnom=item.get('Vnom (kV)',1),
-                               Imax=item.get('Imax (kA)',1),
-                               R=item.get('r (ohm/km)',0),
-                               X=item.get('x (ohm/km)',0),
-                               B=item.get('b (uS/km)',0),
-                               R0=item.get('r0 (ohm/km)',0),
-                               X0=item.get('x0 (ohm/km)',0),
-                               B0=item.get('b0 (uS/km)',0))
+        tpe = SequenceLineType(name=item.get('Name', 'SequenceLine_{}'.format(i)),
+                               Vnom=item.get('Vnom (kV)', 1),
+                               Imax=item.get('Imax (kA)', 1),
+                               R=item.get('r (ohm/km)', 0),
+                               X=item.get('x (ohm/km)', 0),
+                               B=item.get('b (uS/km)', 0),
+                               R0=item.get('r0 (ohm/km)', 0),
+                               X0=item.get('x0 (ohm/km)', 0),
+                               B0=item.get('b0 (uS/km)', 0))
         lst.append(tpe)
 
     return lst
 
-def parse_rms_model_catalogue() -> List[ALL_RMS_TEMPLATES_TYPE]:
-
-    templ_bus = BusRmsTemplate()
-    templ_gen_0 = Generator_0_RmsTemplate()
-    templ_gen_1 = Generator_1_RmsTemplate()
-    templ_line_0 = Line_0_RmsTemplate()
-    templ_line_1 = Line_1_RmsTemplate()
-    templ_load = LoadRmsTemplate()
-    templates: List[ALL_RMS_TEMPLATES_TYPE] = [templ_bus, templ_gen_0, templ_gen_1, templ_line_0, templ_line_1,
-                                               templ_load]
-
-    return templates
-
 
 def save_catalogue(fname: str, grid: MultiCircuit):
     """

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/IO/veragrid/pack_unpack.py

@@ -20,7 +20,6 @@ from VeraGridEngine.Utils.Symbolic.block import Block
 from VeraGridEngine.Devices.types import ALL_DEV_TYPES, VERAGRID_FILE_TYPE
 from VeraGridEngine.enumerations import (DiagramType, DeviceType, SubObjectType, TapPhaseControl, TapModuleControl,
                                          ContingencyOperationTypes)
-# from VeraGridEngine.Devices.all_dev_dict import get_objects_dictionary
 
 
 def get_objects_dictionary() -> Dict[str, ALL_DEV_TYPES]:

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Simulations/LinearFactors/linear_analysis.py

@@ -1024,19 +1024,23 @@ class LinearAnalysisTs:
 
     def __init__(self, grid: MultiCircuit,
                  distributed_slack: bool = True,
-                 correct_values: bool = False):
+                 correct_values: bool = False,
+                 time_indices: IntVec | None = None):
         """
         Constructor
         :param grid: MultiCircuit instance
         :param distributed_slack: boolean to distribute slack
         :param correct_values: boolean to fix out layer values
+        :param time_indices: Array of time indices
         """
 
         if not grid.has_time_series:
             raise Exception("The grid does not have any time series :(")
 
+        self.time_indices = grid.get_all_time_indices() if time_indices is None else time_indices
+
         # get the states matrix
-        mat: IntMat = grid.get_branch_active_time_array()
+        mat: IntMat = grid.get_branch_active_time_array()[self.time_indices, None]
 
         # analyze how many PTDF's we need to get
         self.groups, self.mapping = find_different_states(mat)
@@ -1052,7 +1056,7 @@ class LinearAnalysisTs:
 
         self.nbr = grid.get_branch_number()
         self.nbus = grid.get_bus_number()
-        self.nt = grid.get_time_number()
+        self.nt = len(self.time_indices)
 
     def get_linear_analysis_at(self, t_idx: int) -> LinearAnalysis:
         """

{veragridengine-5.6.1 → veragridengine-5.6.3}/VeraGridEngine/Simulations/LinearFactors/linear_analysis_ts_driver.py

@@ -73,13 +73,13 @@ class LinearAnalysisTimeSeriesDriver(TimeSeriesDriverTemplate):
         self.tic()
         self.__cancel__ = False
         self.report_text('Computing TS linear analysis...')
-        lin_ts = LinearAnalysisTs(self.grid)
+        lin_ts = LinearAnalysisTs(grid=self.grid, time_indices=self.time_indices)
 
         self.report_text('Computing flows...')
 
         if self.simplified_compilation:
             # Theoretically equivallent but cannot be ensured 100%
-            self.results.S = self.grid.get_Pbus_prof(apply_active=True)
+            self.results.S = self.grid.get_Pbus_prof(apply_active=True)[self.time_indices]
             self.results.Sf = lin_ts.get_flows_ts(P=self.results.S,
                                                   progress_func=self.report_progress,
                                                   progress_text=self.report_text)