GridCalEngine 5.1.53__tar.gz → 5.1.54__tar.gz

{GridCalEngine-5.1.53 → GridCalEngine-5.1.54}/GridCalEngine/Devices/Branches/transformer3w.py

@@ -29,6 +29,7 @@ from GridCalEngine.enumerations import DeviceType
 def delta_to_star(z12: float, z23: float, z31: float) -> Tuple[float, float, float]:
     """
     Perform the delta->star transformation
+    See: https://www.electronics-tutorials.ws/dccircuits/dcp_10.html
     :param z12: 1 to 2 delta value
     :param z23: 2 to 3 delta value
     :param z31: 3 to 1 delta value
@@ -44,17 +45,19 @@ def delta_to_star(z12: float, z23: float, z31: float) -> Tuple[float, float, flo
         return 1e-20, 1e-20, 1e-20
 
 
-def start_to_delta(z1: float, z2: float, z3: float):
+def star_to_delta(z1: float, z2: float, z3: float) -> Tuple[float, float, float]:
     """
     Perform the star->delta transformation
-    :param z1:
-    :param z2:
-    :param z3:
-    :return:
+    See: https://www.electronics-tutorials.ws/dccircuits/dcp_10.html
+    :param z1: 0->1 impedance
+    :param z2: 0->2 impedance
+    :param z3: 0->3 impedance
+    :return: z12, z23, z31 impedances
     """
-    z12 = z1 + z2
-    z23 = z2 + z3
-    z31 = z3 + z1
+    zt = z1 * z2 + z2 * z3 + z3 * z1
+    z12 = zt / z3
+    z23 = zt / z2
+    z31 = zt / z1
 
     return z12, z23, z31
 
@@ -427,8 +430,8 @@ class Transformer3W(PhysicalDevice):
         :param x2: reactance of the branch 2 (p.u.)
         :param x3: reactance of the branch 3 (p.u.)
         """
-        self._r12, self._r23, self._r31 = start_to_delta(z1=r1, z2=r2, z3=r3)
-        self._x12, self._x23, self._x31 = start_to_delta(z1=x1, z2=x2, z3=x3)
+        self._r12, self._r23, self._r31 = star_to_delta(z1=r1, z2=r2, z3=r3)
+        self._x12, self._x23, self._x31 = star_to_delta(z1=x1, z2=x2, z3=x3)
 
         self.winding1.R = r1
         self.winding1.X = x1

{GridCalEngine-5.1.53 → GridCalEngine-5.1.54}/GridCalEngine/IO/raw/raw_to_gridcal.py

@@ -19,16 +19,25 @@ from typing import Dict, List, Tuple, Union
 from GridCalEngine.basic_structures import Logger
 import GridCalEngine.Devices as dev
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
+from GridCalEngine.IO.raw.devices.area import RawArea
 from GridCalEngine.IO.raw.devices.branch import RawBranch
 from GridCalEngine.IO.raw.devices.bus import RawBus
 from GridCalEngine.IO.raw.devices.facts import RawFACTS
 from GridCalEngine.IO.raw.devices.generator import RawGenerator
+from GridCalEngine.IO.raw.devices.induction_machine import RawInductionMachine
+from GridCalEngine.IO.raw.devices.inter_area import RawInterArea
 from GridCalEngine.IO.raw.devices.load import RawLoad
 from GridCalEngine.IO.raw.devices.fixed_shunt import RawFixedShunt
 from GridCalEngine.IO.raw.devices.switched_shunt import RawSwitchedShunt
 from GridCalEngine.IO.raw.devices.transformer import RawTransformer
 from GridCalEngine.IO.raw.devices.two_terminal_dc_line import RawTwoTerminalDCLine
 from GridCalEngine.IO.raw.devices.vsc_dc_line import RawVscDCLine
+from GridCalEngine.IO.raw.devices.zone import RawZone
+from GridCalEngine.IO.raw.devices.owner import RawOwner
+from GridCalEngine.IO.raw.devices.substation import RawSubstation
+from GridCalEngine.IO.raw.devices.gne_device import RawGneDevice
+from GridCalEngine.IO.raw.devices.system_switching_device import RawSystemSwitchingDevice
+from GridCalEngine.IO.base.base_circuit import BaseCircuit
 from GridCalEngine.IO.raw.devices.psse_circuit import PsseCircuit
 from GridCalEngine.enumerations import TapChangerTypes
 
@@ -254,7 +263,7 @@ def get_gridcal_generator(psse_elm: RawGenerator, psse_bus_dict: Dict[int, dev.B
                         Pmax=psse_elm.PT,
                         Pmin=psse_elm.PB,
                         active=bool(psse_elm.STAT),
-                        power_factor=psse_elm.WPF if psse_elm.WPF is not None else 0.8)
+                        power_factor=psse_elm.WPF)
 
     if psse_elm.IREG > 0:
         if psse_elm.IREG != psse_elm.I:

{GridCalEngine-5.1.53 → GridCalEngine-5.1.54}/GridCalEngine/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.1.53"
+__GridCalEngine_VERSION__ = "5.1.54"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.53 → GridCalEngine-5.1.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.1.53
+Version: 5.1.54
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.