femagtools 1.7.1__tar.gz → 1.7.3__tar.gz

{femagtools-1.7.1/src/femagtools.egg-info → femagtools-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.7.1
+Version: 1.7.3
 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.1 → femagtools-1.7.3}/src/femagtools/__init__.py

@@ -2,7 +2,7 @@
 
 """
 __title__ = 'femagtools'
-__version__ = '1.7.1'
+__version__ = '1.7.3'
 __author__ = 'Ronald Tanner'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2023-2024 Gamma Technology'

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/bch.py

@@ -70,7 +70,7 @@ def sttylosses(losses):
         except KeyError:
             pass
         return d
-
+    
     if sregs == {'StYoke', 'StTeeth'}:
         return hysteddy('StYoke', 'StTeeth', losses)
     if sregs == {'StJo', 'StZa'}:
@@ -95,6 +95,22 @@ def sttylosses(losses):
         return l
     return {}
 
+def losses_mapping_external_rotor(losses): 
+    styoke = 'rotor'
+    rotor = 'Iron'    
+    d = {}
+    try:
+        d['styoke'] = losses[styoke]
+        d['styoke_hyst'] = losses[styoke+'_hyst']
+        d['rotor_hyst'] = losses[rotor+'_hyst']
+        d['styoke_eddy'] = losses[styoke+'_eddy']
+        d['rotor_eddy'] = losses[rotor+'_eddy']
+        d['styoke_excess'] = losses[styoke+'_excess']
+        d['rotor_excess'] = losses[rotor+'_excess']
+    except KeyError:
+        pass
+    return d
+
 
 def _readSections(f):
     """return list of bch sections
@@ -1150,6 +1166,10 @@ 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)
@@ -1209,7 +1229,10 @@ class Reader:
                                          (nrows, ncols)).T.tolist()
                            for k, v in zip(cols, m[2:])})
         ls['speed'] = speed
-        ls.update(sttylosses(ls))
+        if self.external_rotor: 
+            ls.update(losses_mapping_external_rotor(ls))
+        else: 
+            ls.update(sttylosses(ls))
         if self.ldq:
             self.ldq['losses'] = ls
         elif self.psidq:
@@ -1464,6 +1487,10 @@ class Reader:
     def __read_losses(self, content):
         losses = {}
         i = 0
+        # check if external rotor 
+        if self.weights[0][1] == 0.0 and \
+            self.weights[0][-1] > 0: 
+            self.external_rotor = True
         # find results for angle:
         while True:
             try:
@@ -1521,8 +1548,12 @@ class Reader:
                     losses['total'] += losses['staza']+losses['stajo']
                 elif len(rec) == 1:
                     t = l.split(':')[-1].strip()
-                    if t == 'Iron':
-                        losses['staza'] = floatnan(rec[0])
+                    if t == 'Iron': 
+                        if self.external_rotor: 
+                            losses['rotfe'] = floatnan(rec[0])
+                            losses['total'] += losses['rotfe']
+                        else:
+                            losses['staza'] = floatnan(rec[0])
                     else:
                         losses['stajo'] += floatnan(rec[0])
                     losses['total'] += losses['staza']+losses['stajo']
@@ -1530,11 +1561,17 @@ class Reader:
                 continue
 
             if _rotloss.search(l):
+                if l.find('StZa') > -1: 
+                    self.external_rotor = True
                 rec = self.__findNums(content[i+2])
                 if len(rec) == 1:
-                    rotfe = floatnan(rec[0])
-                    losses['rotfe'] += rotfe
-                    losses['total'] += rotfe
+                    if self.external_rotor: 
+                        losses['staza'] = floatnan(rec[0])
+                        losses['total'] += losses['staza']
+                    else: 
+                        rotfe = floatnan(rec[0])
+                        losses['rotfe'] += rotfe
+                        losses['total'] += rotfe
                 i += 3
                 continue
 
@@ -1565,6 +1602,10 @@ class Reader:
                     if content[i+1].split() == ['rotf', '----']:
                         losses['rotfe'] = sum([floatnan(x) for x in rec])
                         losses['total'] += losses['rotfe']
