femagtools 1.7.5__py3-none-any.whl → 1.7.7__py3-none-any.whl

femagtools/templates/statorRotor3.mako

@@ -34,6 +34,9 @@ m.slot_top_sh = ${model['slot_top_sh']}
 m.zeroangl    = ${model.get('zeroangle',0)}
 m.rlength     = ${model.get('rlength',1)*100}
 
+% if model.get('ac_loss', False):
+  m.ac_loss = ${model.get('ac_loss', 6)}
+% endif
 m.mcvkey_yoke = mcvkey_yoke
 
 pre_models("STATOR_3")
@@ -145,14 +148,14 @@ end
 %endif
 
 %if model.get('thcond', 0) and model.get('thcap', 0):
-
+thcond = ${model.get('thcond', 24)}
+thcap = ${model.get('thcap', 480)}
+density = ${model.get('density', 7700)}
 -- Thermal properties: iron in yoke and tooth
 xst,yst = pd2c(m.inside_diam/2+1,m.zeroangl+0.1)    -- stator tooth
 xsj,ysj = pd2c(m.yoke_diam/2-1,m.zeroangl+0.1)  -- stator yoke
-thcond = 24
-thcap = 480
-def_mat_therm(xst,yst,'darkblue',7700,thcond,thcap,1)
-def_mat_therm(xsj,ysj,'darkblue',7700,thcond,thcap,1)
+def_mat_therm(xst,yst,'darkblue',density,thcond,thcap,1)
+def_mat_therm(xsj,ysj,'darkblue',density,thcond,thcap,1)
 -- insulation
 if m.slot_indul > 0 then
   thickness = 0.25 -- mm

femagtools/windings.py

@@ -262,31 +262,44 @@ class Winding(object):
         """returns the dimensionless magnetomotive force
         (ampere-turns/turns/ampere) and winding angle of phase k (rad)
         Arguments:
-        k: (int) winding key
+        k: (int) winding key (all if 0 or 'all')
         nmax: (int) max order of harmonic (in electrical system)
         """
