pydae 0.57.1__py3-none-any.whl → 0.57.3__py3-none-any.whl

pydae/bmapu/lines/lines.py

@@ -8,151 +8,98 @@ Created on Thu August 10 23:52:55 2022
 import numpy as np
 import sympy as sym
 
+from pydae.bmapu.lines.line_dtr import add_line_dtr
+
 
 def add_lines(self):
+    sys = self.system
 
-    self.g_line_monitors = []
-    self.y_line_monitors = []
-            
     for line in self.lines:
 
-        it = self.it 
+        if not 'dtr' in line: line.update({'dtr':False})
 
-        bus_j = line['bus_j']
-        bus_k = line['bus_k']
+        if line['dtr']:
+            add_line_dtr(self, line)
+        else:
+            add_line(self, line)
 
-        idx_j = self.buses_list.index(bus_j)
-        idx_k = self.buses_list.index(bus_k)    
 
-        self.A[it,idx_j] = 1
-        self.A[it,idx_k] =-1   
-        self.A[it+1,idx_j] = 1
-        self.A[it+2,idx_k] = 1   
-        
-        line_name = f"{bus_j}_{bus_k}"
-        g_jk = sym.Symbol(f"g_{line_name}", real=True) 
-        b_jk = sym.Symbol(f"b_{line_name}", real=True) 
-        bs_jk = sym.Symbol(f"bs_{line_name}", real=True) 
-        self.G_primitive[it,it] = g_jk
-        self.B_primitive[it,it] = b_jk
-        self.B_primitive[it+1,it+1] = bs_jk/2
-        self.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']*self.sys['S_base']/S_line  # in pu of the system base
-            X = line['X_pu']*self.sys['S_base']/S_line  # in pu of the system base
-            G =  R/(R**2+X**2)
-            B = -X/(R**2+X**2)
-            self.params_grid.update({f"g_{line_name}":G})
-            self.params_grid.update({f'b_{line_name}':B})
-
-        if 'X' in line:
-            bus_idx = self.buses_list.index(line['bus_j'])
-            U_base = self.buses[bus_idx]['U_kV']*1000
-            Z_base = U_base**2/self.sys['S_base']
-            R = line['R']/Z_base  # in pu of the system base
-            X = line['X']/Z_base  # in pu of the system base
-            G =  R/(R**2+X**2)
-            B = -X/(R**2+X**2)
-            self.params_grid.update({f"g_{line_name}":G})
-            self.params_grid.update({f'b_{line_name}':B})
-
-        if 'X_km' in line:
-            bus_idx = self.buses_list.index(line['bus_j'])
-            U_base = self.buses[bus_idx]['U_kV']*1000
-            Z_base = U_base**2/self.sys['S_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
-                self.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)
-            self.params_grid.update({f"g_{line_name}":G})
-            self.params_grid.update({f'b_{line_name}':B})        
-
-        self.params_grid.update({f'bs_{line_name}':0.0})
-        if 'Bs_pu' in line:
-            if 'S_mva' in line: S_line = 1e6*line['S_mva']
-            Bs = line['Bs_pu']*S_line/self.sys['S_base']  # in pu of the system base
-            bs = Bs
-            self.params_grid[f'bs_{line_name}'] = bs
-    
-        if 'Bs_km' in line:
-            bus_idx = self.buses_list.index(line['bus_j'])
-            U_base = self.buses[bus_idx]['U_kV']*1000
-            Z_base = U_base**2/self.sys['S_base']
-            Y_base = 1.0/Z_base
-            Bs = line['Bs_km']*line['km']/Y_base # in pu of the system base
-            bs = Bs 
-            self.params_grid[f'bs_{line_name}'] = bs
-            
-        it += 3
-
-        if 'monitor' in line:
-            if line['monitor']:
-
-                bus_j = line['bus_j']
-                bus_k = line['bus_k']
-
-                line_name = f"{bus_j}_{bus_k}"
+def add_line(self, line):
         
