GridCalEngine 5.3.35__tar.gz → 5.3.37__tar.gz

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/Compilers/circuit_to_data.py

@@ -69,7 +69,7 @@ def set_bus_control_voltage(i: int,
     """
     if bus_data.bus_types[i] != BusMode.Slack_tpe.value:  # if it is not Slack
         if remote_control and j > -1 and j != i:
-            # remove voltage control
+            # delete voltage control
             # bus_data.bus_types[j] = BusMode.PQV_tpe.value  # remote bus to PQV type
             bus_data.set_bus_mode(j, BusMode.PQV_tpe)
             # bus_data.bus_types[i] = BusMode.P_tpe.value  # local bus to P type
@@ -120,7 +120,7 @@ def set_bus_control_voltage_vsc(i: int,
     """
     if bus_data.bus_types[i] != BusMode.Slack_tpe.value:  # if it is not Slack
         if remote_control and j > -1 and j != i:
-            # remove voltage control
+            # delete voltage control
             # bus_data.bus_types[j] = BusMode.PQV_tpe.value  # remote bus to PQV type
             # bus_data.set_bus_mode(j, BusMode.PQV_tpe)
             bus_data.is_p_controlled[j] = True
@@ -1437,7 +1437,6 @@ def set_control_dev(k: int,
                     control_bus_idx: IntVec,
                     control_branch_idx: IntVec,
                     bus_dict: Dict[Bus, int],
-                    branch_dict: Dict[BRANCH_TYPES, int],
                     bus_data: BusData,
                     bus_voltage_used: BoolVec,
                     use_stored_guess: bool,
@@ -1592,7 +1591,6 @@ def get_vsc_data(
                             control_bus_idx=data.control1_bus_idx,
                             control_branch_idx=data.control1_branch_idx,
                             bus_dict=bus_dict,
-                            branch_dict=branch_dict,
                             bus_data=bus_data,
                             bus_voltage_used=bus_voltage_used,
                             use_stored_guess=use_stored_guess,
@@ -1604,7 +1602,6 @@ def get_vsc_data(
                             control_bus_idx=data.control2_bus_idx,
                             control_branch_idx=data.control2_branch_idx,
                             bus_dict=bus_dict,
-                            branch_dict=branch_dict,
                             bus_data=bus_data,
                             bus_voltage_used=bus_voltage_used,
                             use_stored_guess=use_stored_guess,
@@ -1629,7 +1626,6 @@ def get_vsc_data(
                             control_bus_idx=data.control1_bus_idx,
                             control_branch_idx=data.control1_branch_idx,
                             bus_dict=bus_dict,
-                            branch_dict=branch_dict,
                             bus_data=bus_data,
                             bus_voltage_used=bus_voltage_used,
                             use_stored_guess=use_stored_guess,
@@ -1642,7 +1638,6 @@ def get_vsc_data(
                             control_bus_idx=data.control2_bus_idx,
                             control_branch_idx=data.control2_branch_idx,
                             bus_dict=bus_dict,
-                            branch_dict=branch_dict,
                             bus_data=bus_data,
                             bus_voltage_used=bus_voltage_used,
                             use_stored_guess=use_stored_guess,
@@ -2188,4 +2183,8 @@ def compile_numerical_circuit_at(circuit: MultiCircuit,
     nc.bus_dict = bus_dict
     nc.consolidate_information()
 
+    if nc.active_branch_data.any_pf_control is False:
+        if nc.vsc_data.nelm > 0:
+            nc.active_branch_data.any_pf_control = True
+
     return nc

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/Compilers/circuit_to_gslv.py

@@ -31,7 +31,7 @@ if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCalEngine.Simulations.ContingencyAnalysis.contingency_analysis_options import ContingencyAnalysisOptions
     from GridCalEngine.Simulations.ContingencyAnalysis.contingency_analysis_results import ContingencyAnalysisResults
 
-GSLV_RECOMMENDED_VERSION = "0.1.1"
+GSLV_RECOMMENDED_VERSION = "0.2.0"
 GSLV_VERSION = ''
 GSLV_AVAILABLE = False
 try:

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/DataStructures/bus_data.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.  
 # SPDX-License-Identifier: MPL-2.0
-
+from typing import Dict
 import numpy as np
 from GridCalEngine.basic_structures import CxVec, Vec, IntVec, BoolVec, StrVec
 from GridCalEngine.enumerations import BusMode
@@ -140,6 +140,15 @@ class BusData:
 
         return data
 
+    def get_original_to_island_bus_dict(self) -> Dict[int, int]:
+        """
+        Dictionary that relates the original bus index to the island bus index
+        :return: dict[original idx] -> island index
+        """
+        return {
+            int(val): idx for idx, val in enumerate(self.original_idx)
+        }
+
     def set_bus_mode(self, idx: int, val: BusMode):
         """
         Set bus mode

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/DataStructures/numerical_circuit.py

@@ -134,6 +134,7 @@ def build_branches_C_coo_2(bus_active: IntVec,
     data = np.empty(nelm * 2, dtype=np.int64)
 
     ii = 0
+    br_count = 0
 
     for k in range(len(F1)):
         if active1[k]:
@@ -141,16 +142,17 @@ def build_branches_C_coo_2(bus_active: IntVec,
             t = T1[k]
             if bus_active[f] and bus_active[t]:
                 # C[k, f] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = f
                 data[ii] = 1
                 ii += 1
 
                 # C[k, t] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = t
                 data[ii] = 1
                 ii += 1
+        br_count += 1
 
     for k in range(len(F2)):
         if active2[k]:
@@ -158,16 +160,17 @@ def build_branches_C_coo_2(bus_active: IntVec,
             t = T2[k]
             if bus_active[f] and bus_active[t]:
                 # C[k, f] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = f
                 data[ii] = 1
                 ii += 1
 
                 # C[k, t] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = t
                 data[ii] = 1
                 ii += 1
+        br_count += 1
 
     return i[:ii], j[:ii], data[:ii], nelm
 
@@ -209,6 +212,7 @@ def build_branches_C_coo_3(bus_active: IntVec,
     data = np.empty(nelm * 2, dtype=np.int64)
 
     ii = 0
+    br_count = 0
 
     for k in range(len(F1)):
         if active1[k]:
@@ -216,16 +220,17 @@ def build_branches_C_coo_3(bus_active: IntVec,
             t = T1[k]
             if bus_active[f] and bus_active[t]:
                 # C[k, f] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = f
                 data[ii] = 1
                 ii += 1
 
                 # C[k, t] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = t
                 data[ii] = 1
                 ii += 1
+        br_count += 1
 
     for k in range(len(F2)):
         if active2[k]:
@@ -233,16 +238,17 @@ def build_branches_C_coo_3(bus_active: IntVec,
             t = T2[k]
             if bus_active[f] and bus_active[t]:
                 # C[k, f] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = f
                 data[ii] = 1
                 ii += 1
 
                 # C[k, t] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = t
                 data[ii] = 1
                 ii += 1
+        br_count += 1
 
     for k in range(len(F3)):
         if active3[k]:
@@ -250,16 +256,17 @@ def build_branches_C_coo_3(bus_active: IntVec,
             t = T3[k]
             if bus_active[f] and bus_active[t]:
                 # C[k, f] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = f
                 data[ii] = 1
                 ii += 1
 
                 # C[k, t] = 1
-                i[ii] = k
+                i[ii] = br_count
                 j[ii] = t
                 data[ii] = 1
                 ii += 1
+        br_count += 1
 
     return i[:ii], j[:ii], data[:ii], nelm
 
@@ -558,13 +565,6 @@ class NumericalCircuit:
         self.nbatt = len(self.battery_data)
         self.nshunt = len(self.shunt_data)
 
-        # self.bus_data.installed_power = self.generator_data.get_installed_power_per_bus()
-        # self.bus_data.installed_power += self.battery_data.get_installed_power_per_bus()
-
-        if self.active_branch_data.any_pf_control is False:
-            if self.vsc_data.nelm > 0:
-                self.active_branch_data.any_pf_control = True
-
     def copy(self) -> "NumericalCircuit":
         """
         Deep copy of ths object

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/DataStructures/passive_branch_data.py

@@ -45,8 +45,6 @@ class PassiveBranchData(BranchParentData):
         self.m_taps = SparseObjectArray(n=self.nelm)
         self.tau_taps = SparseObjectArray(n=self.nelm)
 
-        self.k: Vec = np.ones(nelm, dtype=float)
-
         self.virtual_tap_t: Vec = np.ones(self.nelm, dtype=float)
         self.virtual_tap_f: Vec = np.ones(self.nelm, dtype=float)
 
@@ -92,8 +90,6 @@ class PassiveBranchData(BranchParentData):
         data.m_taps = self.m_taps.slice(elm_idx)
         data.tau_taps = self.tau_taps.slice(elm_idx)
 
-        data.k = self.k[elm_idx]
-
         data.virtual_tap_f = self.virtual_tap_f[elm_idx]
         data.virtual_tap_t = self.virtual_tap_t[elm_idx]
 
@@ -125,7 +121,6 @@ class PassiveBranchData(BranchParentData):
         data.conn = self.conn.copy()  # winding connection
         data.m_taps = self.m_taps.copy()
         data.tau_taps = self.tau_taps.copy()
-        data.k = self.k.copy()
 
         data.virtual_tap_f = self.virtual_tap_f.copy()
         data.virtual_tap_t = self.virtual_tap_t.copy()

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/Devices/Branches/line.py

@@ -195,7 +195,8 @@ class Line(BranchParent):
                                  'for transformers0% for lines.')
 
         self.register(key='circuit_idx', units='', tpe=int,
-                      definition='Circuit index, used for multiple circuits sharing towers (starts at zero)')
+                      definition='Circuit index, used for multiple circuits sharing towers (starts at zero)',
+                      editable=False)
 
         self.register(key='length', units='km', tpe=float, definition='Length of the line (not used for calculation)')
         self.register(key='temp_base', units='ºC', tpe=float, definition='Base temperature at which R was measured.')
@@ -307,9 +308,31 @@ class Line(BranchParent):
 
     @circuit_idx.setter
     def circuit_idx(self, value):
-        if value >= 0:
+        if value > 0:
             self._circuit_idx = int(value)
 
+            if self.auto_update_enabled:
+                print("No impedance updates are being done, use the apply_template method to update the impedance values")
+
+
+    def set_circuit_idx(self, val: int, obj: Union[OverheadLineType, UndergroundLineType, SequenceLineType]):
+        """
+        Set the circuit_idx with additional behavior based on the is_user_action flag. Ensure that the template exists and is valid.
+        :param value: The value to set
+        """
+        # If the user is setting the circuit index, ensure that the template exists and is valid
+        if obj is None:
+            raise Exception("Template must be set before changing the circuit index.")
+        if not isinstance(obj, (OverheadLineType, UndergroundLineType, SequenceLineType)):
+            raise Exception("Invalid template type. Must be OverheadLineType, UndergroundLineType, or SequenceLineType.")
+        if val >= obj.n_circuits:
+            raise Exception("Circuit index exceeds the number of circuits in the template.")
+        if val <= 0:
+            raise Exception("Circuit index must be greater than 0.")
+        else:
+            if val > 0:
+                self._circuit_idx = int(val)
+
     @property
     def length(self) -> float:
         """

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/Devices/Branches/overhead_line_type.py

@@ -59,7 +59,7 @@ class WireInTower:
 
         self._phase: int = phase
 
-        self.circuit_index: int = 0
+        self.circuit_index: int = 1
 
         self.phase_type: str = ""
 
@@ -94,7 +94,7 @@ class WireInTower:
         if phase == 0:
             self._phase = phase
             self.phase_type = "N"
-            self.circuit_index = 0
+            self.circuit_index = 1
 
         elif (phase - 1) % 3 == 0:
             self._phase = phase
@@ -345,7 +345,7 @@ class OverheadLineType(EditableDevice):
     def get_ys(self, circuit_idx: int, Sbase: float, length: float, Vnom: float):
         """
         get the series admittance matrix in p.u. (total)
-        :param circuit_idx: Circuit index (starting by 0)
+        :param circuit_idx: Circuit index (starting by 1)
         :param Sbase: Base power (MVA)
         :param length: Line length (km)
         :param Vnom: Nominal voltage (kV)
@@ -353,7 +353,7 @@ class OverheadLineType(EditableDevice):
         """
         Zbase = (Vnom * Vnom) / Sbase
 
-        k = (3 * circuit_idx) + np.array([0, 1, 2])
+        k = (3 * (circuit_idx - 1)) + np.array([0, 1, 2])
         z = self.z_abc[np.ix_(k, k)] * length / Zbase
         y = np.linalg.inv(z)
         return y
@@ -361,7 +361,7 @@ class OverheadLineType(EditableDevice):
     def get_ysh(self, circuit_idx: int, Sbase: float, length: float, Vnom: float):
         """
         get the shunt admittance matrix in p.u. (total)
-        :param circuit_idx: Circuit index (starting by 0)
+        :param circuit_idx: Circuit index (starting by 1)
         :param Sbase: Base power (MVA)
         :param length: Line length (km)
         :param Vnom: Nominal voltage (kV)
@@ -369,7 +369,7 @@ class OverheadLineType(EditableDevice):
         """
         Zbase = (Vnom * Vnom) / Sbase
         Ybase = 1 / Zbase
-        k = (3 * circuit_idx) + np.array([0, 1, 2])
+        k = (3 * (circuit_idx - 1)) + np.array([0, 1, 2])
         y = self.y_abc[np.ix_(k, k)] * length * -1e6 / Ybase
         return y
 
@@ -533,17 +533,17 @@ class OverheadLineType(EditableDevice):
     def get_sequence_values(self, circuit_idx: int, seq: int = 1):
         """
         Get the positive sequence values R1 [Ohm], X1[Ohm] and Bsh1 [S].
-        :param circuit_idx: Circuit indexation (starts at 0)
+        :param circuit_idx: Circuit indexation (starts at 1)
         :param seq: Sequence number (0, 1, 2)
         :return: R1 [Ohm], X1[Ohm] and Bsh1 [S]
         """
         self.compute()
         if self.z_seq is not None and self.y_seq is not None:
-            a1 = 3 * circuit_idx + seq
+            a1 = 3 * (circuit_idx - 1) + seq
             R1 = self.z_seq[a1, a1].real
             X1 = self.z_seq[a1, a1].imag
             Bsh1 = self.y_seq[a1, a1].imag * 1e6
-            I_kA = self.Imax[circuit_idx]
+            I_kA = self.Imax[circuit_idx - 1]
             return R1, X1, Bsh1, I_kA
         else:
             warn(f"{self.name} tower is incorrect :(")
@@ -564,12 +564,12 @@ class OverheadLineType(EditableDevice):
         Zbase = (Vn * Vn) / Sbase
         Ybase = 1 / Zbase
 
-        a0 = 3 * circuit_index
+        a0 = 3 * (circuit_index - 1)
         R0 = self.z_seq[a0, a0].real
         X0 = self.z_seq[a0, a0].imag
         Bsh0 = self.y_seq[a0, a0].imag * 1e6
 
-        a1 = 3 * circuit_index + 1
+        a1 = 3 * (circuit_index - 1) + 1
         R1 = self.z_seq[a1, a1].real
         X1 = self.z_seq[a1, a1].imag
         Bsh1 = self.y_seq[a1, a1].imag * 1e6
@@ -602,7 +602,7 @@ class OverheadLineType(EditableDevice):
         y2 = 1j * Bsh0 * length * 1e-6 / Ybase
 
         # get the rating in MVA = kA * kV
-        rate = self.Imax[circuit_index] * Vn * np.sqrt(3)
+        rate = self.Imax[circuit_index - 1] * Vn * np.sqrt(3)
 
         return R1, X1, B1, R0, X0, B0, rate
 
@@ -674,7 +674,7 @@ def kron_reduction(mat, keep, embed):
     Perform the Kron reduction
     :param mat: primitive matrix
     :param keep: indices to keep
-    :param embed: indices to remove / embed
+    :param embed: indices to delete / embed
     :return:
     """
     Zaa = mat[np.ix_(keep, keep)]
@@ -700,7 +700,7 @@ def wire_bundling(phases_set: List[int], primitive: Mat, phases_vector: IntVec):
 
         if len(wires_indices) > 1:
 
-            # get the first wire and remove it from the wires list
+            # get the first wire and delete it from the wires list
             i = wires_indices[0]
 
             # wires to keep

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/Devices/Branches/vsc.py

@@ -32,7 +32,6 @@ class VSC(BranchParent):
                  active=True,
                  rate=1e-9,
                  kdp=-0.05,
-                 k=1.0,
                  alpha1=0.0001,
                  alpha2=0.015,
                  alpha3=0.2,

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/Devices/Diagrams/base_diagram.py

@@ -160,6 +160,7 @@ class BaseDiagram:
         self._min_bus_width: float = min_bus_width
         self._max_bus_width: float = max_bus_width
         self._arrow_size: float = arrow_size
+        self._use_api_colors: bool = False
 
         self._palette = palette
         self._default_bus_voltage: float = default_bus_voltage
@@ -267,6 +268,14 @@ class BaseDiagram:
     def default_bus_voltage(self, value: float):
         self._default_bus_voltage = value
 
+    @property
+    def use_api_colors(self) -> bool:
+        return self._use_api_colors
+
+    @use_api_colors.setter
+    def use_api_colors(self, value: bool):
+        self._use_api_colors = value
+
     def set_point(self, device: ALL_DEV_TYPES, location: Union[GraphicLocation, MapLocation]):
         """
 
@@ -286,7 +295,7 @@ class BaseDiagram:
             group.set_point(device, location)
             self.data[str(device.device_type.value)] = group
         else:
-            # the category does exists, add point
+            # the category does exist, add point
             d.set_point(device, location)  # the category, exists, just add
 
     def delete_device(self, device: ALL_DEV_TYPES) -> Union[object, None]:
@@ -300,7 +309,7 @@ class BaseDiagram:
             d = self.data.get(str(device.device_type.value), None)
 
             if d:
-                # the category does exist, delete from it
+                # the category does exist, delete_with_dialogue from it
                 return d.delete_device(device=device)
             else:
                 # not found so we're ok
@@ -350,7 +359,7 @@ class BaseDiagram:
                 "min_bus_width": self.min_bus_width,
                 "max_bus_width": self.max_bus_width,
                 "arrow_size": self.arrow_size,
-
+                "use_api_colors": self.use_api_colors,
                 "palette": self.palette.value,
                 "default_bus_voltage": self.default_bus_voltage,
                 'data': data}
@@ -377,6 +386,7 @@ class BaseDiagram:
         self.arrow_size: float = data.get("arrow_size", 1)
         self.palette = Colormaps(data.get("palette", 'GridCal'))
         self.default_bus_voltage = data.get("default_bus_voltage", 10)
+        self.use_api_colors = data.get("use_api_colors", False)
 
         if data['type'] == 'bus-branch':
             self.diagram_type = DiagramType.Schematic

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/Devices/Parents/editable_device.py

@@ -637,7 +637,7 @@ class EditableDevice:
                 # return the normal property
                 return getattr(self, prop.name)
 
-    def set_vaule(self, prop: GCProp, t_idx: Union[None, int], value: Any) -> None:
+    def set_value(self, prop: GCProp, t_idx: Union[None, int], value: Any) -> None:
         """
         Return value regardless of the property index
         :param prop: GCProp

{gridcalengine-5.3.35 → gridcalengine-5.3.37}/GridCalEngine/Devices/Substation/connectivity_node.py

@@ -13,14 +13,17 @@ from GridCalEngine.enumerations import DeviceType
 
 class ConnectivityNode(PhysicalDevice):
 
-    def __init__(self, name='CN',
+    def __init__(self,
+                 name='CN',
                  idtag=None,
                  code='',
                  dc: bool = False,
                  default_bus: Union[None, Bus] = None,
                  voltage_level: Union[VoltageLevel, None] = None,
                  internal: bool = False,
-                 Vnom: float = 10.0):
+                 Vnom: float = 10.0,
+                 xpos=0,
+                 ypos=0):
         """
         Constructor
         :param name: Name of the connectivity node
@@ -31,6 +34,8 @@ class ConnectivityNode(PhysicalDevice):
         :param voltage_level: Substation of this connectivity node (optional)
         :param internal: Is internal?
         :param Vnom: Nominal voltage in kV
+        :param xpos: x position in px
+        :param ypos: y position in px
         """
         PhysicalDevice.__init__(self,
                                 name=name,
@@ -50,6 +55,9 @@ class ConnectivityNode(PhysicalDevice):
 
         self.Vnom = float(Vnom) if voltage_level is None else voltage_level.Vnom
 
+        self.x = float(xpos)
+        self.y = float(ypos)
+
         self.register(key='Vnom', units='kV', tpe=float, definition='Nominal line voltage of the cn.')
 
         self.register(key="dc", tpe=bool, definition="is this a DC connectivity node?")
@@ -63,6 +71,11 @@ class ConnectivityNode(PhysicalDevice):
         self.register(key="voltage_level", tpe=DeviceType.VoltageLevelDevice,
                       definition="Voltage level of this connectivity node (optional)")
 
+        self.register(key='x', units='px', tpe=float, definition='x position in pixels.', profile_name='',
+                      editable=False)
+        self.register(key='y', units='px', tpe=float, definition='y position in pixels.', profile_name='',
+                      editable=False)
+
     @property
     def bus(self) -> Bus:
         """