VeraGridEngine 5.5.18__tar.gz → 5.5.19__tar.gz

{veragridengine-5.5.18 → veragridengine-5.5.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGridEngine
-Version: 5.5.18
+Version: 5.5.19
 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.

{veragridengine-5.5.18 → veragridengine-5.5.19}/VeraGridEngine/Simulations/InvestmentsEvaluation/investments_evaluation_driver.py

@@ -60,7 +60,8 @@ class InvestmentsEvaluationDriver(DriverTemplate):
                 plot_y_idx=0,
                 max_eval=self.options.max_eval
             )
-    def initialize(self, max_iter):
+
+    def initialize(self, max_iter: int):
         """
         Initialize the results
         :param max_iter: Maximum iterations
@@ -206,7 +207,7 @@ class InvestmentsEvaluationDriver(DriverTemplate):
         n_partitions = int(round(pop_size))
 
         # compile the snapshot
-        self.initialize(max_iter=self.options.max_eval * 2)
+        self.initialize(max_iter=self.options.max_eval)
 
         # add baseline
         ret = self.objective_function(x=np.zeros(self.problem.n_vars(), dtype=int))

{veragridengine-5.5.18 → veragridengine-5.5.19}/VeraGridEngine/Simulations/NTC/ntc_opf.py

@@ -533,7 +533,7 @@ def pmode3_formulation3(prob, t_idx, m, rate, P0, droop, theta_f, theta_t, base_
     return None
 
     
-def pmode3_formulation_convex_hull(prob, t_idx, m, rate, P0, droop, theta_f, theta_t,
+def pmode3_formulation_convex_hull(prob, t_idx, m, rate, P0, droop, theta_f, theta_t, f_obj,
                                    dtheta_max=1.57, base_name: str = "hvdc"):
     """
     Convex-hull (Balas) formulation for HVDC Pmode3.
