GridCal 5.3.50__tar.gz → 5.3.52__tar.gz

{gridcal-5.3.50 → gridcal-5.3.52}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -453,7 +453,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         devs = list()
         # find associated Branches in reverse order
         for obj in substation_buses:
-            for branch_list in self.editor.circuit.get_branch_lists():
+            for branch_list in self.editor.circuit.get_branch_lists(add_vsc=True, add_hvdc=True, add_switch=True):
                 for i in range(len(branch_list) - 1, -1, -1):
                     if branch_list[i].bus_from == obj:
                         devs.append(branch_list[i])

{gridcal-5.3.50 → gridcal-5.3.52}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -1186,7 +1186,7 @@ class GridMapWidget(BaseDiagramWidget):
             lnorm[lnorm == np.inf] = 0
             Sfabs = np.abs(Sf)
             Sfnorm = Sfabs / np.max(Sfabs + 1e-20)
-            for i, branch in enumerate(self.circuit.get_branches_wo_hvdc_iter()):
+            for i, branch in enumerate(self.circuit.get_branches_iter(add_vsc=False, add_hvdc=False, add_switch=True)):
 
                 # try to find the diagram object of the DB object
                 graphic_object: Union[MapAcLine, MapDcLine] = self.graphics_manager.query(branch)

{gridcal-5.3.50 → gridcal-5.3.52}/GridCal/Gui/Diagrams/SchematicWidget/Branches/vsc_graphics.py

@@ -72,19 +72,39 @@ class VscGraphicItem(LineGraphicTemplateItem):
                            checkeable=True,
                            checked_value=self.draw_labels)
 
-            rabf = menu.addAction('Change bus')
-            move_bus_icon = QIcon()
-            move_bus_icon.addPixmap(QPixmap(":/Icons/icons/move_bus.svg"))
-            rabf.setIcon(move_bus_icon)
-            rabf.triggered.connect(self.change_bus)
+            # rabf = menu.addAction('Change bus')
+            # move_bus_icon = QIcon()
+            # move_bus_icon.addPixmap(QPixmap(":/Icons/icons/move_bus.svg"))
+            # rabf.setIcon(move_bus_icon)
+            # rabf.triggered.connect(self.change_bus)
+
+            add_menu_entry(menu=menu,
+                           text="Change bus",
+                           function_ptr=self.change_bus,
+                           icon_path=":/Icons/icons/move_bus.svg")
+
+            add_menu_entry(menu=menu,
+                           text="Set Control dev 1",
+                           function_ptr=self.set_control_dev_1,
+                           icon_path=":/Icons/icons/move_bus.svg")
+
+            add_menu_entry(menu=menu,
+                           text="Set Control dev 2",
+                           function_ptr=self.set_control_dev_2,
+                           icon_path=":/Icons/icons/move_bus.svg")
 
             menu.addSeparator()
 
-            ra2 = menu.addAction('Delete')
-            del_icon = QIcon()
-            del_icon.addPixmap(QPixmap(":/Icons/icons/delete3.svg"))
-            ra2.setIcon(del_icon)
-            ra2.triggered.connect(self.delete)
+            # ra2 = menu.addAction('Delete')
+            # del_icon = QIcon()
+            # del_icon.addPixmap(QPixmap(":/Icons/icons/delete3.svg"))
+            # ra2.setIcon(del_icon)
+            # ra2.triggered.connect(self.delete)
+
+            add_menu_entry(menu=menu,
+                           text="Delete",
+                           function_ptr=self.delete,
+                           icon_path=":/Icons/icons/delete3.svg")
 
             menu.addSeparator()
 
