GridCal 5.2.13__tar.gz → 5.3.0a1__tar.gz

{gridcal-5.2.13 → gridcal-5.3.0a1}/GridCal/Gui/AboutDialogue/about_dialogue.py

@@ -9,9 +9,9 @@ import subprocess
 from PySide6 import QtWidgets
 from typing import List
 from GridCal.Gui.AboutDialogue.gui import Ui_AboutDialog
-from GridCal.__version__ import __GridCal_VERSION__, contributors_msg, copyright_msg
+from GridCal.__version__ import __GridCal_VERSION__
 from GridCal.update import check_version, get_upgrade_command
-from GridCalEngine.__version__ import __GridCalEngine_VERSION__
+from GridCalEngine.__version__ import __GridCalEngine_VERSION__, copyright_msg, contributors_msg
 from GridCalEngine.Compilers.circuit_to_newton_pa import (NEWTON_PA_AVAILABLE,
                                                           NEWTON_PA_RECOMMENDED_VERSION,
                                                           NEWTON_PA_VERSION)

{gridcal-5.2.13 → gridcal-5.3.0a1}/GridCal/Gui/Analysis/object_plot_analysis.py

@@ -24,7 +24,7 @@ from GridCalEngine.enumerations import DeviceType
 from GridCalEngine.Devices.types import ALL_DEV_TYPES
 from GridCalEngine.Utils.NumericalMethods.numerical_stability import (sparse_instability_svd_test,
                                                                       sparse_instability_lu_test)
-from GridCalEngine.DataStructures.numerical_circuit import compile_numerical_circuit_at
+from GridCalEngine.Compilers.circuit_to_data import compile_numerical_circuit_at
 
 
 class GridErrorLog:

{gridcal-5.2.13 → gridcal-5.3.0a1}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -985,9 +985,14 @@ class GridMapWidget(BaseDiagramWidget):
                        hvdc_loading: Vec = None,
                        hvdc_active: IntVec = None,
                        loading_label: str = 'loading',
+                       vsc_Pf: Vec = None,
+                       vsc_Pt: Vec = None,
+                       vsc_Qt: Vec = None,
+                       vsc_losses: Vec = None,
+                       vsc_loading: Vec = None,
+                       vsc_active: IntVec = None,
                        ma: Vec = None,
                        theta: Vec = None,
-                       Beq: Vec = None,
                        fluid_node_p2x_flow: Vec = None,
                        fluid_node_current_level: Vec = None,
                        fluid_node_spillage: Vec = None,
@@ -1017,10 +1022,15 @@ class GridMapWidget(BaseDiagramWidget):
         :param hvdc_losses: HVDC branch losses [MW]
         :param hvdc_loading: HVDC Branch loading [%]
         :param hvdc_active: HVDC Branch status
+        :param vsc_Pf: VSC branch flows "from" [MW]
+        :param vsc_Pt: VSC branch flows "to" [MW]
+        :param vsc_Qt: VSC branch flows "to" [Mvar]
+        :param vsc_losses: VSC branch losses [MW]
+        :param vsc_loading: VSC Branch loading [%]
+        :param vsc_active: VSC Branch status
         :param loading_label: String saling whatever the loading label means
         :param ma: branch phase shift angle (rad)
         :param theta: branch tap module (p.u.)
-        :param Beq: Branch equivanet susceptance (p.u.)
         :param fluid_node_p2x_flow: P2X flow rate (m3)
         :param fluid_node_current_level: Current level (m3)
         :param fluid_node_spillage: Spillage (m3)

{gridcal-5.2.13 → gridcal-5.3.0a1}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -3304,9 +3304,14 @@ class SchematicWidget(BaseDiagramWidget):
                        hvdc_loading: Vec = None,
                        hvdc_active: IntVec = None,
                        loading_label: str = 'loading',
+                       vsc_Pf: Vec = None,
+                       vsc_Pt: Vec = None,
+                       vsc_Qt: Vec = None,
+                       vsc_losses: Vec = None,
+                       vsc_loading: Vec = None,
+                       vsc_active: IntVec = None,
                        ma: Vec = None,
                        theta: Vec = None,
