VeraGrid 5.4.7__tar.gz → 5.4.8__tar.gz

{veragrid-5.4.7 → veragrid-5.4.8}/PKG-INFO

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

{veragrid-5.4.7 → veragrid-5.4.8}/VeraGrid/Gui/Diagrams/base_diagram_widget.py

@@ -521,7 +521,7 @@ class BaseDiagramWidget(QSplitter):
                     any_plot = True
 
                 elif isinstance(results, StochasticPowerFlowResults):
-                    loading_table = results.mdl(result_type=ResultTypes.BranchLoadingAverage)
+                    loading_table = results.mdl(result_type=ResultTypes.BranchLoadingCDF)
                     loading_table.convert_to_cdf()
                     loading_table.plot_device(ax=ax_2, device_idx=i, title="Stochastic loading")
                     any_plot = True

{veragrid-5.4.7 → veragrid-5.4.8}/VeraGrid/Gui/GridReduce/grid_reduce.py

@@ -16,6 +16,8 @@ from VeraGridEngine.Devices.Substation.bus import Bus
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 from VeraGridEngine.Topology.GridReduction.di_shi_grid_reduction import di_shi_reduction
 from VeraGridEngine.Topology.GridReduction.ptdf_grid_reduction import ptdf_reduction
+from VeraGridEngine.Topology.GridReduction.ward_equivalents import ward_standard_reduction
+
 from VeraGridEngine.basic_structures import Logger
 from VeraGridEngine.enumerations import GridReductionMethod
 
@@ -27,9 +29,10 @@ class GridReduceDialogue(QtWidgets.QDialog):
 
     def __init__(self, grid: MultiCircuit, session: SimulationSession, selected_buses_set: Set[Bus]):
         """
-
-        :param grid:
-        :param session:
+        GridMergeDialogue
+        :param grid: MultiCircuit instance
+        :param session: SimulationSession instance to query the power flow
+        :param selected_buses_set: Set of buses (Bus objects) to reduce
         """
         QtWidgets.QDialog.__init__(self)
         self.ui = Ui_ReduceDialog()
@@ -39,13 +42,11 @@ class GridReduceDialogue(QtWidgets.QDialog):
         self.logger = Logger()
         self.logs_dialogue: LogsDialogue | None = None
 
-        lmdl = get_list_model(list(selected_buses_set))
-        self.ui.listView.setModel(lmdl)
+        self.ui.listView.setModel(get_list_model(list(selected_buses_set)))
 
-        methods = [GridReductionMethod.DiShi, GridReductionMethod.PTDF]
+        methods = [GridReductionMethod.DiShi, GridReductionMethod.PTDF, GridReductionMethod.Ward]
         self.methods_dict = {m.value: m for m in methods}
-        cmdl = get_list_model([m.value for m in methods])
-        self.ui.methodComboBox.setModel(cmdl)
+        self.ui.methodComboBox.setModel(get_list_model([m.value for m in methods]))
 
         self._grid: MultiCircuit = grid
         self._session: SimulationSession = session
@@ -70,6 +71,8 @@ class GridReduceDialogue(QtWidgets.QDialog):
                 title="Grid reduction?")
 
             if ok:
+
+                # convert the set of buses to bus indices
                 reduction_bus_indices = np.array([self._grid.buses.index(b) for b in self._selected_buses_set],
                                                  dtype=int)
 
@@ -82,12 +85,27 @@ class GridReduceDialogue(QtWidgets.QDialog):
                         warning_msg("Run a power flow first! or select another method", "Grid reduction")
                         return
 
