femagtools 1.8.16__py3-none-any.whl → 1.8.18__py3-none-any.whl

femagtools/plot/nc.py

@@ -37,18 +37,19 @@ def spel(isa, superelements=[], with_axis=False, with_wiredir=False, ax=0):
             # draw wire direction
             if se.subregion and with_wiredir:
                 if se.subregion.curdir != 0:
-                        wkey = se.subregion.winding.key
-                        if se.subregion.curdir < 0:
-                            label = str(se.subregion.curdir*wkey)
-                        else:
-                            label = '+'+str(se.subregion.curdir*wkey)
-
-                        xy = np.array([n.xy
-                            for nc in se.nodechains
-                            for n in nc.nodes])
-                        cx, cy = np.mean(np.unique(xy[:, 0])), np.mean(np.unique(xy[:, -1]))
-                        ax.text(cx, cy, label, rotation=np.arctan2(cy, cx)/np.pi*180-90,
-                                horizontalalignment='center', verticalalignment='center')
+                    wkey = se.subregion.winding.key
+                    if se.subregion.curdir < 0:
+                        label = str(se.subregion.curdir*wkey)
+                    else:
+                        label = '+'+str(se.subregion.curdir*wkey)
+
+                    xy = np.array([n.xy
+                        for nc in se.nodechains
+                        for n in nc.nodes])
+                    cx, cy = (np.mean(np.unique(xy[:, 0])),
+                              np.mean(np.unique(xy[:, -1])))
+                    ax.text(cx, cy, label, rotation=np.arctan2(cy, cx)/np.pi*180-90,
+                            horizontalalignment='center', verticalalignment='center')
         except:
             pass
     ax.autoscale(enable=True)
@@ -86,7 +87,8 @@ def mesh(isa, with_axis=False, ax=0):
 
 
 def _contour(ax, title, elements, values, label='',
-             cmap=DEFAULT_CMAP, isa=None, alpha=1):
+             cmap=DEFAULT_CMAP, isa=None, alpha=1,
+             relminrange=0.05):
     from matplotlib.patches import Polygon
     from matplotlib.collections import PatchCollection
     if ax == 0:
