GridCalEngine 5.3.2__tar.gz → 5.3.3__tar.gz

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Compilers/circuit_to_data.py

@@ -320,6 +320,13 @@ def get_load_data(data: LoadData,
             data.active[ii] = elm.active
             data.cost[ii] = elm.Cost
 
+        if elm.use_kw:
+            # pass kW to MW
+            data.S[ii] /= 1000.0
+            data.I[ii] /= 1000.0
+            data.Y[ii] /= 1000.0
+            data.cost[ii] /= 1000.0
+
         # reactive power sharing data
         if data.active[ii]:
             bus_data.q_fixed[i] -= data.S[ii].imag
@@ -347,6 +354,11 @@ def get_load_data(data: LoadData,
             data.active[ii] = elm.active
             data.cost[ii] = elm.Cost
 
+        if elm.use_kw:
+            # pass kW to MW
+            data.S[ii] /= 1000.0
+            data.cost[ii] /= 1000.0
+
         # reactive power sharing data
         if data.active[ii]:
             bus_data.q_fixed[i] += data.S[ii].imag
@@ -399,6 +411,11 @@ def get_load_data(data: LoadData,
             data.S[ii] += complex(elm.P, elm.Q)
             data.active[ii] = elm.active
 
+        if elm.use_kw:
+            # pass kW to MW
+            data.S[ii] /= 1000.0
+            data.cost[ii] /= 1000.0
+
         # reactive power sharing data
         if data.active[ii]:
             bus_data.q_fixed[i] += data.S[ii].imag
@@ -428,7 +445,12 @@ def get_load_data(data: LoadData,
             data.active[ii] = elm.active
             data.cost[ii] = elm.Cost
 
-        # reactive power sharing data
+        if elm.use_kw:
+            # pass kW to MW
+            data.I[ii] /= 1000.0
+            data.cost[ii] /= 1000.0
+
+            # reactive power sharing data
         if data.active[ii]:
             bus_data.q_fixed[i] += data.S[ii].imag
             bus_data.ii_fixed[i] += data.I[ii].imag
@@ -485,6 +507,10 @@ def get_shunt_data(
             data.active[k] = elm.active
             data.Y[k] = complex(elm.G, elm.B)
 
+        if elm.use_kw:
+            # pass kW to MW
+            data.Y[ii] /= 1000.0
+
         # reactive power sharing data
         if data.active[ii]:
             bus_data.b_fixed[i] += data.Y[ii].imag
@@ -558,6 +584,10 @@ def get_shunt_data(
                                         use_stored_guess=use_stored_guess,
                                         logger=logger)
 
+        if elm.use_kw:
+            # pass kW to MW
+            data.Y[ii] /= 1000.0
+
         # reactive power sharing data
         if data.active[ii]:
             if data.controllable[ii]:
@@ -717,6 +747,18 @@ def fill_generator_parent(
                                         use_stored_guess=use_stored_guess,
                                         logger=logger)
 
+    if elm.use_kw:
+        # pass kW to MW
+        data.p[k] /= 1000.0
+        data.pmax[k] /= 1000.0
+        data.pmin[k] /= 1000.0
+        data.qmax[k] /= 1000.0
+        data.qmin[k] /= 1000.0
+        data.snom[k] /= 1000.0
+        # data.cost_0[k] /= 1000.0
+        data.cost_1[k] /= 1000.0
+        data.cost_2[k] /= 1e6  # this is because of MW^2
+
     # reactive power-sharing data
     if data.active[k]:
         if data.controllable[k]:

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/DataStructures/branch_parent_data.py

@@ -79,6 +79,38 @@ class BranchParentData:
         data = np.ones(self.nelm, dtype=int)
         return sp.coo_matrix((data, (i, self.T)), shape=(self.nelm, self.nbus), dtype=int).tocsc()
 
+
+    def monitored_Cf(self, idx) -> sp.csc_matrix: # TODO: @Carlos: Ganancia marginal al coger solo los monitorizados. Por ver si es relevante.
+        """
+        Bras-bus from connectivity for monitored branches
+        :param idx: Monitored branches ids
+        :return:
+        """
+        # mat = sp.lil_matrix((self.nelm, self.nbus), dtype=int)
+        # for k in range(self.nelm):
+        #     mat[k, self.F[k]] = 1
+        # return mat.tocsc()
+        nelm = len(idx)
+        i = np.arange(nelm, dtype=int)
+        data = np.ones(nelm, dtype=int)
+        return sp.coo_matrix((data, (i, self.F[idx])), shape=(nelm, self.nbus), dtype=int).tocsc()
+
+    def monitored_Ct(self, idx) -> sp.csc_matrix:
+        """
+        Bras-bus to connectivity for monitored branches
+        :param idx: Monitored branches ids
+        :return:
+        """
+        # mat = sp.lil_matrix((self.nelm, self.nbus), dtype=int)
+        # for k in range(self.nelm):
+        #     mat[k, self.T[k]] = 1
+        # return mat.tocsc()
+        nelm = len(idx)
+        i = np.arange(nelm, dtype=int)
+        data = np.ones(nelm, dtype=int)
+        return sp.coo_matrix((data, (i, self.T[idx])), shape=(nelm, self.nbus), dtype=int).tocsc()
+
+
     @property
     def C(self) -> sp.csc_matrix:
         """

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Devices/Branches/line.py

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MPL-2.0
 
 import numpy as np
-from typing import Union, Tuple, List
+from typing import Union, List
 from GridCalEngine.basic_structures import Logger
 from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices.Substation.connectivity_node import ConnectivityNode
@@ -175,7 +175,7 @@ class Line(BranchParent):
         self.register(key='temp_oper', units='ºC', tpe=float, definition='Operation temperature to modify R.',
                       profile_name='temp_oper_prof')
         self.register(key='alpha', units='1/ºC', tpe=float,
-                      definition='Thermal coefficient to modify R,around a reference temperatureusing a '
+                      definition='Thermal coefficient to modify R,around a reference temperature using a '
                                  'linear approximation.For example:Copper @ 20ºC: 0.004041,Copper @ 75ºC: 0.00323,'
                                  'Annealed copper @ 20ºC: 0.00393,Aluminum @ 20ºC: 0.004308,Aluminum @ 75ºC: 0.00330')
         self.register(key='r_fault', units='p.u.', tpe=float,
@@ -293,9 +293,8 @@ class Line(BranchParent):
 
     def set_length(self, val: float):
         """
-
-        :param val:
-        :return:
+        Set the line length and change the electric parameters of the line as a consequence.
+        :param val: value in km
         """
         if isinstance(val, float):
             if val > 0.0:
@@ -363,9 +362,9 @@ class Line(BranchParent):
         """
         return self.R * (1 + self.alpha * (self.temp_oper - self.temp_base))
 
-    def change_base(self, Sbase_old, Sbase_new):
+    def change_base(self, Sbase_old: float, Sbase_new: float):
         """
-        Change the inpedance base
+        Change the impedance base
         :param Sbase_old: old base (MVA)
         :param Sbase_new: new base (MVA)
         """
@@ -377,8 +376,8 @@ class Line(BranchParent):
 
     def get_weight(self) -> float:
         """
-        Get a weight of this line for graph porpuses
-        the weight is the impedance moudule (sqrt(r^2 + x^2))
+        Get a weight of this line for graph purposes
+        the weight is the impedance module (sqrt(r^2 + x^2))
         :return: weight value
         """
         return np.sqrt(self.R * self.R + self.X * self.X)
@@ -486,17 +485,19 @@ class Line(BranchParent):
         elm.temperature_prof = self.temp_oper_prof
         return elm
 
-    def fill_design_properties(self, r_ohm, x_ohm, c_nf, length, Imax, freq, Sbase, apply_to_profile: bool = True, ):
+    def fill_design_properties(self, r_ohm: float, x_ohm: float, c_nf: float, length: float,
+                               Imax: float, freq: float, Sbase: float, apply_to_profile: bool = True, ):
         """
         Fill R, X, B from not-in-per-unit parameters
         :param r_ohm: Resistance per km in OHM/km
         :param x_ohm: Reactance per km in OHM/km
         :param c_nf: Capacitance per km in nF/km
-        :param length: lenght in kn
+        :param length: length in kn
         :param Imax: Maximum current in kA
         :param freq: System frequency in Hz
         :param Sbase: Base power in MVA (take always 100 MVA)
         :param apply_to_profile: modify the profile is checked
+        :return self pointer
         """
         r_ohm_total = r_ohm * length
         x_ohm_total = x_ohm * length
@@ -522,3 +523,5 @@ class Line(BranchParent):
         if apply_to_profile:
             prof_old = self.rate_prof.toarray()
             self.rate_prof.set(prof_old * new_rate / old_rate)
+
+        return self

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Devices/Branches/transformer.py

@@ -390,7 +390,7 @@ class Transformer2W(ControllableBranchParent):
         Fix the inconsistencies
         :param logger:
         :param maximum_difference: proportion to be under or above
-        (i.e. Transformer HV=41.9, bus HV=45 41.9/45 = 0.93 -> 0.9 <= 0.93 <= 1.1, so its ok
+        (i.e. Transformer HV=41.9, bus HV=45 41.9/45 = 0.93 -> 0.9 <= 0.93 <= 1.1, so it's ok
         :return: were there any errors?
         """
         errors = False
@@ -423,7 +423,7 @@ class Transformer2W(ControllableBranchParent):
 
         return errors
 
-    def fill_design_properties(self, Pcu, Pfe, I0, Vsc, Sbase):
+    def fill_design_properties(self, Pcu: float, Pfe: float, I0: float, Vsc: float, Sbase: float):
         """
         Fill R, X, G, B from the short circuit study values
         :param Pcu: copper_losses (kW)
@@ -431,6 +431,7 @@ class Transformer2W(ControllableBranchParent):
         :param I0: No load current in %
         :param Vsc: Short circuit voltage (%)
         :param Sbase: Base power in MVA (take always 100 MVA)
+        :return: self pointer
         """
         tpe = TransformerType(hv_nominal_voltage=self.HV,
                               lv_nominal_voltage=self.LV,
@@ -450,6 +451,8 @@ class Transformer2W(ControllableBranchParent):
         self.G = np.round(y_shunt.real, 6)
         self.B = np.round(y_shunt.imag, 6)
 
+        return self
+
     def get_vcc(self) -> float:
         """
         Get the short circuit voltage in %

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Devices/Injections/controllable_shunt.py

@@ -120,12 +120,17 @@ class ControllableShunt(ShuntParent):
     @step.setter
     def step(self, value: int):
 
-        if 0 <= value < len(self._b_steps):
-            self._step = int(value)
+        if self.auto_update_enabled:
+
+            if 0 <= value < len(self._b_steps):
+                self._step = int(value)
 
-            # override value on change
-            self.B = np.sum(self._b_steps[:self._step + 1])
-            self.G = np.sum(self._g_steps[:self._step + 1])
+                # override value on change
+                self.B = np.sum(self._b_steps[:self._step + 1] * self._active_steps[:self._step + 1])
+                self.G = np.sum(self._g_steps[:self._step + 1] * self._active_steps[:self._step + 1])
+        else:
+
+            self._step = int(value)
 
     @property
     def Bmin(self):

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Devices/Injections/generator.py

@@ -224,7 +224,7 @@ class Generator(GeneratorParent):
         self.register(key='X0', units='p.u.', tpe=float, definition='Total zero sequence reactance.')
         self.register(key='R2', units='p.u.', tpe=float, definition='Total negative sequence resistance.')
         self.register(key='X2', units='p.u.', tpe=float, definition='Total negative sequence reactance.')
-        self.register(key='Cost2', units='e/MWh²', tpe=float, definition='Generation quadratic cost. Used in OPF.',
+        self.register(key='Cost2', units='e/MW²/h', tpe=float, definition='Generation quadratic cost. Used in OPF.',
                       profile_name='Cost2_prof')
 
         self.register(key='Cost0', units='e/h', tpe=float, definition='Generation constant cost. Used in OPF.',

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Devices/Parents/injection_parent.py

@@ -103,6 +103,8 @@ class InjectionParent(PhysicalDevice):
 
         self.scalable: bool = True
 
+        self._use_kw: bool = False
+
         self.register(key='bus', units='', tpe=DeviceType.BusDevice, definition='Connection bus', editable=False)
 
         self.register(key='cn', units='', tpe=DeviceType.ConnectivityNodeDevice,
@@ -129,9 +131,11 @@ class InjectionParent(PhysicalDevice):
         self.register(key='technologies', units='p.u.', tpe=SubObjectType.Associations,
                       definition='List of technologies', display=False)
 
-        self.register(key='scalable', units='', tpe=bool, definition='Is the load scalable?', editable=False,
+        self.register(key='scalable', units='', tpe=bool, definition='Is the injection scalable?', editable=False,
                       display=False)
 
+        self.register(key='use_kw', units='', tpe=bool, definition='Consider the injections in kW and kVAr?')
+
     @property
     def bus(self) -> Bus:
         """
@@ -205,6 +209,35 @@ class InjectionParent(PhysicalDevice):
         else:
             raise Exception(str(type(val)) + 'not supported to be set into a Cost_prof')
 
+    @property
+    def use_kw(self):
+        return self._use_kw
+
+    @use_kw.setter
+    def use_kw(self, val: bool):
+        """
+        Setter
+        :param val: bool
+        """
+        if self.auto_update_enabled:
+            if val != self._use_kw:
+                self._use_kw = val
+
+                if val:
+                    # is in kW, replace MW by kW
+                    for key, prp in self.registered_properties.items():
+                        prp.units = (prp.units.replace("MW", "kW")
+                                     .replace("MVAr", "kVAr")
+                                     .replace("MVA", "kVA"))
+                else:
+                    # is in MW, replace kW by MW
+                    for key, prp in self.registered_properties.items():
+                        prp.units = (prp.units.replace( "kW", "MW")
+                                     .replace( "kVAr", "MVAr")
+                                     .replace( "kVA", "MVA"))
+        else:
+            self._use_kw = val
+
     def get_S(self) -> complex:
         """
 

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Devices/assets.py

@@ -2147,7 +2147,7 @@ class Assets:
     def pi_measurements(self, value: List[dev.PiMeasurement]):
         self._pi_measurements = value
 
-    def get_pi_measurements(self) -> List[dev.PiMeasurement]:
+    def get_p_measurements(self) -> List[dev.PiMeasurement]:
         """
         List of pi_measurements
         :return: List[dev.PiMeasurement]
@@ -2211,7 +2211,7 @@ class Assets:
     def qi_measurements(self, value: List[dev.QiMeasurement]):
         self._qi_measurements = value
 
-    def get_qi_measurements(self) -> List[dev.QiMeasurement]:
+    def get_q_measurements(self) -> List[dev.QiMeasurement]:
         """
         List of qi_measurements
         :return: List[dev.QiMeasurement]
@@ -5253,11 +5253,11 @@ class Assets:
         elif device_type == DeviceType.FluidP2XDevice:
             return self._p2xs
 
-        elif device_type == DeviceType.PiMeasurementDevice:
-            return self.get_pi_measurements()
+        elif device_type == DeviceType.PMeasurementDevice:
+            return self.get_p_measurements()
 
-        elif device_type == DeviceType.QiMeasurementDevice:
-            return self.get_qi_measurements()
+        elif device_type == DeviceType.QMeasurementDevice:
+            return self.get_q_measurements()
 
         elif device_type == DeviceType.PfMeasurementDevice:
             return self.get_pf_measurements()
@@ -5465,10 +5465,10 @@ class Assets:
             for d in devices:
                 self.add_branch(d)  # each branch needs to be converted accordingly
 
-        elif device_type == DeviceType.PiMeasurementDevice:
+        elif device_type == DeviceType.PMeasurementDevice:
             self._pi_measurements = devices
 
-        elif device_type == DeviceType.QiMeasurementDevice:
+        elif device_type == DeviceType.QMeasurementDevice:
             self._qi_measurements = devices
 
         elif device_type == DeviceType.PfMeasurementDevice:
@@ -5643,10 +5643,10 @@ class Assets:
         elif obj.device_type == DeviceType.FluidPathDevice:
             self.add_fluid_path(obj=obj)
 
-        elif obj.device_type == DeviceType.PiMeasurementDevice:
+        elif obj.device_type == DeviceType.PMeasurementDevice:
             self.add_pi_measurement(obj=obj)
 
-        elif obj.device_type == DeviceType.QiMeasurementDevice:
+        elif obj.device_type == DeviceType.QMeasurementDevice:
             self.add_qi_measurement(obj=obj)
 
         elif obj.device_type == DeviceType.PfMeasurementDevice:
@@ -5821,10 +5821,10 @@ class Assets:
         elif obj.device_type == DeviceType.FluidPathDevice:
             self.delete_fluid_path(obj)
 
-        elif obj.device_type == DeviceType.PiMeasurementDevice:
+        elif obj.device_type == DeviceType.PMeasurementDevice:
             self.delete_pi_measurement(obj)
 
-        elif obj.device_type == DeviceType.QiMeasurementDevice:
+        elif obj.device_type == DeviceType.QMeasurementDevice:
             self.delete_qi_measurement(obj)
 
         elif obj.device_type == DeviceType.PfMeasurementDevice:

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Devices/measurement.py

@@ -9,6 +9,8 @@ from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices.Parents.branch_parent import BranchParent
 from GridCalEngine.enumerations import DeviceType
 
+MEASURABLE_OBJECT = Union[Bus, BranchParent]
+
 
 class MeasurementTemplate(EditableDevice):
     """
@@ -17,7 +19,7 @@ class MeasurementTemplate(EditableDevice):
 
     def __init__(self, value: float,
                  uncertainty: float,
-                 api_obj: EditableDevice,
+                 api_obj: MEASURABLE_OBJECT,
                  name: str,
                  idtag: Union[str, None],
                  device_type: DeviceType):
@@ -36,7 +38,7 @@ class MeasurementTemplate(EditableDevice):
                                 device_type=device_type)
         self.value = float(value)
         self.sigma = float(uncertainty)
-        self.api_object: EditableDevice = api_obj
+        self.api_object: MEASURABLE_OBJECT = api_obj
 
         self.register("value", tpe=float, definition="Value of the measurement")
         self.register("sigma", tpe=float, definition="Uncertainty of the measurement")
@@ -56,7 +58,7 @@ class PiMeasurement(MeasurementTemplate):
                                      api_obj=api_obj,
                                      name=name,
                                      idtag=idtag,
-                                     device_type=DeviceType.PiMeasurementDevice)
+                                     device_type=DeviceType.PMeasurementDevice)
 
 
 class QiMeasurement(MeasurementTemplate):
@@ -72,7 +74,7 @@ class QiMeasurement(MeasurementTemplate):
                                      api_obj=api_obj,
                                      name=name,
                                      idtag=idtag,
-                                     device_type=DeviceType.QiMeasurementDevice)
+                                     device_type=DeviceType.QMeasurementDevice)
 
 
 class VmMeasurement(MeasurementTemplate):
@@ -122,6 +124,36 @@ class QfMeasurement(MeasurementTemplate):
                                      idtag=idtag,
                                      device_type=DeviceType.QfMeasurementDevice)
 
+class PtMeasurement(MeasurementTemplate):
+    """
+    Measurement class
+    """
+
+    def __init__(self, value: float, uncertainty: float, api_obj: BranchParent, name="",
+                 idtag: Union[str, None] = None):
+        MeasurementTemplate.__init__(self,
+                                     value=value,
+                                     uncertainty=uncertainty,
+                                     api_obj=api_obj,
+                                     name=name,
+                                     idtag=idtag,
+                                     device_type=DeviceType.PtMeasurementDevice)
+
+class QtMeasurement(MeasurementTemplate):
+    """
+    Measurement class
+    """
+
+    def __init__(self, value: float, uncertainty: float, api_obj: BranchParent, name="",
+                 idtag: Union[str, None] = None):
+        MeasurementTemplate.__init__(self,
+                                     value=value,
+                                     uncertainty=uncertainty,
+                                     api_obj=api_obj,
+                                     name=name,
+                                     idtag=idtag,
+                                     device_type=DeviceType.QtMeasurementDevice)
+
 
 class IfMeasurement(MeasurementTemplate):
     """

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/Devices/types.py

@@ -72,6 +72,8 @@ MEASUREMENT_TYPES = Union[
     IfMeasurement,
     QfMeasurement,
     PfMeasurement,
+    QtMeasurement,
+    PtMeasurement,
     QiMeasurement,
     PiMeasurement,
     VmMeasurement

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/IO/base/base_property.py

@@ -17,7 +17,7 @@ class BaseProperty:
                  unit: Unit,
                  denominator_unit: Unit = None,
                  description: str = '',
-                 max_chars=65000,
+                 max_chars=None,
                  min_value=-1e20,
                  max_value=1e20):
         """

{gridcalengine-5.3.2 → gridcalengine-5.3.3}/GridCalEngine/IO/cim/cgmes/cgmes_create_instances.py

@@ -122,7 +122,8 @@ def create_cgmes_headers(cgmes_model: CgmesCircuit,
     fm_list[2].profile = profile_uris.get("TP")
     fm_list[3].profile = profile_uris.get("SV")
     fm_list[4].profile = profile_uris.get("GL")
-    if cgmes_model.cgmes_version == CGMESVersions.v2_4_15:  # if 2.4 than no need in SV in 3.0 we need all
+    if cgmes_model.cgmes_version == CGMESVersions.v2_4_15 and len(mas_names) > 1:
+        # if 2.4 than no need in SV in 3.0 we need all
         fm_list[3].modelingAuthoritySet = None
 
     # DependentOn