-                idx_j = self.buses_list.index(bus_j)
-                idx_k = self.buses_list.index(bus_k)  
-
-                V_j = sym.Symbol(f"V_{bus_j}", real=True) 
-                V_k = sym.Symbol(f"V_{bus_k}", real=True) 
-                theta_j = sym.Symbol(f"theta_{bus_j}", real=True) 
-                theta_k = sym.Symbol(f"theta_{bus_k}", real=True)
-
-                b_ij_p = 0.0
-                if f'bs_{line_name}' in self.params_grid:
-                    b_ij_p = self.params_grid[f'bs_{line_name}']
-
-                G_jk = g_jk
-                B_jk = b_jk
-                theta_jk = theta_j - theta_k
-                P_line_to   = V_j*V_k*(G_jk*sym.cos(theta_jk) + B_jk*sym.sin(theta_jk)) - V_j**2*(G_jk) 
-                Q_line_to   = V_j*V_k*(G_jk*sym.sin(theta_jk) - B_jk*sym.cos(theta_jk)) + V_j**2*(B_jk) + V_j**2*(bs_jk/2)
-                P_line_from = V_j*V_k*(G_jk*sym.cos(-theta_jk) + B_jk*sym.sin(-theta_jk)) - V_k**2*(G_jk) 
-                Q_line_from = V_j*V_k*(G_jk*sym.sin(-theta_jk) - B_jk*sym.cos(-theta_jk)) + V_k**2*(B_jk) + V_k**2*(bs_jk/2)
+    sys = self.system
 
+    bus_j = line['bus_j']
+    bus_k = line['bus_k']
 
-                # 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_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)
+    idx_j = self.buses_list.index(bus_j)
+    idx_k = self.buses_list.index(bus_k)    
 
-                self.g_line_monitors += [p_line_to_pu - P_line_to]
-                self.g_line_monitors += [q_line_to_pu - Q_line_to]
-                self.g_line_monitors += [p_line_from_pu - P_line_from]
-                self.g_line_monitors += [q_line_from_pu - Q_line_from]
+    self.A[self.it,idx_j] = 1
+    self.A[self.it,idx_k] =-1   
+    self.A[self.it+1,idx_j] = 1
+    self.A[self.it+2,idx_k] = 1   
+    
+    line_name = f"{bus_j}_{bus_k}"
+    g_jk = sym.Symbol(f"g_{line_name}", real=True) 
+    b_jk = sym.Symbol(f"b_{line_name}", real=True) 
+    bs_jk = sym.Symbol(f"bs_{line_name}", real=True) 
+    self.G_primitive[self.it,self.it] = g_jk
+    self.B_primitive[self.it,self.it] = b_jk
+    self.B_primitive[self.it+1,self.it+1] = bs_jk/2
+    self.B_primitive[self.it+2,self.it+2] = bs_jk/2
 
-                self.y_line_monitors += [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 = self.S_base/(np.sqrt(3)*U_base)
+    if not 'thermal' in line:
+        line.update({'thermal':False})      
 
-                self.h_grid.update({f'p_line_{bus_j}_{bus_k}':p_line_to_pu*self.S_base})
-                self.h_grid.update({f'q_line_{bus_j}_{bus_k}':q_line_to_pu*self.S_base})
-                self.h_grid.update({f'p_line_{bus_k}_{bus_j}':p_line_from_pu*self.S_base})
-                self.h_grid.update({f'q_line_{bus_k}_{bus_j}':q_line_from_pu*self.S_base})
+    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
+        X = line['X_pu']*sys['S_base']/S_line  # in pu of the system base
+        G =  R/(R**2+X**2)
+        B = -X/(R**2+X**2)
+        self.dae['params_dict'].update({f"g_{line_name}":G})
+        self.dae['params_dict'].update({f'b_{line_name}':B})
 
-                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
+    if 'X' in line:
+        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']/Z_base  # in pu of the system base
+        X = line['X']/Z_base  # in pu of the system base
+        G =  R/(R**2+X**2)
+        B = -X/(R**2+X**2)
+        self.dae['params_dict'].update({f"g_{line_name}":G})
+        self.dae['params_dict'].update({f'b_{line_name}':B})
 
-                self.h_grid.update({f'I_line_{bus_j}_{bus_k}':I_j_k_pu*I_base})
-                self.h_grid.update({f'I_line_{bus_k}_{bus_j}':I_k_j_pu*I_base})
+    if 'X_km' in line:
+        bus_idx = self.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
+
+        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)
+        self.dae['params_dict'].update({f"g_{line_name}":G})
+        self.dae['params_dict'].update({f'b_{line_name}':B})        
+
+    self.dae['params_dict'].update({f'bs_{line_name}':0.0})
+    if 'Bs_pu' in line:
+        if 'S_mva' in line: S_line = 1e6*line['S_mva']
+        Bs = line['Bs_pu']*S_line/sys['S_base']  # in pu of the system base
+        bs = Bs
+        self.dae['params_dict'][f'bs_{line_name}'] = bs
 
