GridCalEngine 5.3.36__tar.gz → 5.3.37__tar.gz

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

@@ -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.36 → 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.36 → 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.36 → 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.36 → gridcalengine-5.3.37}/GridCalEngine/Simulations/Derivatives/csc_derivatives.py

@@ -1505,7 +1505,7 @@ def dSt_dbeq_csc(sf_indices, beq_indices) -> CxCSC:
 
 
 @njit()
-def dLossvsc_dVm_csc(nvsc, nbus, i_u_vm, alpha1, alpha2, alpha3, V, Pf, Pt, Qt, F, T) -> CSC:
+def dLossvsc_dVm_csc(nvsc, nbus, i_u_vm, alpha2, alpha3, Vm, Pt, Qt, T) -> CSC:
     """
         pq = Pt[ig_plossacdc] * Pt[ig_plossacdc] + Qt[ig_plossacdc] * Qt[ig_plossacdc]
         pq_sqrt = np.sqrt(pq)
@@ -1530,14 +1530,11 @@ def dLossvsc_dVm_csc(nvsc, nbus, i_u_vm, alpha1, alpha2, alpha3, V, Pf, Pt, Qt,
 
         if j_lookup[t] >= 0:
 
-            Vm_t = np.abs(V[t])
+            Vm_t = Vm[t]
             pq = Pt[kidx] * Pt[kidx] + Qt[kidx] * Qt[kidx]
-            pq_sqrt = np.sqrt(pq)
-            pq_sqrt += 1e-20
-
-            dLossvsc_dVmt = alpha2[kidx] * pq_sqrt / (Vm_t * Vm_t) + 2 * alpha3[kidx] * pq / (Vm_t * Vm_t * Vm_t)
+            pq_sqrt = np.sqrt(pq) + 1e-20
 
-            Tx[nnz] = - dLossvsc_dVmt
+            Tx[nnz] = - (alpha2[kidx] * pq_sqrt / (Vm_t * Vm_t) + 2 * alpha3[kidx] * pq / (Vm_t * Vm_t * Vm_t))
             Ti[nnz] = kidx
             Tj[nnz] = j_lookup[t]
             nnz += 1
@@ -1549,7 +1546,8 @@ def dLossvsc_dVm_csc(nvsc, nbus, i_u_vm, alpha1, alpha2, alpha3, V, Pf, Pt, Qt,
 
 
 @njit()
-def dLosshvdc_dVm_csc(nhvdc, nbus, i_u_vm, V, Pf_hvdc, hvdc_r, F_hvdc):
+def dLosshvdc_dVm_csc(nhvdc: int, nbus: int, i_u_vm: IntVec, Vm: Vec, Pf_hvdc: Vec,
+                      hvdc_r: Vec, F_hvdc: IntVec):
     """
     dLosshvdc = rpu * Pf_hvdc / Vm[F_hvdc]**2 - Pf_hvdc - Pt_hvdc
     """
@@ -1569,7 +1567,7 @@ def dLosshvdc_dVm_csc(nhvdc, nbus, i_u_vm, V, Pf_hvdc, hvdc_r, F_hvdc):
 
         if j_lookup[f] >= 0:
 
-            Vm_f = np.abs(V[f])
+            Vm_f = Vm[f]
             dLosshvdc_dVmf = - 2 * hvdc_r[kidx] * Pf_hvdc[kidx] / (Vm_f * Vm_f * Vm_f)
 
             Tx[nnz] = dLosshvdc_dVmf
@@ -1584,7 +1582,7 @@ def dLosshvdc_dVm_csc(nhvdc, nbus, i_u_vm, V, Pf_hvdc, hvdc_r, F_hvdc):
 
 
 @njit()
-def dLosshvdc_dPfhvdc_csc(nhvdc, V, hvdc_r, F_hvdc):
+def dLosshvdc_dPfhvdc_csc(nhvdc, Vm, hvdc_r, F_hvdc):
     """
     dLosshvdc = rpu * Pf_hvdc / Vm[F_hvdc]**2 - Pf_hvdc - Pt_hvdc
     """
@@ -1599,7 +1597,7 @@ def dLosshvdc_dPfhvdc_csc(nhvdc, V, hvdc_r, F_hvdc):
 
     for kidx in range(nhvdc):
         f = F_hvdc[kidx]
-        Vm_f = np.abs(V[f])
+        Vm_f =Vm[f]
         dLosshvdc_dPfhvdc = hvdc_r[kidx] / (Vm_f * Vm_f) - 1
 
         Tx[nnz] = dLosshvdc_dPfhvdc
@@ -1706,7 +1704,7 @@ def dLossvsc_dPfvsc_csc(nvsc, u_vsc_pf) -> CSC:
 
 
 @njit()
-def dLossvsc_dPtvsc_csc(nvsc, u_vsc_pt, alpha2, alpha3, V, Pt, Qt, T_vsc) -> CSC:
+def dLossvsc_dPtvsc_csc(nvsc, u_vsc_pt, alpha2, alpha3, Vm, Pt, Qt, T_vsc) -> CSC:
     """
     Compute the sparse matrix for the derivative of loss with respect to Pt in CSC format.
 
