femagtools 1.8.13__py3-none-any.whl → 1.8.15__py3-none-any.whl

femagtools/templates/noloadflux-rot.mako

@@ -90,6 +90,7 @@ end
 if nrot == nil then
   nrot = nodes
 end
+nrot=1 -- otherwise too long and only 1 is needed to have results
 curvec = {${','.join([str(x) for x in model['curvec']])}} -- A rms
 
 print("\nNo load flux simulation (DC) with rotation\n")
@@ -106,13 +107,9 @@ rotate({
 })
 
 file_psi = io.open("psi-rot-mag.dat","w")
-value={}
-temp={}
 for n=1,nrot+1 do
 
   pos, bag = calc_field(phi, curvec, file_psi)
-  value[n]=#pos
-  temp[n]=pos
   bags[n] = bag
   phi = n*dphi
   rotate({angle=phi, mode="absolute"})
@@ -120,40 +117,16 @@ end
 rotate({mode = "reset"})  -- restore the initial state (discard any changes)
 file_psi:close()
 
--- add otherwise nil value in bags[n][i][k]
-for i=1, #value-1 do
-  if value[i]<value[i+1] then
-    num_pos=value[i]
-  end
-end 
--- end
-
---for i=1, #curvec do
---  bagfile = string.format("noloadbag-%d.dat", i)
---  file_bag = io.open(bagfile,"w")
---  for k = 1, num_pos do --#pos do -- add otherwise nil value in bags[n][i][k]
---     file_bag:write(string.format("%g ", pos[k]))
---     for n=1, nrot+1 do
---      file_bag:write(string.format("%g ",
---         bags[n][i][k]))  -- Br, rotpos, cur, pos
---     end
---     file_bag:write("\n")
---  end
---  file_bag:close()
---end
-
--- add otherwise nil value in bags[n][i][k]
 for i=1, #curvec do
   bagfile = string.format("noloadbag-%d.dat", i)
   file_bag = io.open(bagfile,"w")
-  for n=1, nrot+1 do
-     for k = 1, value[n] do --#pos do 
-      pos=temp[n]
-      file_bag:write(string.format("%g ", pos[k]))
+  for k = 1, #pos do
+     file_bag:write(string.format("%g ", pos[k]))
+     for n=1, nrot+1 do
       file_bag:write(string.format("%g ",
          bags[n][i][k]))  -- Br, rotpos, cur, pos
      end
      file_bag:write("\n")
   end
   file_bag:close()
-end
+end

femagtools/templates/statorRing.mako

@@ -52,7 +52,7 @@ nc_circle_m(xw2, yw2, x8, y8, 0,0,0)
 nc_circle_m(x4, y4, xw3, yw3, 0,0,0)
 nc_circle_m(xw4, yw4, x7, y7, 0,0,0)
 
-x, y = (x7+x5)/2, (y4+y6)/2
+x, y = (x4+x7)/2, (y4+y5)/2
 create_mesh_se(x, y)
 
 def_new_sreg(x, y, 'StZa', 'skyblue')

femagtools/utils.py

@@ -10,7 +10,10 @@ def fft(pos, y, pmod=0):
       pmod: number of poles in model (ignored if 0)
     """
     model_angle = pos[-1] - pos[0]
-    ntiles = int(round(360/model_angle))
+    if 360/model_angle < 1:
+        ntiles=1
+    else:
+        ntiles = int(round(360/model_angle))
 
     if pmod:
         negative_periodic = pmod % 2
@@ -51,6 +54,7 @@ def fft(pos, y, pmod=0):
     alfa0 = np.angle(Y[i])
     alfa = np.angle(Y[:nmax])
 
+
     return {'a': a, 'a0': a0, 'T0': T0, 'alfa0': alfa0,
             'alfa': alfa,
             'nue': (2*np.abs(Y[:nmax])/N).tolist(),

femagtools/windings.py

@@ -12,6 +12,12 @@
  Number of coils per phase: c = Q * l/2/m
  Number of parallel circuits (coil groups): g
  Number of turns per phase: w1 = Q * n * l/2/m/g
+
+Refs:
+odd number of phases
+ doi:10.1007/s00502-021-00873-6
+even number of phases
+ doi:10.1049/iet-epa.2020.0553
 """
 import numpy as np
 import femagtools.bch