+    if 'Bs_km' in line:
+        bus_idx = self.buses_list.index(line['bus_j'])
+        U_base = self.buses[bus_idx]['U_kV']*1000
+        Z_base = U_base**2/sys['S_base']
+        Y_base = 1.0/Z_base
+        Bs = line['Bs_km']*line['km']/Y_base # in pu of the system base
+        bs = Bs 
+        self.dae['params_dict'][f'bs_{line_name}'] = bs
+        
+    self.it += 3
 
 
 def change_line(model,bus_j,bus_k, *args,**kwagrs):
@@ -230,6 +177,8 @@ def test_line_pu_build():
     grid.uz_jacs = False
     grid.verbose = True
     grid.construct(f'temp')
+
+    
     build_numba(grid.sys_dict)
 
 def test_line_pu_ini():
@@ -267,6 +216,10 @@ def test_line_km_build():
     grid.uz_jacs = False
     grid.verbose = True
     grid.construct(f'temp')
+
+    print(grid.sys_dict)
+
+   
     build_numba(grid.sys_dict)
 
 def test_line_km_ini():
@@ -274,7 +227,7 @@ def test_line_km_ini():
     import temp
 
     model = temp.model()
-    model.ini({'P_2':5000e6,'Q_2':0, "K_xif":0.01},'xy_0.json')
+    model.ini({'P_2':5000e6,'Q_2':0, "K_p_agc":0.0,"K_i_agc":0.0, "K_xif":0.01},'xy_0.json')
     print(f"V_1 = {model.get_value('V_1'):2.2f}, V_2 = {model.get_value('V_2'):2.2f}")
 
     print("report_y:")

pydae/bmapu/lines/temp.py

@@ -92,7 +92,7 @@ class model:
         self.solvern = 5 
         self.imax = 100 
         self.N_x = 2
-        self.N_y = 10 
+        self.N_y = 12 
         self.N_z = 9 
         self.N_store = 100000 
         self.params_list = ['S_base', 'g_1_2', 'b_1_2', 'bs_1_2', 'U_1_n', 'U_2_n', 'K_p_agc', 'K_i_agc', 'K_xif'] 
@@ -101,11 +101,11 @@ class model:
         self.inputs_ini_values_list  = [0.0, 0.0, 5000000000.0, 0.0, 1.0, 0.0] 
         self.inputs_run_list = ['P_1', 'Q_1', 'P_2', 'Q_2', 'v_ref_1', 'theta_ref_1'] 
         self.inputs_run_values_list = [0.0, 0.0, 5000000000.0, 0.0, 1.0, 0.0] 
-        self.outputs_list = ['p_line_1_2', 'q_line_1_2', 'p_line_2_1', 'q_line_2_1', 'I_line_1_2', 'I_line_2_1', 'V_1', 'V_2', 'V_dummy_1'] 
+        self.outputs_list = ['V_1', 'V_2', 'p_line_1_2', 'q_line_1_2', 'p_line_2_1', 'q_line_2_1', 'I_line_1_2', 'I_line_2_1', 'V_dummy_1'] 
         self.x_list = ['V_dummy_1', 'xi_freq'] 
