pydae 0.56.1__py3-none-any.whl → 0.56.3__py3-none-any.whl

pydae/__init__.py

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

pydae/bmapu/bmapu_builder.py

@@ -381,10 +381,19 @@ class bmapu:
 
             if 'monitor' in line:
                 if line['monitor']:
-                    h_grid.update({f"p_line_{bus_j}_{bus_k}":P_line_to})
-                    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}) 
+                    # h_grid.update({f"p_line_{bus_j}_{bus_k}":P_line_to})
+                    # 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]
+
+                    y_grid += [p_line_to,q_line_to,p_line_from,q_line_from]
 
         self.dae['f'] += []
         self.dae['g'] += g_grid

pydae/bmapu/pods/pod_2wo_3ll.hjson

@@ -17,6 +17,6 @@ syns:[
       }
       ],
 "sources":[{"type":"vsource","bus":"2"}],
-"pods":[{bus:"1","type":"pod_2wo_3ll","K_p_pll": 180, "K_i_pll": 3200, "T_pll": 0.02,"K_stab":20, 
-         "T_1":1, "T_2":1, "T_3":1.0, "T_4":1, "T_5":1.0, "T_6":1, "T_wo1":10.0, "T_wo2":10.0}]
+"pods":[{bus:"1","type":"pod_2wo_3ll","K_p_pll": 180, "K_i_pll": 3200, "T_pll": 0.02,"K_stab":-20, 
+         "T_lpf":0.01, "T_1":1, "T_2":1, "T_3":1.0, "T_4":1, "T_5":1.0, "T_6":1, "T_wo1":10.0, "T_wo2":10.0}]
 }

pydae/bmapu/pods/pod_2wo_3ll.py

@@ -75,6 +75,8 @@ def add_pod_2wo_3ll(grid,data):
     ############################################################################################################
 
     # dynamic states
+    x_lpf  = sym.Symbol(f"x_lpf_pod_{name}", real=True)  # low pass filter
+    
     x_wo1  = sym.Symbol(f"x_wo1_pod_{name}", real=True)  # washout 1
     x_wo2  = sym.Symbol(f"x_wo2_pod_{name}", real=True)  # washout 2
 
@@ -90,6 +92,7 @@ def add_pod_2wo_3ll(grid,data):
     T_wo1 = sym.Symbol(f"T_wo1_pod_{name}", real=True)  
     T_wo2 = sym.Symbol(f"T_wo2_pod_{name}", real=True)  
 
+    T_lpf = sym.Symbol(f"T_lpf_pod_{name}", real=True) 
     T_1 = sym.Symbol(f"T_1_pod_{name}", real=True) 
     T_2 = sym.Symbol(f"T_2_pod_{name}", real=True)
     T_3 = sym.Symbol(f"T_3_pod_{name}", real=True) 
@@ -106,10 +109,13 @@ def add_pod_2wo_3ll(grid,data):
 
     # auxiliar
     omega = omega_pll_f
-    u_wo1 = K_stab*(omega - 1.0) + u_pll_probe
+    u_lpf = K_stab*(omega - 1.0) + u_pll_probe
     
-    z_wo1 = u_wo1 - x_wo1
+    z_lpf = x_lpf
+    z_wo1 = z_lpf - x_wo1
     z_wo2 = z_wo1 - x_wo2
+
+    u_wo1 = z_lpf
     u_wo2 = z_wo1
     z_12 = (z_wo2 - x_12)*T_1/T_2 + x_12
     z_34 = (z_12 - x_34)*T_3/T_4 + x_34
@@ -117,6 +123,7 @@ def add_pod_2wo_3ll(grid,data):
 
     pod_out_nosat = z_56
 
+    dx_lpf = (u_lpf - x_lpf)/T_lpf  # low pass filter state
     dx_wo1 = (u_wo1 - x_wo1)/T_wo1  # washout1 state
     dx_wo2 = (u_wo2 - x_wo2)/T_wo2  # washout2 state
     dx_12 =  (z_wo2 - x_12)/T_2      # lead compensator state
@@ -125,11 +132,12 @@ def add_pod_2wo_3ll(grid,data):
 
     g_pod_out = -pod_out + sym.Piecewise((-Limit,pod_out_nosat<-Limit),(Limit,pod_out_nosat>Limit),(pod_out_nosat,True))  
     
-    grid.dae['f'] += [dx_wo1,dx_wo2,dx_12,dx_34, dx_56]
-    grid.dae['x'] += [ x_wo1, x_wo2, x_12, x_34,  x_56]
+    grid.dae['f'] += [dx_lpf, dx_wo1,dx_wo2,dx_12,dx_34, dx_56]
+    grid.dae['x'] += [ x_lpf, x_wo1, x_wo2, x_12, x_34,  x_56]
     grid.dae['g'] += [g_pod_out]
     grid.dae['y_ini'] += [pod_out]  
     grid.dae['y_run'] += [pod_out] 
+    grid.dae['params_dict'].update({str(T_lpf):data['T_lpf']})
     grid.dae['params_dict'].update({str(T_wo1):data['T_wo1']})
     grid.dae['params_dict'].update({str(T_wo2):data['T_wo2']})
     grid.dae['params_dict'].update({str(T_1):data['T_1']})