+                    # NOTE: self._grid gets reduced in-place
                     grid_reduced, logger = di_shi_reduction(
                         grid=self._grid,
                         reduction_bus_indices=reduction_bus_indices,
-                        pf_res=pf_res,
-                        add_power_loads=True,
-                        use_linear=False
+                        V0=pf_res.voltage
+                    )
+
+                elif method == GridReductionMethod.Ward:
+
+                    # get the previous power flow
+                    _, pf_res = self._session.power_flow
+
+                    if pf_res is None:
+                        warning_msg("Run a power flow first! or select another method", "Grid reduction")
+                        return
+
+                    # NOTE: self._grid gets reduced in-place
+                    grid_reduced, logger = ward_standard_reduction(
+                        grid=self._grid,
+                        reduction_bus_indices=reduction_bus_indices,
+                        V0=pf_res.voltage
                     )
 
                 elif method == GridReductionMethod.PTDF:
@@ -98,7 +116,8 @@ class GridReduceDialogue(QtWidgets.QDialog):
                         warning_msg("Run a linear analysis first! or select another method", "Grid reduction")
                         return
 
-                    logger = ptdf_reduction(
+                    # NOTE: self._grid gets reduced in-place
+                    grid_reduced, logger = ptdf_reduction(
                         grid=self._grid,
                         reduction_bus_indices=reduction_bus_indices,
                         PTDF=lin_res.PTDF

{veragrid-5.4.7 → veragrid-5.4.8}/VeraGrid/Gui/Main/MainWindow.py

@@ -31,7 +31,7 @@ class Ui_mainWindow(object):
     def setupUi(self, mainWindow):
         if not mainWindow.objectName():
             mainWindow.setObjectName(u"mainWindow")
-        mainWindow.resize(1198, 742)
+        mainWindow.resize(1390, 847)
         mainWindow.setBaseSize(QSize(0, 0))
         font = QFont()
         font.setPointSize(10)
@@ -2931,52 +2931,61 @@ class Ui_mainWindow(object):
         self.groupBox.setFont(font6)
         self.gridLayout_18 = QGridLayout(self.groupBox)
         self.gridLayout_18.setObjectName(u"gridLayout_18")
+        self.opfGEPCheckBox = QCheckBox(self.groupBox)
+        self.opfGEPCheckBox.setObjectName(u"opfGEPCheckBox")
+        self.opfGEPCheckBox.setFont(font7)
+
+        self.gridLayout_18.addWidget(self.opfGEPCheckBox, 8, 0, 1, 2)
+
+        self.fixOpfCheckBox = QCheckBox(self.groupBox)
+        self.fixOpfCheckBox.setObjectName(u"fixOpfCheckBox")
+        self.fixOpfCheckBox.setFont(font7)
+
+        self.gridLayout_18.addWidget(self.fixOpfCheckBox, 9, 0, 1, 2)
+
         self.label_10 = QLabel(self.groupBox)
         self.label_10.setObjectName(u"label_10")
         self.label_10.setFont(font7)
 
         self.gridLayout_18.addWidget(self.label_10, 0, 0, 1, 1)
 
-        self.opfZonalGroupByComboBox = QComboBox(self.groupBox)
-        self.opfZonalGroupByComboBox.setObjectName(u"opfZonalGroupByComboBox")
-        self.opfZonalGroupByComboBox.setFont(font7)
-
-        self.gridLayout_18.addWidget(self.opfZonalGroupByComboBox, 2, 1, 1, 1)
-
         self.opfUnitCommitmentCheckBox = QCheckBox(self.groupBox)
         self.opfUnitCommitmentCheckBox.setObjectName(u"opfUnitCommitmentCheckBox")
         self.opfUnitCommitmentCheckBox.setFont(font7)
 
         self.gridLayout_18.addWidget(self.opfUnitCommitmentCheckBox, 5, 0, 1, 1)
 
-        self.label_132 = QLabel(self.groupBox)
-        self.label_132.setObjectName(u"label_132")
+        self.opfContingencyToleranceSpinBox = QDoubleSpinBox(self.groupBox)
+        self.opfContingencyToleranceSpinBox.setObjectName(u"opfContingencyToleranceSpinBox")
+        self.opfContingencyToleranceSpinBox.setFont(font7)
+        self.opfContingencyToleranceSpinBox.setDecimals(4)
+        self.opfContingencyToleranceSpinBox.setSingleStep(0.010000000000000)
+        self.opfContingencyToleranceSpinBox.setValue(0.050000000000000)
 
-        self.gridLayout_18.addWidget(self.label_132, 4, 0, 1, 2)
+        self.gridLayout_18.addWidget(self.opfContingencyToleranceSpinBox, 3, 1, 1, 1)
 
-        self.opf_time_grouping_comboBox = QComboBox(self.groupBox)
-        self.opf_time_grouping_comboBox.setObjectName(u"opf_time_grouping_comboBox")
-        self.opf_time_grouping_comboBox.setFont(font7)
+        self.considerContingenciesOpfCheckBox = QCheckBox(self.groupBox)
+        self.considerContingenciesOpfCheckBox.setObjectName(u"considerContingenciesOpfCheckBox")
+        self.considerContingenciesOpfCheckBox.setFont(font7)
 
-        self.gridLayout_18.addWidget(self.opf_time_grouping_comboBox, 1, 1, 1, 1)
+        self.gridLayout_18.addWidget(self.considerContingenciesOpfCheckBox, 6, 0, 1, 2)
 
-        self.mip_solver_comboBox = QComboBox(self.groupBox)
-        self.mip_solver_comboBox.setObjectName(u"mip_solver_comboBox")
-        self.mip_solver_comboBox.setFont(font7)
+        self.opfZonalGroupByComboBox = QComboBox(self.groupBox)
+        self.opfZonalGroupByComboBox.setObjectName(u"opfZonalGroupByComboBox")
+        self.opfZonalGroupByComboBox.setFont(font7)
 
-        self.gridLayout_18.addWidget(self.mip_solver_comboBox, 0, 1, 1, 1)
+        self.gridLayout_18.addWidget(self.opfZonalGroupByComboBox, 2, 1, 1, 1)
 
-        self.fixOpfCheckBox = QCheckBox(self.groupBox)
-        self.fixOpfCheckBox.setObjectName(u"fixOpfCheckBox")
-        self.fixOpfCheckBox.setFont(font7)
+        self.save_mip_checkBox = QCheckBox(self.groupBox)
+        self.save_mip_checkBox.setObjectName(u"save_mip_checkBox")
+        self.save_mip_checkBox.setFont(font7)
 
-        self.gridLayout_18.addWidget(self.fixOpfCheckBox, 8, 0, 1, 2)
+        self.gridLayout_18.addWidget(self.save_mip_checkBox, 12, 0, 1, 2)
 
-        self.considerContingenciesOpfCheckBox = QCheckBox(self.groupBox)
-        self.considerContingenciesOpfCheckBox.setObjectName(u"considerContingenciesOpfCheckBox")
-        self.considerContingenciesOpfCheckBox.setFont(font7)
+        self.label_132 = QLabel(self.groupBox)
+        self.label_132.setObjectName(u"label_132")
 
-        self.gridLayout_18.addWidget(self.considerContingenciesOpfCheckBox, 6, 0, 1, 2)
+        self.gridLayout_18.addWidget(self.label_132, 4, 0, 1, 2)
 
         self.label_4 = QLabel(self.groupBox)
         self.label_4.setObjectName(u"label_4")
@@ -2984,15 +2993,17 @@ class Ui_mainWindow(object):
 
         self.gridLayout_18.addWidget(self.label_4, 1, 0, 1, 1)
 
-        self.save_mip_checkBox = QCheckBox(self.groupBox)
-        self.save_mip_checkBox.setObjectName(u"save_mip_checkBox")
-        self.save_mip_checkBox.setFont(font7)
+        self.label_103 = QLabel(self.groupBox)
+        self.label_103.setObjectName(u"label_103")
+        self.label_103.setFont(font7)
 
-        self.gridLayout_18.addWidget(self.save_mip_checkBox, 11, 0, 1, 2)
+        self.gridLayout_18.addWidget(self.label_103, 2, 0, 1, 1)
 
-        self.verticalSpacer_18 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+        self.mip_solver_comboBox = QComboBox(self.groupBox)
+        self.mip_solver_comboBox.setObjectName(u"mip_solver_comboBox")
+        self.mip_solver_comboBox.setFont(font7)
 
-        self.gridLayout_18.addItem(self.verticalSpacer_18, 12, 0, 1, 1)
+        self.gridLayout_18.addWidget(self.mip_solver_comboBox, 0, 1, 1, 1)
 
         self.label_104 = QLabel(self.groupBox)
         self.label_104.setObjectName(u"label_104")
@@ -3000,26 +3011,21 @@ class Ui_mainWindow(object):
 
         self.gridLayout_18.addWidget(self.label_104, 3, 0, 1, 1)
 
-        self.label_103 = QLabel(self.groupBox)
-        self.label_103.setObjectName(u"label_103")
-        self.label_103.setFont(font7)
+        self.verticalSpacer_18 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
-        self.gridLayout_18.addWidget(self.label_103, 2, 0, 1, 1)
+        self.gridLayout_18.addItem(self.verticalSpacer_18, 13, 0, 1, 1)
 
-        self.opfContingencyToleranceSpinBox = QDoubleSpinBox(self.groupBox)
-        self.opfContingencyToleranceSpinBox.setObjectName(u"opfContingencyToleranceSpinBox")
-        self.opfContingencyToleranceSpinBox.setFont(font7)
-        self.opfContingencyToleranceSpinBox.setDecimals(4)
-        self.opfContingencyToleranceSpinBox.setSingleStep(0.010000000000000)
-        self.opfContingencyToleranceSpinBox.setValue(0.050000000000000)
+        self.opf_time_grouping_comboBox = QComboBox(self.groupBox)
+        self.opf_time_grouping_comboBox.setObjectName(u"opf_time_grouping_comboBox")
+        self.opf_time_grouping_comboBox.setFont(font7)
 
-        self.gridLayout_18.addWidget(self.opfContingencyToleranceSpinBox, 3, 1, 1, 1)
+        self.gridLayout_18.addWidget(self.opf_time_grouping_comboBox, 1, 1, 1, 1)
 
-        self.opfGEPCheckBox = QCheckBox(self.groupBox)
-        self.opfGEPCheckBox.setObjectName(u"opfGEPCheckBox")
-        self.opfGEPCheckBox.setFont(font7)
+        self.useGslkAsCostsOpfCheckBox = QCheckBox(self.groupBox)
+        self.useGslkAsCostsOpfCheckBox.setObjectName(u"useGslkAsCostsOpfCheckBox")
+        self.useGslkAsCostsOpfCheckBox.setFont(font7)
 
-        self.gridLayout_18.addWidget(self.opfGEPCheckBox, 7, 0, 1, 2)
+        self.gridLayout_18.addWidget(self.useGslkAsCostsOpfCheckBox, 7, 0, 1, 2)
 
 
         self.gridLayout_10.addWidget(self.groupBox, 3, 3, 1, 1)
@@ -4799,7 +4805,7 @@ class Ui_mainWindow(object):
         mainWindow.setCentralWidget(self.centralwidget)
         self.menuBar = QMenuBar(mainWindow)
         self.menuBar.setObjectName(u"menuBar")
-        self.menuBar.setGeometry(QRect(0, 0, 1198, 21))
+        self.menuBar.setGeometry(QRect(0, 0, 1390, 37))
         self.menuBar.setFont(font)
         self.menuProject = QMenu(self.menuBar)
         self.menuProject.setObjectName(u"menuProject")
@@ -5851,40 +5857,44 @@ class Ui_mainWindow(object):
 #endif // QT_CONFIG(tooltip)
         self.ips_control_Qlimits_checkBox.setText(QCoreApplication.translate("mainWindow", u"Control Q limits", None))
         self.groupBox.setTitle(QCoreApplication.translate("mainWindow", u"Linear settings", None))
-        self.label_10.setText(QCoreApplication.translate("mainWindow", u"MIP solver", None))
 #if QT_CONFIG(tooltip)
-        self.opfUnitCommitmentCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"Apply unit commitment technique", None))
+        self.opfGEPCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"Apply generation expansion planning", None))
 #endif // QT_CONFIG(tooltip)