-        self.y_run_list = ['V_1', 'theta_1', 'V_2', 'theta_2', 'omega_coi', 'p_line_pu_1_2', 'q_line_pu_1_2', 'p_line_pu_2_1', 'q_line_pu_2_1', 'p_agc'] 
+        self.y_run_list = ['V_1', 'theta_1', 'V_2', 'theta_2', 'p_line_pu_1_2', 'q_line_pu_1_2', 'p_line_pu_2_1', 'q_line_pu_2_1', 'I_1_2', 'I_2_1', 'omega_coi', 'p_agc'] 
         self.xy_list = self.x_list + self.y_run_list 
-        self.y_ini_list = ['V_1', 'theta_1', 'V_2', 'theta_2', 'omega_coi', 'p_line_pu_1_2', 'q_line_pu_1_2', 'p_line_pu_2_1', 'q_line_pu_2_1', 'p_agc'] 
+        self.y_ini_list = ['V_1', 'theta_1', 'V_2', 'theta_2', 'p_line_pu_1_2', 'q_line_pu_1_2', 'p_line_pu_2_1', 'q_line_pu_2_1', 'I_1_2', 'I_2_1', 'omega_coi', 'p_agc'] 
         self.xy_ini_list = self.x_list + self.y_ini_list 
         self.t = 0.0
         self.it = 0
@@ -264,6 +264,10 @@ class model:
     #     jac_run_ss_eval_xy(self.jac_run,self.x,self.y_run,self.u_run,self.p)
     #     jac_run_ss_eval_up(self.jac_run,self.x,self.y_run,self.u_run,self.p)
         
+        
+    def jac_ini_eval(self):
+        de_jac_ini_eval(self.jac_ini,self.x,self.y_ini,self.u_ini,self.p,self.Dt)
+      
     def jac_run_eval(self):
         de_jac_run_eval(self.jac_run,self.x,self.y_run,self.u_run,self.p,self.Dt)
       
@@ -1800,24 +1804,24 @@ def c_h_eval(z,x,y,u,p,Dt):
 
 def sp_jac_ini_vectors():
 
-    sp_jac_ini_ia = [0, 1, 6, 2, 3, 2, 3, 4, 5, 2, 3, 4, 5, 6, 2, 3, 4, 5, 7, 2, 3, 4, 5, 8, 2, 3, 4, 5, 9, 2, 3, 4, 5, 10, 1, 6, 11]
-    sp_jac_ini_ja = [0, 1, 3, 4, 5, 9, 13, 14, 19, 24, 29, 34, 37]
-    sp_jac_ini_nia = 12
-    sp_jac_ini_nja = 12
+    sp_jac_ini_ia = [0, 1, 12, 2, 3, 2, 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5, 6, 2, 3, 4, 5, 7, 2, 3, 4, 5, 8, 2, 3, 4, 5, 9, 2, 6, 7, 10, 4, 8, 9, 11, 12, 1, 12, 13]
+    sp_jac_ini_ja = [0, 1, 3, 4, 5, 9, 13, 18, 23, 28, 33, 37, 41, 42, 45]
+    sp_jac_ini_nia = 14
+    sp_jac_ini_nja = 14
     return sp_jac_ini_ia, sp_jac_ini_ja, sp_jac_ini_nia, sp_jac_ini_nja 
 
 def sp_jac_run_vectors():
 