@@ -146,3 +166,17 @@ class VscGraphicItem(LineGraphicTemplateItem):
         """
         self.api_object.regulation_bus = self.api_object.bus_to
         self.api_object.tap_module_control_mode = TapModuleControl.Vm
+
+    def set_control_dev_1(self):
+        """
+
+        :return:
+        """
+        self.editor.set_vsc_control_dev(graphic=self, control_idx=1)
+
+    def set_control_dev_2(self):
+        """
+
+        :return:
+        """
+        self.editor.set_vsc_control_dev(graphic=self, control_idx=2)

{gridcal-5.3.50 → gridcal-5.3.52}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -3498,7 +3498,10 @@ class SchematicWidget(BaseDiagramWidget):
         # VSC lines
         if vsc_Pf is not None:
 
-            vsc_sending_power_norm = np.abs(vsc_Pt + 1j * vsc_Qt) / (max_flow + 1e-20)
+            if vsc_Qt is None:
+                vsc_sending_power_norm = np.abs(vsc_Pt) / (max_flow + 1e-20)
+            else:
+                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):
@@ -3549,15 +3552,25 @@ class SchematicWidget(BaseDiagramWidget):
 
                             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])
+                            if vsc_Qt is None:
+                                if vsc_losses is not None:
+                                    tooltip += '\nPower (to):\t' + "{:10.4f}".format(vsc_Pt[i]) + ' [MW]'
+                                    tooltip += '\nLosses: \t\t' + "{:10.4f}".format(vsc_losses[i]) + ' [MW]'
+                                    graphic_object.set_arrows_with_power(Sf=vsc_Pf[i],
+                                                                         St=vsc_Pt[i])
+                                else:
+                                    graphic_object.set_arrows_with_power(Sf=vsc_Pf[i],
+                                                                         St=-vsc_Pf[i])
                             else:
-                                graphic_object.set_arrows_with_power(Sf=vsc_Pf[i] + 1j * 0.0,
-                                                                     St=-vsc_Pf[i] + 1j * vsc_Qt[i])
+                                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)
@@ -3787,7 +3800,7 @@ class SchematicWidget(BaseDiagramWidget):
                         bus_dict[bus.idtag] = graphic_object
 
         # third pass: we must also add all those branches connecting the selected buses
-        for lst in self.circuit.get_branch_lists():
+        for lst in self.circuit.get_branch_lists(add_vsc=True, add_hvdc=True, add_switch=True):
             for api_object in lst:
                 if api_object.bus_from.idtag in bus_dict or api_object.bus_to.idtag in bus_dict:
                     diagram.set_point(device=api_object,
@@ -4316,6 +4329,30 @@ class SchematicWidget(BaseDiagramWidget):
             if idx_bus_list[0][1] == line_graphics.api_object.bus_from:
                 idx, old_bus, old_bus_graphic_item = idx_bus_list[0]
 
+    def set_vsc_control_dev(self, graphic: VscGraphicItem, control_idx: int):
+        """
+        Set the VSC control1_dev or control1_dev with the selected bus
+        :param graphic: VscGraphicItem
+        :param control_idx: 1 or 2 to set control1_dev or control1_dev
+        """
+
+        idx_bus_list = self.get_selected_buses()
+
+        if len(idx_bus_list) == 1:
+
+            # detect the bus and its combinations
+            idx, sel_bus, sel_bus_graphic_item = idx_bus_list[0]
+
+            if control_idx == 1:
+                graphic.api_object.control1_dev = sel_bus
+            elif control_idx == 2:
+                graphic.api_object.control2_dev = sel_bus
+            else:
+                print("control_idx must be either 1 or 2")
+        else:
+            error_msg(f"You need to select exactly one bus to be set as the VSC control device {control_idx}",
+                      "Set VSC control device 1")
+
     def get_picture_width(self) -> int:
         return self.editor_graphics_view.width()
 

{gridcal-5.3.50 → gridcal-5.3.52}/GridCal/Gui/Main/SubClasses/Model/diagrams.py

@@ -827,13 +827,21 @@ class DiagramsMain(CompiledArraysMain):
                                              bus_active=bus_active,
                                              loadings=results.loading,
                                              types=results.bus_types,
+
                                              Sf=results.Sf,
                                              St=results.St,
                                              br_active=br_active,
+
                                              hvdc_Pf=results.hvdc_Pf,
                                              hvdc_Pt=-results.hvdc_Pf,
                                              hvdc_loading=results.hvdc_loading,
                                              hvdc_active=hvdc_active,
+
+                                             vsc_Pf=results.vsc_Pf,
+                                             vsc_Pt=-results.vsc_Pf,
+                                             vsc_loading=results.vsc_loading,
+                                             vsc_active=vsc_active,
+
                                              use_flow_based_width=use_flow_based_width,
                                              min_branch_width=min_branch_width,
                                              max_branch_width=max_branch_width,

{gridcal-5.3.50 → gridcal-5.3.52}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -218,7 +218,7 @@ class SimulationsMain(TimeEventsMain):
         self.ui.actionLinearAnalysis.triggered.connect(self.linear_pf_dispatcher)
         self.ui.actionContingency_analysis.triggered.connect(self.contingencies_dispatcher)
         self.ui.actionOTDF_time_series.triggered.connect(self.run_contingency_analysis_ts)
-        self.ui.actionATC.triggered.connect(self.optimal_ntc_dispatcher)
+        self.ui.actionATC.triggered.connect(self.atc_dispatcher)
         self.ui.actionATC_Time_Series.triggered.connect(self.run_available_transfer_capacity_ts)
         self.ui.actionPTDF_time_series.triggered.connect(self.run_linear_analysis_ts)
         self.ui.actionClustering.triggered.connect(self.run_clustering)
@@ -850,16 +850,16 @@ class SimulationsMain(TimeEventsMain):
             else:
                 self.run_opf()
 
-    def optimal_ntc_dispatcher(self):
+    def atc_dispatcher(self):
         """
         Dispatch the NTC action
         :return:
         """
         if self.server_driver.is_running():
             if self.ts_flag():
-                instruction = RemoteInstruction(operation=SimulationTypes.OPF_NTC_TS_run)
+                instruction = RemoteInstruction(operation=SimulationTypes.NetTransferCapacityTS_run)
             else:
-                instruction = RemoteInstruction(operation=SimulationTypes.OPF_NTC_run)
+                instruction = RemoteInstruction(operation=SimulationTypes.NetTransferCapacity_run)
 
             self.run_remote(instruction=instruction)
         else:
@@ -2277,13 +2277,21 @@ class SimulationsMain(TimeEventsMain):
         """
         Actions to run after the OPF simulation
         """
-        _, results = self.session.optimal_net_transfer_capacity
+        drv, results = self.session.optimal_net_transfer_capacity
 
         if results is not None:
             self.remove_simulation(SimulationTypes.OPF_NTC_run)
             self.update_available_results()
             self.colour_diagrams()
 
+            if results.converged:
+                if drv.logger.error_count() == 0:
+                    self.show_info_toast("Optimal result")
+                else:
+                    self.show_warning_toast("Optimal result with errors :/")
+            else:
+                self.show_warning_toast("Not optimal result :/")
+
         if not self.session.is_anything_running():
             self.UNLOCK()
 
@@ -2600,20 +2608,32 @@ class SimulationsMain(TimeEventsMain):
                         )
 
                     elif obj_fn_tpe == InvestmentsEvaluationObjectives.GenerationAdequacy:
-                        problem = sim.AdequacyInvestmentProblem(
-                            grid=self.circuit,
-                            n_monte_carlo_sim=self.ui.max_iterations_reliability_spinBox.value(),
-                            use_monte_carlo=True,
-                            save_file=False
-                        )
+
+                        if self.circuit.has_time_series:
+                            problem = sim.AdequacyInvestmentProblem(
+                                grid=self.circuit,
+                                n_monte_carlo_sim=self.ui.max_iterations_reliability_spinBox.value(),
+                                use_monte_carlo=True,
+                                save_file=False,
+                                time_indices=self.get_time_indices()
+                            )
+                        else:
+                            self.show_warning_toast('Adequacy studies need time data...')
+                            return
 
                     elif obj_fn_tpe == InvestmentsEvaluationObjectives.SimpleDispatch:
-                        problem = sim.AdequacyInvestmentProblem(
-                            grid=self.circuit,
-                            n_monte_carlo_sim=self.ui.max_iterations_reliability_spinBox.value(),
-                            use_monte_carlo=False,
-                            save_file=False
-                        )
+
+                        if self.circuit.has_time_series:
+                            problem = sim.AdequacyInvestmentProblem(
+                                grid=self.circuit,
+                                n_monte_carlo_sim=self.ui.max_iterations_reliability_spinBox.value(),
+                                use_monte_carlo=False,
+                                save_file=False,
+                                time_indices=self.get_time_indices()
+                            )
+                        else:
+                            self.show_warning_toast('Adequacy studies need time data...')
+                            return
 
                     else:
                         self.show_error_toast("Objective not supported yet :/")
@@ -2893,30 +2913,34 @@ class SimulationsMain(TimeEventsMain):
         """
         if self.circuit.valid_for_simulation():
 
