GridCalEngine 5.3.40__tar.gz → 5.3.42__tar.gz

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/Compilers/circuit_to_gslv.py

@@ -15,7 +15,7 @@ from GridCalEngine.Utils.ThirdParty.gslv.gslv_activation import (pg, build_statu
                                                                  GSLV_AVAILABLE, GSLV_VERSION,
                                                                  GSLV_RECOMMENDED_VERSION)
 from GridCalEngine.DataStructures.branch_parent_data import BranchParentData
-from GridCalEngine.basic_structures import IntVec, Vec
+from GridCalEngine.basic_structures import IntVec, Vec, ConvergenceReport
 from GridCalEngine.Devices.profile import Profile
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 import GridCalEngine.Devices as dev
@@ -2381,14 +2381,14 @@ def translate_gslv_pf_results(grid: MultiCircuit, res: "pg.PowerFlowResults", lo
     """
     results = PowerFlowResults(
         n=grid.get_bus_number(),
-        m=grid.get_branch_number_wo_hvdc(),
+        m=grid.get_branch_number(add_switch=True, add_vsc=False, add_hvdc=False),
         n_hvdc=grid.get_hvdc_number(),
         n_vsc=grid.get_vsc_number(),
         n_gen=grid.get_generators_number(),
         n_batt=grid.get_batteries_number(),
         n_sh=grid.get_shunt_like_device_number(),
         bus_names=grid.get_bus_names(),
-        branch_names=grid.get_branch_names(add_switch=True),
+        branch_names=grid.get_branch_names(add_switch=True, add_vsc=False, add_hvdc=False),
         hvdc_names=grid.get_hvdc_names(),
         vsc_names=grid.get_vsc_names(),
         gen_names=grid.get_generator_names(),
@@ -2427,10 +2427,18 @@ def translate_gslv_pf_results(grid: MultiCircuit, res: "pg.PowerFlowResults", lo
     results.battery_q = res.battery_q[0, :]
     results.shunt_q = res.shunt_q[0, :]
 
+    report = ConvergenceReport()
+    report.add(method=SolverType.NR,
+               error=res.error_values[0],
+               elapsed=res.elapsed,
+               iterations=0,
+               converged=res.converged_values[0])
+
+    results.convergence_reports.append(report)
     # logger.add_info("gslv time", value=res.time_array[0])
 
-    # results.bus_area_indices = grid.get_bus_area_indices()
-    # results.area_names = [a.name for a in grid.areas]
+    results.bus_area_indices = grid.get_bus_area_indices()
+    results.area_names = [a.name for a in grid.areas]
     # results.bus_types = convert_bus_types(res.bus_types[0])  # this is a list of lists
 
     # for rep in res.stats[0]:

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/Devices/Branches/line.py

@@ -455,6 +455,12 @@ class Line(BranchParent):
         """
 
         if isinstance(obj, OverheadLineType):
+            if not obj.is_computed():
+                obj.compute()
+                if not obj.is_computed():
+                    return
+            else:
+                pass
 
             template_vn = obj.Vnom
             vn = self.get_max_bus_nominal_voltage()

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/Devices/Branches/overhead_line_type.py

@@ -247,7 +247,7 @@ class OverheadLineType(EditableDevice):
         self.wires_in_tower: ListOfWires = ListOfWires()
 
         # nominal voltage
-        self.Vnom = Vnom  # kV
+        self._Vnom = Vnom  # kV
 
         self.earth_resistivity = earth_resistivity  # ohm/m3
 
@@ -277,6 +277,14 @@ class OverheadLineType(EditableDevice):
         self.register(key='wires_in_tower', units='', tpe=SubObjectType.ListOfWires,
                       definition='List of wires', editable=False, display=False)
 
+    @property
+    def Vnom(self) -> float:
+        return self._Vnom
+
+    @Vnom.setter
+    def Vnom(self, val: float):
+        self._Vnom = float(val)
+
     @property
     def n_circuits(self) -> int:
         """
@@ -420,6 +428,28 @@ class OverheadLineType(EditableDevice):
             # there are no wires
             pass
 
+    def is_computed(self) -> bool:
+
+        """
+
+        return: Boolean that tells if the template has already been computed or not
+
+        """
+
+        ok = True
+        ok = ok and self.z_abc is not None
+        ok = ok and self.z_seq is not None
+        ok = ok and self.z_abcn is not None
+        ok = ok and self.z_phases_abc is not None
+        ok = ok and self.z_phases_abcn is not None
+        ok = ok and self.y_abc is not None
+        ok = ok and self.y_seq is not None
+        ok = ok and self.y_abcn is not None
+        ok = ok and self.y_phases_abc is not None
+        ok = ok and self.y_phases_abcn is not None
+
+        return ok
+
     def check(self, logger=Logger()):
         """
         Check that the wires configuration make sense

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/Devices/Injections/load.py

@@ -65,6 +65,9 @@ class Load(LoadParent):
         self._Ir_prof = Profile(default_value=self.Ir, data_type=float)
         self._Ii_prof = Profile(default_value=self.Ii, data_type=float)
 
+        self._n_customers: int = 1
+        self._n_customers_prof = Profile(default_value=self._n_customers, data_type=int)
+
         self.register(key='Ir', units='MW', tpe=float,
                       definition='Active power of the current component at V=1.0 p.u.', profile_name='Ir_prof')
         self.register(key='Ii', units='MVAr', tpe=float,
@@ -73,6 +76,8 @@ class Load(LoadParent):
                       definition='Active power of the impedance component at V=1.0 p.u.', profile_name='G_prof')
         self.register(key='B', units='MVAr', tpe=float,
                       definition='Reactive power of the impedance component at V=1.0 p.u.', profile_name='B_prof')
+        self.register(key='n_customers', units='unit', tpe=int,
+                      definition='Number of customers represented by this load', profile_name='n_customers_prof')
 
     @property
     def Ir_prof(self) -> Profile:
@@ -142,6 +147,45 @@ class Load(LoadParent):
         else:
             raise Exception(str(type(val)) + 'not supported to be set into a B_prof')
 
+    @property
+    def n_customers(self) -> int:
+        """
+        Return the number of customers
+        """
+        return self._n_customers
+
+    @n_customers.setter
+    def n_customers(self, val: int):
+        """
+        Set the number of customers
+        :param val: value greater than 0
+        """
+        try:
+            val2 = int(val)
+            if val2 > 0:
+                self._n_customers = val2
+            else:
+                print("There must be at least one customer right?")
+        except ValueError as e:
+            print(e)
+
+    @property
+    def n_customers_prof(self) -> Profile:
+        """
+        Cost profile
+        :return: Profile
+        """
+        return self._n_customers_prof
+
+    @n_customers_prof.setter
+    def n_customers_prof(self, val: Union[Profile, np.ndarray]):
+        if isinstance(val, Profile):
+            self._n_customers_prof = val
+        elif isinstance(val, np.ndarray):
+            self._n_customers_prof.set(arr=val)
+        else:
+            raise Exception(str(type(val)) + 'not supported to be set into n_customers_prof')
+
     def plot_profiles(self, time=None, show_fig=True):
         """
         Plot the time series results of this object

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/Devices/Parents/generator_parent.py

@@ -79,7 +79,7 @@ class GeneratorParent(InjectionParent):
 
         self.control_cn = control_cn
 
-        self.P = float(P)
+        self._P = float(P)
         self._P_prof = Profile(default_value=self.P, data_type=float)
 
         # Maximum dispatched power in MW
@@ -109,6 +109,25 @@ class GeneratorParent(InjectionParent):
                       definition='Is the unit available for SRAP participation?',
                       editable=True, profile_name="srap_enabled_prof")
 
+    @property
+    def P(self)->float:
+        """
+        Get the active power value
+        :return: float
+        """
+        return self._P
+
+    @P.setter
+    def P(self, val: float):
+        """
+        Set active power value
+        :param val: some float
+        """
+        try:
+            self._P = float(val)
+        except ValueError:
+            print("The value you're trying to set into P is not a float :(")
+
     @property
     def control_bus_prof(self) -> Profile:
         """

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/Devices/assets.py

@@ -401,6 +401,13 @@ class Assets:
         """
         self._time_profile = pd.to_datetime(arr, unit='s')
 
+    def get_time_deltas_in_hours(self):
+        """
+        Get the time increments in hours
+        :return: array of time deltas where the first delta is 1
+        """
+        return np.r_[1.0, np.diff(self.get_unix_time() / 3600)]
+
     def get_time_profile_as_list(self):
         """
         Get the profiles dictionary

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/Devices/multi_circuit.py

@@ -1112,7 +1112,7 @@ class MultiCircuit(Assets):
 
     def get_inter_buses_branches(self, a1: Set[dev.Bus], a2: Set[dev.Bus]) -> List[Tuple[int, object, float]]:
         """
-        Get the inter-buese Branches. HVDC Branches are not considered
+        Get the inter-buses Branches. HVDC Branches are not considered
         :param a1: Group of Buses 1
         :param a2: Group of Buses 1
         :return: List of (branch index, branch object, flow sense w.r.t the area exchange)

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/Devices/profile.py

@@ -227,7 +227,7 @@ class Profile:
         :param map_data: map with the data
         """
         self._is_sparse = True
-        self._sparse_array = SparseArray(data_type=self.dtype)
+        self._sparse_array = SparseArray(data_type=self.dtype, default_value=default_value)
         if map_data is None:
             self._sparse_array.create(size=size, default_value=default_value)
         else:
@@ -286,7 +286,7 @@ class Profile:
 
                 if check_type(dtype=self.dtype, value=base):
                     self._is_sparse = True
-                    self._sparse_array = SparseArray(data_type=self.dtype)
+                    self._sparse_array = SparseArray(data_type=self.dtype, default_value=base)
 
                     if most_common_count > 1:
                         if isinstance(arr, np.ndarray):
@@ -358,8 +358,7 @@ class Profile:
             if self._dense_array is None:
                 # WTF, initialize sparse
                 self._is_sparse = True
-                self._sparse_array = SparseArray(data_type=self.dtype)
-                self._sparse_array.default_value = self.default_value
+                self._sparse_array = SparseArray(data_type=self.dtype, default_value = self.default_value)
                 print("Initializing sparse when querying, this signals a mis initialization")
                 return self.default_value
             else:
@@ -451,7 +450,7 @@ class Profile:
         self.default_value = value
         self._is_sparse = True
         if self._sparse_array is None:
-            self._sparse_array = SparseArray(data_type=self.dtype)
+            self._sparse_array = SparseArray(data_type=self.dtype, default_value=value)
         self._sparse_array.fill(value)
         self._dense_array = None
 

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/IO/cim/cgmes/base.py

@@ -178,27 +178,31 @@ class Base:
         """
         return True
 
-    def add_reference(self, obj, attr_name):
+    def add_reference(self, obj, attr_name, logger: DataLogger):
         """
         Adds a categorized reference to this object
         :param obj:
         :param attr_name:
+        :param logger:
         :return:
         """
-        if obj.tpe in self.references_to_me:
-            self.references_to_me[obj.tpe].add(obj)
-        else:
-            self.references_to_me[obj.tpe] = {obj}
-        if attr_name is None:
-            return
-        current_value = getattr(self, attr_name)
-
-        if current_value is None:
-            setattr(self, attr_name, obj)
-        elif isinstance(current_value, list):
-            current_value.append(obj)
+        if hasattr(self, attr_name):
+            if obj.tpe in self.references_to_me:
+                self.references_to_me[obj.tpe].add(obj)
+            else:
+                self.references_to_me[obj.tpe] = {obj}
+            if attr_name is None:
+                return
+            current_value = getattr(self, attr_name)
+
+            if current_value is None:
+                setattr(self, attr_name, obj)
+            elif isinstance(current_value, list):
+                current_value.append(obj)
+            else:
+                setattr(self, attr_name, [current_value, obj])
         else:
-            setattr(self, attr_name, [current_value, obj])
+            logger.add_error("Cannot add reference", device_class=self.tpe, device_property=attr_name)
 
 
     def register_property(self, name: str,

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/IO/cim/cgmes/cgmes_assets/cgmes_3_0_0_assets.py

@@ -23,6 +23,7 @@ from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.busbar_section import Busba
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.bus_name_marker import BusNameMarker
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.caes_plant import CAESPlant
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.clamp import Clamp
+from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.full_model import FullModel
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.cogeneration_plant import CogenerationPlant
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.combined_cycle_plant import CombinedCyclePlant
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.conducting_equipment import ConductingEquipment
@@ -343,6 +344,7 @@ class Cgmes_3_0_0_Assets:
             'CoordinateSystem': CoordinateSystem,
             'Location': Location,
             'PositionPoint': PositionPoint,
+            'FullModel': FullModel,
         }
 
         self.association_inverse_dict = {
@@ -734,3 +736,4 @@ class Cgmes_3_0_0_Assets:
         self.CoordinateSystem_list: List[CoordinateSystem] = list()
         self.Location_list: List[Location] = list()
         self.PositionPoint_list: List[PositionPoint] = list()
+        self.FullModel_list: List[FullModel] = list()

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/IO/cim/cgmes/cgmes_circuit.py

@@ -125,7 +125,7 @@ def find_references(elements_by_type: Dict[str, List[Base]],
                                                                property_name=property_name,
                                                                association_inverse_dict=association_inverse_dict)
                                 if ref_attribute is not None:
-                                    referenced_object.add_reference(element, ref_attribute)
+                                    referenced_object.add_reference(element, ref_attribute, logger=logger)
 
                             else:
 
@@ -175,7 +175,7 @@ def find_references(elements_by_type: Dict[str, List[Base]],
                                                                    property_name=property_name,
                                                                    association_inverse_dict=association_inverse_dict)
                                     if ref_attribute is not None:
-                                        referenced_object.add_reference(element, ref_attribute)
+                                        referenced_object.add_reference(element, ref_attribute, logger=logger)
 
                                 else:
 

{gridcalengine-5.3.40 → gridcalengine-5.3.42}/GridCalEngine/IO/cim/cgmes/cgmes_create_instances.py

@@ -398,16 +398,18 @@ def create_cgmes_tap_changer_control(
     tcc.targetDeadband = 0.5
     tcc.targetValueUnitMultiplier = UnitMultiplier.k
     tcc.enabled = tcc_enabled
-    voltage = get_voltage_terminal(tcc.Terminal, logger)
-    tcc.targetValue = mc_trafo.vset * voltage
+    voltage: float | None = get_voltage_terminal(tcc.Terminal, logger)
 
-    # TODO consider other control types
-    # if mc_trafo.tap_module_control_mode ...:
-    #     tcc.targetValue = mc_trafo.Pset
-    # tcc.RegulatingCondEq not required .?
-    # control_cn.Vnom ?
+    if voltage is not None:
+        tcc.targetValue = mc_trafo.vset * voltage
 
-    cgmes_model.add(tcc)
+        # TODO consider other control types
+        # if mc_trafo.tap_module_control_mode ...:
+        #     tcc.targetValue = mc_trafo.Pset
+        # tcc.RegulatingCondEq not required .?
+        # control_cn.Vnom ?
+
+        cgmes_model.add(tcc)
 
     return tcc
 
@@ -433,24 +435,26 @@ def create_cgmes_current_limit(terminal,
     curr_lim.shortName = f'CL-1'
     curr_lim.description = f'Ratings for element {terminal.ConductingEquipment.name} - Limit'
 
-    voltage = get_voltage_terminal(terminal, logger)
-    sqrt_3 = 1.73205080756888
-    current_rate = rate_mw * 1e3 / (voltage * sqrt_3)
-    current_rate = np.round(current_rate, 4)
+    voltage: float | None = get_voltage_terminal(terminal, logger)
 
-    curr_lim.value = current_rate  # Current rate in Amps
+    if voltage is not None:
+        sqrt_3 = 1.73205080756888
+        current_rate = rate_mw * 1e3 / (voltage * sqrt_3)
+        current_rate = np.round(current_rate, 4)
 
-    op_lim_set_1 = create_operational_limit_set(terminal, cgmes_model, logger)
-    if op_lim_set_1 is not None:
-        curr_lim.OperationalLimitSet = op_lim_set_1
-    else:
-        logger.add_error(msg='No operational limit created',
-                         device=op_lim_set_1,
-                         comment="create_cgmes_current_limit")
+        curr_lim.value = current_rate  # Current rate in Amps
+
+        op_lim_set_1 = create_operational_limit_set(terminal, cgmes_model, logger)
+        if op_lim_set_1 is not None:
+            curr_lim.OperationalLimitSet = op_lim_set_1
+        else:
+            logger.add_error(msg='No operational limit created',
+                             device=op_lim_set_1,
+                             comment="create_cgmes_current_limit")
 
-    curr_lim.OperationalLimitType = op_limit_type
+        curr_lim.OperationalLimitType = op_limit_type
 
-    cgmes_model.add(curr_lim)
+        cgmes_model.add(curr_lim)
     return