-    sp_jac_run_ia = [0, 1, 6, 2, 3, 2, 3, 4, 5, 2, 3, 4, 5, 6, 2, 3, 4, 5, 7, 2, 3, 4, 5, 8, 2, 3, 4, 5, 9, 2, 3, 4, 5, 10, 1, 6, 11]
-    sp_jac_run_ja = [0, 1, 3, 4, 5, 9, 13, 14, 19, 24, 29, 34, 37]
-    sp_jac_run_nia = 12
-    sp_jac_run_nja = 12
+    sp_jac_run_ia = [0, 1, 12, 2, 3, 2, 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5, 6, 2, 3, 4, 5, 7, 2, 3, 4, 5, 8, 2, 3, 4, 5, 9, 2, 6, 7, 10, 4, 8, 9, 11, 12, 1, 12, 13]
+    sp_jac_run_ja = [0, 1, 3, 4, 5, 9, 13, 18, 23, 28, 33, 37, 41, 42, 45]
+    sp_jac_run_nia = 14
+    sp_jac_run_nja = 14
     return sp_jac_run_ia, sp_jac_run_ja, sp_jac_run_nia, sp_jac_run_nja 
 
 def sp_jac_trap_vectors():
 
-    sp_jac_trap_ia = [0, 1, 6, 2, 3, 2, 3, 4, 5, 2, 3, 4, 5, 6, 2, 3, 4, 5, 7, 2, 3, 4, 5, 8, 2, 3, 4, 5, 9, 2, 3, 4, 5, 10, 1, 6, 11]
-    sp_jac_trap_ja = [0, 1, 3, 4, 5, 9, 13, 14, 19, 24, 29, 34, 37]
-    sp_jac_trap_nia = 12
-    sp_jac_trap_nja = 12
+    sp_jac_trap_ia = [0, 1, 12, 2, 3, 2, 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5, 6, 2, 3, 4, 5, 7, 2, 3, 4, 5, 8, 2, 3, 4, 5, 9, 2, 6, 7, 10, 4, 8, 9, 11, 12, 1, 12, 13]
+    sp_jac_trap_ja = [0, 1, 3, 4, 5, 9, 13, 18, 23, 28, 33, 37, 41, 42, 45]
+    sp_jac_trap_nia = 14
+    sp_jac_trap_nja = 14
     return sp_jac_trap_ia, sp_jac_trap_ja, sp_jac_trap_nia, sp_jac_trap_nja 

pydae/bmapu/lines/temp_ini_cffi.c

@@ -573,7 +573,7 @@ static void (*_cffi_call_python_org)(struct _cffi_externpy_s *, char *);
 void f_ini_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
 data[0] = -x[0] + u[4]; 
-data[1] = -p[8]*x[1] - y[4] + 1; 
+data[1] = -p[8]*x[1] - y[10] + 1; 
 
 }
 
@@ -583,78 +583,88 @@ data[0] = y[0] - u[4];
 data[1] = y[1] - u[5]; 
 data[2] = -u[2]/p[0] + y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) + pow(y[2], 2)*p[1]; 
 data[3] = -u[3]/p[0] + y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + pow(y[2], 2)*(-p[2] - 1.0/2.0*p[3]); 
-data[4] = 1.0 - y[4]; 
-data[5] = pow(y[0], 2)*p[1] - y[0]*y[2]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])) + y[5]; 
-data[6] = -pow(y[0], 2)*p[2] - 1.0/2.0*pow(y[0], 2)*p[3] - y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + y[6]; 
-data[7] = -y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])) + pow(y[2], 2)*p[1] + y[7]; 
-data[8] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])) - pow(y[2], 2)*p[2] - 1.0/2.0*pow(y[2], 2)*p[3] + y[8]; 
-data[9] = p[7]*x[1] + p[6]*(1 - y[4]) - y[9]; 
+data[4] = -pow(y[0], 2)*p[1] - y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) + y[4]; 
+data[5] = pow(y[0], 2)*p[2] - y[0]*y[2]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])) + y[5]; 
+data[6] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) - pow(y[2], 2)*p[1] + y[6]; 
+data[7] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + pow(y[2], 2)*p[2] + y[7]; 
+data[8] = -y[8] + 1.4433756729740647e-6*p[0]*sqrt(pow(y[4], 2) + pow(y[5], 2))/y[0]; 
+data[9] = -y[9] + 1.4433756729740647e-6*p[0]*sqrt(pow(y[6], 2) + pow(y[7], 2))/y[2]; 
+data[10] = 1.0 - y[10]; 
+data[11] = p[7]*x[1] + p[6]*(1 - y[10]) - y[11]; 
 
 }
 
 void h_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
