femagtools 1.7.9__py3-none-any.whl → 1.8.0__py3-none-any.whl

femagtools/templates/magnetIron.mako

@@ -49,7 +49,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIron2.mako

@@ -51,7 +51,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIron3.mako

@@ -75,7 +75,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIron4.mako

@@ -50,7 +50,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0) and model.get('density', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIron5.mako

@@ -50,7 +50,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIronV.mako

@@ -78,7 +78,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetSector.mako

@@ -78,7 +78,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/mesh-airgap.mako

@@ -34,20 +34,26 @@ if not airgap_created then
     if inner_da_start == nil then
       inner_da_start = da2/2
     end
-    nc_line(r1, 0.0, r2, 0.0, 2)
+    x1, y1 = pr2c(inner_da_start, 0.0)
+    nc_line(x1, y1, r1, 0.0, 0.0)
 
     if outer_da_start == nil then
       outer_da_start = da1/2
     end
-    nc_line(r2, 0.0, outer_da_start, 0.0, 0)
+    x2, y2 = pr2c(outer_da_start, 0.0)
+    nc_line(r2, 0.0, x2, y2, 0.0)
 
     if m.tot_num_slot > m.num_sl_gen then
-      x4, y4 = pr2c(outer_da_start, alfa)
-      nc_line(x1, y1, x2, y2, 2)
-      nc_line(x4, y4, x2, y2, 0)
+      x3, y3 = pr2c(inner_da_end, alfa)
+      x4, y4 = pr2c(r1, alfa)
+      nc_line(x3, y3, x4, y4, 0, 0)
+
+      x3, y3 = pr2c(outer_da_end, alfa)
+      x4, y4 = pr2c(r2, alfa)
+      nc_line(x3, y3, x4, y4, 0, 0)
     end
 
-    x0, y0 = pr2c(r2-ag/6, alfa/2)
+    x0, y0 = pr2c(r1-ag/6, alfa/2)
     create_mesh_se(x0, y0)
     x0, y0 = pr2c(r2+ag/6, alfa/2)
     create_mesh_se(x0, y0)

femagtools/templates/prepare_thermal.mako

@@ -1,7 +1,7 @@
 -- prepare thermal model
 
 save_model('cont')
-
+state_of_problem("therm_static")
 function get_xy(elkey)
   -- get element xy
   local x, y
@@ -45,7 +45,8 @@ stator_air = {} -- black, 8
 airgap = {} -- white, 8
 magnet_pocket_spel = {}  -- red, 1
 non_uniform_airgap = {} -- white, 8
-
+slot_opening = {} 
+slot_sreg_exist = 0
 -- search all components
 for i =1,  #spel_keys do
   -- loop over all spel keys
@@ -87,10 +88,17 @@ for i =1,  #spel_keys do
               table.insert(stator_air, spel_keys[i])
               def_mat_therm(xc, yc, 'yellow', 1.19,0.15,1007, 1)
               color_spel(spel_keys[i], 8) 
-
+              key_exist_sl = get_sreg_key(xc, yc)
+              if key_exist_sl <= 0 and slot_sreg_exist == 0 then 
+                  def_new_sreg(xc, yc, 'Slot', 'yellow')
+                  slot_sreg_exist = 1
+              else 
+                  add_to_sreg(xc, yc, 'Slot')
+              end        
            elseif rc > da2/2 and rc < da1/2 then
               table.insert(airgap, spel_keys[i])
-              def_mat_therm(xc, yc, 'yellow', 1.19,0.063,1007, 1)
+              def_mat_therm(xc, yc, 'yellow', 1.19,0.15,1007, 1)
+              add_to_sreg(xc, yc, 'Slot')
               color_spel(spel_keys[i], 7) -- white air
 
 --           elseif rc > dy2/2 then
@@ -104,14 +112,6 @@ for i =1,  #spel_keys do
               if x0_shaft ~= nil and x0_shaft ~= 0.0 then
                   table.insert(shaft_spel, spel_keys[i])
                   def_mat_therm(xc, yc, 'lightgrey', shaft_density, shaft_thcond, shaft_thcap, 1)
-              else
-                  -- is inner air
-                  table.insert(inner_air, spel_keys[i])
-%if model.get('htc_inner', 0):
-                  def_heat_transfer(xc,yc,yellow,${model['htc_inner']}, 1.0)
-%endif
-                  def_new_sreg(xc,yc, 'INAR', 'yellow')
-                  color_spel(spel_keys[i], 16) -- light grey inner air
               end
            end
         end
@@ -185,7 +185,8 @@ for i = 1, #rotor_air do
           table.insert(non_uniform_airgap, rotor_air[i])
           els = get_spel_data('elkeys', rotor_air[i])
           xc, yc = get_xy(els[1])
-          def_mat_therm(xc, yc, 'yellow', 1.19,0.063,1007, 1)
+          def_mat_therm(xc, yc, 'yellow', 1.19,1.15,1007, 1)
+          add_to_sreg(xc, yc, 'Slot')
           color_spel(rotor_air[i], 7)
         end 
       end 
@@ -216,4 +217,138 @@ for i = 1, #rotor_air do
    end 
 end 
 
+
 save_metafile(model..'.ps')
+
+
+
+---------------------------------------------
+-- material slot insulation
+---------------------------------------------
+
+function get_boundary_node(num_slots)
+
+   local ctr
+   -- get the number of winding
+   get_wdg_keys("wkeys")
+   -- search subregions
+   local srkey_sl = {}
+   ctr = 1
+   for i = 1, #wkeys do
+      tmpksl = get_wdg_data("srkeys", wkeys[i])
+      for j = 1, #tmpksl do
+         srkey_sl[ctr] = tmpksl[j]
+         ctr = ctr + 1
+      end
+   end
+   -- search superelements
+   local sekey_sl = {}
+   ctr = 1
+   for k = 1, #srkey_sl do
+      sl_se = get_sreg_data("sekeys", srkey_sl[k])
+      for kk =1, #sl_se do
+         sl_nd = get_spel_data("bndkeys", sl_se[kk])
+         x, y = get_node_data("xy", sl_nd[1])
+         r, phi = c2pd(x, y)
+         if phi < 360/num_slots then
+            sekey_sl[ctr] = sl_se[kk]
+            ctr = ctr + 1
+         end
+      end
+   end
+
+   local xn  = {}
+   local yn = {}
+   local node = {}
+   local bndnodes = {}
+   local bnd_unique = {}
+
+   ctr = 1
+
+   for i = 1, #sekey_sl do
+      bnd = get_spel_data("bndkeys", sekey_sl[i])
+
+      for j = 1, #bnd do
+         bndnodes[ctr] = bnd[j]
+         ctr = ctr + 1
+         if bnd_unique[bnd[j]] == true then
+            bnd_unique[bnd[j]] = false
+         else
+            bnd_unique[bnd[j]] = true
+         end
+      end
+   end
+
+   ctr =  1
+   for j = 1, #bndnodes do
+     x, y = get_node_data("xy", bndnodes[j])
+
+     r, phi = c2pd(x, y)
+     if (phi < 360/num_slots/2 - 0.05) and (bnd_unique[bndnodes[j]] == true)  then
+
+        node[ctr] = bndnodes[j]
+        xn[ctr] = x
+        yn[ctr] = y
+        ctr = ctr + 1
+       end
+   end
+
+
+   local indx = {1, math.floor(#node/4), math.floor(#node/2), math.floor(#node/4*3), #node}
+
+   local x_new = {}
+   local y_new = {}
+
+   for i = 1, 10 do
+      x_new[i] = 0
+      y_new[i] = 0
+   end
+
+   for i = 1, #indx do
+      x_new[i] = xn[indx[i]]
+      y_new[i] = yn[indx[i]]
+      r, phi = c2pd(x_new[i], y_new[i])
+      x_new[10 - (i-1)], y_new[10 - (i-1)] = pd2c(r, 360/num_slots - phi)
+   end
+
+   local rn = {}
+   local phin = {}
+
+   for i = 1, #x_new do
+      rn[i], phin[i] = c2pd(x_new[i], y_new[i])
+   end
+   return rn, phin
+end
+
+
+rn, phin = get_boundary_node(m.tot_num_slot)
+thickness = ${model.get('slot_insul', 0.15)}
+conductivity = ${model.get('slot_insul_cond', 0.31)}
+
+for i = 1,m.num_sl_gen do
+x = {}
+y = {}
+
+for j = 1, #rn do
+   x[j], y[j] = pd2c(rn[j], phin[j] + (i-1)*360/m.tot_num_slot)
+   point(x[j], y[j],"black","x") 
+end
+
+def_insulation_by_nodechain(thickness,conductivity,
+      x[1],y[1],
+      x[2],y[2],
+      x[3],y[3],
+      x[4],y[4],
+      x[5],y[5],
+      x[6],y[6],
+      x[7],y[7],
+      x[8],y[8],
+      x[9],y[9],
+      x[10],y[10],
+      x[1], y[1]
+      )
+
+end
+save_metafile('insulation.ps')
+
+state_of_problem("mag_static")

femagtools/windings.py

@@ -32,18 +32,18 @@ def q1q2yk(Q, p, m, l=1):
     """returns q1, q2, Yk, Qb"""
     t = num_basic_windings(Q, p, l)
     Qb = Q//t
-    qqb = Qb if l == 2 else Qb//2
+    qbb = Qb if l==2 else Qb//2
     pb = p//t
-    if qqb//m % 2:  # odd
-        q2 = (qqb + m)//(2*m) - 1
+    if qbb//m % 2:  # odd
+        q2 = (qbb + m)//(2*m) - 1
         q1 = q2 + 1
     else:
-        q2 = (qqb)//(2*m)
+        q2 = (qbb)//(2*m)
         q1 = q2
     n = 1
-    while (n*qqb + 1) % pb:
+    while (n*qbb + 1) % pb:
         n += 1
-    Yk = (n*qqb + 1)//pb
+    Yk = (n*qbb + 1)//pb
     return q1, q2, Yk, Qb
 
 
@@ -118,22 +118,22 @@ class Winding(object):
         self.yd = coilwidth
 
         q1, q2, Yk, Qb = q1q2yk(self.Q, self.p, self.m, self.l)
+        j = 2 if layers == 1 else 1
         k1 = [(q1 + q2)*i for i in range(self.m)]
         k2 = (q1*(self.m+1) + q2*(self.m-1))//2
-        j = 2 if layers == 1 else 1
         pos = [[(j*Yk*(k + n)) % Qb
                 for n in range(q1)] for k in k1]
         neg = [[j*Yk*(k + n + k2) % Qb
                 for n in range(q2)] for k in k1]
-        if layers > 1:
+        if self.l > 1:
             slots = [sorted([(k, 1, 1)
                              for k in p] + [(k, -1, 1)
                                             for k in n])
                      for n, p in zip(neg, pos)]
             for i, p in enumerate(slots):
                 slots[i] = sorted(slots[i] +
-                                  [((k[0]+coilwidth) % Qb, -k[1], 0)
-                                   for k in slots[i]], key=lambda s: s[0])
+                                  [((k[0]+self.yd) % Qb, -k[1], 0)
+                                   for k in slots[i]])
         else:
             if (coilwidth + 1) % 2:
                 coilwidth += 1
@@ -147,10 +147,6 @@ class Winding(object):
             slots = [sorted([(k, 1, 1) for k in p] + [(k, -1, 1) for k in n])
                      for n, p in zip(xneg, xpos)]
 
-        if self.m > 3:  # TODO: check this hack
-            slots = slots[:self.m//2] + [[((k[0]+1) % self.Q, k[1], k[2])
-                                          for k in s]
-                                         for s in slots[:self.m//2]]
         taus = 360/self.Q
         self.windings = {
             i+1:  dict(dir=[k[1] for k in s],
@@ -183,6 +179,10 @@ class Winding(object):
             nue = n
         else:
             nue = self.kw_order(n)
+        #if q1 == q2:  # integral slot winding
+        #    q = self.Q/2/self.m/self.p
+        #    nuep = nue/self.p
+        #    return np.sin(nuep*np.pi/2/self.m)/q/np.sin(nuep*np.pi/2/self.m/q)
         k = 2 if self.l == 1 else 1
         a = nue*k*np.pi/self.Q*Yk
         t = self.Q//Qb
@@ -244,14 +244,19 @@ class Winding(object):
 
     def slots(self, key):
         """returns slot indexes of winding key"""
-        ngen = self.m*self.Q//np.gcd(self.Q, self.m*2*self.p)
         taus = 360/self.Q
-
-        dim = int(self.l*ngen/self.m)
-        slots = [(round((x-taus/2)/taus) + ngen*n) % self.Q + 1
-                 for n in range(self.Q//ngen)
+        t = num_basic_windings(self.Q, self.p, self.l)
+        Qb = self.Q//t
+        dim = self.l*Qb//self.m
+        ngen = t
+        qgen = Qb
+        if dim > len(self.windings[key]['PHI']):
+            qgen = qgen//2
+            ngen = 2*t
+        slots = [(round((x-taus/2)/taus) + qgen*n) % self.Q + 1
+                 for n in range(ngen)
                  for x in self.windings[key]['PHI'][:dim]]
-        return np.array(slots).reshape((np.gcd(self.Q, self.p), -1))
+        return np.array(slots).reshape(t, -1)
 
     def axis(self, k=1):
         """returns axis angle of winding 1 in mechanical system"""

{femagtools-1.7.9.dist-info → femagtools-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.7.9
+Version: 1.8.0
 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
@@ -37,33 +37,33 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy <=1.26.4
+Requires-Dist: numpy<=1.26.4
 Requires-Dist: scipy
 Requires-Dist: mako
 Requires-Dist: six
 Requires-Dist: lmfit
-Requires-Dist: netCDF4 >=1.6.5
-Provides-Extra: all
-Requires-Dist: femagtools[dxfsl,meshio,mplot,svgfsl,test,vtk,zmq] ; extra == 'all'
+Requires-Dist: netCDF4>=1.6.5
+Provides-Extra: rdp
+Requires-Dist: rdp; extra == "rdp"
 Provides-Extra: dxfsl
-Requires-Dist: dxfgrabber ; extra == 'dxfsl'
-Requires-Dist: networkx ; extra == 'dxfsl'
-Requires-Dist: rdp ; extra == 'dxfsl'
-Provides-Extra: meshio
-Requires-Dist: meshio ; extra == 'meshio'
-Provides-Extra: mplot
-Requires-Dist: matplotlib ; extra == 'mplot'
+Requires-Dist: dxfgrabber; extra == "dxfsl"
+Requires-Dist: networkx; extra == "dxfsl"
 Provides-Extra: svgfsl
-Requires-Dist: dxfgrabber ; extra == 'svgfsl'
-Requires-Dist: networkx ; extra == 'svgfsl'
-Requires-Dist: lxml ; extra == 'svgfsl'
-Requires-Dist: rdp ; extra == 'svgfsl'
-Provides-Extra: test
-Requires-Dist: pytest ; extra == 'test'
+Requires-Dist: dxfgrabber; extra == "svgfsl"
+Requires-Dist: networkx; extra == "svgfsl"
+Requires-Dist: lxml; extra == "svgfsl"
+Provides-Extra: mplot
+Requires-Dist: matplotlib; extra == "mplot"
+Provides-Extra: meshio
+Requires-Dist: meshio; extra == "meshio"
 Provides-Extra: vtk
-Requires-Dist: vtk ; extra == 'vtk'
+Requires-Dist: vtk; extra == "vtk"
 Provides-Extra: zmq
-Requires-Dist: pyzmq ; extra == 'zmq'
+Requires-Dist: pyzmq; extra == "zmq"
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Provides-Extra: all
+Requires-Dist: femagtools[dxfsl,meshio,mplot,svgfsl,test,vtk,zmq]; extra == "all"
 
 
 # Introduction to Femagtools

{femagtools-1.7.9.dist-info → femagtools-1.8.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-femagtools/__init__.py,sha256=ATMoeLjKbQNtu7mNeonzwYoT_GNWt_6-meukz6ptS4c,1600
+femagtools/__init__.py,sha256=LOLIDnRqx1rFlY3VW2IB1PaBPwEYtzPgv2UIqP0QKZU,1600
 femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
-femagtools/amela.py,sha256=pHjfXzpANI-7oz8MtrqNcyDZ6PxVM91vCJuvYhHy1rk,13891
+femagtools/amela.py,sha256=RFTuQ5EcX19G2YJchnktr6j62mNptrdTreShQDOeuKA,13874
 femagtools/asm.py,sha256=CiL0KWaF4P7O6-VwmGLdva_icwmPrPiI-TFQ19XYTKk,7660
 femagtools/bch.py,sha256=l-0j7HsKSQxTjwhjJbwDgrnNcQ3ITw1vYroSDbgx_Ec,73962
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
@@ -13,11 +13,11 @@ 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=gaZ8JmlFVoP6IYe79YXPXvZSULm8IZr6bPBdKuyKaIo,12832
+femagtools/ecloss.py,sha256=0nD2_R7ISl6OGG_l8FLi27ynLG9SlzhJBy13sBoR8Ts,33743
 femagtools/erg.py,sha256=IXKq76P9qLt_ssNOP78v8Qizk3J2Zg80yaKDSjzwoJE,1224
-femagtools/femag.py,sha256=fFKsKiwiajNU5FXQPODMb8Tx0pPSyMfLEy-nfo_upBg,44566
+femagtools/femag.py,sha256=5zOcfUHkAgdhWsOROuAijLaTQMt7JF5xpszwQR_G7Zs,45990
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
-femagtools/fsl.py,sha256=5LsTXZ-fnos13HRycgu0i5claxyp5czL9xb61lpfRnM,37456
+femagtools/fsl.py,sha256=Ap-U7g3BO8uBGUyElkwRgaHHK0WK5XDRC7NfdXaK8lk,36182
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
 femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
@@ -29,9 +29,9 @@ femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
 femagtools/job.py,sha256=sIRVXsyoupfRXqGsWyOHMetcKlWIyggxfVURjM8aD54,11322
 femagtools/losscoeffs.py,sha256=Nil2fvkkS6-T29OnHIsdVbegCHyl23iZg8rMVbbA5wY,6785
 femagtools/magnet.py,sha256=Nuk060bT4Wa3lX74HdefqTTtUxLaERDSBYTTpbi6KP4,1093
-femagtools/mcv.py,sha256=Y5tCBEhm6k64m9xQ-salId5e-U29nNTz-iH4MHTbE5Y,40673
-femagtools/me.py,sha256=XNK0l-aroNYfKyxV_uslE8q3vJb_KuntAYTWd-4FQaQ,1833
-femagtools/model.py,sha256=dK-SuH_dp1eN_wmFj_m1-PSEQdvT-g9roPu1s3zm4Ag,17700
+femagtools/mcv.py,sha256=jZrlWHvTlHzHFjk0zr2aGkHtE5ahuzhDE-SVtey6xnQ,40554
+femagtools/me.py,sha256=z6RJkvSbgMmorCQTxKvq44uIYKh82uYYExjkNePJCmE,1813
+femagtools/model.py,sha256=sqv2qdcL3MHv_6hcwsAtO03UHbteRipY60BcaHGGfcU,17863
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
 femagtools/multiproc.py,sha256=7mJF-VU1NrJkENyg8eHtDrDRNBwLPK43phZv3ehm9BU,8435
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
@@ -46,33 +46,33 @@ femagtools/ts.py,sha256=x9aCMVASjdBZuyI2pJGMyi1dveGFd_pWQ20cZ-l_moc,47216
 femagtools/utils.py,sha256=1SX5s21xyW8u0NF_Hjs7DByyCTdLm9VRArLburTyHR0,1581
 femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
-femagtools/windings.py,sha256=-pVnutzZNy9wKYDV_9AoOqW3285UuIpqJkoUgan6A-Q,23456
+femagtools/windings.py,sha256=OYoEFIQci3f3sYJkcyRjBpBpDRtX2Y2aHZiRXOEgsls,23497
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
-femagtools/dxfsl/area.py,sha256=A5kwW937EAAjxGSamW_RhXPu-ZNIsLpG670_ghI4rrM,61852
+femagtools/dxfsl/area.py,sha256=74VwDSvBLrxpIo_oxU3FGbg3ef_4L8F2IJTG-dJArz8,65208
 femagtools/dxfsl/areabuilder.py,sha256=Siu11yRcNJiSCWwc865-OvuVhSmLtRQWysbe1-rUcN0,34197
 femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
-femagtools/dxfsl/conv.py,sha256=Z_jf4OTxikr-SoUuBew_wrEj32qcGPyEp7VMtkRJx9M,10747
-femagtools/dxfsl/converter.py,sha256=XDy8eN3Ck9M_U4K-9746tv4Bu4APzv62tq47XsQR6UE,33759
+femagtools/dxfsl/conv.py,sha256=TaYqaeRwrK98mPh9uH33SmpmVW48U2v-qnDKs2cjcj8,10600
+femagtools/dxfsl/converter.py,sha256=B0r9MWZbsiIWukHotZ7NMq8rse1FadAaOblxbvDDyw4,34490
 femagtools/dxfsl/corner.py,sha256=-XPBcnEau-2-SRHLYzlBqCQGaFfgm_DH2qR1mSaFoAs,1311
 femagtools/dxfsl/dumprenderer.py,sha256=n4AvInjvGIaC2iKZtQaYXXDyJVSQ3uEOFOLD4-xfKRY,1861
 femagtools/dxfsl/dxfparser.py,sha256=kyXG0kZfNyOgn96MqBgP8RhOQhppfB5NbyRNNybs1C0,13451
 femagtools/dxfsl/femparser.py,sha256=O8940Q1Mz8MKng6W8M3s9KfTvhDLJ56tfQWtZEW3xMM,2134
-femagtools/dxfsl/fslrenderer.py,sha256=uAa2oEQjiyiXpyU0-0I4WEnNK_V1-7zPHrCIOb0xxX8,27652
+femagtools/dxfsl/fslrenderer.py,sha256=Z6jLpwuDCwUyQFf9YinSnJ7u_9WAb71MIgSOugdt0-8,27540
 femagtools/dxfsl/functions.py,sha256=teJHtVxoViGs66AB8_4BxRrFQx9SbPT2azIrKyhJHOc,12005
-femagtools/dxfsl/geom.py,sha256=eYKe8PtWKl-4rcW570HVvOrDxX_CguMCupp8Mo60FQY,171680
-femagtools/dxfsl/journal.py,sha256=S17B7wsrq5QzIUbjgg0ntvnpgH0thHq9aQXO7GdYlQQ,4265
-femagtools/dxfsl/machine.py,sha256=NoUtAg-li3djMHg0jMqNoFp-aupSlrM_yrQ9kM4ip28,50222
+femagtools/dxfsl/geom.py,sha256=iHrHdC8yOTfE1bRSbsM2hVd0LH_sx7Ws42-SX0TBSzM,172502
+femagtools/dxfsl/journal.py,sha256=4LMSW5wCYlETzid6SIF8b5DH-DCgtH4nFx-xIxjtbfg,4265
+femagtools/dxfsl/machine.py,sha256=M6KzOzmeb3Al2Hp3BjlgYWKGpbRrOPwKeN5VFXS2qF8,50415
 femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6R_c,13823
-femagtools/dxfsl/shape.py,sha256=ZmWw7VTSJs5rcY1Lh99MKo804mO7dSGHdKMIh-nVBow,59904
+femagtools/dxfsl/shape.py,sha256=kz68mPsK1m5jRnE-5iNS3FX2IkpSHOe0X3OdEklGR80,59970
 femagtools/dxfsl/svgparser.py,sha256=FE8Jk3pV6e4AtJlrJuUxz89_JZC9buS0wwTBsX52O1g,3762
 femagtools/dxfsl/symmetry.py,sha256=0WeDq_z42A_cjG4m_vREDWyx-wqHqXDkoCT2eXh2EMo,38084
 femagtools/machine/__init__.py,sha256=U8W65K7jr7jDdC1KnJh0WjYd8DFaLnIFVvlh-TKcV94,7174
 femagtools/machine/afpm.py,sha256=3hJTmQxeYDyfTelr_sMEFOB6CsTIFTqmnNH3SfiZQzU,24956
 femagtools/machine/effloss.py,sha256=GV_bc5f1ysBi1Ng7FR3fD1xh5KXa6ACc55iWfsltMBI,13663
 femagtools/machine/im.py,sha256=3Y54AHMZfAjkvgexx2E-5jxNWzaVQ-SyaETCh7gNBYA,38008
-femagtools/machine/pm.py,sha256=iAi2iVk5REPB51Tz_mLrItofFBVQ2ZWzDsqlsu08ldM,68129
+femagtools/machine/pm.py,sha256=C4vDdPIsIRUKtzY3b1RNT1v37p1uP3pMUduftNejcPc,68129
 femagtools/machine/sizing.py,sha256=nWCfxbyWfbw5-7xu0qZ6zjWNquEPn3fUH-fQeGb6QUc,24307
-femagtools/machine/sm.py,sha256=Lb1urOMl-RoPFqxaMb9fN-aHqlNsMyUWabhn1O2jlos,38807
+femagtools/machine/sm.py,sha256=y_zPZN0gGKUQL8RCyhyyfeJE_cSRPK5Mmk93HQPzTFM,39379
 femagtools/machine/utils.py,sha256=CRTY5qwlaN_Zp5SZgxicXTfZyVU5fjtm4XKEA-peNCc,20856
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
 femagtools/moo/algorithm.py,sha256=e-Cgp2rp_hG9DXqWqluzQGNIWvCfthUgLD8O-aVPofA,5763
@@ -84,14 +84,14 @@ femagtools/moo/test/ProblemTest.py,sha256=r5XEfY4LPscDb35TxxPd0lbP3nUmL6_G6vrRo1
 femagtools/plot/__init__.py,sha256=f0yNw9NhadltPIu7zRWwTAY6FgHKeq9ul-3UcnK8Fmk,949
 femagtools/plot/bch.py,sha256=_EEPPEqtEPeWco3xlQqUuZft1eF-IXbMNnXyd8pYEJs,28873
 femagtools/plot/char.py,sha256=gVWPQTJkU8VkbCGFD62zfmZA_K0KlZ7EjorhwshhnZA,12123
-femagtools/plot/fieldlines.py,sha256=QtKF4nhnQ_FHHGh9Qez3GVmym0CLhW1ZyIKtk4pzos4,1136
+femagtools/plot/fieldlines.py,sha256=_7ykKhnQLeS4fz34pnzovH1gIhcUSKJ3gl1GUgWYix8,1137
 femagtools/plot/fluxdens.py,sha256=NlexRJ3f_8CgKoWrV82ZIsAXPrLhwj98uOe8_fUks7A,1082
 femagtools/plot/forcedens.py,sha256=Vloi9czy7qbGXI-Vm7Cow6IfHTsFhCLI1YWduFOR55c,4075
-femagtools/plot/mcv.py,sha256=NwDBe40PQgKqWh_rM89k-vsxRmvyjetv4y7elXzTPZU,3099
+femagtools/plot/mcv.py,sha256=ijZg6KPwZC7sDxEzGEUfVWvDoSEfgcaH-hzQMt7E90I,3671
 femagtools/plot/nc.py,sha256=S_Rb0ax4O0pFVzcL4JctwfXl6-uQFHUJwoeQMftibJM,10839
 femagtools/plot/phasor.py,sha256=5QG1GkXKVksc8P6Q4thKADf6W1l8rDKeArIHFYvbXlw,4858
-femagtools/plot/wdg.py,sha256=Bf9miZqIrIf69mzfufPsHVkKGmPi-lYmBfgggw2yE7w,9816
-femagtools/svgfsl/converter.py,sha256=F0os2rqgLREQlnfARlVQrpFC1GDEC49jKux75BQqqcQ,3014
+femagtools/plot/wdg.py,sha256=Orw2XGThHpOuJ_raSRnQTzj5tOmwllNWweByoOXbA7I,9820
+femagtools/svgfsl/converter.py,sha256=5q4LognshXNTpUWLnU5rtgCfAwZnEuPzqsgyeRYC-VM,3019
 femagtools/templates/FE-losses.mako,sha256=Rql5_8Q6_uthpr-uFXMUo7tdHehfZYND-7M-ohJXVU8,874
 femagtools/templates/afm_rotor.mako,sha256=fY-dlZvRLN9UAy5V6Q_inWghkSUe8pzrCYjJdNgfNXs,3112
 femagtools/templates/afm_stator.mako,sha256=l1xEwxffZ1jyx5wuJ3rhVbVlZirJzD2K8n4i5Dvbxuc,5344
@@ -111,7 +111,7 @@ femagtools/templates/displ_stator_rotor.mako,sha256=dsf9qW0i79aWAbOxaHwWfiq-Tn6W
 femagtools/templates/ec-rotorbar.mako,sha256=RbA1TVNczEEddTNjvGLPxILExxp4rIgoxXe1YT6a4Is,1672
 femagtools/templates/fe-contr.mako,sha256=NoP7FQ62ITxgNmwP6GmkCnGhjEn5gPLUFgdLdhkKylY,1983
 femagtools/templates/fieldcalc.mako,sha256=bEtff9HeD6hTpB9t3COt40V1oGeT0a_6ouWTQlKIGX8,749
-femagtools/templates/gen_hairpin_winding.mako,sha256=U8ZBe49WoRyUivcFgoJpwFRhQKlBQJthhCGVSf9emgY,5871
+femagtools/templates/gen_hairpin_winding.mako,sha256=mQ8TyFYzSyKazpu4uiyS0UdVrl4PobHN-J6FE74IWs8,5329
 femagtools/templates/gen_winding.mako,sha256=kVMRkonDLHRB12bJ5e0Pwb1-8hBGVMM4dn1FEo70bok,3984
 femagtools/templates/inductances.mako,sha256=OpcW3E7LW09J8eoXylzfq2R16LKKxzJDr0PGCdHzixM,560
 femagtools/templates/ld_lq_fast.mako,sha256=BEQoplL7Ojqg5caldzAhMLKL-3E78wCSSbz5-KkDk2o,1359
@@ -120,17 +120,17 @@ femagtools/templates/leak_evol_wind.mako,sha256=JKff7ZEpndKmFYr7R0xaef_49YV6TG0t
 femagtools/templates/leak_tooth_wind.mako,sha256=LYCPSXhSLApidthuuGNiApLh0EJZOPZmTX0LZ5cOblQ,431
 femagtools/templates/magnet-data.mako,sha256=j96ihn0S-Z1PrWMsC0BQZuPYfL6vImKOVYDSxH5-cK0,1271
 femagtools/templates/magnetFC2.mako,sha256=AB2KlOHc9y1aoLXRP_v6ncok3LC2t7diJd20Rb_7tLc,788
-femagtools/templates/magnetIron.mako,sha256=gN5YeckGb9khn7jqv9D1b06MnkKyZWCzYaK_5Y_uPFU,2528
-femagtools/templates/magnetIron2.mako,sha256=iO2Vlr9jA-ZngJ1LxwtFVou2tWi7_hxYOgdMqd4P0QM,2581
-femagtools/templates/magnetIron3.mako,sha256=OySuTGYbQvDgqCewwihhY9FZfYWrrq7l0-dujriGuqE,3471
-femagtools/templates/magnetIron4.mako,sha256=zJa8-9oqasrQib7ecM7q6OMEfM8qPyz2O2wb65npfGA,2568
-femagtools/templates/magnetIron5.mako,sha256=EzDgwrT3JhS68dXTOvipxgFknLwv0VQ-e1c5F-BhqfE,2531
-femagtools/templates/magnetIronV.mako,sha256=JWHitSk_EJMD38lmxxTREIGInLHa3VtPsxbtPEXCxOM,3363
-femagtools/templates/magnetSector.mako,sha256=nQ68Kxjz-pKNYeleMbbOngholLU_02znb6Yuf7Usbdw,3171
+femagtools/templates/magnetIron.mako,sha256=e3WWF246o-yTOyS5LP4zDPm82XsOeCDKhCSTnOwoXOc,2524
+femagtools/templates/magnetIron2.mako,sha256=RiKzraJS883me2yt1D7JekkK9kpXtDyVCMc-BgSqzj0,2577
+femagtools/templates/magnetIron3.mako,sha256=ATQHbk5vyxJ3BDSk-I097bBz9mUDo-rCs7Mw5a0rbD4,3467
+femagtools/templates/magnetIron4.mako,sha256=DsLxLU1avNffXtnioGubIMGMoFfizq5pcVfxkfYNhcU,2564
+femagtools/templates/magnetIron5.mako,sha256=qvcb1WRf43LTFIzDuacXg3zkBK7lXM-GovGPjsl8L74,2527
+femagtools/templates/magnetIronV.mako,sha256=KQAUxg6kKoJqdUWQJpHDGlMpG_e9Un_ZD36bfpbLlBg,3359
+femagtools/templates/magnetSector.mako,sha256=vSyZVkYtuX2Bct5kpRRGjqez3xnca5PJVPFFqsptFKk,3167
 femagtools/templates/magnetSectorLinear.mako,sha256=ez2rkZslw66Zy4DCDiLjI2K45nEjGgunl0jsXseO_Zs,727
 femagtools/templates/magnetShell.mako,sha256=vpyZIZ5tOsrmUVM00Kime7zyu1lK9P61xq78jB8BLdo,1295
 femagtools/templates/magnetShell2.mako,sha256=4IJBfBTPxuYHr1SAcVvNdQoGd8emwsx8vMKQPI9pRlc,4080
-femagtools/templates/mesh-airgap.mako,sha256=9fESevBQJSIf0uCWJIRqhZaj-2-HEjR3nJl-YfKebPo,3685
+femagtools/templates/mesh-airgap.mako,sha256=Pn3lDoWMoHFmT_u9yhsdhBBORxcGJWuAY5Qg5aW1H8w,3858
 femagtools/templates/modal_analysis.mako,sha256=Thf62FBqL738qnp1ongPr196GJY27vwElKqPfMWF45s,2298
 femagtools/templates/modified_steinmetz.mako,sha256=qrJ18XtoU39kjbcdywCJCLObQGaO-eC3Cl-1P4xLZWg,1327
 femagtools/templates/mult_cal_fast.mako,sha256=FhqRZQaBIIvmx0LgKXVLOIjz7LshoDFHqhkD0QGlX8A,1255
@@ -143,7 +143,7 @@ femagtools/templates/plots.mako,sha256=6xfmncVbzDiJLF6V0B6fha23H19R7P26DvcTTwzJ5
 femagtools/templates/pm_sym_f_cur.mako,sha256=KlskcNx5Y_HNwt2crA7CqHN5TIaKBb14T6cFg2vghl0,1464
 femagtools/templates/pm_sym_fast.mako,sha256=NOSbuWSEM2XGY5-JweGxSr32mXGBVSas_aSOQyK4uEU,2361
 femagtools/templates/pm_sym_loss.mako,sha256=dh0o3ZamZuWs7sHc-jS7ohKsqeZCA0tRaqkaFmXlRS0,1009
-femagtools/templates/prepare_thermal.mako,sha256=VtuDTSoigimcmdnaiLwBz_qRPgIkxaCNF5LoANM3Sgw,6615
+femagtools/templates/prepare_thermal.mako,sha256=H8YRqE8i5AiRPl-dE3obiMhiuO9vm5L7ASeqPJoUozg,9521
 femagtools/templates/psd_psq_fast.mako,sha256=7DQUZI6KOjdKQMFLKySGUlWXo4U_rZuHXFzLxiA1GGc,1339
 femagtools/templates/ring.mako,sha256=Cuc_FuCPWZM-g3TxHqzTdjknYEJSUgP-y64gp8pekDI,643
 femagtools/templates/rot_hsm.mako,sha256=eh50TbpWNUALK9_7wOOJ7KPewHos7JExAfMACbPlXYc,973
@@ -188,9 +188,8 @@ tests/test_losscoeffs.py,sha256=3EKmDFRuvn88z_8r0HxKFdB0lNXNnhEgaFshL8BkDjE,2012
 tests/test_machine.py,sha256=Woha6nfKaYQCxxoG57sUztpnpU6K9imXwn9B_KMhanw,12906
 tests/test_magncurv.py,sha256=wPf1dNACZ1BkqKHSqJxiNi6Dq8JP3QCRBY4ql_0YCyU,2608
 tests/test_magnet.py,sha256=BUHG_8SEi4d8j6yV9BSzcpYc2-UVMRFv50P_jgTTXoQ,276
-tests/test_mcv.py,sha256=qV52S82BAN3GRyD-z73RgOBK9-fQCKvrT4T9MXzArn0,283
+tests/test_mcv.py,sha256=BdFdCkBL_tM88G2z_hbLsVlOaq7T83flS4m8YYLLPnc,4574
 tests/test_mcvreader.py,sha256=3cgq22b_iaWLrs4WWOUNHqJREnv0YoFivNpAb4teEJs,2118
-tests/test_mcvwriter.py,sha256=eKVCJ4TTjrykMvychffre8vBNjR4OZsYD_H5aLyrDrY,3986
 tests/test_me.py,sha256=En00OrOhZclBO4u74q5Os0FgVP4TGFLzz99LF0QHXHA,196
 tests/test_model.py,sha256=kYjjFgZPIex3foX3skiOdD5MCcmA2JP7oDDuE9txv_U,2698
 tests/test_nc.py,sha256=kIFUOlFy_jQUjLnS9wuy6c2YkPOrKyXlMtGxDIJnXsw,4205
@@ -203,7 +202,7 @@ tests/test_tksreader.py,sha256=8QtPAzxPJbkpxd1Nw2I7ggaTaKaL4WY55JJBHkZAzus,766
 tests/test_ts.py,sha256=tR2x5cKU9gw2fUprzaPgPbCvmDOHDO36JUPCCoTlY7Y,1833
 tests/test_vbfreader.py,sha256=-6oAhLJDb7K3Ui5O1mtHvbskawEfgyIH-Of5n-8u-fc,832
 tests/test_vtu.py,sha256=pGpHuAcaCk5zDYTBBp_akOEenZOpq-IzGl_kaMtodyA,1469
-tests/test_windings.py,sha256=qklMqzQZxqv0cdsO4yO1y38uXXpPuCoH9eiyqLDgVyA,5665
+tests/test_windings.py,sha256=rZjAudsSCHedbo5BWt1ZVaU49ktxjOim1r7BzJmSdUo,5841
 tests/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/engines/test_amazon.py,sha256=4uy36NIo0epi3CgjUm8vl4snLpr4NRvUoWi6Zew_zcE,2014
 tests/engines/test_config.py,sha256=_I1Z5RuubgnOGQeZHjAsCsovt0WEMH0o4ILz032l_Bc,663
@@ -214,9 +213,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.7.9.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
-femagtools-1.7.9.dist-info/METADATA,sha256=3f-iDI4cc4uKilc09dDWOGK2XNY0F0bkUHqC1-3x2hM,6233
-femagtools-1.7.9.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-femagtools-1.7.9.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.7.9.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.7.9.dist-info/RECORD,,
+femagtools-1.8.0.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.8.0.dist-info/METADATA,sha256=qZkw13rq-jo1WT373nahzfRdxT1VvBAnMgKBhiDK_5A,6198
+femagtools-1.8.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+femagtools-1.8.0.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.8.0.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.8.0.dist-info/RECORD,,

{femagtools-1.7.9.dist-info → femagtools-1.8.0.dist-info}/WHEEL

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