femagtools 1.8.7__py3-none-any.whl → 1.8.8__py3-none-any.whl

femagtools/templates/psi-torq-rot.mako

@@ -0,0 +1,98 @@
+-- calculate flux linkages and torque (magstatic mode)
+--
+-- model:
+--    curvec (A) current samples (amplitudes)
+--    num_par_wdgs (number of parallel winding groups, default 1)
+--
+-- creates file psi-torq-rot.dat in current directory with columns:
+--  displ curr1 curr2 curr3 psi1 psi2 psi3 torq
+--
+function gcd(a, b)
+	return b==0 and a or gcd(b,a%b)
+end
+
+function calc_flux_torq(phi, curvec)
+  psivec={}
+  tqvec={}
+  for i=1, #curvec do
+    for k=1,3 do
+      def_curr_wdg(k, curvec[i][k], 0)
+    end
+
+    calc_field_single({
+        maxit=m.num_nonl_it, maxcop=m.error_perm, -- err_perm in %
+        permode='restore'})
+    psi = {}
+    for k=1,3 do
+      psir, psii = flux_winding_wk(k)
+      psi[k] = {ksym*psir/a*m.arm_length, ksym*psii/a*m.arm_length}
+    end
+
+    fr, ft, tq, fx, fy = force_torque()
+    tqvec[i] = tq
+    psivec[i] = psi
+  end
+  return psivec, tqvec
+end
+
+%if type(model['curvec']) is list:
+curamp = {${','.join([str(x) for x in model['curvec']])}} -- A
+% else:
+curamp = {${model['curvec']}} -- A
+% endif
+a=${model.get('num_par_wdgs', 1)}   -- parallel branches
+
+curvec = {}
+for i=1, #curamp do
+    amp = curamp[i]/a
+    curvec[i] = {amp, -amp, 0}
+ end
+
+ksym = m.num_poles/m.npols_gen
+
+if num_agnodes ~= nil then
+  dphi = 360/num_agnodes -- ndst[2] -- deg
+else
+  post_models("nodedistance", "ndst" )
+  dphi = ndst[2] -- deg
+end
+nodes = math.floor(360/m.num_poles/dphi+0.5)
+printf("Nodes in airgap total %g, Nodes per pole: %d", 360/dphi, nodes)
+-- find a valid number of steps for a rotation:
+nrot = nodes
+while( nrot%2) == 0 do
+  nrot = nrot//2
+end
+Q1 = get_dev_data("num_slots")
+p = m.num_poles//2
+dphi = 360//gcd(Q1, p)/nrot
+print(string.format(" rotation steps: %d  current steps: %d\n", nrot, #curvec))
+
+phi = 0
+-- initialize rotate
+rotate({
+    airgap = m.fc_radius,    -- air gap radius
+    region = "inside",       -- region to rotate
+    mode   = "save"         -- save initial model state
+})
+
+file_psi = io.open("psi-torq-rot.dat","w")
+for n=1,nrot+1 do
+  psi, tq = calc_flux_torq(phi, curvec)
+  for i=1, #curvec do
+    file_psi:write(string.format("%g ", phi))
+    for k=1, 3 do
+      file_psi:write(string.format("%g ", a*curvec[i][k]))
+    end
+    for k=1, 3 do
+      file_psi:write(string.format("%g ", psi[i][k][1]))
+    end
+    file_psi:write(string.format("%g ", tq[i]))
+    file_psi:write("\n")
+  end
+
+  phi = n*dphi
+  rotate({angle=phi, mode="absolute"})
+end
+rotate({mode = "reset"})  -- restore the initial state (discard any changes)
+file_psi:close()

femagtools/tks.py

@@ -227,7 +227,7 @@ if __name__ == "__main__":
                                  #                                 (tks.losses['cw'],
                                  #                                  tks.losses['cw_freq'],
                                  #                                  tks.losses['b_coeff']),
-                                 title=filename, log=False)
+                                 title=filename, log=True)
         pl.show()
 
     mcv = tks.getValues()

femagtools/windings.py

@@ -46,6 +46,71 @@ def q1q2yk(Q, p, m, l=1):
     Yk = (n*qbb + 1)//pb
     return q1, q2, Yk, Qb
 
