GridCalEngine 5.0.0a17__tar.gz → 5.0.0a19__tar.gz

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Compilers/circuit_to_bentayga.py

@@ -694,11 +694,9 @@ def bentayga_linear_matrices(circuit: MultiCircuit, distributed_slack=False):
 def translate_bentayga_pf_results(grid: MultiCircuit, res) -> PowerFlowResults:
     results = PowerFlowResults(n=grid.get_bus_number(),
                                m=grid.get_branch_number_wo_hvdc(),
-                               n_tr=grid.get_transformers2w_number(),
                                n_hvdc=grid.get_hvdc_number(),
                                bus_names=res.names,
                                branch_names=res.names,
-                               transformer_names=[],
                                hvdc_names=res.hvdc_names,
                                bus_types=res.bus_types)
 

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Compilers/circuit_to_data.py

@@ -20,7 +20,7 @@ from GridCalEngine.Core.Devices.Substation.bus import Bus
 from GridCalEngine.Core.Devices.Aggregation.area import Area
 from GridCalEngine.Core.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.basic_structures import BusMode, BranchImpedanceMode, CxVec, ExternalGridMode
-from GridCalEngine.Core.Devices.enumerations import ConverterControlType, TransformerControlType
+from GridCalEngine.enumerations import ConverterControlType, TransformerControlType
 import GridCalEngine.Core.DataStructures as ds
 
 