-        self.opfUnitCommitmentCheckBox.setText(QCoreApplication.translate("mainWindow", u"Unit commitment", None))
-        self.label_132.setText("")
+        self.opfGEPCheckBox.setText(QCoreApplication.translate("mainWindow", u"Generation expansion planning", None))
 #if QT_CONFIG(tooltip)
-        self.opf_time_grouping_comboBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Choose the time grouping to possibly shorten the solution time.</p><p>This splits the time series by week, month, etc. and the subproblems are solved sequentially.</p></body></html>", None))
+        self.fixOpfCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"Fix infeasible problems and rey with the relaxed problem. Applies to OPF and NTC", None))
 #endif // QT_CONFIG(tooltip)
+        self.fixOpfCheckBox.setText(QCoreApplication.translate("mainWindow", u"Fix infeasibilities and retry", None))
+        self.label_10.setText(QCoreApplication.translate("mainWindow", u"MIP solver", None))
 #if QT_CONFIG(tooltip)
-        self.mip_solver_comboBox.setToolTip(QCoreApplication.translate("mainWindow", u"Choose the external mixed integer programming solver", None))
+        self.opfUnitCommitmentCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"Apply unit commitment technique", None))
 #endif // QT_CONFIG(tooltip)
+        self.opfUnitCommitmentCheckBox.setText(QCoreApplication.translate("mainWindow", u"Unit commitment", None))
 #if QT_CONFIG(tooltip)
