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

pydae/bmapu/miscellaneous/temp_xy_0.json

@@ -4,11 +4,5 @@
     "V_2": 1.0,
     "theta_2": 0.0,
     "omega_coi": 1.0,
-    "omega_1": 1.0,
-    "e1q_1": 1.0,
-    "i_q_1": 0.5,
-    "v_f_1": 1.5,
-    "v_r_1": 1.0,
-    "xi_v_1": 10000.0,
-    "x_cb_1": 2.0
+    "omega_2": 1.0
 }

pydae/bmapu/miscellaneous/xy_0.json

@@ -4,11 +4,5 @@
     "V_2": 1.0,
     "theta_2": 0.0,
     "omega_coi": 1.0,
-    "omega_1": 1.0,
-    "e1q_1": 1.0,
-    "i_q_1": 0.5,
-    "v_f_1": 1.5,
-    "v_r_1": 1.0,
-    "xi_v_1": 10000.0,
-    "x_cb_1": 2.0
+    "omega_2": 1.0
 }

pydae/bmapu/pvs/pvs.py

@@ -29,12 +29,15 @@ def add_pvs(grid):
         else:
             name = bus_name
             
+
+
         for gen_id in range(100):
             if name not in grid.generators_id_list:
                 grid.generators_id_list += [name]
                 break
             else:
                 name = name + f'_{gen_id}'
+
                 
         item['name'] = name
 

pydae/etools/pv_designer.py

