GridCal 5.1.6__tar.gz → 5.1.7__tar.gz

{GridCal-5.1.6 → GridCal-5.1.7}/GridCal/Gui/CascadingSteps/cascading_steps.py

@@ -67,7 +67,7 @@ class CascadingStepsGUI(QtWidgets.QDialog):
                 options = self.gridcal_main.get_selected_power_flow_options()
                 options.solver_type = SolverType.LM
                 max_isl = self.gridcal_main.ui.cascading_islands_spinBox.value()
-                drv = sim.Cascading(self.gridcal_main.circuit.copy(), options, max_additional_islands=max_isl)
+                drv = sim.CascadingDriver(self.gridcal_main.circuit.copy(), options, max_additional_islands=max_isl)
 
                 self.gridcal_main.session.run(drv,
                                               post_func=self.gridcal_main.post_cascade,
@@ -101,9 +101,9 @@ class CascadingStepsGUI(QtWidgets.QDialog):
                 max_isl = self.gridcal_main.ui.cascading_islands_spinBox.value()
                 n_lsh_samples = self.gridcal_main.ui.max_iterations_stochastic_spinBox.value()
 
-                drv = sim.Cascading(self.gridcal_main.circuit.copy(), options,
-                                    max_additional_islands=max_isl,
-                                    n_lhs_samples_=n_lsh_samples)
+                drv = sim.CascadingDriver(self.gridcal_main.circuit.copy(), options,
+                                          max_additional_islands=max_isl,
+                                          n_lhs_samples_=n_lsh_samples)
 
                 self.gridcal_main.session.run(drv,
                                               post_func=self.gridcal_main.post_cascade,

{GridCal-5.1.6 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/diagram_editor_widget.py

@@ -937,7 +937,8 @@ class DiagramEditorWidget(QSplitter):
                         # add fluid node reference for later
                         # fluid_node_dict[idtag] = graphic_object
                         self.graphics_manager.add_device(elm=location.api_object, graphic=graphic_object)
-                        self.graphics_manager.add_device(elm=location.api_object.bus, graphic=graphic_object)
+                        if location.api_object.bus is not None:
+                            self.graphics_manager.add_device(elm=location.api_object.bus, graphic=graphic_object)
 
                         # map the internal bus
                         # if location.api_object.bus is not None:

{GridCal-5.1.6 → GridCal-5.1.7}/GridCal/Gui/Main/SubClasses/Model/diagrams.py

@@ -649,7 +649,7 @@ class DiagramsMain(CompiledArraysMain):
             else:
                 info_msg(f"{current_study} only has values for the snapshot")
 
-        elif current_study == sim.ContingencyAnalysisTimeSeries.tpe.value:
+        elif current_study == sim.ContingencyAnalysisTimeSeriesDriver.tpe.value:
             if t_idx is not None:
                 results: sim.ContingencyAnalysisTimeSeriesResults = self.session.get_results(
                     sim.SimulationTypes.ContingencyAnalysisTS_run)

{GridCal-5.1.6 → GridCal-5.1.7}/GridCal/Gui/Main/SubClasses/Results/results.py

@@ -297,7 +297,7 @@ class ResultsMain(SimulationsMain):
         """
         Copy the results from the OPF time series to the profiles
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.OPFTimeSeries_run)
+        results = self.session.optimal_power_flow_ts
 
         if results is not None:
 

{GridCal-5.1.6 → GridCal-5.1.7}/GridCal/Gui/Main/SubClasses/Settings/configuration.py

@@ -293,7 +293,8 @@ class ConfigurationMain(ResultsMain):
             },
             "file": {
                 "store_results_in_file": self.ui.saveResultsCheckBox,
-                "current_boundary_set": self.current_boundary_set
+                "current_boundary_set": self.current_boundary_set,
+                "cgmes_selected_version": self.ui.cgmes_version_comboBox
             }
         }
 

{GridCal-5.1.6 → GridCal-5.1.7}/GridCal/Gui/Main/SubClasses/base_gui.py

@@ -650,7 +650,7 @@ class BaseMainGui(QMainWindow):
         branches = self.circuit.get_branches()
 
         if len(branches) > 0:
-            pf_drv, pf_results = self.session.get_driver_results(sim.SimulationTypes.PowerFlow_run)
+            pf_results = self.session.power_flow()
 
             if pf_results is not None:
                 factor = self.ui.branch_rating_doubleSpinBox.value()

{GridCal-5.1.6 → GridCal-5.1.7}/GridCal/Gui/Main/SubClasses/io.py

@@ -37,6 +37,7 @@ from GridCalEngine.Compilers.circuit_to_newton_pa import NEWTON_PA_AVAILABLE
 from GridCalEngine.Compilers.circuit_to_pgm import PGM_AVAILABLE
 from GridCalEngine.IO.gridcal.contingency_parser import import_contingencies_from_json, export_contingencies_json_file
 from GridCalEngine.DataStructures.numerical_circuit import compile_numerical_circuit_at
+from GridCalEngine.enumerations import CGMESVersions
 
 
 class IoMain(ConfigurationMain):
@@ -60,6 +61,9 @@ class IoMain(ConfigurationMain):
                                     '.ejson2', '.ejson3',
                                     '.xml', '.rawx', '.zip', '.dpx', '.epc']
 
+        self.cgmes_version_dict = {x.value: x for x in [CGMESVersions.v2_4_15, CGMESVersions.v3_0_0]}
+        self.ui.cgmes_version_comboBox.setModel(gf.get_list_model(list(self.cgmes_version_dict.keys())))
+
         self.ui.actionNew_project.triggered.connect(self.new_project)
         self.ui.actionOpen_file.triggered.connect(self.open_file)
         self.ui.actionAdd_circuit.triggered.connect(self.add_circuit)
@@ -518,17 +522,20 @@ class IoMain(ConfigurationMain):
         """
 
         if self.ui.saveResultsCheckBox.isChecked():
-            sessions = [self.session]
+            sessions_data = self.session.get_save_data()
         else:
-            sessions = list()
+            sessions_data = list()
 
         # get json files to store
         json_files = {"gui_config": self.get_gui_config_data()}
 
+        cgmes_version = self.cgmes_version_dict[self.ui.cgmes_version_comboBox.currentText()]
+
         options = filedrv.FileSavingOptions(cgmes_boundary_set=self.current_boundary_set,
                                             simulation_drivers=self.get_simulations(),
-                                            sessions=sessions,
-                                            dictionary_of_json_files=json_files)
+                                            sessions_data=sessions_data,
+                                            dictionary_of_json_files=json_files,
+                                            cgmes_version=cgmes_version)
 
         return options
 
@@ -759,10 +766,12 @@ class IoMain(ConfigurationMain):
                 session_name = path[0]
                 study_name = path[1]
                 if self.last_file_driver is not None:
-                    data_dict, json_files = self.last_file_driver.load_session_objects(session_name=session_name,
-                                                                                       study_name=study_name)
+                    data_dict = self.last_file_driver.load_session_objects(session_name=session_name,
+                                                                           study_name=study_name)
 
-                    self.session.register_driver_from_disk_data(self.circuit, study_name, data_dict)
+                    self.session.register_driver_from_disk_data(grid=self.circuit,
+                                                                study_name=study_name,
+                                                                data_dict=data_dict)
 
                     self.update_available_results()
                 else:

{GridCal-5.1.6 → GridCal-5.1.7}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -630,7 +630,7 @@ class SimulationsMain(TimeEventsMain):
         """
         if use_opf:
 
-            drv, opf_time_series_results = self.session.get_driver_results(SimulationTypes.OPFTimeSeries_run)
+            opf_time_series_results = self.session.optimal_power_flow_ts
 
             if opf_time_series_results is None:
                 if use_opf:
@@ -765,16 +765,12 @@ class SimulationsMain(TimeEventsMain):
         """
         # update the results in the circuit structures
 
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.PowerFlow_run)
+        results = self.session.power_flow
 
         if results is not None:
             self.ui.progress_label.setText('Colouring power flow results in the grid...')
-            # QtGui.QGuiApplication.processEvents()
-
             self.remove_simulation(sim.SimulationTypes.PowerFlow_run)
-
             self.update_available_results()
-
             self.colour_diagrams()
 
         else:
@@ -793,7 +789,7 @@ class SimulationsMain(TimeEventsMain):
         if len(self.circuit.buses) > 0:
             if not self.session.is_this_running(sim.SimulationTypes.ShortCircuit_run):
 
-                pf_drv, pf_results = self.session.get_driver_results(sim.SimulationTypes.PowerFlow_run)
+                pf_results = self.session.power_flow
 
                 if pf_results is not None:
 
@@ -861,15 +857,13 @@ class SimulationsMain(TimeEventsMain):
 
         """
         # update the results in the circuit structures
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.ShortCircuit_run)
-        self.remove_simulation(sim.SimulationTypes.ShortCircuit_run)
+        results = self.session.short_circuit
+
         if results is not None:
 
             self.ui.progress_label.setText('Colouring short circuit results in the grid...')
-            QtGui.QGuiApplication.processEvents()
-
+            self.remove_simulation(sim.SimulationTypes.ShortCircuit_run)
             self.update_available_results()
-
             self.colour_diagrams()
 
         else:
@@ -927,12 +921,10 @@ class SimulationsMain(TimeEventsMain):
         Returns:
 
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.LinearAnalysis_run)
-
         self.remove_simulation(sim.SimulationTypes.LinearAnalysis_run)
 
         # update the results in the circuit structures
-        # if not drv.__cancel__:
+        results = self.session.linear_power_flow
         if results is not None:
 
             self.ui.progress_label.setText('Colouring PTDF results in the grid...')
@@ -982,10 +974,10 @@ class SimulationsMain(TimeEventsMain):
         Returns:
 
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.LinearAnalysis_TS_run)
         self.remove_simulation(sim.SimulationTypes.LinearAnalysis_TS_run)
 
         # update the results in the circuit structures
+        results = self.session.linear_power_flow_ts
         if results is not None:
 
             # expand the clusters
@@ -1071,11 +1063,10 @@ class SimulationsMain(TimeEventsMain):
         Returns:
 
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.ContingencyAnalysis_run)
         self.remove_simulation(sim.SimulationTypes.ContingencyAnalysis_run)
 
         # update the results in the circuit structures
-        # if not drv.__cancel__:
+        results = self.session.contingency
         if results is not None:
 
             self.ui.progress_label.setText('Colouring contingency analysis results in the grid...')
@@ -1106,11 +1097,11 @@ class SimulationsMain(TimeEventsMain):
 
                         self.LOCK()
 
-                        drv = sim.ContingencyAnalysisTimeSeries(grid=self.circuit,
-                                                                options=self.get_contingency_options(),
-                                                                time_indices=self.get_time_indices(),
-                                                                clustering_results=self.get_clustering_results(),
-                                                                engine=self.get_preferred_engine())
+                        drv = sim.ContingencyAnalysisTimeSeriesDriver(grid=self.circuit,
+                                                                      options=self.get_contingency_options(),
+                                                                      time_indices=self.get_time_indices(),
+                                                                      clustering_results=self.get_clustering_results(),
+                                                                      engine=self.get_preferred_engine())
 
                         self.session.run(drv,
                                          post_func=self.post_contingency_analysis_ts,
@@ -1133,11 +1124,10 @@ class SimulationsMain(TimeEventsMain):
         Returns:
 
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.ContingencyAnalysisTS_run)
         self.remove_simulation(sim.SimulationTypes.ContingencyAnalysisTS_run)
 
         # update the results in the circuit structures
-        # if not drv.__cancel__:
+        results = self.session.contingency_ts
         if results is not None:
 
             # expand the clusters
@@ -1184,7 +1174,7 @@ class SimulationsMain(TimeEventsMain):
                 sense_hvdc_br = np.array([sense for i, bus, sense in lst_hvdc_br])
 
                 if self.ui.usePfValuesForAtcCheckBox.isChecked():
-                    pf_drv, pf_results = self.session.get_driver_results(sim.SimulationTypes.PowerFlow_run)
+                    pf_results = self.session.power_flow
                     if pf_results is not None:
                         Pf = pf_results.Sf.real
                         Pf_hvdc = pf_results.hvdc_Pf.real
@@ -1250,11 +1240,10 @@ class SimulationsMain(TimeEventsMain):
         Returns:
 
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.NetTransferCapacity_run)
         self.remove_simulation(sim.SimulationTypes.NetTransferCapacity_run)
+        results = self.session.net_transfer_capacity
 
         # update the results in the circuit structures
-        # if not drv.__cancel__:
         if results is not None:
 
             self.ui.progress_label.setText('Colouring ATC results in the grid...')
@@ -1301,7 +1290,7 @@ class SimulationsMain(TimeEventsMain):
                     sense_hvdc_br = np.array([sense for i, bus, sense in lst_hvdc_br])
 
                     if self.ui.usePfValuesForAtcCheckBox.isChecked():
-                        pf_drv, pf_results = self.session.get_driver_results(sim.SimulationTypes.TimeSeries_run)
+                        pf_results = self.session.power_flow_ts
                         if pf_results is not None:
                             Pf = pf_results.Sf.real
                             Pf_hvdc = pf_results.hvdc_Pf.real
@@ -1372,11 +1361,10 @@ class SimulationsMain(TimeEventsMain):
         Returns:
 
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.NetTransferCapacityTS_run)
         self.remove_simulation(sim.SimulationTypes.NetTransferCapacityTS_run)
 
         # update the results in the circuit structures
-        # if not drv.__cancel__:
+        results = self.session.net_transfer_capacity_ts
         if results is not None:
 
             # expand the clusters
@@ -1401,7 +1389,7 @@ class SimulationsMain(TimeEventsMain):
 
         if len(self.circuit.buses) > 0:
 
-            pf_drv, pf_results = self.session.get_driver_results(sim.SimulationTypes.PowerFlow_run)
+            pf_drv, pf_results = self.session.power_flow_driver_and_results
 
             if pf_results is not None:
 
@@ -1503,7 +1491,7 @@ class SimulationsMain(TimeEventsMain):
                         pf_options = self.get_selected_power_flow_options()
 
                         # create object
-                        drv = sim.ContinuationPowerFlowDriver(circuit=self.circuit,
+                        drv = sim.ContinuationPowerFlowDriver(grid=self.circuit,
                                                               options=vc_options,
                                                               inputs=vc_inputs,
                                                               pf_options=pf_options)
@@ -1521,7 +1509,7 @@ class SimulationsMain(TimeEventsMain):
                             # lock the UI
                             self.LOCK()
 
-                            pf_drv.run_at(start_idx)
+                            pf_drv.run_at(start_idx)  # TODO: inspect this
 
                             # get the power Injections array to get the initial and end points
                             Sprof = self.circuit.get_Sbus_prof()
@@ -1532,7 +1520,7 @@ class SimulationsMain(TimeEventsMain):
                             pf_options = self.get_selected_power_flow_options()
 
                             # create object
-                            drv = sim.ContinuationPowerFlowDriver(circuit=self.circuit,
+                            drv = sim.ContinuationPowerFlowDriver(grid=self.circuit,
                                                                   options=vc_options,
                                                                   inputs=vc_inputs,
                                                                   pf_options=pf_options)
@@ -1555,7 +1543,7 @@ class SimulationsMain(TimeEventsMain):
         Actions performed after the voltage stability. Launched by the thread after its execution
         :return:
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.ContinuationPowerFlow_run)
+        results = self.session.continuation_power_flow
 
         if results is not None:
 
@@ -1620,7 +1608,7 @@ class SimulationsMain(TimeEventsMain):
         @return:
         """
 
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.TimeSeries_run)
+        results = self.session.power_flow_ts
 
         if results is not None:
 
