GridCalEngine 5.3.38__tar.gz → 5.3.39__tar.gz

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/Compilers/circuit_to_gslv.py

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MPL-2.0
 from __future__ import annotations
 import os.path
+import time
 import warnings
 import numpy as np
 from typing import List, Dict, Union, Tuple, TYPE_CHECKING
@@ -23,7 +24,7 @@ from GridCalEngine.Simulations.PowerFlow.power_flow_results import PowerFlowResu
 from GridCalEngine.DataStructures.numerical_circuit import NumericalCircuit
 
 from GridCalEngine.IO.file_system import get_create_gridcal_folder
-from GridCalEngine.basic_structures import ConvergenceReport
+from GridCalEngine.basic_structures import ConvergenceReport, Logger
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCalEngine.Simulations.OPF.opf_results import OptimalPowerFlowResults
@@ -188,8 +189,6 @@ def fill_profile(gslv_profile: "pg.Profiledouble|pg.Profilebool|pg.Profileint|pg
     :param default_val: Default value
     """
 
-
-
     if use_time_series:
         if gc_profile.is_sparse:
             if time_indices is None:
@@ -2418,7 +2417,8 @@ def gslv_pf(circuit: MultiCircuit,
             pf_opt: PowerFlowOptions,
             time_series: bool = False,
             time_indices: Union[IntVec, None] = None,
-            opf_results: Union[None, OptimalPowerFlowResults] = None) -> "pg.PowerFlowResults":
+            opf_results: Union[None, OptimalPowerFlowResults] = None,
+            logger: Logger = Logger()) -> "pg.PowerFlowResults":
     """
     GSLV power flow
     :param circuit: MultiCircuit instance
@@ -2449,19 +2449,23 @@ def gslv_pf(circuit: MultiCircuit,
         time_indices = [0]
         n_threads = 1
 
+    t0 = time.time()
     pf_res = pg.multi_island_pf(grid=gslv_grid,
                                 options=pf_options,
                                 time_indices=time_indices,
                                 n_threads=n_threads)
 
+    logger.add_info("gslv time", value=f"{(time.time() - t0)} s")
+
     return pf_res
 
 
-def translate_gslv_pf_results(grid: MultiCircuit, res: "pg.PowerFlowResults") -> PowerFlowResults:
+def translate_gslv_pf_results(grid: MultiCircuit, res: "pg.PowerFlowResults", logger: Logger) -> PowerFlowResults:
     """
     Translate the GSLV Power Analytics results back to GridCal
     :param grid: MultiCircuit instance
     :param res: GSLV's PowerFlowResults instance
+    :param logger: Logger
     :return: PowerFlowResults instance
     """
     results = PowerFlowResults(
@@ -2502,6 +2506,14 @@ def translate_gslv_pf_results(grid: MultiCircuit, res: "pg.PowerFlowResults") ->
     results.Pt_hvdc = res.Pt_hvdc[0, :]
     results.loading_hvdc = res.loading_hvdc[0, :]
     results.losses_hvdc = res.losses_hvdc[0, :]
+
+    results.Pf_vsc = res.Pf_vsc[0, :]
+    results.St_vsc = res.St_vsc[0, :]
+    results.loading_vsc = res.loading_vsc[0, :]
+    results.losses_vsc = res.losses_vsc[0, :]
+
+    # 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_types = convert_bus_types(res.bus_types[0])  # this is a list of lists
@@ -2657,8 +2669,8 @@ def compare_branch_parent_data(gslv_branch_data: pg.BranchParentData,
     # branch data
     errors += CheckArrEq(np.array(gslv_branch_data.idtag), np.array(gc_branch_data.idtag), parent_name, 'idtag')
     errors += CheckArrEq(gslv_branch_data.F, gc_branch_data.F, parent_name, 'F')
-    errors += CheckArrEq(gslv_branch_data.T, gc_branch_data.T,  parent_name, 'T')
-    errors += CheckArrEq(gslv_branch_data.active, gc_branch_data.active,  parent_name, 'active')
+    errors += CheckArrEq(gslv_branch_data.T, gc_branch_data.T, parent_name, 'T')
+    errors += CheckArrEq(gslv_branch_data.active, gc_branch_data.active, parent_name, 'active')
     errors += CheckArr(gslv_branch_data.rates, gc_branch_data.rates, tol, parent_name, 'rates')
 
     errors += CheckArr(gslv_branch_data.contingency_rates, gc_branch_data.contingency_rates, tol,
@@ -2671,14 +2683,14 @@ def compare_branch_parent_data(gslv_branch_data: pg.BranchParentData,
     errors += CheckArr(gslv_branch_data.mttr, gc_branch_data.mttr, tol, parent_name, 'mttr')
 
     errors += CheckArrEq(gslv_branch_data.contingency_enabled, gc_branch_data.contingency_enabled,
-                       parent_name, 'contingency_enabled')
+                         parent_name, 'contingency_enabled')
     errors += CheckArrEq(gslv_branch_data.monitor_loading, gc_branch_data.monitor_loading,
-                       parent_name, 'monitor_loading')
+                         parent_name, 'monitor_loading')
 
     errors += CheckArr(gslv_branch_data.overload_cost, gc_branch_data.overload_cost, tol,
                        parent_name, 'overload_cost')
     errors += CheckArrEq(gslv_branch_data.original_idx, gc_branch_data.original_idx,
-                       parent_name, 'original_idx')
+                         parent_name, 'original_idx')
     # errors += CheckArr(gslv_branch_data.reducible, gc_branch_data.reducible, tol, parent_name, 'reducible')
 
     return errors
@@ -2695,7 +2707,7 @@ def compare_nc(nc_gslv: "pg.NumericalCircuit", nc_gc: NumericalCircuit, tol: flo
     errors = 0
 
     # bus data
-    errors += CheckArrEq(nc_gslv.bus_data.active, nc_gc.bus_data.active,  'BusData', 'active')
+    errors += CheckArrEq(nc_gslv.bus_data.active, nc_gc.bus_data.active, 'BusData', 'active')
     errors += CheckArr(nc_gslv.bus_data.Vbus.real, nc_gc.bus_data.Vbus.real, tol, 'BusData', 'V0')
     errors += CheckArr(nc_gslv.bus_data.installed_power, nc_gc.bus_data.installed_power, tol,
                        'BusData', 'installed power')
@@ -2736,14 +2748,14 @@ def compare_nc(nc_gslv: "pg.NumericalCircuit", nc_gc: NumericalCircuit, tol: flo
     errors += CheckArr(nc_gslv.vsc_data.control1_val, nc_gc.vsc_data.control1_val, tol, 'VscData', 'control1_val')
     errors += CheckArr(nc_gslv.vsc_data.control2_val, nc_gc.vsc_data.control2_val, tol, 'VscData', 'control2_val')
 
-    errors += CheckArrEq(nc_gslv.vsc_data.control1_bus_idx, nc_gc.vsc_data.control1_bus_idx,  'VscData',
-                       'control1_bus_idx')
-    errors += CheckArrEq(nc_gslv.vsc_data.control2_bus_idx, nc_gc.vsc_data.control2_bus_idx,  'VscData',
-                       'control2_bus_idx')
-    errors += CheckArrEq(nc_gslv.vsc_data.control1_branch_idx, nc_gc.vsc_data.control1_branch_idx,  'VscData',
-                       'control1_branch_idx')
-    errors += CheckArrEq(nc_gslv.vsc_data.control2_branch_idx, nc_gc.vsc_data.control2_branch_idx,  'VscData',
-                       'control2_branch_idx')
+    errors += CheckArrEq(nc_gslv.vsc_data.control1_bus_idx, nc_gc.vsc_data.control1_bus_idx, 'VscData',
+                         'control1_bus_idx')
+    errors += CheckArrEq(nc_gslv.vsc_data.control2_bus_idx, nc_gc.vsc_data.control2_bus_idx, 'VscData',
+                         'control2_bus_idx')
+    errors += CheckArrEq(nc_gslv.vsc_data.control1_branch_idx, nc_gc.vsc_data.control1_branch_idx, 'VscData',
+                         'control1_branch_idx')
+    errors += CheckArrEq(nc_gslv.vsc_data.control2_branch_idx, nc_gc.vsc_data.control2_branch_idx, 'VscData',
+                         'control2_branch_idx')
 
     # HVDC data
     errors += compare_branch_parent_data(nc_gslv.hvdc_data, nc_gc.hvdc_data, tol, "HvdcData")
@@ -2768,8 +2780,8 @@ def compare_nc(nc_gslv: "pg.NumericalCircuit", nc_gc: NumericalCircuit, tol: flo
     errors += CheckArr(nc_gslv.hvdc_data.Qmax_t, nc_gc.hvdc_data.Qmax_t, tol, 'HvdcData', 'Qmax_t')
 
     # generator data
-    errors += CheckArrEq(nc_gslv.generator_data.bus_idx, nc_gc.generator_data.bus_idx,  'GenData', 'bus_idx')
-    errors += CheckArrEq(nc_gslv.generator_data.active, nc_gc.generator_data.active,  'GenData', 'active')
+    errors += CheckArrEq(nc_gslv.generator_data.bus_idx, nc_gc.generator_data.bus_idx, 'GenData', 'bus_idx')
+    errors += CheckArrEq(nc_gslv.generator_data.active, nc_gc.generator_data.active, 'GenData', 'active')
     errors += CheckArr(nc_gslv.generator_data.p, nc_gc.generator_data.p, tol, 'GenData', 'P')
     errors += CheckArr(nc_gslv.generator_data.pf, nc_gc.generator_data.pf, tol, 'GenData', 'Pf')
     errors += CheckArr(nc_gslv.generator_data.v, nc_gc.generator_data.v, tol, 'GenData', 'v')

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/Devices/Branches/line.py

@@ -325,8 +325,9 @@ class Line(BranchParent):
             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 and isinstance(obj, OverheadLineType):
-            raise Exception("Circuit index exceeds the number of circuits in the template.")
+        if isinstance(obj, OverheadLineType):
+            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:

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/Devices/Branches/wire.py

@@ -13,7 +13,8 @@ class Wire(EditableDevice):
     to compose towers
     """
 
-    def __init__(self, name='', idtag: Union[str, None] = None,
+    def __init__(self, name='',
+                 idtag: Union[str, None] = None,
                  r: float = 0.01,
                  max_current: float = 1.0,
                  stranding: str = "",

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/Devices/Parents/editable_device.py

@@ -83,6 +83,23 @@ def parse_idtag(val: Union[str, None]) -> str:
         return str(val)
 
 
+def smart_compare(a, b, atol = 1.e-10):
+    """
+    Compares two Python objects with tolerance for numerical values.
+
+    If both inputs are numeric (int, float, complex, or NumPy numbers),
+    the function uses `np.isclose()` to compare them. For all other types, it falls back to
+    standard equality comparison (`==`).
+
+    a :First object to compare.
+    b :Second object to compare.
+    :return: bool
+    """
+    if isinstance(a, float) and isinstance(b, float):
+        return np.isclose(a, b, atol=atol)
+    return a == b
+
+
 class GCProp:
     """
     GridCal property
@@ -879,7 +896,7 @@ class EditableDevice:
             v1 = self.get_property_value(prop=prop, t_idx=None)
             v2 = other.get_property_value(prop=prop, t_idx=None)
 
-            if v1 != v2:
+            if not smart_compare(v1, v2):
                 logger.add_info(msg="Different snapshot values",
                                 device_class=self.device_type.value,
                                 device_property=prop.name,
@@ -907,7 +924,7 @@ class EditableDevice:
                         v1 = p1[t_idx]
                         v2 = p2[t_idx]
 
-                        if v1 != v2:
+                        if not smart_compare(v1, v2):
                             logger.add_info(msg="Different time series values",
                                             device_class=self.device_type.value,
                                             device_property=prop.name,
@@ -919,7 +936,7 @@ class EditableDevice:
                         v1b = self.get_property_value(prop=prop, t_idx=t_idx)
                         v2b = other.get_property_value(prop=prop, t_idx=t_idx)
 
-                        if v1 != v1b:
+                        if not smart_compare(v1, v1b):
                             logger.add_info(
                                 msg="Profile values differ with different getter methods!",
                                 device_class=self.device_type.value,
@@ -929,7 +946,7 @@ class EditableDevice:
                                 expected_value=v1)
                             action = ActionType.Modify
 
-                        if v2 != v2b:
+                        if not smart_compare(v2, v2b):
                             logger.add_info(
                                 msg="Profile getting values differ with different getter methods!",
                                 device_class=self.device_type.value,

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/Simulations/ContingencyAnalysis/contingency_analysis_driver.py

@@ -167,14 +167,25 @@ class ContingencyAnalysisDriver(DriverTemplate):
 
         elif self.engine == EngineType.GSLV:
 
-            self.report_text("Running contingencies in newton...")
+            self.report_text("Running contingencies in gslv...")
             con_res = gslv_contingencies(circuit=self.grid,
                                          con_opt=self.options,
                                          time_series=False,
                                          time_indices=None)
 
-            self.results = translate_newton_pa_contingencies(grid=self.grid,
-                                                             con_res=con_res)
+            self.results = ContingencyAnalysisResults(
+                ncon=self.grid.get_contingency_groups_number(),
+                nbus=self.grid.get_bus_number(),
+                nbr=self.grid.get_branch_number_wo_hvdc(),
+                bus_names=self.grid.get_bus_names(),
+                branch_names=self.grid.get_branch_names_wo_hvdc(),
+                bus_types=np.ones(self.grid.get_bus_number(), dtype=int),
+                con_names=np.array(self.grid.get_contingency_group_names())
+            )
+
+            # results.S[t, :] = res_t.S.real.max(axis=0)
+            self.results.max_flows = con_res.max_values.Sf[0, :]
+            self.results.max_loading = con_res.max_values.loading[0, :]
 
         return self.results
 

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/Simulations/ContingencyAnalysis/contingency_analysis_ts_driver.py

@@ -237,7 +237,7 @@ class ContingencyAnalysisTimeSeriesDriver(TimeSeriesDriverTemplate):
             self.results = self.run_newton_pa()
 
         elif self.engine == EngineType.GSLV:
-            self.report_text('Running gslv... ')
+            self.report_text('Running contingencies in gslv... ')
             self.results = self.run_gslv()
 
         else:

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/Simulations/PowerFlow/power_flow_driver.py

@@ -172,9 +172,9 @@ class PowerFlowDriver(DriverTemplate):
 
         elif self.engine == EngineType.GSLV:
 
-            res = gslv_pf(circuit=self.grid, pf_opt=self.options, time_series=False)
+            res = gslv_pf(circuit=self.grid, pf_opt=self.options, time_series=False, logger=self.logger)
 
-            self.results = translate_gslv_pf_results(self.grid, res)
+            self.results = translate_gslv_pf_results(self.grid, res=res, logger=self.logger)
             self.results.area_names = [a.name for a in self.grid.areas]
             self.convergence_reports = self.results.convergence_reports
 

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/Simulations/PowerFlow/power_flow_ts_driver.py

@@ -204,7 +204,8 @@ class PowerFlowTimeSeriesDriver(TimeSeriesDriverTemplate):
                       pf_opt=self.options,
                       time_series=True,
                       time_indices=time_indices,
-                      opf_results=self.opf_time_series_results)
+                      opf_results=self.opf_time_series_results,
+                      logger=self.logger)
 
         n = self.grid.get_bus_number()
         results = PowerFlowTimeSeriesResults(n=self.grid.get_bus_number(),
@@ -251,6 +252,11 @@ class PowerFlowTimeSeriesDriver(TimeSeriesDriverTemplate):
         results.hvdc_losses = res.losses_hvdc
         results.error_values = res.error_values
 
+        results.Pf_vsc = res.Pf_vsc
+        results.St_vsc = res.St_vsc
+        results.loading_vsc = res.loading_vsc
+        results.losses_vsc = res.losses_vsc
+
         return results
 
     def run(self):

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/GridCalEngine/__version__.py

@@ -6,7 +6,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.3.38"
+__GridCalEngine_VERSION__ = "5.3.39"
 
 url = 'https://github.com/SanPen/GridCal'
 

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.3.38
+Version: 5.3.39
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.

{gridcalengine-5.3.38 → gridcalengine-5.3.39}/setup.py

@@ -56,7 +56,7 @@ package_data = {'GridCalEngine': ['LICENSE.txt', 'setup.py'], }
 
 dependencies = ['setuptools>=41.0.1',
                 'wheel>=0.37.2',
-                "numpy<=2.0.0",
+                "numpy>=2.2.0",
                 "autograd>=1.7.0",
                 "scipy>=1.0.0",
                 "networkx>=2.1",
@@ -71,7 +71,7 @@ dependencies = ['setuptools>=41.0.1',
                 "geopy>=1.16",
                 "pytest>=7.2",
                 "h5py>=3.12.0",
-                "numba>=0.60",  # to compile routines natively
+                "numba>=0.61",  # to compile routines natively
                 'pyproj',
                 'pyarrow>=15',
                 "windpowerlib>=0.2.2",