pydae 0.56.3__tar.gz → 0.56.5__tar.gz

{pydae-0.56.3 → pydae-0.56.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pydae
-Version: 0.56.3
+Version: 0.56.5
 Summary: =====
 Keywords: engineering
 Author-email: Juan Manuel Mauricio <jmmauricio6@gmail.com>
@@ -18,6 +18,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering
+License-File: COPYING
+License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: sympy

{pydae-0.56.3 → pydae-0.56.5}/src/pydae/__init__.py

@@ -7,5 +7,5 @@ Differential Algebraic Equations in Python
 
 """
 
-__version__ = "0.56.3"
+__version__ = "0.56.5"
  

{pydae-0.56.3 → pydae-0.56.5}/src/pydae/bmapu/bmapu_builder.py

@@ -19,6 +19,8 @@ from pydae.bmapu.loads.loads import add_loads
 from pydae.bmapu.sources.sources import add_sources
 from pydae.bmapu.miscellaneous.miscellaneous import add_miscellaneous
 from pydae.bmapu.pods.pods import add_pods
+from pydae.bmapu.miscellaneous.banks import add_banks
+
 import pydae.build_cffi as db
 from pydae.build_v2 import builder
 
@@ -143,7 +145,9 @@ class bmapu:
             B_primitive[it+1,it+1] = bs_jk/2
             B_primitive[it+2,it+2] = bs_jk/2
 
-            
+            if not 'thermal' in line:
+                line.update({'thermal':False})      
+
             if 'X_pu' in line:
                 if 'S_mva' in line: S_line = 1e6*line['S_mva']
                 R = line['R_pu']*sys['S_base']/S_line  # in pu of the system base
@@ -168,7 +172,13 @@ class bmapu:
                 bus_idx = buses_list.index(line['bus_j'])
                 U_base = self.buses[bus_idx]['U_kV']*1000
                 Z_base = U_base**2/sys['S_base']
-                R = line['R_km']*line['km']/Z_base  # in pu of the system base
+                if line['thermal']:
+                    R = sym.Symbol(f"R_{line_name}", real=True)
+                    R_N = line['R_km']*line['km']/Z_base  # in pu of the system base
+                    u_grid.update({str(R):R_N})
+                else:    
+                    R = line['R_km']*line['km']/Z_base  # in pu of the system base
+
                 X = line['X_km']*line['km']/Z_base  # in pu of the system base
                 G =  R/(R**2+X**2)
                 B = -X/(R**2+X**2)
@@ -385,15 +395,38 @@ class bmapu:
                     # h_grid.update({f"q_line_{bus_j}_{bus_k}":Q_line_to}) 
                     # h_grid.update({f"p_line_{bus_k}_{bus_j}":P_line_from})
                     # h_grid.update({f"q_line_{bus_k}_{bus_j}":Q_line_from}) 
-                    p_line_to,q_line_to = sym.symbols(f"p_line_{bus_j}_{bus_k},q_line_{bus_j}_{bus_k}", real=True)
-                    p_line_from,q_line_from = sym.symbols(f"p_line_{bus_k}_{bus_j},q_line_{bus_k}_{bus_j}", real=True)
-
-                    g_grid += [p_line_to - P_line_to]
-                    g_grid += [q_line_to - Q_line_to]
-                    g_grid += [p_line_from - P_line_from]
-                    g_grid += [q_line_from - Q_line_from]
+                    p_line_to_pu,q_line_to_pu = sym.symbols(f"p_line_pu_{bus_j}_{bus_k},q_line_pu_{bus_j}_{bus_k}", real=True)
+                    p_line_from_pu,q_line_from_pu = sym.symbols(f"p_line_pu_{bus_k}_{bus_j},q_line_pu_{bus_k}_{bus_j}", real=True)
+
+                    g_grid += [p_line_to_pu - P_line_to]
+                    g_grid += [q_line_to_pu - Q_line_to]
+                    g_grid += [p_line_from_pu - P_line_from]
+                    g_grid += [q_line_from_pu - Q_line_from]
+
+                    y_grid += [p_line_to_pu,q_line_to_pu,p_line_from_pu,q_line_from_pu]
+                    
+                    U_base = self.buses[idx_j]['U_kV']*1000
+                    I_base = S_base/(np.sqrt(3)*U_base)
+
+                    h_grid.update({f'p_line_{bus_j}_{bus_k}':p_line_to_pu*S_base})
+                    h_grid.update({f'q_line_{bus_j}_{bus_k}':q_line_to_pu*S_base})
+                    h_grid.update({f'p_line_{bus_k}_{bus_j}':p_line_from_pu*S_base})
+                    h_grid.update({f'q_line_{bus_k}_{bus_j}':q_line_from_pu*S_base})
+
+                    I_j_k_pu = (  p_line_to_pu**2 +   q_line_to_pu**2)**0.5/V_j
+                    I_k_j_pu = (p_line_from_pu**2 + q_line_from_pu**2)**0.5/V_k
+
+                    h_grid.update({f'I_line_{bus_j}_{bus_k}':I_j_k_pu*I_base})
+                    h_grid.update({f'I_line_{bus_k}_{bus_j}':I_k_j_pu*I_base})
+
+        for bus in self.buses:
+            if 'monitor' in bus:
+                if bus['monitor']:
+                    U_base = bus['U_kV']*1000
+                    V = sym.Symbol(f"V_{bus['name']}", real=True) 
+                    h_grid.update({f"U_{bus['name']}":V*U_base})
+ 
 
-                    y_grid += [p_line_to,q_line_to,p_line_from,q_line_from]
 
         self.dae['f'] += []
         self.dae['g'] += g_grid
@@ -459,6 +492,8 @@ class bmapu:
             add_loads(self)
         if 'pods' in  self.data:
             add_pods(self)
+        if 'banks' in  self.data:
+            add_banks(self)
 
         add_miscellaneous(self)
 
@@ -515,10 +550,10 @@ class bmapu:
             self.sys_dict.update({'testing':True})
 
 
-    def compile(self):
+    def compile(self, API=False):
 
         bldr = db.builder(self.sys_dict,verbose=self.verbose);
-        bldr.build()    
+        bldr.build(API=API)    
 
     def compile_mkl(self, name):
 
@@ -533,11 +568,11 @@ class bmapu:
         b.template()
         b.compile_mkl()  
 
-    def build(self, name =''):
+    def build(self, name ='', API=False):
         if name == '':
             print('Error: name is not provided.')
         self.construct(name)    
-        self.compile()  
+        self.compile(API=False)  
 
     def build_mkl_win(self, name =''):
         if name == '':

pydae-0.56.5/src/pydae/bmapu/miscellaneous/banks.hjson

@@ -0,0 +1,8 @@
+{
+    "system":{"name":"capacitor_bank","S_base":100e6, "K_p_agc":0.0,"K_i_agc":0.0,"K_xif":0.01},       
+    "buses":[{"name":"1", "P_W":0.0,"Q_var":0.0,"U_kV":20.0},
+             {"name":"2", "P_W":0.0,"Q_var":0.0,"U_kV":20.0}],
+    "banks":[{"bus":"1", "B":50.0, "S_mva":1.0, "T_cap":1.0}],
+    "lines":[{"bus_j":"1", "bus_k":"2", "X_pu":0.05,"R_pu":0.0,"Bs_pu":0.0,"S_mva":100, monitor:true}],
+    "sources":[{"bus":"2","type":"genape", "S_n":1000e6,"F_n":50.0,"X_v":0.001,"R_v":0.0,"K_delta":0.001,"K_alpha":1e-6}]
+    }

pydae-0.56.5/src/pydae/bmapu/miscellaneous/banks.py

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Thu August 10 23:52:55 2022
+
+@author: jmmauricio
+"""
+
+import numpy as np
+import sympy as sym
+
+def add_banks(grid):
+
+    buses = grid.data['buses']
+    buses_list = [bus['name'] for bus in buses]
+
+    for item in grid.data['banks']:
+
+        data_dict = item
+        
+        bus_name = item['bus']
+        
+        if 'name' in item:
+            name = item['name']
+        else:
+            name = bus_name
+            
+
+        q_cap,B_cap,V,S_n_cap,S_base = sym.symbols(f'q_cap_{name},B_cap_{name},V_{bus_name},S_n_cap_{name},S_base', real=True)
+        B_cap_ref,T_cap = sym.symbols(f'B_cap_ref_{name},T_cap_{name}', real=True)
+
+
+        dB_cap = 1/T_cap*(B_cap_ref - B_cap)
+
+        q_cap = B_cap*(V**2) # pu-m
+
+        grid.dae['f'] += [dB_cap]
+        grid.dae['x'] += [ B_cap]
+
+        grid.dae['params_dict'].update({str(T_cap):item['T_cap']})
+        grid.dae['params_dict'].update({str(S_n_cap):item['S_mva']*1e6})
+
+        grid.dae['u_ini_dict'].update({str(B_cap_ref):item['B']})
+        grid.dae['u_run_dict'].update({str(B_cap_ref):item['B']})
+
+
+
+        # grid power injection
+        idx_bus = buses_list.index(bus_name) # get the number of the bus where the syn is connected
+        if not 'idx_powers' in buses[idx_bus]: buses[idx_bus].update({'idx_powers':0})
+        buses[idx_bus]['idx_powers'] += 1
+
+        S_base = sym.Symbol('S_base', real = True)
+        grid.dae['g'][idx_bus*2]   += -0/S_base
+        grid.dae['g'][idx_bus*2+1] += -q_cap/S_base*S_n_cap
+
+def test_build():
+    import sympy as sym
+    from pydae.bmapu import bmapu_builder
+    import matplotlib.pyplot as plt
+    grid = bmapu_builder.bmapu('banks.hjson')
+    grid.build('temp')
+
+def test_run():
+    import temp
+
+    model = temp.model()
+    model.ini({},'xy_0.json')
+
+
+    model.report_x()
+    model.report_y()
+    model.report_z()
+
+if __name__=='__main__':
+
+    test_build()
+    test_run()
+
+        

{pydae-0.56.3 → pydae-0.56.5}/src/pydae/bmapu/miscellaneous/pll.py

@@ -68,6 +68,7 @@ def add_pll(grid,data):
     grid.dae['h_dict'].update({f"omega_pll_{name}":omega_pll})
     grid.dae['h_dict'].update({f"omega_pll_f_{name}":omega_pll_f})
     grid.dae['h_dict'].update({f"rocof_pll_{name}":rocof_pll})
+    grid.dae['h_dict'].update({f"frequency_{name}":50*omega_pll_f})
 
 def test():
     import numpy as np