femagtools 1.8.1__py3-none-any.whl → 1.8.2__py3-none-any.whl

femagtools/machine/sizing.py

@@ -1,6 +1,6 @@
 """general design of an AC electrical machine
 
-   Types: spm, ipm, eesm, im
+   Types: spm, ipm, eesm, im, afpm
 
 """
 import numpy as np
@@ -10,6 +10,25 @@ from .utils import wdg_resistance
 
 logger = logging.getLogger("femagools.machine.sizing")
 
+AFPM_DEFAULTS = dict(
+    airgap=2e-3,
+    kd=0.7,  # ratio of inner vs outer diameter 0.6 .. 0.8
+    eta=0.92,  # efficiency
+    cos_phi=0.95,  # power factor
+    m=3,  # number of phases
+    ui_u=0.8,  # U ind / U
+    J=8.5e6,  # current density  A/mm²
+    sigmas=40e3,  # shear force 30 .. 65 kN/m2
+    Ba=0.7,  # flux density in airgap
+    Bth=1.5,  # flux density in teeth 1.5 .. 2 T
+    By=1.2,  # flux density in yoke 1.2 .. 1.5 T
+    kq=0.6,  # stator winding fill factor 0.35 .. 0.75
+    mag_width=0.95,  # rel magnet width 0.6 .. 1
+    Hc=700,  # max. coercitive field strength, 500 .. 900 kA/m
+    brem=1.2,  # remanence 0.3 .. 1.3 T
+    demag=6  # safety factor for demagnetisation (nom current)
+)
+"""default sizing parameters for AFPM"""
 
 PM_DEFAULTS = dict(
     airgap=1.5e-3,  # airgap width m
@@ -217,7 +236,7 @@ def _stator_slots(par, slots):
          # check sim factor, height/width ratio
         if qhbmin[1] == len(q)-1:
             # last has smallest sim factor
-             return q[qhbmin[1]][0]
+            return q[qhbmin[1]][0]
         elif q[qhbmin[1]][2] < q[qhbmin[1]+1][2]:
             # select ideal height/width ratio (3.2)
             return q[qhbmin[1]][0]
@@ -270,7 +289,7 @@ def get_stator_dimensions(par, slots=[]):
     Ui_U = par['ui_u']
 
     # design parameters
-    # AJ = papyr['AJ'] # 100*1e9 # thermal load, typically 100 .. 300 A²/mm³
+    # AJ = par['AJ'] # 100*1e9 # thermal load, typically 100 .. 300 A²/mm³
     J = par['J']   # current density 3 .. 6 A/mm²
     Ba = par['Ba']     # airgap flux density, typically 0.6 .. 1.5 T
     kq = par['kq']      # winding fill factor, typically 0.35 .. 0.75
@@ -431,15 +450,13 @@ def get_stator_dimensions(par, slots=[]):
 
     return r
 
-
 def _get_magnet_height(I1, N, kw, par):
     airgap = par['airgap']
     Ba = par['Ba']
     p = par['p']
     m = par['m']
 
-    Hc = par['Hc']
-    Hc = Hc*1e3  # unit kA/m
+    Hc = par['Hc']*1e3  # unit kA/m -> A/m
     # Safety Factor for demagnetization
     demag = par['demag']
     THETA1 = m/np.pi*np.sqrt(2)*I1*N*kw/p
@@ -648,6 +665,10 @@ def _set_defaults(par, defaults):
             par[k] = defaults[k]
 
 
+def _set_afpm_defaults(par):
+    _set_defaults(par, AFPM_DEFAULTS)
+
+
 def _set_pm_defaults(par):
     _set_defaults(par, PM_DEFAULTS)
 
@@ -708,6 +729,163 @@ def spm(pnom: float, speed: float, p: int, **kwargs) -> dict:
     return r
 
 
+def afpm(pnom: float, speed: float, p: int, afmtype: str, **kwargs) -> dict:
+    """returns dimension of a AFPM machine
+
+    Args:
+    pnom: power at rated speed (W)
+    speed: rotation speed (1/s)
+    p: number of pole pairs
+    afmtype: one of 'S1R1', 'S2R1', 'S1R2'
+
+    udc: (optional) DC link voltage (V)
+    u1: (optional)  phase voltage (Vrms)
+    Q1: (optional) total number of stator slots
+    brem: (optional) remanence of magnet (T)
+    """
+    par = dict(
+        pnom=pnom, speed=speed, p=p)
+    par.update(kwargs)
+    _set_afpm_defaults(par)
+
+    kp = 1 if afmtype == 'S1R1' else 2
+    kps = 1 if afmtype in ('S1R1', 'S1R2') else 2
+    kpr = 2 if afmtype == 'S1R2' else 1
+    kd = par['kd']  # ratio of inner_diam/outer_diam
+    tnom = pnom/(2*np.pi*speed)
+    sigmas = par['sigmas']  # shear force
+    # outer diameter:
+    # https://web.mit.edu/kirtley/binlustuff/literature/electric%20machine/designOfAxialFluxPMM.pdf
+    Do = 2*np.power(tnom/(kp*sigmas*np.pi*kd*(1-kd**2)), 1/3)
+    Di = Do*kd
+    # pole width and iron length
+    Davg = (Do+Di)/2
+    taup = np.pi * Davg/(2*p)
+    lfe = (Do-Di)/2
+    # flux density in airgap
+    Bd1 = 4.0/np.pi*par['Ba']*np.sin(np.pi/2.0*par['mag_width'])
+
+    # rated phase voltage
+    if 'udc' in par:
+        u1nom = 0.9*par['udc']/np.sqrt(2)/np.sqrt(3)
+    else:
+        u1nom = par['u1']
+    f1 = speed*p
+    # flux linkage
+    psi1 = kpr*2.0/np.pi*taup*lfe*Bd1
+
+    # winding factor
+    Q1 = par['Q1']
+    m = par['m']
+    yd = par.get('coil_span', 0)
+    if yd:
+        wdg = Winding({'Q': par['Q1'], 'p': par['p'], 'm': 3,
+                       'yd': yd, 'l': 2})
+    else:
+        wdg = Winding({'Q': par['Q1'], 'p': par['p'], 'm': 3, 'l': 2})
+
+    kw = wdg.kw()
+
+    Ui = par['ui_u'] * u1nom
+    N = np.sqrt(2)*Ui/(2*np.pi*f1*kw*psi1)
+
+    # feasible number of turns per coil...
+    layers = wdg.l
+    # coils per phase (kps: number of stators)
+    ncoils = kps*Q1 // 2 // m * layers
+    ngroups = [1] + [g for g in range(2, layers*p + 1) if layers * p % g == 0]
+    ndiff = [abs(N - ncoils // a * a * round(N / ncoils))
+             for a in ngroups]
+    logger.debug("N %f ngroups %s ndiffs %s", N, ngroups, ndiff)
+    # parallel groups
+    a_calc = ngroups[np.argmin(ndiff)]
+    a = par.get("a", a_calc)
+    if a not in ngroups:
+        logger.warning("Check given number %s of parallel wdg groups. Valid ngroups are: %s",
+                       a, ngroups)
+    # num wires per coil side (number of coil groups a)
+    num_wires = round(a * N / ncoils)
+
+    # correction of number of turns per phase
+    N_old = N
+    N = num_wires * ncoils / a
+
+    # correction of voltage
+    Ui = Ui/N_old*N
+    u1nom = Ui/par['ui_u']
+
+    # current loading
+    # A = np.sqrt(2)*sigmas/kw/Ba
+    I1 = pnom/(m*par['eta']*par['cos_phi']*u1nom)
+    A = 2*m*N*I1/np.pi/Di
+    # slot area
+    # J = AJ/A
+    hs1 = 1e-3  # slot opening height
+    taus = np.pi/Q1
+    ans = taus*Di*A/(par['kq']*par['J'])
+    bds = taus*(Di+2*hs1)*Bd1/par['Bth']
+    bns = taus*(Di+2*hs1) - bds
+
+    hns = (-bns + np.sqrt(bns**2 + 4*ans*np.tan(taus)))/2/np.tan(taus)/kps
+    hys = psi1/lfe/par['By']/kps
+
+    aw = ans * par['kq'] / layers / num_wires * kps
+
+    r = {'outer_diam': Do, 'inner_diam': Di, 'airgap': par['airgap']/kp,
+         'afmtype': afmtype, 'lfe': lfe,
+         'poles': 2*p,
+         'ans': round(ans, 6),
+         'hns': round(hns, 4),
+         'bns': round(bns, 4),
+         'A': round(A, 3),
+         'AJ': round(par['J']*A, 0),
+         'w1': int(N),
+         'kw': round(kw, 4),
+         'ess': round(1e-3*pnom/(60*speed)/(Do**2*lfe), 4),
+         'q': wdg.q,
+         'i1': round(I1, 3),  # np.pi*Da1*A/2/m/N
+         'psi1': round(psi1, 5),
+         'u1': u1nom,
+         'ui': Ui}
+    hs1 = 0
+    hs2 = 0
+    r['stator'] = dict(
+        u1nom=round(u1nom, 1), f1nom=round(f1, 1),
+        num_slots=Q1,
+        nodedist=1,
+        # num_slots_gen = req_poles*Q1/2/p,
+        afm_stator=dict(
+            slot_width=r['bns'],
+            slot_height=hs1+r['hns'],
+            slot_h1=hs1,
+            slot_h2=hs1,
+            slot_open_width=r['bns'],
+            slot_r1=0,
+            slot_r2=0,  # bns2/2,
+            yoke_height=round(hys, 4) if kpr == 1 else 0))
+
+    relculen = 1.4
+    r['winding'] = dict(
+        #wire_diam=round(dwire, 5),
+        num_phases=m,
+        cufilfact=par['kq'],
+        culength=relculen,
+        num_par_wdgs=a,
+        num_layers=layers,
+        #resistance=round(r1, 4),
+        coil_span=wdg.yd,
+        num_wires=int(num_wires))
+
+    hm = _get_magnet_height(r['i1'], r['w1'], r['kw'], par)/kpr
+    r['magnet'] = dict(
+        afm_rotor=dict(
+            yoke_height=round(hys/kpr, 4) if kps == 1 else 0,
+            rel_magn_width=par['mag_width'],
+            magn_height=round(hm, 4))
+    )
+    return r
+
+
 def ipm(pnom: float, speed: float, p: int, **kwargs) -> dict:
     """returns dimension of a IPM machine
 
@@ -808,11 +986,11 @@ def eesm(pnom: float, speed: float, p: int, **kwargs) -> dict:
 
 
 if __name__ == "__main__":
-
-    pnom = 10e3
-    speed = 4400/60
-    p = 4
-    udc = 600
+    # sizing example with SPM
+    pnom = 10e3  # shaft power in W
+    speed = 4400/60  # speed in 1/s
+    p = 4  # number of pole pairs
+    udc = 600  # DC voltage in V
 
     r = spm(pnom, speed, p, udc=udc)
 

femagtools/machine/utils.py

@@ -449,8 +449,8 @@ def dqparident(workdir, engine, temp, machine,
     leakfile.unlink(missing_ok=True)
 
     period_frac = kwargs.get('period_frac', 6)
-    if machine.get('external_rotor', False):
-        period_frac = 1  # TODO: missing femag support
+    if machine.get('external_rotor', False) and period_frac > 1:
+        logger.warning("period frac for external rotor requires GT femag version >= 2024")
 
     if dqtype == 'ldq':
         simulation = dict(

femagtools/mcv.py

@@ -335,9 +335,8 @@ class Mcv(object):
             self.setData(data)
 
             self.mc1_curves = len(self.curve)
-            if self.mc1_type == MAGCRV and self.mc1_curves > 1:
-                self.mc1_type = ORIENT_CRV
-            if self.mc1_type in (ORIENT_CRV, ORIENT_PM_CRV):
+            if (self.mc1_type in (ORIENT_CRV, ORIENT_PM_CRV)
+                or self.mc1_curves > 1):
                 self.version_mc_curve = self.ORIENTED_VERSION_MC_CURVE
             elif self.mc1_type == DEMCRV_BR:
                 self.version_mc_curve = self.PARAMETER_PM_CURVE

femagtools/model.py

@@ -136,14 +136,15 @@ class MachineModel(Model):
         name = 'DRAFT'
         if isinstance(parameters, str):
             name = parameters
+            self.connect_full = False  # no matter
         else:
             if 'name' in parameters:
                 name = parameters['name']
             if 'windings' in parameters:
                 self.winding = self.windings
 
-        # connect model even for complete model (see fsl connect_models)
-        self.connect_full = True
+            # connect model even for complete model (see fsl connect_models)
+            self.connect_full = parameters.get('afmtype', '') == ''
         # must sanitize name to prevent femag complaints
         self.name = ''.join([n
                              for n in name.strip()
@@ -410,7 +411,7 @@ class MachineModel(Model):
             missing += m
             names += n
         if missing:
-            raise MCerror("MC pars missing: {}".format(
+            raise MCerror("Material properties missing: {}".format(
                 ', '.join(set(missing))))
         return set(names)
 

femagtools/parstudy.py

@@ -325,7 +325,7 @@ class ParameterStudy(object):
                                 shutil.copy(ff, repdir)
                         calcid += 1
                     if isinstance(r, dict) and 'error' in r:
-                        logger.warn("job %d failed: %s", k, r['error'])
+                        logger.warning("job %d failed: %s", k, r['error'])
                         if objective_vars:
                             f.append([float('nan')]*len(objective_vars))
                         else:

femagtools/plot/nc.py

@@ -14,7 +14,7 @@ DEFAULT_CMAP='viridis'
 """default colormap (see https://matplotlib.org/stable/users/explain/colors/colormaps.html)"""
 
 
-def spel(isa, superelements=[], with_axis=False, ax=0):
+def spel(isa, superelements=[], with_axis=False, with_wiredir=False, ax=0):
     """plot super elements of I7/ISA7 model
     Args:
       isa: Isa7 object
@@ -35,7 +35,7 @@ def spel(isa, superelements=[], with_axis=False, ax=0):
                             color=isa.color[se.color], lw=0))
         try:
             # draw wire direction
-            if se.subregion:
+            if se.subregion and with_wiredir:
                 if se.subregion.curdir != 0:
                         wkey = se.subregion.winding.key
                         if se.subregion.curdir < 0:

{femagtools-1.8.1.dist-info → femagtools-1.8.2.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-femagtools/__init__.py,sha256=8qBE3W14xsW2ubtd47GQKlMz2Q3iiSOKk2UAcacUMJI,1600
+femagtools/__init__.py,sha256=kRVLeU7jCmB8MUrNUdzChKl4fzai9F9XlN-SHUMQXTo,1600
 femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
 femagtools/amela.py,sha256=RFTuQ5EcX19G2YJchnktr6j62mNptrdTreShQDOeuKA,13874
@@ -17,7 +17,7 @@ femagtools/ecloss.py,sha256=kTsE9Lx6nt6Ez9PBfD58hPMcnH2PxSc95zJaYMCQd5Q,33957
 femagtools/erg.py,sha256=IXKq76P9qLt_ssNOP78v8Qizk3J2Zg80yaKDSjzwoJE,1224
 femagtools/femag.py,sha256=m8mfMjzjkL_R-iqyInxM7y7F4jgKg6ZI7FfTQlbxtng,46988
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
-femagtools/fsl.py,sha256=XktbwR4KvUVv-Fq_9FMPbigBvrHYfSdL6P0kcwAx5Mg,36929
+femagtools/fsl.py,sha256=PU4t8wBvtVckv4f8ozg5_exxspuToW0W0O95jZZ5IU4,36924
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
 femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
@@ -29,9 +29,9 @@ femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
 femagtools/job.py,sha256=sIRVXsyoupfRXqGsWyOHMetcKlWIyggxfVURjM8aD54,11322
 femagtools/losscoeffs.py,sha256=Nil2fvkkS6-T29OnHIsdVbegCHyl23iZg8rMVbbA5wY,6785
 femagtools/magnet.py,sha256=Nuk060bT4Wa3lX74HdefqTTtUxLaERDSBYTTpbi6KP4,1093
-femagtools/mcv.py,sha256=jZrlWHvTlHzHFjk0zr2aGkHtE5ahuzhDE-SVtey6xnQ,40554
+femagtools/mcv.py,sha256=CAv-8bRm9aQJR5LVVXuLGGw1id_uu0m-fMiPMYX9Z-o,40488
 femagtools/me.py,sha256=z6RJkvSbgMmorCQTxKvq44uIYKh82uYYExjkNePJCmE,1813
-femagtools/model.py,sha256=sqv2qdcL3MHv_6hcwsAtO03UHbteRipY60BcaHGGfcU,17863
+femagtools/model.py,sha256=dk9x-iqRzgOTdTCeU_ynUZGb1bt4FvU1ZGMPXytMbUg,17965
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
 femagtools/multiproc.py,sha256=7mJF-VU1NrJkENyg8eHtDrDRNBwLPK43phZv3ehm9BU,8435
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
@@ -39,7 +39,7 @@ femagtools/nc.py,sha256=bAj3iurE9WaovoCi76ry2aJZJ6rC1zO6xWrfsSD6lrc,15160
 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=IkWffdFLhLACSvqJ6_ho4Pi4RC6AapLThoktVTXnVJE,19461
+femagtools/parstudy.py,sha256=OXAqRGSvOZHNZTx_bXSgXpKv_ABB6zHOU-dJLJjrhBI,19464
 femagtools/poc.py,sha256=wMwOxMhPLFRiGPMsKQwWWuGr6UZPzRBajhfVMfXptNU,6794
 femagtools/tks.py,sha256=xStMu6P1xsc36tS53FKnbL6i2ZTVnCNXyTVw8_gjepo,7436
 femagtools/ts.py,sha256=x9aCMVASjdBZuyI2pJGMyi1dveGFd_pWQ20cZ-l_moc,47216
@@ -48,32 +48,32 @@ femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
 femagtools/windings.py,sha256=OYoEFIQci3f3sYJkcyRjBpBpDRtX2Y2aHZiRXOEgsls,23497
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
-femagtools/dxfsl/area.py,sha256=d991y_mLGapilCQyp3ZK6mXbUeXEt-nAkJWJ5P0yxXo,65227
-femagtools/dxfsl/areabuilder.py,sha256=Siu11yRcNJiSCWwc865-OvuVhSmLtRQWysbe1-rUcN0,34197
+femagtools/dxfsl/area.py,sha256=C0mPWeer2kleh3x5GHibMSjegEjfmEZHTHTB9WVHIPg,67005
+femagtools/dxfsl/areabuilder.py,sha256=6dfWryYjXzGIVDOsX2zb1VKIhUzmpL43XhF-wtdesAg,35882
 femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
 femagtools/dxfsl/conv.py,sha256=-d03mQiDWF_MD4T0TIH7k-zNa6p7w9rtc6QE2Bz1Q7s,10362
-femagtools/dxfsl/converter.py,sha256=8Bm3JQaK6IwZBil6n5avaydd7Nkvj8tRNGbqWU4EHU8,35525
+femagtools/dxfsl/converter.py,sha256=YXesbeqHbwtr97xPMJTNSsxe_kVJycJQfrKrIQVoJQw,36425
 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=v2z6GJPuuI0FDxHENw_Oteejz5GZzgc5nr0fjffH3q8,27904
+femagtools/dxfsl/fslrenderer.py,sha256=d2a_HXml2CqS8FkmSbFXsUtOLIfSI14C4qGQd0Xj-c4,27961
 femagtools/dxfsl/functions.py,sha256=teJHtVxoViGs66AB8_4BxRrFQx9SbPT2azIrKyhJHOc,12005
-femagtools/dxfsl/geom.py,sha256=Q0pxdT3qtUs7lg3RmJ-_7RhlnM9n9_xE_LRjJeNpf4E,174555
+femagtools/dxfsl/geom.py,sha256=CuaW4aa0Xb3dTYX_HSHpMxqOXGztT35_ISHh0Dj-FJE,173525
 femagtools/dxfsl/journal.py,sha256=4LMSW5wCYlETzid6SIF8b5DH-DCgtH4nFx-xIxjtbfg,4265
-femagtools/dxfsl/machine.py,sha256=vaELJixMKrjJTOe5QNb5aXVG17vN0KbMQaI1arNzYd0,50580
+femagtools/dxfsl/machine.py,sha256=8KG0jIcK7vYFTXqIwYNOecGaYgvhZ9UjrRHJQZ9kjHE,56514
 femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6R_c,13823
-femagtools/dxfsl/shape.py,sha256=kz68mPsK1m5jRnE-5iNS3FX2IkpSHOe0X3OdEklGR80,59970
-femagtools/dxfsl/svgparser.py,sha256=FE8Jk3pV6e4AtJlrJuUxz89_JZC9buS0wwTBsX52O1g,3762
-femagtools/dxfsl/symmetry.py,sha256=0WeDq_z42A_cjG4m_vREDWyx-wqHqXDkoCT2eXh2EMo,38084
-femagtools/machine/__init__.py,sha256=U8W65K7jr7jDdC1KnJh0WjYd8DFaLnIFVvlh-TKcV94,7174
-femagtools/machine/afpm.py,sha256=3hJTmQxeYDyfTelr_sMEFOB6CsTIFTqmnNH3SfiZQzU,24956
+femagtools/dxfsl/shape.py,sha256=-hUphAYwhja_6FyWHjUbBlNSPh6tWZCKYdz7aDplqWk,61566
+femagtools/dxfsl/svgparser.py,sha256=RY2TU9MK6gOaNmI6w6RNqcw7H9YGmK-NUwvdylKBcsE,3763
+femagtools/dxfsl/symmetry.py,sha256=DPZ-y-UjEshNlOdC90kGhpAitsIwrvCN6gZeNGp5DJU,41120
+femagtools/machine/__init__.py,sha256=B7yeRZzf29NWCWy8C8iJFdTr9bszAoMRcVEpblhCeg4,7256
+femagtools/machine/afpm.py,sha256=wMyfdGDaBAt6knDSzw04Oxy_oDuBCEi06f6WaKZoRGw,25918
 femagtools/machine/effloss.py,sha256=GV_bc5f1ysBi1Ng7FR3fD1xh5KXa6ACc55iWfsltMBI,13663
 femagtools/machine/im.py,sha256=3Y54AHMZfAjkvgexx2E-5jxNWzaVQ-SyaETCh7gNBYA,38008
 femagtools/machine/pm.py,sha256=C4vDdPIsIRUKtzY3b1RNT1v37p1uP3pMUduftNejcPc,68129
-femagtools/machine/sizing.py,sha256=nWCfxbyWfbw5-7xu0qZ6zjWNquEPn3fUH-fQeGb6QUc,24307
+femagtools/machine/sizing.py,sha256=YhsT5Iki7_zW1BBKB1dD_q6qHI-kvjb3_68881Q71LU,30039
 femagtools/machine/sm.py,sha256=Y6g4KPm-2bhzMYjGarojokEzaNgOmFR2G4DIKBtVQOs,39210
-femagtools/machine/utils.py,sha256=CRTY5qwlaN_Zp5SZgxicXTfZyVU5fjtm4XKEA-peNCc,20856
+femagtools/machine/utils.py,sha256=VswrQuGB_uGE4cYWIQSXLSEVJKrmSwNJdGlme7RPEno,20912
 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
@@ -88,7 +88,7 @@ femagtools/plot/fieldlines.py,sha256=_7ykKhnQLeS4fz34pnzovH1gIhcUSKJ3gl1GUgWYix8
 femagtools/plot/fluxdens.py,sha256=NlexRJ3f_8CgKoWrV82ZIsAXPrLhwj98uOe8_fUks7A,1082
 femagtools/plot/forcedens.py,sha256=Vloi9czy7qbGXI-Vm7Cow6IfHTsFhCLI1YWduFOR55c,4075
 femagtools/plot/mcv.py,sha256=ijZg6KPwZC7sDxEzGEUfVWvDoSEfgcaH-hzQMt7E90I,3671
-femagtools/plot/nc.py,sha256=S_Rb0ax4O0pFVzcL4JctwfXl6-uQFHUJwoeQMftibJM,10839
+femagtools/plot/nc.py,sha256=kfTifzAMReQZu4UmbHZo1caAK0n7N51lkPj7BU7l1lU,10876
 femagtools/plot/phasor.py,sha256=5QG1GkXKVksc8P6Q4thKADf6W1l8rDKeArIHFYvbXlw,4858
 femagtools/plot/wdg.py,sha256=Orw2XGThHpOuJ_raSRnQTzj5tOmwllNWweByoOXbA7I,9820
 femagtools/svgfsl/converter.py,sha256=5q4LognshXNTpUWLnU5rtgCfAwZnEuPzqsgyeRYC-VM,3019
@@ -188,7 +188,7 @@ tests/test_losscoeffs.py,sha256=3EKmDFRuvn88z_8r0HxKFdB0lNXNnhEgaFshL8BkDjE,2012
 tests/test_machine.py,sha256=Woha6nfKaYQCxxoG57sUztpnpU6K9imXwn9B_KMhanw,12906
 tests/test_magncurv.py,sha256=wPf1dNACZ1BkqKHSqJxiNi6Dq8JP3QCRBY4ql_0YCyU,2608
 tests/test_magnet.py,sha256=BUHG_8SEi4d8j6yV9BSzcpYc2-UVMRFv50P_jgTTXoQ,276
-tests/test_mcv.py,sha256=BdFdCkBL_tM88G2z_hbLsVlOaq7T83flS4m8YYLLPnc,4574
+tests/test_mcv.py,sha256=cPgijMjDxSt1CwN6syE4r4WWAlUSruZDQsTK_oNhfg4,4570
 tests/test_mcvreader.py,sha256=3cgq22b_iaWLrs4WWOUNHqJREnv0YoFivNpAb4teEJs,2118
 tests/test_me.py,sha256=En00OrOhZclBO4u74q5Os0FgVP4TGFLzz99LF0QHXHA,196
 tests/test_model.py,sha256=kYjjFgZPIex3foX3skiOdD5MCcmA2JP7oDDuE9txv_U,2698
@@ -213,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.8.1.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
-femagtools-1.8.1.dist-info/METADATA,sha256=vMKM0Pd8bfajkKv7bXpXco4_dmISFQXGJKQRtQDb9xE,6198
-femagtools-1.8.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-femagtools-1.8.1.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.8.1.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.8.1.dist-info/RECORD,,
+femagtools-1.8.2.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.8.2.dist-info/METADATA,sha256=yH0fPdMTzP_mojxKfekWdoGkrj_tvA0WrEpRVt_XYlc,6198
+femagtools-1.8.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+femagtools-1.8.2.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.8.2.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.8.2.dist-info/RECORD,,

tests/test_mcv.py

@@ -33,7 +33,7 @@ def test_write_mcv_orient_crv(tmpdir):
     mcvr = femagtools.mcv.Reader()
     mcvr.readMcv(filename+ext)
     assert mcvr['version_mc_curve'] == 1
-    assert mcvr['ctype'] == femagtools.mcv.ORIENT_CRV
+    assert mcvr['ctype'] == femagtools.mcv.MAGCRV
     assert mcvr['curve'][0]['bi'] == pytest.approx(B, 1e-3)
     assert mcvr['curve'][0]['hi'] == pytest.approx(H, 1e-3)
     assert mcvr['curve'][1]['bi'] == pytest.approx(B, 1e-3)