GridCalEngine 5.1.12__tar.gz → 5.1.14__tar.gz

{GridCalEngine-5.1.12 → GridCalEngine-5.1.14}/GridCalEngine/Devices/multi_circuit.py

@@ -1237,7 +1237,7 @@ class MultiCircuit(Assets):
         return groups
 
     def get_injection_devices_grouped_by_cn(self) -> Dict[dev.ConnectivityNode,
-                                                          Dict[DeviceType, List[INJECTION_DEVICE_TYPES]]]:
+    Dict[DeviceType, List[INJECTION_DEVICE_TYPES]]]:
         """
         Get the injection devices grouped by bus and by device type
         :return: Dict[ConnectivityNode, Dict[DeviceType, List[Injection devs]]
@@ -2293,9 +2293,10 @@ class MultiCircuit(Assets):
             # if elm.cn_from is not None and elm.cn_to is not None:
             #     f = process_info.get_candidate_pos_from_cn(elm.cn_from)
             #     t = process_info.get_candidate_pos_from_cn(elm.cn_to)
-            f, t, is_ok = process_info.get_connection_indices(elm=elm, logger=logger)
-            Cf[i, f] = br_active[i]
-            Ct[i, t] = br_active[i]
+            if br_active[i]:  # avoid adding zeros
+                f, t, is_ok = process_info.get_connection_indices(elm=elm, logger=logger)
+                Cf[i, f] = br_active[i]
+                Ct[i, t] = br_active[i]
 
         # --------------------------------------------------------------------------------------------------------------
         # Compose the adjacency matrix from the connectivity information

{GridCalEngine-5.1.12 → GridCalEngine-5.1.14}/GridCalEngine/IO/__init__.py

@@ -1,5 +1,6 @@
 
-from GridCalEngine.IO.cim.cim16.cim_parser import CIMImport, CIMExport
+
+from GridCalEngine.IO.cim import cgmesProfile, CIMImport, CIMExport
 from GridCalEngine.IO.dgs.dgs_parser import dgs_to_circuit
 from GridCalEngine.IO.others.dpx_parser import load_dpx
 from GridCalEngine.IO.others.ipa_parser import load_iPA
@@ -7,4 +8,4 @@ from GridCalEngine.IO.gridcal.json_parser import save_json_file_v3, parse_json_d
 from GridCalEngine.IO.matpower.matpower_parser import parse_matpower_file, get_matpower_case_data
 from GridCalEngine.IO.raw.raw_parser_legacy import PSSeParser
 from GridCalEngine.IO.gridcal.excel_interface import interpret_excel_v3, interprete_excel_v2
-from GridCalEngine.IO.file_handler import FileOpen, FileSave
+from GridCalEngine.IO.file_handler import FileOpen, FileSave, FileSavingOptions

GridCalEngine-5.1.14/GridCalEngine/IO/cim/__init__.py

@@ -0,0 +1,3 @@
+
+from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile
+from GridCalEngine.IO.cim.cim16.cim_parser import CIMImport, CIMExport

{GridCalEngine-5.1.12 → GridCalEngine-5.1.14}/GridCalEngine/IO/cim/cgmes/cgmes_to_gridcal.py

@@ -17,15 +17,20 @@
 import numpy as np
 from typing import Dict, List, Tuple, Union
 import GridCalEngine.IO.cim.cgmes.cgmes_enums as cgmes_enums
+from GridCalEngine.Devices import LineLocations
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 import GridCalEngine.Devices as gcdev
 from GridCalEngine.IO.cim.cgmes.cgmes_circuit import CgmesCircuit
 from GridCalEngine.IO.cim.cgmes.cgmes_utils import (get_nominal_voltage,
                                                     get_pu_values_ac_line_segment,
                                                     get_values_shunt,
-                                                    get_pu_values_power_transformer, get_pu_values_power_transformer3w,
-                                                    get_regulating_control, get_pu_values_power_transformer_end,
-                                                    get_slack_id, find_object_by_idtag)
+                                                    get_pu_values_power_transformer,
+                                                    get_pu_values_power_transformer3w,
+                                                    get_regulating_control,
+                                                    get_pu_values_power_transformer_end,
+                                                    get_slack_id,
+                                                    find_object_by_idtag,
+                                                    find_terms_connections)
 from GridCalEngine.data_logger import DataLogger
 from GridCalEngine.IO.cim.cgmes.base import Base
 
@@ -159,34 +164,7 @@ def get_gcdev_device_to_terminal_dict(cgmes_model: CgmesCircuit,
     return device_to_terminal_dict
 
 
-def find_terms_connections(cgmes_terminal: Base,
-                           calc_node_dict: Dict[str, gcdev.Bus],
-                           cn_dict: Dict[str, gcdev.ConnectivityNode]) -> Tuple[gcdev.Bus, gcdev.ConnectivityNode]:
-    """
-
-    :param cgmes_terminal:
-    :param calc_node_dict:
-    :param cn_dict:
-    :return:
-    """
-
-    if cgmes_terminal is not None:
-        # get the rosetta calculation node if exists
-        if cgmes_terminal.TopologicalNode is not None:
-            calc_node = calc_node_dict.get(cgmes_terminal.TopologicalNode.uuid, None)
-        else:
-            calc_node = None
-
-        # get the gcdev connectivity node if exists
-        if cgmes_terminal.ConnectivityNode is not None:
-            cn = cn_dict.get(cgmes_terminal.ConnectivityNode.uuid, None)
-        else:
-            cn = None
-    else:
-        calc_node = None
-        cn = None
 
-    return calc_node, cn
 
 
 def find_connections(cgmes_elm: Base,
@@ -272,6 +250,7 @@ def get_gcdev_calculation_nodes(cgmes_model: CgmesCircuit,
             is_slack = True
 
         volt_lev, substat, country = None, None, None
+        longitude, latitude = 0.0, 0.0
         if cgmes_elm.ConnectivityNodeContainer:
             volt_lev = find_object_by_idtag(
                 object_list=gc_model.voltage_levels,
@@ -297,6 +276,8 @@ def get_gcdev_calculation_nodes(cgmes_model: CgmesCircuit,
                     print(f'No substation found for BUS {cgmes_elm.name}')
                 else:
                     country = substat.country
+                    longitude = substat.longitude
+                    latitude = substat.latitude
         else:
             logger.add_warning(msg='Missing voltage level.',
                                device=cgmes_elm.rdfid,
@@ -318,8 +299,8 @@ def get_gcdev_calculation_nodes(cgmes_model: CgmesCircuit,
                               substation=substat,
                               voltage_level=volt_lev,
                               country=country,
-                              # latitude=0.0,
-                              # longitude=0.0,
+                              latitude=latitude,
+                              longitude=longitude,
                               Vm0=vm,
                               Va0=va)
 
@@ -424,12 +405,17 @@ def get_gcdev_loads(cgmes_model: CgmesCircuit,
                         pass  # TODO convert exponent to ZIP
                     else:  # ZIP model
                         # TODO check all attributes
+                        # :param P: Active power in MW
                         p = cgmes_elm.p * cgmes_elm.LoadResponse.pConstantPower
+                        # :param Q: Reactive power in MVAr
                         q = cgmes_elm.q * cgmes_elm.LoadResponse.qConstantPower
+                        # :param Ir: Real current in equivalent MW
                         i_r = cgmes_elm.p * cgmes_elm.LoadResponse.pConstantCurrent
+                        # :param Ii: Imaginary current in equivalent MVAr
                         i_i = cgmes_elm.q * cgmes_elm.LoadResponse.qConstantCurrent
-
+                        # :param G: Conductance in equivalent MW
                         g = cgmes_elm.p * cgmes_elm.LoadResponse.pConstantImpedance
+                        # :param B: Susceptance in equivalent MVAr
                         b = cgmes_elm.q * cgmes_elm.LoadResponse.qConstantImpedance
                 else:
                     p = cgmes_elm.p
@@ -516,9 +502,14 @@ def get_gcdev_generators(cgmes_model: CgmesCircuit,
 
                 if cgmes_elm.GeneratingUnit is not None:
 
-                    v_set, is_controlled = get_regulating_control(cgmes_elm=cgmes_elm,
-                                                                  cgmes_enums=cgmes_enums,
-                                                                  logger=logger)
+                    v_set, is_controlled, controlled_bus, controlled_cn = (
+                        get_regulating_control(
+                            cgmes_elm=cgmes_elm,
+                            cgmes_enums=cgmes_enums,
+                            calc_node_dict=calc_node_dict,
+                            cn_dict=cn_dict,
+                            logger=logger
+                        ))
 
                     if cgmes_elm.p != 0.0:
                         pf = np.cos(np.arctan(cgmes_elm.q / cgmes_elm.p))
@@ -551,8 +542,8 @@ def get_gcdev_generators(cgmes_model: CgmesCircuit,
                                                 Qmin=cgmes_elm.minQ,
                                                 vset=v_set,
                                                 is_controlled=is_controlled,
-                                                # control_bus=,  # TODO get controlled gc.bus
-                                                # control_cn=,
+                                                # controlled_bus
+                                                # TODO get controlled gc.bus
                                                 )
 
                     gcdev_model.add_generator(bus=calc_node, api_obj=gcdev_elm, cn=cn)
@@ -709,6 +700,19 @@ def get_gcdev_ac_lines(cgmes_model: CgmesCircuit,
                                        b0=b0,
                                        rate=rate,
                                        length=cgmes_elm.length)
+                # if cgmes_elm.Location:
+                #     longitude = cgmes_elm.Location.PositionPoints.xPosition
+                #     latitude = cgmes_elm.Location.PositionPoints.yPosition
+                #     seq_number = cgmes_elm.Location.PositionPoints.sequenceNumber
+                #     pos_id = cgmes_elm.Location.PositionPoints.uuid
+                #     line_locations = LineLocations()
+                #     for cgmes_loc in ...:
+                #         line_locations.add(latitude=latitude,
+                #                            longitude=longitude,
+                #                            sequence=seq_number,
+                #                            idtag=pos_id)
+
+                    # gcdev_elm.locations = line_locations
                 gcdev_model.add_line(gcdev_elm, logger=logger)
             else:
                 logger.add_error(msg='Not exactly two terminals',
@@ -898,7 +902,8 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
                     gcdev_elm.winding3.cn_from = cn_3
                     gcdev_elm.winding3.cn_to = cn_1
 
-                    gcdev_model.add_transformer3w(gcdev_elm, add_middle_bus=False)
+                    # gcdev_model.add_transformer3w(gcdev_elm, add_middle_bus=False)  # TODO: Why not adding the middle bus?
+                    gcdev_model.add_transformer3w(gcdev_elm, add_middle_bus=True)
 
                 else:
                     logger.add_error(msg='Not exactly three terminals',
@@ -1121,17 +1126,27 @@ def get_gcdev_substations(cgmes_model: CgmesCircuit,
     for device_list in [cgmes_model.cgmes_assets.Substation_list]:
 
         for cgmes_elm in device_list:
+
+            region = find_object_by_idtag(
+                object_list=gcdev_model.communities,
+                target_idtag=cgmes_elm.Region.uuid
+            )
+
+            if cgmes_elm.Location:
+                longitude = cgmes_elm.Location.PositionPoints.xPosition
+                latitude = cgmes_elm.Location.PositionPoints.yPosition
+            else:
+                latitude = 0.0
+                longitude = 0.0
+
             gcdev_elm = gcdev.Substation(
                 name=cgmes_elm.name,
                 idtag=cgmes_elm.uuid,
                 code=cgmes_elm.description,
-                # latitude=0.0,     # later from GL profile/Location class
-                # longitude=0.0
-            )
-            region = find_object_by_idtag(
-                object_list=gcdev_model.communities,
-                target_idtag=cgmes_elm.Region.uuid
+                latitude=latitude,     # later from GL profile/Location class
+                longitude=longitude
             )
+
             if region is not None:
                 gcdev_elm.community = region
             else:
@@ -1173,6 +1188,7 @@ def get_gcdev_voltage_levels(cgmes_model: CgmesCircuit,
 
     return volt_lev_dict
 
+
 def get_gcdev_busbars(cgmes_model: CgmesCircuit,
                       gcdev_model: MultiCircuit,
                       calc_node_dict: Dict[str, gcdev.Bus],

{GridCalEngine-5.1.12 → GridCalEngine-5.1.14}/GridCalEngine/IO/cim/cgmes/cgmes_utils.py

@@ -1,5 +1,6 @@
-from typing import List, Tuple
-
+from typing import List, Tuple, Dict
+import GridCalEngine.Devices as gcdev
+from GridCalEngine.IO.cim.cgmes.base import Base
 # from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.ac_line_segment import ACLineSegment
 # from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.base_voltage import BaseVoltage
 # from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.busbar_section import BusbarSection
@@ -22,6 +23,36 @@ from GridCalEngine.enumerations import (WindingsConnection, BuildStatus, TapChan
 import numpy as np
 
 
+def find_terms_connections(cgmes_terminal: Base,
+                           calc_node_dict: Dict[str, gcdev.Bus],
+                           cn_dict: Dict[str, gcdev.ConnectivityNode]) -> Tuple[gcdev.Bus, gcdev.ConnectivityNode]:
+    """
+
+    :param cgmes_terminal:
+    :param calc_node_dict:
+    :param cn_dict:
+    :return:
+    """
+
+    if cgmes_terminal is not None:
+        # get the rosetta calculation node if exists
+        if cgmes_terminal.TopologicalNode is not None:
+            calc_node = calc_node_dict.get(cgmes_terminal.TopologicalNode.uuid, None)
+        else:
+            calc_node = None
+
+        # get the gcdev connectivity node if exists
+        if cgmes_terminal.ConnectivityNode is not None:
+            cn = cn_dict.get(cgmes_terminal.ConnectivityNode.uuid, None)
+        else:
+            cn = None
+    else:
+        calc_node = None
+        cn = None
+
+    return calc_node, cn
+
+
 def find_object_by_idtag(object_list, target_idtag):
     """
     Finds an object with the specified idtag
