femagtools 1.5.7__py3-none-any.whl → 1.6.1__py3-none-any.whl

femagtools/plot/__init__.py

@@ -17,3 +17,4 @@ from .nc import spel, mesh, demag, demag_pos, \
 from .mcv import mcv_hbj, mcv_muer, felosses
 from .phasor import i1beta_phasor, iqd_phasor, phasor
 from .wdg import mmf, mmf_fft, zoneplan, winding_factors, winding
+from .fieldlines import fieldlines

femagtools/plot/bch.py

@@ -813,6 +813,7 @@ def main():
     ext = args.filename.split('.')[-1].upper()
     if ext.startswith('MC'):
         import femagtools.mcv
+        from femagtools.plot.mcv import mcv_hbj, mcv_muer
         mcv = femagtools.mcv.read(sys.argv[1])
 
         if mcv['mc1_type'] in (femagtools.mcv.MAGCRV, femagtools.mcv.ORIENT_CRV):
@@ -836,6 +837,7 @@ def main():
 
     if ext.startswith('PLT'):
         import femagtools.forcedens
+        from femagtools.plot.forcedens import forcedens, forcedens_fft
         fdens = femagtools.forcedens.read(args.filename)
         cols = 1
         rows = 2

femagtools/plot/fieldlines.py

@@ -0,0 +1,37 @@
+import re
+import xml.etree.ElementTree as ET
+import matplotlib.pyplot as plt
+import numpy as np
+import matplotlib.lines as mpl
+
+rgbpat = re.compile('rgb\((\d+),(\d+),(\d+)\)')
+
+def fieldlines(svgfilename, ax=0):
+    """plot fieldlines from svg file"""
+    lines = []
+    cols = []
+    tree = ET.parse(svgfilename)
+    root = tree.getroot()
+    for line in root.findall('svg:line',
+                             {'svg': 'http://www.w3.org/2000/svg'}):
+        lines.append(
+            ((float(line.attrib['x1']), float(line.attrib['x2'])),
+             (float(line.attrib['y1']), float(line.attrib['y2']))))
+        cols.append(
+            [int(x)/256
+             for x in rgbpat.findall(line.attrib['stroke'])[0]])
+    a = np.array(lines)
+    xmax, xmin = np.max(a[:, 0]), np.min(a[:, 0])
+    ymax, ymin = np.max(a[:, 1]), np.min(a[:, 1])
+
+    if ax == 0:
+        ax = plt.gca()
+    ax.set_frame_on(False)
+    ax.set_aspect(1)
+    ax.set_xlim((xmin, xmax))
+    ax.set_ylim((ymax, ymin))  # upside down
+    ax.set_yticks([])
+    ax.set_xticks([])
+
+    for l, c in zip(lines, cols):
+        ax.add_line(mpl.Line2D(l[0], l[1], color=c))

femagtools/templates/basic_modpar.mako

@@ -88,6 +88,14 @@ m.pole_width      = ${model['pole_width']*1e3}
 % if hasattr(model, 'lfe'):
 m.arm_length      =   ${model.get(['lfe'])*1e3}
 % endif
+% if hasattr(model, 'lfe'):
+m.arm_length      =   ${model.get(['lfe'])*1e3}
+% endif
+% if hasattr(model, 'winding'):
+% if 'num_par_wdgs' in model.winding:
+m.num_par_wdgs    = ${model.winding['num_par_wdgs']}
+% endif
+% endif
 pre_models("basic_modpar")
 % endif
 % if hasattr(model, 'num_agnodes'):

femagtools/templates/bertotti.mako