@@ -0,0 +1,325 @@
+import numpy as np
+import json,hjson
+from pydae.utils import read_data
+
+
+class Desing:
+
+    def __init__(self, data):
+
+        self.data = read_data(data)
+        self.z_decimals = 5
+        self.lines_impedance_format = 'Z_km' # 'Z_km', 'pu-s', 'Z'
+        
+
+        self.S_base    = self.data['S_base']  
+        self.P_inv_max = self.data['P_inv_max']  
+        self.S_inv_max = self.data['S_inv_max']  
+        self.U_lv      = self.data['U_lv']  
+        self.U_mv      = self.data['U_mv']  
+        self.U_hv      = self.data['U_hv'] 
+        self.F         = self.data['F']  
+        self.M         = self.data['M'] 
+        self.N         = self.data['N']  
+        self.S_bess_mva         = self.data['S_bess_mva'] 
+        self.S_bess_storage_kWh = self.data['S_bess_storage_kWh'] 
+        self.Irrad_max          = self.data['Irrad_max'] 
+        self.Area_form_factor   = self.data['Area_form_factor'] 
+        self.PV_efficiency      = self.data['PV_efficiency'] 
+        self.Z_trafo_poi_pu     = self.data['Z_trafo_poi_pu'] 
+        self.I_mp = data["I_mp"]
+        self.V_mp = data["V_mp"]
+        self.V_dc_n = data["V_dc_n"] 
+
+        self.cables = [
+        {'name':  '1X95', 'R_dc_km': 0.320, 'R_ac_km': 0.403, 'X_km': 0.128, 'muC_km': 0.187, 'R_0_km': 1.050, 'X_0_km': 0.391, 'muC_0_km': 0.187,  'I_max_aire': 255, 'I_max_direct': 205, 'I_max_tube': 190, 'I_cc_max':  8930, 'I_cc_0_max': 3140},
+        {'name': '1X150', 'R_dc_km': 0.206, 'R_ac_km': 0.262, 'X_km': 0.119, 'muC_km': 0.216, 'R_0_km': 0.890, 'X_0_km': 0.341, 'muC_0_km': 0.216,  'I_max_aire': 335, 'I_max_direct': 260, 'I_max_tube': 245, 'I_cc_max': 14100, 'I_cc_0_max': 3470},
+        {'name': '1X240', 'R_dc_km': 0.125, 'R_ac_km': 0.161, 'X_km': 0.109, 'muC_km': 0.260, 'R_0_km': 0.768, 'X_0_km': 0.297, 'muC_0_km': 0.260,  'I_max_aire': 455, 'I_max_direct': 345, 'I_max_tube': 320, 'I_cc_max': 22600, 'I_cc_0_max': 3810},
+        {'name': '1X400', 'R_dc_km':0.0778, 'R_ac_km': 0.102, 'X_km': 0.103, 'muC_km': 0.313, 'R_0_km': 0.650, 'X_0_km': 0.237, 'muC_0_km': 0.313,  'I_max_aire': 610, 'I_max_direct': 445, 'I_max_tube': 415, 'I_cc_max': 37600, 'I_cc_0_max': 4300},
+        {'name': '1X500', 'R_dc_km':0.0605, 'R_ac_km': 0.084, 'X_km': 0.099, 'muC_km': 0.329, 'R_0_km': 0.618, 'X_0_km': 0.225, 'muC_0_km': 0.329,  'I_max_aire': 715, 'I_max_direct': 505, 'I_max_tube': 480, 'I_cc_max': 47000, 'I_cc_0_max': 4810},
+        {'name': '1X630', 'R_dc_km':0.0469, 'R_ac_km':0.0636, 'X_km': 0.095, 'muC_km': 0.396, 'R_0_km': 0.561, 'X_0_km': 0.195, 'muC_0_km': 0.396,  'I_max_aire': 830, 'I_max_direct': 575, 'I_max_tube': 545, 'I_cc_max': 59200, 'I_cc_0_max': 5140}
+        ]
+
+
+    def design(self):
+
+        M = self.M
+        N = self.N
+        self.S_plant = self.S_inv_max*N*M + 1.2*self.S_bess_mva*1e6
+        S_base = self.S_base
+
+        self.LV_MV_trafo_X_pu = 0.05
+        self.LV_MV_trafo_R_pu = 0.01
+
+        S_trafo_poi = M*N*self.S_inv_max*1.1
+
+        # Area_inv = Long_n * Long_m    
+        # Long_n =  Area_form_factor * Long_m
+        # Area_inv = Area_form_factor * Long_m**2
+
+        Area_inv = self.P_inv_max/(self.Irrad_max*self.PV_efficiency)
+        self.Long_m = np.sqrt( Area_inv/self.Area_form_factor )
+        self.Long_n =  self.Area_form_factor * self.Long_m
+
+        S_grid_line = self.S_plant*2.0
+
+        self.base_data = {
+            "system":{"name":f"pv_{M}_{N}","S_base":S_base,"K_p_agc":0.0,"K_i_agc":0.0,"K_xif":0.01},
+            "buses":[
+                {"name": "POIMV","P_W":0.0,"Q_var":0.0,"U_kV":self.U_mv/1e3},
+                {"name":   "POI","P_W":0.0,"Q_var":0.0,"U_kV":self.U_hv/1e3},
+                {"name":  "GRID","P_W":0.0,"Q_var":0.0,"U_kV":self.U_hv/1e3},
+                {"name":  "BESS","P_W":0.0,"Q_var":0.0,"U_kV":self.U_lv/1e3},
+            ],
+            "lines":[
+                {"bus_j":"POI","bus_k":"GRID","X_pu":0.001*S_base/S_grid_line,"R_pu":0.0,"Bs_pu":0.0,"S_mva":S_base/1e6, 'sym':True, 'monitor':True},
+                {"bus_j":"BESS","bus_k": "POIMV","X_pu":0.01,"R_pu":0.0,"Bs_pu":0.0,"S_mva":S_base/1e6, 'sym':True, 'monitor':True},
+                ],
+            "transformers":[{"bus_j":"POIMV","bus_k": "POI","X_pu":0.1,"R_pu":0.0,"Bs_pu":0.0,"S_mva":self.S_plant/1e6}],
+            "pvs":[],
+            "sources":[{"type":"genape","bus":"GRID",
+                        "S_n":1000e6,"F_n":50.0,"X_v":0.001,"R_v":0.0,
+                        "K_delta":0.001,"K_alpha":1e-6}],
+            "vscs":[{"type":"bess_pq","bus":"BESS","E_kWh":self.S_bess_storage_kWh,"S_n":self.S_bess_mva*1e6,
+                    "soc_ref":0.5,
+                    "socs":[0.0, 0.1, 0.2, 0.8,0.9,1.0],
+                    "es":[1, 1.08, 1.13, 1.17, 1.18,1.25]}
+                ],
+            }
+
+
+        Z_base_trafo_poi = self.U_mv**2/S_trafo_poi 
+        Z_trafo_poi = Z_base_trafo_poi*self.Z_trafo_poi_pu
+        I_cc_max = self.U_mv/(np.sqrt(3)*Z_trafo_poi)
+
+        for it, item in enumerate(self.cables):
+            if item['I_cc_max'] > I_cc_max:
+                print(f"Short circuit designed cable ({I_cc_max/1e3:0.2f} kA): {item['name']}")
+                idx_cc = it
+                break
+
+        I_max = 1.0*N*self.S_inv_max/(np.sqrt(3)*self.U_mv)
+
+        for it, item in enumerate(self.cables):
+            if item['I_max_tube'] > I_max:
+                print(f"Nominal current designed cable  ({I_max:0.2f} A): {item['name']}")
+                idx_n = it
+                break
+
+        if idx_cc > idx_n:
+            idx_cable = idx_cc
+        else:
+            idx_cable = idx_n
+
+        print(f"Cable: {self.cables[idx_cable]['name']}")
+
+        self.section_cable =  float(self.cables[idx_cable]['name'].split('X')[-1])
+        self.R_km_cable =  self.cables[idx_cable]['R_ac_km']
+        self.X_km_cable =  self.cables[idx_cable]['X_km']
+        self.B_km_cable =  2*np.pi*50*self.cables[idx_cable]['muC_km']*1e-6
+    
+
+
+
+        P_mp = self.I_mp*self.V_mp
+        N_pv_s = int(self.V_dc_n/self.V_mp)
+        N_pv_p = int(self.P_inv_max/(P_mp*N_pv_s))
+
+        S_feeder = N*self.S_inv_max
+        I_feeder = S_feeder/(np.sqrt(3)*self.U_mv)
+
+        pos_mv_poi_m_pu = 0.0
+        pos_mv_poi_m = pos_mv_poi_m_pu * (M-1)*self.Long_m
+        pos_mv_poi_n = 0.0
+
+        for i_m in range(1,M+1):
+            name_j = "POIMV"
+            monitor = True
+            pos_m =  (i_m-1) * self.Long_m
+
+
+            for i_n in range(1,N+1):
+                name = f"{i_m}".zfill(2) + f"{i_n}".zfill(2)
+                name_k = 'MV' + name
+
+                self.base_data['buses'].append({"name":f"LV{name}","P_W":0.0,"Q_var":0.0,"U_kV":self.U_lv/1e3})
+                self.base_data['buses'].append({"name":f"MV{name}","P_W":0.0,"Q_var":0.0,"U_kV":self.U_mv/1e3})
+
+
+                if i_n == 1:
+                    Long = np.abs(pos_mv_poi_m - pos_m) + self.Long_n*0.5
+                else:
+                    Long = self.Long_n
+
+                pos_n =  (i_n-1) * self.Long_n + self.Long_n/2
+                #print(f'pos_m = {pos_m:5.1f}, pos_n = {pos_n:5.1f}')
+
+                # LV-MV Trafos
+                S_trafo_n = 1.2*self.S_inv_max
+                X_pu = self.LV_MV_trafo_X_pu*self.S_base/S_trafo_n
+                R_pu = self.LV_MV_trafo_R_pu*self.S_base/S_trafo_n
+
+
+
+                self.base_data['lines'].append({"bus_j":f"LV{name}","bus_k":f"MV{name}","X_pu":np.round(X_pu,self.z_decimals),"R_pu":np.round(R_pu,self.z_decimals),"Bs_pu":0.0,"S_mva":S_base/1e6,"monitor":False})
+      
+            
+                # MV Cables:
+                S_b = self.S_base
+                Z_b = self.U_mv**2/S_b
+                R_cable_pu = self.R_km_cable*Long/1e3/Z_b
+                X_cable_pu = self.X_km_cable*Long/1e3/Z_b
+                B_cable_pu = self.B_km_cable*Long/1e3*Z_b
+
+                print(f"{name_k} - {name_j}, Cable: {self.cables[idx_cable]['name']}, R_km = {self.R_km_cable:3.4f}, X_km = {self.X_km_cable:3.4f}, B_km = {self.B_km_cable:3.4f}, Long_km = {Long/1000:2.5f}")
+                
+                # LV/MV Transformers
+ 
+                # MV Feeders lines
+                if self.lines_impedance_format == 'pu-s':
+                    self.base_data['lines'].append({"bus_j":f"{name_k}","bus_k":f"{name_j}","X_pu":X_cable_pu,"R_pu":R_cable_pu,"Bs_pu":B_cable_pu,"S_mva":S_base/1e6,"monitor":monitor})
+
+                if self.lines_impedance_format == 'Z_km':
+                    X_km_cable = np.round(self.X_km_cable,self.z_decimals) 
+                    R_km_cable = np.round(self.R_km_cable,self.z_decimals)
+                    B_km_cable = np.round(self.B_km_cable,self.z_decimals)
+
+                    self.base_data['lines'].append({"bus_j":f"{name_k}","bus_k":f"{name_j}","X_km": X_km_cable,"R_km": R_km_cable,"Bs_km": B_km_cable,"km":np.round(Long/1e3,4),"monitor":monitor})
+
+                
+                name_j = name_k
+                self.base_data['pvs'].append({"bus":f"LV{name}","type":"pv_dq_d","S_n":self.S_inv_max,"U_n":self.U_lv,"F_n":50.0,"X_s":0.1,"R_s":0.0001,"monitor":False,
+                                    "I_sc":8,"V_oc":42.1,"I_mp":self.I_mp,"V_mp":self.V_mp,"K_vt":-0.160,"K_it":0.065,"N_pv_s":N_pv_s,"N_pv_p":N_pv_p})
+            
+                monitor = False
+
+        with open(f'pv_{M}_{N}.json','w') as fobj:
+            fobj.write(json.dumps(self.base_data, indent=2))
+
+    def report(self):
+
+        M = self.M
+        N = self.N
+
+        latex = r'''
+        \begin{table}
+            \centering
+            \caption{Nominal characteristics of PV inverters and transformers of the benchmark 2$\times$3 PV park.}
+            \begin{tabular}{lr}
+            \toprule
+                \multicolumn{2}{c}{PV inverters} \\ \midrule
+                Rated voltage & inverter_rated_voltage V \\ \hline
+                Rated power & inverter_rated_mva MVA \\ \hline
+                Rated power factor & inverter_pf (ind/cap)\\ \midrule
+                \multicolumn{2}{c}{MV/LV PV transformers} \\ \midrule
+                Rated voltages & U_mv_kV/U_lv_kV kV \\ \hline
+                Rated power & MV_LV_rated_mva MVA \\ \hline
+                Short-circuit impedance & 0.06 p.u. \\ \hline
+                $X_{sc}/R_{sc}$ & 10 \\  \midrule
+                \multicolumn{2}{c}{HV/MV POI transformer} \\ \midrule
+                Rated voltages & U_hv_kV/U_mv_kV kV \\ \hline
+                Rated power & poi_trafo_rated_power MVA \\ \hline 
+                Short-circuit impedance & 0.13 p.u. \\ \hline
+                $X_{sc}/R_{sc}$ & 10\\ \midrule
+                \multicolumn{2}{c}{MV branches} \\
+                \midrule
+first_feeder_segment_string
+                Length MV\#\# - MV\#\# & length_segments m \\ \hline
+                Cross section &  section_cable mm$^2$\\ \hline
+                Resistance & R_km_cable $\Omega$/km \\ \hline
+                Reactance  & X_km_cable $\Omega$/km \\ %\hline
+        %        Susceptance & B_km_cable S/km \\ 
+                \bottomrule
+            \end{tabular}
+            \label{tab:PV_MxN}
+        \end{table}        
+        '''
+
+        latex = latex.replace('inverter_rated_voltage', f'{self.U_lv:0.0f}')
+        latex = latex.replace('inverter_rated_mva', f'{self.S_inv_max/1e6:0.1f}')
+        latex = latex.replace('inverter_pf', f'{self.P_inv_max/self.S_inv_max:0.2f}')
+        latex = latex.replace('U_mv_kV', f'{self.U_mv/1e3:0.0f}').replace('U_lv_kV', f'{self.U_lv/1e3}')
+        latex = latex.replace('inverter_pf', f'{self.P_inv_max/self.S_inv_max:0.2f}')
+        latex = latex.replace('U_mv_kV', f'{self.U_mv/1e3:0.0f}').replace('U_hv_kV', f'{self.U_hv/1e3:0.0f}')
+        latex = latex.replace('poi_trafo_rated_power', f'{self.S_plant/1e6:0.0f}') 
+
+
+        pos_mv_poi_m_pu = 0.0
+        pos_mv_poi_m = pos_mv_poi_m_pu * (M-1)*self.Long_m
+        pos_mv_poi_n = 0.0
+
+        first_feeder_segment_string = ''
+        for i_m in range(1,M+1):
+            name_j = "POIMV"
+            monitor = True
+            pos_m =  (i_m-1) * self.Long_m
+
+
+            for i_n in range(1,N+1):
+                name = f"{i_m}".zfill(2) + f"{i_n}".zfill(2)
+                name_k = 'MV' + name
+
+                self.base_data['buses'].append({"name":f"LV{name}","P_W":0.0,"Q_var":0.0,"U_kV":self.U_lv/1e3})
+                self.base_data['buses'].append({"name":f"MV{name}","P_W":0.0,"Q_var":0.0,"U_kV":self.U_mv/1e3})
+
+
+                if i_n == 1:
+                    Long = np.abs(pos_mv_poi_m - pos_m) + self.Long_n*0.5
+                else:
+                    Long = self.Long_n
+
+                if i_n == 1:
+                    first_feeder_segment_string += f'                Length {name_k}-{name_j}  & {Long:0.0f} m' + r'\\ \hline' 
+                    if i_m < M:
+                        first_feeder_segment_string +=  '\n'
+                else:
+                    self.length_segments = Long
+ 
+        latex = latex.replace('first_feeder_segment_string', first_feeder_segment_string) 
+        latex = latex.replace('length_segments', f'{self.length_segments:0.0f}') 
+
+        latex = latex.replace('length_segments', f'{self.length_segments:0.0f}') 
+        latex = latex.replace('R_km_cable', f'{self.R_km_cable:0.4f}') 
+        latex = latex.replace('X_km_cable', f'{self.X_km_cable:0.4f}') 
+
+        if self.B_km_cable > 0.001:
+            latex = latex.replace('B_km_cable', f'{self.B_km_cable:0.4f}') 
+        else:
+            latex = latex.replace('B_km_cable', '0') 
+
+        latex = latex.replace('section_cable', f'{self.section_cable:0.0f}')  
+        latex = latex.replace('PV_MxN',  f'PV_{M}x{N}')  
+
+        return latex
+
+
+if __name__ == "__main__": 
+
+    data = {
+    "M": 2,
+    "N": 3,
+    "S_base": 10e6,
+    "P_inv_max": 3e6, # W
+    "S_inv_max": 3e6/0.85,
+    "U_lv": 800,
+    "U_mv": 20e3,
+    "U_hv": 132e3,
+    "F": 50, #Nominal Frequency (Hz)
+    "S_bess_mva": 1,
+    "S_bess_storage_kWh": 250,
+    "Irrad_max": 1000, # W/m_2
+    "Area_form_factor": 1.0,
+    "PV_efficiency": 0.1,
+    "Z_trafo_poi_pu": 0.1, 
+    "I_mp" : 3.56,  # PV module current at MP
+    "V_mp" : 33.7,  # PV module voltage at MP
+    "V_dc_n" : 1200  # DC nominal voltage 
+}
+
+    d = Desing(data)
+    d.design()
+    print(d.report())
+
+    #print(d.base_data)
+
+    