-data[0] = p[0]*y[5]; 
-data[1] = p[0]*y[6]; 
-data[2] = p[0]*y[7]; 
-data[3] = p[0]*y[8]; 
-data[4] = 1.4433756729740647e-6*p[0]*sqrt(pow(y[5], 2) + pow(y[6], 2))/y[0]; 
-data[5] = 1.4433756729740647e-6*p[0]*sqrt(pow(y[7], 2) + pow(y[8], 2))/y[2]; 
-data[6] = y[0]; 
-data[7] = y[2]; 
+data[0] = y[0]; 
+data[1] = y[2]; 
+data[2] = p[0]*y[4]; 
+data[3] = p[0]*y[5]; 
+data[4] = p[0]*y[6]; 
+data[5] = p[0]*y[7]; 
+data[6] = y[8]; 
+data[7] = y[9]; 
 data[8] = x[0]; 
 
 }
 
 void de_jac_ini_up_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
-data[13] = -p[8]; 
-data[133] = p[7]; 
-data[138] = -p[6]; 
+data[15] = -p[8]; 
+data[183] = p[7]; 
+data[194] = -p[6]; 
 
 }
 
 void de_jac_ini_xy_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
-data[50] = y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
-data[51] = y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[52] = y[0]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) + 2*y[2]*p[1]; 
-data[53] = y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
-data[62] = y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[63] = y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[64] = y[0]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + 2*y[2]*(-p[2] - 1.0/2.0*p[3]); 
-data[65] = y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
-data[86] = 2*y[0]*p[1] - y[2]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[87] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
-data[88] = -y[0]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[89] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[98] = -2*y[0]*p[2] - y[0]*p[3] - y[2]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[99] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[100] = -y[0]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[58] = y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[59] = y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[60] = y[0]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) + 2*y[2]*p[1]; 
+data[61] = y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
+data[72] = y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[73] = y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
+data[74] = y[0]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + 2*y[2]*(-p[2] - 1.0/2.0*p[3]); 
+data[75] = y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[86] = -2*y[0]*p[1] - y[2]*(-p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[87] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[88] = -y[0]*(-p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[89] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
+data[100] = 2*y[0]*p[2] - y[2]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
 data[101] = -y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
-data[110] = -y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[111] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
-data[112] = -y[0]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])) + 2*y[2]*p[1]; 
-data[113] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[122] = -y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
-data[123] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
-data[124] = -y[0]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])) - 2*y[2]*p[2] - y[2]*p[3]; 
-data[125] = -y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
+data[102] = -y[0]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
+data[103] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
+data[114] = -y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[115] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[116] = -y[0]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) - 2*y[2]*p[1]; 
+data[117] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
+data[128] = -y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[129] = -y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
+data[130] = -y[0]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + 2*y[2]*p[2]; 
+data[131] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[142] = -1.4433756729740647e-6*p[0]*sqrt(pow(y[4], 2) + pow(y[5], 2))/pow(y[0], 2); 
+data[146] = 1.4433756729740647e-6*p[0]*y[4]*pow(pow(y[4], 2) + pow(y[5], 2), -0.5)/y[0]; 
+data[147] = 1.4433756729740647e-6*p[0]*y[5]*pow(pow(y[4], 2) + pow(y[5], 2), -0.5)/y[0]; 
+data[158] = -1.4433756729740647e-6*p[0]*sqrt(pow(y[6], 2) + pow(y[7], 2))/pow(y[2], 2); 
+data[162] = 1.4433756729740647e-6*p[0]*y[6]*pow(pow(y[6], 2) + pow(y[7], 2), -0.5)/y[2]; 
+data[163] = 1.4433756729740647e-6*p[0]*y[7]*pow(pow(y[6], 2) + pow(y[7], 2), -0.5)/y[2]; 
 
 }
 
 void de_jac_ini_num_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
 data[0] = -1; 
