From 0ac0e5c84d16d24da0ce6123328fb40d840928f4 Mon Sep 17 00:00:00 2001
From: Pedro Romero <promerogomb@unav.es>
Date: Mon, 31 Mar 2025 11:31:56 +0200
Subject: [PATCH] Main fix and MCAD fix

---
 .gitignore                              |   3 ++-
 __pycache__/extraerH.cpython-313.pyc    | Bin 846 -> 0 bytes
 __pycache__/genCurvas.cpython-313.pyc   | Bin 3681 -> 0 bytes
 __pycache__/motorcad.cpython-313.pyc    | Bin 3074 -> 0 bytes
 fluxcontrol.py                          |   6 +++---
 genCurvas.py                            |   2 +-
 curva.txt => h_values/curva.txt         |   0
 extraerH.py => h_values/extraerH.py     |   1 -
 h_values.json => h_values/h_values.json |   0
 motorcad.py                             |  21 +++++++++++++--------
 10 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 __pycache__/extraerH.cpython-313.pyc
 delete mode 100644 __pycache__/genCurvas.cpython-313.pyc
 delete mode 100644 __pycache__/motorcad.cpython-313.pyc
 rename curva.txt => h_values/curva.txt (100%)
 rename extraerH.py => h_values/extraerH.py (99%)
 rename h_values.json => h_values/h_values.json (100%)

diff --git a/.gitignore b/.gitignore
index 72babfc..779ba37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 venv/
 *.mdb
-motores/PLACond/
\ No newline at end of file
+motores/PLACond/
+__pycache__/
\ No newline at end of file
diff --git a/__pycache__/extraerH.cpython-313.pyc b/__pycache__/extraerH.cpython-313.pyc
deleted file mode 100644
index 6f77403310108b8fff9175cebf9c9058adb7c268..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 846
zcmaJ+O;6NN6uocS*ZC-8WQJMrkxT_OOjHO_OaRejqNK!t$uzj(8Ej@cP%UkJZ4p@!
zW8%2cF~*1+GfVv$@(WZTj*kt-xL_w?LBh({fzg18x5;hqIp?09yPHfVfY<QdpR+0g
z_z@1xiXMLK&T-~7XrQ5+K%pNfB9U&;BAPH5InYFa3PebQItD;RO(fz7CrX^1kO7ET
z;Qe?F9s-5raRxxcgZ!Ui(I|;^1Bq%9=F=ZEPEaA!5FBYF-c%?sp#sRD@YLbcOsW8p
zxgYwgYupmmVoe3VrG-GD<A`x%2=_>f7S|F(!oR+==oFlX-ov#L&tHxxkmU&!m>d}u
zvQYkyVip}Ja`JZQFu4>j26RF1^A~-FD3jFNx)m4<jc#*eSW3>#EQEm9ch7Tdh8}K<
z9L^yonRdyr{oDyA9x!uEbX<c=$_!hkZRiYpJ~dtbaxK$mlB-kS@E9&zj_xzuFlLhO
z@}&~PE;VhR#Y3-|vS}GiECuuK2iOf$vP;EbGUXZ6BaX+z6a(9^Omf}u?)#2Q%2u#g
zbZnnG7BLomsvA`8b04wTm3gNWSjJV_$xXt0yc%!61ccBg$XlYcjCLfD5|wjRZyk58
zJlJeaRd8KSSAz|?tDfn2GyQV<)t#@I-p`rd_vy9Fh055sw)T~?wbr+}wYJlh8}*jt
z3-y^=oqB$2Cl0Cfo&ZwU&PhPhvi>CY9mgyED;L*swl-83V^7B)k5}|+du`y0cqUXT
xpKx|B!#6f?=l)(B2R3ka-|ONbtBHI{cz2DrkC)T=9$__=$Scv+o<x2i`Ws|AyWju-

