GridCalEngine 5.1.1__tar.gz → 5.1.2__tar.gz

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/Compilers/circuit_to_data.py

@@ -1228,9 +1228,13 @@ def get_fluid_node_data(circuit: MultiCircuit,
         if time_series:
             data.inflow[k] = elm.inflow_prof[t_idx]
             data.spillage_cost[k] = elm.spillage_cost_prof[t_idx]
+            data.max_soc[k] = elm.max_soc_prof[t_idx]
+            data.min_soc[k] = elm.min_soc_prof[t_idx]
         else:
             data.inflow[k] = elm.inflow
             data.spillage_cost[k] = elm.spillage_cost
+            data.max_soc[k] = elm.max_soc
+            data.min_soc[k] = elm.min_soc
 
     return data, plant_dict
 

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/DataStructures/fluid_node_data.py

@@ -35,8 +35,9 @@ class FluidNodeData:
 
         self.min_level = np.zeros(nelm, dtype=float)
         self.max_level = np.zeros(nelm, dtype=float)
+        self.min_soc = np.zeros(nelm, dtype=float)
+        self.max_soc = np.zeros(nelm, dtype=float)
         self.initial_level = np.zeros(nelm, dtype=float)
-        # self.bus_index = np.empty()  # TODO: check if relevant
         self.inflow = np.zeros(nelm, dtype=float)
         self.spillage_cost = np.zeros(nelm, dtype=float)
 
@@ -61,6 +62,8 @@ class FluidNodeData:
 
         data.min_level = self.min_level.copy()
         data.max_level = self.max_level.copy()
+        data.min_soc = self.min_soc.copy()
+        data.max_soc = self.max_soc.copy()
         data.initial_level = self.initial_level.copy()
 
         data.inflow = self.inflow.copy()

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/Devices/Aggregation/__init__.py

@@ -29,3 +29,4 @@ from GridCalEngine.Devices.Aggregation.community import Community
 from GridCalEngine.Devices.Aggregation.region import Region
 from GridCalEngine.Devices.Aggregation.municipality import Municipality
 from GridCalEngine.Devices.Aggregation.branch_group import BranchGroup
+from GridCalEngine.Devices.Aggregation.modelling_authority import ModellingAuthority

GridCalEngine-5.1.2/GridCalEngine/Devices/Aggregation/modelling_authority.py

@@ -0,0 +1,35 @@
+# GridCal
+# Copyright (C) 2015 - 2024 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 typing import Union
+from GridCalEngine.Devices.Parents.editable_device import EditableDevice, DeviceType
+
+
+class ModellingAuthority(EditableDevice):
+
+    def __init__(self, name='', code='', idtag: Union[str, None] = None):
+        """
+
+        :param name:
+        :param idtag:
+        """
+        EditableDevice.__init__(self,
+                                name=name,
+                                code=code,
+                                idtag=idtag,
+                                device_type=DeviceType.ModellingAuthority)

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/Devices/Branches/transformer3w.py

@@ -171,7 +171,9 @@ class Transformer3W(EditableDevice):
     def bus1(self, obj: Bus):
         self._bus1 = obj
         self.winding1.bus_to = obj
-        self.winding1.set_hv_and_lv(self.winding1.HV, self.winding1.LV)
+
+        if obj is not None:
+            self.winding1.set_hv_and_lv(self.winding1.HV, self.winding1.LV)
 
     @property
     def bus2(self) -> Bus:
@@ -184,7 +186,9 @@ class Transformer3W(EditableDevice):
     def bus2(self, obj: Bus):
         self._bus2 = obj
         self.winding2.bus_to = obj
-        self.winding2.set_hv_and_lv(self.winding2.HV, self.winding2.LV)
+
+        if obj is not None:
+            self.winding2.set_hv_and_lv(self.winding2.HV, self.winding2.LV)
 
     @property
     def bus3(self) -> Bus:
@@ -197,7 +201,9 @@ class Transformer3W(EditableDevice):
     def bus3(self, obj: Bus):
         self._bus3 = obj
         self.winding3.bus_to = obj
-        self.winding3.set_hv_and_lv(self.winding3.HV, self.winding3.LV)
+
+        if obj is not None:
+            self.winding3.set_hv_and_lv(self.winding3.HV, self.winding3.LV)
 
     @property
     def V1(self) -> float:

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/Devices/Fluid/fluid_node.py

@@ -32,6 +32,8 @@ class FluidNode(EditableDevice):
                  code: str = '',
                  min_level: float = 0.0,
                  max_level: float = 0.0,
+                 min_soc: float = 0.0,
+                 max_soc: float = 1.0,
                  current_level: float = 0.0,
                  spillage_cost: float = 1000.0,
                  inflow: float = 0.0,
@@ -58,6 +60,8 @@ class FluidNode(EditableDevice):
 
         self.min_level = min_level  # hm3
         self.max_level = max_level  # hm3
+        self.max_soc = max_soc  # p.u.
+        self.min_soc = min_soc  # p.u.
         self.initial_level = current_level  # hm3
         self.spillage_cost = spillage_cost  # m3/s
         self.inflow = inflow  # m3/s
@@ -67,12 +71,23 @@ class FluidNode(EditableDevice):
         self._inflow_prof = Profile(default_value=inflow)  # m3/s
         self._spillage_cost_prof = Profile(default_value=spillage_cost)  # e/(m3/s)
 
+        self._max_soc_prof = Profile(default_value=max_soc)  # p.u.
+        self._min_soc_prof = Profile(default_value=min_soc)  # p.u.
+
         self.register(key='min_level', units='hm3', tpe=float,
                       definition="Minimum amount of fluid at the node/reservoir")
 
         self.register(key='max_level', units='hm3', tpe=float,
                       definition="Maximum amount of fluid at the node/reservoir")
 
+        self.register(key='min_soc', units='p.u.', tpe=float,
+                      definition="Minimum SOC of fluid at the node/reservoir",
+                      profile_name='min_soc_prof')
+
+        self.register(key='max_soc', units='p.u.', tpe=float,
+                      definition="Maximum SOC of fluid at the node/reservoir",
+                      profile_name='max_soc_prof')
+
         self.register(key='initial_level', units='hm3', tpe=float,
                       definition="Initial level of the node/reservoir")
 
@@ -124,6 +139,40 @@ class FluidNode(EditableDevice):
         else:
             raise Exception(str(type(val)) + 'not supported to be set into a inflow_prof')
 
+    @property
+    def max_soc_prof(self) -> Profile:
+        """
+        Max soc profile
+        :return: Profile
+        """
+        return self._max_soc_prof
+
+    @max_soc_prof.setter
+    def max_soc_prof(self, val: Union[Profile, np.ndarray]):
+        if isinstance(val, Profile):
+            self._max_soc_prof = val
+        elif isinstance(val, np.ndarray):
+            self._max_soc_prof.set(arr=val)
+        else:
+            raise Exception(str(type(val)) + 'not supported to be set into a max soc prof')
+
+    @property
+    def min_soc_prof(self) -> Profile:
+        """
+        Min soc profile
+        :return: Profile
+        """
+        return self._min_soc_prof
+
+    @min_soc_prof.setter
+    def min_soc_prof(self, val: Union[Profile, np.ndarray]):
+        if isinstance(val, Profile):
+            self._min_soc_prof = val
+        elif isinstance(val, np.ndarray):
+            self._min_soc_prof.set(arr=val)
+        else:
+            raise Exception(str(type(val)) + 'not supported to be set into a min soc prof')
+
     def copy(self):
         """
         Make a deep copy of this object
@@ -135,6 +184,8 @@ class FluidNode(EditableDevice):
 
         fluid_node.min_level = self.min_level  # hm3
         fluid_node.max_level = self.max_level  # hm3
+        fluid_node.min_soc = self.min_soc  # p.u.
+        fluid_node.max_soc = self.max_soc  # p.u.
         fluid_node.initial_level = self.initial_level  # hm3
         fluid_node.spillage_cost = self.spillage_cost  # m3/s
         fluid_node.inflow = self.inflow  # m3/s
@@ -143,6 +194,8 @@ class FluidNode(EditableDevice):
 
         fluid_node.inflow_prof = self.inflow_prof  # m3/s
         fluid_node.spillage_cost_prof = self.spillage_cost_prof  # e/(m3/s)
+        fluid_node.max_soc_prof = self.max_soc_prof  # m3
+        fluid_node.min_soc_prof = self.min_soc_prof  # m3
 
         return fluid_node
 

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/Devices/multi_circuit.py

@@ -316,6 +316,9 @@ class MultiCircuit:
         # technologies
         self.technologies: List[dev.Technology] = list()
 
+        # Modelling authority
+        self.modelling_authorities: List[dev.ModellingAuthority] = list()
+
         # fuels
         self.fuels: List[dev.Fuel] = list()
 
@@ -394,6 +397,7 @@ class MultiCircuit:
                 dev.InvestmentsGroup(),
                 dev.Investment(),
                 dev.BranchGroup(),
+                dev.ModellingAuthority()
             ],
             "Tags & Associations": [
                 dev.Technology(),
@@ -1755,7 +1759,58 @@ class MultiCircuit:
 
         self.branch_groups.remove(obj)
 
-    def get_elements_by_type(self, device_type: DeviceType):
+    # ------------------------------------------------------------------------------------------------------------------
+    # modelling_authority
+    # ------------------------------------------------------------------------------------------------------------------
+
+    def get_modelling_authorities(self) -> List[dev.ModellingAuthority]:
+        """
+        List of modelling_authorities
+        :return: List[dev.ModellingAuthority]
+        """
+        return self.modelling_authorities
+
+    def get_modelling_authorities_number(self) -> int:
+        """
+        Size of the list of modelling_authorities
+        :return: size of modelling_authorities
+        """
+        return len(self.modelling_authorities)
+
+    def get_modelling_authority_at(self, i: int) -> dev.ModellingAuthority:
+        """
+        Get modelling_authority at i
+        :param i: index
+        :return: ModellingAuthority
+        """
+        return self.modelling_authorities[i]
+
+    def get_modelling_authority_names(self) -> StrVec:
+        """
+        Array of modelling_authority names
+        :return: StrVec
+        """
+        return np.array([e.name for e in self.modelling_authorities])
+
+    def add_modelling_authority(self, obj: dev.ModellingAuthority):
+        """
+        Add a ModellingAuthority object
+        :param obj: ModellingAuthority instance
+        """
+
+        if self.time_profile is not None:
+            obj.create_profiles(self.time_profile)
+        self.modelling_authorities.append(obj)
+
+    def delete_modelling_authority(self, obj: dev.ModellingAuthority) -> None:
+        """
+        Add a ModellingAuthority object
+        :param obj: ModellingAuthority instance
+        """
+
+        self.modelling_authorities.remove(obj)
+
+    def get_elements_by_type(self, device_type: DeviceType) -> List[ALL_DEV_TYPES]:
         """
         Get set of elements and their parent nodes
         :param device_type: DeviceTYpe instance
@@ -1945,6 +2000,9 @@ class MultiCircuit:
         elif device_type == DeviceType.TimeDevice:
             return self.get_time_array()
 
+        elif device_type == DeviceType.ModellingAuthority:
+            return self.get_modelling_authorities()
+
         else:
             raise Exception('Element type not understood ' + str(device_type))
 
@@ -2136,6 +2194,9 @@ class MultiCircuit:
         elif device_type == DeviceType.IfMeasurementDevice:
             self.if_measurements = devices
 
+        elif device_type == DeviceType.ModellingAuthority:
+            self.modelling_authorities = devices
+
         else:
             raise Exception('Element type not understood ' + str(device_type))
 
@@ -2313,6 +2374,9 @@ class MultiCircuit:
         elif element_type == DeviceType.IfMeasurementDevice:
             return self.delete_if_measurement(obj)
 
+        elif element_type == DeviceType.ModellingAuthority:
+            return self.delete_modelling_authority(obj)
+
         else:
             raise Exception('Element type not understood ' + str(element_type))
 
@@ -2418,6 +2482,7 @@ class MultiCircuit:
                 'pf_measurements',
                 'qf_measurements',
                 'if_measurements',
+                'modelling_authorities'
                 ]
 
         for pr in ppts:
@@ -2430,46 +2495,9 @@ class MultiCircuit:
         Clear the multi-circuit (remove the bus and branch objects)
         """
 
-        for lst in self.get_branch_lists():
-            lst.clear()
-
-        for lst in self.get_injection_devices_lists():
-            lst.clear()
-
-        self.areas = list()
-        self.technologies = list()
-        self.contingencies = list()
-        self.contingency_groups = list()
-        self.investments = list()
-        self.investments_groups = list()
-        self.fuels = list()
-        self.emission_gases = list()
-
-        # Should accept buses
-        self.buses = list()
-        self.voltage_levels = list()
-        self.substations = list()
-
-        # List of overhead line objects
-        self.overhead_line_types = list()
-
-        # list of wire types
-        self.wire_types = list()
-
-        # underground cable lines
-        self.underground_cable_types = list()
-
-        # sequence modelled lines
-        self.sequence_line_types = list()
-
-        # List of transformer types
-        self.transformer_types = list()
-
-        self.time_profile = None
-
-        self.contingencies = list()
-
-        self.branch_groups = list()
+        for key, elm_list in self.objects_with_profiles.items():
+            for elm in elm_list:
+                self.get_elements_by_type(device_type=elm.device_type).clear()
 
     def get_catalogue_dict(self, branches_only=False):
         """

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/Devices/types.py