@@ -594,8 +594,21 @@ def pmode3_formulation_convex_hull(prob, t_idx, m, rate, P0, droop, theta_f, the
     # Region selection
     prob.add_cst(lam_d + lam_u + lam_l == 1, name=nm("region_sum_eq"))
 
+    # New vars
+    phi = prob.add_var(lb=-dtheta_max, ub=dtheta_max, name=nm("phi"))   # control angle
+    s   = prob.add_var(lb=0.0,        ub=prob.INFINITY, name=nm("phi_slack_abs"))
+
+    # Use phi in droop law (replace your droop_affine_eq)
+    prob.add_cst(g == P0 + droop * phi, name=nm("droop_affine_eq_phi"))
+
+    # Softly tie phi to actual angle difference (absolute value with linear slacks)
+    prob.add_cst(s >=  phi - (theta_f - theta_t), name=nm("phi_couple_pos"))
+    prob.add_cst(s >= -(phi - (theta_f - theta_t)), name=nm("phi_couple_neg"))
+
+    f_obj += 1.0 * s
+
     # Droop eq.
-    prob.add_cst(g == P0 + droop * (theta_f - theta_t), name=nm("droop_affine_eq"))
+    # prob.add_cst(g == P0 + droop * (theta_f - theta_t), name=nm("droop_affine_eq"))
 
     # Flow decomposition in the three areas
     prob.add_cst(flow == f_d + f_u + f_l, name=nm("flow_decomp_eq"))
@@ -624,7 +637,7 @@ def pmode3_formulation_convex_hull(prob, t_idx, m, rate, P0, droop, theta_f, the
     prob.add_cst(g >=  rate * lam_u + gL * (1 - lam_u), name=nm("upper_sat_consistency_ge"))
     prob.add_cst(g <= -rate * lam_l + gU * (1 - lam_l), name=nm("lower_sat_consistency_le"))
 
-    return flow
+    return flow, f_obj
 
 
 def formulate_lp_abs_value(prob: LpModel, lp_var: LpVar, ub: float, M: float, name: str):
@@ -1993,7 +2006,7 @@ def add_linear_hvdc_formulation(t_idx: int,
                     #                                                 theta_t=vars_bus.Va[t_idx, to],
                     #                                                 base_name="hvdc")
 
-                    hvdc_vars.flows[t_idx, m] = pmode3_formulation_convex_hull(prob=prob,
+                    hvdc_vars.flows[t_idx, m], f_obj = pmode3_formulation_convex_hull(prob=prob,
                                                                        t_idx=t_idx,
                                                                        m=m,
                                                                        rate=hvdc_data_t.rates[m] / Sbase,
@@ -2001,6 +2014,7 @@ def add_linear_hvdc_formulation(t_idx: int,
                                                                        droop=droop,
                                                                        theta_f=vars_bus.Va[t_idx, fr],
                                                                        theta_t=vars_bus.Va[t_idx, to],
+                                                                       f_obj=f_obj,
                                                                        dtheta_max=1.0,
                                                                        base_name="hvdc")
 

{veragridengine-5.5.18 → veragridengine-5.5.19}/VeraGridEngine/Simulations/types.py

@@ -12,8 +12,8 @@ from VeraGridEngine.Simulations.ContingencyAnalysis.contingency_analysis_driver
                                                                                         ContingencyAnalysisResults)
 from VeraGridEngine.Simulations.ContingencyAnalysis.contingency_analysis_ts_driver import (
     ContingencyAnalysisTimeSeriesDriver, ContingencyAnalysisTimeSeriesResults)
-from VeraGridEngine.Simulations.ContinuationPowerFlow.continuation_power_flow_driver import (ContinuationPowerFlowDriver,
-                                                                                             ContinuationPowerFlowResults)
+from VeraGridEngine.Simulations.ContinuationPowerFlow.continuation_power_flow_driver import (
+    ContinuationPowerFlowDriver, ContinuationPowerFlowResults)
 from VeraGridEngine.Simulations.LinearFactors.linear_analysis_driver import LinearAnalysisDriver, LinearAnalysisResults
 from VeraGridEngine.Simulations.LinearFactors.linear_analysis_ts_driver import (LinearAnalysisTimeSeriesDriver,
                                                                                 LinearAnalysisTimeSeriesResults)
@@ -29,10 +29,11 @@ from VeraGridEngine.Simulations.Stochastic.stochastic_power_flow_driver import (
 from VeraGridEngine.Simulations.Clustering.clustering_driver import ClusteringDriver, ClusteringResults
 from VeraGridEngine.Simulations.Reliability.blackout_driver import CascadingDriver, CascadingResults
 from VeraGridEngine.Simulations.InputsAnalysis.inputs_analysis_driver import InputsAnalysisDriver, InputsAnalysisResults
-from VeraGridEngine.Simulations.InvestmentsEvaluation.investments_evaluation_driver import (InvestmentsEvaluationDriver,
-                                                                                            InvestmentsEvaluationResults)
+from VeraGridEngine.Simulations.InvestmentsEvaluation.investments_evaluation_driver import (
+    InvestmentsEvaluationDriver, InvestmentsEvaluationResults)
 from VeraGridEngine.Simulations.SigmaAnalysis.sigma_analysis_driver import SigmaAnalysisDriver, SigmaAnalysisResults
-from VeraGridEngine.Simulations.NTC.ntc_driver import OptimalNetTransferCapacityDriver, OptimalNetTransferCapacityResults
+from VeraGridEngine.Simulations.NTC.ntc_driver import (
+    OptimalNetTransferCapacityDriver, OptimalNetTransferCapacityResults)
 from VeraGridEngine.Simulations.NTC.ntc_ts_driver import (OptimalNetTransferCapacityTimeSeriesDriver,
                                                           OptimalNetTransferCapacityTimeSeriesResults)
 from VeraGridEngine.Simulations.NodalCapacity.nodal_capacity_ts_driver import (NodalCapacityTimeSeriesDriver,
@@ -41,6 +42,7 @@ from VeraGridEngine.Simulations.Topology.node_groups_driver import NodeGroupsDri
 from VeraGridEngine.Simulations.Reliability.reliability_driver import ReliabilityStudyDriver, ReliabilityResults
 
 from VeraGridEngine.Simulations.Rms.rms_driver import RmsSimulationDriver
+from VeraGridEngine.Simulations.SmallSignalStability.small_signal_driver import SmallSignalStabilityDriver
 
 DRIVER_OBJECTS = Union[
     AvailableTransferCapacityDriver,
@@ -66,7 +68,8 @@ DRIVER_OBJECTS = Union[
     InvestmentsEvaluationDriver,
     NodalCapacityTimeSeriesDriver,
     ReliabilityStudyDriver,
-    RmsSimulationDriver
+    RmsSimulationDriver,
+    SmallSignalStabilityDriver
 ]
 
 RESULTS_OBJECTS = Union[

{veragridengine-5.5.18 → veragridengine-5.5.19}/VeraGridEngine/Topology/VoltageLevels/double_bar.py

@@ -10,7 +10,7 @@ from VeraGridEngine.enumerations import BusGraphicType, SwitchGraphicType
 from VeraGridEngine.Topology.VoltageLevels.single_bar import connect_bar_segments
 
 
-def create_double_bar(
+def create_double_bar_with_disconnectors(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -228,7 +228,7 @@ def create_double_bar(
     return vl, conn_buses, all_buses, offset_total_x, offset_total_y
 
 
-def create_double_bar_with_disconnectors(
+def create_double_bar(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -378,7 +378,7 @@ def create_double_bar_with_disconnectors(
     return vl, conn_buses, all_buses, offset_total_x, offset_total_y
 
 
-def create_double_bar_with_transference_bar(
+def create_double_bar_with_transference_bar_with_disconnectors(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -419,7 +419,7 @@ def create_double_bar_with_transference_bar(
 
     if not bar_by_segments:
         bar1 = dev.Bus(name=f"{name} bar1", substation=substation, Vnom=v_nom, voltage_level=vl,
-                       width=(n_bays + 1) * bus_width + bus_width * 3 + (x_dist - bus_width) * n_bays,
+                       width=(n_bays + 1) * bus_width + bus_width * 2 + (x_dist - bus_width) * (n_bays - 1),
                        xpos=offset_x - bus_width,
                        ypos=offset_y + y_dist * 3,
                        country=country,
@@ -430,7 +430,7 @@ def create_double_bar_with_transference_bar(
         l_y_pos.append(bar1.y)
 
         bar2 = dev.Bus(name=f"{name} bar2", substation=substation, Vnom=v_nom, voltage_level=vl,
-                       width=(n_bays + 1) * bus_width + bus_width * 3 + (x_dist - bus_width) * n_bays,
+                       width=(n_bays + 1) * bus_width + bus_width * 2 + (x_dist - bus_width) * (n_bays - 1),
                        xpos=offset_x - bus_width,
                        ypos=offset_y + y_dist * 4, country=country,
                        graphic_type=BusGraphicType.BusBar)
@@ -440,7 +440,7 @@ def create_double_bar_with_transference_bar(
         l_y_pos.append(bar2.y)
 
         transfer_bar = dev.Bus(name=f"{name} transfer bar", substation=substation, Vnom=v_nom, voltage_level=vl,
-                               width=(n_bays + 1) * bus_width + bus_width * 3 + (x_dist - bus_width) * n_bays,
+                               width=(n_bays + 1) * bus_width + bus_width * 2 + (x_dist - bus_width) * (n_bays - 1),
                                xpos=offset_x - bus_width, ypos=offset_y + y_dist * 5, country=country,
                                graphic_type=BusGraphicType.BusBar)
         grid.add_bus(transfer_bar)
@@ -553,14 +553,14 @@ def create_double_bar_with_transference_bar(
 
     # coupling
     bus1 = dev.Bus(name=f"{name}_coupling_bar1", substation=substation, Vnom=v_nom, voltage_level=vl,
-                   xpos=offset_x + n_bays * x_dist + x_dist * 0.25,
+                   xpos=offset_x + n_bays * x_dist + x_dist * 0.5,
                    ypos=offset_y + y_dist * 3.6,
                    width=bus_width,
                    country=country,
                    graphic_type=BusGraphicType.Connectivity)
 
     bus2 = dev.Bus(name=f"{name}_coupling_bar2", substation=substation, Vnom=v_nom, voltage_level=vl,
-                   xpos=offset_x + n_bays * x_dist + x_dist * 0.25,
+                   xpos=offset_x + n_bays * x_dist + x_dist * 0.5,
                    ypos=offset_y + y_dist * 4.6,
                    width=bus_width,
                    country=country,
@@ -604,7 +604,7 @@ def create_double_bar_with_transference_bar(
     return vl, conn_buses, all_buses, offset_total_x, offset_total_y
 
 
-def create_double_bar_with_transference_bar_with_disconnectors(
+def create_double_bar_with_transference_bar(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -645,7 +645,7 @@ def create_double_bar_with_transference_bar_with_disconnectors(
 
     if not bar_by_segments:
         bar1 = dev.Bus(name=f"{name} bar1", substation=substation, Vnom=v_nom, voltage_level=vl,
-                       width=(n_bays + 1) * bus_width + bus_width * 3 + (x_dist - bus_width) * n_bays,
+                       width=(n_bays + 1) * bus_width + bus_width * 2 + (x_dist - bus_width) * (n_bays - 1),
                        xpos=offset_x - bus_width, ypos=offset_y + y_dist * 2, country=country,
                        graphic_type=BusGraphicType.BusBar)
         grid.add_bus(bar1)
@@ -654,7 +654,7 @@ def create_double_bar_with_transference_bar_with_disconnectors(
         l_y_pos.append(bar1.y)
 
         bar2 = dev.Bus(name=f"{name} bar2", substation=substation, Vnom=v_nom, voltage_level=vl,
-                       width=(n_bays + 1) * bus_width + bus_width * 3 + (x_dist - bus_width) * n_bays,
+                       width=(n_bays + 1) * bus_width + bus_width * 2 + (x_dist - bus_width) * (n_bays - 1),
                        xpos=offset_x - bus_width, ypos=offset_y + y_dist * 3, country=country,
                        graphic_type=BusGraphicType.BusBar)
         grid.add_bus(bar2)
@@ -663,7 +663,7 @@ def create_double_bar_with_transference_bar_with_disconnectors(
         l_y_pos.append(bar2.y)
 
         transfer_bar = dev.Bus(name=f"{name} transfer bar", substation=substation, Vnom=v_nom, voltage_level=vl,
-                               width=(n_bays + 1) * bus_width + bus_width * 3 + (x_dist - bus_width) * n_bays,
+                               width=(n_bays + 1) * bus_width + bus_width * 2 + (x_dist - bus_width) * (n_bays - 1),
                                xpos=offset_x - bus_width, ypos=offset_y + y_dist * 4, country=country,
                                graphic_type=BusGraphicType.BusBar)
         grid.add_bus(transfer_bar)
@@ -761,7 +761,7 @@ def create_double_bar_with_transference_bar_with_disconnectors(
 
     # coupling
     bus1 = dev.Bus(f"{name}_coupling_bar1", substation=substation, Vnom=v_nom, voltage_level=vl,
-                   xpos=offset_x + n_bays * x_dist + x_dist * 0.25,
+                   xpos=offset_x + n_bays * x_dist + x_dist * 0.5,
                    ypos=offset_y + y_dist * 3.6,
                    width=bus_width,
                    country=country,

{veragridengine-5.5.18 → veragridengine-5.5.19}/VeraGridEngine/Topology/VoltageLevels/single_bar.py

@@ -27,7 +27,7 @@ def connect_bar_segments(grid: MultiCircuit, bar_buses: List[dev.Bus], name: str
         grid.add_line(ln)
 
 
-def create_single_bar(name: str,
+def create_single_bar_with_disconnectors(name: str,
                       grid: MultiCircuit,
                       n_bays: int,
                       v_nom: float,
@@ -172,7 +172,7 @@ def create_single_bar(name: str,
     return vl, conn_buses, all_buses, offset_total_x, offset_total_y
 
 
-def create_single_bar_with_disconnectors(
+def create_single_bar(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -283,7 +283,7 @@ def create_single_bar_with_disconnectors(
     return vl, conn_buses, all_buses, offset_total_x, offset_total_y
 
 
-def create_single_bar_with_bypass(
+def create_single_bar_with_bypass_with_disconnectors(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -438,7 +438,7 @@ def create_single_bar_with_bypass(
     return vl, conn_buses, all_buses, offset_total_x, offset_total_y
 
 
-def create_single_bar_with_bypass_with_disconnectors(
+def create_single_bar_with_bypass(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -552,7 +552,7 @@ def create_single_bar_with_bypass_with_disconnectors(
     return vl, conn_buses, all_buses, offset_total_x, offset_total_y
 
 
-def create_single_bar_with_splitter(
+def create_single_bar_with_splitter_with_disconnectors(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -724,7 +724,7 @@ def create_single_bar_with_splitter(
     return vl, conn_buses, all_buses, offset_total_x, offset_total_y
 
 
-def create_single_bar_with_splitter_with_disconnectors(
+def create_single_bar_with_splitter(
         name: str,
         grid: MultiCircuit,
         n_bays: int,
@@ -786,9 +786,6 @@ def create_single_bar_with_splitter_with_disconnectors(
     l_x_pos.append(bar2.x)
     l_y_pos.append(bar2.y)
 
-    cb_bars = dev.Switch(name=f"CB_bars", bus_from=bar1, bus_to=bar2, graphic_type=SwitchGraphicType.CircuitBreaker)
-    grid.add_switch(cb_bars)
-
     for i in range(n_bays):
         if i < n_bays_bar_1:
             bar = bar1

{veragridengine-5.5.18 → veragridengine-5.5.19}/VeraGridEngine/__version__.py

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