@@ -1690,7 +1678,7 @@ class SimulationsMain(TimeEventsMain):
         @return:
         """
 
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.StochasticPowerFlow)
+        results = self.session.stochastic_power_flow
 
         if results is not None:
 
@@ -1712,10 +1700,9 @@ class SimulationsMain(TimeEventsMain):
         """
 
         # update the results in the circuit structures
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.Cascade_run)
-
         self.remove_simulation(sim.SimulationTypes.Cascade_run)
 
+        results = self.session.cascade
         n = len(results.events)
 
         if n > 0:
@@ -1802,7 +1789,7 @@ class SimulationsMain(TimeEventsMain):
         ips_iterations = self.ui.ips_iterations_spinBox.value()
         ips_trust_radius = self.ui.ips_trust_radius_doubleSpinBox.value()
         ips_init_with_pf = self.ui.ips_initialize_with_pf_checkBox.isChecked()
-        pf_results = self.session.get_driver_results(SimulationTypes.PowerFlow_run)
+        pf_results = self.session.power_flow
 
         options = sim.OptimalPowerFlowOptions(solver=solver,
                                               time_grouping=time_grouping,
@@ -1863,7 +1850,7 @@ class SimulationsMain(TimeEventsMain):
         """
         Actions to run after the OPF simulation
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.OPF_run)
+        results = self.session.optimal_power_flow
 
         if results is not None:
 
@@ -1932,7 +1919,7 @@ class SimulationsMain(TimeEventsMain):
         Post OPF Time Series
         """
 
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.OPFTimeSeries_run)
+        results = self.session.optimal_power_flow_ts
 
         if results is not None:
 
