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

femagtools/__init__.py

@@ -2,7 +2,7 @@
 
 """
 __title__ = 'femagtools'
-__version__ = '1.8.14'
+__version__ = '1.8.15'
 __author__ = 'Ronald Tanner'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2023-2025 Gamma Technology'

femagtools/bch.py

@@ -420,6 +420,11 @@ class Reader:
             self.windings[w[0]]['N'].append(w[2])
             self.windings[w[0]]['R'].append(w[3]/1e3)
             self.windings[w[0]]['PHI'].append(w[4])
+        # check if external rotor
+        if hasattr(self, "machine"): 
+            if "fc_radius" in self.machine:
+                if np.mean(self.windings[1]["R"]) < self.machine["fc_radius"]:
+                    self.external_rotor = True
 
     def __read_winding_factors(self, content):
         "read winding factors section"
@@ -1202,10 +1207,7 @@ class Reader:
         m = []
         subregs = [name.split()[-1]
                    for name in content[2].split('\t') if name][2:]
-        # outer rotor motor
-        if 'Iron' in subregs and \
-            'Rotor' in subregs:
-            self.external_rotor = True
+
         logger.info("Stator Subregions: %s", subregs)
         speed = float(content[0].split()[-1])/60.
         logger.info('losses for speed %f', speed)

femagtools/femag.py

@@ -153,7 +153,7 @@ class BaseFemag(object):
         dest = dir if dir else self.workdir
         if isinstance(feloss, (int, float)):
             try:
-                feloss = {1: 'jordan', 11: 'bertotti'}[int(feloss)]
+                feloss = {1: 'jordan', 2: "steinmetz", 10:"modified steinmetz", 11: 'bertotti'}[int(feloss)]
             except KeyError:
                 feloss = ''
         return [self.magnetizingCurves.writefile(m[0], dest,
@@ -188,6 +188,11 @@ class BaseFemag(object):
             recsin = simulation.get('recsin', '')
             feloss = simulation.get('calc_fe_loss', '')
         self.copy_magnetizing_curves(self.model, recsin=recsin, feloss=feloss)
+
+        if feloss and \
+            int(feloss) in (1, 2):
+            simulation["calc_fe_loss"] = 1
+
         try:
             if 'wdgdef' in self.model.winding:
                 self.model.winding['wdgfile'] = self.create_wdg_def(

femagtools/machine/afpm.py

@@ -213,6 +213,9 @@ def parident(workdir, engine, temp, machine,
     if np.isscalar(machine['magnet'][slotmodel]['rel_magn_width']):
         num_slices = kwargs.get('num_slices', 3)
         rmagw = num_slices*[machine['magnet'][slotmodel]['rel_magn_width']]
+    elif len(machine['magnet'][slotmodel]['rel_magn_width']) == 1: 
+            num_slices = kwargs.get('num_slices', 3)
+            rmagw = num_slices*machine['magnet'][slotmodel]['rel_magn_width']
     else:
         rmagw = machine['magnet'][slotmodel]['rel_magn_width']
         num_slices = len(rmagw)
@@ -543,13 +546,18 @@ def process(lfe, pole_width, machine, bch):
         nsegx = machine['magnet'].get('num_segments', 1)
         if type(nsegx) == int:
             nsegx = [nsegx]*len(bch)
+        elif len(nsegx) == 1 and len(nsegx) < len(bch): 
+            nsegx = nsegx*len(bch)
+        else: 
+            pass 
         for nx, b in zip(nsegx, bch):
             pm = b['losses'][0]['magnet_data']
             magloss = ecloss.MagnLoss(magnet_data=[pm])
             ml = magloss.calc_losses_ialh2(nsegx=nx)
-            b['losses'][-1][k] = ml[0]
+            b["losses"][-1].update({k: ml[0]})
     else:
         k = 'magnetJ'
+
     if len(pole_width) > 1:
         maglosses = _integrate1d(radius, scale_factor*np.array(
             [b['losses'][-1][k]/lz
@@ -1025,7 +1033,9 @@ class AFPM:
                     machine['magnet'][slotmodel]['rel_magn_width'])
         if np.isscalar(machine['magnet'][slotmodel]['rel_magn_width']):
             rmagw = num_slices*[machine['magnet'][slotmodel]['rel_magn_width']]
-        else:
+        elif len(machine['magnet'][slotmodel]['rel_magn_width']) == 1: 
+                rmagw = num_slices*machine['magnet'][slotmodel]['rel_magn_width']
+        else: 
             rmagw = machine['magnet'][slotmodel]['rel_magn_width']
             num_slices = len(rmagw)
 

femagtools/machine/effloss.py

@@ -370,7 +370,7 @@ def efficiency_losses_map(eecpars, u1, T, temp, n, npoints=(60, 40),
         plfe1 = m.kpfe*m.iqd_plfe1(*iqd, f1)
         plfe2 = m.kpfe*m.iqd_plfe2(*iqd, f1)
         plmag = np.zeros_like(plfe2)
-        plcu1 = m.iqd_plcu1(iqd[0], iqd[1], 2*np.pi*f1)
+        plcu1 = m.iqd_plcu1(iqd[0], iqd[1], f1)
         try:
             plcu1_dc = m.iqd_plcu1(iqd[0], iqd[1],
                                 np.array([0.0 for i in f1])).tolist()

femagtools/plot/wdg.py

@@ -7,6 +7,7 @@
 """
 import numpy as np
 import matplotlib.pyplot as plt
+import logging
 
 
 def currdist(wdg, title='', k='all', phi=0, ax=0):
@@ -81,13 +82,13 @@ def mmf_fft(f, title='', mmfmin=1e-2, ax=0):
         pass
 
 