+                    
+                    if content[i+1].split() == ['Iron', '----']: # external rotor
+                        losses['rotfe'] = sum([floatnan(x) for x in rec])
+                        losses['total'] += losses['rotfe']
                 i += 4
                 continue
 
@@ -1622,7 +1663,10 @@ class Reader:
                     l.find('RoZa') > -1:
                 k = 'staza'
             elif l.find('Iron') > -1 and l.find('Stator') > -1:
-                k = 'staza'
+                if self.external_rotor:
+                    k = 'rotor'
+                else:
+                    k = 'staza'
             elif l.find('Iron') > -1:
                 if self.external_rotor:
                     k = 'staza'

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/dxfsl/converter.py

@@ -643,7 +643,8 @@ def convert(dxfile,
             params['agndst'] = agndst(params.get('da1'),
                                       params.get('da2'),
                                       params.get('tot_num_slot'),
-                                      params.get('num_poles'), 1)
+                                      params.get('num_poles'),
+                                      params.get('nodedist'))
 
             if params['external_rotor']:
                 conv['fsl_magnet'] = outer

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/dxfsl/fslrenderer.py

@@ -35,6 +35,7 @@ def agndst(da1, da2, Q, p, nodedist=1):
         num_nodes = [i*lcm for i in range(nmin, nmax) if i*lcm%6==0]
         dagset = [2*np.pi/p/i for i in num_nodes]
         i = max(np.argmin(np.abs(np.array(dagset) - np.arctan2(ag, r))), 1)
+        # nodedist 0.5, 2, 4, 6
     nd = min(round(nodedist), i)
     try:
         logger.info("Num nodes/p %d Num nodes/slot %g nodedist %g",
@@ -550,7 +551,7 @@ class FslRenderer(object):
                     'ndt(agndst)',
                     'r1 = m.fc_radius - ag/6',
                     'x1, y1 = pr2c(r1, alfa)',
-                    'n = math.floor(r1*alfa/agndst + 1.5)',
+                    'n = math.floor(m.fc_radius*alfa/agndst + 1.5)',
                     'nc_circle_m(r1, 0, x1, y1, 0.0, 0.0, n)\n',
                     'r2 = m.fc_radius + ag/6',
                     'x2, y2 = pr2c(r2, alfa)',

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/fsl.py

@@ -352,7 +352,7 @@ class Builder:
                     '-- thermal properties in airgap',
                     'ag_cond = 0.063',
                     'thcap = 1007',
-                    'beta = np.pi*m.npols_gen/m.num_poles + m.zeroangl/180*np.pi',
+                    'beta = math.pi*m.npols_gen/m.num_poles + m.zeroangl/180*math.pi',
                     'xai, yai = pr2c((da1+da2)/4, beta)',
                     'def_mat_therm(xai,yai,"cyan",1.19,ag_cond,thcap,1)',
                     'xai, yai = pr2c((da1+da2)/4-ag/4, beta)',
@@ -540,7 +540,7 @@ class Builder:
                                model.get('bore_diam') - 2*ag,
                                model.stator.get('num_slots'),
                                model.get('poles'),
-                               model.stator.get('nodedist') or 1.0))
+                               model.dxffile.get('nodedist')))
 
                 logger.info(" num poles %d num slots %d outer diameter %.4f m",
                             model.poles, model.stator['num_slots'],
@@ -553,14 +553,17 @@ class Builder:
                 self.prepare_diameter(model)
                 if self.fsl_stator and model.get('num_agnodes', 0) == 0:
                     from femagtools.dxfsl.fslrenderer import agndst
-                    ag = model.get('airgap')
-                    model.set_value(
-                        'agndst',
-                        agndst(model.get('bore_diam'),
-                               model.get('bore_diam') - 2*ag,
-                               model.stator.get('num_slots'),
-                               model.get('poles'),
-                               model.stator.get('nodedist') or 1.0))
+                    if model.get('agndst'): 
+                        pass
+                    else: 
+                        ag = model.get('airgap')
+                        model.set_value(
+                            'agndst',
+                            agndst(model.get('bore_diam'),
+                                model.get('bore_diam') - 2*ag,
+                                model.stator.get('num_slots'),
+                                model.get('poles'),
+                                model.stator.get('nodedist') or 1.0))
 
                 model.set_num_slots_gen()
             if hasattr(model, 'magnet'):

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/machine/pm.py

@@ -569,10 +569,9 @@ class PmRelMachine(object):
             if abs(du) > 0.1:
                 logger.debug('oops? iqd_imax_umax one more torque reduction')
                 if with_tmech:
-                    iq, id = self.iqd_tmech(torque, w1/2/np.pi/self.p,
-                                            iq, id)[:2]
+                    iq, id = self.iqd_tmech_umax(torque, w1, u1max)[:2]
                 else:
-                    iq, id = self.iqd_torque(torque)[:2]
+                    iq, id = self.iqd_torque_umax(torque, w1, u1max)[:2]
         if with_mtpv:
             try:
                 if with_tmech:
@@ -779,7 +778,7 @@ class PmRelMachine(object):
                                           maxtorque=T > 0)[:2])
                     w, _, ier, _ = so.fsolve(voltw1, wx, full_output=True)
                     logger.debug("fsolve ier %d T %f w %f w1 %f", ier, T, w, wx)