diff --git a/__pycache__/genCurvas.cpython-313.pyc b/__pycache__/genCurvas.cpython-313.pyc
deleted file mode 100644
index 53b0438a64fc4875f51b026730b62c30ebe3d8b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3681
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
Mwy*Xgp~p4<A5TmKPyhe`

diff --git a/__pycache__/motorcad.cpython-313.pyc b/__pycache__/motorcad.cpython-313.pyc
deleted file mode 100644
index 7edade84599b9c9502a98372ea20766a97b1d4ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3074
zcmbVOO-vg{6dv1SyvD}-;{X9RG(Q+phcu9+C{Pg_Qo>Iui=!qWS<CL&Y_r~Vch^Zk
zYUN|o9+I@G!jYqU<H#|`<Yo)2iKdZSsW~(~R7hN^o;tJkvYU_y)RF9cKi_-v=FRuK
z-m9yt1!O(D^;i099{_()#aiyFuy>LOKLHMKu4!=HrMp>h-K}}piUn$rb9VsEn|4J!
zuW87fU`0}mWCb4b*?R$LmL+O4*MbvOwe^DGs-(D=2)?owYAnfqI*=YmPR2%9(n7$J
z>}SHwxe_1*IQIqjFs+U(1tvTTbrsq9&3QODT&<M_1XJ(yR%FgQ?5ap6qVXUi0d2%m
zv*qV%h~1g{UHkhu=1`2Et34DG;DU!@>W+X39RX8+1WdybFpWpRG#vrcd<0Ajxy8fo
zqLphq6cgr-9g1n^Iu6BjzIE@d7HjM$cbw~bBTv}&SrXU%7N*_u*iUQfO!ju#c1z-V
zEcPm1G6C;Gu=|Lb_aIK}BYgjBVtcs{5-u{cCog#RXO`)v6WL|eX+ODB3CGkpChoLV
z1q;5ok?;+9PJ$CON4FhoNj|`b0APV5`ivdj1LjVoz^JDOq+F4{Iqb`*hN>Zb9Y%?S
zn`e=(^Jx^9^sLOUaRzUo*OXq1>rJy1$)+S3v9ijGNF2f8Sw5{GLlPEOk(S}*n3~JV
zl9JYF2yTq!Gz}?69Hk^hG9*=bO@D82(^X!$Juy2O<7FWy^VBhkkHyq<nuIQ@+E+Q`
zaN*+<G7=0;%~bcAR5bzV6p{QahTAFuToxhG8Pyy|)qr(#2kOJ!?@u*Dj)X%~ikK4&
zUJ=X+aP!sqS#DL;jF_YeIms}SG#)ImmRsdhhFOF3C;4T@wF|Rc_4MhKx&HnH2jj7;
zIsJwz8>GY1L(&TzoL}X2G%ntuTdohqMwSyg()8slIWE%Fw3=C2jwAiHp=Os;a_*j>
zDx?$g^8CzrOjX2aMqI(Zs<Pg?VBXLSpJDrGi`gknRU$Y<YN>X7Mp6*2C%U<9wLsi5
znNvhQLvD(fCpARcuLx_{M_7@Q4IML8AxSu5+%vF$!n*bK?u815)pG*56Frra<uw-F
z%aWEMF}mJv`BOZhjmR2m)ftU6V7IE{nlv(myCR0OvGF)&Oo~wnW_e>3!!K1y!9g7v
z$veCz@hdXI0aKH7i7FvV#AJ#zD@l2Yy;)6C4BRSZXaz}Kl_fEmAsi;bGH#=xf=YY}
zIje0Ciz-nnL{17eDRGcgXYU-UoGWSdrOv8$Leo?&;wQ5tuFR1>V!uRoG+Bp3cUA2+
zp>;B)$|BM*%m{>Mbn52m30)J|HHBR%9H?fcR^3mggtZnP5-e7zdJgGAPC>HtPF9et
zWHxv)nq4D(k}_ntG}>70GD%4PFz6#>F!SJLYxwcaA8!7*l%IPQsDCi}-RSq9<m0bG
z4G+@y(+}kP^2S)<<L&Ua|4B>n;^a=~TK?J#$UKLwCD>YQ8z_8UhUZK}O9{3-Tr9&5
zQwx`1c*9qQ>`Uk`)^=|av2V8qc>Px7xvj=Byx>R`DV#6E4;_a7!bBN<<S-0wohrl2
z4#UtED#I%dLv+hqh8G=%fkNWVT`q1D#Fztdx<Cw3hv7g-q%c&5gO1`K%A4^rjO@o8
z(3MT04Et@rvdP=W?=HdaV$ZGOGO0afVtPujr^sH~ZZE@FbsM$>*)r_?oe4f?+DlA(
zv7>*78OV>nunhw{%-J^#gFDRm{P?S;md9rvoq2rr(b<h}3TxY+KDqg1`l(SIS=?z#
z<fnJt&^use=`1mw8`Fi(GBf;=sVjz}W#-&21A=uA8^67jpZjOm2Z9aH16`#+*B)?r
z2TV}p7p8yLL$rVOCc>eo{asT5@GQ_d74balbCK^z4Q}QYeNCsYkO~0>@=n2wrD8~R
zjU~|<ePfw?{2A;K5onjl7iO+xR52%`F>Q>f^ev&&znf%Rm+LpsTLito0{@<S(ABJs
G68nEse!b8D

diff --git a/fluxcontrol.py b/fluxcontrol.py
index 7555112..1be985e 100644
--- a/fluxcontrol.py
+++ b/fluxcontrol.py
@@ -13,7 +13,7 @@ if __name__ == '__main__':
     
     E_obj, I_obj, f_obj = gc.valores_objetivo(archivoEnsayos, material)
 
-    print(E_obj)
+    print("La tensión inducida objetivo son ", E_obj, " V")
     
     offset = 0
      
@@ -41,8 +41,8 @@ if __name__ == '__main__':
 
         error = np.mean(error)
 
-        print(tension)
-        print(error)
+        print("El resultado de la tensión inducida de la iteración ", i, " son ", tension, " V")
+        print("Y por tanto el error es igual a ", error)
 
         flag, offset = gc.logica_offset(offset, error, errorObjetivo)
 
diff --git a/genCurvas.py b/genCurvas.py
index f15b004..a6245bb 100644
--- a/genCurvas.py
+++ b/genCurvas.py
@@ -16,7 +16,7 @@ def generar_curva(offset, ruta):
 
     muVacio = 4 * np.pi * 1e-7
 
-    with open("h_values.json", "r") as f : h = np.array(json.load(f))
+    with open("h_values/h_values.json", "r") as f : h = np.array(json.load(f))
     b = muVacio * h + offset
 
     with open(ruta, "w") as f:
diff --git a/curva.txt b/h_values/curva.txt
similarity index 100%
rename from curva.txt
rename to h_values/curva.txt
diff --git a/extraerH.py b/h_values/extraerH.py
similarity index 99%
rename from extraerH.py
rename to h_values/extraerH.py
index f32861b..ec13303 100644
--- a/extraerH.py
+++ b/h_values/extraerH.py
@@ -2,7 +2,6 @@ import json
 
 h = []
 
-
 with open("curva.txt", "r") as f:
     for linea in f:
         if "HValue" in linea:
diff --git a/h_values.json b/h_values/h_values.json
similarity index 100%
rename from h_values.json
rename to h_values/h_values.json
diff --git a/motorcad.py b/motorcad.py
index d077ce7..679846d 100644
--- a/motorcad.py
+++ b/motorcad.py
@@ -1,15 +1,16 @@
 import ansys.motorcad.core as MCAD
 import os
-def simularMCAD(mdbName, iteration):
+def simularMCAD(corriente, frecuencia, material, iteration):
     working_folder = os.getcwd()
+    motPath = os.path.join(working_folder, "motores", f"{material}.mot")
+    materialPath = os.path.join(working_folder, f"{material}.mdb")
 
     mcad = MCAD.MotorCAD()
     
-    motPath = os.path.join(working_folder, "motores", f"{mdbName}.mot")
     mcad.set_variable("MessageDisplayState", 2)
     mcad.set_visible(True)
     mcad.load_from_file(motPath)
-    print("Motor file loaded:", motPath)
+    print("Archivo de motor cargado desde:", motPath)
 
     # Simulation config
     mcad.set_variable("MagneticThermalCoupling", 0)
@@ -25,14 +26,18 @@ def simularMCAD(mdbName, iteration):
     mcad.set_variable("TorqueCalculation", True)
 
     # Operation point
-    mcad.set_variable("ShaftSpeed", 1000)
-    mcad.set_variable("RMSCurrent", 0.95)
-    mcad.set_variable("DCBusVoltage", 400)
+    polos = mcad.get_variable("PoleNumber")
+    n = frecuencia * 60 / (polos/2)
+    mcad.set_variable("ShaftSpeed", n)
+    mcad.set_variable("RMSCurrent", corriente)
+    mcad.set_variable("DCBusVoltage", 230)
     mcad.set_variable("PhaseAdvance", 0)
  
     # Material
-    mcad.import_solid_material("C:\\Users\\promerogomb\\Desktop\\fluxcontrol\\PLACond.mdb", "PLACond")
-    mcad.set_component_material("Rotor Lam (Back Iron)", "PLACond")
+    mcad.import_solid_material(materialPath, material)
+    print("Material importado desde:", materialPath)
+    mcad.set_component_material("Rotor Lam (Back Iron)", material)
+    print("Material puesto en el rotor.")
 
     # Ejecución y resultados
     mcad.do_magnetic_calculation()