-def zoneplan(wdg, write_title=True, max_slots=0, ax=0):
+def zoneplan(wdg, write_title=True, ax=0, max_slots=0):
     """plot zone plan of winding wdg"""
     from matplotlib.patches import Rectangle
     upper, lower = wdg.zoneplan()
     Qb = len([n for l in upper for n in l])
     if max_slots:
-        Qb = max_slots
+        Qb = min(max_slots, Qb)
     from femagtools.windings import coil_color
     h = 0.5
     w = 1
@@ -171,7 +172,7 @@ def winding_factors(wdg, n=8, ax=0):
         pass
 
 
-def winding(wdg, ax=0):
+def winding(wdg, ax=0, max_slots=0):
     """plot coils of windings wdg"""
     from matplotlib.patches import Rectangle
     from matplotlib.lines import Line2D
@@ -186,12 +187,16 @@ def winding(wdg, ax=0):
     if ax == 0:
         ax = plt.gca()
     z = wdg.zoneplan()
+    z0 = z[0] if len(z[0]) >= len(z[1]) else z[1]
+    Qb = sum([len(l) for l in z0])
+    if max_slots:
+        Qb = min(max_slots, Qb)
     xoff = 0
     if z[-1]:
         xoff = 0.75
     yd = dslot*wdg.yd
     mh = 2*coil_height/yd
-    slots = sorted([abs(n) for m in z[0] for n in m])
+    slots = sorted([abs(n) for m in z[0] for n in m])[:Qb]
     smax = slots[-1]*dslot
     for n in slots:  # draw slots and lamination
         x = n*dslot
@@ -204,6 +209,15 @@ def winding(wdg, ax=0):
                 backgroundcolor="white",
                 bbox=dict(boxstyle='circle,pad=0', fc="white", lw=0))
 
+    # colors in slots
+    csl = [['']*(Qb+1), ['']*(Qb+1)]
+    for i, layer in enumerate(z):
+        for m, mslots in enumerate(layer):
+            for k in mslots:
+                if abs(k) > Qb:
+                    continue
+                csl[i][abs(k)-1] = coil_color[m]
+
     nl = 2 if z[1] else 1
     line_thickness = [0.6, 1.2]
     for i, layer in enumerate(z):
@@ -213,8 +227,9 @@ def winding(wdg, ax=0):
         d = 1
         for m, mslots in enumerate(layer):
             for k in mslots:
+                if abs(k) > Qb:
+                    continue
                 x = abs(k) * dslot + b
-                kcoil = (abs(k)-1)//wdg.yd
                 xpoints = []
                 ypoints = []
                 if nl == 2:
@@ -224,6 +239,12 @@ def winding(wdg, ax=0):
                         d = 1 if i == 1 else 0
                 else:
                     d = 0 if k > 0 else 1
+                    if abs(k) > 1:
+                        if csl[0][abs(k)-2] == coil_color[m]:
+                            d = 1
+                            csl[0][abs(k)-1] = ''
+                        else:
+                            d = 0
 
                 if direction[d] == 'right':
                     # first layer, positive dir or neg. dir and 2-layers:

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.14.dist-info → femagtools-1.8.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: femagtools
-Version: 1.8.14
+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: Copyright (c) 2016-2023, Semafor Informatik & Energie AG, Basel

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

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=gJcP88c10j1_CgFqstAAzR2NxPFwt_-dkoYUz5i2-yk,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=TC1DKNHuYS9QQNVdBdM1QiMmF6qlT3RnRA4uDMa270c,75623
+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,7 +15,7 @@ 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=ejagYsOG9CJDcJQvldq3v3NcZ0OdMC5aipZenc-5MI4,44868
+femagtools/femag.py,sha256=rJ_n1Fvu8RcL-6LTH5o-lvV8pP0kpsqmx6RggsiJMhU,45013
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
 femagtools/fsl.py,sha256=AWyc7mIgUL2tjqw_kmK22y-gZXhTzOccyhjJLwCqKcg,37736
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
@@ -49,7 +49,7 @@ femagtools/ts.py,sha256=yoYjpKrr_0b-tHfsX5azJEBXHUs9PN8P-SMhbjjRhCA,48381
 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
@@ -71,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=xDY9QSUVL2Y17I4fq-nXsb5uMHCIxnCmGVIiL0fZZYE,7447
-femagtools/machine/afpm.py,sha256=ZkYk-acfmwV2ebhU8BUE6dKYkDrCR8UKp1plxEdZ4v8,40223
-femagtools/machine/effloss.py,sha256=vDFKscFTWuW2ro4DRfNdmehQRhMBvqUG7iTm3YaARi8,16431
+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
@@ -95,7 +95,7 @@ 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=cfDlO11vWovz2muPLg9X2rgeHD9Ihaz8PRiz63MRr88,819
 femagtools/templates/afm_rotor.mako,sha256=4yoEA4fOq9FRcwxOMRw1oX4Bs_jcrtyHOY6kHPYJ5MY,3175
@@ -172,7 +172,7 @@ femagtools/templates/stator_msh.mako,sha256=Neze1ielMCk7TrARyhOra91fFQVT8Phsgk2O
 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.14.dist-info/licenses/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+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
@@ -211,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
@@ -222,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.14.dist-info/METADATA,sha256=BrabUwTwkjyUIeeY3Ln1RIyfy1FQefxu8EgDckCsobA,6213
-femagtools-1.8.14.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-femagtools-1.8.14.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.8.14.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.8.14.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.14.dist-info → femagtools-1.8.15.dist-info}/WHEEL

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

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]