-                       Beq: Vec = None,
                        fluid_node_p2x_flow: Vec = None,
                        fluid_node_current_level: Vec = None,
                        fluid_node_spillage: Vec = None,
@@ -3336,10 +3341,15 @@ class SchematicWidget(BaseDiagramWidget):
         :param hvdc_losses: HVDC branch losses [MW]
         :param hvdc_loading: HVDC Branch loading [%]
         :param hvdc_active: HVDC Branch status
+        :param vsc_Pf: VSC branch flows "from" [MW]
+        :param vsc_Pt: VSC branch flows "to" [MW]
+        :param vsc_Qt: VSC branch flows "to" [Mvar]
+        :param vsc_losses: VSC branch losses [MW]
+        :param vsc_loading: VSC Branch loading [%]
+        :param vsc_active: VSC Branch status
         :param loading_label: String saling whatever the loading label means
         :param ma: branch phase shift angle (rad)
         :param theta: branch tap module (p.u.)
-        :param Beq: Branch equivanet susceptance (p.u.)
         :param fluid_node_p2x_flow: P2X flow rate (m3)
         :param fluid_node_current_level: Current level (m3)
         :param fluid_node_spillage: Spillage (m3)
@@ -3446,8 +3456,8 @@ class SchematicWidget(BaseDiagramWidget):
                 else:
                     Sfnorm = Sfabs
 
-                if self.circuit.get_branch_number_wo_hvdc() == len(Sf):
-                    for i, branch in enumerate(self.circuit.get_branches_wo_hvdc_iter()):
+                if self.circuit.get_branch_number_wo_vsc_hvdc() == len(Sf):
+                    for i, branch in enumerate(self.circuit.get_branches_wo_vsc_hvdc_iter()):
 
                         # try to find the diagram object of the DB object
                         graphic_object = self.graphics_manager.query(branch)
@@ -3503,15 +3513,15 @@ class SchematicWidget(BaseDiagramWidget):
                                     if theta is not None:
                                         tooltip += '\ntap angle:\t' + "{:10.4f}".format(theta[i]) + ' rad'
 
-                                if branch.device_type == DeviceType.VscDevice:
-                                    if ma is not None:
-                                        tooltip += '\ntap module:\t' + "{:10.4f}".format(ma[i])
-
-                                    if theta is not None:
-                                        tooltip += '\nfiring angle:\t' + "{:10.4f}".format(theta[i]) + ' rad'
+                                # if branch.device_type == DeviceType.VscDevice:
+                                #     if ma is not None:
+                                #         tooltip += '\ntap module:\t' + "{:10.4f}".format(ma[i])
+                                #
+                                #     if theta is not None:
+                                #         tooltip += '\nfiring angle:\t' + "{:10.4f}".format(theta[i]) + ' rad'
 
-                                    if Beq is not None:
-                                        tooltip += '\nBeq:\t' + "{:10.4f}".format(Beq[i])
+                                    # if Beq is not None:
+                                    #     tooltip += '\nBeq:\t' + "{:10.4f}".format(Beq[i])
 
                                 graphic_object.setToolTipText(tooltip)
                                 graphic_object.set_colour(color, w, style)
@@ -3531,9 +3541,85 @@ class SchematicWidget(BaseDiagramWidget):
                             pass
                 else:
                     error_msg("Branch results length differs from the number of branch results. \n"
-                              "Did you change the numbe rof devices? If so, re-run the simulation.")
+                              "Did you change the number of devices? If so, re-run the simulation.")
                     return
 