@@ -1961,12 +1948,12 @@ class SimulationsMain(TimeEventsMain):
 
             if self.circuit.time_profile is not None:
 
-                drv, results = self.session.get_driver_results(sim.SimulationTypes.OPFTimeSeries_run)
+                results = self.session.optimal_power_flow_ts
 
                 if results is not None:
 
-                    quit_msg = "Are you sure that you want overwrite the time events " \
-                               "with the simulated by the OPF time series?"
+                    quit_msg = ("Are you sure that you want overwrite the time events "
+                                "with the simulated by the OPF time series?")
                     reply = QtWidgets.QMessageBox.question(self, 'Message', quit_msg,
                                                            QtWidgets.QMessageBox.StandardButton.Yes,
                                                            QtWidgets.QMessageBox.StandardButton.No)
@@ -2072,7 +2059,7 @@ class SimulationsMain(TimeEventsMain):
         """
         Actions to run after the OPF simulation
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.OPF_NTC_run)
+        results = self.session.optimal_net_transfer_capacity
 
         if results is not None:
             self.remove_simulation(sim.SimulationTypes.OPF_NTC_run)
@@ -2124,7 +2111,7 @@ class SimulationsMain(TimeEventsMain):
         Actions to run after the optimal net transfer capacity time series simulation
         """
 
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.OPF_NTC_TS_run)
+        results = self.session.optimal_net_transfer_capacity_ts
 
         if results is not None:
 
