VeraGridEngine 5.4.4__tar.gz → 5.4.6__tar.gz

{veragridengine-5.4.4 → veragridengine-5.4.6}/PKG-INFO

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

{veragridengine-5.4.4 → veragridengine-5.4.6}/VeraGridEngine/Compilers/circuit_to_gslv.py

@@ -676,7 +676,7 @@ def convert_bus(elm: dev.Bus, n_time: int,
     :return:
     """
     bus = pg.Bus(nt=n_time,
-                 name=elm.name,
+                 name=str(elm.name),
                  idtag=elm.idtag,
                  code=str(elm.code),
                  Vnom=elm.Vnom,

{veragridengine-5.4.4 → veragridengine-5.4.6}/VeraGridEngine/Devices/Branches/tap_changer.py

@@ -355,7 +355,7 @@ class TapChanger:
 
         elif self.tc_type == TapChangerTypes.VoltageRegulation:
             ndu = self._ndv[tap_position]
-            return 1.0 / (1.0 - ndu)
+            return 1.0 / (1.0 - ndu + 1e-20)
 
         elif self.tc_type == TapChangerTypes.Asymmetrical:
             ndu = self._ndv[tap_position]

{veragridengine-5.4.4 → veragridengine-5.4.6}/VeraGridEngine/Devices/Diagrams/base_diagram.py

@@ -449,10 +449,7 @@ class BaseDiagram:
         # Add the electrical branches ----------------------------------------------------------------------------------
         tuples = list()
         for dev_type in [DeviceType.LineDevice,
-                         DeviceType.DCLineDevice,
-                         DeviceType.HVDCLineDevice,
                          DeviceType.Transformer2WDevice,
-                         DeviceType.VscDevice,
                          DeviceType.UpfcDevice]:
 
             groups = self.data.get(dev_type.value, None)
@@ -471,6 +468,62 @@ class BaseDiagram:
 
                         tuples.append((f, t, w))
 
+        for dev_type in [DeviceType.DCLineDevice]:
+
+            groups = self.data.get(dev_type.value, None)
+
+            if groups:
+                for i, (idtag, location) in enumerate(groups.locations.items()):
+                    branch = location.api_object
+                    f = graph_node_dictionary.get(branch.bus_from.idtag, None)
+                    t = graph_node_dictionary.get(branch.bus_to.idtag, None)
+
+                    if f is not None and t is not None:
+                        w = branch.R
+                        tuples.append((f, t, w))
+
+        for dev_type in [DeviceType.HVDCLineDevice]:
+
+            groups = self.data.get(dev_type.value, None)
+
+            if groups:
+                for i, (idtag, location) in enumerate(groups.locations.items()):
+                    branch = location.api_object
+                    f = graph_node_dictionary.get(branch.bus_from.idtag, None)
+                    t = graph_node_dictionary.get(branch.bus_to.idtag, None)
+
+                    if f is not None and t is not None:
+                        w = max(branch.r, 0.01)
+                        tuples.append((f, t, w))
+
+        for dev_type in [DeviceType.VscDevice]:
+
+            groups = self.data.get(dev_type.value, None)
+
+            if groups:
+                for i, (idtag, location) in enumerate(groups.locations.items()):
+                    branch = location.api_object
+                    f = graph_node_dictionary.get(branch.bus_from.idtag, None)
+                    t = graph_node_dictionary.get(branch.bus_to.idtag, None)
+
+                    if f is not None and t is not None:
+                        w = 0.01
+                        tuples.append((f, t, w))
+
+        for dev_type in [DeviceType.SwitchDevice]:
+
+            groups = self.data.get(dev_type.value, None)
+
+            if groups:
+                for i, (idtag, location) in enumerate(groups.locations.items()):
+                    branch = location.api_object
+                    f = graph_node_dictionary.get(branch.bus_from.idtag, None)
+                    t = graph_node_dictionary.get(branch.bus_to.idtag, None)
+
+                    if f is not None and t is not None:
+                        w = max(branch.R, 0.001)
+                        tuples.append((f, t, w))
+
         # Add fluid branches -------------------------------------------------------------------------------------------
         for dev_type in [DeviceType.FluidPathDevice]:
 

{veragridengine-5.4.4 → veragridengine-5.4.6}/VeraGridEngine/Devices/assets.py

@@ -1707,6 +1707,18 @@ class Assets:
             gen_index_dict[elm.idtag] = k  # associate the idtag to the index
         return gen_index_dict
 
+    def get_generator_bus_index_dict(self, bus_index_dict: Dict[dev.Bus, int] = None):
+        """
+        Get a dictionary of generators related to their bus index
+        :param bus_index_dict: bus object to bus index dictionary (optional)
+        :return: generator object to bus index dictionary
+
+        """
+        if bus_index_dict is None:
+            bus_index_dict = self.get_bus_index_dict()
+
+        return {g.idtag: bus_index_dict[g.bus] for g in self.get_generators() if g.bus is not None}
+
     # ------------------------------------------------------------------------------------------------------------------
     # External grid
     # ------------------------------------------------------------------------------------------------------------------
@@ -6152,6 +6164,8 @@ class Assets:
         elif obj.device_type == DeviceType.RmsModelTemplateDevice:
             self.add_rms_model(obj=obj)
 
+        elif obj.device_type == DeviceType.SwitchDevice:
+            self.add_switch(obj=obj)
         else:
             raise Exception('Element type not understood ' + str(obj.device_type))
 

{veragridengine-5.4.4 → veragridengine-5.4.6}/VeraGridEngine/Devices/multi_circuit.py

@@ -2090,7 +2090,7 @@ class MultiCircuit(Assets):
                 # not found in the base, add it
                 action = ActionType.Add
 
-            else:
+            elif type(new_elm) == type(elm_from_base):
                 # check differences
                 action, changed_props = elm_from_base.compare(
                     other=new_elm,
@@ -2098,6 +2098,12 @@ class MultiCircuit(Assets):
                     detailed_profile_comparison=detailed_profile_comparison,
                     nt=nt
                 )
+            else:
+                # Same iftag, different classes, probably some consequence of CGMES
+                logger.add_info(msg="Same idtag, different types",
+                                device_class=new_elm.device_type.value,
+                                device_property=new_elm.name,
+                                expected_value=elm_from_base.device_type.value)
 
             if action != ActionType.NoAction:
                 new_element = new_elm.copy(forced_new_idtag=False)

{veragridengine-5.4.4 → veragridengine-5.4.6}/VeraGridEngine/IO/cim/cgmes/cgmes_to_veragrid.py

@@ -386,7 +386,9 @@ def get_gcdev_buses(cgmes_model: CgmesCircuit,
             code=cn_elm.description,
             name=cn_elm.name,
             Vnom=nominal_voltage,
-            is_slack=is_slack
+            is_slack=is_slack,
+            Va0=va,
+            Vm0=vm,
         )
 
         gc_model.add_bus(gcdev_elm)

{veragridengine-5.4.4 → veragridengine-5.4.6}/VeraGridEngine/IO/cim/cgmes/cgmes_utils.py

@@ -549,16 +549,25 @@ def get_nominal_voltage_for_cn(cn: CGMES_CONNECTIVITY_NODE, logger: DataLogger)
     :return: hopefully the nominal voltage
     """
     if hasattr(cn, 'ConnectivityNodeContainer'):
-        if hasattr(cn.ConnectivityNodeContainer, 'BaseVoltage'):
-            if cn.ConnectivityNodeContainer.BaseVoltage is not None:
-                if not isinstance(cn.ConnectivityNodeContainer.BaseVoltage, str):
-                    return float(cn.ConnectivityNodeContainer.BaseVoltage.nominalVoltage)
+        if hasattr(cn.ConnectivityNodeContainer, 'VoltageLevel'):
+            if hasattr(cn.ConnectivityNodeContainer.VoltageLevel, 'BaseVoltage'):
+                if cn.ConnectivityNodeContainer.VoltageLevel.BaseVoltage is not None:
+                    if not isinstance(cn.ConnectivityNodeContainer.VoltageLevel.BaseVoltage.nominalVoltage, str):
+                        return float(cn.ConnectivityNodeContainer.VoltageLevel.BaseVoltage.nominalVoltage)
+                    else:
+                        logger.add_error(msg='Missing reference',
+                                         device=cn.rdfid,
+                                         device_class=cn.tpe,
+                                         device_property="nominalVoltage",
+                                         value=cn.ConnectivityNodeContainer.VoltageLevel.BaseVoltage,
+                                         expected_value='object')
+                        return 0.0
                 else:
                     logger.add_error(msg='Missing reference',
                                      device=cn.rdfid,
                                      device_class=cn.tpe,
-                                     device_property="BaseVoltage",
-                                     value=cn.ConnectivityNodeContainer.BaseVoltage,
+                                     device_property="nominalVoltage",
+                                     value=cn.ConnectivityNodeContainer,
                                      expected_value='object')
                     return 0.0
             else:
@@ -570,13 +579,34 @@ def get_nominal_voltage_for_cn(cn: CGMES_CONNECTIVITY_NODE, logger: DataLogger)
                                  expected_value='object')
                 return 0.0
         else:
-            logger.add_error(msg='Missing reference',
-                             device=cn.rdfid,
-                             device_class=cn.tpe,
-                             device_property="BaseVoltage",
-                             value=cn.ConnectivityNodeContainer,
-                             expected_value='object')
-            return 0.0
+            if hasattr(cn.ConnectivityNodeContainer, 'BaseVoltage'):
+                if cn.ConnectivityNodeContainer.BaseVoltage is not None:
+                    if not isinstance(cn.ConnectivityNodeContainer.BaseVoltage.nominalVoltage, str):
+                        return float(cn.ConnectivityNodeContainer.BaseVoltage.nominalVoltage)
+                    else:
+                        logger.add_error(msg='Missing reference',
+                                         device=cn.rdfid,
+                                         device_class=cn.tpe,
+                                         device_property="nominalVoltage",
+                                         value=cn.ConnectivityNodeContainer.BaseVoltage,
+                                         expected_value='object')
+                        return 0.0
+                else:
+                    logger.add_error(msg='Missing reference',
+                                     device=cn.rdfid,
+                                     device_class=cn.tpe,
+                                     device_property="nominalVoltage",
+                                     value=cn.ConnectivityNodeContainer,
+                                     expected_value='object')
+                    return 0.0
+            else:
+                logger.add_error(msg='Missing reference',
+                                 device=cn.rdfid,
+                                 device_class=cn.tpe,
+                                 device_property="BaseVoltage",
+                                 value=cn.ConnectivityNodeContainer,
+                                 expected_value='object')
+                return 0.0
     else:
         logger.add_error(msg='Missing reference',
                          device=cn.rdfid,