@@ -131,8 +137,6 @@ def end_wdg_length_hairpins(wire_h, wire_w, wire_th, wire_gap,
 
 
 class Winding(object):
-    # TODO: raise ValueError "Unbalanced winding" if Q % (m * gcd(Q, p)) != 0
-
     def __init__(self, arg):
         """create winding either from bch winding section or winding dict()
 
@@ -199,15 +203,29 @@ class Winding(object):
             coilwidth = self.yd
 
         self.yd = coilwidth
+        if self.m % 2:  # odd number of phases
+            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
+            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]
+        else:  # even number of phases
+            if np.mod(self.Q, 4/self.l*self.m*np.gcd(self.Q, self.p)):
+                raise ValueError(
+                    f"Unbalanced winding: Q={self.Q}, p={self.p}, m={self.m}")
+            t = np.gcd(self.Q, self.p)
+            Qb = self.Q//t
+            seq = np.array([i for j in range(Qb)
+                            for i in range(Qb) if (j*self.p//t - i) % Qb == 0])
+            if self.l == 1:
+                seq = seq[::2]
+            seq = np.array(seq).reshape((-1, 6))
+            pos = seq[::2].T
+            neg = seq[1::2].T
 
-        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
-        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 self.l > 1:
             slots = [sorted([(k, 1, 1)
                              for k in p] + [(k, -1, 1)
@@ -495,16 +513,16 @@ class Winding(object):
                 if not is_upper(r, s*taus - (x-taus/2))]
                 for key in self.windings]
 
-        z = ([[d*s for s, d in zip(u, ud)] for u, ud in zip(upper, udirs)],
-             [[d*s for s, d in zip(l, ld)] for l, ld in zip(lower, ldirs)])
+        z = ([[int(d*s) for s, d in zip(u, ud)] for u, ud in zip(upper, udirs)],
+             [[int(d*s) for s, d in zip(l, ld)] for l, ld in zip(lower, ldirs)])
         # complete if not  basic winding:
         Qb = self.Q//num_basic_windings(self.Q, self.p, self.l)
 
         if not np.asarray(upper).size or not np.asarray(lower).size:
             layers = 1
         if layers == 1 and z[1]:
-            z = ([[d*s for s, d in zip(l, ld)] for l, ld in zip(lower, ldirs)],
-                 [[d*s for s, d in zip(u, ud)] for u, ud in zip(upper, udirs)])
+            z = ([[int(d*s) for s, d in zip(l, ld)] for l, ld in zip(lower, ldirs)],
+                 [[int(d*s) for s, d in zip(u, ud)] for u, ud in zip(upper, udirs)])
 
         if max([abs(n) for m in z[0] for n in m]) < Qb:
             return [[k + [-n+Qb//2 if n < 0 else -(n+Qb//2) for n in k]

{femagtools-1.8.13.dist-info → femagtools-1.8.15.dist-info}/METADATA

@@ -1,14 +1,42 @@
 Metadata-Version: 2.4
 Name: femagtools
-Version: 1.8.13
+Version: 1.8.15
 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-Expression: BSD-3-Clause
+License: Copyright (c) 2016-2023, Semafor Informatik & Energie AG, Basel
+        Copyright (c) 2023-2024, Gamma Technology LLC
+        All rights reserved.
+        
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions
+        are met:
+        
+        Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+        
+        Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+        
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+        THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+        PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+        BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+        CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+        INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+        
 Classifier: Programming Language :: Python :: 3
 Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: mako
@@ -36,6 +64,7 @@ Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Provides-Extra: all
 Requires-Dist: femagtools[dxfsl,meshio,mplot,svgfsl,test,vtk,zmq]; extra == "all"
+Dynamic: license-file
 
 
 # Introduction to Femagtools

{femagtools-1.8.13.dist-info → femagtools-1.8.15.dist-info}/RECORD

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=HyXtrEg4fAUu0T0tWobt4wWZ6tzcYTlD4ap1kvNm0KA,1601
+femagtools/__init__.py,sha256=qICbWqrJVPMO4pvagU-k07Q0dkOXxLyKxNhgp6aGXYQ,1601
 femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
 femagtools/amela.py,sha256=2q-Xsj6i6nQ3iKheBR1vQ4FulJfF1i-L8w3a3U8GYWo,4362
 femagtools/asm.py,sha256=CiL0KWaF4P7O6-VwmGLdva_icwmPrPiI-TFQ19XYTKk,7660
-femagtools/bch.py,sha256=ogdBxZhnUZuIcWOLNFODpD-jpUeTL-QSuwCRpjIMfj4,74768
+femagtools/bch.py,sha256=e6kKyp4iaGb-GPMxwq5LgcyA0GQxteRJDfZsLZVfLyw,75732
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
 femagtools/condor.py,sha256=J8z9iBdvrGu3I1eFNoyKV8AXzRoTEPGLSak6cXUQxAM,10766
 femagtools/conductor.py,sha256=rXO7c7Qh_s7JpgILmLd4IbG64vP6Eh143YF9u25Mdwg,1076
@@ -15,18 +15,18 @@ femagtools/dakotaout.py,sha256=6nn0PXsB40mPKiQLenqAtHy0KXCO7kvqqQ-aD2JhQvw,5573
 femagtools/docker.py,sha256=XDVmLBB0z4sZZpcrx7Wbm84xl4ksj7aqn5-ZOPxdxm4,7460
 femagtools/ecloss.py,sha256=3qwfb_9qpWw99asUDcQgdbP51VGXp4MlLQZDhywWHEk,35051
 femagtools/erg.py,sha256=IXKq76P9qLt_ssNOP78v8Qizk3J2Zg80yaKDSjzwoJE,1224
-femagtools/femag.py,sha256=kfIFBNV7xw1JUHKBdEck3bU3wD5JDKY02kfTlBDpkTo,44789
+femagtools/femag.py,sha256=rJ_n1Fvu8RcL-6LTH5o-lvV8pP0kpsqmx6RggsiJMhU,45013
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
-femagtools/fsl.py,sha256=h3wPDlTYUd6elcYutw0Tx-pOn97tDgqwkOZEWdN8vGM,38476
+femagtools/fsl.py,sha256=AWyc7mIgUL2tjqw_kmK22y-gZXhTzOccyhjJLwCqKcg,37736
 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=HqTQmbOLmLi75ytXpkryeYiXqUChi07mBUNYYj9xOjk,66365
+femagtools/isa7.py,sha256=qtmBx53IIbn4rO2pCTFqn0h1f-REbQ0uEWAJ9T85LgI,67033
 femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
-femagtools/job.py,sha256=pc0IDskJ8d1aPLd1WO-2YKCNUAXnQiR5-lGPP91y6zk,11431
+femagtools/job.py,sha256=sh4yk8RVEFai7YDBMsVg19p9xEd6_sfyNX5WQSY7HEY,11726
 femagtools/leakinduc.py,sha256=4IGZaV8S1ZG6L3hgZsCXqMsMNRH4F88l9EsvUjSXDSE,999
 femagtools/losscoeffs.py,sha256=7B29VdEsmv8HSP749X3QBb_E-XN6Z9dvNleKiRLWaMI,7721
 femagtools/magnet.py,sha256=Nuk060bT4Wa3lX74HdefqTTtUxLaERDSBYTTpbi6KP4,1093
@@ -34,22 +34,22 @@ 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/multiproc.py,sha256=XSYe18kZOaY6C_9gH_neWR0H3S8q2l8dda3dbXlNb54,9265
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
 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
-femagtools/parstudy.py,sha256=Y3S1OUBVjAPhduQb08rNN2qHmQDJuI0yNsBuz6KMh6k,20548
+femagtools/parstudy.py,sha256=eHOcHHZAQMPnYwyQpnX9daZIMKhZZl8aDeEPXBgSS-k,20550
 femagtools/poc.py,sha256=yPWmpi8Q2g7NmpAi2YV5ezyo0VUj67EK0tcX2wikerw,7207
 femagtools/semi_fea.py,sha256=WZtYKrzhDruETyuEW2kpiNp9OaA7Hheq3qJiAIYtsjg,3475
 femagtools/shortcircuit.py,sha256=ZugEzPnofsVb2ZLInEbjkjwEVzLL1dNTJtqSueaHc8A,14301
 femagtools/tks.py,sha256=mDi45S5go9-jwALh6rS9RWPoOFBORZm0-XL4ECjSf_8,7531
 femagtools/ts.py,sha256=yoYjpKrr_0b-tHfsX5azJEBXHUs9PN8P-SMhbjjRhCA,48381
-femagtools/utils.py,sha256=dJkQ5xsoVMzSEB5-2hEiwe2of9mLmsDo8nkrnSN-gPE,1643
+femagtools/utils.py,sha256=yZYgAKHsvK7QyY2-ijE3gSzXlE3vfuhD5dx7myyw434,1703
 femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
-femagtools/windings.py,sha256=p7BkIbi8mMc_CmWqAjOZNKz1-GlQb4kON4rWhvlARf8,27498
+femagtools/windings.py,sha256=eGRoDbi9yruiWHqZysamBLPJefw8IQX3Lq4KpG4oIKo,28216
 femagtools/zmq.py,sha256=62x5VRk0TMNER0-EZ8E28IdLKzsttlbxy1U_3wocNLc,9618
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
 femagtools/dxfsl/area.py,sha256=CpTMRBF8_AJmJMkkn-LgRv27U5xJ5Ohhd2ppRvESPNU,69757
@@ -70,14 +70,14 @@ femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6
 femagtools/dxfsl/shape.py,sha256=uQqbgXIA2_KP2XRdhCfVfGWjcjwzhJ5t9RhiqR9R98c,61668
 femagtools/dxfsl/svgparser.py,sha256=RY2TU9MK6gOaNmI6w6RNqcw7H9YGmK-NUwvdylKBcsE,3763
 femagtools/dxfsl/symmetry.py,sha256=dXfZVIqT49nbMirY5YVaRPi8kNB8reaiq-eIbhw1Z54,43936
-femagtools/machine/__init__.py,sha256=I71jrAGxE331x419y9iq3KxktNeDyTn9rJSFV03c_qA,8388
-femagtools/machine/afpm.py,sha256=ZkYk-acfmwV2ebhU8BUE6dKYkDrCR8UKp1plxEdZ4v8,40223
-femagtools/machine/effloss.py,sha256=VzaJlMMVYWaSleEMqt5ipKji3Hm145UTZn0TxiZ_mw4,16447
-femagtools/machine/im.py,sha256=rX4RTXtZuwK1sOhht1wz8YLcFVHxnRnozJSCBT0vF98,38324
-femagtools/machine/pm.py,sha256=PTzQDIjHzKSoO2WT1jYH5cvCUCdAkmlmCfd2N35EbIs,69967
-femagtools/machine/sizing.py,sha256=vcm7wuokDtk21JAj5GHwMmlC4TaY-mYuXH-UD1nID-g,30172
-femagtools/machine/sm.py,sha256=cr0lUvgDDdYashoX4EDBjaHP2Y6G-TGnqTj1N0qfST8,38961
-femagtools/machine/utils.py,sha256=25QNxP8lp31W7kB-gcIA1Vd_9UcYlxrahqZ-k3ALU_s,20985
+femagtools/machine/__init__.py,sha256=xDY9QSUVL2Y17I4fq-nXsb5uMHCIxnCmGVIiL0fZZYE,7447
+femagtools/machine/afpm.py,sha256=_Ei1FMuoC1GiI0z90qnyuxNrefkmeRdtDZKm20glzNY,40711
+femagtools/machine/effloss.py,sha256=Mf_C6rFrVn5ku-3IJnyD07XfccHAcTk4wVotCzLKoiQ,16423
+femagtools/machine/im.py,sha256=UeN1e0JTwsbaFjGhJFBmhwRDlgckNNf8_A69YmG6ABE,39545
+femagtools/machine/pm.py,sha256=hXG71o2TqTxqy-FRy1WoeSOT-KysOGeZlCCnaLfISuE,70026
+femagtools/machine/sizing.py,sha256=QO-k-UALmSPFNf8ajJPDnzKtlbkiAhX1DqWCRLr-H9k,32306
+femagtools/machine/sm.py,sha256=hQC_guN6qCJPrFWyECNyJyVmu13wzPxTioqXnGT4AtA,39191
+femagtools/machine/utils.py,sha256=HRM9UHY0UwuBWyK2dAfwlPuvMkXYBVqHlmEsUIdSNJk,21694
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
 femagtools/moo/algorithm.py,sha256=e-Cgp2rp_hG9DXqWqluzQGNIWvCfthUgLD8O-aVPofA,5763
 femagtools/moo/population.py,sha256=krIl8tOJXPhCgBemkqn-jwvZg1VzsGniqMN_KAFxbuw,10203
@@ -95,9 +95,9 @@ femagtools/plot/machine.py,sha256=fVLOZTc19Ru8eXLdtoTeIYsHRWhGLkn_YVZ6qO6KgrE,26
 femagtools/plot/mcv.py,sha256=ijZg6KPwZC7sDxEzGEUfVWvDoSEfgcaH-hzQMt7E90I,3671
 femagtools/plot/nc.py,sha256=E7_7WNG3MNrV4QPJJqng1nfuXf3ZbjAGeonthqQlMss,11349
 femagtools/plot/phasor.py,sha256=5QG1GkXKVksc8P6Q4thKADf6W1l8rDKeArIHFYvbXlw,4858
-femagtools/plot/wdg.py,sha256=Orw2XGThHpOuJ_raSRnQTzj5tOmwllNWweByoOXbA7I,9820
+femagtools/plot/wdg.py,sha256=uTEtpW_xCXueGnkWx8fTQHruBiayw62AVTXkc9vz9iM,10536
 femagtools/svgfsl/converter.py,sha256=5q4LognshXNTpUWLnU5rtgCfAwZnEuPzqsgyeRYC-VM,3019
-femagtools/templates/FE-losses.mako,sha256=Rql5_8Q6_uthpr-uFXMUo7tdHehfZYND-7M-ohJXVU8,874
+femagtools/templates/FE-losses.mako,sha256=cfDlO11vWovz2muPLg9X2rgeHD9Ihaz8PRiz63MRr88,819
 femagtools/templates/afm_rotor.mako,sha256=4yoEA4fOq9FRcwxOMRw1oX4Bs_jcrtyHOY6kHPYJ5MY,3175
 femagtools/templates/afm_stator.mako,sha256=l1xEwxffZ1jyx5wuJ3rhVbVlZirJzD2K8n4i5Dvbxuc,5344
 femagtools/templates/airgapinduc.mako,sha256=aCMLZ7P4vjeSGikIetkwymgDjESdftPN_aYx2LfjfsY,246
@@ -113,13 +113,13 @@ femagtools/templates/conduct-data.mako,sha256=quT9S1cq2C2GyeoUe-erxV6w20KvRPuJVJ
 femagtools/templates/connect_models.mako,sha256=8j1hzBMeoDJ7-GL5BH-S5p53Bu5jtqqsC2_w6MSwWnI,663
 femagtools/templates/cu_losses.mako,sha256=EeNwINYuwBuhbo9LH3STdQOTxOyyWw_BANgh_BSV9TE,1339
 femagtools/templates/displ_stator_rotor.mako,sha256=dsf9qW0i79aWAbOxaHwWfiq-Tn6WCDx46PQyEvL3SMw,830
-femagtools/templates/ec-rotorbar.mako,sha256=MDXUKL3I4pJRMrOjXnjb-aABBnoYd1D_u5uHknmbXV8,1798
+femagtools/templates/ec-rotorbar.mako,sha256=RbA1TVNczEEddTNjvGLPxILExxp4rIgoxXe1YT6a4Is,1672
 femagtools/templates/fe-contr.mako,sha256=Gj4EFpAk_SVW_SIeW5eRRJAsYXTTpl-djuyb47n3Dj8,1898
 femagtools/templates/fieldcalc.mako,sha256=bEtff9HeD6hTpB9t3COt40V1oGeT0a_6ouWTQlKIGX8,749
 femagtools/templates/gen_hairpin_winding.mako,sha256=O3up0yjj3BDqFgpIY28fILKt7NX9NbgXTbd0sb3MM6A,5340
 femagtools/templates/gen_winding.mako,sha256=kVMRkonDLHRB12bJ5e0Pwb1-8hBGVMM4dn1FEo70bok,3984
 femagtools/templates/inductances.mako,sha256=OpcW3E7LW09J8eoXylzfq2R16LKKxzJDr0PGCdHzixM,560
-femagtools/templates/ld_lq_fast.mako,sha256=zmgrsGJsJ70Jfi3F6kmYeh1ftq51IUW09H6lAxYdHp8,1449
+femagtools/templates/ld_lq_fast.mako,sha256=vO7_zLpZThNpBu_LSGnZ8k1S8eF87DEmxUse4rRVmmk,1448
 femagtools/templates/leak_dist_wind.mako,sha256=vs8fpxcM203kL8BVNuR8BKSmMsQM6U1_vTtYXZIfdSc,600
 femagtools/templates/leak_evol_wind.mako,sha256=JKff7ZEpndKmFYr7R0xaef_49YV6TG0tZeE8wQejR7Q,770
 femagtools/templates/leak_tooth_wind.mako,sha256=LYCPSXhSLApidthuuGNiApLh0EJZOPZmTX0LZ5cOblQ,431
@@ -135,12 +135,12 @@ femagtools/templates/magnetSector.mako,sha256=vSyZVkYtuX2Bct5kpRRGjqez3xnca5PJVP
 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=ANlKEEYgnyTVuPizTmZG75g1lP-5MAhoOMR4fUB_kAE,4095
+femagtools/templates/mesh-airgap.mako,sha256=bHmiz-Ul_S0x7mJH_b2VWXu6aH7FyXB7dcTwr5JAg9c,4022
 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=TTEPmWKpqq8rSO_usYvHl9rTMopHNGoEhmRuhEgYTrg,1344
 femagtools/templates/new_model.mako,sha256=P7658h99bKrA6YbP1D365ImIZPGEAZoBeYCdq0DT0AA,345
-femagtools/templates/noloadflux-rot.mako,sha256=EAnE2giVjXsQUOqIOmXvbqZnlA5_kRGZHren40DIqG0,3906
+femagtools/templates/noloadflux-rot.mako,sha256=Rcoq0qTR4hzPaG--5IbgqFaX6b4u04AGvyHOP-M0WjU,3275
 femagtools/templates/noloadflux.mako,sha256=vYUpZRLOAixNoBbB-Nc-Y9niPYsSUEPvBCOjw26uFdg,4661
 femagtools/templates/noloadfluxdc.mako,sha256=n3M4gNxf4Q-i7B8ft69Ism9lquRqh-pf4ET4KYwdQb0,3146
 femagtools/templates/open.mako,sha256=Zl5yvdwT5BflJIPVmReggzSrTQhepbef62EoCuw_mQg,344
@@ -159,8 +159,6 @@ femagtools/templates/rotorAsyn.mako,sha256=r_gce0oic24nPdI7BmERM1sokXpC5vvm8Sm0T
 femagtools/templates/rotorKs2.mako,sha256=PtWyvW71gObgWIUnnqS9VnMX1oCfxw_sF9eAwUzeAyQ,1908
 femagtools/templates/rotor_msh.mako,sha256=50nep93hyVFG-KOJujPnJpCaIrIsG9VL71Zy8WGuxa0,1910
 femagtools/templates/rotor_winding.mako,sha256=rK5CBX4AJ1_SS5vL02_xVLmlWDlU2fosw4pLTlDFLlk,866
-femagtools/templates/rotor_winding_ks2.mako,sha256=9xSxJpgNHkLP21dDhIjkI-ssSWxMUY_ViX5ZHZshU7A,1007
-femagtools/templates/rotor_winding_ks2_ecSimulation.mako,sha256=raP7HvmL1W45tGPi86FlkNpO72ZogBl6GqN1hdh0aJ0,1031
 femagtools/templates/shortcircuit.mako,sha256=Mr1zRtF_Y2QZ1qpTn8_-PASYrTFRYWpByhDzdWx87ys,1981
 femagtools/templates/srm.mako,sha256=NneriEFv1wurQCGBI2xozzF2pTzlzS8pEPqtKm0SASQ,2077
 femagtools/templates/stator1.mako,sha256=1sf0lzLXsjwiBNk3OGLwlio3GUVFogfxqEwaySVO6cs,761
@@ -168,12 +166,13 @@ femagtools/templates/stator2.mako,sha256=7Ae9sfaX7H4ummL6-g8iG42ArUvl6J809TW2tOd
 femagtools/templates/stator3Linear.mako,sha256=pNe3C1wT0W2C0qePo3sEyebW1z_dpTuJzg0r5kf3JQY,760
 femagtools/templates/stator4.mako,sha256=Jq8pfIuOmmpyGOL1z2aQZfbwMS5-Zyn6OGJ51LCBVKs,1179
 femagtools/templates/statorBG.mako,sha256=fh0cVOZVWyLojlGxWJoFz2pvdL6Yxy4xzhY-Joc2xeg,893
-femagtools/templates/statorRing.mako,sha256=7NeweZX3VIVlEfUlwt3HIMeW2BAKlyRDmOmLZdKpnAY,2071
+femagtools/templates/statorRing.mako,sha256=sDgDmk71EoE8d4e9cmyqKqRldfC8uKMmpHEjXJGIt_k,2071
 femagtools/templates/statorRotor3.mako,sha256=6ycHlkSnk-TKFdoxiOqjpr6Pk0l634w3_O94vvRP4BI,4357
 femagtools/templates/stator_msh.mako,sha256=Neze1ielMCk7TrARyhOra91fFQVT8Phsgk2Omt_aMG8,1799
 femagtools/templates/therm-dynamic.mako,sha256=pEz7jrUpopK1-RqgulNnrkSaCZDjfLelsVo6cBqmpac,3142
 femagtools/templates/therm_static.mako,sha256=ulevp4AP-kZ1_qdScPMaX9tLqvvP0t9lFflWTXgUxaE,1310
 femagtools/templates/torq_calc.mako,sha256=et6O9ZEkPMOYcaJVpYtH2u3aoU0iyhRCPkfN4ZLdjxA,2353
+femagtools-1.8.15.dist-info/licenses/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_afpm.py,sha256=ge5CXnVQ7E5gVViTI9hQOC0hHetBci18pY9prbUCAqU,16849
 tests/test_airgap_induction.py,sha256=cmpy1og59oWEyCO4oF_zDuc1DUwCbdeebNL1ujpZza4,1065
@@ -185,9 +184,9 @@ tests/test_convert.py,sha256=oseuhm3Iw-9b4WzBjA_Og2lgXPqKYicLUnfadq5Yick,6497
 tests/test_dxfsl.py,sha256=DBAjtwNAwcB7VYZBjul7xf4ovu14n3Z0fxyreVzAW4A,383
 tests/test_effloss.py,sha256=-kJJNgS5c6saHXjNuhAe5GdWfr9mEYpPo8fE8OtjsNA,1142
 tests/test_erg.py,sha256=kRVzpXa6JDdbxTss18HUWKny9Dx8IMx9uGTrbQCnHwg,523
-tests/test_femag.py,sha256=55cCx90tJ1BEeu_-DOit37y26hFGVSYwkT81s9-p28E,1934
+tests/test_femag.py,sha256=l7-av3eitLm7bwTuunEmVeTspi82ifPrlz7f1boGdVI,1934
 tests/test_forcedens.py,sha256=Yzl3SAmJNkZN9dA3aLxRvwY8fKsw077Fl0iJm6zJ5Sk,536
-tests/test_fsl.py,sha256=5l-L-6eONQAgRReMtyoUNEpy9-hMKfmX7iZbhxW61xw,16623
+tests/test_fsl.py,sha256=oe5dHxR0G3sfGvsRtO6fEIn0R3oQFugsSkGzhyFPQR4,16624
 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
@@ -212,7 +211,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=rZjAudsSCHedbo5BWt1ZVaU49ktxjOim1r7BzJmSdUo,5841
+tests/test_windings.py,sha256=WKFabGC6-TpCnxXL9U91J84INK_ntkMMU1FZRuE7m6k,6142
 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
@@ -223,8 +222,8 @@ 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.13.dist-info/METADATA,sha256=WrG9IMqMZCl8Fmuqe5N2Do4-KOhzC_ybE7kwj-m0MS4,4571
-femagtools-1.8.13.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-femagtools-1.8.13.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.8.13.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.8.13.dist-info/RECORD,,
+femagtools-1.8.15.dist-info/METADATA,sha256=tFQ51rVZ5aZLm_-o116EK8gTaOuPU3xOo2Km76rTi_k,6213
+femagtools-1.8.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+femagtools-1.8.15.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.8.15.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.8.15.dist-info/RECORD,,

{femagtools-1.8.13.dist-info → femagtools-1.8.15.dist-info}/WHEEL

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

femagtools-1.8.15.dist-info/licenses/LICENSE

@@ -0,0 +1,26 @@
+Copyright (c) 2016-2023, Semafor Informatik & Energie AG, Basel
+Copyright (c) 2023-2024, Gamma Technology LLC
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.

tests/test_femag.py

@@ -70,7 +70,7 @@ def test_run_script(monkeypatch, tmpdir):
                                    magnetizingCurves=mcv, magnets=magnetmat)
 
     fsl = femag.create_fsl(machine, simulation)
-    assert len(fsl) == 95
+    assert len(fsl) == 94
     assert femag.model.magnet['temp_prop']['magntemp'] == 60.0
 
     r = femag(machine, simulation)

tests/test_fsl.py

@@ -304,18 +304,18 @@ class FslBuilderTest(unittest.TestCase):
         self.m['stator']['ffactor'] = 1.1
         model = femagtools.MachineModel(self.m)
         fsl = self.builder.create_fe_losses(model)
-        self.assertEqual(len(fsl), 21)
+        self.assertEqual(len(fsl), 19)
         ffact = [float(f.split('=')[1])
                  for f in fsl if f.startswith('m.ffactor')][0]
         self.assertEqual(ffact, self.m['stator']['ffactor'])
         feloss = [f.split('"')[1]
-                  for f in fsl if f.find('pre_models') > 0][0]
+                  for f in fsl if f.find('pre_models') >= 0][0]
         self.assertEqual(feloss, 'FE-Losses-1')
 
     def test_run_models(self):
         feapars['calculationMode'] = "cogg_calc"
         fsl = self.builder.create_analysis(feapars)
-        self.assertEqual(len(fsl), 29)
+        self.assertEqual(len(fsl), 28)
 
         feapars['calculationMode'] = "pm_sym_fast"
         fsl = self.builder.create_analysis(feapars)
@@ -327,13 +327,13 @@ class FslBuilderTest(unittest.TestCase):
 
         feapars['calculationMode'] = "torq_calc"
         fsl = self.builder.create_analysis(feapars)
-        self.assertEqual(len(fsl), 29)
+        self.assertEqual(len(fsl), 28)
 
     def test_run_existing_model(self):
         model = femagtools.MachineModel('data/magnsec')
         feapars['calculationMode'] = "cogg_calc"
         fsl = self.builder.create(model, feapars)
-        self.assertEqual(len(fsl), 68)
+        self.assertEqual(len(fsl), 67)
 
     def test_create_plots(self):
         pars = copy.deepcopy(feapars)

tests/test_windings.py

@@ -163,3 +163,14 @@ def test_zoneplan():
     w = femagtools.windings.Winding(
         {'Q': 60, 'p': 32, 'm': 3, 'l': 1})
     assert [1, -2, 3, -4, 5, -6, -17, 18, -19, 20] == w.zoneplan()[0][0]
+
+def test_zoneplan_6phase():
+    w = femagtools.windings.Winding(
+        {'Q': 24, 'p': 11, 'm': 6, 'l': 1})
+    assert [
+        [1, -2, -13, 14],
+        [-11, 12, 23, -24],
+        [-9, 10, 21, -22],
+        [-7, 8, 19, -20],
+        [-5, 6, 17, -18],
+        [-3, 4, 15, -16]] == w.zoneplan()[0]

femagtools/templates/rotor_winding_ks2.mako

@@ -1,44 +0,0 @@
--- Winding (ROTOR_KS2)
-
-Q1 = m.tot_num_sl
-Q2 = ${model['num_slots']}
-m.tot_num_sl      = Q2
-% if model.get('num_slots_gen', 0):
-m.num_sl_gen  =   ${model['num_slots_gen']}
-% else:
-m.num_sl_gen  =   Q2 * m.npols_gen/m.num_poles
-% endif
-
-
-
-m.zeroangl        = ${model.get('zeroangl',0)}
-
-m.mcvkey_yoke = mcvkey_yoke
-
-
-dphi=1e-2
-
-num_wires=1
-dir = {'wi', 'wo'}
-
--- set subregions 'Bar'
-r=da2/2 - m.slot_height/2
-phi=180/Q2+m.zeroangl
-xcoil, ycoil = pd2c(r,phi-dphi)
---delete_sreg(xcoil, ycoil)
---def_new_wdg(xcoil, ycoil, yellow, "Exc", num_wires, 10.0, dir[1])
-def_currdens_se(xcoil, ycoil, 5)
-
-for i=2, m.num_sl_gen do
-  phi=(2*i-1)*180/Q2 + m.zeroangl
-  xcoil, ycoil = pd2c(r,phi)
-  --delete_sreg(xcoil, ycoil)
-  pole_per_encoche = Q2 / m.num_poles
-  pole_num = i // pole_per_encoche
-
-  if pole_num % 2 == 0
-	then def_currdens_se(xcoil, ycoil, 5) --add_to_wdg(xcoil, ycoil, wsamekey, dir[1], 'wser')
-  else
-     def_currdens_se(xcoil, ycoil, -5) --add_to_wdg(xcoil, ycoil, wsamekey, dir[2], 'wser')
-end
-end

femagtools/templates/rotor_winding_ks2_ecSimulation.mako

@@ -1,44 +0,0 @@
--- Winding (ROTOR_KS2)
-
-Q1 = m.tot_num_sl
-Q2 = ${model['num_slots']}
-m.tot_num_sl      = Q2
-% if model.get('num_slots_gen', 0):
-m.num_sl_gen  =   ${model['num_slots_gen']}
-% else:
-m.num_sl_gen  =   Q2 * m.npols_gen/m.num_poles
-% endif
-
-
-
-m.zeroangl        = ${model.get('zeroangl',0)}
-
-m.mcvkey_yoke = mcvkey_yoke
-
-
-dphi=1e-2
-
-num_wires=1
-dir = {'wi', 'wo'}
-
--- set subregions 'Bar'
-r=da2/2 - m.slot_height/2
-phi=180/Q2+m.zeroangl
-xcoil, ycoil = pd2c(r,phi-dphi)
---delete_sreg(xcoil, ycoil)
---def_new_wdg(xcoil, ycoil, yellow, "Exc", num_wires, 10.0, dir[1])
-def_currdens_se(xcoil, ycoil, 5)
-
---for i=2, m.num_sl_gen do
---  phi=(2*i-1)*180/Q2 + m.zeroangl
---  xcoil, ycoil = pd2c(r,phi)
---  --delete_sreg(xcoil, ycoil)
---  pole_per_encoche = Q2 / m.num_poles
---  pole_num = i // pole_per_encoche
-
---  if pole_num % 2 == 0
---	then def_currdens_se(xcoil, ycoil, 5) --add_to_wdg(xcoil, ycoil, wsamekey, dir[1], 'wser')
---  else
---     def_currdens_se(xcoil, ycoil, -5) --add_to_wdg(xcoil, ycoil, wsamekey, dir[2], 'wser')
---end
---end