@@ -696,6 +727,8 @@ def get_nominal_voltage(topological_node, logger) -> float:
 
 def get_regulating_control(cgmes_elm,
                            cgmes_enums,
+                           calc_node_dict,
+                           cn_dict,
                            logger: DataLogger):
     if cgmes_elm.RegulatingControl is not None:
 
@@ -707,6 +740,7 @@ def get_regulating_control(cgmes_elm,
         else:
             is_controlled = False
 
+        control_bus = None
         control_node = None
 
         # TapModuleControl
@@ -743,27 +777,23 @@ def get_regulating_control(cgmes_elm,
             else:
                 v_set = 1.0
 
+            if cgmes_elm.EquipmentContainer.tpe == 'VoltageLevel':
+                # find the control node
+                control_terminal = cgmes_elm.RegulatingControl.Terminal
+                control_node, cn = find_terms_connections(cgmes_terminal=control_terminal,
+                                                          calc_node_dict=calc_node_dict,
+                                                          cn_dict=cn_dict)
 
-            # if cgmes_elm.EquipmentContainer.tpe == 'VoltageLevel':
-            #
-            #     # is_controlled = True
-            #
-            #     # find the control node
-            #     # control_terminal = cgmes_elm.RegulatingControl.Terminal
-            #     # control_node, cn = find_terms_connections(cgmes_terminal=control_terminal,
-            #     #                                           calc_node_dict=calc_node_dict,
-            #     #                                           cn_dict=cn_dict)
-            #
-            # else:
-            #     control_node = None
-            #     v_set = 1.0
-            #     is_controlled = False
-            #     logger.add_warning(msg='RegulatingCondEq has no voltage control',
-            #                        device=cgmes_elm.rdfid,
-            #                        device_class=cgmes_elm.tpe,
-            #                        device_property="EquipmentContainer",
-            #                        value='None',
-            #                        expected_value='BaseVoltage')
+            else:
+                control_node = None
+                v_set = 1.0
+                is_controlled = False
+                logger.add_warning(msg='RegulatingCondEq has no voltage control',
+                                   device=cgmes_elm.rdfid,
+                                   device_class=cgmes_elm.tpe,
+                                   device_property="EquipmentContainer",
+                                   value='None',
+                                   expected_value='BaseVoltage')
 
         else:
             control_node = None
@@ -786,4 +816,4 @@ def get_regulating_control(cgmes_elm,
                            value='None',
                            expected_value='BaseVoltage')
 
-    return v_set, is_controlled  # control_node, control_mode
+    return v_set, is_controlled, control_bus, control_node

{GridCalEngine-5.1.12 → GridCalEngine-5.1.14}/GridCalEngine/IO/cim/cgmes/cgmes_v2_4_15/devices/coordinate_system.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.identified_object import IdentifiedObject
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile

{GridCalEngine-5.1.12 → GridCalEngine-5.1.14}/GridCalEngine/IO/cim/cgmes/cgmes_v2_4_15/devices/identified_object.py

@@ -25,7 +25,7 @@ class IdentifiedObject(Base):
 
 		self.description: str = None
 		self.energyIdentCodeEic: str = None
-		self.mRID: str = None
+		self.mRID: str = rdfid
 		self.name: str = None
 		self.shortName: str = None
 

GridCalEngine-5.1.14/GridCalEngine/IO/cim/cgmes/cgmes_v2_4_15/devices/location.py

@@ -0,0 +1,62 @@
+# GridCal
+# Copyright (C) 2015 - 2023 Santiago Peñate Vera
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+from typing import TYPE_CHECKING
+from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
+from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.identified_object import IdentifiedObject
+from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile
+
+if TYPE_CHECKING:
+    from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.coordinate_system import CoordinateSystem
+    from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.power_system_resource import PowerSystemResource
+    from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.position_point import PositionPoint
+
+
+class Location(IdentifiedObject):
+    def __init__(self, rdfid='', tpe='Location'):
+        IdentifiedObject.__init__(self, rdfid, tpe)
+
+        self.CoordinateSystem: CoordinateSystem | None = None
+
+        self.PowerSystemResources: PowerSystemResource | None = None
+
+        self.PositionPoints: PositionPoint | None = None
+
+        self.register_property(
+            name='CoordinateSystem',
+            class_type=CoordinateSystem,
+            multiplier=UnitMultiplier.none,
+            unit=UnitSymbol.none,
+            description='''Coordinate system used to describe position points of this location.''',
+            profiles=[]
+        )
+        self.register_property(
+            name='PowerSystemResources',
+            class_type=PowerSystemResource,
+            multiplier=UnitMultiplier.none,
+            unit=UnitSymbol.none,
+            description='''All power system resources at this location.''',
+            profiles=[]
+        )
+        self.register_property(
+            name='PositionPoints',
+            class_type=PositionPoint,
+            multiplier=UnitMultiplier.none,
+            unit=UnitSymbol.none,
+            description='''Sequence of position points describing this location, expressed in coordinate system 'Location.CoordinateSystem'.''',
+            profiles=[]
+        )

{GridCalEngine-5.1.12 → GridCalEngine-5.1.14}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/identified_object.py

@@ -25,7 +25,7 @@ class IdentifiedObject(Base):
 
 		self.description: str = None
 		self.energyIdentCodeEic: str = None
-		self.mRID: str = None
+		self.mRID: str = rdfid
 		self.name: str = None
 		self.shortName: str = None