GridCalEngine 5.1.48__tar.gz → 5.1.50__tar.gz

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Compilers/circuit_to_data.py

@@ -189,6 +189,12 @@ def get_load_data(circuit: MultiCircuit,
             data.active[ii] = elm.active
             data.cost[ii] = elm.Cost
 
+        # reactive power sharing data
+        if data.active[ii]:
+            bus_data.q_fixed[i] -= data.S[ii].imag
+            bus_data.ii_fixed[i] -= data.I[ii].imag
+            bus_data.b_fixed[i] -= data.Y[ii].imag
+
         data.C_bus_elm[i, ii] = 1
         ii += 1
 
@@ -209,6 +215,12 @@ def get_load_data(circuit: MultiCircuit,
             data.active[ii] = elm.active
             data.cost[ii] = elm.Cost
 
+        # reactive power sharing data
+        if data.active[ii]:
+            bus_data.q_fixed[i] += data.S[ii].imag
+            # bus_data.ii_fixed[i] += data.I[ii].imag
+            # bus_data.b_fixed[i] += data.Y[ii].imag
+
         data.C_bus_elm[i, ii] = 1
         ii += 1
 
@@ -243,6 +255,12 @@ def get_load_data(circuit: MultiCircuit,
             data.S[ii] += complex(elm.P, elm.Q)
             data.active[ii] = elm.active
 
+        # reactive power sharing data
+        if data.active[ii]:
+            bus_data.q_fixed[i] += data.S[ii].imag
+            bus_data.ii_fixed[i] += data.I[ii].imag
+            bus_data.b_fixed[i] += data.Y[ii].imag
+
         data.C_bus_elm[i, ii] = 1
         ii += 1
 
@@ -266,6 +284,12 @@ def get_load_data(circuit: MultiCircuit,
             data.active[ii] = elm.active
             data.cost[ii] = elm.Cost
 
+        # reactive power sharing data
+        if data.active[ii]:
+            bus_data.q_fixed[i] += data.S[ii].imag
+            bus_data.ii_fixed[i] += data.I[ii].imag
+            bus_data.b_fixed[i] += data.Y[ii].imag
+
         data.C_bus_elm[i, ii] = 1
         ii += 1
 
@@ -293,15 +317,15 @@ def get_shunt_data(
     :param t_idx:
     :param time_series:
     :param use_stored_guess:
+    :param control_remote_voltage:
     :return:
     """
-    devices = circuit.get_shunts()
 
     data = ds.ShuntData(nelm=circuit.get_shunt_like_device_number(),
                         nbus=circuit.get_bus_number())
 
     ii = 0
-    for k, elm in enumerate(devices):
+    for k, elm in enumerate(circuit.get_shunts()):
 
         i = bus_dict[elm.bus]
 
@@ -318,6 +342,10 @@ def get_shunt_data(
             data.active[k] = elm.active
             data.Y[k] = complex(elm.G, elm.B)
 
+        # reactive power sharing data
+        if data.active[ii]:
+            bus_data.b_fixed[i] += data.Y[ii].imag
+
         data.C_bus_elm[i, k] = 1
         ii += 1
 
@@ -382,6 +410,14 @@ def get_shunt_data(
                                         use_stored_guess=use_stored_guess,
                                         logger=logger)
 
+        # reactive power sharing data
+        if data.active[ii]:
+            if data.controllable[ii]:
+                bus_data.q_shared_total[i] += data.Y[ii].imag
+                data.q_share[ii] = data.Y[ii].imag
+            else:
+                bus_data.b_fixed[i] += data.Y[ii].imag
+
         data.C_bus_elm[i, ii] = 1
         ii += 1
 
@@ -536,6 +572,14 @@ def get_generator_data(
             data.qmin[k] = elm.Qmin
             data.qmax[k] = elm.Qmax
 
+        # reactive power sharing data
+        if data.active[k]:
+            if data.controllable[k]:
+                bus_data.q_shared_total[i] += data.p[k]
+                data.q_share[k] = data.p[k]
+            else:
+                bus_data.q_fixed[i] += data.get_q_at(k)
+
         data.C_bus_elm[i, k] = 1
 
     return data, gen_index_dict
@@ -696,6 +740,14 @@ def get_battery_data(
             data.qmin[k] = elm.Qmin
             data.qmax[k] = elm.Qmax
 
+        # reactive power sharing data
+        if data.active[k]:
+            if data.controllable[k]:
+                bus_data.q_shared_total[i] += data.p[k]
+                data.q_share[k] = data.p[k]
+            else:
+                bus_data.q_fixed[i] += data.get_q_at(k)
+
         data.C_bus_elm[i, k] = 1
 
     return data

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/DataStructures/branch_data.py

@@ -372,19 +372,19 @@ class BranchData:
         """
         return np.where(self.contingency_enabled == 1)[0]
 
-    def get_inter_areas(self, buses_areas_1, buses_areas_2):
+    def get_inter_areas(self, bus_idx_from, bus_idx_to):
         """
         Get the Branches that join two areas
-        :param buses_areas_1: Area from
-        :param buses_areas_2: Area to
+        :param bus_idx_from: Area from
+        :param bus_idx_to: Area to
         :return: List of (branch index, flow sense w.r.t the area exchange)
         """
 
         lst: List[Tuple[int, float]] = list()
         for k in range(self.nelm):
-            if self.F[k] in buses_areas_1 and self.T[k] in buses_areas_2:
+            if self.F[k] in bus_idx_from and self.T[k] in bus_idx_to:
                 lst.append((k, 1.0))
-            elif self.F[k] in buses_areas_2 and self.T[k] in buses_areas_1:
+            elif self.F[k] in bus_idx_to and self.T[k] in bus_idx_from:
                 lst.append((k, -1.0))
         return lst
 

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/DataStructures/bus_data.py

@@ -46,6 +46,15 @@ class BusData:
         self.areas: IntVec = np.empty(nbus, dtype=int)
         self.substations: IntVec = np.empty(nbus, dtype=int)
 
+        # This is the total value used to compute the q_share in generators, batteries and shunts
+        self.q_shared_total = np.zeros(nbus, dtype=float)
+
+        # This is the fixed amount of Q that is Subtrated from Qbus to compute
+        # the Q of each generator, battery and shunt controlling
+        self.q_fixed = np.zeros(nbus, dtype=float)
+        self.ii_fixed = np.zeros(nbus, dtype=float)  # same concept, but imag current from loads
+        self.b_fixed = np.zeros(nbus, dtype=float)  # same concept, but susceptance from shunts
+
         self.original_idx: IntVec = np.zeros(nbus, dtype=int)
 
     def slice(self, elm_idx: IntVec) -> "BusData":
@@ -76,6 +85,11 @@ class BusData:
         data.areas = self.areas[elm_idx]
         data.substations = self.substations[elm_idx]
 
+        data.q_shared_total = self.q_shared_total[elm_idx]
+        data.q_fixed = self.q_fixed[elm_idx]
+        data.ii_fixed = self.ii_fixed[elm_idx]
+        data.b_fixed = self.b_fixed[elm_idx]
+
         data.original_idx = elm_idx
 
         return data
@@ -115,6 +129,11 @@ class BusData:
         data.areas = self.areas.copy()
         data.substations = self.substations.copy()
 
+        data.q_shared_total = self.q_shared_total.copy()
+        data.q_fixed = self.q_fixed.copy()
+        data.ii_fixed = self.ii_fixed.copy()
+        data.b_fixed = self.b_fixed.copy()
+
         data.original_idx = self.original_idx.copy()
 
         return data

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/DataStructures/generator_data.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from typing import Tuple
+
 import numpy as np
 import scipy.sparse as sp
 import GridCalEngine.Topology.topology as tp
@@ -46,6 +48,7 @@ class GeneratorData:
 
         self.qmin: Vec = np.zeros(nelm, dtype=float)
         self.qmax: Vec = np.zeros(nelm, dtype=float)
+        self.q_share: Vec = np.zeros(nelm, dtype=float)
 
         # reliabilty
         self.mttf: Vec = np.zeros(nelm, dtype=float)
@@ -103,6 +106,7 @@ class GeneratorData:
 
         data.qmin = self.qmin[elm_idx]
         data.qmax = self.qmax[elm_idx]
+        data.q_share = self.q_share[elm_idx]
 
         data.mttf = self.mttf[elm_idx]
         data.mttr = self.mttr[elm_idx]
@@ -164,6 +168,7 @@ class GeneratorData:
 
         data.qmin = self.qmin.copy()
         data.qmax = self.qmax.copy()
+        data.q_share = self.q_share.copy()
 
         data.mttf = self.mttf.copy()
         data.mttr = self.mttr.copy()
@@ -217,6 +222,17 @@ class GeneratorData:
         Q = pf_sign * self.p * np.sqrt((1.0 - pf2) / (pf2 + 1e-20))
         return self.p + 1.0j * Q
 
+    def get_q_at(self, i) -> float:
+        """
+
+        :param i:
+        :return:
+        """
+        pf2 = np.power(self.pf[i], 2.0)
+        pf_sign = (self.pf[i] + 1e-20) / np.abs(self.pf[i] + 1e-20)
+        Q = pf_sign * self.p[i] * np.sqrt((1.0 - pf2) / (pf2 + 1e-20))
+        return Q
+
     def get_Yshunt(self, seq: int = 1) -> CxVec:
         """
         Obtain the vector of shunt admittances of a given sequence per bus
@@ -322,4 +338,11 @@ class GeneratorData:
         :return:
         """
         x = (~self.dispatchable * self.active).astype(int)
-        return np.where(x == 1)[0]
+        return np.where(x == 1)[0]
+
+    def get_controllable_and_not_controllable_indices(self) -> Tuple[IntVec, IntVec]:
+        """
+        Get the indices of controllable generators
+        :return: idx_controllable, idx_non_controllable
+        """
+        return np.where(self.controllable == 1)[0], np.where(self.controllable == 0)[0]

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/DataStructures/hvdc_data.py

@@ -310,19 +310,19 @@ class HvdcData:
         # Shvdc, Losses_hvdc, Pf_hvdc, Pt_hvdc, loading_hvdc, n_free
         return Pbus, Losses, Pf, Pt, loading, nfree
 
-    def get_inter_areas(self, buses_areas_1, buses_areas_2):
+    def get_inter_areas(self, bus_idx_from, bus_idx_to):
         """
         Get the hvdcs that join two areas
-        :param buses_areas_1: Area from
-        :param buses_areas_2: Area to
+        :param bus_idx_from: Area from
+        :param bus_idx_to: Area to
         :return: List of (branch index, flow sense w.r.t the area exchange)
         """
 
         lst: List[Tuple[int, float]] = list()
         for k in range(self.nelm):
-            if self.F[k] in buses_areas_1 and self.T[k] in buses_areas_2:
+            if self.F[k] in bus_idx_from and self.T[k] in bus_idx_to:
                 lst.append((k, 1.0))
-            elif self.F[k] in buses_areas_2 and self.T[k] in buses_areas_1:
+            elif self.F[k] in bus_idx_to and self.T[k] in bus_idx_from:
                 lst.append((k, -1.0))
         return lst
 

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/DataStructures/numerical_circuit.py

@@ -2018,6 +2018,25 @@ class NumericalCircuit:
         # if any error in the logger, bad
         return logger.error_count() == 0, logger
 
+    def get_structural_ntc(self, bus_idx_from: IntVec, bus_idx_to: IntVec) -> float:
+        """
+        Get the structural NTC
+        :param bus_idx_from: list of buses of the area from
+        :param bus_idx_to: list of buses of the area to
+        :return: structural NTC in MVA
+        """
+
+        inter_area_branches = self.branch_data.get_inter_areas(bus_idx_from=bus_idx_from, bus_idx_to=bus_idx_to)
+        sum_ratings = 0.0
+        for k, sense in inter_area_branches:
+            sum_ratings += self.branch_data.rates[k]
+
+        inter_area_hvdcs = self.hvdc_data.get_inter_areas(bus_idx_from=bus_idx_from, bus_idx_to=bus_idx_to)
+        for k, sense in inter_area_hvdcs:
+            sum_ratings += self.hvdc_data.rate[k]
+
+        return sum_ratings
+
 
 def compile_numerical_circuit_at(circuit: MultiCircuit,
                                  t_idx: Union[int, None] = None,

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/DataStructures/shunt_data.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from typing import Tuple
 import numpy as np
 import scipy.sparse as sp
 import GridCalEngine.Topology.topology as tp
@@ -46,6 +47,7 @@ class ShuntData:
 
         self.qmin: Vec = np.zeros(nelm, dtype=float)
         self.qmax: Vec = np.zeros(nelm, dtype=float)
+        self.q_share: Vec = np.zeros(nelm, dtype=float)
 
         self.cost: Vec = np.zeros(nelm, dtype=float)
 
@@ -88,6 +90,7 @@ class ShuntData:
 
         data.qmax = self.qmax[elm_idx]
         data.qmin = self.qmin[elm_idx]
+        data.q_share = self.q_share[elm_idx]
 
         data.cost = self.cost[elm_idx]
 
@@ -119,6 +122,7 @@ class ShuntData:
 
         data.qmax = self.qmax.copy()
         data.qmin = self.qmin.copy()
+        data.q_share = self.q_share.copy()
 
         data.cost = self.cost.copy()
 
@@ -162,6 +166,13 @@ class ShuntData:
         """
         return self.C_bus_elm * (self.Y * self.active)
 
+    def get_fix_injections_per_bus(self) -> CxVec:
+        """
+        Get fixed Injections per bus
+        :return:
+        """
+        return self.C_bus_elm * (self.Y * self.active * (1 - self.controllable))
+
     def get_qmax_per_bus(self) -> Vec:
         """
         Get generator Qmax per bus
@@ -185,3 +196,10 @@ class ShuntData:
         :return: array with the bus indices
         """
         return tp.get_csr_bus_indices(self.C_bus_elm.tocsr())
+
+    def get_controllable_and_not_controllable_indices(self) -> Tuple[IntVec, IntVec]:
+        """
+        Get the indices of controllable generators
+        :return: idx_controllable, idx_non_controllable
+        """
+        return np.where(self.controllable == 1)[0], np.where(self.controllable == 0)[0]

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/Branches/dc_line.py

@@ -142,7 +142,7 @@ class DcLine(BranchParent):
         self.register(key='fault_pos', units='p.u.', tpe=float,
                       definition='Per-unit positioning of the fault:0 would be at the "from" side,1 would '
                                  '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='template', units='', tpe=DeviceType.AnyLineTemplateDevice, definition='', editable=False)
 
         self.register(key='locations', units='', tpe=SubObjectType.LineLocations, definition='', editable=False)
 

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/Branches/line.py

@@ -176,7 +176,7 @@ class Line(BranchParent):
                                  '0 would be at the "from" side,'
                                  '1 would 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='template', units='', tpe=DeviceType.AnyLineTemplateDevice, definition='', editable=False)
         self.register(key='locations', units='', tpe=SubObjectType.LineLocations, definition='', editable=False)
 
         self.register(key='possible_tower_types', units='', tpe=SubObjectType.Associations,

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/Branches/tap_changer.py

@@ -30,6 +30,7 @@ class TapChanger:
     def __init__(self,
                  total_positions: int = 5,
                  neutral_position: int = 2,
+                 normal_position: int = 2,
                  dV: float = 0.01,
                  asymmetry_angle: float = 90.0,
                  tc_type: TapChangerTypes = TapChangerTypes.NoRegulation) -> None:
@@ -46,8 +47,10 @@ class TapChanger:
         self._total_positions = int(total_positions)  # total number of positions
         self.dV = float(dV)  # voltage increment in p.u.
         self.neutral_position = int(neutral_position)  # neutral position
+        self.normal_position = int(normal_position)     # normal position
         self._tap_position = int(neutral_position)  # index with respect to the neutral position
         self.tc_type: TapChangerTypes = tc_type  # tap changer mode
+        self._negative_low = False  # for CGMES compatibility we store if the low step is negative
 
         # Calculated arrays
         self._ndv = np.zeros(self._total_positions)
@@ -85,7 +88,7 @@ class TapChanger:
         Set the tap position
         :param val: tap value
         """
-        self._tap_position = val
+        self._tap_position = int(val)
 
     @property
     def tap_modules_array(self):
@@ -123,8 +126,10 @@ class TapChanger:
             "total_positions": self.total_positions,
             "dV": self.dV,
             "neutral_position": self.neutral_position,
+            "normal_position": self.normal_position,
             "tap_position": self._tap_position,
-            "type": str(self.tc_type)
+            "type": str(self.tc_type),
+            "negative_low": self._negative_low
         }
 
     def parse(self, data: Dict[str, Union[str, float]]):
@@ -136,8 +141,10 @@ class TapChanger:
         self.total_positions = data.get("total_positions", 5)
         self.dV = data.get("dV", 0.01)
         self.neutral_position = data.get("neutral_position", 2)
+        self.normal_position = data.get("normal_position", 2)
         self.tap_position = data.get("tap_position", 2)
         self.tc_type = TapChangerTypes(data.get("type", TapChangerTypes.NoRegulation.value))
+        self._negative_low = data.get("negative_low", False)
         self.recalc()
 
     def to_df(self) -> pd.DataFrame:
@@ -279,7 +286,7 @@ class TapChanger:
 
     def get_tap_phase_min(self) -> float:
         """
-        Min tap phase, cputed on the fly
+        Min tap phase, computed on the fly
         :return: float
         """
         return self.get_tap_phase2(tap_position=0)
@@ -299,8 +306,9 @@ class TapChanger:
         """
         return ((self.asymmetry_angle == other.asymmetry_angle)
                 and (self.total_positions == other.total_positions)
-                and (self.dV == other.dV)
+                and np.allclose(self.dV, other.dV, atol=1e-06)
                 and (self.neutral_position == other.neutral_position)
+                and (self.normal_position == other.normal_position)
                 and (self.tap_position == other.tap_position)
                 and (self.tc_type == other.tc_type))
 
@@ -310,3 +318,77 @@ class TapChanger:
         :return:
         """
         return "Tap changer"
+
+    def init_from_cgmes(self,
+                        low: int,
+                        high: int,
+                        normal: int,
+                        neutral: int,
+                        stepVoltageIncrement: float,
+                        step: int,
+                        asymmetry_angle: float = 0.0,
+                        tc_type: TapChangerTypes = TapChangerTypes.NoRegulation) -> None:
+        """
+        Import TapChanger object from CGMES
+
+        :param low:
+        :param high:
+        :param normal:
+        :param neutral:
+        :param stepVoltageIncrement:
+        :param step:
+        :param asymmetry_angle:
+        :param tc_type:
+        :return:
+        """
+
+        self._negative_low = low < 0
+
+        if self._negative_low:
+            self.asymmetry_angle = float(asymmetry_angle)  # assymetry angle (Theta)
+            self._total_positions = int(high-low+1)  # total number of positions
+            self.dV = float(stepVoltageIncrement / 100)  # voltage increment in p.u.
+            self.neutral_position = int(neutral - low + 1)  # neutral position
+            self.normal_position = int(normal - low + 1)  # normal position
+            self._tap_position = int(self.neutral_position + step)  # index with respect to the neutral position
+            self.tc_type = tc_type  # tap changer mode
+
+        else:
+            self.asymmetry_angle = float(asymmetry_angle)  # assymetry angle (Theta)
+            self._total_positions = int(high-low+1)  # total number of positions
+            self.dV = float(stepVoltageIncrement / 100)  # voltage increment in p.u.
+            self.neutral_position = int(neutral)  # neutral position
+            self.normal_position = int(normal)  # normal position
+            self._tap_position = int(step)  # index with respect to the neutral position
+            self.tc_type: TapChangerTypes = tc_type  # tap changer mode
+
+        # Calculated arrays
+        self._ndv = np.zeros(self._total_positions)
+        self._tau_array = np.zeros(self._total_positions)
+        self._m_array = np.zeros(self._total_positions)
+        self.recalc()
+
+    def get_cgmes_values(self):
+        """
+        Returns with values of a Tap Changer in CGMES
+        
+        :return: 
+        :rtype: 
+        """
+
+        if self._negative_low:
+            low = -self.neutral_position + 1
+            high = self.total_positions - self.neutral_position
+            normal = self.normal_position + low - 1
+            neutral = self.neutral_position + low - 1
+            sVI = self.dV * 100
+            step = self.tap_position + low - 1
+        else:
+            low = 0
+            high = self.total_positions-1
+            normal = self.normal_position
+            neutral = self.neutral_position
+            sVI = self.dV * 100
+            step = self.tap_position
+
+        return low, high, normal, neutral, sVI, step

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/Branches/transformer.py

@@ -90,6 +90,7 @@ class Transformer2W(ControllableBranchParent):
                  build_status: BuildStatus = BuildStatus.Commissioned,
                  tc_total_positions: int = 5,
                  tc_neutral_position: int = 2,
+                 tc_normal_position: int = 2,
                  tc_dV: float = 0.01,
                  tc_asymmetry_angle=90,
                  tc_type: TapChangerTypes = TapChangerTypes.NoRegulation):
@@ -200,6 +201,7 @@ class Transformer2W(ControllableBranchParent):
                                           device_type=DeviceType.Transformer2WDevice,
                                           tc_total_positions=tc_total_positions,
                                           tc_neutral_position=tc_neutral_position,
+                                          tc_normal_position=tc_normal_position,
                                           tc_dV=tc_dV,
                                           tc_asymmetry_angle=tc_asymmetry_angle,
                                           tc_type=tc_type)

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/Branches/transformer3w.py

@@ -49,6 +49,9 @@ class Transformer3W(PhysicalDevice):
                  name: str = 'Branch',
                  bus0: Union[None, Bus] = None,
                  bus1: Bus = None, bus2: Bus = None, bus3: Bus = None,
+                 w1_idtag: Union[str, None] = None,
+                 w2_idtag: Union[str, None] = None,
+                 w3_idtag: Union[str, None] = None,
                  V1=10.0, V2=10.0, V3=10.0, active=True,
                  r12=0.0, r23=0.0, r31=0.0, x12=0.0, x23=0.0, x31=0.0,
                  rate12=0.0, rate23=0.0, rate31=0.0,
@@ -113,9 +116,9 @@ class Transformer3W(PhysicalDevice):
         self._rate23 = float(rate23)
         self._rate31 = float(rate31)
 
-        self.winding1 = Winding(bus_from=self.bus0, bus_to=bus1, HV=V1, LV=1.0, name=name + "_W1")
-        self.winding2 = Winding(bus_from=self.bus0, bus_to=bus2, HV=V2, LV=1.0, name=name + "_W2")
-        self.winding3 = Winding(bus_from=self.bus0, bus_to=bus3, HV=V3, LV=1.0, name=name + "_W3")
+        self.winding1 = Winding(bus_from=self.bus0, idtag=w1_idtag, bus_to=bus1, HV=V1, LV=1.0, name=name + "_W1")
+        self.winding2 = Winding(bus_from=self.bus0, idtag=w2_idtag, bus_to=bus2, HV=V2, LV=1.0, name=name + "_W2")
+        self.winding3 = Winding(bus_from=self.bus0, idtag=w3_idtag, bus_to=bus3, HV=V3, LV=1.0, name=name + "_W3")
 
         self.x = float(x)
         self.y = float(y)

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/Parents/branch_parent.py

@@ -125,6 +125,8 @@ class BranchParent(PhysicalDevice):
         self._rate = float(rate)
         self._rate_prof = Profile(default_value=rate, data_type=float)
 
+        # TODO define additional rates if needed, plus register property (only here, not in init)
+
         if not isinstance(contingency_factor, Union[float, int]):
             raise ValueError("contingency_factor must be a float")
         self._contingency_factor = float(contingency_factor)

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/Parents/controllable_branch_parent.py

@@ -82,6 +82,7 @@ class ControllableBranchParent(BranchParent):
                  device_type: DeviceType,
                  tc_total_positions: int = 5,
                  tc_neutral_position: int = 2,
+                 tc_normal_position: int = 2,
                  tc_dV: float = 0.01,
                  tc_asymmetry_angle=90,
                  tc_type: TapChangerTypes = TapChangerTypes.NoRegulation):
@@ -186,6 +187,7 @@ class ControllableBranchParent(BranchParent):
         # tap changer object
         self._tap_changer = TapChanger(total_positions=tc_total_positions,
                                        neutral_position=tc_neutral_position,
+                                       normal_position=tc_normal_position,
                                        dV=tc_dV,
                                        asymmetry_angle=tc_asymmetry_angle,
                                        tc_type=tc_type)

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/Parents/editable_device.py

@@ -24,7 +24,7 @@ from GridCalEngine.enumerations import (DeviceType, TimeFrame, BuildStatus, Wind
                                         HvdcControlType, ActionType, AvailableTransferMode, ContingencyMethod,
                                         CpfParametrization, CpfStopAt, InvestmentEvaluationMethod, SolverType,
                                         InvestmentsEvaluationObjectives, NodalCapacityMethod, TimeGrouping,
-                                        ZonalGrouping, MIPSolvers, AcOpfMode,
+                                        ZonalGrouping, MIPSolvers, AcOpfMode, SubstationTypes,
                                         BranchImpedanceMode, FaultType, TapChangerTypes)
 
 # types that can be assigned to a GridCal property
@@ -55,7 +55,8 @@ GCPROP_TYPES = Union[
     Type[AcOpfMode],
     Type[BranchImpedanceMode],
     Type[FaultType],
-    Type[TapChangerTypes]
+    Type[TapChangerTypes],
+    Type[SubstationTypes]
 ]
 
 

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/multi_circuit.py

@@ -1839,7 +1839,8 @@ class MultiCircuit(Assets):
 
     def compare_circuits(self, grid2: "MultiCircuit",
                          detailed_profile_comparison: bool = True,
-                         skip_internals: bool = False) -> Tuple[bool, Logger]:
+                         skip_internals: bool = False,
+                         tolerance: float = 1e-06) -> Tuple[bool, Logger]:
         """
         Compare this circuit with another circuits for equality
         :param grid2: MultiCircuit
@@ -1896,12 +1897,21 @@ class MultiCircuit(Assets):
                         v1 = elm1.get_property_value(prop=prop, t_idx=None)
                         v2 = elm2.get_property_value(prop=prop, t_idx=None)
 
-                        if v1 != v2:
-                            logger.add_error(msg="Different snapshot values",
-                                             device_class=template_elm.device_type.value,
-                                             device_property=prop.name,
-                                             value=v2,
-                                             expected_value=v1)
+                        if prop.tpe == float:
+                            if not np.isclose(v1, v2, atol=tolerance):
+                                logger.add_error(
+                                    msg="Different snapshot values",
+                                    device_class=template_elm.device_type.value,
+                                    device_property=prop.name,
+                                    value=v2,
+                                    expected_value=v1)
+                        else:
+                            if v1 != v2:
+                                logger.add_error(msg="Different snapshot values",
+                                                 device_class=template_elm.device_type.value,
+                                                 device_property=prop.name,
+                                                 value=v2,
+                                                 expected_value=v1)
 
                         if prop.has_profile():
                             p1 = elm1.get_profile_by_prop(prop=prop)

{GridCalEngine-5.1.48 → GridCalEngine-5.1.50}/GridCalEngine/Devices/types.py

@@ -14,7 +14,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-from typing import Union
 from GridCalEngine.Devices.Aggregation import *
 from GridCalEngine.Devices.Associations import *
 from GridCalEngine.Devices.Branches import *