-data[18] = -1; 
-data[26] = 1; 
-data[39] = 1; 
-data[78] = -1; 
-data[91] = 1; 
-data[104] = 1; 
-data[117] = 1; 
-data[130] = 1; 
-data[143] = -1; 
+data[26] = -1; 
+data[30] = 1; 
+data[45] = 1; 
+data[90] = 1; 
+data[105] = 1; 
+data[120] = 1; 
+data[135] = 1; 
+data[150] = -1; 
+data[165] = -1; 
+data[180] = -1; 
+data[195] = -1; 
 
 }
 

pydae/bmapu/lines/temp_run_cffi.c

@@ -573,7 +573,7 @@ static void (*_cffi_call_python_org)(struct _cffi_externpy_s *, char *);
 void f_run_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
 data[0] = -x[0] + u[4]; 
-data[1] = -p[8]*x[1] - y[4] + 1; 
+data[1] = -p[8]*x[1] - y[10] + 1; 
 
 }
 
@@ -583,78 +583,88 @@ data[0] = y[0] - u[4];
 data[1] = y[1] - u[5]; 
 data[2] = -u[2]/p[0] + y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) + pow(y[2], 2)*p[1]; 
 data[3] = -u[3]/p[0] + y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + pow(y[2], 2)*(-p[2] - 1.0/2.0*p[3]); 
-data[4] = 1.0 - y[4]; 
-data[5] = pow(y[0], 2)*p[1] - y[0]*y[2]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])) + y[5]; 
-data[6] = -pow(y[0], 2)*p[2] - 1.0/2.0*pow(y[0], 2)*p[3] - y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + y[6]; 
-data[7] = -y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])) + pow(y[2], 2)*p[1] + y[7]; 
-data[8] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])) - pow(y[2], 2)*p[2] - 1.0/2.0*pow(y[2], 2)*p[3] + y[8]; 
-data[9] = p[7]*x[1] + p[6]*(1 - y[4]) - y[9]; 
+data[4] = -pow(y[0], 2)*p[1] - y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) + y[4]; 
+data[5] = pow(y[0], 2)*p[2] - y[0]*y[2]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])) + y[5]; 
+data[6] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) - pow(y[2], 2)*p[1] + y[6]; 
+data[7] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + pow(y[2], 2)*p[2] + y[7]; 
+data[8] = -y[8] + 1.4433756729740647e-6*p[0]*sqrt(pow(y[4], 2) + pow(y[5], 2))/y[0]; 
+data[9] = -y[9] + 1.4433756729740647e-6*p[0]*sqrt(pow(y[6], 2) + pow(y[7], 2))/y[2]; 
+data[10] = 1.0 - y[10]; 
+data[11] = p[7]*x[1] + p[6]*(1 - y[10]) - y[11]; 
 
 }
 
 void h_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
-data[0] = p[0]*y[5]; 
-data[1] = p[0]*y[6]; 
-data[2] = p[0]*y[7]; 
-data[3] = p[0]*y[8]; 
-data[4] = 1.4433756729740647e-6*p[0]*sqrt(pow(y[5], 2) + pow(y[6], 2))/y[0]; 
-data[5] = 1.4433756729740647e-6*p[0]*sqrt(pow(y[7], 2) + pow(y[8], 2))/y[2]; 
-data[6] = y[0]; 
-data[7] = y[2]; 
+data[0] = y[0]; 
+data[1] = y[2]; 
+data[2] = p[0]*y[4]; 
+data[3] = p[0]*y[5]; 
+data[4] = p[0]*y[6]; 
+data[5] = p[0]*y[7]; 
+data[6] = y[8]; 
+data[7] = y[9]; 
 data[8] = x[0]; 
 
 }
 
 void de_jac_run_up_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