-            if not self.session.is_this_running(SimulationTypes.Reliability_run):
+            if self.circuit.get_time_number() > 0:
 
-                self.add_simulation(SimulationTypes.Reliability_run)
+                if not self.session.is_this_running(SimulationTypes.Reliability_run):
 
-                self.LOCK()
+                    self.add_simulation(SimulationTypes.Reliability_run)
 
-                # Compile the grid
-                self.ui.progress_label.setText('Compiling the grid...')
-                QtGui.QGuiApplication.processEvents()
+                    self.LOCK()
 
-                pf_options = self.get_selected_power_flow_options()
+                    # Compile the grid
+                    self.ui.progress_label.setText('Compiling the grid...')
+                    QtGui.QGuiApplication.processEvents()
 
-                drv = sim.ReliabilityStudyDriver(grid=self.circuit,
-                                                 pf_options=pf_options,
-                                                 n_sim=self.ui.max_iterations_reliability_spinBox.value())
+                    pf_options = self.get_selected_power_flow_options()
 
-                self.session.run(drv,
-                                 post_func=self.post_reliability,
-                                 prog_func=self.ui.progressBar.setValue,
-                                 text_func=self.ui.progress_label.setText)
+                    drv = sim.ReliabilityStudyDriver(grid=self.circuit,
+                                                     pf_options=pf_options,
+                                                     time_indices=self.get_time_indices(),
+                                                     n_sim=self.ui.max_iterations_reliability_spinBox.value())
 
-            else:
-                self.show_warning_toast('Another OPF time series is running already...')
+                    self.session.run(drv,
+                                     post_func=self.post_reliability,
+                                     prog_func=self.ui.progressBar.setValue,
+                                     text_func=self.ui.progress_label.setText)
 
+                else:
+                    self.show_warning_toast('Another reliability study is running already...')
+            else:
+                self.show_warning_toast('Reliability studies need time data...')
         else:
             pass