-        self.fixOpfCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"Fix infeasible problems and rey with the relaxed problem. Applies to OPF and NTC", None))
+        self.opfContingencyToleranceSpinBox.setToolTip(QCoreApplication.translate("mainWindow", u"LODF matrix tolerance choosing contingencies", None))
 #endif // QT_CONFIG(tooltip)
-        self.fixOpfCheckBox.setText(QCoreApplication.translate("mainWindow", u"Fix infeasibilities and retry", None))
 #if QT_CONFIG(tooltip)
         self.considerContingenciesOpfCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"Consider the contingencies when dispatching", None))
 #endif // QT_CONFIG(tooltip)
         self.considerContingenciesOpfCheckBox.setText(QCoreApplication.translate("mainWindow", u"Compute contingencies", None))
-        self.label_4.setText(QCoreApplication.translate("mainWindow", u"Time grouping", None))
 #if QT_CONFIG(tooltip)
         self.save_mip_checkBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>The program will save the MIP file in .lp format in the user VeraGrid folder before running a linear optimization study.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
         self.save_mip_checkBox.setText(QCoreApplication.translate("mainWindow", u"Save MIP file", None))
-        self.label_104.setText(QCoreApplication.translate("mainWindow", u"Contingency tolerance", None))
+        self.label_132.setText("")
+        self.label_4.setText(QCoreApplication.translate("mainWindow", u"Time grouping", None))
         self.label_103.setText(QCoreApplication.translate("mainWindow", u"Zone grouping", None))
 #if QT_CONFIG(tooltip)
