pydae 0.54.4__py3-none-any.whl → 0.55.0__py3-none-any.whl

pydae/__init__.py

@@ -7,5 +7,5 @@ Differential Algebraic Equations in Python
 
 """
 
-__version__ = "0.54.4"
+__version__ = "0.55.0"
  

pydae/bmapu/pvs/pv_dq_d.py

@@ -222,10 +222,10 @@ def pv_dq_d(grid,name,bus_name,data_dict):
     grid.dae['u_run_dict'].update({f'{str(i_sr_ref)}':0.0})
 
     grid.dae['params_dict'].update({f'{str(v_lvrt)}':0.8})
-    grid.dae['params_dict'].update({f'{str(T_lp1p)}':0.1,f'{str(T_lp2p)}':0.1})
-    grid.dae['params_dict'].update({f'{str(T_lp1q)}':0.1,f'{str(T_lp2q)}':0.1})
-    grid.dae['params_dict'].update({f'{str(PRampUp)}':2.5,f'{str(PRampDown)}':-2.5})
-    grid.dae['params_dict'].update({f'{str(QRampUp)}':2.5,f'{str(QRampDown)}':-2.5})
+    grid.dae['params_dict'].update({f'{str(T_lp1p)}':0.02,f'{str(T_lp2p)}':0.02})
+    grid.dae['params_dict'].update({f'{str(T_lp1q)}':0.02,f'{str(T_lp2q)}':0.02})
+    grid.dae['params_dict'].update({f'{str(PRampUp)}':5.0,f'{str(PRampDown)}':-5.0})
+    grid.dae['params_dict'].update({f'{str(QRampUp)}':5.0,f'{str(QRampDown)}':-5.0})
 
     ### outputs
     grid.dae['h_dict'].update({f"m_ref_{name}":m_ref})
@@ -306,6 +306,7 @@ def pv_dq_d(grid,name,bus_name,data_dict):
 
     if 'monitor' in data_dict:
         if data_dict['monitor'] == True:
+            print('writting outputs')
             
             grid.dae['h_dict'].update({f"v_dc_v_{name}":v_dc*V_dc_b})
             grid.dae['h_dict'].update({f"v_ac_v_{name}":v_t_m*U_n})
@@ -384,7 +385,7 @@ if __name__ == "__main__":
              {"name":"2", "P_W":0.0,"Q_var":0.0,"U_kV":20.0}
             ],
     "lines":[{"bus_j":"1", "bus_k":"2", "X_pu":0.05,"R_pu":0.0,"Bs_pu":0.0,"S_mva":10000.0}],
-    "genapes":[{"bus":"2","S_n":10000e6,"F_n":50.0,"X_v":0.001,"R_v":0.0,"K_delta":0.001,"K_alpha":1e-6}]
+    "sources":[{"type":"genape","bus":"2","S_n":10000e6,"F_n":50.0,"X_v":0.001,"R_v":0.0,"K_delta":0.001,"K_alpha":1e-6}]
     }
 
     grid = bmapu_builder.bmapu(data)

pydae/bmapu/pvs/pv_dq_ss.py

@@ -168,31 +168,67 @@ def pv_dq_ss(grid,name,bus_name,data_dict):
         C_p = np.array(data_dict['C_p'])
         D_p = np.array(data_dict['D_p'])
 
+        sys_p = ss_num2sym(f'p_{name}',A_p,B_p,C_p,D_p)
+        sys_p['dx']= sys_p['dx'].replace(sys_p['u'][0],p_s_ppc)
+        sys_p['z_evaluated']= sys_p['z_evaluated'].replace(sys_p['u'][0],p_s_ppc)
+
+        ### dynamic equations            
+        grid.dae['f'] += list(sys_p['dx'])
+        grid.dae['x'] += list(sys_p['x'])
+
+        p_s_ppc_d = sys_p['z_evaluated'][0,0]
+
+        grid.dae['params_dict'].update(sys_p['params_dict'])
+    
     if 'A_q' in data_dict:
         A_q = np.array(data_dict['A_q'])
         B_q = np.array(data_dict['B_q'])
         C_q = np.array(data_dict['C_q'])
         D_q = np.array(data_dict['D_q'])
 
-    sys_p = ss_num2sym(f'p_{name}',A_p,B_p,C_p,D_p)
-    sys_p['dx']= sys_p['dx'].replace(sys_p['u'][0],p_s_ppc)
-    sys_p['z_evaluated']= sys_p['z_evaluated'].replace(sys_p['u'][0],p_s_ppc)
+        sys_q = ss_num2sym(f'q_{name}',A_q,B_q,C_q,D_q)
+        sys_q['dx']= sys_q['dx'].replace(sys_q['u'][0],q_s_ppc)
+        sys_q['z_evaluated']= sys_q['z_evaluated'].replace(sys_q['u'][0],q_s_ppc)
+
+        ### dynamic equations            
+        grid.dae['f'] += list(sys_q['dx'])
+        grid.dae['x'] += list(sys_q['x'])
+
+        q_s_ppc_d = sys_q['z_evaluated'][0,0]
+
+        grid.dae['params_dict'].update(sys_q['params_dict'])
+
+    if 'A_pq' in data_dict:
+        A_pq = np.array(data_dict['A_pq'])
+        B_pq = np.array(data_dict['B_pq'])
+        C_pq = np.array(data_dict['C_pq'])
+        D_pq = np.array(data_dict['D_pq'])
+
+
+        sys_pq = ss_num2sym(f'pq_{name}',A_pq,B_pq,C_pq,D_pq)
 
-    sys_q = ss_num2sym(f'q_{name}',A_q,B_q,C_q,D_q)
-    sys_q['dx']= sys_q['dx'].replace(sys_q['u'][0],q_s_ppc)
-    sys_q['z_evaluated']= sys_q['z_evaluated'].replace(sys_q['u'][0],q_s_ppc)
 
+        sys_pq['dx']= sys_pq['dx'].replace(sys_pq['u'][0],p_s_ppc)
+        sys_pq['dx']= sys_pq['dx'].replace(sys_pq['u'][1],q_s_ppc)
+        sys_pq['z_evaluated']= sys_pq['z_evaluated'].replace(sys_pq['u'][0],p_s_ppc)
+        sys_pq['z_evaluated']= sys_pq['z_evaluated'].replace(sys_pq['u'][1],q_s_ppc)
 
-    p_s_ppc_d = sys_p['z_evaluated'][0,0]
-    q_s_ppc_d = sys_q['z_evaluated'][0,0]
+        ### dynamic equations            
+        grid.dae['f'] += list(sys_pq['dx'])
+        grid.dae['x'] += list(sys_pq['x'])
+
+        p_s_ppc_d = sys_pq['z_evaluated'][0,0]
+        q_s_ppc_d = sys_pq['z_evaluated'][1,0]
+
+        grid.dae['params_dict'].update(sys_pq['params_dict'])
+
+
+    
+    
 
     p_s_ref = sym.Piecewise((p_s_ppc_d,p_s_ppc_d<p_mp),(p_mp,p_s_ppc_d>=p_mp))
     q_s_ref = q_s_ppc_d
 
-
-    ### dynamic equations            
-    grid.dae['f'] += list(sys_p['dx']) + list(sys_q['dx'])
-    grid.dae['x'] += list(sys_p['x']) + list(sys_q['x'])
  
  
     ### algebraic equations   
@@ -250,8 +286,7 @@ def pv_dq_ss(grid,name,bus_name,data_dict):
     # grid.dae['params_dict'].update({f'{str(PRampUp)}':2.5,f'{str(PRampDown)}':-2.5})
     # grid.dae['params_dict'].update({f'{str(QRampUp)}':2.5,f'{str(QRampDown)}':-2.5})
 
-    grid.dae['params_dict'].update(sys_p['params_dict'])
-    grid.dae['params_dict'].update(sys_q['params_dict'])
+
 
 
     ### outputs
@@ -434,7 +469,7 @@ def test_build():
       "K_it": 0.065,
       "N_pv_s": 23,
       "N_pv_p": 1087,
-    # Close loop
+    # # Close loop
     #   "A_p": [[ 2.22745959,  2.89134367],[-5.98640302, -5.13853719]],
     #   "B_p":[[-2.62892537],[-3.35747765]],
     #   "C_p":[[-0.53183608 ,-0.28013641]],
@@ -443,6 +478,18 @@ def test_build():
     #   "B_q":[[-2.62892537],[-3.35747765]],
     #   "C_q":[[-0.53183608 ,-0.28013641]],
     #   "D_q":[[0.]],
+    # Close loop pq coupled
+      "A_pq": [[ 2.22745959,  2.89134367,        0.0,        0.0],
+               [-5.98640302, -5.13853719,        0.0,        0.0],
+               [        0.0,         0.0, 2.22745959, 2.89134367],
+               [        0.0,         0.0,-5.98640302,-5.13853719]],
+      "B_pq":[[-2.62892537,         0.0],
+              [-3.35747765,         0.0],
+              [         0.0,-2.62892537],
+              [         0.0,-3.35747765]],
+      "C_pq":[[-0.53183608 ,-0.28013641,         0.0,        0.0],
+              [         0.0,        0.0,-0.53183608 ,-0.28013641]],
+      "D_pq":[[0.,0.],[0.,0.]],
     # Open loop
     #   "A_p":[[ 0.33137699,  2.1000962 ], [-9.11825055, -6.20455623]],
     #   "B_p":[[-3.44429742], [-5.67395313]],
@@ -453,26 +500,26 @@ def test_build():
     #   "C_q":[[-0.53651084, -0.02498652]],
     #   "D_q":[[0.]],   
     # Open loop high order
-   "A_p":[[ 8.38271015, -1.7571524 ,  1.73425499, -1.30126187, -0.65661779, 0.19946719, -0.27419108],
-          [ 9.21838154,  4.00099853, -7.81509434,  4.35694934,  1.93722067,-0.5469874 ,  0.71654726],
-          [-2.40905211,  2.06691677,  1.45133758, -4.4215498 , -1.4626006 , 0.3642175 , -0.44442714],
-          [ 1.49417659, -0.95112217,  3.64830378, -0.65345492,  2.62637562,-0.48697018,  0.52522081],
-          [ 1.76580717, -0.98874696,  2.81999399, -6.13573245, -2.77497888,-1.4733826 ,  1.18610772],
-          [-3.98772761,  2.0720406 , -5.20922579,  8.4373616 , 10.92677635,-5.37878648, -6.41515444],
-          [ 2.15679302, -1.06505127,  2.48988235, -3.55911887, -3.43500894, 2.50096692, -9.87800368]],    
-    "B_p":[[ 0.76019693],[-1.61641228],[ 0.79263982],[-0.70153677],[-1.0642704 ],[ 2.92345721],[-1.86444729]],
-    "C_p":[[ 0.53471062, -0.22393912,  0.43508347, -0.49268284, -0.34211526,0.13852951, -0.2621668 ]],
-    "D_p":[[0.]], 
-    "A_q":[[ 8.38271015, -1.7571524 ,  1.73425499, -1.30126187, -0.65661779, 0.19946719, -0.27419108],
-          [ 9.21838154,  4.00099853, -7.81509434,  4.35694934,  1.93722067,-0.5469874 ,  0.71654726],
-          [-2.40905211,  2.06691677,  1.45133758, -4.4215498 , -1.4626006 , 0.3642175 , -0.44442714],
-          [ 1.49417659, -0.95112217,  3.64830378, -0.65345492,  2.62637562,-0.48697018,  0.52522081],
-          [ 1.76580717, -0.98874696,  2.81999399, -6.13573245, -2.77497888,-1.4733826 ,  1.18610772],
-          [-3.98772761,  2.0720406 , -5.20922579,  8.4373616 , 10.92677635,-5.37878648, -6.41515444],
-          [ 2.15679302, -1.06505127,  2.48988235, -3.55911887, -3.43500894, 2.50096692, -9.87800368]],    
-    "B_q":[[ 0.76019693],[-1.61641228],[ 0.79263982],[-0.70153677],[-1.0642704 ],[ 2.92345721],[-1.86444729]],
-    "C_q":[[ 0.53471062, -0.22393912,  0.43508347, -0.49268284, -0.34211526,0.13852951, -0.2621668 ]],
-    "D_q":[[0.]],  
+#    "A_p":[[ 8.38271015, -1.7571524 ,  1.73425499, -1.30126187, -0.65661779, 0.19946719, -0.27419108],
+#           [ 9.21838154,  4.00099853, -7.81509434,  4.35694934,  1.93722067,-0.5469874 ,  0.71654726],
+#           [-2.40905211,  2.06691677,  1.45133758, -4.4215498 , -1.4626006 , 0.3642175 , -0.44442714],
+#           [ 1.49417659, -0.95112217,  3.64830378, -0.65345492,  2.62637562,-0.48697018,  0.52522081],
+#           [ 1.76580717, -0.98874696,  2.81999399, -6.13573245, -2.77497888,-1.4733826 ,  1.18610772],
+#           [-3.98772761,  2.0720406 , -5.20922579,  8.4373616 , 10.92677635,-5.37878648, -6.41515444],
+#           [ 2.15679302, -1.06505127,  2.48988235, -3.55911887, -3.43500894, 2.50096692, -9.87800368]],    
+#     "B_p":[[ 0.76019693],[-1.61641228],[ 0.79263982],[-0.70153677],[-1.0642704 ],[ 2.92345721],[-1.86444729]],
+#     "C_p":[[ 0.53471062, -0.22393912,  0.43508347, -0.49268284, -0.34211526,0.13852951, -0.2621668 ]],
+#     "D_p":[[0.]], 
+#     "A_q":[[ 8.38271015, -1.7571524 ,  1.73425499, -1.30126187, -0.65661779, 0.19946719, -0.27419108],
+#           [ 9.21838154,  4.00099853, -7.81509434,  4.35694934,  1.93722067,-0.5469874 ,  0.71654726],
+#           [-2.40905211,  2.06691677,  1.45133758, -4.4215498 , -1.4626006 , 0.3642175 , -0.44442714],
+#           [ 1.49417659, -0.95112217,  3.64830378, -0.65345492,  2.62637562,-0.48697018,  0.52522081],
+#           [ 1.76580717, -0.98874696,  2.81999399, -6.13573245, -2.77497888,-1.4733826 ,  1.18610772],
+#           [-3.98772761,  2.0720406 , -5.20922579,  8.4373616 , 10.92677635,-5.37878648, -6.41515444],
+#           [ 2.15679302, -1.06505127,  2.48988235, -3.55911887, -3.43500894, 2.50096692, -9.87800368]],    
+#     "B_q":[[ 0.76019693],[-1.61641228],[ 0.79263982],[-0.70153677],[-1.0642704 ],[ 2.92345721],[-1.86444729]],
+#     "C_q":[[ 0.53471062, -0.22393912,  0.43508347, -0.49268284, -0.34211526,0.13852951, -0.2621668 ]],
+#     "D_q":[[0.]],  
     }]
     }