GridCalEngine 5.3.28__tar.gz → 5.3.30__tar.gz

{gridcalengine-5.3.28 → gridcalengine-5.3.30}/GridCalEngine/Compilers/circuit_to_gslv.py

@@ -8,7 +8,6 @@ import warnings
 import numpy as np
 from typing import List, Dict, Union, Tuple, TYPE_CHECKING
 
-import GridCalEngine
 from GridCalEngine import TapModuleControl, TapPhaseControl
 from GridCalEngine.basic_structures import IntVec, Vec
 from GridCalEngine.Devices.profile import Profile
@@ -184,7 +183,7 @@ def fill_profile(gslv_profile: "pg.Profiledouble|pg.Profilebool|pg.Profileint|pg
 
                 # we pick all the profile
                 if len(data) > 0:
-                    gslv_profile.init_sparse(default_val=gc_profile.default_value, data=data)
+                    gslv_profile.init_sparse(default_value=gc_profile.default_value, data=data)
 
             else:
                 assert len(time_indices) == n_time
@@ -199,7 +198,7 @@ def fill_profile(gslv_profile: "pg.Profiledouble|pg.Profilebool|pg.Profileint|pg
                 else:
                     data = sp_arr2.get_map()
 
-                gslv_profile.init_sparse(default_val=gc_profile.default_value, data=data)
+                gslv_profile.init_sparse(default_value=gc_profile.default_value, data=data)
 
         else:
             if time_indices is None:
@@ -1560,10 +1559,9 @@ def convert_transformer(elm: dev.Transformer2W,
 
     # control vars
     if override_controls:
-        tr2.tap_module_control_mode = pg.TapModuleControl.fixed
-        tr2.tap_phase_control_mode = pg.TapPhaseControl.fixed
+        tr2.tap_module_control_mode.fill(pg.TapModuleControl.fixed)
+        tr2.tap_phase_control_mode.fill(pg.TapPhaseControl.fixed)
     else:
-        # tr2.setAllControlMode(ctrl_dict[elm.control_mode])
         pass
 
     return tr2
@@ -1635,11 +1633,6 @@ def convert_transformer3w(elm: dev.Transformer3W,
     # this is because the central node is in the buses list already from GridCal
     tr3.central_node = bus_dict[elm.bus0.idtag]
 
-    if use_time_series:
-        pass
-    else:
-        pass
-
     return tr3
 
 
@@ -2496,9 +2489,9 @@ def gslv_contingencies(circuit: MultiCircuit,
     logger = pg.Logger()
 
     res = pg.run_contingencies(grid=gslv_grid,
-                                  options=con_opt_gslv,
-                                  n_threads=n_threads,
-                                  time_indices=time_indices,
-                                  logger=logger)
+                               options=con_opt_gslv,
+                               n_threads=n_threads,
+                               time_indices=time_indices,
+                               logger=logger)
 
     return res

{gridcalengine-5.3.28 → gridcalengine-5.3.30}/GridCalEngine/IO/cim/cgmes/gridcal_to_cgmes.py

@@ -357,10 +357,10 @@ def get_cgmes_cn_nodes_from_tp_nodes(multi_circuit_model: MultiCircuit,
         else:
             logger.add_error(
                 msg=f'TN has no ConnectivityNodeContainer, so cannot be assigned to CN',
-                device=tn.idtag,
-                device_class=tn.device_type.value,
+                device=tn.rdfid,
+                device_class=tn.tpe,
                 device_property="Bus.voltage_level.idtag",
-                value=tn.ConnectivityNodeContainer,
+                value="None",
                 comment="get_cgmes_cn_nodes_from_tp_nodes()"
             )
 

{gridcalengine-5.3.28 → gridcalengine-5.3.30}/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.3.28"
+__GridCalEngine_VERSION__ = "5.3.30"
 
 url = 'https://github.com/SanPen/GridCal'
 

{gridcalengine-5.3.28 → gridcalengine-5.3.30}/PKG-INFO

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

{gridcalengine-5.3.28 → gridcalengine-5.3.30}/setup.py

@@ -13,6 +13,7 @@ https://github.com/pypa/sampleproject
 from setuptools import setup, find_packages
 import os
 from GridCalEngine.__version__ import __GridCalEngine_VERSION__
+from GridCalEngine.Compilers.circuit_to_gslv import GSLV_RECOMMENDED_VERSION
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -81,10 +82,12 @@ dependencies = ['setuptools>=41.0.1',
                 "websockets",
                 "brotli",
                 "opencv-python>=4.10.0.84",
+
                 ]
 
 extras_require = {
-    'gch5 files': ["tables"]  # this is for h5 compatibility
+    'gch5 files': ["tables"],  # this is for h5 compatibility
+    'pygslv': ["pygslv>=" + GSLV_RECOMMENDED_VERSION]
 }
 # Arguments marked as "Required" below must be included for upload to PyPI.
 # Fields marked as "Optional" may be commented out.