VeraGridEngine 5.4.7__tar.gz → 5.4.8__tar.gz

{veragridengine-5.4.7 → veragridengine-5.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGridEngine
-Version: 5.4.7
+Version: 5.4.8
 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.7 → veragridengine-5.4.8}/VeraGridEngine/Compilers/circuit_to_data.py

@@ -1133,8 +1133,8 @@ def fill_generator_parent(
     # reactive power-sharing data
     if data.active[k]:
         if data.controllable[k]:
-            bus_data.q_shared_total[i] += data.p[k]
-            data.q_share[k] = data.p[k]
+            bus_data.q_shared_total[i] += data.pmax[k]
+            data.q_share[k] = data.pmax[k]
         else:
             bus_data.q_fixed[i] += data.get_q_at(k)
 

{veragridengine-5.4.7 → veragridengine-5.4.8}/VeraGridEngine/Compilers/circuit_to_gslv.py

@@ -319,13 +319,13 @@ def add_municipalities(circuit: MultiCircuit,
     return d
 
 
-def convert_region(country: dev.Municipality) -> "pg.Municipality":
+def convert_region(country: dev.Municipality) -> "pg.Region":
     """
 
     :param country:
     :return:
     """
-    return pg.Municipality(idtag=country.idtag, code=str(country.code), name=country.name)
+    return pg.Region(idtag=country.idtag, code=str(country.code), name=country.name)
 
 
 def add_regions(circuit: MultiCircuit,
@@ -781,7 +781,7 @@ def convert_load(k: int, elm: dev.Load, bus_dict: Dict[str, "pg.Bus"], n_time: i
 
     load = pg.Load(
         nt=n_time,
-        bus=bus_dict[elm.bus.idtag],
+        bus=None if elm.bus is None else bus_dict[elm.bus.idtag],
         name=elm.name,
         idtag=elm.idtag,
         code=str(elm.code),
@@ -912,7 +912,7 @@ def convert_static_generator(elm: dev.StaticGenerator,
         idtag=elm.idtag,
         code=str(elm.code),
         name=elm.name,
-        calc_node=bus_dict[elm.bus.idtag],
+        bus=None if elm.bus is None else bus_dict[elm.bus.idtag],
         nt=n_time,
         P=elm.P,
         Q=elm.Q,
@@ -984,7 +984,7 @@ def convert_shunt(elm: dev.Shunt, bus_dict: Dict[str, "pg.Bus"], n_time: int,
     """
     sh = pg.Shunt(
         nt=n_time,
-        bus=bus_dict[elm.bus.idtag],
+        bus=None if elm.bus is None else bus_dict[elm.bus.idtag],
         name=elm.name,
         idtag=elm.idtag,
         code=str(elm.code),
@@ -1062,7 +1062,7 @@ def convert_generator(k: int, elm: dev.Generator, bus_dict: Dict[str, "pg.Bus"],
     """
     gen = pg.Generator(
         nt=n_time,
-        bus=bus_dict[elm.bus.idtag],
+        bus=None if elm.bus is None else bus_dict[elm.bus.idtag],
         name=elm.name,
         idtag=elm.idtag,
         active=elm.active,
@@ -1183,7 +1183,7 @@ def convert_battery(k: int, elm: dev.Battery, bus_dict: Dict[str, "pg.Bus"], n_t
     """
     gen = pg.Battery(
         nt=n_time,
-        bus=bus_dict[elm.bus.idtag],
+        bus=None if elm.bus is None else bus_dict[elm.bus.idtag],
         name=elm.name,
         idtag=elm.idtag,
         P=elm.P,

{veragridengine-5.4.7 → veragridengine-5.4.8}/VeraGridEngine/Devices/assets.py

@@ -665,6 +665,13 @@ class Assets:
     def lines(self, value: List[dev.Line]):
         self._lines = value
 
+    def get_lines_number(self) -> int:
+        """
+
+        :return:
+        """
+        return len(self._lines)
+
     def get_lines(self) -> List[dev.Line]:
         """
         get list of ac lines

{veragridengine-5.4.7 → veragridengine-5.4.8}/VeraGridEngine/Devices/multi_circuit.py

@@ -1686,8 +1686,9 @@ class MultiCircuit(Assets):
         bus_dict = self.get_bus_index_dict()
 
         for elm in self.get_injection_devices_iter():
-            k = bus_dict[elm.bus]
-            val[k] = elm.get_S()
+            if elm.bus is not None:
+                k = bus_dict[elm.bus]
+                val[k] = elm.get_S()
 
         return val
 
@@ -1701,8 +1702,9 @@ class MultiCircuit(Assets):
         bus_dict = self.get_bus_index_dict()
 
         for elm in self.get_injection_devices_iter():
-            k = bus_dict[elm.bus]
-            val[:, k] = elm.get_Sprof()
+            if elm.bus is not None:
+                k = bus_dict[elm.bus]
+                val[:, k] = elm.get_Sprof()
 
         return val
 
@@ -1716,14 +1718,16 @@ class MultiCircuit(Assets):
         bus_dict = self.get_bus_index_dict()
 
         for elm in self.get_load_like_devices():
-            k = bus_dict[elm.bus]
-            val[:, k] = elm.get_Sprof()
-
-        for elm in self.get_generation_like_devices():
-            if not elm.enabled_dispatch:
+            if elm.bus is not None:
                 k = bus_dict[elm.bus]
                 val[:, k] = elm.get_Sprof()
 
+        for elm in self.get_generation_like_devices():
+            if elm.bus is not None:
+                if not elm.enabled_dispatch:
+                    k = bus_dict[elm.bus]
+                    val[:, k] = elm.get_Sprof()
+
         return val
 
     def get_Sbus_prof_dispatchable(self) -> CxMat:
@@ -1736,9 +1740,10 @@ class MultiCircuit(Assets):
         bus_dict = self.get_bus_index_dict()
 
         for elm in self.get_generation_like_devices():
-            if elm.enabled_dispatch:
-                k = bus_dict[elm.bus]
-                val[:, k] = elm.get_Sprof()
+            if elm.bus is not None:
+                if elm.enabled_dispatch:
+                    k = bus_dict[elm.bus]
+                    val[:, k] = elm.get_Sprof()
 
         return val
 

{veragridengine-5.4.7 → veragridengine-5.4.8}/VeraGridEngine/IO/matpower/legacy/matpower_parser.py

@@ -902,38 +902,39 @@ def get_generation(
     elm_list = circuit.get_generators() + circuit.get_batteries()
 
     for k, elm in enumerate(elm_list):
-        i = bus_dict[elm.bus]  # already accounts for the +1 of Matlab
-
-        data.append({'bus': i,
-                     'Pg': elm.P,
-                     'Qg': 0,
-                     'Qmax': elm.Qmax,
-                     'Qmin': elm.Qmin,
-                     'Vg': elm.Vset,
-                     'mBase': elm.Snom,
-                     'status': int(elm.active),
-                     'Pmax': elm.Pmax,
-                     'Pmin': elm.Pmin,
-                     'Pc1': 0,
-                     'Pc2': 0,
-                     'Qc1min': 0,
-                     'Qc1max': 0,
-                     'Qc2min': 0,
-                     'Qc2max': 0,
-                     'ramp_agc': 0,
-                     'ramp_10': 0,
-                     'ramp_30': 0,
-                     'ramp_q': 0,
-                     'apf': 0,
-                     })
-
-        cost_data.append({
-            'costtype': 2,
-            'startup': elm.StartupCost,
-            'shutdown': elm.ShutdownCost,
-            'n': 3,
-            'costvector': [elm.Cost2, elm.Cost, elm.Cost0]
-        })
+        if elm.bus is not None:
+            i = bus_dict[elm.bus]  # already accounts for the +1 of Matlab
+
+            data.append({'bus': i,
+                         'Pg': elm.P,
+                         'Qg': 0,
+                         'Qmax': elm.Qmax,
+                         'Qmin': elm.Qmin,
+                         'Vg': elm.Vset,
+                         'mBase': elm.Snom,
+                         'status': int(elm.active),
+                         'Pmax': elm.Pmax,
+                         'Pmin': elm.Pmin,
+                         'Pc1': 0,
+                         'Pc2': 0,
+                         'Qc1min': 0,
+                         'Qc1max': 0,
+                         'Qc2min': 0,
+                         'Qc2max': 0,
+                         'ramp_agc': 0,
+                         'ramp_10': 0,
+                         'ramp_30': 0,
+                         'ramp_q': 0,
+                         'apf': 0,
+                         })
+
+            cost_data.append({
+                'costtype': 2,
+                'startup': elm.StartupCost,
+                'shutdown': elm.ShutdownCost,
+                'n': 3,
+                'costvector': [elm.Cost2, elm.Cost, elm.Cost0]
+            })
 
     return data, cost_data