GridCalEngine 5.0.22__tar.gz → 5.1.1__tar.gz

{GridCalEngine-5.0.22 → GridCalEngine-5.1.1}/GridCalEngine/DataStructures/numerical_circuit.py

@@ -225,7 +225,8 @@ class NumericalCircuit:
         self.Ibus_: CxVec = None
         self.YloadBus_: CxVec = None
         self.Yshunt_from_devices_: CxVec = None
-
+        self.Bmax_bus_: Vec = None
+        self.Bmin_bus_: Vec = None
         self.Qmax_bus_: Vec = None
         self.Qmin_bus_: Vec = None
 
@@ -263,7 +264,6 @@ class NumericalCircuit:
         self.Ibus_: CxVec = None
         self.YloadBus_: CxVec = None
         self.Yshunt_from_devices_: CxVec = None
-
         self.Qmax_bus_: Vec = None
         self.Qmin_bus_: Vec = None
         self.Bmax_bus_: Vec = None
@@ -398,11 +398,7 @@ class NumericalCircuit:
 
         return nc
 
-    def get_structures_list(self) -> List[Union[ds.BusData, ds.LoadData, ds.ShuntData,
-    ds.GeneratorData, ds.BatteryData,
-    ds.BranchData, ds.HvdcData,
-    ds.FluidNodeData, ds.FluidTurbineData, ds.FluidPumpData,
-    ds.FluidP2XData, ds.FluidPathData]]:
+    def get_structures_list(self) -> List[ALL_STRUCTS]:
         """
         Get a list of the structures inside the NumericalCircuit
         :return:

{GridCalEngine-5.0.22 → GridCalEngine-5.1.1}/GridCalEngine/Devices/Parents/injection_parent.py

@@ -29,6 +29,7 @@ class InjectionParent(EditableDevice):
     """
     Parent class for Injections
     """
+
     def __init__(self,
                  name: str,
                  idtag: Union[str, None],
@@ -66,7 +67,7 @@ class InjectionParent(EditableDevice):
                                 code=code,
                                 device_type=device_type)
 
-        self.bus = bus
+        self._bus = bus
         self._bus_prof = Profile(default_value=bus)
 
         self.cn = cn
@@ -109,6 +110,26 @@ class InjectionParent(EditableDevice):
         self.register(key='Cost', units='e/MWh', tpe=float, definition='Cost of not served energy. Used in OPF.',
                       profile_name='Cost_prof')
 
+    @property
+    def bus(self) -> Bus:
+        """
+        Bus
+        :return: Bus
+        """
+        return self._bus
+
+    @bus.setter
+    def bus(self, val: Bus):
+        if val is None:
+            self._bus = val
+            self._bus_prof.fill(value=val)
+        else:
+            if isinstance(val, Bus):
+                self._bus = val
+                self._bus_prof.fill(value=val)
+            else:
+                raise Exception(str(type(val)) + 'not supported to be set into a bus')
+
     @property
     def bus_prof(self) -> Profile:
         """

{GridCalEngine-5.0.22 → GridCalEngine-5.1.1}/GridCalEngine/Devices/types.py