-        slots = self.slots(k)[0]
-        dirs = self.windings[k]['dir']
-        # turns = self.windings[k]['N']
-        r = len(slots)//len(dirs)
-        curr = np.concatenate([np.array(dirs)*(1 - 2*(n % 2))
-                               for n in range(r)])
-
+        m = len(self.windings)  # number of phases
+        if k in (0, 'all'):
+            keys = self.windings.keys()
+        else:
+            keys = [k]
+        t = femagtools.windings.num_basic_windings(self.Q, self.p, self.l)
+        curr = np.zeros(self.Q//t)
+        for z in self.zoneplan():
+            if z:
+                for j in keys:
+                    a = np.zeros(self.Q//t)
+                    for s in z[j-1]:
+                        d = -1 if s < 0 else 1
+                        a[abs(s)-1] = d*np.cos((j-1)*2*np.pi/m)
+                    toggles = np.sort(np.hstack(
+                        (np.nonzero(a>0), np.nonzero(a<0)))[0])
+                    l = 0
+                    for u in toggles:
+                        if a[l] == 0:
+                            a[l:u] = a[toggles[-1]]
+                        else:
+                            a[l:u] = a[l]
+                        l = u
+                    a[l:] = a[l]
+                    curr += a
         NY = 4096
-        t = np.gcd(self.Q, self.p)
-        y = np.zeros(NY*self.Q//t)
-        for i in range(1, self.Q//t+1):
-            if i in set(slots):
-                y[NY*(i-1)+NY//2] = np.sum(curr[slots == i])
-        yy = [np.sum(y[:i+1]) for i in range(0, len(y))]
-        yy[:NY//2] = yy[-NY//2:]
-        yy = np.tile(yy-np.mean(yy), t)
+        y = [[c]*NY for c in curr]
+        yy = np.tile(np.hstack(
+            (y[-1][-NY//2:], np.ravel(y[:-1]), y[-1][:-NY//2])), t)
         yy /= np.max(yy)
 
         # calc spectrum
+        pb = self.p//t
         N = len(yy)
         Y = np.fft.fft(yy)
-        pb = self.p//t
         if self.q < 1:
             imax = pb
         else:
@@ -305,7 +318,7 @@ class Winding(object):
                 2*np.abs(Y)/N) if f > 0]).T
 
         return dict(
-            pos=[i*taus/NY for i in range(len(y))],
+            pos=[i*taus/NY for i in range(NY*self.Q//t)],
             mmf=yy[:NY*self.Q//t].tolist(),
             alfa0=-alfa0/self.p,
             nue=nue.tolist(),

{femagtools-1.7.5.dist-info → femagtools-1.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.7.5
+Version: 1.7.7
 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.7.5.dist-info → femagtools-1.7.7.dist-info}/RECORD

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=z_m3ZYsmxn72xMFMzy-WxDxEWeieBELwuwUF3kzJssE,1600
+femagtools/__init__.py,sha256=RUddQSC2XLDQ3qyyCbKuSFOSWVCY9Pf07TYeocqb9wU,1600
 femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
 femagtools/amela.py,sha256=pHjfXzpANI-7oz8MtrqNcyDZ6PxVM91vCJuvYhHy1rk,13891
 femagtools/asm.py,sha256=CiL0KWaF4P7O6-VwmGLdva_icwmPrPiI-TFQ19XYTKk,7660
-femagtools/bch.py,sha256=FYpQsbCaJB6GJHwUto4aCq94Yz1DtYAbaj7l-gGjmY4,73716
+femagtools/bch.py,sha256=l-0j7HsKSQxTjwhjJbwDgrnNcQ3ITw1vYroSDbgx_Ec,73962
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
 femagtools/condor.py,sha256=J8z9iBdvrGu3I1eFNoyKV8AXzRoTEPGLSak6cXUQxAM,10766
 femagtools/conductor.py,sha256=rXO7c7Qh_s7JpgILmLd4IbG64vP6Eh143YF9u25Mdwg,1076
@@ -15,30 +15,30 @@ femagtools/dakotaout.py,sha256=6nn0PXsB40mPKiQLenqAtHy0KXCO7kvqqQ-aD2JhQvw,5573
 femagtools/docker.py,sha256=XDVmLBB0z4sZZpcrx7Wbm84xl4ksj7aqn5-ZOPxdxm4,7460
 femagtools/ecloss.py,sha256=gaZ8JmlFVoP6IYe79YXPXvZSULm8IZr6bPBdKuyKaIo,12832
 femagtools/erg.py,sha256=IXKq76P9qLt_ssNOP78v8Qizk3J2Zg80yaKDSjzwoJE,1224
-femagtools/femag.py,sha256=RUkjvkHe5gBElawh4-cbwueplXA5Tjvnu28CPVw6f74,44123
+femagtools/femag.py,sha256=5l1T4-oZ-5U_h2v1disLmQR5wxuHDW3SF6_qrZZShIY,44155
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
-femagtools/fsl.py,sha256=htSzZkguxDsVvIBXi6VK3YRqUbYAlQ_R4jLRfcOmIzw,33872
+femagtools/fsl.py,sha256=-dN5owgRz72MWlezegoKDDPvG8y-EhZW13qIbxyXpm8,35106
 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=HnD_NZ5-Oj98kw8e3o3tdHt07kfEL-d0N6KmqkoeTeU,58332
+femagtools/isa7.py,sha256=d5AcAmvjSipC7SJ8eAaRcPC0rbEuIxHNAk9JdrVU3yQ,58355
 femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
 femagtools/job.py,sha256=dOatzr10nIda76CjVRSS0SfEWC8_BAw0kowli523qbY,11320
 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=bv6U2wBnJejTA8zHQD-hSZETkEZr4UF73gbPLmtsaRI,16328
+femagtools/model.py,sha256=J6AJS9DHUb3gnp1d9QakOL2E6WgpnCIqsAOU5xieH9M,17307
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
 femagtools/multiproc.py,sha256=7mJF-VU1NrJkENyg8eHtDrDRNBwLPK43phZv3ehm9BU,8435
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
-femagtools/nc.py,sha256=6O3lWuX2SX8IuVM0rr55L2UywrI1MmXzJOgUtUmcg4A,14532
+femagtools/nc.py,sha256=9S9AXNj909A7qQiJFe6jFTXYzh4_yZpkeXj6IiohtJo,14684
 femagtools/netlist.py,sha256=CSCl8setLZ_L8DCnNWaNA3-wLe1yo-fmzARZoVvYfaA,2052
 femagtools/ntib.py,sha256=76g1ZO3Fq_kN-HTMBvaKvJmMMlJMyEPFeNAcJPq3w7Y,3099
-femagtools/opt.py,sha256=snQlPNT5hksCgj0TBjFBhSCERMHHGMv1xc4uFSxptfQ,8687
+femagtools/opt.py,sha256=wBU0yh3hZlNti_zfIvtKcPg1EJrnE3I1BqmVxLGWixU,8753
 femagtools/parstudy.py,sha256=IkWffdFLhLACSvqJ6_ho4Pi4RC6AapLThoktVTXnVJE,19461
 femagtools/poc.py,sha256=wMwOxMhPLFRiGPMsKQwWWuGr6UZPzRBajhfVMfXptNU,6794
 femagtools/tks.py,sha256=xStMu6P1xsc36tS53FKnbL6i2ZTVnCNXyTVw8_gjepo,7436
@@ -46,51 +46,51 @@ 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=-PDqzatXJUaMTR4hI1bbY__AAb3fjwfjiS9FEuR-8N8,22305
+femagtools/windings.py,sha256=Y2LGsr4QKBH_-HkMTB7zGMxrHHQVROOX2zpBSSk2DFY,22846
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
-femagtools/dxfsl/area.py,sha256=VTRYoIRDFM0bp5nWZF3_DtyUNA86ZwtD4eYfb3mnGY4,56618
+femagtools/dxfsl/area.py,sha256=Y7qNteasOB54hzo-QkDlHdjcym74FKJVdUrKaCFy23I,60813
 femagtools/dxfsl/areabuilder.py,sha256=Siu11yRcNJiSCWwc865-OvuVhSmLtRQWysbe1-rUcN0,34197
 femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
-femagtools/dxfsl/conv.py,sha256=GeRYUvbdcP5vKtNm5S5gU1yyMboGkGNyOqzkHpYbEEo,10086
-femagtools/dxfsl/converter.py,sha256=BRIzgg15gqnO-FJ6maVJ1YI3i-elY6Dwbs_-dNTiL94,32412
+femagtools/dxfsl/conv.py,sha256=Z_jf4OTxikr-SoUuBew_wrEj32qcGPyEp7VMtkRJx9M,10747
+femagtools/dxfsl/converter.py,sha256=47_AaZNCEXLpwwj17i7mef-QD7P_jusKaYYMfyMASow,33654
 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=PBy3KUlNIqItcxCFnWC-d3OrSrsNFj5vDLLGZW2oq3Q,25081
-femagtools/dxfsl/functions.py,sha256=F0AjzHfIfq3v-mhDzUOeq3zeYQCEsJl1-XpEyJQsSnQ,11805
-femagtools/dxfsl/geom.py,sha256=-yIlxM1Mb93qdqTYwNYgs-RUI0-9qf9MB7f58q-bKFw,166805
+femagtools/dxfsl/fslrenderer.py,sha256=R_XSTSu0Cetj0UfPcRmdVQz0uY9ouI9Nhhf1HpLh2eE,27376
+femagtools/dxfsl/functions.py,sha256=teJHtVxoViGs66AB8_4BxRrFQx9SbPT2azIrKyhJHOc,12005
+femagtools/dxfsl/geom.py,sha256=75fbgCBNldGnQObFhft9muN-7MuSTK9dWHgFH16aRNA,171186
 femagtools/dxfsl/journal.py,sha256=S17B7wsrq5QzIUbjgg0ntvnpgH0thHq9aQXO7GdYlQQ,4265
-femagtools/dxfsl/machine.py,sha256=3leWkjdMCLX2HgMhw8gNdxTKROhNCKU7KQrDVbBQ8DI,49337
+femagtools/dxfsl/machine.py,sha256=NoUtAg-li3djMHg0jMqNoFp-aupSlrM_yrQ9kM4ip28,50222
 femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6R_c,13823
 femagtools/dxfsl/shape.py,sha256=ZmWw7VTSJs5rcY1Lh99MKo804mO7dSGHdKMIh-nVBow,59904
 femagtools/dxfsl/svgparser.py,sha256=R8V2V5jE6JyVfzshJVaPgsSuMlQf_pwJTFvrTrKDxZ0,2905
 femagtools/dxfsl/symmetry.py,sha256=0WeDq_z42A_cjG4m_vREDWyx-wqHqXDkoCT2eXh2EMo,38084
 femagtools/machine/__init__.py,sha256=U8W65K7jr7jDdC1KnJh0WjYd8DFaLnIFVvlh-TKcV94,7174
 femagtools/machine/afpm.py,sha256=hNyDFRLGmCuWRPZl_u1ztJ4pA-Y_mxLaVvg3UJkzRuE,24766
-femagtools/machine/effloss.py,sha256=sLB8AXYVAE_AL1Ca41A2EDbn9_7u6xNjaYFjmRPoTDg,13578
+femagtools/machine/effloss.py,sha256=GV_bc5f1ysBi1Ng7FR3fD1xh5KXa6ACc55iWfsltMBI,13663
 femagtools/machine/im.py,sha256=3Y54AHMZfAjkvgexx2E-5jxNWzaVQ-SyaETCh7gNBYA,38008
-femagtools/machine/pm.py,sha256=njWa9YRV2W80xqjT9Dj9Jro73Y3zJtg0HYdJ75Ye0Vk,61720
+femagtools/machine/pm.py,sha256=iAi2iVk5REPB51Tz_mLrItofFBVQ2ZWzDsqlsu08ldM,68129
 femagtools/machine/sizing.py,sha256=nWCfxbyWfbw5-7xu0qZ6zjWNquEPn3fUH-fQeGb6QUc,24307
-femagtools/machine/sm.py,sha256=G4fHmZngQSRN9Dum7mHaf36b_CvD-u_AQogIFixlnys,37899
-femagtools/machine/utils.py,sha256=zi659wCszhXEioKXtRdeyQik2etRFGpoykqfOGiLtTo,21223
+femagtools/machine/sm.py,sha256=Lb1urOMl-RoPFqxaMb9fN-aHqlNsMyUWabhn1O2jlos,38807
+femagtools/machine/utils.py,sha256=37_Z8aYlS1peKsk_d1df8_yn9RNCvTdkMJ0k2Yt9XfA,20856
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
-femagtools/moo/algorithm.py,sha256=lNEf0Bur4yFpIJeLtAC3oIus8sOMWTb7jepFlD28YzE,5445
+femagtools/moo/algorithm.py,sha256=e-Cgp2rp_hG9DXqWqluzQGNIWvCfthUgLD8O-aVPofA,5763
 femagtools/moo/population.py,sha256=qGEsm-2Ys_pTkVQv3Zv36HzOlqUxtMvM6NqY_KytsUE,10060
 femagtools/moo/problem.py,sha256=McIGKAXK97Jygumns0qmFeYxTG6KDRSQj2aENeC9F9A,2391
 femagtools/moo/test/AlgorithmTest.py,sha256=KzR1og4bu6NOE61DDKjEMTQdsysmho4LCYmJ6WZoILo,2535
 femagtools/moo/test/PopulationTest.py,sha256=lG9NeWo0xrslfQRa4tgy1Nj23VJMFIlg_vQ9KUBYnRA,5529
 femagtools/moo/test/ProblemTest.py,sha256=r5XEfY4LPscDb35TxxPd0lbP3nUmL6_G6vrRo1I3RSg,505
 femagtools/plot/__init__.py,sha256=dD_wvo6sGc8jvJYD1b0Z7oxCE4O9uQ3Igb5DeAjZDWU,939
-femagtools/plot/bch.py,sha256=4f9Q-JZtj9WMjxFUXMXNaSdWdDXN_Be4-F9kOU45xns,28525
-femagtools/plot/char.py,sha256=iDvrKp_Hz10W7qLjWCtYajKjY01fZbwf_kITDGisPaY,12123
+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/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/nc.py,sha256=yq-uYppAEUePbo1SAaBKNKla3cyqdLh5z9ArhtwPYZY,9548
+femagtools/plot/nc.py,sha256=Un1F9V_M8tkvQpXjqDoUiRi8jvsriGYNl04GrAhHCmI,10392
 femagtools/plot/phasor.py,sha256=5QG1GkXKVksc8P6Q4thKADf6W1l8rDKeArIHFYvbXlw,4858
-femagtools/plot/wdg.py,sha256=UooR1K8JDoVjKWEox_AfkBY40L87jk2L9OdIFz4O-OY,8462
+femagtools/plot/wdg.py,sha256=U0IoQ1WW0N_C-jeAU7gr4sLqPa_W7CsjgtGCo1M03uo,8866
 femagtools/svgfsl/converter.py,sha256=ZwHOugB-LwIKDz27tjKWiA_dMA4JOL1FWWXPs812uwc,2748
 femagtools/templates/FE-losses.mako,sha256=Rql5_8Q6_uthpr-uFXMUo7tdHehfZYND-7M-ohJXVU8,874
 femagtools/templates/afm_rotor.mako,sha256=fY-dlZvRLN9UAy5V6Q_inWghkSUe8pzrCYjJdNgfNXs,3112
@@ -111,7 +111,8 @@ 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_winding.mako,sha256=yRe00f1L4_UuEOVwBkbEOL6rgG8NY43Jbpdud1nw4oo,3834
+femagtools/templates/gen_hairpin_winding.mako,sha256=U8ZBe49WoRyUivcFgoJpwFRhQKlBQJthhCGVSf9emgY,5871
+femagtools/templates/gen_winding.mako,sha256=WN2YZKPltS4pKwZxyHlfZzmk7MatTmftL__3-cKxN8s,3830
 femagtools/templates/inductances.mako,sha256=OpcW3E7LW09J8eoXylzfq2R16LKKxzJDr0PGCdHzixM,560
 femagtools/templates/ld_lq_fast.mako,sha256=BEQoplL7Ojqg5caldzAhMLKL-3E78wCSSbz5-KkDk2o,1359
 femagtools/templates/leak_dist_wind.mako,sha256=vs8fpxcM203kL8BVNuR8BKSmMsQM6U1_vTtYXZIfdSc,600
@@ -119,7 +120,7 @@ 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=p82wk149GZR8wprkeefXpH7AOThA3hZ-TgtKWw4bwFw,2268
+femagtools/templates/magnetIron.mako,sha256=m1uXJni0dPhjYUtbEJAT9vtWoYkw1GeuIz-E9X1A6UU,3070
 femagtools/templates/magnetIron2.mako,sha256=ZK1F0oon1Go3-942D4ci9kq9938KHpHlQdKyJZpH09c,1426
 femagtools/templates/magnetIron3.mako,sha256=d62XtiW1Vtb6pjt4A-8paficft3NUOUzjQem_1sd7xs,2315
 femagtools/templates/magnetIron4.mako,sha256=qZ8coX7Am8bjXKiolD2Vjq2MGlScHbyBL6kh7ImvGww,1413
@@ -129,7 +130,7 @@ femagtools/templates/magnetSector.mako,sha256=db_i1jNJ4TONkBIEKVIWVRZkEJWPwO_r4M
 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=QFutdFUnz5lMpjRT9cN0w6EPShccYJfz4yuMqNYoZ1Y,3425
+femagtools/templates/mesh-airgap.mako,sha256=9fESevBQJSIf0uCWJIRqhZaj-2-HEjR3nJl-YfKebPo,3685
 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
@@ -148,7 +149,7 @@ femagtools/templates/rot_hsm.mako,sha256=eh50TbpWNUALK9_7wOOJ7KPewHos7JExAfMACbP
 femagtools/templates/rotorAsyn.mako,sha256=r_gce0oic24nPdI7BmERM1sokXpC5vvm8Sm0TIPb2zI,2280
 femagtools/templates/rotorKs2.mako,sha256=PtWyvW71gObgWIUnnqS9VnMX1oCfxw_sF9eAwUzeAyQ,1908
 femagtools/templates/rotor_msh.mako,sha256=50nep93hyVFG-KOJujPnJpCaIrIsG9VL71Zy8WGuxa0,1910
-femagtools/templates/rotor_winding.mako,sha256=k0NPigo8WbgQccsXFSqUxfMjD5CkG4QrMZQ0K0kkHFk,753
+femagtools/templates/rotor_winding.mako,sha256=rK5CBX4AJ1_SS5vL02_xVLmlWDlU2fosw4pLTlDFLlk,866
 femagtools/templates/shortcircuit.mako,sha256=Mr1zRtF_Y2QZ1qpTn8_-PASYrTFRYWpByhDzdWx87ys,1981
 femagtools/templates/srm.mako,sha256=NneriEFv1wurQCGBI2xozzF2pTzlzS8pEPqtKm0SASQ,2077
 femagtools/templates/stator1.mako,sha256=1sf0lzLXsjwiBNk3OGLwlio3GUVFogfxqEwaySVO6cs,761
@@ -157,7 +158,7 @@ femagtools/templates/stator3Linear.mako,sha256=pNe3C1wT0W2C0qePo3sEyebW1z_dpTuJz
 femagtools/templates/stator4.mako,sha256=Jq8pfIuOmmpyGOL1z2aQZfbwMS5-Zyn6OGJ51LCBVKs,1179
 femagtools/templates/statorBG.mako,sha256=fh0cVOZVWyLojlGxWJoFz2pvdL6Yxy4xzhY-Joc2xeg,893
 femagtools/templates/statorRing.mako,sha256=sDgDmk71EoE8d4e9cmyqKqRldfC8uKMmpHEjXJGIt_k,2071
-femagtools/templates/statorRotor3.mako,sha256=MrU_JCSH8tJEUH09fftJJslkbEeIwOB1WGBSxXqUqeI,4942
+femagtools/templates/statorRotor3.mako,sha256=ynN1GG9rKvAWAPV-vgOImCDzBlkO_UY9ix8uQ7HUKTI,5117
 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
@@ -201,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=PerbhIvIeyTuHZbBCORUy9EINKEhVoyN6vshtsrs1xA,4912
+tests/test_windings.py,sha256=QThZrGiG49yrLK6p2SlLbd05FSwI1yB1bQiKjwdXhh8,4911
 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
@@ -212,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.5.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
-femagtools-1.7.5.dist-info/METADATA,sha256=IK9wuI7T0Bxd3Vo1nyzRSRZ1rKqncHaJwlAP57Uk5Tg,6156
-femagtools-1.7.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-femagtools-1.7.5.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.7.5.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.7.5.dist-info/RECORD,,
+femagtools-1.7.7.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.7.7.dist-info/METADATA,sha256=Y2Ok4pRFh_Cksnk-qCvcDvKgAK7jG_uchtA1lPY6ylg,6156
+femagtools-1.7.7.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+femagtools-1.7.7.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.7.7.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.7.7.dist-info/RECORD,,

{femagtools-1.7.5.dist-info → femagtools-1.7.7.dist-info}/WHEEL

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

tests/test_windings.py

@@ -61,7 +61,7 @@ def test_slots(wdg):
 
 
 def test_axis(wdg):
-    assert round(wdg.axis(), 3) == 0.349
+    assert round(wdg.axis(), 3) == 0.32
 
 
 def test_winding_factor(wdg):