@@ -292,8 +292,7 @@ def get_generator_data(circuit: MultiCircuit,
         data.names[k] = elm.name
         data.idtag[k] = elm.idtag
 
-        data.qmin[k] = elm.Qmin
-        data.qmax[k] = elm.Qmax
+
         data.controllable[k] = elm.is_controlled
         data.installed_p[k] = elm.Snom
 
@@ -363,6 +362,14 @@ def get_generator_data(circuit: MultiCircuit,
                     elif elm.Vset != Vbus[i]:
                         logger.add_error('Different set points', elm.bus.name, elm.Vset, Vbus[i])
 
+        # reactive power limits, for the given power value
+        if elm.use_reactive_power_curve:
+            data.qmin[k] = elm.q_curve.get_qmin(data.p[i])
+            data.qmax[k] = elm.q_curve.get_qmax(data.p[i])
+        else:
+            data.qmin[k] = elm.Qmin
+            data.qmax[k] = elm.Qmax
+
         data.C_bus_elm[i, k] = 1
 
     return data
@@ -402,9 +409,6 @@ def get_battery_data(circuit: MultiCircuit,
         data.names[k] = elm.name
         data.idtag[k] = elm.idtag
 
-        data.qmin[k] = elm.Qmin
-        data.qmax[k] = elm.Qmax
-
         data.controllable[k] = elm.is_controlled
         data.installed_p[k] = elm.Snom
 
@@ -481,6 +485,14 @@ def get_battery_data(circuit: MultiCircuit,
                     elif elm.Vset != Vbus[i]:
                         logger.add_error('Different set points', elm.bus.name, elm.Vset, Vbus[i])
 
+        # reactive power limits, for the given power value
+        if elm.use_reactive_power_curve:
+            data.qmin[k] = elm.q_curve.get_qmin(data.p[i])
+            data.qmax[k] = elm.q_curve.get_qmax(data.p[i])
+        else:
+            data.qmin[k] = elm.Qmin
+            data.qmax[k] = elm.Qmax
+
         data.C_bus_elm[i, k] = 1
 
     return data

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Compilers/circuit_to_newton_pa.py

@@ -19,7 +19,7 @@ import numpy as np
 from typing import List, Dict, Union
 from GridCalEngine.basic_structures import IntVec
 from GridCalEngine.Core.Devices.multi_circuit import MultiCircuit
-from GridCalEngine.Core.Devices.enumerations import TransformerControlType
+from GridCalEngine.enumerations import TransformerControlType, HvdcControlType
 import GridCalEngine.Core.Devices as dev
 from GridCalEngine.basic_structures import SolverType, ReactivePowerControlMode
 from GridCalEngine.Simulations.PowerFlow.power_flow_options import PowerFlowOptions
@@ -820,8 +820,8 @@ def add_hvdc_data(circuit: MultiCircuit,
     :param time_indices: Array of time indices
     """
 
-    cmode_dict = {dev.HvdcControlType.type_0_free: npa.HvdcControlMode.HvdcControlAngleDroop,
-                  dev.HvdcControlType.type_1_Pset: npa.HvdcControlMode.HvdcControlPfix}
+    cmode_dict = {HvdcControlType.type_0_free: npa.HvdcControlMode.HvdcControlAngleDroop,
+                  HvdcControlType.type_1_Pset: npa.HvdcControlMode.HvdcControlPfix}
 
     for i, elm in enumerate(circuit.hvdc_lines):
         hvdc = npa.HvdcLine(uuid=elm.idtag,
@@ -1130,8 +1130,8 @@ def get_newton_pa_linear_opf_options(opf_opt: "OptimalPowerFlowOptions",
                      bs.TimeGrouping.Monthly: npa.TimeGrouping.Monthly,
                      bs.TimeGrouping.Hourly: npa.TimeGrouping.Hourly}
 
-    opt = npa.LinearOpfOptions()
-    opt.solver = solver_dict[opf_opt.mip_solver]
+    opt = npa.LinearOpfOptions(solver=solver_dict[opf_opt.mip_solver])
+    # opt.solver = solver_dict[opf_opt.mip_solver]
     opt.grouping = grouping_dict[opf_opt.grouping]
     opt.unit_commitment = False
     opt.compute_flows = opf_opt.zonal_grouping == ZonalGrouping.NoGrouping
@@ -1434,7 +1434,8 @@ def translate_newton_pa_opf_results(grid: MultiCircuit, res: "npa.NonlinearOpfRe
                                       F=res.F,
                                       T=res.T,
                                       F_hvdc=res.hvdc_F,
-                                      T_hvdc=res.hvdc_T)
+                                      T_hvdc=res.hvdc_T,
+                                      bus_area_indices=grid.get_bus_area_indices())
 
     results.Sbus = res.Scalc[0, :],
     results.voltage = res.voltage[0, :],

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/DataStructures/branch_data.py

@@ -18,7 +18,7 @@ import numpy as np
 import pandas as pd
 import scipy.sparse as sp
 import GridCalEngine.Core.topology as tp
-from GridCalEngine.Core.Devices.enumerations import WindingsConnection
+from GridCalEngine.enumerations import WindingsConnection
 from GridCalEngine.basic_structures import Vec, IntVec, StrVec, ObjVec
 
 

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/DataStructures/hvdc_data.py

@@ -18,8 +18,8 @@ import numpy as np
 from typing import Tuple
 import scipy.sparse as sp
 import GridCalEngine.Core.topology as tp
-from GridCalEngine.Core.Devices.enumerations import HvdcControlType
-from GridCalEngine.basic_structures import CxVec, Vec, IntVec
+from GridCalEngine.enumerations import HvdcControlType
+from GridCalEngine.basic_structures import Vec, IntVec
 
 
 class HvdcData:

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/DataStructures/numerical_circuit.py

@@ -30,7 +30,7 @@ from GridCalEngine.Core.topology import compile_types
 from GridCalEngine.Simulations.sparse_solve import get_sparse_type
 import GridCalEngine.Core.Compilers.circuit_to_data as gc_compiler2
 import GridCalEngine.Core.admittance_matrices as ycalc
-from GridCalEngine.Core.Devices.enumerations import TransformerControlType, ConverterControlType
+from GridCalEngine.enumerations import TransformerControlType, ConverterControlType
 import GridCalEngine.Core.DataStructures as ds
 from GridCalEngine.Core.Devices.Substation.bus import Bus
 from GridCalEngine.Core.Devices.Aggregation.area import Area

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Aggregation/area.py

@@ -35,7 +35,6 @@ class GenericAreaGroup(EditableDevice):
                                 name=name,
                                 code=code,
                                 idtag=idtag,
-                                active=True,
                                 device_type=device_type)
 
         self.latitude = latitude

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Aggregation/contingency.py

@@ -44,7 +44,6 @@ class Contingency(EditableDevice):
         EditableDevice.__init__(self,
                                 idtag=idtag,
                                 code=code,
-                                active=True,
                                 name=name,
                                 device_type=DeviceType.ContingencyDevice)
 

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Aggregation/contingency_group.py

@@ -36,7 +36,6 @@ class ContingencyGroup(EditableDevice):
                                 name=name,
                                 idtag=idtag,
                                 code='',
-                                active=True,
                                 device_type=DeviceType.ContingencyGroupDevice)
 
         # Contingency type

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Aggregation/emission_gas.py

@@ -43,7 +43,6 @@ class EmissionGas(EditableDevice):
                                 name=name,
                                 code=code,
                                 idtag=idtag,
-                                active=True,
                                 device_type=DeviceType.EmissionGasDevice)
 
         self.cost = cost

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Aggregation/fuel.py

@@ -48,7 +48,6 @@ class Fuel(EditableDevice):
                                 name=name,
                                 code=code,
                                 idtag=idtag,
-                                active=True,
                                 device_type=DeviceType.FuelDevice)
 
         self.cost = cost

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Aggregation/investment.py

@@ -48,7 +48,6 @@ class Investment(EditableDevice):
         EditableDevice.__init__(self,
                                 idtag=idtag,
                                 code=code,
-                                active=True,
                                 name=name,
                                 device_type=DeviceType.InvestmentDevice)
 

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Aggregation/investments_group.py

@@ -41,7 +41,6 @@ class InvestmentsGroup(EditableDevice):
                                 name=name,
                                 idtag=idtag,
                                 code='',
-                                active=True,
                                 device_type=DeviceType.InvestmentsGroupDevice)
 
         # Contingency type

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Aggregation/technology.py

@@ -36,7 +36,6 @@ class Technology(EditableDevice):
                                 name=name,
                                 code=code,
                                 idtag=idtag,
-                                active=True,
                                 device_type=DeviceType.Technology)
 
         self.name2 = ""

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Associations/generator_emission.py

@@ -42,7 +42,6 @@ class GeneratorEmission(EditableDevice):
                                 name=name,
                                 code=code,
                                 idtag=idtag,
-                                active=True,
                                 device_type=DeviceType.GeneratorEmissionAssociation)
 
         self.generator = generator

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Associations/generator_fuel.py

@@ -42,7 +42,6 @@ class GeneratorFuel(EditableDevice):
                                 name=name,
                                 code=code,
                                 idtag=idtag,
-                                active=True,
                                 device_type=DeviceType.GeneratorFuelAssociation)
 
         self.generator = generator

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Associations/generator_technology.py

@@ -42,7 +42,6 @@ class GeneratorTechnology(EditableDevice):
                                 name=name,
                                 code=code,
                                 idtag=idtag,
-                                active=True,
                                 device_type=DeviceType.GeneratorTechnologyAssociation)
 
         self.generator = generator

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Branches/__init__.py

@@ -16,7 +16,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-from GridCalEngine.Core.Devices.Branches.branch import Branch, BranchTemplate
+from GridCalEngine.Core.Devices.Branches.branch import Branch, BranchTemplate, BranchType
 from GridCalEngine.Core.Devices.Branches.dc_line import DcLine
 from GridCalEngine.Core.Devices.Branches.line import Line
 from GridCalEngine.Core.Devices.Branches.hvdc_line import HvdcLine

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Branches/branch.py

@@ -21,13 +21,13 @@ import numpy as np
 from matplotlib import pyplot as plt
 from enum import Enum
 from GridCalEngine.Core.Devices.Substation.bus import Bus
-from GridCalEngine.Core.Devices.enumerations import BuildStatus
+from GridCalEngine.enumerations import BuildStatus
 from GridCalEngine.Core.Devices.Branches.templates.parent_branch import ParentBranch
 from GridCalEngine.Core.Devices.Branches.tap_changer import TapChanger
-from GridCalEngine.Core.Devices.Branches.transformer import TransformerType, Transformer2W
+from GridCalEngine.Core.Devices.Branches.transformer import Transformer2W
 from GridCalEngine.Core.Devices.Branches.line import Line
 
-from GridCalEngine.Core.Devices.editable_device import EditableDevice, DeviceType, GCProp
+from GridCalEngine.Core.Devices.editable_device import DeviceType
 
 # Global sqrt of 3 (bad practice?)
 SQRT3 = np.sqrt(3.0)

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Branches/dc_line.py

@@ -17,16 +17,13 @@
 
 
 import pandas as pd
-import numpy as np
-from typing import Tuple, Union
+from typing import Union
 from matplotlib import pyplot as plt
 
-from GridCalEngine.basic_structures import Logger
 from GridCalEngine.Core.Devices.Substation.bus import Bus
-from GridCalEngine.Core.Devices.Branches.templates.overhead_line_type import OverheadLineType
-from GridCalEngine.Core.Devices.Branches.line import LineTemplate, SequenceLineType, UndergroundLineType
+from GridCalEngine.Core.Devices.Branches.line import LineTemplate
 from GridCalEngine.Core.Devices.Branches.templates.parent_branch import ParentBranch
-from GridCalEngine.Core.Devices.enumerations import DeviceType, BuildStatus
+from GridCalEngine.enumerations import DeviceType, BuildStatus
 
 
 class DcLine(ParentBranch):
@@ -209,70 +206,6 @@ class DcLine(ParentBranch):
 
         return b
 
-    def apply_template(self, obj: OverheadLineType, Sbase, logger=Logger()):
-        """
-        Apply a branch template to this object
-
-        Arguments:
-
-            **obj**: TransformerType or Tower object
-
-            **Sbase** (float): Nominal power in MVA
-
-            **logger** (list, []): Log list
-
-        """
-
-        if type(obj) is OverheadLineType:
-
-            Vn = self.bus_to.Vnom
-            Zbase = (Vn * Vn) / Sbase
-            Ybase = 1 / Zbase
-
-            z = obj.z_series() * self.length / Zbase
-            y = obj.y_shunt() * self.length / Ybase
-
-            self.R = np.round(z.real, 6)
-
-            # get the rating in MVA = kA * kV
-            self.rate = obj.rating * Vn * np.sqrt(3)
-
-            if obj != self.template:
-                self.template = obj
-
-        elif type(obj) is UndergroundLineType:
-            Vn = self.bus_to.Vnom
-            Zbase = (Vn * Vn) / Sbase
-            Ybase = 1 / Zbase
-
-            z = obj.z_series() * self.length / Zbase
-            y = obj.y_shunt() * self.length / Ybase
-
-            self.R = np.round(z.real, 6)
-
-            # get the rating in MVA = kA * kV
-            self.rate = obj.rating * Vn * np.sqrt(3)
-
-            if obj != self.template:
-                self.template = obj
-
-        elif type(obj) is SequenceLineType:
-
-            Vn = self.bus_to.Vnom
-            Zbase = (Vn * Vn) / Sbase
-            Ybase = 1 / Zbase
-
-            self.R = np.round(obj.R * self.length / Zbase, 6)
-
-            # get the rating in MVA = kA * kV
-            self.rate = obj.rating * Vn * np.sqrt(3)
-
-            if obj != self.template:
-                self.template = obj
-
-        else:
-            logger.add_error('Template not recognised', self.name)
-
     def get_save_data(self):
         """
         Return the data that matches the edit_headers

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Branches/hvdc_line.py

@@ -22,9 +22,9 @@ from typing import Tuple
 from matplotlib import pyplot as plt
 
 from GridCalEngine.Core.Devices.Substation.bus import Bus
-from GridCalEngine.Core.Devices.enumerations import DeviceType, BuildStatus
+from GridCalEngine.enumerations import DeviceType, BuildStatus
 from GridCalEngine.Core.Devices.Branches.templates.parent_branch import ParentBranch
-from GridCalEngine.Core.Devices.enumerations import HvdcControlType
+from GridCalEngine.enumerations import HvdcControlType
 
 
 def firing_angles_to_reactive_limits(P, alphamin, alphamax) -> Tuple[float, float]:

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Branches/line.py

@@ -19,7 +19,7 @@ import numpy as np
 from typing import Union, Tuple
 from GridCalEngine.basic_structures import Logger
 from GridCalEngine.Core.Devices.Substation.bus import Bus
-from GridCalEngine.Core.Devices.enumerations import BuildStatus
+from GridCalEngine.enumerations import BuildStatus
 from GridCalEngine.Core.Devices.Branches.templates.underground_line import UndergroundLineType
 from GridCalEngine.Core.Devices.Branches.templates.overhead_line_type import OverheadLineType
 from GridCalEngine.Core.Devices.Branches.transformer import Transformer2W
@@ -222,72 +222,10 @@ class Line(ParentBranch):
         :param logger: Logger
         """
 
-        if type(obj) is OverheadLineType:
+        if type(obj) in [OverheadLineType, UndergroundLineType, SequenceLineType]:
 
-            Vn = self.bus_to.Vnom
-            Zbase = (Vn * Vn) / Sbase
-            Ybase = 1 / Zbase
-
-            z1 = obj.z_series() * self.length / Zbase
-            y1 = obj.y_shunt() * self.length / Ybase
-            self.R = np.round(z1.real, 6)
-            self.X = np.round(z1.imag, 6)
-            self.B = np.round(y1.imag, 6)
-
-            z0 = obj.z0_series() * self.length / Zbase
-            y0 = obj.y0_shunt() * self.length / Ybase
-            self.R = np.round(z0.real, 6)
-            self.X = np.round(z0.imag, 6)
-            self.B = np.round(y0.imag, 6)
-
-            z2 = obj.z2_series() * self.length / Zbase
-            y2 = obj.y2_shunt() * self.length / Ybase
-            self.R = np.round(z2.real, 6)
-            self.X = np.round(z2.imag, 6)
-            self.B = np.round(y2.imag, 6)
-
-            # get the rating in MVA = kA * kV
-            self.rate = obj.rating * Vn * np.sqrt(3)
-
-            if self.template is not None:
-                if obj != self.template:
-                    self.template = obj
-            else:
-                self.template = obj
-
-        elif type(obj) is UndergroundLineType:
-            Vn = self.bus_to.Vnom
-            Zbase = (Vn * Vn) / Sbase
-            Ybase = 1 / Zbase
-
-            z = obj.z_series() * self.length / Zbase
-            y = obj.y_shunt() * self.length / Ybase
-
-            self.R = np.round(z.real, 6)
-            self.X = np.round(z.imag, 6)
-            self.B = np.round(y.imag, 6)
-
-            # get the rating in MVA = kA * kV
-            self.rate = obj.rating * Vn * np.sqrt(3)
-
-            if self.template is not None:
-                if obj != self.template:
-                    self.template = obj
-            else:
-                self.template = obj
-
-        elif type(obj) is SequenceLineType:
-
-            Vn = self.bus_to.Vnom
-            Zbase = (Vn * Vn) / Sbase
-            Ybase = 1 / Zbase
-
-            self.R = np.round(obj.R * self.length / Zbase, 6)
-            self.X = np.round(obj.X * self.length / Zbase, 6)
-            self.B = np.round(obj.B * self.length / Ybase, 6)
-
-            # get the rating in MVA = kA * kV
-            self.rate = obj.rating * Vn * np.sqrt(3)
+            self.R, self.X, self.B, self.R0, self.X0, self.B0, self.rate = obj.get_values(Sbase=Sbase,
+                                                                                          length=self.length)
 
             if self.template is not None:
                 if obj != self.template:

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Branches/switch.py

@@ -17,7 +17,7 @@
 
 
 from GridCalEngine.Core.Devices.Substation.bus import Bus
-from GridCalEngine.Core.Devices.enumerations import BuildStatus
+from GridCalEngine.enumerations import BuildStatus
 from GridCalEngine.Core.Devices.Branches.templates.parent_branch import ParentBranch
 from GridCalEngine.Core.Devices.editable_device import DeviceType
 

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Branches/templates/overhead_line_type.py

@@ -67,12 +67,13 @@ class OverheadLineType(EditableDevice):
                                 name=name,
                                 idtag=idtag,
                                 code='',
-                                active=True,
                                 device_type=DeviceType.OverheadLineTypeDevice)
 
         # list of wires in the tower
         self.wires_in_tower = list()
 
+        self.Vnom = 1.0
+
         # properties
         # self.tower_name = name
         self.earth_resistivity = 100
@@ -83,7 +84,6 @@ class OverheadLineType(EditableDevice):
         self.X1 = 0.0
 
         # total shunt admittance (positive sequence)
-        self.Gsh1 = 0.0
         self.Bsh1 = 0.0
 
         # total series impedance (positive sequence)
@@ -91,11 +91,10 @@ class OverheadLineType(EditableDevice):
         self.X0 = 0.0
 
         # total shunt admittance (positive sequence)
-        self.Gsh0 = 0.0
         self.Bsh0 = 0.0
 
         # current rating of the tower in kA
-        self.rating = 0.0
+        self.Imax = 0.0
 
         # impedances
         self.z_abcn = None
@@ -120,13 +119,12 @@ class OverheadLineType(EditableDevice):
         self.register(key='frequency', units='Hz', tpe=float, definition='Frequency')
         self.register(key='R1', units='Ohm/km', tpe=float, definition='Positive sequence resistance')
         self.register(key='X1', units='Ohm/km', tpe=float, definition='Positive sequence reactance')
-        self.register(key='Gsh1', units='S/km', tpe=float, definition='Positive sequence shunt conductance')
-        self.register(key='Bsh1', units='S/km', tpe=float, definition='Positive sequence shunt susceptance')
+        self.register(key='Bsh1', units='uS/km', tpe=float, definition='Positive sequence shunt susceptance')
         self.register(key='R0', units='Ohm/km', tpe=float, definition='Zero-sequence resistance')
         self.register(key='X0', units='Ohm/km', tpe=float, definition='Zero sequence reactance')
-        self.register(key='Gsh0', units='S/km', tpe=float, definition='Zero sequence shunt conductance')
-        self.register(key='Bsh0', units='S/km', tpe=float, definition='Zero sequence shunt susceptance')
-        self.register(key='rating', units='kA', tpe=float, definition='Current rating of the tower')
+        self.register(key='Bsh0', units='uS/km', tpe=float, definition='Zero sequence shunt susceptance')
+        self.register(key='Imax', units='kA', tpe=float, definition='Current rating of the tower', old_names=['rating'])
+        self.register(key='Vnom', units='kV', tpe=float, definition='Voltage rating of the line')
 
     def add_wire(self, w: Wire):
         """
@@ -158,19 +156,19 @@ class OverheadLineType(EditableDevice):
         """
         positive sequence shunt admittance in S per unit of length
         """
-        return self.Gsh1 + 1j * self.Bsh1
+        return 1j * self.Bsh1
 
     def y0_shunt(self):
         """
         zero sequence shunt admittance in S per unit of length
         """
-        return self.Gsh0 + 1j * self.Bsh0
+        return 1j * self.Bsh0
 
     def y2_shunt(self):
         """
         negative sequence shunt admittance in S per unit of length
         """
-        return self.Gsh0 + 1j * self.Bsh0
+        return 1j * self.Bsh0
 
     def plot(self, ax=None):
         """
@@ -278,17 +276,15 @@ class OverheadLineType(EditableDevice):
                 self.y_seq = calc_y_matrix(self.wires_in_tower, f=self.frequency, rho=self.earth_resistivity)
 
             # compute the tower rating in kA
-            self.rating = self.compute_rating()
+            self.Imax = self.compute_rating()
 
             self.R0 = self.z_seq[0, 0].real
             self.X0 = self.z_seq[0, 0].imag
-            self.Gsh0 = self.y_seq[0, 0].real
-            self.Bsh0 = self.y_seq[0, 0].imag
+            self.Bsh0 = self.y_seq[0, 0].imag * 1e6
 
             self.R1 = self.z_seq[1, 1].real
             self.X1 = self.z_seq[1, 1].imag
-            self.Gsh1 = self.y_seq[1, 1].real
-            self.Bsh1 = self.y_seq[1, 1].imag
+            self.Bsh1 = self.y_seq[1, 1].imag * 1e6
         else:
             pass
 
@@ -303,6 +299,40 @@ class OverheadLineType(EditableDevice):
             if self.wires_in_tower[i].wire.name == wire.name:
                 return True
 
+    def get_values(self, Sbase, length):
+        """
+
+        :param Sbase:
+        :param length:
+        :return:
+        """
+        Vn = self.Vnom
+        Zbase = (Vn * Vn) / Sbase
+        Ybase = 1 / Zbase
+
+        z1 = self.z_series() * length / Zbase
+        y1 = self.y_shunt() * length * -1e6 / Ybase
+        R1 = np.round(z1.real, 6)
+        X1 = np.round(z1.imag, 6)
+        B1 = np.round(y1.imag, 6)
+
+        z0 = self.z0_series() * length / Zbase
+        y0 = self.y0_shunt() * length * -1e6 / Ybase
+        R0 = np.round(z0.real, 6)
+        X0 = np.round(z0.imag, 6)
+        B0 = np.round(y0.imag, 6)
+
+        z2 = self.z2_series() * length / Zbase
+        y2 = self.y2_shunt() * length * -1e6 / Ybase
+        R2 = np.round(z2.real, 6)
+        X2 = np.round(z2.imag, 6)
+        B2 = np.round(y2.imag, 6)
+
+        # get the rating in MVA = kA * kV
+        rate = self.Imax * Vn * np.sqrt(3)
+
+        return R1, X1, B1, R0, X0, B0, rate
+
     def __str__(self):
         return self.name
 

{GridCalEngine-5.0.0a17 → GridCalEngine-5.0.0a19}/GridCalEngine/Core/Devices/Branches/templates/parent_branch.py

@@ -24,7 +24,7 @@ from matplotlib import pyplot as plt
 from GridCalEngine.basic_structures import Logger, Vec, BoolVec
 from GridCalEngine.Core.Devices.Substation.bus import Bus
 from GridCalEngine.Core.Devices.Substation.connectivity_node import ConnectivityNode
-from GridCalEngine.Core.Devices.enumerations import BuildStatus
+from GridCalEngine.enumerations import BuildStatus
 from GridCalEngine.Core.Devices.editable_device import EditableDevice, DeviceType
 
 
@@ -89,7 +89,6 @@ class ParentBranch(EditableDevice):
                                 name=name,
                                 idtag=idtag,
                                 code=code,
-                                active=active,
                                 device_type=device_type)
 
         # connectivity
@@ -99,6 +98,9 @@ class ParentBranch(EditableDevice):
         self.cn_from = cn_from
         self.cn_to = cn_to
 
+        self.active = active
+        self.active_prof = active_prof
+
         # List of measurements
         self.measurements = list()
 
@@ -120,8 +122,6 @@ class ParentBranch(EditableDevice):
 
         self.build_status = build_status
 
-        self.active_prof = active_prof
-
         # line rating in MVA
         self.rate = rate
         self.rate_prof = rate_prof