GridCalEngine 5.2.9__tar.gz → 5.2.11__tar.gz

{gridcalengine-5.2.9 → gridcalengine-5.2.11}/GridCalEngine/Devices/Branches/transformer3w.py

@@ -44,8 +44,8 @@ def star_to_delta(z1: float, z2: float, z3: float) -> Tuple[float, float, float]
     """
     zt = z1 * z2 + z2 * z3 + z3 * z1
     z12 = zt / z3
-    z23 = zt / z2
-    z31 = zt / z1
+    z23 = zt / z1
+    z31 = zt / z2
 
     return z12, z23, z31
 

{gridcalengine-5.2.9 → gridcalengine-5.2.11}/GridCalEngine/IO/cim/cgmes/cgmes_create_instances.py

@@ -327,15 +327,15 @@ def create_cgmes_generating_unit(gen: gcdev.Generator,
     return None
 
 
-def create_cgmes_regulating_control(cgmes_syn,
-                                    mc_gen: gcdev.Generator,
+def create_cgmes_regulating_control(cgmes_elm,
+                                    mc_gen: Union[gcdev.Generator, gcdev.ControllableShunt],
                                     cgmes_model: CgmesCircuit,
                                     logger: DataLogger):
     """
-    Create Regulating Control for Generators
+    Create Regulating Control for a CGMES device
 
-    :param cgmes_syn: Cgmes Synchronous Machine
-    :param mc_gen: MultiCircuit Generator
+    :param cgmes_elm: Cgmes Synchronous Machine or Shunt (Nonlin or Lin)
+    :param mc_gen: MultiCircuit element: Generator or Controllable Shunt
     :param cgmes_model: CgmesCircuit
     :param logger:
     :return:
@@ -348,13 +348,13 @@ def create_cgmes_regulating_control(cgmes_syn,
     rc.name = f'_RC_{mc_gen.name}'
     rc.shortName = rc.name
     rc.mode = RegulatingControlModeKind.voltage
-    rc.Terminal = cgmes_syn.Terminals
+    rc.Terminal = cgmes_elm.Terminals
 
-    rc.RegulatingCondEq = cgmes_syn
+    rc.RegulatingCondEq = cgmes_elm
     rc.discrete = False
     rc.targetDeadband = 0.5
     rc.targetValueUnitMultiplier = UnitMultiplier.k
-    rc.enabled = True  # todo correct?
+    rc.enabled = True
     rc.targetValue = mc_gen.Vset * mc_gen.bus.Vnom
     # TODO control_cn.Vnom
 

{gridcalengine-5.2.9 → gridcalengine-5.2.11}/GridCalEngine/IO/cim/cgmes/cgmes_to_gridcal.py

@@ -1472,8 +1472,8 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
                                                     V1=windings[0].ratedU,
                                                     V2=windings[1].ratedU,
                                                     V3=windings[2].ratedU,
-                                                    r12=r12, r23=r23, r31=r31,
-                                                    x12=x12, x23=x23, x31=x31,
+                                                    # r12=r12, r23=r23, r31=r31,
+                                                    # x12=x12, x23=x23, x31=x31,
                                                     rate12=windings[0].ratedS,
                                                     rate23=windings[1].ratedS,
                                                     rate31=windings[2].ratedS, )
@@ -1511,6 +1511,8 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
                     gcdev_elm.winding3.B0 = b03
                     gcdev_elm.winding3.rate = float(windings[2].ratedS)
 
+                    gcdev_elm.fill_from_star(r1=r1, r2=r2, r3=r3, x1=x1, x2=x2, x3=x3)
+
                     gcdev_model.add_transformer3w(gcdev_elm, add_middle_bus=True)
 
                 else:

{gridcalengine-5.2.9 → gridcalengine-5.2.11}/GridCalEngine/IO/cim/cgmes/gridcal_to_cgmes.py

@@ -1201,10 +1201,26 @@ def get_cgmes_linear_and_non_linear_shunts(multicircuit_model: MultiCircuit,
                 object_list=cgmes_model.cgmes_assets.BaseVoltage_list,
                 target_vnom=mc_elm.bus.Vnom)
 