-                    if ier in (1, 4, 5):
+                    if ier == 1: #in (1, 4, 5):
                         if abs(w[0]) <= wx:
                             self.check_extrapolation = True
                             return [w/2/np.pi/self.p
@@ -788,6 +787,8 @@ class PmRelMachine(object):
                             wl += (wu-wl)/4
                         else:
                             wl = w[0]
+                    else:
+                        break
                 except ValueError as e:
                     logger.debug("%s: wx %f wl %f wu %f", e, wx, wl, wu)
                     wl = wx

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/machine/sizing.py

@@ -5,6 +5,8 @@
 """
 import numpy as np
 import logging
+from ..windings import Winding
+from .utils import wdg_resistance
 
 logger = logging.getLogger("femagools.machine.sizing")
 
@@ -14,7 +16,7 @@ PM_DEFAULTS = dict(
     eta=0.92,  # efficiency
     cos_phi=0.95,  # power factor
     m=3,  # number of phases
-    ui_u=0.62,  # U ind / U
+    ui_u=0.64,  # U ind / U
     lda=1.33,  # length/taup ratio 0.5 .. sqrt(p)
     J=3.8e6,  # current density 3 .. 6 A/mm²
     sigmas=17e3,  # shear force 10 .. 45 kN/m2
@@ -25,10 +27,10 @@ PM_DEFAULTS = dict(
     mag_width=0.8,  # rel magnet width 0.6 .. 1
     Hc=700,  # max. coercitive field strength, 500 .. 900 kA/m
     brem=1.15,  # remanence 0.3 .. 1.3 T
-    demag=1.5,  # safety factor for demagnetisation
+    demag=6,  # safety factor for demagnetisation (nom current)
     external_rotor=False,
     coil_span=0,
-    hfe=1e-3  # iron height between magnet and airgap (IPM)
+    hfe=1.5e-3  # iron height between magnet and airgap (IPM)
 )
 """default sizing parameters for PM"""
 
@@ -88,10 +90,10 @@ def iron_losses(dy, lfe, hy, wt, ht, q1, B, f):
     return Wfe * dens*vol
 
 
-def wdg_resistance(w1, l, d):
-    S = 56e6  # conductivity of copper 1/Ohm m
-    a = np.pi*d**2/4
-    return 2*w1*l/S/a
+#def wdg_resistance(w1, l, d):
+#    S = 56e6  # conductivity of copper 1/Ohm m
+#    a = np.pi*d**2/4
+#    return 2*w1*l/S/a
 
 
 def check_symmetry_conditions(Q1, p, layers, m):
@@ -202,18 +204,22 @@ def _stator_slots(par, slots):
         par['Q1'] = Q1
         r = get_stator_dimensions(par)
         hb = r['hns']/r['bns']
+        logging.debug(f"Q1 {Q1} hs/bs {hb}")
         if hb > 5:
             break
-        if hb > 3:
-            q.append((Q1, Q1//np.gcd(Q1, p), abs(4-hb), r['kw']))
+        if hb > 2.5:
+            # ideal height/width ratio: 3.2
+            q.append((Q1, Q1//np.gcd(Q1, p), abs(3.2-hb), r['kw']))
 
     if q:
         qhbmin = np.argmin(q, axis=0)
-        logger.debug("q %s", q)
-        # check sim factor, height/width ratio, winding factor
+        logger.debug("q %s qhbmin %s", q, qhbmin)
+         # check sim factor, height/width ratio
         if qhbmin[1] == len(q)-1:
-            return q[qhbmin[1]][0]
+            # last has smallest sim factor
+             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]
         return q[qhbmin[1]+1][0]
     return slotset[0]
@@ -222,7 +228,6 @@ def _stator_slots(par, slots):
 def get_stator_dimensions(par, slots=[]):
     # Check symmetry
     if 'Q1' in par:
-        from ..windings import Winding
         wdg = Winding({'Q': par['Q1'], 'p': par['p'], 'm': 3})
     # nominal (rated) operating parameters
     pnom = par['pnom']
@@ -237,7 +242,8 @@ def get_stator_dimensions(par, slots=[]):
 
     # pole width
     taup = np.pi * Da/(2*p)
-    lfe = taup*lda
+    lfe_q = par.get('lfe_q', 0.001)
+    lfe = lfe_q * round(taup*lda/lfe_q)
 
     if 'udc' in par:
         u1nom = 0.9*par['udc']/np.sqrt(2)/np.sqrt(3)  # phase voltage
@@ -254,8 +260,6 @@ def get_stator_dimensions(par, slots=[]):
     else:
         Q1 = par['Q1']
     coil_span = par.get('coil_span', 0)
-    if np.gcd(Q1, 2*p) == coil_span:
-        coil_span = 0
     layers = 1 if coil_span == 0 else 2
     req_poles = np.gcd(Q1, 2*p)
     if req_poles != 2*p:
@@ -282,7 +286,7 @@ def get_stator_dimensions(par, slots=[]):
     kw = kwz * kws
 
     # flux density amplitude of base harmonic
-    if 'brem' in par:
+    if 'mag_width' in par:
         mag_width = par['mag_width']
         Bd1 = 4.0/np.pi*Ba*np.sin(np.pi/2.0*mag_width)
     else:
@@ -293,8 +297,36 @@ def get_stator_dimensions(par, slots=[]):
     # stator winding
     psi1 = 2.0/np.pi*taup*lfe*Bd1
 
+    # number of turns per phase, first estimation
     Ui = Ui_U * u1nom
-    N = round(np.sqrt(2)*Ui/(2*np.pi*f1nom*kw*psi1), 1)
+    N = np.sqrt(2)*Ui/(2*np.pi*f1nom*kw*psi1)
+
+    # coils per phase and pole
+    # q = Q/2/p/m
+    # num wires per coil side (number of coil groups a)
+    # n = a*N / 2 / p / q
+
+    # feasible number of turns per coil...
+    ncoils = 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)
+    a_calc = ngroups[np.argmin(ndiff)]
+    a = par.get("a", a_calc)
+    if not a in ngroups:
+        logger.warning("Check given number %s of parallel wdg groups. Valid ngroups are: %s",
+                       a, ngroups)
+    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/Ui_U
 
     # current loading
     # A = np.sqrt(2)*sigmas/kw/Ba
@@ -312,6 +344,12 @@ def get_stator_dimensions(par, slots=[]):
     hns = (-bns + np.sqrt(bns**2 + 4*ans*np.tan(taus)))/2/np.tan(taus)
     hys = psi1/2/lfe/By
 
+    aw = ans * kq / layers / num_wires
+    # round wire: pi*d²/4
+    dwire = 2 * np.sqrt(aw/np.pi)
+    wdg = Winding({'Q': Q1, 'p': p, 'm': 3, 'yd': coil_span, 'l': layers})
+    r1 = wdg_resistance(wdg, num_wires, a, aw, Da, hns, lfe)
+    relculen = 1.4
     # airgap and yoke diameter
     airgap = par['airgap']
     if par['external_rotor']:
@@ -336,9 +374,11 @@ def get_stator_dimensions(par, slots=[]):
         trv=round(1e-3*pnom/(2*np.pi*speednom)/(np.pi*Da1**2/4*lfe), 1),
         w1=int(N),
         kw=round(kw, 4),
-        q=qt,
+        q=wdg.q,
         i1=round(I1, 3),  # np.pi*Da1*A/2/m/N
-        psi1=round(psi1, 5))
+        psi1=round(psi1, 5),
+        u1=u1nom,
+        ui=Ui)
 
     slotwidth = np.floor(0.3*np.pi*Da1/Q1*2000+0.5)/2000.0
     tw = bds  # np.pi*(Da1+hns)/Q1 - bns
@@ -375,25 +415,14 @@ def get_stator_dimensions(par, slots=[]):
             wedge_width1=0,  # bns1,
             wedge_width2=0,
             middle_line=0 if layers < 2 else middle_line))
-    # coils per phase and pole
-    # q = Q/2/p/m
-    # num wires per coil side (number of coil groups a)
-    # n = a*N / 2 / p / q
-    ncoils = Q1//2//m*layers
-    ngroups = [1] + [g for g in range(2, p+1) if p%g == 0]
-    a = ngroups[np.argmin([abs(N-ncoils//a*round(a*N/ncoils))
-                           for a in ngroups])]
-    num_wires = round(a*N/ncoils)
-    dwire = 2*np.sqrt(ans*kq/layers/np.pi/num_wires)
-    relculen = 1.4
-    r1 = wdg_resistance(N, relculen*lfe, dwire)/a
+
     r['pcu'] = round(m*r1*I1**2, 1)
 
     r['winding'] = dict(
         wire_diam=round(dwire, 5),
         num_phases=m,
         cufilfact=kq,
-        culength=1.4,
+        culength=relculen,
         num_par_wdgs=a,
         num_layers=layers,
         resistance=round(r1, 4),
@@ -413,8 +442,7 @@ def _get_magnet_height(I1, N, kw, par):
     Hc = Hc*1e3  # unit kA/m
     # Safety Factor for demagnetization
     demag = par['demag']
-    I1max = 4*I1
-    THETA1 = m/np.pi*np.sqrt(2)*I1max*N*kw/p
+    THETA1 = m/np.pi*np.sqrt(2)*I1*N*kw/p
     # minimal magnet height with safety factor
     hM = THETA1/Hc*demag
     Br = par['brem']
@@ -698,6 +726,7 @@ def ipm(pnom: float, speed: float, p: int, **kwargs) -> dict:
         pnom=pnom, speed=speed, p=p)
     par.update(kwargs)
     _set_pm_defaults(par)
+    par.pop('mag_width')
 
     # stator and magnet parameters of interior mounted magnet machine
     r = get_stator_dimensions(par)

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/machine/sm.py

@@ -102,6 +102,8 @@ def parident(workdir, engine, machine,
                 num_cur_steps=kwargs.get('num_cur_steps', 5),
                 num_beta_steps=kwargs.get('num_beta_steps', 13),
                 num_par_wdgs=machine[wdgk].get('num_par_wdgs', 1),
+                skew_angle=kwargs.get('skew_angle', 0.0),
+                num_skew_steps=kwargs.get('num_skew_steps', 0.0),
                 period_frac=kwargs.get('period_frac', 6),
                 speed=kwargs.get('speed', 50))
 
@@ -338,9 +340,9 @@ class SynchronousMachine(object):
     def torquemax(self, i1, iex):
         "returns maximum torque of i1, iex (nan if i1 out of range)"
         def torquei1b(b):
-            return -self.torque_iqd(*iqd(b[0], i1), iex)
+            return self.torque_iqd(*iqd(b[0], i1), iex)
         res = so.minimize(torquei1b, (0,))
-        return -res.fun
+        return res.fun
 
     def torquemin(self, i1, iex):
         "returns minimum torque of i1, iex (nan if i1 out of range)"
@@ -576,7 +578,7 @@ class SynchronousMachine(object):
         i1max: max. phase current (RMS)
         """
         if kwargs.get('i1max', 0):
-                w1type, T = self.w1_imax_umax(kwargs['i1max'], u1max)
+            w1type, T = self.w1_imax_umax(kwargs['i1max'], u1max)
         try:
             iq, id, iex = self.iqd_torque(T)
         except ValueError:

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/nc.py

@@ -195,7 +195,7 @@ class Reader(object):
                 grp.variables['delta_node_angle'].getValue().data)
             self.poles_sim = int(grp.variables['poles_sim'].getValue().data)
             self.slots = int(grp.variables['num_slots'].getValue().data)