@@ -102,5 +102,14 @@ ALL_DEV_TYPES = Union[
     GeneratorTechnology,
     BranchGroup,
     LineLocations,
-    LineLocation
+    LineLocation,
+    ModellingAuthority,
+    Fuel,
+    Investment,
+    InvestmentsGroup,
+    Contingency,
+    ContingencyGroup,
+    Technology,
+    UndergroundLineType,
+    SequenceLineType
 ]

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/IO/cim/cgmes/cgmes_circuit.py

@@ -186,7 +186,7 @@ def find_attribute(referenced_object, obj, property_name, association_inverse_di
         if isinstance(obj, globals()[c_class]) and c_prop == property_name:
             i_class = str(inverse).split('.')[0]
             i_prop = str(inverse).split('.')[-1]
-            if isinstance(referenced_object, globals()[i_class]) and i_prop in referenced_object.get_all_properties():
+            if isinstance(referenced_object, globals()[i_class]) and i_prop in vars(referenced_object):
                 return i_prop
             else:
                 continue

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/IO/cim/cgmes/cgmes_to_gridcal.py

@@ -30,7 +30,7 @@ from GridCalEngine.IO.cim.cgmes.cgmes_utils import (get_nominal_voltage,
                                                     get_windings,
                                                     get_regulating_control, get_pu_values_power_transformer_end,
                                                     get_slack_id)
-from GridCalEngine.IO.cim.cgmes.gridcal_to_cgmes import gridcal_to_cgmes    #TODO move them here
+from GridCalEngine.IO.cim.cgmes.gridcal_to_cgmes import gridcal_to_cgmes  # TODO move them here
 from GridCalEngine.data_logger import DataLogger
 from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.identified_object import IdentifiedObject
 from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.terminal import Terminal
@@ -162,7 +162,7 @@ def find_connections(cgmes_elm: IdentifiedObject,
     return calc_nodes, cns
 
 
-def find_object_by_idtag(object_list, target_idtag):  #TODO move to somewhere
+def find_object_by_idtag(object_list, target_idtag):  # TODO move to somewhere
     """
     Finds an object with the specified idtag
      in the given object_list from a Multi Circuit.
@@ -238,17 +238,16 @@ def get_gcdev_calculation_nodes(cgmes_model: CgmesCircuit,
                               is_slack=is_slack,
                               is_dc=False,
                               # is_internal=False,
-                              area=None,    #TODO get tp area
-                              zone=None,    #TODO get tp zone
-                              substation=None,  #TODO
-                              voltage_level=volt_lev,   #TODO
-                              country=None,     #TODO
+                              area=None,  # TODO get tp area
+                              zone=None,  # TODO get tp zone
+                              substation=None,  # TODO
+                              voltage_level=volt_lev,  # TODO
+                              country=None,  # TODO
                               # latitude=0.0,
                               # longitude=0.0,
                               Vm0=vm,
                               Va0=va)
 
-
         gc_model.add_bus(gcdev_elm)
         calc_node_dict[gcdev_elm.idtag] = gcdev_elm
 
@@ -330,8 +329,8 @@ def get_gcdev_loads(cgmes_model: CgmesCircuit,
 
                     if cgmes_elm.LoadResponse.exponentModel:
                         print(f'Exponent model True at {cgmes_elm.name}')
-                        pass    #TODO convert exponent to ZIP
-                    else:       # ZIP model
+                        pass  # TODO convert exponent to ZIP
+                    else:  # ZIP model
                         # TODO check all attributes
                         p = cgmes_elm.p * cgmes_elm.LoadResponse.pConstantPower
                         q = cgmes_elm.q * cgmes_elm.LoadResponse.qConstantPower
@@ -489,7 +488,7 @@ def get_gcdev_external_grids(cgmes_model: CgmesCircuit,
     """
     # convert loads
     for device_list in [cgmes_model.EquivalentInjection_list]:
-        #TODO ExternalNetworkInjection
+        # TODO ExternalNetworkInjection
         for cgmes_elm in device_list:
             calc_nodes, cns = find_connections(cgmes_elm=cgmes_elm,
                                                device_to_terminal_dict=device_to_terminal_dict,
@@ -628,7 +627,13 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
 
         for cgmes_elm in device_list:
 
-            windings = get_windings(cgmes_elm)
+            windings = [None, None, None]
+            for pte in list(cgmes_elm.PowerTransformerEnd):
+                if hasattr(pte, "endNumber"):
+                    i = getattr(pte, "endNumber")
+                    windings[i - 1] = pte
+            windings = [x for x in windings if x is not None]
+            # windings = get_windings(cgmes_elm)
             # windings: List[PowerTransformerEnd] = list(cgmes_elm.references_to_me['PowerTransformerEnd'])
 
             if len(windings) == 2:
@@ -763,9 +768,10 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
                     gcdev_elm.winding3.X0 = x0
                     gcdev_elm.winding3.G0 = g0
                     gcdev_elm.winding3.B0 = b0
-                    gcdev_model.add_transformer3w(gcdev_elm)
                     gcdev_elm.winding3.rate = windings[2].ratedS
 
+                    gcdev_model.add_transformer3w(gcdev_elm)
+
 
                 else:
                     logger.add_error(msg='Not exactly three terminals',
@@ -907,13 +913,14 @@ def get_gcdev_switches(cgmes_model: CgmesCircuit,
                     # rate in MVA = A / 1000 * kV * sqrt(3)    CORRECTED!
                     op_rate = np.round((operational_current_rate / 1000.0) *
                                        cgmes_elm.BaseVoltage.nominalVoltage * 1.73205080756888,
-                                    4)
+                                       4)
                 else:
                     op_rate = 9999  # Corrected
 
-                if cgmes_elm.ratedCurrent is not None and cgmes_elm.ratedCurrent != 0.0:   # TODO
-                    rated_current = np.round((cgmes_elm.ratedCurrent / 1000.0) * cgmes_elm.BaseVoltage.nominalVoltage * 1.73205080756888,
-                                    4)
+                if cgmes_elm.ratedCurrent is not None and cgmes_elm.ratedCurrent != 0.0:  # TODO
+                    rated_current = np.round(
+                        (cgmes_elm.ratedCurrent / 1000.0) * cgmes_elm.BaseVoltage.nominalVoltage * 1.73205080756888,
+                        4)
                 else:
                     rated_current = op_rate
 
@@ -955,7 +962,6 @@ def get_gcdev_substations(cgmes_model: CgmesCircuit,
     for device_list in [cgmes_model.Substation_list]:
 
         for cgmes_elm in device_list:
-
             gcdev_elm = gcdev.Substation(
                 name=cgmes_elm.name,
                 idtag=cgmes_elm.uuid,

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/IO/cim/cgmes/cgmes_utils.py

@@ -74,7 +74,8 @@ def get_pu_values_power_transformer(power_transformer: PowerTransformer, System_
     :return:
     """
     try:
-        windings = get_windings(power_transformer)
+        # windings = get_windings(power_transformer)
+        windings = list(power_transformer.PowerTransformerEnd)
 
         R, X, G, B = 0, 0, 0, 0
         R0, X0, G0, B0 = 0, 0, 0, 0
@@ -103,7 +104,8 @@ def get_pu_values_power_transformer3w(power_transformer: PowerTransformer, Syste
     :return:
     """
     try:
-        windings = get_windings(power_transformer)
+        # windings = get_windings(power_transformer)
+        windings = list(power_transformer.PowerTransformerEnd)
 
         r12, r23, r31, x12, x23, x31 = 0.0, 0.0, 0.0, 0.0, 0.0, 0.0
 

{GridCalEngine-5.1.1 → GridCalEngine-5.1.2}/GridCalEngine/IO/cim/cgmes/cgmes_v2_4_15/devices/__init__.py

@@ -19,3 +19,5 @@ from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.synchronous_machine import
 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.regulating_cond_eq import RegulatingCondEq
 from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.regulating_control import RegulatingControl
+from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.power_transformer import PowerTransformer
+from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.power_transformer_end import PowerTransformerEnd