-        self.opfContingencyToleranceSpinBox.setToolTip(QCoreApplication.translate("mainWindow", u"LODF matrix tolerance choosing contingencies", None))
+        self.mip_solver_comboBox.setToolTip(QCoreApplication.translate("mainWindow", u"Choose the external mixed integer programming solver", None))
 #endif // QT_CONFIG(tooltip)
+        self.label_104.setText(QCoreApplication.translate("mainWindow", u"Contingency tolerance", None))
 #if QT_CONFIG(tooltip)
-        self.opfGEPCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"Apply generation expansion planning", None))
+        self.opf_time_grouping_comboBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Choose the time grouping to possibly shorten the solution time.</p><p>This splits the time series by week, month, etc. and the subproblems are solved sequentially.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.opfGEPCheckBox.setText(QCoreApplication.translate("mainWindow", u"Generation expansion planning", None))
+#if QT_CONFIG(tooltip)
+        self.useGslkAsCostsOpfCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"Instead of using the generation, loads cost for dispatching, use the GLSK (Generation, Load Shift Keys)", None))
+#endif // QT_CONFIG(tooltip)
+        self.useGslkAsCostsOpfCheckBox.setText(QCoreApplication.translate("mainWindow", u"Use GSLK as costs", None))
         self.label_73.setText(QCoreApplication.translate("mainWindow", u"Optimal Power Flow", None))
         self.groupBox_2.setTitle(QCoreApplication.translate("mainWindow", u"General settings", None))
         self.label_128.setText(QCoreApplication.translate("mainWindow", u"Verbose", None))