-            self.arm_length = int(grp.variables['arm_length'].getValue().data)
+            self.arm_length = float(grp.variables['arm_length'].getValue().data)
         except:
             pass
 
@@ -281,10 +281,10 @@ class Reader(object):
                 cw = float(mcgrp.variables['cw'][i].data)
                 cw_freq_exp = float(mcgrp.variables['cw_exp'][i].data)
                 cw_ind_exp = float(mcgrp.variables['ind_exp'][i].data)
-                try: 
+                try:
                     ce = float(mcgrp.variables['ce'][i].data)
                     cw_ind_beta_exp = float(mcgrp.variables['ind_beta_exp'][i].data)
-                except: 
+                except:
                     pass
                 spec_weight = float(mcgrp.variables['spec_weight'][i].data)
                 fillfactor = float(mcgrp.variables['fillfac'][i].data)

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/plot/forcedens.py

@@ -8,7 +8,17 @@
 """
 import numpy as np
 import matplotlib.pyplot as plt
-from matplotlib import colormaps
+try:
+    from matplotlib import colormaps
+    cmap_viridis = colormaps['viridis']
+    cmap_jet = colormaps['jet']
+    cmap_YlOrBr = colormaps['YlOrBr']
+except:  # older matplotlib
+    from matplotlib import cm
+    cmap_viridis = cm.viridis
+    cmap_jet = cm.jet
+    cmap_YlOrBr = cm.YlOrBr
+
 
 def _create_3d_axis():
     """creates a subplot with 3d projection if one does not already exist"""
@@ -24,7 +34,7 @@ def _create_3d_axis():
         plt.subplot(111, projection='3d')
 
 
-def _plot_surface(ax, x, y, z, labels, azim=None, cmap=colormaps['viridis']):
+def _plot_surface(ax, x, y, z, labels, azim=None, cmap=cmap_viridis):
     """helper function for surface plots"""
     # ax.tick_params(axis='both', which='major', pad=-3)
     assert np.size(x) > 1 and np.size(y) > 1 and np.size(z) > 1
@@ -60,7 +70,7 @@ def forcedens(title, pos, fdens, ax=0):
     ax.set_ylabel('Force Density / kN/m²')
 
 
-def forcedens_surface(fdens, attr='FN', ax=0, cmap=colormaps['jet']):
+def forcedens_surface(fdens, attr='FN', ax=0, cmap=cmap_jet):
     if ax == 0:
         _create_3d_axis()
         ax = plt.gca()
@@ -72,7 +82,7 @@ def forcedens_surface(fdens, attr='FN', ax=0, cmap=colormaps['jet']):
                   ('Rotor pos/°', 'Pos/°', f'{attr} / kN/m²'),
                   cmap=cmap)
 
-def forcedens_contour(fdens, attr='FN', ax=0, cmap=colormaps['jet']):
+def forcedens_contour(fdens, attr='FN', ax=0, cmap=cmap_jet):
     if ax == 0:
         ax = plt.gca()
     z = 1e-3*np.array(getattr(fdens, attr))
@@ -91,7 +101,7 @@ def forcedens_contour(fdens, attr='FN', ax=0, cmap=colormaps['jet']):
     cbar.ax.set_ylabel('kN/m²')
 
 def forcedens_fft(title, fdens, harmmax=(), #(200, 40),
-                  cmap=colormaps['YlOrBr'],
+                  cmap=cmap_YlOrBr,
                   ax=0):
     """plot force densities FFT
     Args:

{femagtools-1.7.1 → femagtools-1.7.3}/src/femagtools/tks.py

@@ -21,6 +21,17 @@ numPattern = re.compile(r'([+-]?\d+(?:\.\d+)?(?:[eE][+-]\d+)?)')
 HBpattern = re.compile(r'H.+\s+B')
 BPpattern = re.compile(r'B.+\s+P')
 
+_tranlate = {
+    "ch": "Hysteresis Loss Factor", 
+    "cw": "Eddy Current Loss Factor", 
+    "ce": "Excess Loss Factor", 
+    "ch_freq": "Hyteresis Exponent", 
+    "cw_freq": "Eddy Current Exponent", 
+    "b_coeff": "Induction Loss Exponent", 
+    "alpha": "Induction Loss Exponent (Bertotti)",
+    "Bo": "Reference Induction", 
+    "fo": "Reference Frequency", 
+}
 
 def readlist(section):
     x = []
@@ -109,7 +120,8 @@ class Reader(object):
             self.cw = z[2]
             self.cw_freq = z[3]
             self.b_coeff = z[4]
-
+            self.jordan = {'ch': z[0], 'cw': z[2], 'ch_freq': z[1], 'cw_freq': z[3], 'b_coeff': z[4],
+                            'Bo': self.Bo, 'fo': self.fo}
             z = lc.fitsteinmetz(
                 self.losses['f'],
                 self.losses['B'],
@@ -122,11 +134,15 @@ class Reader(object):
             self.losses['cw_freq'] = z[1]
             self.losses['b_coeff'] = z[2]
 
+            self.steinmetz = {'cw': z[0], 'cw_freq': z[1], 'b_coeff': z[2], 
+                              'Bo': self.Bo, 'fo': self.fo}
+
             self.losses['Bo'] = self.Bo
             self.losses['fo'] = self.fo
             z = lc.fit_bertotti(self.losses['f'],
                                 self.losses['B'], pfe)
-            self.bertotti = {'ch': z[0], 'alpha': 2.0, 'cw': z[1], 'ce': z[2]}
+            self.bertotti = {'ch': z[0], 'cw': z[1], 'ce': z[2], 
+                             'alpha': 2.0, 'Bo': 1, 'fo': 1}
             logger.info("Bertotti loss coeffs %s", z)
 
             # must normalize pfe matrix:
@@ -156,7 +172,27 @@ class Reader(object):
             'b_coeff': self.b_coeff,
             'rho': self.rho,
             'losses': self.losses}
-
+    
+def tableview(Reader): 
+    """pretty print loss coeff table"""
+    losscoeff = [Reader.jordan, Reader.steinmetz, Reader.bertotti]
+    # Title
+    strlen = 101
+    print('='*strlen)
+    print('| {:^34} '.format(' ') + '| {:^18} | {:^18} | {:^18} |'.format(*["Jordan", "Steinmetz", 'Bertotti']))
+    print('='*strlen)
+    # data 
+    for key, item in _tranlate.items(): 
+        fout = ''
+        for i in losscoeff: 
+            if key in i: 
+                fout += '| ' + f'{i[key]:^18.8e} '
+            else: 
+                tmp = '-'
+                fout += '| ' + f'{tmp:^18} '
+        print(f'| {item:^34}' + ' ' + fout + '|')
+        print('='*strlen)
+    return 
 
 def read(filename, filecontent=None):
     """read Thyssen File TKS and return mc dict"""

{femagtools-1.7.1 → femagtools-1.7.3/src/femagtools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.7.1
+Version: 1.7.3
 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