+def end_wdg_length_round_wires(layers, Rp, Rb, r_wire, h, coil_span, Q, bore_diam, slot_h1, slot_height):
+    '''return length of a single winding head for 1 coil turn.
+    Multiply by 2 to get length for both winding heads'''
+    if layers == 2:
+        R_inner_lyr = bore_diam/2 + slot_h1 + slot_height/4
+        R_outer_lyr = bore_diam/2 + slot_h1 + 3*slot_height/4
+    elif layers == 1:
+        R_inner_lyr = bore_diam/2 + slot_h1 + slot_height/2
+        R_outer_lyr = bore_diam/2 + slot_h1 + slot_height/2
+    else:
+        raise ValueError("Round wire windings can only have 1 or 2 layers")
+
+    if Rb < 2*r_wire:
+        Rb = 2*r_wire
+    if Rp < R_outer_lyr + 2*(Rb + r_wire):
+        Rp = R_outer_lyr + 2*(Rb + r_wire) + 1e-5
+    if h < 2*(Rb + r_wire):
+        h = 2*(Rb + r_wire) + 0.002
+
+    l = np.pi*coil_span/Q * (Rp + R_inner_lyr)
+    z = Rp - R_outer_lyr - 2*(Rb + r_wire)
+    l_ew = 2*h + l + z + (Rb + r_wire)*(np.pi - 2)
+    return l_ew, h, Rp, Rb
+
+def end_wdg_hairpin_check(alpha, h, dmin, l_h, wire_w, tooth_wmin):
+    alpha = alpha*np.pi/180     # ensure alpha is in radians
+    if alpha == 0 and h == 0: # end wdg parameters not set
+        alpha = np.arcsin((dmin + wire_w)/(tooth_wmin + wire_w))
+        h = np.tan(alpha)*l_h/2
+    elif alpha == 0 and h > 0: # imposed end wdg height
+        alpha = np.arctan(h/l_h)
+        dmin = np.sin(alpha)*(tooth_wmin + wire_w) - wire_w
+        if dmin < 0.0015: # imposed end wdg height is not feasible - calculate min end wdg parameters
+            dmin = 0.0015
+            alpha = np.arcsin((dmin + wire_w)/(tooth_wmin + wire_w))
+            h = np.tan(alpha)*l_h/2
+    elif alpha > 0: # imposed end wdg angle
+        dmin = np.sin(alpha)*(tooth_wmin + wire_w) - wire_w
+        if dmin < 0.0015: # imposed end wdg angle is not feasible - calculate min end wdg parameters
+            dmin = 0.0015
+            alpha = np.arcsin((dmin + wire_w)/(tooth_wmin + wire_w))
+            h = np.tan(alpha)*l_h/2
+    return h, alpha, dmin
+
+def end_wdg_length_hairpins(wire_h, wire_w, wire_th, wire_gap,
+                                 layers, coil_pitch, Q, bore_diam, slot_h, slot_w,
+                                 h_bent=0, h_welded=0, h_conn=0.005, alpha_bent=0, alpha_welded=0, dmin=0.0015): # needs to be validated
+    '''return end wdg length of single pin for bent and welded side, average end wdg length,
+     bent and welded side end wdg heights, bending angles and min distances between pins'''
+
+    R_avg = bore_diam/2 + wire_th + layers/2*(wire_h + wire_gap) + wire_h/2
+    l_h = R_avg/2*coil_pitch/Q*np.pi*(bore_diam + wire_th + slot_h)
+    tooth_wmin = (bore_diam + 2*wire_th)*np.pi/Q - slot_w
+
+    h_bent, alpha_bent, dmin = end_wdg_hairpin_check(alpha_bent, h_bent, dmin, l_h, wire_w, tooth_wmin)
+
+    h_welded = h_welded - h_conn if h_welded - h_conn > 0 else 0
+    h_welded, alpha_welded, dmin = end_wdg_hairpin_check(alpha_welded, h_welded, dmin, l_h, wire_w, tooth_wmin)
+
+    l_bent = 2*(0.002 + wire_w/2*alpha_bent + wire_w*(np.pi/2 - alpha_bent) + np.sqrt((l_h/2)**2 + h_bent**2))
+    l_welded = 2*(0.002 + wire_w/2*alpha_bent + wire_w*(np.pi/2 - alpha_bent) + np.sqrt((l_h/2)**2 + h_welded**2)) + h_conn
+    l_ew = (l_bent + l_welded)/2
+    h_welded = h_welded + h_conn
+    return l_bent, l_welded, l_ew, h_bent, h_welded, alpha_bent*180/np.pi, alpha_welded*180/np.pi, dmin
+
 
 class Winding(object):
     # TODO: raise ValueError "Unbalanced winding" if Q % (m * gcd(Q, p)) != 0

