GridCalEngine 5.0.17__tar.gz → 5.0.21__tar.gz

{GridCalEngine-5.0.17 → GridCalEngine-5.0.21}/GridCalEngine/Compilers/circuit_to_data.py

@@ -246,7 +246,6 @@ def get_load_data(circuit: MultiCircuit,
 
         else:
             data.I[ii] = complex(elm.Ir, elm.Ii)
-            data.Y[ii] = complex(elm.G, elm.B)
             data.active[ii] = elm.active
             data.cost[ii] = elm.Cost
 
@@ -1045,6 +1044,63 @@ def get_branch_data(circuit: MultiCircuit,
 
         ii += 1
 
+    # Series reactance
+    for i, elm in enumerate(circuit.series_reactances):
+        # generic stuff
+        f = bus_dict[elm.bus_from]
+        t = bus_dict[elm.bus_to]
+
+        data.names[ii] = elm.name
+        data.idtag[ii] = elm.idtag
+
+        data.mttf[ii] = elm.mttf
+        data.mttr[ii] = elm.mttr
+
+        data.dc[ii] = 0
+
+        if time_series:
+            data.active[ii] = elm.active_prof[t_idx]
+            data.rates[ii] = elm.rate_prof[t_idx]
+            data.contingency_rates[ii] = elm.rate_prof[t_idx] * elm.contingency_factor_prof[t_idx]
+            data.protection_rates[ii] = elm.rate_prof[t_idx] * elm.protection_rating_factor_prof[t_idx]
+            data.overload_cost[ii] = elm.Cost_prof[t_idx]
+        else:
+            data.active[ii] = elm.active
+            data.rates[ii] = elm.rate
+            data.contingency_rates[ii] = elm.rate * elm.contingency_factor
+            data.protection_rates[ii] = elm.rate * elm.protection_rating_factor
+            data.overload_cost[ii] = elm.Cost
+
+        data.C_branch_bus_f[ii, f] = 1
+        data.C_branch_bus_t[ii, t] = 1
+        data.F[ii] = f
+        data.T[ii] = t
+
+        data.contingency_enabled[ii] = int(elm.contingency_enabled)
+        data.monitor_loading[ii] = int(elm.monitor_loading)
+
+        data.control_mode[ii] = TransformerControlType.fixed
+
+        data.virtual_tap_f[ii], data.virtual_tap_t[ii] = elm.get_virtual_taps()
+
+        if apply_temperature:
+            data.R[ii] = elm.R_corrected
+        else:
+            data.R[ii] = elm.R
+
+        if branch_tolerance_mode == BranchImpedanceMode.Lower:
+            data.R[ii] *= (1 - elm.tolerance / 100.0)
+        elif branch_tolerance_mode == BranchImpedanceMode.Upper:
+            data.R[ii] *= (1 + elm.tolerance / 100.0)
+
+        data.X[ii] = elm.X
+        data.R0[ii] = elm.R0
+        data.X0[ii] = elm.X0
+
+        data.R2[ii] = elm.R2
+        data.X2[ii] = elm.X2
+        ii += 1
+
     return data
 
 

{GridCalEngine-5.0.17 → GridCalEngine-5.0.21}/GridCalEngine/DataStructures/branch_data.py

@@ -147,15 +147,15 @@ class BranchData:
         data.G = self.G[elm_idx]
         data.B = self.B[elm_idx]
 
-        data.R0 = self.R[elm_idx]
-        data.X0 = self.X[elm_idx]
-        data.G0 = self.G[elm_idx]
-        data.B0 = self.B[elm_idx]
-
-        data.R2 = self.R[elm_idx]
-        data.X2 = self.X[elm_idx]
-        data.G2 = self.G[elm_idx]
-        data.B2 = self.B[elm_idx]
+        data.R0 = self.R0[elm_idx]
+        data.X0 = self.X0[elm_idx]
+        data.G0 = self.G0[elm_idx]
+        data.B0 = self.B0[elm_idx]
+
+        data.R2 = self.R2[elm_idx]
+        data.X2 = self.X2[elm_idx]
+        data.G2 = self.G2[elm_idx]
+        data.B2 = self.B2[elm_idx]
 
         data.k = self.k[elm_idx]
         data.virtual_tap_f = self.virtual_tap_f[elm_idx]

{GridCalEngine-5.0.17 → GridCalEngine-5.0.21}/GridCalEngine/Devices/Aggregation/area.py

@@ -46,22 +46,6 @@ class GenericAreaGroup(EditableDevice):
         self.register(key='latitude', units='deg', tpe=float, definition='latitude of the bus.', profile_name='',
                       editable=False)
 
-    def get_properties_dict(self, version=3):
-
-        data = {'id': self.idtag,
-                'name': self.name,
-                'code': self.code
-                }
-        return data
-
-    def get_profiles_dict(self, version=3):
-        data = {'id': self.idtag}
-        return data
-
-    def get_units_dict(self, version=3):
-        data = {}
-        return data
-
 
 class Area(GenericAreaGroup):
 

{GridCalEngine-5.0.17 → GridCalEngine-5.0.21}/GridCalEngine/Devices/Branches/__init__.py

@@ -15,7 +15,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-
 from GridCalEngine.Devices.Branches.branch import Branch, BranchType
 from GridCalEngine.Devices.Branches.dc_line import DcLine
 from GridCalEngine.Devices.Branches.line import Line
@@ -23,6 +22,7 @@ from GridCalEngine.Devices.Branches.hvdc_line import HvdcLine
 from GridCalEngine.Devices.Branches.switch import Switch
 from GridCalEngine.Devices.Branches.transformer import Transformer2W
 from GridCalEngine.Devices.Branches.transformer3w import Transformer3W
+from GridCalEngine.Devices.Branches.series_reactance import SeriesReactance
 from GridCalEngine.Devices.Branches.upfc import UPFC
 from GridCalEngine.Devices.Branches.vsc import VSC
 from GridCalEngine.Devices.Branches.winding import Winding
@@ -32,3 +32,4 @@ from GridCalEngine.Devices.Branches.transformer_type import TransformerType
 from GridCalEngine.Devices.Branches.overhead_line_type import OverheadLineType, WireInTower
 from GridCalEngine.Devices.Branches.sequence_line_type import SequenceLineType
 from GridCalEngine.Devices.Branches.underground_line_type import UndergroundLineType
+from GridCalEngine.Devices.Branches.line_locations import LineLocations, LineLocation

{GridCalEngine-5.0.17 → GridCalEngine-5.0.21}/GridCalEngine/Devices/Branches/branch.py

@@ -173,9 +173,9 @@ class Branch(BranchParent):
         # Tap module
         if tap != 0:
             self.tap_module = tap
-            self.tap_changer.set_tap(self.tap_module)
+            self.tap_changer.set_tap_module(self.tap_module)
         else:
-            self.tap_module = self.tap_changer.get_tap()
+            self.tap_module = self.tap_changer.get_tap_module()
 
         # Tap angle
         self.angle = shift_angle
@@ -331,14 +331,14 @@ class Branch(BranchParent):
         Move the tap changer one position up
         """
         self.tap_changer.tap_up()
-        self.tap_module = self.tap_changer.get_tap()
+        self.tap_module = self.tap_changer.get_tap_module()
 
     def tap_down(self):
         """
         Move the tap changer one position up
         """
         self.tap_changer.tap_down()
-        self.tap_module = self.tap_changer.get_tap()
+        self.tap_module = self.tap_changer.get_tap_module()
 
     def apply_tap_changer(self, tap_changer: TapChanger):
         """
@@ -352,9 +352,9 @@ class Branch(BranchParent):
         self.tap_changer = tap_changer
 
         if self.tap_module != 0:
-            self.tap_changer.set_tap(self.tap_module)
+            self.tap_changer.set_tap_module(self.tap_module)
         else:
-            self.tap_module = self.tap_changer.get_tap()
+            self.tap_module = self.tap_changer.get_tap_module()
 
     def get_save_data(self):
         """

{GridCalEngine-5.0.17 → GridCalEngine-5.0.21}/GridCalEngine/Devices/Branches/dc_line.py

@@ -15,7 +15,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-
 import pandas as pd
 from typing import Union
 from matplotlib import pyplot as plt
@@ -23,7 +22,8 @@ import numpy as np
 from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices.Parents.branch_parent import BranchParent
 from GridCalEngine.Devices.profile import Profile
-from GridCalEngine.enumerations import DeviceType, BuildStatus
+from GridCalEngine.enumerations import DeviceType, BuildStatus, SubObjectType
+from GridCalEngine.Devices.Branches.line_locations import LineLocations
 
 
 class DcLine(BranchParent):
@@ -132,6 +132,9 @@ class DcLine(BranchParent):
         # type template
         self.template = template
 
+        # Line locations
+        self._locations: LineLocations = LineLocations()
+
         self.register(key='R', units='p.u.', tpe=float, definition='Total positive sequence resistance.')
         self.register(key='length', units='km', tpe=float, definition='Length of the line (not used for calculation)')
         self.register(key='r_fault', units='p.u.', tpe=float,
@@ -141,6 +144,8 @@ class DcLine(BranchParent):
                                  'be at the "to" side,therefore 0.5 is at the middle.')
         self.register(key='template', units='', tpe=DeviceType.SequenceLineDevice, definition='', editable=False)
 
+        self.register(key='locations', units='', tpe=SubObjectType.LineLocations, definition='', editable=False)
+
     @property
     def temp_oper_prof(self) -> Profile:
         """
@@ -158,6 +163,23 @@ class DcLine(BranchParent):
         else:
             raise Exception(str(type(val)) + 'not supported to be set into a temp_oper_prof')
 
+    @property
+    def locations(self) -> LineLocations:
+        """
+        Cost profile
+        :return: Profile
+        """
+        return self._locations
+
+    @locations.setter
+    def locations(self, val: Union[LineLocations, np.ndarray]):
+        if isinstance(val, LineLocations):
+            self._locations = val
+        elif isinstance(val, np.ndarray):
+            self._locations.set(data=val)
+        else:
+            raise Exception(str(type(val)) + 'not supported to be set into a locations')
+
     @property
     def R_corrected(self):
         """
@@ -234,78 +256,6 @@ class DcLine(BranchParent):
                 data.append(obj)
         return data
 
-    def get_properties_dict(self, version=3):
-        """
-        Get json dictionary
-        :return:
-        """
-        if version == 2:
-            return {'id': self.idtag,
-                    'type': 'dc_line',
-                    'phases': 'ps',
-                    'name': self.name,
-                    'name_code': self.code,
-                    'bus_from': self.bus_from.idtag,
-                    'bus_to': self.bus_to.idtag,
-                    'active': self.active,
-                    'rate': self.rate,
-                    'r': self.R,
-                    'length': self.length,
-                    'base_temperature': self.temp_base,
-                    'operational_temperature': self.temp_oper,
-                    'alpha': self.alpha,
-                    'locations': []}
-        elif version == 3:
-            return {'id': self.idtag,
-                    'type': 'dc_line',
-                    'phases': 'ps',
-                    'name': self.name,
-                    'name_code': self.code,
-                    'bus_from': self.bus_from.idtag,
-                    'bus_to': self.bus_to.idtag,
-                    'active': self.active,
-                    'rate': self.rate,
-                    'contingency_factor1': self.contingency_factor,
-                    'contingency_factor2': self.contingency_factor,
-                    'contingency_factor3': self.contingency_factor,
-                    'r': self.R,
-                    'length': self.length,
-                    'base_temperature': self.temp_base,
-                    'operational_temperature': self.temp_oper,
-                    'alpha': self.alpha,
-
-                    'overload_cost': self.Cost,
-                    'capex': self.capex,
-                    'opex': self.opex,
-                    'build_status': str(self.build_status.value).lower(),
-                    'locations': []}
-        else:
-            return dict()
-
-    def get_profiles_dict(self, version=3):
-
-        if self.active_prof is not None:
-            active_prof = self.active_prof.tolist()
-            rate_prof = self.rate_prof.tolist()
-        else:
-            active_prof = list()
-            rate_prof = list()
-
-        return {'id': self.idtag,
-                'active': active_prof,
-                'rate': rate_prof}
-
-    def get_units_dict(self, version=3):
-        """
-        Get units of the values
-        """
-        return {'rate': 'MW',
-                'r': 'p.u.',
-                'length': 'km',
-                'base_temperature': 'ºC',
-                'operational_temperature': 'ºC',
-                'alpha': '1/ºC'}
-
     def plot_profiles(self, time_series=None, my_index=0, show_fig=True):
         """
         Plot the time series results of this object

{GridCalEngine-5.0.17 → GridCalEngine-5.0.21}/GridCalEngine/Devices/Branches/hvdc_line.py

@@ -22,11 +22,12 @@ from typing import Tuple, Union
 from matplotlib import pyplot as plt
 
 from GridCalEngine.Devices.Substation.bus import Bus
-from GridCalEngine.enumerations import DeviceType, BuildStatus
+from GridCalEngine.enumerations import DeviceType, BuildStatus, SubObjectType
 from GridCalEngine.Devices.Parents.branch_parent import BranchParent
 from GridCalEngine.enumerations import HvdcControlType
 from GridCalEngine.basic_structures import Vec, IntVec
 from GridCalEngine.Devices.profile import Profile
+from GridCalEngine.Devices.Branches.line_locations import LineLocations
 
 
 def firing_angles_to_reactive_limits(P, alphamin, alphamax) -> Tuple[float, float]:
@@ -185,9 +186,6 @@ class HvdcLine(BranchParent):
                               Cost=overload_cost,
                               device_type=DeviceType.HVDCLineDevice)
 
-        # List of measurements
-        self.measurements = list()
-
         # line length in km
         self.length = length
 
@@ -238,6 +236,9 @@ class HvdcLine(BranchParent):
 
         self.n_lines = n_lines
 
+        # Line locations
+        self._locations: LineLocations = LineLocations()
+
         self.register(key='dispatchable', units='', tpe=bool, definition='Is the line power optimizable?')
 
         self.register(key='control_mode', units='-', tpe=HvdcControlType, definition='Control type.')
@@ -263,6 +264,10 @@ class HvdcLine(BranchParent):
 
         self.register(key='length', units='km', tpe=float, definition='Length of the branch (not used for calculation)')
 
+        self.register(key='locations', units='', tpe=SubObjectType.LineLocations, definition='', editable=False)
+
+        self.registered_properties['Cost'].old_names.append('overload_cost')
+
     @property
     def active_prof(self) -> Profile:
         """
@@ -399,6 +404,23 @@ class HvdcLine(BranchParent):
         else:
             raise Exception(str(type(val)) + 'not supported to be set into a Vset_t_prof')
 
+    @property
+    def locations(self) -> LineLocations:
+        """
+        Cost profile
+        :return: Profile
+        """
+        return self._locations
+
+    @locations.setter
+    def locations(self, val: Union[LineLocations, np.ndarray]):
+        if isinstance(val, LineLocations):
+            self._locations = val
+        elif isinstance(val, np.ndarray):
+            self._locations.set(data=val)
+        else:
+            raise Exception(str(type(val)) + 'not supported to be set into a locations')
+
     def get_from_and_to_power(self, theta_f, theta_t, Sbase, in_pu=False):
         """
         Get the power set at both ends accounting for meaningful losses
@@ -465,123 +487,6 @@ class HvdcLine(BranchParent):
             data.append(obj)
         return data
 
-    def get_properties_dict(self, version=3):
-        """
-        Get json dictionary
-        :return:
-        """
-        if version == 2:
-            d = {'id': self.idtag,
-                 'type': 'hvdc',
-                 'phases': 'ps',
-                 'name': self.name,
-                 'name_code': self.code,
-                 'bus_from': self.bus_from.idtag,
-                 'bus_to': self.bus_to.idtag,
-                 'active': self.active,
-                 'rate': self.rate,
-                 'control_mode': self.control_mode.value,
-                 'r': self.r,
-                 'length': self.length,
-                 'loss_factor': self.loss_factor,
-                 'angle_droop': self.angle_droop,
-                 'vset_from': self.Vset_f,
-                 'vset_to': self.Vset_t,
-                 'Pset': self.Pset,
-                 'min_firing_angle_f': self.min_firing_angle_f,
-                 'max_firing_angle_f': self.max_firing_angle_f,
-                 'min_firing_angle_t': self.min_firing_angle_t,
-                 'max_firing_angle_t': self.max_firing_angle_t,
-                 'overload_cost': self.Cost,
-                 'base_temperature': 20,
-                 'operational_temperature': 20,
-                 'alpha': 0.00330,
-                 'locations': []
-                 }
-        elif version == 3:
-            d = {'id': self.idtag,
-                 'type': 'hvdc',
-                 'phases': 'ps',
-                 'name': self.name,
-                 'name_code': self.code,
-                 'bus_from': self.bus_from.idtag,
-                 'bus_to': self.bus_to.idtag,
-                 'active': self.active,
-                 'rate': self.rate,
-                 'control_mode': self.control_mode.value,
-                 'contingency_factor1': self.contingency_factor,
-                 'contingency_factor2': self.contingency_factor,
-                 'contingency_factor3': self.contingency_factor,
-                 'r': self.r,
-                 'length': self.length,
-                 'loss_factor': self.loss_factor,
-                 'angle_droop': self.angle_droop,
-                 'vset_from': self.Vset_f,
-                 'vset_to': self.Vset_t,
-                 'Pset': self.Pset,
-                 'min_firing_angle_f': self.min_firing_angle_f,
-                 'max_firing_angle_f': self.max_firing_angle_f,
-                 'min_firing_angle_t': self.min_firing_angle_t,
-                 'max_firing_angle_t': self.max_firing_angle_t,
-                 'overload_cost': self.Cost,
-                 'base_temperature': 20,
-                 'operational_temperature': 20,
-                 'alpha': 0.00330,
-                 'capex': self.capex,
-                 'opex': self.opex,
-                 'build_status': str(self.build_status.value).lower(),
-                 'locations': []
-                 }
-        else:
-            d = dict()
-
-        return d
-
-    def get_profiles_dict(self, version=3):
-        """
-
-        :return:
-        """
-
-        if self.active_prof is not None:
-            active_prof = self.active_prof.tolist()
-            rate_prof = self.rate_prof.tolist()
-            pset_prof = self.Pset_prof.tolist()
-            vset_prof_f = self.Vset_f_prof.tolist()
-            vset_prof_t = self.Vset_t_prof.tolist()
-            cost_prof = self.Cost_prof.tolist()
-        else:
-            active_prof = list()
-            rate_prof = list()
-            pset_prof = list()
-            cost_prof = list()
-            vset_prof_f = list()
-            vset_prof_t = list()
-
-        return {'id': self.idtag,
-                'active': active_prof,
-                'rate': rate_prof,
-                'Pset': pset_prof,
-                'vset_from': vset_prof_f,
-                'vset_to': vset_prof_t,
-                'overload_cost': cost_prof}
-
-    def get_units_dict(self, version=3):
-        """
-        Get units of the values
-        """
-        return {'rate': 'MW',
-                'length': 'km',
-                'loss_factor': '%',
-                'vset_f': 'p.u.',
-                'vset_t': 'p.u.',
-                'pset': 'MW',
-                'min_firing_angle_f': 'radians',
-                'max_firing_angle_f': 'radians',
-                'min_firing_angle_t': 'radians',
-                'max_firing_angle_t': 'radians',
-                'overload_cost': 'e/MWh'}
-
     def get_max_bus_nominal_voltage(self):
         return max(self.bus_from.Vnom, self.bus_to.Vnom)