pydae/tools.py

@@ -8,7 +8,9 @@
 
 import numpy as np
 import json
-
+import hjson
+import requests
+import os 
 
 def save(json_file,dictionary, sort_keys=False, indent=4):
     '''
@@ -34,14 +36,14 @@ def save(json_file,dictionary, sort_keys=False, indent=4):
     
 
     
-def load(json_file):
+def load(data_input):
     '''
-    Read json file and convert it to dictionary.
+    Read json or hjson file and convert it to dictionary.
 
     Parameters
     ----------
-    json_file : path
-        Path of the json data file.
+    data_input : path
+        Path of the json or hjson data file.
 
     Returns
     -------
@@ -50,12 +52,21 @@ def load(json_file):
 
     '''
     
-    with open(json_file, 'r') as fobj:
-        json_data = fobj.read()
-        
-    json_data = json_data.replace("'",'"')
-    data_dictionary = json.loads(json_data)        
-    
+    if type(data_input) == str:
+        if 'http' in data_input:
+            url = data_input
+            resp = requests.get(url)
+            data_dictionary = hjson.loads(resp.text)
+        else:
+            if os.path.splitext(data_input)[1] == '.json':
+                with open(data_input,'r') as fobj:
+                    data_dictionary = json.loads(fobj.read().replace("'",'"'))
+            if os.path.splitext(data_input)[1] == '.hjson':
+                with open(data_input,'r') as fobj:
+                    data_dictionary = hjson.loads(fobj.read().replace("'",'"'))
+    elif type(data_input) == dict:
+        data_dictionary = data_input 
+
     return data_dictionary
 
 

pydae/urisi/fcs/sofc_dcdcac_gf.py

@@ -127,28 +127,31 @@ def sofc_dcdcac_gf(grid,data,name,bus_name):
     Tau_h2 = sym.Symbol(f'Tau_h2_{name}', real=True) # ?? (units?)
     Tau_h2o = sym.Symbol(f'Tau_h2o_{name}', real=True) # ?? (units?)
     Tau_o2 = sym.Symbol(f'Tau_o2_{name}', real=True) # ?? (units?)
-    N0 = sym.Symbol(f'N0_{name}', real=True) # ?? (units?)
+    N_s = sym.Symbol(f'N_s_{name}', real=True) # ?? (units?)
+    N_p = sym.Symbol(f'N_p_{name}', real=True) # ?? (units?)
     E0 = sym.Symbol(f'E0_{name}', real=True) # ?? (units?)
     R_ohm = sym.Symbol(f'R_ohm_{name}', real=True) # ?? (units?)
 
     F = 96487.3 # Faraday's constant (units?)
     R = 8.314 # Universal gas constant  (units?)
     i_dc = i_dc_ref + Di_dc_ref + sym.Piecewise((1.0,i_l<1.0),(250.0,i_l>250.0),(i_l,True))
+    i_cell = i_dc/N_p
 
-    #formulacion del sistema de ecuaciones del modelo
+    #formulacion del sistema de ecuaciones del modelo de una única celda
     # dynamic equations
-    dq_h2  = (2*K_r/U_opt*i_dc - q_h2)/Tau_f
-    dp_h2  = (-p_h2 + (-2*K_r*i_dc + q_h2)/K_h2)/Tau_h2
-    dp_h2o = (2*K_r*i_dc/K_h2o - p_h2o)/Tau_h2o
-    dp_o2  = ((q_h2/R_h01 - K_r*i_dc)/K_o2 - p_o2)/Tau_o2
+    dq_h2  = (2*K_r/U_opt*i_cell - q_h2)/Tau_f
+    dp_h2  = (-p_h2 + (-2*K_r*i_cell + q_h2)/K_h2)/Tau_h2
+    dp_h2o = (2*K_r*i_cell/K_h2o - p_h2o)/Tau_h2o
+    dp_o2  = ((q_h2/R_h01 - K_r*i_cell)/K_o2 - p_o2)/Tau_o2
 
     dDi_dc_ref  = di_dc_ref - 1e-6*Di_dc_ref
 
-    V_ernst = R*temp/(2*F)*sym.ln(p_h2*sym.sqrt(p_o2)/p_h2o)*N0
+    V_ernst = R*temp/(2*F)*sym.ln(p_h2*sym.sqrt(p_o2)/p_h2o)
     P_dc = v_fc_dc*i_dc
 
+
     # Algebraic equations
-    g_v_fc_dc = V_ernst + E0*N0 - R_ohm*N0*i_dc - v_fc_dc
+    g_v_fc_dc = (V_ernst + E0 - R_ohm*i_cell)*N_s - v_fc_dc
 
 
     grid.dae['f'] += [dq_h2,dp_h2,dp_h2o,dp_o2,dDi_dc_ref]
@@ -181,7 +184,8 @@ def sofc_dcdcac_gf(grid,data,name,bus_name):
     grid.dae['params_dict'].update({f'Tau_h2_{name}':26.1})
     grid.dae['params_dict'].update({f'Tau_h2o_{name}':78.3})
     grid.dae['params_dict'].update({f'Tau_o2_{name}':2.91})
-    grid.dae['params_dict'].update({f'N0_{name}':450})
+    grid.dae['params_dict'].update({f'N_s_{name}':450})
+    grid.dae['params_dict'].update({f'N_p_{name}':10})
     grid.dae['params_dict'].update({f'E0_{name}':1.18})
     grid.dae['params_dict'].update({f'R_ohm_{name}':3.2813e-004})
 

pydae/utils/svg2pdf.py

@@ -0,0 +1,56 @@
+import os
+import subprocess
+import json
+import time
+
+
+
+def load_converted_data(json_path):
+    if os.path.exists(json_path):
+        with open(json_path, "r") as f:
+            return json.load(f)
+    return {}
+
+def save_converted_data(json_path, data):
+    with open(json_path, "w") as f:
+        json.dump(data, f, indent=2)
+
+def get_file_mod_time(path):
+    return os.path.getmtime(path)
+
+def convert_all_svgs_to_pdf(input_dir, output_dir, json_path="converted_files.json", inkscape_path=r"C:\Program Files\Inkscape\bin\inkscape.exe"):
+    os.makedirs(output_dir, exist_ok=True)
+    converted_data = load_converted_data(json_path)
+    updated_data = {}
+
+    for filename in os.listdir(input_dir):
+        if filename.lower().endswith(".svg"):
+            input_svg = os.path.join(input_dir, filename)
+            output_pdf = os.path.join(output_dir, os.path.splitext(filename)[0] + ".pdf")
+            mod_time = get_file_mod_time(input_svg)
+
+            # Skip if unchanged
+            if filename in converted_data and converted_data[filename] == mod_time:
+                print(f"Skipping (unchanged): {filename}")
+                updated_data[filename] = mod_time
+                continue
+
+            # Convert
+            try:
+                subprocess.run([
+                    inkscape_path,
+                    input_svg,
+                    "--export-type=pdf",
+                    f"--export-filename={output_pdf}"
+                ], check=True)
+                print(f"Converted: {filename}")
+                updated_data[filename] = mod_time
+            except subprocess.CalledProcessError as e:
+                print(f"Failed to convert {filename}: {e}")
+
+    save_converted_data(json_path, updated_data)
+
+def svg2pdf():
+    # Example usage
+    convert_all_svgs_to_pdf("svg", "figs")
+

{pydae-0.56.3.dist-info → pydae-0.56.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydae
-Version: 0.56.3
+Version: 0.56.4
 Summary: =====
 Keywords: engineering
 Author-email: Juan Manuel Mauricio <jmmauricio6@gmail.com>

{pydae-0.56.3.dist-info → pydae-0.56.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pydae/.gitignore,sha256=c1jUQV9WXX3PWrlOzHiKvUWFomLJUrfYogbU7nYwAwc,288
-pydae/__init__.py,sha256=WQV5HZES-dq8iqVUH5ysQUKQ576WJYMI2xCknHeBmEc,106
+pydae/__init__.py,sha256=tC7ODVqBfv538NrCOaJBs4cHTgNvcGoqT4GXtmp5yfE,106
 pydae/b_pu.py,sha256=FdRRVieJLQDYPwYNWhbXJ0SXvf4jtPdbvIZTKWi16I0,6775
 pydae/bpu.py,sha256=FdRRVieJLQDYPwYNWhbXJ0SXvf4jtPdbvIZTKWi16I0,6775
 pydae/build.py,sha256=ECfc_doyK9PhrjEAlWJGLfirQmpT24XuYNxUgtrXI74,46151
@@ -41,13 +41,13 @@ pydae/temp.py,sha256=K_4SgF8_b6a9zkSCYM_1Ta9olJhpafuduiHSYCzLKQc,60271
 pydae/temp_ini_cffi.c,sha256=IOhBAj5NvJB7jtw7jhAlsbxWAyk4SXln_WbtQ-te_2k,42517
 pydae/temp_run_cffi.c,sha256=KXXwvj8Vco20aFVEGrXwv66w941e3Ko0kks4C3kI7nY,42511
 pydae/temp_trap_cffi.c,sha256=6TrwKnjjB1S_QDRMY57oz09trX0CjZSQHa0pOaWW88o,33135
-pydae/tools.py,sha256=MdmvKyKvbcRU3U4zKQ34Y_ksZXkuwT31EmGe5sWEWOc,4223
+pydae/tools.py,sha256=f7VexbXpH0JOLFeH-l0o2vDG3faN7ai3OPlLldQqg9k,4765
 pydae/train_tools.py,sha256=8I-bKxIi0Ab0SXB_gKKUwk4n5wFipbDUdUjtFPl_rAE,6115
 pydae/transformers.py,sha256=tVei7P88EFJWx-68NjscVL8eYFJYECpQtRgS6BH_3B0,17289
 pydae/xy_0.json,sha256=uX-p5beHXjMDIkSTd5egfdq2UOq4n37oHpB8XJbpUts,240
 pydae/.ipynb_checkpoints/models-checkpoint.py,sha256=N8-m1Dk6HdmgpELHhEudVGup3ZO_b_DrJls7nanY4O8,58246
 pydae/bmapu/__init__.py,sha256=r7mgVYduCfuZ_pqaNXp_Y6Y-L3wcOKT4dzBLPsr8oak,105
-pydae/bmapu/bmapu_builder.py,sha256=JHMyJdW4eOR4WdSjYMyb5tuBbX_o0pOpU01E3Qap_i8,25832
+pydae/bmapu/bmapu_builder.py,sha256=QwP2bEmLQAIO2aIG_1qaijipslW9kYDLtaqdBQ9qn3E,27450
 pydae/bmapu/avrs/__init__.py,sha256=JhpeBVii27qLqxJqimWLBYwjPgXrz3hYq7PQQf2ssGs,99
 pydae/bmapu/avrs/avr_antiw.py,sha256=WtezvBDcr82VEqEmbSMdfKS_jdeI-ZcBan5FWqTURd4,15589
 pydae/bmapu/avrs/avrs.py,sha256=sWz29mcLMPcK7N0NiCtkF7MszAkv-RNAvo8Vst81m2A,1104
@@ -99,20 +99,22 @@ pydae/bmapu/loads/xy_0.json,sha256=3S2kNH4SMSQdhG49UC_it-0iqZXOo_lXmf7QgLwXls8,2
 pydae/bmapu/loads/zip.hjson,sha256=fFe-SW6l4fy4zJ1RNjUhcgVORulc1KYLpZjo4CmUUBI,471
 pydae/bmapu/loads/zip.py,sha256=GPXNZZHZ5WSEd8GkPDhT0Y7Vi1sV0N33ZVNDCuvMrSA,2234
 pydae/bmapu/miscellaneous/__init__.py,sha256=JhpeBVii27qLqxJqimWLBYwjPgXrz3hYq7PQQf2ssGs,99
+pydae/bmapu/miscellaneous/banks.hjson,sha256=RQr0Wb21BMTGjq63WSpNN7hPwOva8svcJJ-ljwBjRcc,534
+pydae/bmapu/miscellaneous/banks.py,sha256=lBRiDVoEoyu3rDFDGlYGqIzNNTbi-gTZJLAvh08dcr4,2011
 pydae/bmapu/miscellaneous/fault.hjson,sha256=FLACfOsxsQ_u9gMUIqtIpu33RrfWJKVQ6jH3vaiw-8s,814
 pydae/bmapu/miscellaneous/fault.py,sha256=h9KH13K4_2v3I_GxNjUCIozw9poj37vZdlmVEM21GM8,3298
 pydae/bmapu/miscellaneous/fault.svg,sha256=HdUsQkL42e6PvBHzgKcoZErBsDljHn_16HgkdNxOuX8,32865
 pydae/bmapu/miscellaneous/miscellaneous.py,sha256=CH66pLjnbxiWWGkoObJNImiR6OiSiqKEHSkyyH_o43Q,649
 pydae/bmapu/miscellaneous/pll.hjson,sha256=juYnhVB4E6hugKoiYAm9CR6OTPsiU54AX0N_X09Xeyc,939
 pydae/bmapu/miscellaneous/pll.ipynb,sha256=94mo3h58QNo7vCGchz0gBNf8Vo_0Q6RXpeGchjfvm2E,100314
-pydae/bmapu/miscellaneous/pll.py,sha256=j9VZTv6sEnJqqSih2T898TsmbquchcnMUFG5q8uQlCE,3874
+pydae/bmapu/miscellaneous/pll.py,sha256=232o6XqGcax1cVRwmR-PD3-hFWrWWn8f2cauKQrav-M,3943
 pydae/bmapu/miscellaneous/pll.svg,sha256=Q8Gmwk4moJv9sWA26bCL8sexCv28ZSUORWdZs_g9e3I,32748
 pydae/bmapu/miscellaneous/pll_omegas.svg,sha256=dygV8cT7DQk0JFpJbW9dzxgeywatyayqVdOE3nMwLlA,51621
 pydae/bmapu/miscellaneous/pll_pod.py,sha256=EH5WymAxEzRzVxl4Kv9rlcnlBLl-Tc8DEmVu5yl79YM,5739
-pydae/bmapu/miscellaneous/temp.py,sha256=v2TL7LdyazK0zKhHE-Un1yeb2y1zHnjQr7P6IjSxVIw,67153
-pydae/bmapu/miscellaneous/temp_cffi.c,sha256=yqbMWk_4s6L-OAqRt8HaGVgJdTfKbMAWOplQkpu-bvk,235891
-pydae/bmapu/miscellaneous/temp_xy_0.json,sha256=9UI6XGiyO3EHMx_VUVFzUNEJre1qg5rDlQ0t32MAljM,243
-pydae/bmapu/miscellaneous/xy_0.json,sha256=9UI6XGiyO3EHMx_VUVFzUNEJre1qg5rDlQ0t32MAljM,243
+pydae/bmapu/miscellaneous/temp.py,sha256=2eODCi8JYFYPdaI5Z5UCygS6NW93BxH3wlExXT5thmU,65880
+pydae/bmapu/miscellaneous/temp_cffi.c,sha256=8JgG-Uq0q4mO-rXWyl5j8LmmydMYvWXqBMu64mQa0vU,228005
+pydae/bmapu/miscellaneous/temp_xy_0.json,sha256=3lR24ijoEGnQrtwvWuNW0zmc0yaybQeUeLzFjK0fI3c,123
+pydae/bmapu/miscellaneous/xy_0.json,sha256=3lR24ijoEGnQrtwvWuNW0zmc0yaybQeUeLzFjK0fI3c,123
 pydae/bmapu/old/bpu.py,sha256=FdRRVieJLQDYPwYNWhbXJ0SXvf4jtPdbvIZTKWi16I0,6775
 pydae/bmapu/pods/__init__.py,sha256=JhpeBVii27qLqxJqimWLBYwjPgXrz3hYq7PQQf2ssGs,99
 pydae/bmapu/pods/pod_2wo_3ll.hjson,sha256=h2jdpkicUk_-vSrYkrLgAu7F4_KM_Dg89_aNqYXU9jk,1003
@@ -145,7 +147,7 @@ pydae/bmapu/pvs/pv_dq_ss_test.ipynb,sha256=sJevn6PnKK3OlPRwBpc1etGOPHdg2ikeD9uT5
 pydae/bmapu/pvs/pv_model_test.ipynb,sha256=UZMSZz5VcTCynyYP3E9CALz5kXrA9Kahi4kkFhJ2_1g,221714
 pydae/bmapu/pvs/pv_test.py,sha256=Ku2XC39nefqELSJC0u_gzRhJtBC5Pu7Y2n0M671u3nw,63880
 pydae/bmapu/pvs/pv_test_cffi.c,sha256=kfumVy9p7LgH7hu-bpFVHtIp0p5hgUh1yG0zEpoNx2E,111095
-pydae/bmapu/pvs/pvs.py,sha256=ihu1wZ98zz9rfeClnhofRSd32KmPO1neVAjiTVZj2co,1997
+pydae/bmapu/pvs/pvs.py,sha256=TG39NflgJoEZY55BYQZnluc1Xn303iMH8QQ_roIY64o,2003
 pydae/bmapu/pvs/shaded.svg,sha256=w7aXKzb-uF6BgLGFt_-xMvtffi9MxJjwSbFR6WKmWtI,65005
 pydae/bmapu/pvs/shaded_cell.svg,sha256=DcMZJn71Mpkwzv5tplPukHrhVgi2By5t0BM7-rNUsnc,29942
 pydae/bmapu/pvs/temp.py,sha256=dGCBi7h2HNro_JvVOt3bl9Z4iAVbsrIGpUv1W1hRSLQ,67575
@@ -440,6 +442,7 @@ pydae/edashboards/wecs/sm_pmsm_iso/xy_0.json,sha256=Wr6xqWV2mI_jwSVWEzsCCtirQH2P
 pydae/edashboards/wecs/sm_pmsm_iso/xy_1.json,sha256=ytkz-xqgeht2MXatdvtyom44SYGvlce6KsqeivABarU,1319
 pydae/etools/__init__.py,sha256=ssmPnE4AIWaxmL7rUw7DnR3osNBd5qOhEY0hoZDMGqc,12
 pydae/etools/etools.py,sha256=DfketNK9TDTJ_rlIcrtJI_omlqzR2fNBT8OG8qZ5fu8,4534
+pydae/etools/pv_designer.py,sha256=uPV4XnoRaD8hiunsspecXVqZcMmSht8jxGmua9gl85o,14470
 pydae/etools/solar.py,sha256=hudSW8GEH5bOjIWW0maxd9jr9lMJqO6p7hWey4xlbVQ,14016
 pydae/etools/vsc_losses.py,sha256=Momed_X7oa8Q_i3pqkHfV9-x-vj_m3Y-nKkcoads-to,22266
 pydae/models/__init__.py,sha256=p1f9JVQU3e7SjQZu2jnrxLHLMvhPi8gqrvkXvKc0Wtc,78
@@ -548,7 +551,7 @@ pydae/urisi/fcs/sofc_dcdc_gf.hjson,sha256=_Gg4GN7veQf8LrlFWzcgi_BOxzZihQI9pTJ_KZ
 pydae/urisi/fcs/sofc_dcdc_gf.ipynb,sha256=pJhhFKzwsrWaatLG2Iuq1L13pYZAWvGf_NR926n57_w,66820
 pydae/urisi/fcs/sofc_dcdc_gf.py,sha256=vXs8UhwohfM_s4keX9C2bIFzHgmdj8DAmr9nNhzizks,15340
 pydae/urisi/fcs/sofc_dcdc_gf_iso.hjson,sha256=oWNN0pq6Uvzo33BFExpa7PiYAgQ6JnzblSY6jmM5qvc,1056
-pydae/urisi/fcs/sofc_dcdcac_gf.py,sha256=OVjtmVkzkbREz194WTQqlysVHHWR70pk7xq1JG3TCbQ,9281
+pydae/urisi/fcs/sofc_dcdcac_gf.py,sha256=JLNqALR8E03qeIXjj3XgVJ5nE0XhNUWqdNWfFDBTEis,9454
 pydae/urisi/fcs/sofc_dcdcac_gf_ib.hjson,sha256=0UHz1PDFEfkBWq8OahBj_XJj0RgZc76DfO7MWViNqXc,1707
 pydae/urisi/fcs/sofc_dcdcac_gf_ib.ipynb,sha256=-qDedoETT72I1_J7lKa3uVPcqkWWcfNHX2MQ2aeJrEM,271786
 pydae/urisi/fcs/sofc_dcdcac_gf_iso.hjson,sha256=4KB4SdUy-ZVj03hjglaueZrFZSPtS-F57t9k2j9yRIw,1613
@@ -715,12 +718,13 @@ pydae/urisi/vsgs/vsgs.py,sha256=v17sLm7EaaAyBVJk9-8DnLtxPDtXmkyizFlGhgqyFEE,644
 pydae/urisi/vsgs/xy_0.json,sha256=Q6qWPIqEP-w5Qu2twd3S4PX4zMggpNpG2W62e7ry70g,851
 pydae/utils/__init__.py,sha256=kwp76qeU2mnwrCexDSF15id9ih12Q0VRL3l-_c6omcQ,184
 pydae/utils/ss_num2sym.py,sha256=ZA-x01y1mEWk1HdlpNv9rNspFdH0RBlTq_JRDHmjlpU,3209
+pydae/utils/svg2pdf.py,sha256=6tNORhlu_cMPDp264Kg3X_eBORfT9Q1cqAcWaWgDs7k,1861
 pydae/utils/tools.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pydae/utils/types_converter.py,sha256=3eAWwELgG1d6iFX8sn8iGPIp6NBaX4I-eyUriRDOFyE,7929
 pydae/utils/utils.py,sha256=AI0wZr4PJ3Td3vjfAW06FJdgcK01TpUAukhG37gZP5g,1079
 pydae/utils/emtp/readPL4.py,sha256=R59KhXTmFrqtdv-9nv5tkdHoTs9uoofGqEfBCF4fGEY,3088
-pydae-0.56.3.dist-info/COPYING,sha256=QWnWoslbTjQmtlFSRoGF3wxJEJuTJdlEMZ7lHtbGAeQ,1139
-pydae-0.56.3.dist-info/LICENSE,sha256=8hQe1oM4ySdliF3R-NEvR6HqrcGDKvsLFJC3gA1sNjY,1108
-pydae-0.56.3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-pydae-0.56.3.dist-info/METADATA,sha256=MMPp-f_zyzsr7q5hrTteWiyD5xacFUNWFrHNp_5oI2Y,1046
-pydae-0.56.3.dist-info/RECORD,,
+pydae-0.56.4.dist-info/COPYING,sha256=QWnWoslbTjQmtlFSRoGF3wxJEJuTJdlEMZ7lHtbGAeQ,1139
+pydae-0.56.4.dist-info/LICENSE,sha256=8hQe1oM4ySdliF3R-NEvR6HqrcGDKvsLFJC3gA1sNjY,1108
+pydae-0.56.4.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+pydae-0.56.4.dist-info/METADATA,sha256=Dg71icY-yXGhkgv66E1lg0kNhDU1FxMOf7vTZgVypP0,1046
+pydae-0.56.4.dist-info/RECORD,,