@@ -0,0 +1,40 @@
+
+function pfe(Bx,By,kh,fnu,km,z,d)
+
+  -- Bx   flux density x component
+  -- By   flux density y component
+  -- kh   Hysterese Factor 
+  -- fnu  frequency
+  -- km   material factor
+  -- ph   return for hysterese losses
+  -- pw   return for eddy current losses
+  -- iret status 
+
+  -- Parameter
+
+  basfrq=${model['base_frequency']}      -- Base Frequency for ch and cw [Hz]
+  basind=${model['base_induction']}      -- Base Induction (Peak) [T]
+  ch=${model['ch']}                      -- Fe Hysteresis Coefficient ch [W/kg]
+  cw=${model['cw']}                      -- Fe Eddy Current Coefficient cw [W/kg]
+  ce=${model['ce']}                      -- Fe Excess Coefficient cw [W/kg]
+  hyscoef=${model['alpha']}              -- Hysteresis Frequency Coefficient
+  spweight= ${model['special_weight']}   -- Specific Weight Iron [gr/m3]
+  fillfact=${model['fillfac']}           -- Fillfactor Iron <= 1
+
+  -- Bertotti Iron Loss Model
+  -- pvfe = ch*f*(b**alpha) + cw*f**2*(b**2) + ce*f**1.5*(b**1.5)
+  hxx = Bx/fillfact                 -- Bx
+  hyy = By/fillfact                 -- By
+  b21 = math.sqrt(hxx*hxx+hyy*hyy)
+  b = b21/basind
+
+  hi = fnu/basfrq
+  hcw = hi^2
+  hce = hi^1.5
+
+  ph = kh*spweight*km*ch*hi*(b^hyscoef)   -- [W/m3]
+  pw = spweight*km*cw*hcw*(b^2)     -- [W/m3]
+  pe = spweight*km*ce*hce*(b^1.5)
+  iret=1
+  return ph, pw, pe, iret
+end

femagtools/templates/modified_steinmetz.mako

@@ -0,0 +1,39 @@
+
+function pfe(Bx,By,kh,fnu,km,z,d)
+
+  -- Bx   flux density x component
+  -- By   flux density y component
+  -- kh   Hysterese Factor 
+  -- fnu  frequency
+  -- km   material factor
+  -- ph   return for hysterese losses
+  -- pw   return for eddy current losses
+  -- iret status 
+
+  -- Parameter
+
+  basfrq=${model['base_frequency']}      -- Base Frequency for ch and cw [Hz]
+  basind=${model['base_induction']}      -- Base Induction (Peak) [T]
+  ch=${model['ch']}                      -- Fe Hysteresis Coefficient ch [W/kg]
+  cw=${model['cw']}                      -- Fe Eddy Current Coefficient cw [W/kg]
+  alpha=${model['alpha']}              -- Hysteresis Frequency Coefficient Alpha
+  beta=${model['beta']}              -- Hysteresis Frequency Coefficient Beta
+  spweight= ${model['special_weight']}   -- Specific Weight Iron [gr/m3]
+  fillfact=${model['fillfac']}           -- Fillfactor Iron <= 1
+
+  -- Modified Steinmetz Iron Loss Model
+  -- pvfe = ch*hi*(b**(alpha + beta*b)) + cw*(hi**2)*(b**2)
+  hxx = Bx/fillfact                 -- Bx
+  hyy = By/fillfact                 -- By
+  b21 = math.sqrt(hxx*hxx+hyy*hyy)
+
+  b = b21/basind
+  hi = fnu/basfrq
+  coeff = alpha+beta*b
+  ph = kh*spweight*km*ch*hi*(b^coeff)   -- [W/m3]
+  pw = spweight*km*cw*(b^2)*(hi^2)   -- [W/m3]
+  pe = 0.0
+
+  iret=1
+  return ph, pw, pe, iret
+end

femagtools/ts.py

@@ -292,7 +292,7 @@ class Losses(object):
             srname = srname+' '
 
         time = self.times.vector[-1]-self.times.vector[0]