@@ -105,7 +107,15 @@ def _contour(ax, title, elements, values, label='',
     patches = np.array([Polygon(xy) for xy in vertices])[valid_values]
     p = PatchCollection(patches, match_original=False,
                         cmap=cmap, alpha=alpha)
-    p.set_array(np.asarray(values)[valid_values])
+    z = values[valid_values]
+    clim = np.min(z), np.max(z)
+    n = np.max(np.abs(clim))
+    if not np.isclose(n, 0):
+        relrange = (clim[1]-clim[0])/n
+        if relrange < relminrange:  # prevent strange color pattern
+            c = (clim[1]+clim[0])/2
+            p.set_clim([(1-relminrange)*c, (1+relminrange)*c])
+    p.set_array(z)
     ax.add_collection(p)
     cb = plt.colorbar(p, shrink=0.9)
 
@@ -118,7 +128,7 @@ def _contour(ax, title, elements, values, label='',
     ax.axis('off')
 
 
-def demag(isa, cmap=DEFAULT_CMAP, ax=0):
+def demag(isa, cmap=DEFAULT_CMAP, relminrange=0.05, ax=0):
     """plot demag of NC/I7/ISA7 model
     Args:
       isa: Isa7/NC object
@@ -126,11 +136,12 @@ def demag(isa, cmap=DEFAULT_CMAP, ax=0):
     emag = [e for e in isa.elements if e.is_magnet()]
     demag = np.array([e.demagnetization(isa.MAGN_TEMPERATURE) for e in emag])
     _contour(ax, f'Demagnetization at {isa.MAGN_TEMPERATURE} °C (max -{np.max(demag):.1f} kA/m)',
-             emag, demag, '-H / kA/m', cmap, isa)
+             emag, demag, '-H / kA/m', cmap=cmap, isa=isa,
+             relminrange=relminrange)
     logger.info("Max demagnetization %f", np.max(demag))
 
 
-def remanence(isa, cmap=DEFAULT_CMAP, ax=0):
+def remanence(isa, cmap=DEFAULT_CMAP, relminrange=0.05, ax=0):
     """plot remanence of NC/I7/ISA7 model
     Args:
       isa: Isa7/NC object
@@ -139,17 +150,20 @@ def remanence(isa, cmap=DEFAULT_CMAP, ax=0):
     rem = np.linalg.norm([e.remanence(isa.MAGN_TEMPERATURE)
                           for e in emag], axis=1)
     _contour(ax, f'Remanence at {isa.MAGN_TEMPERATURE} °C (min {np.min(rem):.1f} T)',
-             emag, rem, 'T', cmap, isa)
+             emag, rem, 'T', cmap=cmap, isa=isa, relminrange=relminrange)
     logger.info("Min remanence %f", np.min(rem))
 
 
-def demag_pos(isa, pos=-1, icur=-1, ibeta=-1, cmap=DEFAULT_CMAP, ax=0):
+def demag_pos(isa, pos=-1, icur=-1, ibeta=-1, cmap=DEFAULT_CMAP,
+              relminrange=0.05, ax=0):
     """plot demag of NC/I7/ISA7 model at rotor position
     Args:
         isa: Isa7/NC object
         pos: rotor position in degree (maximum h if -1)
         icur: cur amplitude index or last index if -1
         ibeta: beta angle index or last index if -1
+        cmap: colormap
+        relminrange: rel minimum range for colorbar
     """
     emag = [e for e in isa.elements if e.is_magnet()]
     demag = np.array([isa.demagnetization(e, icur, ibeta)[1]
@@ -166,9 +180,12 @@ def demag_pos(isa, pos=-1, icur=-1, ibeta=-1, cmap=DEFAULT_CMAP, ax=0):
     hpol = demag[:, i]
     hmax = np.max(hpol)
     hpol[hpol == 0] = np.nan
-    _contour(ax, f'Demagnetization at pos. {round(x/np.pi*180):.1f}°, '
-    f'{isa.MAGN_TEMPERATURE} °C (max -{hmax:.1f} kA/m)',
-             emag, hpol, '-H / kA/m', cmap, isa)
+    isa.rotate(isa.pos_el_fe_induction[i])
+    _contour(ax, f'Demagnetization at pos. {round(x/np.pi*180, 1):.1f}°, '
+             f'{isa.MAGN_TEMPERATURE} °C (max -{hmax:.1f} kA/m)',
+             emag, hpol, '-H / kA/m', cmap=cmap, isa=isa,
+             relminrange=relminrange)
+    isa.rotate(0)
     logger.info("Max demagnetization %f kA/m", np.nanmax(hpol))
 
 
@@ -185,7 +202,8 @@ def __elements_of_subreg(isa, subreg):
             yield e
 
 
-def flux_density(isa, subreg=[], cmap=DEFAULT_CMAP, ax=0):
+def flux_density(isa, subreg=[], cmap=DEFAULT_CMAP,
+                 relminrange=0.05, ax=0):
     """plot flux density of NC/I7/ISA7 model
 
     Args:
@@ -193,16 +211,18 @@ def flux_density(isa, subreg=[], cmap=DEFAULT_CMAP, ax=0):
         subreg: list of subregion names (all if empty)
         icur: cur index or last index if -1
         ibeta: beta angle index or last index if -1
+        relminrange: rel minimum range for colorbar
     """
     elements = [e for e in __elements_of_subreg(isa, subreg)]
     fluxd = np.array([np.linalg.norm(e.flux_density()) for e in elements])
     _contour(ax, f'Flux Density T (max {np.max(fluxd):.1f} T)',
-             elements, fluxd, '', cmap)
+             elements, fluxd, '', cmap=cmap, relminrange=relminrange)
     logger.info("Max flux dens %f", np.max(fluxd))
 
 
 def flux_density_eccentricity(isa, subreg=[], icur=-1, ibeta=-1,
-                              cmap='plasma_r', ax=0, alpha=0.75):
+                              cmap='plasma_r', ax=0, alpha=0.75,
+                              relminrange=0.05):
     """plot eccentricity (axis ratio) of flux density in lamination
 
     Args:
@@ -210,6 +230,7 @@ def flux_density_eccentricity(isa, subreg=[], icur=-1, ibeta=-1,
         subreg: list of subregion names (all if empty)
         icur: cur amplitude index or last index if -1
         ibeta: beta angle index or last index if -1
+        relminrange: rel minimum range for colorbar
     """
     from ..utils import fft
     elements = []
@@ -248,10 +269,12 @@ def flux_density_eccentricity(isa, subreg=[], icur=-1, ibeta=-1,
                     ecc.append(b/a) #np.sqrt(1-b**2/a**2))
 
     _contour(ax, '', #'Eccentricity of Flux Density',
-                 elements, ecc, 'axis ratio', cmap, alpha=alpha)
+                 elements, ecc, 'axis ratio', cmap=cmap, alpha=alpha,
+                 relminrange=relminrange)
 
 
-def flux_density_pos(isa, ipos, subreg=[], icur=-1, ibeta=-1, cmap=DEFAULT_CMAP, ax=0):
+def flux_density_pos(isa, ipos, subreg=[], icur=-1, ibeta=-1, cmap=DEFAULT_CMAP,
+                     relminrange=0.05, ax=0):
     """plot flux density at rotor pos for each element of NC/I7/ISA7 model
 
     Args:
@@ -259,7 +282,7 @@ def flux_density_pos(isa, ipos, subreg=[], icur=-1, ibeta=-1, cmap=DEFAULT_CMAP,
         ipos: position index
         icur: cur index or last index if -1
         ibeta: beta angle index or last index if -1
-
+        relminrange: rel minimum range for colorbar
     """
     elements = [e for e in __elements_of_subreg(isa, subreg)
                 if e not in isa.airgap_center_elements]
@@ -272,7 +295,7 @@ def flux_density_pos(isa, ipos, subreg=[], icur=-1, ibeta=-1, cmap=DEFAULT_CMAP,
     pos = isa.pos_el_fe_induction[ipos]*180/np.pi
     isa.rotate(isa.pos_el_fe_induction[ipos])
     _contour(ax, f'Flux Density T at {pos:.1f}° (max {np.max(fluxd):.1f} T)',
-             elements, fluxd, '', cmap)
+             elements, fluxd, '', cmap=cmap, relminrange=relminrange)
     logger.info("Max flux dens %f", np.max(fluxd))
     isa.rotate(0)
 
@@ -282,6 +305,9 @@ def airgap_flux_density_pos(isa, ipos, icur=-1, ibeta=-1, ax=0):
 
     Args:
         isa: Isa7/NC object
+        ipos: index of rotor position
+        icur: index of current
+        ibeta: index of beta
     """
     bx = []
     by = []
@@ -300,21 +326,27 @@ def airgap_flux_density_pos(isa, ipos, icur=-1, ibeta=-1, ax=0):
     logger.info("Max flux dens %f", np.max(np.abs(bx)))
 
 
-def loss_density(isa, subreg=[], cmap=DEFAULT_CMAP, ax=0):
+def loss_density(isa, subreg=[], cmap=DEFAULT_CMAP, relminrange=0.05, ax=0):
     """plot loss density of NC/I7/ISA7 model
 
     Args:
         isa: Isa7/NC object
+        subreg: array of subregions (all if empty)
+        cmap: color map
+        relminrange: rel minimum range for colorbar
     """
     elements = [e for e in __elements_of_subreg(isa, subreg)]
     lossd = np.array([e.loss_density*1e-3 for e in elements])
-    _contour(ax, 'Loss Density kW/m³', elements, lossd, '', cmap)
+    _contour(ax, 'Loss Density kW/m³', elements, lossd, '', cmap=cmap,
+             relminrange=relminrange)
+
 
-def temperature_distribution(isa, ax=0, cmap='plasma'):
+def temperature_distribution(isa, ax=0, cmap='plasma', relminrange=0.05):
     """plot temperature distribution of NC/I7/ISA7 model
 
     Args:
         isa: Isa7/NC object
+        relminrange: rel minimum range for colorbar
     """
     temp = []
     elements = [e for e in isa.elements]
@@ -325,7 +357,8 @@ def temperature_distribution(isa, ax=0, cmap='plasma'):
             tmp += n.vpot[-1]
             ctr = ctr + 1
         temp.append(tmp/ctr)
-    _contour(ax, 'Temperature in K', elements, temp, '', cmap)
+    _contour(ax, 'Temperature in K', elements, temp, '', cmap=cmap,
+             relminrange=relminrange)
 
 def punchdist(isa, cmap=DEFAULT_CMAP, ax=0):
     """plot punching border distances of NC/I7/ISA7 model
@@ -334,4 +367,4 @@ def punchdist(isa, cmap=DEFAULT_CMAP, ax=0):
     """
     elam, pdist = isa.punchdist()
     _contour(ax, 'Punching Border Distances / mm)',
-             elam, pdist*1e3, 'mm', cmap, isa)
+             elam, pdist*1e3, 'mm', cmap=cmap, isa=isa)

femagtools/shortcircuit.py

@@ -93,6 +93,7 @@ def shortcircuit(femag, machine, bch, simulation, engine=0):
         builder = femagtools.fsl.Builder(femag.templatedirs)
         fslcmds = (builder.open_model(femag.model) +
                    builder.create_shortcircuit(simulation))
+#                   ['save_model("cont")'])
         fslfile = 'shortcircuit.fsl'
         (pathlib.Path(femag.workdir)/fslfile).write_text(
             '\n'.join(fslcmds),
@@ -140,6 +141,8 @@ def shortcircuit(femag, machine, bch, simulation, engine=0):
             simulation['i1max'] = 5*bch.machine['i1']
         logger.info("2phase short circuit simulation i1max = %.0f",
                     simulation['i1max'])
+        if 'magn_temp' not in simulation:
+            simulation['magn_temp'] = bch.magnet.get('Tmag', 20)
         scdata = shortcircuit_2phase(femag, machine, simulation, engine)
 
     else:
@@ -193,7 +196,7 @@ def shortcircuit_2phase(femag, machine, simulation, engine=0):
     else:
         simulation.update(flux_sim)
         simulation['curvec'] = i1vec.tolist()
-        results = femag(machine, simulation)
+        results = femag(machine, simulation, fslfile='2ph_shortcircuit.fsl')
         class Task:
             def __init__(self, workdir):
                 self.directory = workdir
@@ -362,9 +365,13 @@ def demag(femag, machine, simulation, i1max, phirot, phi, engine=0):
         'phi': phirot,
         'magntemp': simulation['Tmag'],
         'curvec': curvec})
-    _ = femag(machine, simulation)
+    try:
+        del simulation['airgap_induc']
+    except KeyError:
+        pass
+    _ = femag(machine, simulation, fslfile='demag.fsl')
 
-    ptr = np.loadtxt(femag.workdir / "psi-torq-rem.dat")
+    ptr = np.loadtxt(pathlib.Path(femag.workdir) / "psi-torq-rem.dat")
     i1 = np.concat(([0], np.max(ptr[:,1:4], axis=1)))
     rr = np.concat(([1], ptr[:,-1]))
     dmag = {'Hk': simulation['Hk'],

femagtools/utils.py

@@ -24,6 +24,8 @@ def fft(pos, y, pmod=0):
         nypos = ~ypos
         nzc = len(((ypos[:-1] & nypos[1:])
                    | (nypos[:-1] & ypos[1:])).nonzero()[0])
+        if np.isclose(y[0], 0, atol=1e-2):
+            nzc += 1
         negative_periodic = nzc == 0 or nzc % 2 == 1
 
     if negative_periodic:
@@ -36,13 +38,13 @@ def fft(pos, y, pmod=0):
 
     N = len(yx)
     # compute DFT from induction (eliminate DC offset)
-    a0 = np.mean(yx)
+    a0 = float(np.mean(yx))
     Y = np.fft.fft(yx-a0)
 
     # find the peak (amplitude of base harmonic)
     i = np.argmax(np.abs(Y[:N//2]))
 
-    a = 2*np.abs(Y[i])/N
+    a = float(2*np.abs(Y[i])/N)
     freq = np.fft.fftfreq(N, d=360/N)
     nmax = min(18*ntiles, N//2)
     T0 = 0
@@ -51,10 +53,9 @@ def fft(pos, y, pmod=0):
         npoles = 2*int(360/T0)
         nmax = min(9*npoles, N//2)
 
-    alfa0 = np.angle(Y[i])
+    alfa0 = float(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-1.8.16.dist-info → femagtools-1.8.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: femagtools
-Version: 1.8.16
+Version: 1.8.18
 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
@@ -38,7 +38,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
-Requires-Dist: scipy
+Requires-Dist: scipy<=1.14.1
 Requires-Dist: mako
 Requires-Dist: six
 Requires-Dist: lmfit

{femagtools-1.8.16.dist-info → femagtools-1.8.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
-femagtools/__init__.py,sha256=yW5kIvW8xbIRiQDkTT8Is4UgEjOhkX7Vqoytu45rvFc,1601
-femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
+femagtools/__init__.py,sha256=dnFwrc3_Cq8UXFY0_zaoeyPv_i-P_HnEkfOG-6Hwr4U,1601
+femagtools/airgap.py,sha256=ROm4uhZjYiO0CxmFnpgiaNY9x3khlO8LBLmp5Yh5RLk,1973
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
 femagtools/amela.py,sha256=2q-Xsj6i6nQ3iKheBR1vQ4FulJfF1i-L8w3a3U8GYWo,4362
 femagtools/asm.py,sha256=CiL0KWaF4P7O6-VwmGLdva_icwmPrPiI-TFQ19XYTKk,7660
@@ -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=rJ_n1Fvu8RcL-6LTH5o-lvV8pP0kpsqmx6RggsiJMhU,45013
+femagtools/femag.py,sha256=v85KRdG-TAqGXl7QdHZnas8umAovl7gkHfucWfA4BeE,45576
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
 femagtools/fsl.py,sha256=JSalCD21wyYnlwwXeZjUfTca80RnYezrLvDcewlUH-Q,37976
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
@@ -43,40 +43,40 @@ femagtools/opt.py,sha256=wBU0yh3hZlNti_zfIvtKcPg1EJrnE3I1BqmVxLGWixU,8753
 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/shortcircuit.py,sha256=Yt-DqBAqR5r8xcOgECL-vYUYyJgLlgw0UEmfvfhE15o,14601
 femagtools/tks.py,sha256=mDi45S5go9-jwALh6rS9RWPoOFBORZm0-XL4ECjSf_8,7531
 femagtools/ts.py,sha256=yoYjpKrr_0b-tHfsX5azJEBXHUs9PN8P-SMhbjjRhCA,48381
-femagtools/utils.py,sha256=yZYgAKHsvK7QyY2-ijE3gSzXlE3vfuhD5dx7myyw434,1703
+femagtools/utils.py,sha256=G9U-C8ULcdGq9Ix6VEtDZ9dw7hjJHBjG3Otlka4wmU0,1787
 femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
 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
-femagtools/dxfsl/areabuilder.py,sha256=6dfWryYjXzGIVDOsX2zb1VKIhUzmpL43XhF-wtdesAg,35882
+femagtools/dxfsl/area.py,sha256=MRIta_2V5UhJdbKQa4KbyLJi6eTt86xLcPFTN91jlUk,70652
+femagtools/dxfsl/areabuilder.py,sha256=-LqJivzrBEs8g825yMnTI0KJZuAVz075Y_iDag2hteA,36947
 femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
 femagtools/dxfsl/conv.py,sha256=rAG_r2twWtcZyLKe8L8gYcC-n-JMG-dK1iMmd9yviTQ,12237
-femagtools/dxfsl/converter.py,sha256=PQ92kyRIxKWdrlVpNSvIq_Ska-RDMC26RVM1rluPVk0,40826
+femagtools/dxfsl/converter.py,sha256=M9x4IjWRxamCFtLq5sag7-Lxanpn_7pioaBjsp4BudE,41577
 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=gaHBJwqPt7fVz-fyphCb-xppmIFvu72zBpeB18eAvko,27826
+femagtools/dxfsl/fslrenderer.py,sha256=QwfR3i20ossNByfAtM7GyTz5yvcR3vnpL2T3-HOeebk,27855
 femagtools/dxfsl/functions.py,sha256=1RFT2YPR_rTJSKtTqIoO8Z-s_kXKIp95zed83SM0gZg,12784
-femagtools/dxfsl/geom.py,sha256=bUa_5103OdNJTzEexYYPvMs9Kx1BSNbvWL9ekETWmI4,178082
+femagtools/dxfsl/geom.py,sha256=Y32mfz7M4HYQdMwzrvmUyf86kfLZYtRzC6oHgf8LILs,185782
 femagtools/dxfsl/journal.py,sha256=r4z52av3k95MjwzypgUJpj8sSAeQoJsS81Uqs1IBLVw,4265
-femagtools/dxfsl/machine.py,sha256=_GmGQdrH7yCkRdCCdkm4yALHS1Gwof77zJOZbWtgRPo,57990
+femagtools/dxfsl/machine.py,sha256=Dlz7NnHFUyiWq8pZiccCULdTPHLitnPW9xUY0hvVcK4,59131
 femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6R_c,13823
 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=xDY9QSUVL2Y17I4fq-nXsb5uMHCIxnCmGVIiL0fZZYE,7447
+femagtools/dxfsl/symmetry.py,sha256=bGDSZhs6VOS-gp4C9eW0tjyMMec4BVFVZ0NpGXV3H0U,44660
+femagtools/machine/__init__.py,sha256=V1u-O4vsA7K_ZqBINNl-uD9dcoyBkmh4wkH0czrFkMU,7538
 femagtools/machine/afpm.py,sha256=_Ei1FMuoC1GiI0z90qnyuxNrefkmeRdtDZKm20glzNY,40711
-femagtools/machine/effloss.py,sha256=meQ3bsAORtmn1nMEUfJSiu4YsyfDE5PHc-YNaxnstU4,17093
+femagtools/machine/effloss.py,sha256=lR-20LeKGgCW77x5vCzGjT9jXvqKmhf2YwbIeeNzqAI,17341
 femagtools/machine/im.py,sha256=5wYjsEQIiKR62M2M0rA8zmybWQDVjpoazXJPRKyQOvM,40331
-femagtools/machine/pm.py,sha256=hXG71o2TqTxqy-FRy1WoeSOT-KysOGeZlCCnaLfISuE,70026
+femagtools/machine/pm.py,sha256=1ohA-jP1GES-HIzZ-LD0bmK1LxGGGpcgx5I6wm2m1Eo,70511
 femagtools/machine/sizing.py,sha256=QO-k-UALmSPFNf8ajJPDnzKtlbkiAhX1DqWCRLr-H9k,32306
-femagtools/machine/sm.py,sha256=qZfCIbm02ELH-RsenzqvjZuqRZ-U7OXQq85iOfZphwo,40671
+femagtools/machine/sm.py,sha256=pGWWvlm68p8ieNMnGZuyBU5ncfx2Huw7DwRvSyTwHmY,40698
 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
@@ -86,14 +86,14 @@ femagtools/moo/test/AlgorithmTest.py,sha256=KzR1og4bu6NOE61DDKjEMTQdsysmho4LCYmJ
 femagtools/moo/test/PopulationTest.py,sha256=lG9NeWo0xrslfQRa4tgy1Nj23VJMFIlg_vQ9KUBYnRA,5529
 femagtools/moo/test/ProblemTest.py,sha256=r5XEfY4LPscDb35TxxPd0lbP3nUmL6_G6vrRo1I3RSg,505
 femagtools/plot/__init__.py,sha256=LFrHy_9L6FxJqhYND2z1534s3ebPXkfXVagFeNA1wWk,978
-femagtools/plot/bch.py,sha256=EhW_YRgMZU4K1Az_XAK1XGG0JAtrDwmwZ6SHdvPi4-c,34085
-femagtools/plot/char.py,sha256=8eA1sEt-xKAqOZNlB6tx33DNXVsO3N7ius5KcV9lSv4,12771
+femagtools/plot/bch.py,sha256=bd5HygPdwEfGN6QvqzYw20myCCWSbO9xIEImzbt4d6M,34137
+femagtools/plot/char.py,sha256=XTRs25EKIrcQhUe_BQPwkYdaT8rnukPVjMOY5afj-08,12346
 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/machine.py,sha256=fVLOZTc19Ru8eXLdtoTeIYsHRWhGLkn_YVZ6qO6KgrE,2654
 femagtools/plot/mcv.py,sha256=ijZg6KPwZC7sDxEzGEUfVWvDoSEfgcaH-hzQMt7E90I,3671
-femagtools/plot/nc.py,sha256=OWmO8-WF303z5-zeBGkNJ8N09RJvH7sEYgOuK3LJaR8,11630
+femagtools/plot/nc.py,sha256=qNEKgxw9ChImHE1UzntYVJw9vB8-_kbrxiSiP5p_l1w,13080
 femagtools/plot/phasor.py,sha256=5QG1GkXKVksc8P6Q4thKADf6W1l8rDKeArIHFYvbXlw,4858
 femagtools/plot/wdg.py,sha256=uTEtpW_xCXueGnkWx8fTQHruBiayw62AVTXkc9vz9iM,10536
 femagtools/svgfsl/converter.py,sha256=5q4LognshXNTpUWLnU5rtgCfAwZnEuPzqsgyeRYC-VM,3019
@@ -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=PH2IXg9ysi0w8N_8YB0IsE3rRj2VE2AYkGortQxFGfQ,2424
-femagtools-1.8.16.dist-info/licenses/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.8.18.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
@@ -194,7 +194,7 @@ tests/test_isa7.py,sha256=GJhRj2nncrUpNTIlM4jvG4kKZS7cK19hhQg9KbM3b5Q,3001
 tests/test_jhb.py,sha256=aDzwr2ZaXlizrPnlLlcI_IT3OpSxuKu-FzBBkIALEDg,824
 tests/test_job.py,sha256=1tCTPqd2LUeeVNuzC07lsPz4ffr0WAVX_BykyXQ2mZY,981
 tests/test_losscoeffs.py,sha256=3EKmDFRuvn88z_8r0HxKFdB0lNXNnhEgaFshL8BkDjE,2012
-tests/test_machine.py,sha256=BBaeypcFCpGZfJM52_rUIrA3uu17n4_IT1Y05W_caSA,12960
+tests/test_machine.py,sha256=lSAAfi7CXroaj5T7d4szWWMP3f7fLiop8ioXrPO6C-o,12907
 tests/test_magncurv.py,sha256=wPf1dNACZ1BkqKHSqJxiNi6Dq8JP3QCRBY4ql_0YCyU,2608
 tests/test_magnet.py,sha256=BUHG_8SEi4d8j6yV9BSzcpYc2-UVMRFv50P_jgTTXoQ,276
 tests/test_mcv.py,sha256=Vv51WU3WU0AkgcSpyujMdJ2KvSdLNsks5HGtY0pWMOY,4749
@@ -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.16.dist-info/METADATA,sha256=H9y1DOCVUWBJhZgyHDJa1Vqt9r7xHZg9rZUiWXUxEoQ,6213
-femagtools-1.8.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-femagtools-1.8.16.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.8.16.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.8.16.dist-info/RECORD,,
+femagtools-1.8.18.dist-info/METADATA,sha256=U9-02Wrkc6rrxUZbtE0hJcLIL5G885FBxrSfDt0Ng2I,6221
+femagtools-1.8.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+femagtools-1.8.18.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.8.18.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.8.18.dist-info/RECORD,,

tests/test_machine.py

@@ -140,7 +140,6 @@ def test_char_psid_array():
     assert r['beta'][0] == pytest.approx(-38.01, rel=1e-1)
     assert r['cosphi'][0] == pytest.approx(0.788, rel=1e-1)
 
-@pytest.mark.skip(reason="fixit: returns currently 0")
 def test_char_ldd_fieldweakening():
     m = dict(
         p=6,
@@ -169,7 +168,7 @@ def test_char_ldd_fieldweakening():
     assert r['beta'][0] == pytest.approx(-30.0, rel=1e-1)
     assert r['cosphi'][0] == pytest.approx(0.729, rel=1e-1)
 
-@pytest.mark.skip(reason="fixit: returns currently 0")
+@pytest.mark.skip(reason="fixit: returns currently nan")
 def test_i1beta_char():
     m = dict(
         p=4,