{veragrid-5.4.7 → veragrid-5.4.8}/VeraGrid/Gui/Main/SubClasses/Model/diagrams.py

@@ -74,9 +74,9 @@ class VideoExportWorker(QtCore.QThread):
 
         self.filename = filename
         self.diagram = diagram
-        self.fps = fps
-        self.start_idx = start_idx
-        self.end_idx = end_idx
+        self.fps: int = fps
+        self.start_idx: int = start_idx
+        self.end_idx: int = end_idx
         self.current_study = current_study
         self.grid_colour_function: Callable[[ALL_EDITORS, str, int, bool], None] = grid_colour_function
 
@@ -273,6 +273,7 @@ class DiagramsMain(CompiledArraysMain):
         self.ui.palette_comboBox.currentTextChanged.connect(self.set_diagrams_palette)
         self.ui.tile_provider_comboBox.currentTextChanged.connect(self.set_diagrams_map_tile_provider)
 
+        # TODO: this lambda calls to colour twice is the simulation is run the first time
         self.ui.available_results_to_color_comboBox.currentTextChanged.connect(lambda: self.colour_diagrams(False))
 
         # sliders
@@ -1231,6 +1232,8 @@ class DiagramsMain(CompiledArraysMain):
         """
         nbus = self.circuit.get_bus_number()
         nbr = self.circuit.get_branch_number(add_vsc=False, add_hvdc=False, add_switch=True)
+        nhvdc = self.circuit.get_hvdc_number()
+        nvsc = self.circuit.get_vsc_number()
 
         bus_active = self.circuit.get_bus_actives(t_idx=t_idx)
         br_active = self.circuit.get_branch_actives(t_idx=t_idx, add_vsc=False, add_hvdc=False, add_switch=True)
@@ -1245,6 +1248,14 @@ class DiagramsMain(CompiledArraysMain):
                                              loadings=np.zeros(nbr, dtype=complex),
                                              br_active=br_active,
                                              hvdc_active=hvdc_active,
+                                             hvdc_loading=np.zeros(nhvdc, dtype=float),
+                                             hvdc_Pf=np.zeros(nhvdc, dtype=float),
+                                             hvdc_Pt=np.zeros(nhvdc, dtype=float),
+                                             vsc_active=vsc_active,
+                                             vsc_loading=np.zeros(nvsc, dtype=float),
+                                             vsc_Pf=np.zeros(nvsc, dtype=float),
+                                             vsc_Pt=np.zeros(nvsc, dtype=float),
+                                             vsc_Qt=np.zeros(nvsc, dtype=float),
                                              use_flow_based_width=use_flow_based_width,
                                              min_branch_width=min_branch_width,
                                              max_branch_width=max_branch_width,

{veragrid-5.4.7 → veragrid-5.4.8}/VeraGrid/__version__.py

@@ -6,7 +6,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # remember to keep a three-number version!!!
-__VeraGrid_VERSION__ = "5.4.7"
+__VeraGrid_VERSION__ = "5.4.8"
 
 url = 'https://github.com/SanPen/VeraGrid'