+        # VSC lines
+        if vsc_Pf is not None:
+
+            vsc_sending_power_norm = np.abs(vsc_Pt + 1j * vsc_Qt) / (max_flow + 1e-20)
+
+            if self.circuit.get_vsc_number() == len(vsc_Pf):
+                for i, elm in enumerate(self.circuit.vsc_devices):
+
+                    # try to find the diagram object of the DB object
+                    graphic_object = self.graphics_manager.query(elm)
+
+                    if graphic_object:
+
+                        if vsc_active[i]:
+
+                            if use_flow_based_width:
+                                w = int(np.floor(
+                                    min_branch_width + vsc_sending_power_norm[i] * (
+                                            max_branch_width - min_branch_width)))
+                            else:
+                                w = graphic_object.pen_width
+
+                            if elm.active:
+                                style = Qt.PenStyle.SolidLine
+
+                                a = 1
+                                if cmap == palettes.Colormaps.Green2Red:
+                                    b, g, r = palettes.green_to_red_bgr(abs(vsc_loading[i]))
+
+                                elif cmap == palettes.Colormaps.Heatmap:
+                                    b, g, r = palettes.heatmap_palette_bgr(abs(vsc_loading[i]))
+
+                                elif cmap == palettes.Colormaps.TSO:
+                                    b, g, r = palettes.tso_line_palette_bgr(elm.get_max_bus_nominal_voltage(),
+                                                                            abs(vsc_loading[i]))
+
+                                else:
+                                    r, g, b, a = loading_cmap(abs(vsc_loading[i]))
+                                    r *= 255
+                                    g *= 255
+                                    b *= 255
+                                    a *= 255
+
+                                color = QColor(r, g, b, a)
+                            else:
+                                style = Qt.PenStyle.DashLine
+                                color = QColor(115, 115, 115, 255)  # gray
+
+                            tooltip = str(i) + ': ' + elm.name
+                            tooltip += '\n' + loading_label + ': ' + "{:10.4f}".format(
+                                abs(vsc_loading[i]) * 100) + ' [%]'
+
+                            tooltip += '\nPower (from):\t' + "{:10.4f}".format(vsc_Pf[i]) + ' [MW]'
+
+                            if vsc_losses is not None:
+                                tooltip += '\nPower (to):\t' + "{:10.4f}".format(vsc_Pt[i]) + ' [MW]'
+                                tooltip += '\nPower (to):\t' + "{:10.4f}".format(vsc_Qt[i]) + ' [Mvar]'
+                                tooltip += '\nLosses: \t\t' + "{:10.4f}".format(vsc_losses[i]) + ' [MW]'
+                                graphic_object.set_arrows_with_power(Sf=vsc_Pf[i] + 1j * 0.0, St=vsc_Pt[i] + 1j * vsc_Qt[i])
+                            else:
+                                graphic_object.set_arrows_with_power(Sf=vsc_Pf[i] + 1j * 0.0, St=-vsc_Pf[i] + 1j * vsc_Qt[i])
+
+                            graphic_object.setToolTipText(tooltip)
+                            graphic_object.set_colour(color, w, style)
+                        else:
+                            w = graphic_object.pen_width
+                            style = Qt.PenStyle.DashLine
+                            color = QColor(115, 115, 115, 255)  # gray
+                            graphic_object.set_pen(QPen(color, w, style))
+                    else:
+                        # No diagram object
+                        pass
+            else:
+                error_msg("VSC results length differs from the number of VSC results. \n"
+                          "Did you change the number of devices? If so, re-run the simulation.")
+
         # HVDC lines
         if hvdc_Pf is not None:
 
@@ -3607,7 +3693,7 @@ class SchematicWidget(BaseDiagramWidget):
                         pass
             else:
                 error_msg("HVDC results length differs from the number of HVDC results. \n"
-                          "Did you change the numbe rof devices? If so, re-run the simulation.")
+                          "Did you change the number of devices? If so, re-run the simulation.")
 
         # fluid paths
         if fluid_path_flow is not None:

{gridcal-5.2.13 → gridcal-5.3.0a1}/GridCal/Gui/Diagrams/base_diagram_widget.py