@@ -31,7 +31,10 @@ INJECTION_DEVICE_TYPES = Union[
     StaticGenerator,
     Shunt,
     ControllableShunt,
-    CurrentInjection
+    CurrentInjection,
+    FluidP2x,
+    FluidTurbine,
+    FluidPump
 ]
 
 BRANCH_TYPES = Union[

{GridCalEngine-5.0.22 → GridCalEngine-5.1.1}/GridCalEngine/IO/cim/cgmes/gridcal_to_cgmes.py

@@ -271,13 +271,13 @@ def get_cgmes_tn_nodes(multi_circuit_model: MultiCircuit,
 
     for bus in multi_circuit_model.buses:
 
-        new_rdf_id = get_new_rdfid()
-        tn = cgmes.TopologicalNode(rdfid=new_rdf_id)
+        tn = cgmes.TopologicalNode(rdfid=bus.idtag)
         tn.name = bus.name
         tn.BaseVoltage = find_object_by_vnom(
             object_list=cgmes_model.BaseVoltage_list,
             target_vnom=bus.Vnom
         )
+
         if bus.voltage_level is not None:  # VoltageLevel
             vl: cgmes.VoltageLevel = find_object_by_uuid(
                 object_list=cgmes_model.VoltageLevel_list,
@@ -286,7 +286,6 @@ def get_cgmes_tn_nodes(multi_circuit_model: MultiCircuit,
             tn.ConnectivityNodeContainer = vl
             # link back
             vl.TopologicalNode = tn
-
         else:
             print(f'Bus.voltage_level.idtag is None for {bus.name}')
         # TODO bus should have association for VoltageLevel first
@@ -461,6 +460,22 @@ def get_cgmes_ac_line_segments(multicircuit_model: MultiCircuit,
         cgmes_model.ACLineSegment_list.append(line)
 
 
+def get_cgmes_operational_limits(multicircuit_model: MultiCircuit,
+                                 cgmes_model: CgmesCircuit,
+                                 logger: DataLogger):
+
+    # OperationalLimitSet and OperationalLimitType
+
+    pass
+
+
+
+def get_cgmes_current_limits(multicircuit_model: MultiCircuit,
+                             cgmes_model: CgmesCircuit,
+                             logger: DataLogger):
+    pass
+
+
 def get_cgmes_generators(multicircuit_model: MultiCircuit,
                          cgmes_model: CgmesCircuit,
                          logger: DataLogger):
@@ -512,6 +527,14 @@ def get_cgmes_generators(multicircuit_model: MultiCircuit,
 
         cgmes_model.SynchronousMachine_list.append(cgmes_syn)
 
+
+def get_cgmes_power_transformers():
+    pass
+
+
+def get_cgmes_power_transformer_ends():
+    pass
+
 # endregion
 
 

{GridCalEngine-5.0.22 → GridCalEngine-5.1.1}/GridCalEngine/Utils/MIP/ortools_interface.py

@@ -29,6 +29,7 @@ from ortools.linear_solver.python.model_builder import LinearConstraint as LpCst
 from ortools.linear_solver.python.model_builder import LinearExpr as LpExp
 from ortools.linear_solver.python.model_builder import Variable as LpVar
 from ortools.linear_solver.python.model_builder import _Sum as LpSum
+from ortools.init.python import init
 from GridCalEngine.enumerations import MIPSolvers
 from GridCalEngine.basic_structures import Logger
 
@@ -38,6 +39,7 @@ def get_available_mip_solvers() -> List[str]:
     Get a list of candidate solvers
     :return:
     """
+    init.CppBridge.init_logging("")  # this avoids displaying all the solver logger information
     candidates = ['SCIP', 'CBC', 'CPLEX', 'GUROBI', 'XPRESS', 'HIGHS', 'GLOP']
     res = list()
     for c in candidates:
@@ -181,7 +183,6 @@ class LpModel:
                 slacks = list()
                 debugging_f_obj = 0
                 for i, cst in enumerate(debug_model.get_linear_constraints()):
-
                     # create a new slack var in the problem
                     sl = debug_model.new_var(0, 1e20, is_integer=False, name='Slackkk{}'.format(i))
 
@@ -217,7 +218,6 @@ class LpModel:
                         val = self.solver.value(sl)
 
                         if val > 1e-10:
-
                             # add the slack in the main model
                             sl2 = self.model.new_var(0, 1e20, is_integer=False, name='Slackkk{}'.format(i))
                             self.relaxed_slacks.append((i, sl2, 0.0))  # the 0.0 value will be read later

{GridCalEngine-5.0.22 → GridCalEngine-5.1.1}/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.0.22"
+__GridCalEngine_VERSION__ = "5.1.1"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.0.22 → GridCalEngine-5.1.1}/PKG-INFO

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