{femagtools-1.8.7.dist-info → femagtools-1.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: femagtools
-Version: 1.8.7
+Version: 1.8.8
 Summary: Python API for FEMAG
 Author-email: Ronald Tanner <tar@semafor.ch>, Dapu Zhang <dzhang@gtisoft.com>, Beat Holm <hob@semafor.ch>, Günther Amsler <amg@semafor.ch>, Nicolas Mauchle <mau@semafor.ch>
 License: Copyright (c) 2016-2023, Semafor Informatik & Energie AG, Basel

{femagtools-1.8.7.dist-info → femagtools-1.8.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
-femagtools/__init__.py,sha256=ACK3cP4kilKCsL9TszbvzK0Gd3rNR9mdxXLlRxxVOI8,1600
+femagtools/__init__.py,sha256=nV55WL97b3bPz5zjpLN9RGLR4qnSMVZqRAiBhHa_c_o,1600
 femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
-femagtools/amela.py,sha256=RFTuQ5EcX19G2YJchnktr6j62mNptrdTreShQDOeuKA,13874
+femagtools/amela.py,sha256=2q-Xsj6i6nQ3iKheBR1vQ4FulJfF1i-L8w3a3U8GYWo,4362
 femagtools/asm.py,sha256=CiL0KWaF4P7O6-VwmGLdva_icwmPrPiI-TFQ19XYTKk,7660
 femagtools/bch.py,sha256=wLuYbxNPpZ8b-74O_m-85qmbW2pg0ozEXfd2DD7-gvY,74388
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
@@ -13,29 +13,30 @@ femagtools/dakota.py,sha256=L2zZdACdhso7szwN_s5tsmeEbcuUygE2JK4SxwtL79w,6901
 femagtools/dakota_femag.py,sha256=ipmMUMTK1mvMpfHJJjwHa_4kx7BItYO3ha8MeYJTyy8,4068
 femagtools/dakotaout.py,sha256=6nn0PXsB40mPKiQLenqAtHy0KXCO7kvqqQ-aD2JhQvw,5573
 femagtools/docker.py,sha256=XDVmLBB0z4sZZpcrx7Wbm84xl4ksj7aqn5-ZOPxdxm4,7460
-femagtools/ecloss.py,sha256=kTsE9Lx6nt6Ez9PBfD58hPMcnH2PxSc95zJaYMCQd5Q,33957
+femagtools/ecloss.py,sha256=nES8mtXNFitmxDvKL5o39hZl6qu-HfR6kUh9eBA9zxQ,34660
 femagtools/erg.py,sha256=IXKq76P9qLt_ssNOP78v8Qizk3J2Zg80yaKDSjzwoJE,1224
-femagtools/femag.py,sha256=y9H7_B4k1lDjQygoNe_amOzsZvLhobIYSFBrhU6BE6s,44799
+femagtools/femag.py,sha256=ScrZ9gbWQIy4eIhF0Wmi41lSFm7-WRtiLcJOvkITcHo,44864
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
-femagtools/fsl.py,sha256=8aFo7a0cf2vOLiYTqKabwZl_1xs2JqJaAHKGckHCL6U,37204
+femagtools/fsl.py,sha256=e6qeGEUdbupwDXMPNGwpSxdRENjyWrUuXEFXGIoXavE,37187
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
 femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
 femagtools/grid.py,sha256=s7LfKKLm2H4-cza2kSEANq6vwxq10Su3TJl3kHShHRA,1561
 femagtools/heat_source_network.py,sha256=dz3nTK084SR2fyy1167wlpBlGrzv54OqCCGKPNWqpsU,16836
 femagtools/hxy.py,sha256=PkiZ_-CRhtvtpkmLAP8iMtwvzh7CjKGGcAbOhFb4Nls,6275
-femagtools/isa7.py,sha256=bP1yl2iwy_5W0QVv2eSXn74EfFOAvtUSpyJGiI3QwTg,61831
+femagtools/isa7.py,sha256=6wDyJmMMVncjOt8ObnFyvYxdpRTUc93IE6bOfWmu6u8,66067
 femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
 femagtools/job.py,sha256=sIRVXsyoupfRXqGsWyOHMetcKlWIyggxfVURjM8aD54,11322
+femagtools/leakinduc.py,sha256=TMCz0DNbVwRPAYIe-kt9Ttu4aO-HhMZSIP_MTTLaSDo,2267
 femagtools/losscoeffs.py,sha256=7B29VdEsmv8HSP749X3QBb_E-XN6Z9dvNleKiRLWaMI,7721
 femagtools/magnet.py,sha256=Nuk060bT4Wa3lX74HdefqTTtUxLaERDSBYTTpbi6KP4,1093
-femagtools/mcv.py,sha256=IDT0rw67mfennlHnuqJKDUS7vKezXMr_tZsSHDypUoE,48343
+femagtools/mcv.py,sha256=nVemXwRPHkvlz7IIwnUONfQglnOcTnp3CsPwU1eG3OI,48604
 femagtools/me.py,sha256=z6RJkvSbgMmorCQTxKvq44uIYKh82uYYExjkNePJCmE,1813
 femagtools/model.py,sha256=dk9x-iqRzgOTdTCeU_ynUZGb1bt4FvU1ZGMPXytMbUg,17965
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
 femagtools/multiproc.py,sha256=Y8nx0W4NgRoG6UWO6TUD1drx216xnzSYuBbisCHhqrY,9107
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
-femagtools/nc.py,sha256=bAj3iurE9WaovoCi76ry2aJZJ6rC1zO6xWrfsSD6lrc,15160
+femagtools/nc.py,sha256=sKfFaeT8hPVUCb1axPIwfUVxuUsnrHygdfqiHv7G_YA,15216
 femagtools/netlist.py,sha256=CSCl8setLZ_L8DCnNWaNA3-wLe1yo-fmzARZoVvYfaA,2052
 femagtools/ntib.py,sha256=76g1ZO3Fq_kN-HTMBvaKvJmMMlJMyEPFeNAcJPq3w7Y,3099
 femagtools/opt.py,sha256=wBU0yh3hZlNti_zfIvtKcPg1EJrnE3I1BqmVxLGWixU,8753
@@ -43,12 +44,12 @@ femagtools/parstudy.py,sha256=WY1LxvN44LBqhmZb2dnNO5lVRW3oNyRiKmyi6QxdmqU,19792
 femagtools/poc.py,sha256=yPWmpi8Q2g7NmpAi2YV5ezyo0VUj67EK0tcX2wikerw,7207
 femagtools/semi_fea.py,sha256=WZtYKrzhDruETyuEW2kpiNp9OaA7Hheq3qJiAIYtsjg,3475
 femagtools/shortcircuit.py,sha256=9LjnX4z3Kt_DI7DO_h-ivZqxvPt8eAnkJ8_RIFB_q-s,13936
-femagtools/tks.py,sha256=C3lDdS91Yikf3cMnW-OEqmie-q6S24T81cCFrzwOyeI,7532
+femagtools/tks.py,sha256=mDi45S5go9-jwALh6rS9RWPoOFBORZm0-XL4ECjSf_8,7531
 femagtools/ts.py,sha256=x9aCMVASjdBZuyI2pJGMyi1dveGFd_pWQ20cZ-l_moc,47216
 femagtools/utils.py,sha256=dJkQ5xsoVMzSEB5-2hEiwe2of9mLmsDo8nkrnSN-gPE,1643
 femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
-femagtools/windings.py,sha256=RS3QSx1JY0FXzItDuWimC9zYzRxq9n6BbY5fZt1dMFg,23780
+femagtools/windings.py,sha256=Jk1FGLnKMltDct_plcaFW-NMUE6YFrP57LtJrdw1Un0,27140
 femagtools/zmq.py,sha256=HY8U7dxXkgE48151nvLcnLPa8OFBZcZTrB2XcjBc0Y4,9413
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
 femagtools/dxfsl/area.py,sha256=CpTMRBF8_AJmJMkkn-LgRv27U5xJ5Ohhd2ppRvESPNU,69757
@@ -70,8 +71,8 @@ femagtools/dxfsl/shape.py,sha256=uQqbgXIA2_KP2XRdhCfVfGWjcjwzhJ5t9RhiqR9R98c,616
 femagtools/dxfsl/svgparser.py,sha256=RY2TU9MK6gOaNmI6w6RNqcw7H9YGmK-NUwvdylKBcsE,3763
 femagtools/dxfsl/symmetry.py,sha256=dXfZVIqT49nbMirY5YVaRPi8kNB8reaiq-eIbhw1Z54,43936
 femagtools/machine/__init__.py,sha256=B7yeRZzf29NWCWy8C8iJFdTr9bszAoMRcVEpblhCeg4,7256
-femagtools/machine/afpm.py,sha256=PTBCvHHW8Z4dhyjhHSEkgfdVU9gzEsHLw2mY3X5LQp8,38272
-femagtools/machine/effloss.py,sha256=gOgVdAr703Vh9T2Ht14of_I-95QOkH5qXmm11bfHK7s,14414
+femagtools/machine/afpm.py,sha256=lNfJ8vvq70e3G5pLwW7t_ynRBOPgbgvd1Jgi9sIbBMI,40239
+femagtools/machine/effloss.py,sha256=wVsXqMni74IopYb6SHNWjEh-_6rjeLNNiWMB29ar0ms,14898
 femagtools/machine/im.py,sha256=isMSoCnIk4Hj47MwBNP5PW7a2rI-7N35A9zHGOSl43s,38111
 femagtools/machine/pm.py,sha256=C4vDdPIsIRUKtzY3b1RNT1v37p1uP3pMUduftNejcPc,68129
 femagtools/machine/sizing.py,sha256=6IUSdp6HNGHlSaWMy0mjzLGxp3UtxFLfdzQ_4MYx7TI,30069
@@ -150,6 +151,7 @@ femagtools/templates/pm_sym_loss.mako,sha256=FNAvi_gmTXsGylrpi7lLKPoOOcNCV1mG6rc
 femagtools/templates/prepare_thermal.mako,sha256=V3W6BGW7gjY8Lg2qzvGDi8rxx3JvPzrWoABDvHKyq54,9539
 femagtools/templates/psd_psq_fast.mako,sha256=IOZx04JhVleAAbBOPWk9gEwDyT28z0zkF9tyEBteRPU,1428
 femagtools/templates/psi-torq-rem-rot.mako,sha256=A1KOsYNSJhIJfumF-egnU-HUfNMPeX-XSPL_WsoE1Cw,3579
+femagtools/templates/psi-torq-rot.mako,sha256=e0-kJZ4mQ5w-Dd4riJkcjlJAt0STcNrVRVJfa-6cV7g,2498
 femagtools/templates/ring.mako,sha256=Cuc_FuCPWZM-g3TxHqzTdjknYEJSUgP-y64gp8pekDI,643
 femagtools/templates/rot_hsm.mako,sha256=eh50TbpWNUALK9_7wOOJ7KPewHos7JExAfMACbPlXYc,973
 femagtools/templates/rotorAsyn.mako,sha256=r_gce0oic24nPdI7BmERM1sokXpC5vvm8Sm0TIPb2zI,2280
@@ -170,9 +172,9 @@ femagtools/templates/therm-dynamic.mako,sha256=pEz7jrUpopK1-RqgulNnrkSaCZDjfLels
 femagtools/templates/therm_static.mako,sha256=ulevp4AP-kZ1_qdScPMaX9tLqvvP0t9lFflWTXgUxaE,1310
 femagtools/templates/torq_calc.mako,sha256=et6O9ZEkPMOYcaJVpYtH2u3aoU0iyhRCPkfN4ZLdjxA,2353
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_afpm.py,sha256=eNQFe9pxuiCITJHCs8pjHVqcKgVBKPJZX_VY-OMBoBw,16846
+tests/test_afpm.py,sha256=ge5CXnVQ7E5gVViTI9hQOC0hHetBci18pY9prbUCAqU,16849
 tests/test_airgap_induction.py,sha256=cmpy1og59oWEyCO4oF_zDuc1DUwCbdeebNL1ujpZza4,1065
-tests/test_amela.py,sha256=IsGah_O8qWsudZOnWL0pjH9S40O03oH_XfDtLgnzBMk,637
+tests/test_amela.py,sha256=Oi_NURmXDI0s9Tw82KO8k5ZkK6sZ9b2DhafJ5SBnvkE,629
 tests/test_asm.py,sha256=NAMJ2Km4zi6byhooq5E7GZbkFeSNSTaLpJWt-jQF5cE,1398
 tests/test_bchreader.py,sha256=yFpjN0MIv_o_OD8XH9HxlOpcNtL79K_3bXMeupxO648,16843
 tests/test_conductor.py,sha256=T7bmuSdI2Fowwm2Ht-8D0Qnfs1_lx1aoi9RhC2p5nYU,332
@@ -182,7 +184,7 @@ tests/test_effloss.py,sha256=-kJJNgS5c6saHXjNuhAe5GdWfr9mEYpPo8fE8OtjsNA,1142
 tests/test_erg.py,sha256=kRVzpXa6JDdbxTss18HUWKny9Dx8IMx9uGTrbQCnHwg,523
 tests/test_femag.py,sha256=l7-av3eitLm7bwTuunEmVeTspi82ifPrlz7f1boGdVI,1934
 tests/test_forcedens.py,sha256=Yzl3SAmJNkZN9dA3aLxRvwY8fKsw077Fl0iJm6zJ5Sk,536
-tests/test_fsl.py,sha256=J9ym2RD7bOixFGi2o7jy3PeGNxtnYD-zXJHZ-oxS-Ro,16623
+tests/test_fsl.py,sha256=e8NnUZLsG1Fh9fBOix_ClAl754b9lcqFp4EZR5HoDio,16623
 tests/test_heat_source_network.py,sha256=TC-Gl4iy9jnMGfsY_24XjwlP-SDxP345JKVT8xRwsFo,690
 tests/test_hxy.py,sha256=pVb6ZfDhBy5-DXa3gh7RQmLFG8p5cSYB8gdGLC8kjAk,640
 tests/test_im.py,sha256=55wfCoA8_PuogI_RsC3AjUQCpR84T-HddtHuU1NxfPc,662
@@ -197,7 +199,7 @@ tests/test_mcv.py,sha256=Vv51WU3WU0AkgcSpyujMdJ2KvSdLNsks5HGtY0pWMOY,4749
 tests/test_mcvreader.py,sha256=3cgq22b_iaWLrs4WWOUNHqJREnv0YoFivNpAb4teEJs,2118
 tests/test_me.py,sha256=En00OrOhZclBO4u74q5Os0FgVP4TGFLzz99LF0QHXHA,196
 tests/test_model.py,sha256=kYjjFgZPIex3foX3skiOdD5MCcmA2JP7oDDuE9txv_U,2698
-tests/test_nc.py,sha256=QUf01YigPYtwkRsmt7_8ap9tQUJgIeDmWo53llVucTM,4668
+tests/test_nc.py,sha256=aTYWF5BDakA9sYRmkSHD0oLWXcOxkVYKKUE8r-nNfAE,4625
 tests/test_parident.py,sha256=zwj-f-Q_s5dBr_fEvzd5iZqNVIcLwkoi_FF2_FNTiaw,1393
 tests/test_parstudy.py,sha256=wk7WfYQrx5dtv6MnmWCfNAEInvRKsbVXYEUIIR9zLbQ,3200
 tests/test_pocfile.py,sha256=eiMLBRQxDnHIGiqku6EXcQ3fb7wGIxhXmb20iyLlPRU,5816
@@ -218,9 +220,9 @@ tests/moo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/moo/test_algorithm.py,sha256=Em8sFm2vzPmuIzRrBBnUQLU_TYuJHSf-kEeozw0XeX4,2563
 tests/moo/test_population.py,sha256=FvX9LRCxQx0_E2GxHQ5vKwOYFBQiNbT6Lmv5GmNWjTQ,5471
 tests/moo/test_problem.py,sha256=ALeP4u7g-dFhfwWL8vxivdrrYzVKPjHMCAXzzgyNZbs,467
-femagtools-1.8.7.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
-femagtools-1.8.7.dist-info/METADATA,sha256=FjouSutX0CXyaLR8K4xThZIFopGoxvhm6151vMBW95A,6190
-femagtools-1.8.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-femagtools-1.8.7.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.8.7.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.8.7.dist-info/RECORD,,
+femagtools-1.8.8.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.8.8.dist-info/METADATA,sha256=dDLQLG1jOcCzNyRrSwMe81o32RSqT2A5Au3KjjfRn6s,6190
+femagtools-1.8.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+femagtools-1.8.8.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.8.8.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.8.8.dist-info/RECORD,,

{femagtools-1.8.7.dist-info → femagtools-1.8.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_afpm.py

@@ -83,6 +83,6 @@ def test_process(bch):
     assert pytest.approx(r['r1'], abs=1e-3) == 0.03159
     assert pytest.approx(np.mean(r['torque']), abs=0.1) == 17.5
     assert pytest.approx(
-        sum([r['plfe'][k] for k in r['plfe']]), abs=0.1) == 50.1
-    assert pytest.approx(np.mean(r['plmag']), abs=0.1) == 119.7
+        sum([r['plfe'][k] for k in r['plfe']]), abs=0.01) == 6.264
+    assert pytest.approx(np.mean(r['plmag']), abs=0.01) == 14.96
     assert pytest.approx(np.mean(r['plcu']), abs=0.1) == 925.6

tests/test_amela.py

@@ -1,5 +1,4 @@
-import os
-import sys
+import pytest
 import json
 from femagtools import amela
 from pathlib import Path
@@ -11,7 +10,6 @@ def read_json():
     return json.loads(
         (Path(__file__).parent/"data/pm_data/pm_data_se38.json").read_text())
 
-
 def test_amela():
     al = amela.Amela(workdir='src/tests/data',
                      magnet_data=dict(name='pm_data'))

tests/test_fsl.py

@@ -315,19 +315,19 @@ class FslBuilderTest(unittest.TestCase):
     def test_run_models(self):
         feapars['calculationMode'] = "cogg_calc"
         fsl = self.builder.create_analysis(feapars)
-        self.assertEqual(len(fsl), 27)
+        self.assertEqual(len(fsl), 28)
 
         feapars['calculationMode'] = "pm_sym_fast"
         fsl = self.builder.create_analysis(feapars)
-        self.assertEqual(len(fsl), 35)
+        self.assertEqual(len(fsl), 36)
 
         feapars['calculationMode'] = "mult_cal_fast"
         fsl = self.builder.create_analysis(feapars)
-        self.assertEqual(len(fsl), 33)
+        self.assertEqual(len(fsl), 34)
 
         feapars['calculationMode'] = "torq_calc"
         fsl = self.builder.create_analysis(feapars)
-        self.assertEqual(len(fsl), 27)
+        self.assertEqual(len(fsl), 28)
 
     def test_run_existing_model(self):
         model = femagtools.MachineModel('data/magnsec')

tests/test_nc.py

@@ -98,8 +98,7 @@ def test_geom(pm):
     g = mag_spels[0].get_rect_geom()
     assert g['w'] == pytest.approx(0.0112, abs=1e-4)
     assert g['h'] == pytest.approx(0.00308, abs=1e-5)
-    assert g['x0'] == pytest.approx(0.02317, abs=1e-5)
-    assert g['y0'] == pytest.approx(0.007528, abs=1e-5)
+    assert g['cxy'] == pytest.approx((0.02317, 0.007528), abs=1e-5)
     assert g['area'] == pytest.approx(3.45e-05, abs=1e-6)
     assert g['alpha'] == pytest.approx(1.885, abs=1e-3)