-        return srlossenergy / time
+        return self.ohm_lossenergy_sr(self.nc.get_subregion(srname)) / time
 
     def ohm_lossenergy(self, start=0.0, end=0.0):
         '''Ohmic loss energy of all subregions

femagtools/utils.py

@@ -15,7 +15,13 @@ def fft(pos, y, pmod=0):
     if pmod:
         negative_periodic = pmod % 2
     else:
-        negative_periodic = np.abs(y[0] - y[-1])/np.max(y) > 1
+        #negative_periodic = np.abs(y[0] - y[-1])/np.max(y) > 1
+        # count zero crossings
+        ypos = np.asarray(y[:-1]) > 0
+        nypos = ~ypos
+        nzc = len(((ypos[:-1] & nypos[1:])
+                   | (nypos[:-1] & ypos[1:])).nonzero()[0])
+        negative_periodic = nzc == 0 or nzc % 2 == 1
 
     if negative_periodic:
         yx = np.concatenate(
@@ -34,12 +40,12 @@ def fft(pos, y, pmod=0):
     i = np.argmax(np.abs(Y[:N//2]))
 
     a = 2*np.abs(Y[i])/N
-    freq = np.fft.fftfreq(N, d=pos[1]-pos[0])
+    freq = np.fft.fftfreq(N, d=360/N)
     nmax = min(18*ntiles, N//2)
     T0 = 0
     if abs(freq[i]) > 0:
         T0 = np.abs(1/freq[i])
-        npoles = 2*int(np.ceil(360/T0))
+        npoles = 2*int(360/T0)
         nmax = min(9*npoles, N//2)
 
     alfa0 = np.angle(Y[i])

{femagtools-1.5.7.dist-info → femagtools-1.6.1.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=wgOm7w4vbhw1vEgx2gBJtViWiM99iphrpU67P8qs6b0,1615
+femagtools/__init__.py,sha256=Rw6Z2_8l-e7ExzcB5j-qNHtHUxu2HC_SbKQaDRTOQLQ,1615
 femagtools/airgap.py,sha256=ZCIZTYf6BbuNYx68y9fUDBQo3taN8RuGl8q-jJ7ygiA,1577
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
 femagtools/amela.py,sha256=pHjfXzpANI-7oz8MtrqNcyDZ6PxVM91vCJuvYhHy1rk,13891
 femagtools/asm.py,sha256=CiL0KWaF4P7O6-VwmGLdva_icwmPrPiI-TFQ19XYTKk,7660
-femagtools/bch.py,sha256=q6vMKFI0DSMQZDsOPAxMVPoxzz6aAUCApuwcW6c_oXM,70154
+femagtools/bch.py,sha256=gDQnL6xxW5e-BeWwIqLm6dLTMzfU6_3oDQhoUeHihSA,71677
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
 femagtools/condor.py,sha256=J8z9iBdvrGu3I1eFNoyKV8AXzRoTEPGLSak6cXUQxAM,10766
 femagtools/conductor.py,sha256=rXO7c7Qh_s7JpgILmLd4IbG64vP6Eh143YF9u25Mdwg,1076
@@ -15,9 +15,9 @@ femagtools/dakotaout.py,sha256=6nn0PXsB40mPKiQLenqAtHy0KXCO7kvqqQ-aD2JhQvw,5573
 femagtools/docker.py,sha256=XDVmLBB0z4sZZpcrx7Wbm84xl4ksj7aqn5-ZOPxdxm4,7460
 femagtools/ecloss.py,sha256=gaZ8JmlFVoP6IYe79YXPXvZSULm8IZr6bPBdKuyKaIo,12832
 femagtools/erg.py,sha256=IXKq76P9qLt_ssNOP78v8Qizk3J2Zg80yaKDSjzwoJE,1224
-femagtools/femag.py,sha256=8aRc9hlONtOvEm4KeLeNAyJ36Ja-QmcqHXCd5e6M-Tg,42297
+femagtools/femag.py,sha256=kqBHwahV_Q-gPaIt6wOX4DZjQD8ISJm4G2snTRN1eT4,43124
 femagtools/forcedens.py,sha256=nEM1MHxtpLee2sGFsehzrWEdsCRe_RSRqyNfj6u_l8g,7415
-femagtools/fsl.py,sha256=mNMqwghFoJJLs2a6jsYpbr_dKrZXiP_jZ0Udlu5Mc6M,31413
+femagtools/fsl.py,sha256=3dOm_xK5AaSrIIEuANwK_HpwzKw9DA-1VPBxacHTtnE,31881
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
 femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
@@ -28,44 +28,44 @@ femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
 femagtools/job.py,sha256=dOatzr10nIda76CjVRSS0SfEWC8_BAw0kowli523qbY,11320
 femagtools/losscoeffs.py,sha256=dlSYDS13RqpPHLdv_EPWIA9liwhqjbxUiN7t7GFPZhw,5397
 femagtools/magnet.py,sha256=Nuk060bT4Wa3lX74HdefqTTtUxLaERDSBYTTpbi6KP4,1093
-femagtools/mcv.py,sha256=Pll-r0YZh-wp9EQBTD4XEBlX4J5jy4oeVa22SYIM7q8,39744
+femagtools/mcv.py,sha256=Y5tCBEhm6k64m9xQ-salId5e-U29nNTz-iH4MHTbE5Y,40673
 femagtools/me.py,sha256=XNK0l-aroNYfKyxV_uslE8q3vJb_KuntAYTWd-4FQaQ,1833
-femagtools/model.py,sha256=wcOZwKe8nd_vwe4SlLmWPe4ukvtVINUE8Qi5HEp2hkw,15018
+femagtools/model.py,sha256=u-sTaVKKxrPCIMoXXQFRheC_JTwp9Plis1KP_YF3vmk,15119
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
 femagtools/multiproc.py,sha256=7mJF-VU1NrJkENyg8eHtDrDRNBwLPK43phZv3ehm9BU,8435
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
-femagtools/nc.py,sha256=VQKpA2ZLoyvkQmzmHGrG7oePfGvynNw-pwqfavSxJx8,14233
+femagtools/nc.py,sha256=TC7LY1FAL43ntA0IlGzUXhUsB05-xWzeZ1yP0q4L0A4,14532
 femagtools/netlist.py,sha256=CSCl8setLZ_L8DCnNWaNA3-wLe1yo-fmzARZoVvYfaA,2052
 femagtools/ntib.py,sha256=76g1ZO3Fq_kN-HTMBvaKvJmMMlJMyEPFeNAcJPq3w7Y,3099
-femagtools/opt.py,sha256=4KvhluihZ53LSe6p8DEZQAIY4VPHHODquDXPBQYLxxc,8682
-femagtools/parstudy.py,sha256=X335jV8tS5e6K6OsCl1DfMxBYT7-nn3wXD9aWNN0Fh4,18696
+femagtools/opt.py,sha256=snQlPNT5hksCgj0TBjFBhSCERMHHGMv1xc4uFSxptfQ,8687
+femagtools/parstudy.py,sha256=oP6ukKBCcAjwPK_DzbUEmo5ay2TINamao2aV42FbgP8,18799
 femagtools/poc.py,sha256=MN5DRL4vHycNzXSTt9kjuZP1yZ2I02NmrKQFsmRcbF0,6536
 femagtools/tks.py,sha256=FuEKiWcSnOW2Hp2NxCq1hBeQdRFkHutaJuctrhxh8Ws,6228
-femagtools/ts.py,sha256=JZbiXhss6f5J8gDhOMmfZe-fkroBA1BRcpGE5PGZjWU,47175
-femagtools/utils.py,sha256=RnZwENpsHWFQIUaz0tq6rC_kbsh4iEGXucMAS4sh2vY,1350
+femagtools/ts.py,sha256=x9aCMVASjdBZuyI2pJGMyi1dveGFd_pWQ20cZ-l_moc,47216
+femagtools/utils.py,sha256=1SX5s21xyW8u0NF_Hjs7DByyCTdLm9VRArLburTyHR0,1581
 femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
 femagtools/windings.py,sha256=6ioABZRWQ3xA4kmEz2NUkXh-C-FmW9YYkjQKs5YakQs,22197
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
-femagtools/dxfsl/area.py,sha256=51EW6jbcM0_l5QKDxvY0hZ_X7H0Vj1B_wOdoa7iHRWg,57839
-femagtools/dxfsl/conv.py,sha256=xOCj0vPlyRVP1FVNPLtKx_Fe88emjaht_DD4bfycD6A,8990
-femagtools/dxfsl/converter.py,sha256=EoRSw1JePBrgclFqClhsOSSiHm6O_o-AarZgMPI2PLU,20576
+femagtools/dxfsl/area.py,sha256=ohs6J_X-c6y-FrSd2LFjMc3024N9RcOpDKgsXIsuoNs,57818
+femagtools/dxfsl/conv.py,sha256=j17gjZ7XjoP6QmEO50ZMA-jyYrcMQEgpDH0hZN26RbM,9236
+femagtools/dxfsl/converter.py,sha256=6BCwlVp0PiSZ4Wj-YDgl7ynWNN2SBuwxw5VnNQ55Y9w,20821
 femagtools/dxfsl/corner.py,sha256=UI1MLlVmiTBURywsOnXnXV7eBABoENc6ortkW_3GYH8,1266
 femagtools/dxfsl/dumprenderer.py,sha256=n4AvInjvGIaC2iKZtQaYXXDyJVSQ3uEOFOLD4-xfKRY,1861
-femagtools/dxfsl/fslrenderer.py,sha256=63aFyinpfRgQNKxfXZIucPU_ZGjpI41q47foD8G7gBw,23379
-femagtools/dxfsl/functions.py,sha256=CVEfdYgIlXFPoeRgljOGQt-FlPsk6ZzCn2G1D8wlGho,9835
-femagtools/dxfsl/geom.py,sha256=-hVk8CdqWKuZrvPcm6k9KmnhTk3TeJvQ6ZWu7Ool8Ss,158807
-femagtools/dxfsl/machine.py,sha256=WAKI62y_93ixWQSxO_gvYu3i-q8zxbWTjw5tGT5PFbw,39828
-femagtools/dxfsl/plotrenderer.py,sha256=lJFEH0Jdsph3atcABMS6IweKNPANxJA1aF0YlMdk_p0,12725
-femagtools/dxfsl/shape.py,sha256=ZPXBtXVtETo90QA6BXzHobZo7werjcXilpik6x6DU-c,46178
-femagtools/machine/__init__.py,sha256=m3DnYBP8Wxh-qDoFhkPVlXUGcA4fjDOVleqo3YQ4syA,7728
-femagtools/machine/afpm.py,sha256=TRRGKZWpbXWPXMJQPXAjfOtmXm1XPCnwgzhgBjexfl8,24813
+femagtools/dxfsl/fslrenderer.py,sha256=C4oonLPzKb_9IKvpm-fMvbhQZqtP_7xWG5bzpq8P1CY,23377
+femagtools/dxfsl/functions.py,sha256=Y861cXEWTLVpC5iKOSDqRQ4Idbk4OqQQD-qFK-s8_20,10107
+femagtools/dxfsl/geom.py,sha256=bAZtk_GIO7anaBeZKZhWHGyt9L-t_F1YglCgRc0oU48,163051
+femagtools/dxfsl/machine.py,sha256=RxUjn4Ak2o4ThwjYK7AkKuSK7SyqYFZDUOnMe9yFEBE,41543
+femagtools/dxfsl/plotrenderer.py,sha256=dIOM8p3UNTlqypxuPcLCegOaK19j3-ahelZ8hneLJ6k,12710
+femagtools/dxfsl/shape.py,sha256=4onAfXaVUWxC9C2WXVLYi3UH6w2lhUHxuLjdFgQOqks,48302
+femagtools/machine/__init__.py,sha256=xMypyugPeEe7qHBAn2UWjiHdVYYfP6eoO56k1ZIEBss,7165
+femagtools/machine/afpm.py,sha256=hNyDFRLGmCuWRPZl_u1ztJ4pA-Y_mxLaVvg3UJkzRuE,24766
 femagtools/machine/effloss.py,sha256=aaSmmxKd_KWMasHUHipYDcZOw-fvTHNa38MWFnpVock,13130
 femagtools/machine/im.py,sha256=ScIOLrlc4CPLYFNx2MmJqkpmbky_HXxFGZbMWUNGBrk,37881
-femagtools/machine/pm.py,sha256=V9Q0y8ZnS1V4guhlGcACCk7IAt4FAYeOVzEXAP7WSIg,55873
+femagtools/machine/pm.py,sha256=cGOdcUzMyBYJotQB8_tj93_2pwK9tml4GuSet80HgnM,56042
 femagtools/machine/sizing.py,sha256=aN_OahewjTTBHnpRNfLh1AGFhqnoeZVuMBeb_3MCIVI,23096
-femagtools/machine/sm.py,sha256=hfJA8_C-uuDIKnjR12H9LkVocxnNoSkJaH2R_-8-2zQ,34310
-femagtools/machine/utils.py,sha256=i2nnwYLTrf_OZbSDgo6uhHpH8-7UaWlRbvgp_BL4JSE,16770
+femagtools/machine/sm.py,sha256=pkik913kU41PPiUpwDy_6BEKfCIhvY6FEp-fbU2Lqew,34320
+femagtools/machine/utils.py,sha256=g9q4j9KxUWdb_iUOUQDuaAwwJx8XM0kZMpgnwsNz8hU,18616
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
 femagtools/moo/algorithm.py,sha256=lNEf0Bur4yFpIJeLtAC3oIus8sOMWTb7jepFlD28YzE,5445
 femagtools/moo/population.py,sha256=gi8PSVUXkYY5vzgAwWvxfMbH_z51fN58O4-NKoarwzI,10100
@@ -73,9 +73,10 @@ femagtools/moo/problem.py,sha256=McIGKAXK97Jygumns0qmFeYxTG6KDRSQj2aENeC9F9A,239
 femagtools/moo/test/AlgorithmTest.py,sha256=KzR1og4bu6NOE61DDKjEMTQdsysmho4LCYmJ6WZoILo,2535
 femagtools/moo/test/PopulationTest.py,sha256=lG9NeWo0xrslfQRa4tgy1Nj23VJMFIlg_vQ9KUBYnRA,5529
 femagtools/moo/test/ProblemTest.py,sha256=r5XEfY4LPscDb35TxxPd0lbP3nUmL6_G6vrRo1I3RSg,505
-femagtools/plot/__init__.py,sha256=kaki8KzUSDqPSKEfIlDJrEn1y71JOXTNp_AWyfRXeus,885
-femagtools/plot/bch.py,sha256=r1FACtRRTV907UZ667yJzlmRqQO8tSQl2w_BV5_XvDI,28396
+femagtools/plot/__init__.py,sha256=GeyzHrxv2JDe0WO-u6vwX_GOjm28Tv30IiShyVWjgsk,920
+femagtools/plot/bch.py,sha256=4f9Q-JZtj9WMjxFUXMXNaSdWdDXN_Be4-F9kOU45xns,28525
 femagtools/plot/char.py,sha256=pfmsoSbrE4QuWBaGV9X7s2hT4OSK5ZQ99drmE4y1TDw,11192
+femagtools/plot/fieldlines.py,sha256=QtKF4nhnQ_FHHGh9Qez3GVmym0CLhW1ZyIKtk4pzos4,1136
 femagtools/plot/fluxdens.py,sha256=NlexRJ3f_8CgKoWrV82ZIsAXPrLhwj98uOe8_fUks7A,1082
 femagtools/plot/forcedens.py,sha256=37FQLViGsjCh20tSlWlVfLTsvtjzdK_pEQGC2KcQ-xI,2996
 femagtools/plot/mcv.py,sha256=AKbWhJd20Kcec8Hv9dX32G5yTLPkcWorQS7-3P6m-mQ,2960
@@ -87,7 +88,8 @@ femagtools/templates/afm_rotor.mako,sha256=fY-dlZvRLN9UAy5V6Q_inWghkSUe8pzrCYjJd
 femagtools/templates/afm_stator.mako,sha256=l1xEwxffZ1jyx5wuJ3rhVbVlZirJzD2K8n4i5Dvbxuc,5344
 femagtools/templates/airgapinduc.mako,sha256=aCMLZ7P4vjeSGikIetkwymgDjESdftPN_aYx2LfjfsY,246
 femagtools/templates/asyn_motor.mako,sha256=vvZ0SIJj4ORaCbE1Hl5NeCU_j2CWdOltVpSKP7ESJTQ,2879
-femagtools/templates/basic_modpar.mako,sha256=7qXIYrqJqI3xRnxXKG5zSwBNsiQotc94Q37X4sbAXxQ,3036
+femagtools/templates/basic_modpar.mako,sha256=RqCazMbcRkDeOGT7o3EGvdvhoJhJT8pN-C3Nu5y4sQs,3259
+femagtools/templates/bertotti.mako,sha256=o0OjzIIliVy2oHtDx4QzsDBodfsUQhdln4DmPNcIHnQ,1346
 femagtools/templates/calc_field_ts.mako,sha256=hNs7INzk92U8LljQvQHnKf20fD2HU6igtx1rhsOvPkc,1911
 femagtools/templates/calc_therm_field.mako,sha256=Q1aAulucLjrtNiCnFGin3ObK13R1KG6dWjJTWwdfxds,1600
 femagtools/templates/cogg_calc.mako,sha256=tCz6zjQXH4bZMRMKVFkGm89RQkuMO3lFAMn7gAJFfg8,1867
@@ -119,6 +121,7 @@ femagtools/templates/magnetShell.mako,sha256=vpyZIZ5tOsrmUVM00Kime7zyu1lK9P61xq7
 femagtools/templates/magnetShell2.mako,sha256=4IJBfBTPxuYHr1SAcVvNdQoGd8emwsx8vMKQPI9pRlc,4080
 femagtools/templates/mesh-airgap.mako,sha256=QFutdFUnz5lMpjRT9cN0w6EPShccYJfz4yuMqNYoZ1Y,3425
 femagtools/templates/modal_analysis.mako,sha256=Thf62FBqL738qnp1ongPr196GJY27vwElKqPfMWF45s,2298
+femagtools/templates/modified_steinmetz.mako,sha256=qrJ18XtoU39kjbcdywCJCLObQGaO-eC3Cl-1P4xLZWg,1327
 femagtools/templates/mult_cal_fast.mako,sha256=FhqRZQaBIIvmx0LgKXVLOIjz7LshoDFHqhkD0QGlX8A,1255
 femagtools/templates/new_model.mako,sha256=P7658h99bKrA6YbP1D365ImIZPGEAZoBeYCdq0DT0AA,345
 femagtools/templates/noloadflux-rot.mako,sha256=BiAtTL0mj8ukbRiPKKyH80PpzugGIJKZhvay7yxnSp8,3209
@@ -154,14 +157,14 @@ tests/test_afpm.py,sha256=OE-ULFcp_fBQ7SyRacDmDGbq8ULFHLbXXx3MHJN1C1c,11031
 tests/test_airgap_induction.py,sha256=cmpy1og59oWEyCO4oF_zDuc1DUwCbdeebNL1ujpZza4,1065
 tests/test_amela.py,sha256=IsGah_O8qWsudZOnWL0pjH9S40O03oH_XfDtLgnzBMk,637
 tests/test_asm.py,sha256=NAMJ2Km4zi6byhooq5E7GZbkFeSNSTaLpJWt-jQF5cE,1398
-tests/test_bchreader.py,sha256=7c9LHhODbTq8DMMl3OIt3DNHby2e7fIA2ubU-oKDRr0,14755
+tests/test_bchreader.py,sha256=byqjDa_329cCgQFhLHLOgxiwZ0UMzvWb-rVjvN9wFQA,15497
 tests/test_conductor.py,sha256=T7bmuSdI2Fowwm2Ht-8D0Qnfs1_lx1aoi9RhC2p5nYU,332
 tests/test_convert.py,sha256=oseuhm3Iw-9b4WzBjA_Og2lgXPqKYicLUnfadq5Yick,6497
 tests/test_effloss.py,sha256=-kJJNgS5c6saHXjNuhAe5GdWfr9mEYpPo8fE8OtjsNA,1142
 tests/test_erg.py,sha256=kRVzpXa6JDdbxTss18HUWKny9Dx8IMx9uGTrbQCnHwg,523
-tests/test_femag.py,sha256=l7-av3eitLm7bwTuunEmVeTspi82ifPrlz7f1boGdVI,1934
+tests/test_femag.py,sha256=55cCx90tJ1BEeu_-DOit37y26hFGVSYwkT81s9-p28E,1934
 tests/test_forcedens.py,sha256=Yzl3SAmJNkZN9dA3aLxRvwY8fKsw077Fl0iJm6zJ5Sk,536
-tests/test_fsl.py,sha256=VTG2ZfCUvEgMfSQcMOknJ4gb3R2rMdN_wZXVZG8RL_E,16623
+tests/test_fsl.py,sha256=H2doNSNLx9FmcHsq-Ng8mEwV7qZtAdIK4bFCyhFDUTw,16623
 tests/test_hxy.py,sha256=pVb6ZfDhBy5-DXa3gh7RQmLFG8p5cSYB8gdGLC8kjAk,640
 tests/test_im.py,sha256=55wfCoA8_PuogI_RsC3AjUQCpR84T-HddtHuU1NxfPc,662
 tests/test_isa7.py,sha256=GJhRj2nncrUpNTIlM4jvG4kKZS7cK19hhQg9KbM3b5Q,3001
@@ -197,9 +200,9 @@ tests/moo/__init__.py,sha256=l8HD-AY8EwxOoo_VrG3HgEZb2MaHypvnhKCVSkR-DTA,808
 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.5.7.dist-info/LICENSE,sha256=V5OED7AzEaOtvbfgNheKOSUeNtijvKQuo84FtSJNkJU,1316
-femagtools-1.5.7.dist-info/METADATA,sha256=CDF9AHSLnVXybAWVUb7bZahdllHeAPQ9aGtHHI-o2eQ,5685
-femagtools-1.5.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-femagtools-1.5.7.dist-info/entry_points.txt,sha256=UXpu6KnrykN89sCUaFAIIzn_dYwuxizUS0GcPdoekro,195
-femagtools-1.5.7.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.5.7.dist-info/RECORD,,
+femagtools-1.6.1.dist-info/LICENSE,sha256=V5OED7AzEaOtvbfgNheKOSUeNtijvKQuo84FtSJNkJU,1316
+femagtools-1.6.1.dist-info/METADATA,sha256=xqY9FsLAYpZD0uPCvnoDDDU8Kxv-_g8tTOVr37hRi3g,5685
+femagtools-1.6.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+femagtools-1.6.1.dist-info/entry_points.txt,sha256=UXpu6KnrykN89sCUaFAIIzn_dYwuxizUS0GcPdoekro,195
+femagtools-1.6.1.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.6.1.dist-info/RECORD,,

tests/test_bchreader.py

@@ -306,6 +306,17 @@ class BchReaderTest(unittest.TestCase):
         self.assertTrue(bch.leak_dist_wind)
         self.assertEqual(bch.leak_dist_wind['nseg'], 4)
 
-
+    def test_read_felosses_ldq_b2(self):
+        bch = self.read_bch('ldqlosses-2024b2.BATCH')
+        self.assertEqual(bch.ldq['losses']['styoke_excess'][0],  [1.45, 2.114, 2.175, 2.175])
+        self.assertEqual(bch.ldq['losses']['stteeth_excess'][0],  [4.309, 4.973, 5.034, 5.034])
+        self.assertEqual(bch.ldq['losses']['rotor_excess'][0],  [0.0, 0.0, 0.0, 0.7933])
+
+    def test_read_felosses_ldq_b2(self):
+        bch = self.read_bch('psdqlosses-2024b2.BATCH')
+        self.assertEqual(bch.psidq['losses']['styoke_excess'][0],  [2.235, 2.235, 2.839])
+        self.assertEqual(bch.psidq['losses']['stteeth_excess'][0],  [6.58, 6.576, 7.176])
+        self.assertEqual(bch.psidq['losses']['rotor_excess'][0],  [0.0, 0.0, 0.0])
+        
 if __name__ == '__main__':
     unittest.main()

tests/test_femag.py

@@ -70,7 +70,7 @@ def test_run_script(monkeypatch, tmpdir):
                                    magnetizingCurves=mcv, magnets=magnetmat)
 
     fsl = femag.create_fsl(machine, simulation)
-    assert len(fsl) == 94
+    assert len(fsl) == 95
     assert femag.model.magnet['temp_prop']['magntemp'] == 60.0
 
     r = femag(machine, simulation)

tests/test_fsl.py

@@ -498,7 +498,7 @@ class FslBuilderTest(unittest.TestCase):
         magnets = femagtools.magnet.Magnet(magnetmat)
         condMat = femagtools.magnet.Magnet([dict(name='Cu', elconduct=56e6)])
         fsl = self.builder.create_model(model, magnets, condMat)
-        self.assertEqual(len(fsl), 186)
+        self.assertEqual(len(fsl), 187)
         brem = [l.strip() for l in fsl
                 if l.split('=')[0].strip() == 'm.remanenc']
         self.assertEqual(brem[-1].split('=')[-1].strip(),