@@ -2151,7 +2138,7 @@ class SimulationsMain(TimeEventsMain):
         """
         if self.ui.actionFind_node_groups.isChecked():
 
-            drv, ptdf_results = self.session.get_driver_results(sim.SimulationTypes.LinearAnalysis_run)
+            ptdf_results = self.session.linear_power_flow
 
             if ptdf_results is not None:
 
@@ -2183,7 +2170,7 @@ class SimulationsMain(TimeEventsMain):
         self.UNLOCK()
         print('\nGroups:')
 
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.NodeGrouping_run)
+        drv, _ = self.session.node_groups_driver
 
         if drv is not None:
 
@@ -2236,7 +2223,7 @@ class SimulationsMain(TimeEventsMain):
 
         :return:
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.InputsAnalysis_run)
+        results = self.session.inputs_analysis
 
         if results is not None:
             self.remove_simulation(sim.SimulationTypes.InputsAnalysis_run)
@@ -2255,7 +2242,7 @@ class SimulationsMain(TimeEventsMain):
 
             if self.ui.actionStorage_location_suggestion.isChecked():
 
-                ts_drv, ts_results = self.session.get_driver_results(sim.SimulationTypes.TimeSeries_run)
+                ts_results = self.session.power_flow_ts
 
                 if ts_results is not None:
 
@@ -2376,11 +2363,11 @@ class SimulationsMain(TimeEventsMain):
         """
         Post investments evaluation
         """
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.InvestmestsEvaluation_run)
-        self.remove_simulation(sim.SimulationTypes.InvestmestsEvaluation_run)
+        results = self.session.investments_evaluation
 
         # update the results in the circuit structures
         if results is not None:
+            self.remove_simulation(sim.SimulationTypes.InvestmestsEvaluation_run)
 
             self.ui.progress_label.setText('Colouring investments evaluation results in the grid...')
             QtGui.QGuiApplication.processEvents()
@@ -2399,7 +2386,7 @@ class SimulationsMain(TimeEventsMain):
         :return: ClusteringResults or None
         """
         if self.ui.actionUse_clustering.isChecked():
-            _, clustering_results = self.session.get_driver_results(sim.SimulationTypes.ClusteringAnalysis_run)
+            clustering_results = self.session.clustering
 
             if clustering_results is not None:
                 n = len(clustering_results.time_indices)
@@ -2465,8 +2452,9 @@ class SimulationsMain(TimeEventsMain):
 
         """
         # update the results in the circuit structures
-        drv, results = self.session.get_driver_results(sim.SimulationTypes.ClusteringAnalysis_run)
         self.remove_simulation(sim.SimulationTypes.ClusteringAnalysis_run)
+
+        results = self.session.clustering
         if results is not None:
 
             self.update_available_results()
@@ -2536,7 +2524,7 @@ class SimulationsMain(TimeEventsMain):
         if self.ui.actionUse_clustering.isChecked():
 
             # check if there are clustering results yet
-            _, clustering_results = self.session.get_driver_results(sim.SimulationTypes.ClusteringAnalysis_run)
+            clustering_results = self.session.clustering
 
             if clustering_results is not None:
                 n = len(clustering_results.time_indices)