@@ -1730,16 +1728,13 @@ def dLossvsc_dPtvsc_csc(nvsc, u_vsc_pt, alpha2, alpha3, V, Pt, Qt, T_vsc) -> CSC
     Ti = np.empty(max_nnz, dtype=np.int32)
     Tj = np.empty(max_nnz, dtype=np.int32)
 
-    j_lookup = make_lookup(len(u_vsc_pt), u_vsc_pt)
-
     nnz = 0  # Counter for non-zero entries
-    Vm = np.abs(V)
 
     for k, vsc in enumerate(u_vsc_pt):
         t = T_vsc[vsc]
         Vm_t = Vm[t]
-        val = alpha2[vsc] / Vm_t * 1 / np.sqrt(Pt[vsc] * Pt[vsc] + Qt[vsc] * Qt[vsc] + 1e-20) * Pt[vsc] + 2 * alpha3[
-            vsc] * Pt[vsc] / (Vm_t * Vm_t) - 1
+        val = (alpha2[vsc] / Vm_t * 1 / np.sqrt(Pt[vsc] * Pt[vsc] + Qt[vsc] * Qt[vsc] + 1e-20) * Pt[vsc]
+               + 2 * alpha3[vsc] * Pt[vsc] / (Vm_t * Vm_t) - 1)
 
         # Populate COO format arrays
         Tx[nnz] = val
@@ -1754,7 +1749,7 @@ def dLossvsc_dPtvsc_csc(nvsc, u_vsc_pt, alpha2, alpha3, V, Pt, Qt, T_vsc) -> CSC
 
 
 @njit()
-def dLossvsc_dQtvsc_csc(nvsc, u_vsc_qt, alpha2, alpha3, V, Pt, Qt, T_vsc) -> CSC:
+def dLossvsc_dQtvsc_csc(nvsc, u_vsc_qt, alpha2, alpha3, Vm, Pt, Qt, T_vsc) -> CSC:
     """
     Compute the sparse matrix for the derivative of loss with respect to Qt in CSC format.
 
@@ -1778,16 +1773,13 @@ def dLossvsc_dQtvsc_csc(nvsc, u_vsc_qt, alpha2, alpha3, V, Pt, Qt, T_vsc) -> CSC
     Ti = np.empty(max_nnz, dtype=np.int32)
     Tj = np.empty(max_nnz, dtype=np.int32)
 
-    j_lookup = make_lookup(len(u_vsc_qt), u_vsc_qt)
-
     nnz = 0  # Counter for non-zero entries
-    Vm = np.abs(V)
 
     for k, vsc in enumerate(u_vsc_qt):
         t = T_vsc[vsc]
         Vm_t = Vm[t]
-        val = alpha2[vsc] / Vm_t * 1 / np.sqrt(Pt[vsc] * Pt[vsc] + Qt[vsc] * Qt[vsc] + 1e-20) * Qt[vsc] + 2 * alpha3[
-            vsc] * Qt[vsc] / (Vm_t * Vm_t)
+        val = (alpha2[vsc] / Vm_t * 1 / np.sqrt(Pt[vsc] * Pt[vsc] + Qt[vsc] * Qt[vsc] + 1e-20) * Qt[vsc]
+               + 2 * alpha3[vsc] * Qt[vsc] / (Vm_t * Vm_t))
 
         # Populate COO format arrays
         Tx[nnz] = val
@@ -1843,21 +1835,21 @@ def dP_dPfvsc_csc(i_k_p, u_vsc_pf, F_vsc) -> CSC:
 
 
 @njit()
-def dPQ_dPQft_csc(nbus, nvsc, i_k_pq, u_dev_pq, FT_dev) -> CSC:
+def dPQ_dPQft_csc(nbus: int, nvsc: int, i_k_pq: IntVec, u_dev_pq: IntVec, FT_dev: IntVec) -> CSC:
     """
     Calculate the derivatives of the power balance with respect to injections of branches
     The method works for vscs and transformers without loss of generality
 
     :param i_k_pq: Indices for the rows corresponding to the power injections.
     :param u_dev_pq: Column indices for the sparse matrix.