@@ -484,9 +484,6 @@ class BaseDiagramWidget(QSplitter):
         self.draw()
 
     def colour_results(self,
-                       buses: List[Bus],
-                       branches: List[BRANCH_TYPES],
-                       hvdc_lines: List[HvdcLine],
                        Sbus: CxVec,
                        bus_active: IntVec,
                        Sf: CxVec,
@@ -502,9 +499,21 @@ class BaseDiagramWidget(QSplitter):
                        hvdc_loading: Vec = None,
                        hvdc_active: IntVec = None,
                        loading_label: str = 'loading',
+                       vsc_Pf: Vec = None,
+                       vsc_Pt: Vec = None,
+                       vsc_Qt: Vec = None,
+                       vsc_losses: Vec = None,
+                       vsc_loading: Vec = None,
+                       vsc_active: IntVec = None,
                        ma: Vec = None,
                        theta: Vec = None,
-                       Beq: Vec = None,
+                       fluid_node_p2x_flow: Vec = None,
+                       fluid_node_current_level: Vec = None,
+                       fluid_node_spillage: Vec = None,
+                       fluid_node_flow_in: Vec = None,
+                       fluid_node_flow_out: Vec = None,
+                       fluid_path_flow: Vec = None,
+                       fluid_injection_flow: Vec = None,
                        use_flow_based_width: bool = False,
                        min_branch_width: int = 5,
                        max_branch_width=5,
@@ -513,9 +522,6 @@ class BaseDiagramWidget(QSplitter):
                        cmap: palettes.Colormaps = None):
         """
 
-        :param buses:
-        :param branches:
-        :param hvdc_lines:
         :param Sbus:
         :param bus_active:
         :param Sf:
@@ -531,15 +537,28 @@ class BaseDiagramWidget(QSplitter):
         :param hvdc_loading:
         :param hvdc_active:
         :param loading_label:
+        :param vsc_Pf:
+        :param vsc_Pt:
+        :param vsc_Qt:
+        :param vsc_losses:
+        :param vsc_loading:
+        :param vsc_active:
         :param ma:
         :param theta:
-        :param Beq:
+        :param fluid_node_p2x_flow:
+        :param fluid_node_current_level:
+        :param fluid_node_spillage:
+        :param fluid_node_flow_in:
+        :param fluid_node_flow_out:
+        :param fluid_path_flow:
+        :param fluid_injection_flow:
         :param use_flow_based_width:
         :param min_branch_width:
         :param max_branch_width:
         :param min_bus_width:
         :param max_bus_width:
         :param cmap:
+        :return:
         """
         pass
 

{gridcal-5.2.13 → gridcal-5.3.0a1}/GridCal/Gui/Main/ConsoleLog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'ConsoleLog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.6.2
+## Created by: Qt User Interface Compiler version 6.7.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -28,7 +28,7 @@ class Ui_mainWindow(object):
         mainWindow.resize(516, 327)
         mainWindow.setBaseSize(QSize(0, 0))
         icon = QIcon()
-        icon.addFile(u":/Program icon/GridCal_icon.svg", QSize(), QIcon.Normal, QIcon.Off)
+        icon.addFile(u":/Program icon/GridCal_icon.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         mainWindow.setWindowIcon(icon)
         mainWindow.setIconSize(QSize(24, 24))
         mainWindow.setDocumentMode(False)
@@ -37,7 +37,7 @@ class Ui_mainWindow(object):
         self.actionSave = QAction(mainWindow)
         self.actionSave.setObjectName(u"actionSave")
         icon1 = QIcon()
-        icon1.addFile(u":/Icons/icons/savec.svg", QSize(), QIcon.Normal, QIcon.Off)
+        icon1.addFile(u":/Icons/icons/savec.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.actionSave.setIcon(icon1)
         self.centralwidget = QWidget(mainWindow)
         self.centralwidget.setObjectName(u"centralwidget")

{gridcal-5.2.13 → gridcal-5.3.0a1}/GridCal/Gui/Main/GridCalMain.py

@@ -148,7 +148,7 @@ def runGridCal() -> None:
     h_ = 780
     window_.resize(int(1.7 * h_), h_)  # almost the golden ratio :)
     window_.show()
-    sys.exit(app.exec())
+    sys.exit(app.exec_())
 
 
 if __name__ == "__main__":