+            non_lin_sc.Terminals = (
+                create_cgmes_terminal(mc_bus=mc_elm.bus,
+                                      seq_num=1,
+                                      cond_eq=non_lin_sc,
+                                      cgmes_model=cgmes_model,
+                                      logger=logger))
+
             # CONTROL
-            # non_lin_sc.RegulatingControl = False  # TODO: Should be an object
+            # control_type: voltage or power control, ..
+            # is_controlled: enabling flag (already have)
+            if mc_elm.is_controlled:
+                non_lin_sc.RegulatingControl = (
+                    create_cgmes_regulating_control(non_lin_sc, mc_elm,
+                                                    cgmes_model, logger)
+                )
+                non_lin_sc.controlEnabled = True
+            else:
+                non_lin_sc.controlEnabled = False
+
             # SSH
-            non_lin_sc.controlEnabled = False
             #    sections: Shunt compensator sections in use.
             non_lin_sc.sections = 1
             # if mc_elm.active:
@@ -1229,14 +1245,6 @@ def get_cgmes_linear_and_non_linear_shunts(multicircuit_model: MultiCircuit,
             non_lin_sc.maximumSections = len(b_points)
             non_lin_sc.aggregate = False
 
-
-            # non_lin_sc.Terminals =
-            create_cgmes_terminal(mc_bus=mc_elm.bus,
-                                  seq_num=1,
-                                  cond_eq=non_lin_sc,
-                                  cgmes_model=cgmes_model,
-                                  logger=logger)
-
             cgmes_model.add(non_lin_sc)
 
         else:   # LINEAR controllable shunts
@@ -1256,9 +1264,7 @@ def get_cgmes_linear_and_non_linear_shunts(multicircuit_model: MultiCircuit,
             lsc.BaseVoltage = find_object_by_vnom(cgmes_model=cgmes_model,
                                                   object_list=cgmes_model.cgmes_assets.BaseVoltage_list,
                                                   target_vnom=mc_elm.bus.Vnom)
-            # lsc.RegulatingControl = False  # TODO: Should be an object
-            # SSH
-            lsc.controlEnabled = False
+
             if mc_elm.active:
                 lsc.sections = 1
             else:
@@ -1272,12 +1278,22 @@ def get_cgmes_linear_and_non_linear_shunts(multicircuit_model: MultiCircuit,
             lsc.maximumSections = 1
             lsc.aggregate = False
 
-            # lsc.Terminals =
-            create_cgmes_terminal(mc_bus=mc_elm.bus,
-                                  seq_num=1,
-                                  cond_eq=lsc,
-                                  cgmes_model=cgmes_model,
-                                  logger=logger)
+            lsc.Terminals = (
+                create_cgmes_terminal(mc_bus=mc_elm.bus,
+                                      seq_num=1,
+                                      cond_eq=lsc,
+                                      cgmes_model=cgmes_model,
+                                      logger=logger))
+
+            # CONTROL
+            if mc_elm.is_controlled:
+                lsc.RegulatingControl = (
+                    create_cgmes_regulating_control(lsc, mc_elm,
+                                                    cgmes_model, logger)
+                )
+                lsc.controlEnabled = True
+            else:
+                lsc.controlEnabled = False
 
             cgmes_model.add(lsc)
 

{gridcalengine-5.2.9 → gridcalengine-5.2.11}/GridCalEngine/IO/raw/raw_to_gridcal.py

@@ -6,6 +6,7 @@ import numpy as np
 from typing import Dict, List, Tuple, Union
 from GridCalEngine.basic_structures import Logger
 import GridCalEngine.Devices as dev
+from GridCalEngine.Topology import detect_substations
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.IO.raw.devices.branch import RawBranch
 from GridCalEngine.IO.raw.devices.bus import RawBus
@@ -185,15 +186,14 @@ def get_gridcal_shunt_switched(psse_elm: RawSwitchedShunt,
     :param logger:
     :return:
     """
-    name = str(psse_elm.I).replace("'", "")
-    name = name.strip()
+    busnum_id = psse_elm.get_id()
 
     # GL and BL come in MW and MVAr
     # They must be in siemens
     vv = bus.Vnom ** 2.0
 
     if vv == 0:
-        logger.add_error('Voltage equal to zero in shunt conversion', name)
+        logger.add_error('Voltage equal to zero in shunt conversion', busnum_id)
 
     if psse_elm.MODSW in [1, 2]:
         b_init = psse_elm.BINIT * psse_elm.RMPCT / 100.0
@@ -202,11 +202,11 @@ def get_gridcal_shunt_switched(psse_elm: RawSwitchedShunt,
 
     vset = (psse_elm.VSWHI + psse_elm.VSWLO) / 2.0
 
-    elm = dev.ControllableShunt(name='Switched shunt ' + name,
+    elm = dev.ControllableShunt(name='Switched shunt ' + busnum_id,
                                 active=bool(psse_elm.STAT),
                                 # B=b_init,   # TODO Binit
                                 vset=vset,
-                                code=name,
+                                code=busnum_id,
                                 is_nonlinear=True)
 
     if psse_elm.SWREG > 0:
@@ -431,29 +431,29 @@ def get_gridcal_transformer(psse_elm: RawTransformer,
             elm.tap_module_control_mode = TapModuleControl.fixed
             elm.tap_phase_control_mode = TapPhaseControl.fixed
 
-        elif psse_elm.COD1 == 1:    # for voltage control
+        elif psse_elm.COD1 in [1, -1]:    # for voltage control
 
             elm.tap_module_control_mode = TapModuleControl.Vm
             elm.tap_phase_control_mode = TapPhaseControl.fixed
 
-        elif psse_elm.COD1 == 2:    # for reactive power flow control
+        elif psse_elm.COD1 in [2, -2]:    # for reactive power flow control
 
             elm.tap_module_control_mode = TapModuleControl.Qf
             elm.tap_phase_control_mode = TapPhaseControl.fixed
 
-        elif psse_elm.COD1 == 3:    # for active power flow control
+        elif psse_elm.COD1 in [3, -3]:    # for active power flow control
 
             elm.tap_module_control_mode = TapModuleControl.fixed
             elm.tap_phase_control_mode = TapPhaseControl.Pf
             elm.tap_changer.tc_type = TapChangerTypes.Symmetrical
 
-        elif psse_elm.COD1 == 4:    # for control of a dc line quantity
+        elif psse_elm.COD1 in [4, -4]:    # for control of a dc line quantity
                                     # (valid only for two-windingtransformers)
 
             logger.add_error(msg="Not implemented transformer control. (COD1)",
                              value=psse_elm.COD1)
 
-        elif psse_elm.COD1 == 5:  # for asymmetric active power flow control
+        elif psse_elm.COD1 in [5, -5]:  # for asymmetric active power flow control
 
             elm.tap_module_control_mode = TapModuleControl.fixed
             elm.tap_phase_control_mode = TapPhaseControl.fixed
@@ -1031,4 +1031,7 @@ def psse_to_gridcal(psse_circuit: PsseCircuit,
         if psse_elm.is_connected():
             get_upfc_from_facts(psse_elm, psse_bus_dict, psse_circuit.SBASE, logger, circuit=circuit)
 
+    # detect substation from the raw file
+    detect_substations(grid=circuit)
+
     return circuit

{gridcalengine-5.2.9 → gridcalengine-5.2.11}/GridCalEngine/__version__.py

@@ -6,7 +6,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.2.9"
+__GridCalEngine_VERSION__ = "5.2.11"
 
 url = 'https://github.com/SanPen/GridCal'
 
@@ -15,7 +15,7 @@ about_msg = "GridCal v" + str(__GridCalEngine_VERSION__) + '\n\n'
 about_msg += """
 GridCal has been carefully crafted since 2015 to 
 serve as a platform for research and consultancy. 
-Visit https://www.advancedgridinsights.com/gridcal for more details.\n"""
+"""
 
 about_msg += """
 This program is free software; you can redistribute it and/or

{gridcalengine-5.2.9 → gridcalengine-5.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.2.9
+Version: 5.2.11
 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.