-data[13] = -p[8]; 
-data[133] = p[7]; 
-data[138] = -p[6]; 
+data[15] = -p[8]; 
+data[183] = p[7]; 
+data[194] = -p[6]; 
 
 }
 
 void de_jac_run_xy_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
-data[50] = y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
-data[51] = y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[52] = y[0]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) + 2*y[2]*p[1]; 
-data[53] = y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
-data[62] = y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[63] = y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[64] = y[0]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + 2*y[2]*(-p[2] - 1.0/2.0*p[3]); 
-data[65] = y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
-data[86] = 2*y[0]*p[1] - y[2]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[87] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
-data[88] = -y[0]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[89] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[98] = -2*y[0]*p[2] - y[0]*p[3] - y[2]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[99] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[100] = -y[0]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[58] = y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[59] = y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[60] = y[0]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) + 2*y[2]*p[1]; 
+data[61] = y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
+data[72] = y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[73] = y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
+data[74] = y[0]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + 2*y[2]*(-p[2] - 1.0/2.0*p[3]); 
+data[75] = y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[86] = -2*y[0]*p[1] - y[2]*(-p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[87] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[88] = -y[0]*(-p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[89] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
+data[100] = 2*y[0]*p[2] - y[2]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
 data[101] = -y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
-data[110] = -y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
-data[111] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
-data[112] = -y[0]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])) + 2*y[2]*p[1]; 
-data[113] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
-data[122] = -y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
-data[123] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
-data[124] = -y[0]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])) - 2*y[2]*p[2] - y[2]*p[3]; 
-data[125] = -y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
+data[102] = -y[0]*(p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
+data[103] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
+data[114] = -y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[115] = -y[0]*y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[116] = -y[0]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])) - 2*y[2]*p[1]; 
+data[117] = -y[0]*y[2]*(-p[2]*cos(y[1] - y[3]) - p[1]*sin(y[1] - y[3])); 
+data[128] = -y[2]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])); 
+data[129] = -y[0]*y[2]*(-p[2]*sin(y[1] - y[3]) + p[1]*cos(y[1] - y[3])); 
+data[130] = -y[0]*(p[2]*cos(y[1] - y[3]) + p[1]*sin(y[1] - y[3])) + 2*y[2]*p[2]; 
+data[131] = -y[0]*y[2]*(p[2]*sin(y[1] - y[3]) - p[1]*cos(y[1] - y[3])); 
+data[142] = -1.4433756729740647e-6*p[0]*sqrt(pow(y[4], 2) + pow(y[5], 2))/pow(y[0], 2); 
+data[146] = 1.4433756729740647e-6*p[0]*y[4]*pow(pow(y[4], 2) + pow(y[5], 2), -0.5)/y[0]; 
+data[147] = 1.4433756729740647e-6*p[0]*y[5]*pow(pow(y[4], 2) + pow(y[5], 2), -0.5)/y[0]; 
+data[158] = -1.4433756729740647e-6*p[0]*sqrt(pow(y[6], 2) + pow(y[7], 2))/pow(y[2], 2); 
+data[162] = 1.4433756729740647e-6*p[0]*y[6]*pow(pow(y[6], 2) + pow(y[7], 2), -0.5)/y[2]; 
+data[163] = 1.4433756729740647e-6*p[0]*y[7]*pow(pow(y[6], 2) + pow(y[7], 2), -0.5)/y[2]; 
 
 }
 
 void de_jac_run_num_eval(double *data,double *x,double *y,double *u,double *p,double Dt){
 
 data[0] = -1; 
-data[18] = -1; 
-data[26] = 1; 
-data[39] = 1; 
-data[78] = -1; 
-data[91] = 1; 
-data[104] = 1; 
-data[117] = 1; 
-data[130] = 1; 
-data[143] = -1; 
+data[26] = -1; 
+data[30] = 1; 
+data[45] = 1; 
+data[90] = 1; 
+data[105] = 1; 
+data[120] = 1; 
+data[135] = 1; 
+data[150] = -1; 
+data[165] = -1; 
+data[180] = -1; 
+data[195] = -1; 
 
 }