-    :param FT_dev: From or bus indices.
+    :param FT_dev: From or To bus indices.
     :return: Sparse matrix in CSC format.
     """
     n_cols = len(u_dev_pq)  # Number of columns (length of u_vsc_pf).
     n_rows = len(i_k_pq)  # Number of rows (equal to nbus).
     max_nnz = len(u_dev_pq)  # Maximum number of non-zero entries.
 
-    mat = CxCSC(n_rows, n_cols, max_nnz, False)
+    mat = CSC(n_rows, n_cols, max_nnz, False)
     Tx = np.empty(max_nnz, dtype=np.float64)
     Ti = np.empty(max_nnz, dtype=np.int32)
     Tj = np.empty(max_nnz, dtype=np.int32)
@@ -1870,18 +1862,16 @@ def dPQ_dPQft_csc(nbus, nvsc, i_k_pq, u_dev_pq, FT_dev) -> CSC:
     for dev_idx, dev in enumerate(u_dev_pq):
         f_bus = FT_dev[dev]
 
-        if j_lookup[f_bus] >= 0:
-        # if f_bus in i_k_p_set:
-        # if vsc_lookup[dev] >= 0:
-            Tx[nnz] = 1.0
-            Ti[nnz] = j_lookup[f_bus]
-            Tj[nnz] = vsc_lookup[dev]
-            nnz += 1
+        # if j_lookup[f_bus] >= 0: # this is always evaluated to true
+        Tx[nnz] = 1.0
+        Ti[nnz] = j_lookup[f_bus]
+        Tj[nnz] = vsc_lookup[dev]
+        nnz += 1
 
     # Convert to CSC
     mat.fill_from_coo(Ti, Tj, Tx, nnz)
 
-    return mat.real
+    return mat
 
 
 @njit()

{gridcalengine-5.3.36 → gridcalengine-5.3.37}/GridCalEngine/Simulations/OPF/linear_opf_ts.py

@@ -723,7 +723,10 @@ def add_linear_generation_formulation(t: Union[int, None],
     else:
         id_gen_nonvd = []
 
-    year = time_array[t].year - time_array[0].year
+    if len(time_array) > 0:
+        year = time_array[t].year - time_array[0].year
+    else:
+        year = 0
 
     # add generation stuff
     for k in range(gen_data_t.nelm):

{gridcalengine-5.3.36 → gridcalengine-5.3.37}/GridCalEngine/Simulations/PowerFlow/Formulations/pf_advanced_formulation.py

@@ -418,7 +418,6 @@ class PfAdvancedFormulation(PfFormulationTemplate):
             conn=self.nc.passive_branch_data.conn,
             seq=1,
             add_windings_phase=False,
-            verbose=self.options.verbose,
         )
 
         # compute the complex voltage
@@ -482,8 +481,7 @@ class PfAdvancedFormulation(PfFormulationTemplate):
             Yshunt_bus=self.nc.get_Yshunt_bus_pu(),
             conn=self.nc.passive_branch_data.conn,
             seq=1,
-            add_windings_phase=False,
-            verbose=self.options.verbose,
+            add_windings_phase=False
         )
 
         # compute the complex voltage