femagtools 1.2.5__py3-none-any.whl → 1.2.6__py3-none-any.whl

femagtools/__init__.py

@@ -9,7 +9,7 @@
 
 """
 __title__ = 'femagtools'
-__version__ = '1.2.5'
+__version__ = '1.2.6'
 __author__ = 'Ronald Tanner'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2016-2022 SEMAFOR Informatik & Energie AG'

femagtools/machine/effloss.py

@@ -2,6 +2,7 @@ import numpy as np
 import scipy.interpolate as ip
 import logging
 from .utils import betai1
+from .pm import PmRelMachineLdq
 from . import create_from_eecpars
 
 logger = logging.getLogger("femagtools.effloss")
@@ -67,29 +68,28 @@ def efficiency_losses_map(eecpars, u1, T, temp, n, npoints=(50, 40)):
         else:
             xtemp = [temp, temp]
         m = create_from_eecpars(xtemp, eecpars)
-    else:  # must be a Machine
+    else:  # must be an instance of Machine
         m = eecpars
     if isinstance(T, list):
         r = {'T': T, 'n': n}
         rb = {'T': [], 'n': []}
-    else:
+    else: # calculate speed,torque charactersics
         nmax = n
-        if 'ldq' in eecpars:
-            r = m.characteristics(T, nmax, u1)  # driving mode
-            if min(eecpars['ldq'][0]['beta']) >= -90:  # driving mode only
+        r = m.characteristics(T, nmax, u1)  # driving mode
+        if isinstance(m, PmRelMachineLdq):
+            if min(m.betarange) >= -np.pi/2:  # driving mode only
                 rb = {}
                 rb['n'] = None
                 rb['T'] = None
             else:
                 rb = m.characteristics(-T, max(r['n']), u1)  # braking mode
         else:
-            r = m.characteristics(T, nmax, u1)  # driving mode
             rb = m.characteristics(-T, max(r['n']), u1)  # braking mode
 
     ntmesh = _generate_mesh(r['n'], r['T'],
                             rb['n'], rb['T'], npoints)
 
-    if 'ldq' in eecpars:
+    if isinstance(m, PmRelMachineLdq):
         iqd = np.array([
             m.iqd_torque_umax(
                 nt[1],
@@ -118,19 +118,17 @@ def efficiency_losses_map(eecpars, u1, T, temp, n, npoints=(50, 40)):
             r['plcu1'].append(m.m*np.abs(i1)**2*m.rstat(w1))
             r['plcu2'].append(m.m*np.abs(i2)**2*m.rrot(w1-m.p*wm))
 
-    tfric = eecpars['kfric_b']*eecpars['rotor_mass']*30e-3/np.pi
-    plfric = 2*np.pi*ntmesh[0]*tfric
-    ntmesh[1] -= tfric
-    pmech = np.array(
-        [2*np.pi*nt[0]*nt[1]
-         for nt in ntmesh.T])
 
-    if 'ldq' in eecpars:
+    if isinstance(m, PmRelMachineLdq):
         plfe1 = m.iqd_plfe1(*iqd, f1)
         plfe2 = m.iqd_plfe2(iqd[0], iqd[1], f1)
         plmag = m.iqd_plmag(iqd[0], iqd[1], f1)
         plcu1 = m.iqd_plcu1(iqd[0], iqd[1], 2*np.pi*f1)
         plcu2 = m.iqd_plcu2(*iqd)
+        try:
+            tfric = eecpars['kfric_b']*eecpars['rotor_mass']*30e-3/np.pi
+        except:
+            tfric = 0
     else:
         plfe1 = np.array(r['plfe1'])
         plfe2 = np.zeros(ntmesh.shape[1])
@@ -140,7 +138,13 @@ def efficiency_losses_map(eecpars, u1, T, temp, n, npoints=(50, 40)):
         iqd = np.zeros(ntmesh.shape)
         u1 = np.array(r['u1'])
         i1 = np.array(r['i1'])
+        tfric = 0
 
+    plfric = 2*np.pi*ntmesh[0]*tfric
+    ntmesh[1] -= tfric
+    pmech = np.array(
+        [2*np.pi*nt[0]*nt[1]
+         for nt in ntmesh.T])
     ploss = plfe1+plfe2+plmag+plcu1+plcu2+plfric
 
     eta = []

femagtools/machine/pm.py

@@ -369,7 +369,7 @@ class PmRelMachine(object):
                 for nn in np.linspace(r['n'][-1]+dn, n2, nstab[1]):
                     w1 = 2*np.pi*nn*self.p
                     logger.debug("fieldweakening: n %g T %g i1max %g w1 %g u1 %g",
-                                nn*60, tq, i1max, w1, u1max)
+                                 nn*60, T, i1max, w1, u1max)
                     iq, id = self.iqd_imax_umax(i1max, w1, u1max,
                                                 maxtorque=T > 0)
                     tq = self.torque_iqd(iq, id)
@@ -380,7 +380,7 @@ class PmRelMachine(object):
                         r['T'].append(tq)
                     else:
                         logger.warning("fieldweakening: n %g T %g i1max %g w1 %g u1 %g",
-                                       nn*60, tq, i1max, w1, u1max)
+                                       nn*60, T, i1max, w1, u1max)
 
             if n2 < n3:
                 for nn in np.linspace(r['n'][-1]+dn/2, n3, nstab[2]):

femagtools/multiproc.py

@@ -28,6 +28,8 @@ logger = logging.getLogger(__name__)
 
 numpat = re.compile(r'([+-]?\d+(?:\.\d+)?(?:[eE][+-]\d+)?)\s*')
 
+class LicenseError(Exception):
+    pass 
 
 class ProtFile:
     def __init__(self, dirname, num_cur_steps):
@@ -133,13 +135,20 @@ def run_femag(cmd, workdir, fslfile):
             proc.wait()
             os.remove(os.path.join(workdir, 'femag.pid'))
 
-            logger.info("Finished pid: %d return %d",
-                        proc.pid, proc.returncode)
-            return proc.returncode
+            #logger.info("Finished pid: %d return %d",
+            #            proc.pid, proc.returncode)
+            #return proc.returncode
         except OSError as e:
             logger.error("Starting process failed: %s, Command: %s", e, cmd)
             raise
-
+        
+    # raise License Error
+    if proc.returncode != 0: 
+        with open(os.path.join(workdir, "femag.err"), "r") as err: 
+            for line in err: 
+                if 'license' in line: 
+                    raise LicenseError(line)
+                
     logger.info("Finished pid: %d return %d", proc.pid, proc.returncode)
     return proc.returncode
 

femagtools/parstudy.py

@@ -258,6 +258,14 @@ class ParameterStudy(object):
                     prob.prepare(x, [fea, self.femag.magnets])
                     for m in modelfiles:
                         task.add_file(m)
+                    set_magnet_properties(model, fea, self.femag.magnets)
+                    task.add_file(
+                        'femag.fsl',
+                        builder.create_open(model) +
+                        builder.create_fe_losses(model) +
+                        builder.create_analysis(fea) +
+                        ['save_model("close")'])
+
                 else:
                     prob.prepare(x, [model, fea, self.femag.magnets])
                     logger.info("prepare %s", x)
@@ -266,13 +274,13 @@ class ParameterStudy(object):
                             dir=task.directory,
                             recsin=fea.recsin):
                         task.add_file(mc)
-
-                set_magnet_properties(model, fea, self.femag.magnets)
-                task.add_file(
-                    'femag.fsl',
-                    builder.create_model(model, self.femag.magnets) +
-                    builder.create_analysis(fea) +
-                    ['save_model("close")'])
+                    set_magnet_properties(model, fea, self.femag.magnets)
+                    task.add_file(
+                        'femag.fsl',
+                        builder.create_model(model, self.femag.magnets) +
+                        builder.create_analysis(fea) +
+                        ['save_model("close")'])
+                    
                 if hasattr(fea, 'poc'):
                     task.add_file(fea.pocfilename,
                                   fea.poc.content())

femagtools/plot.py

@@ -1770,19 +1770,19 @@ def losses_map(rmap, ax=0, title='Losses Map / kW'):
     plot_contour(rmap['n'], rmap['T'], np.asarray(rmap['losses'])/1e3, ax,
                  title=title, levels=14)
 
-def eigenmode(reigen, num_modes=12): 
+def eigenmode(reigen, num_modes=12):
     """plot eigenmode"""
     cols = 4
     rows = int((num_modes - num_modes%cols)/cols + 1)
     fig, ax = plt.subplots(rows, cols)
     ctr = 0
-    for i in range(rows): 
-        for j in range(cols): 
-            if ctr < num_modes: 
+    for i in range(rows):
+        for j in range(cols):
+            if ctr < num_modes:
                 ax[i, j].imshow(reigen[0][ctr])
                 ax[i, j].set_title(f'Freq: {reigen[1][ctr]:.2f} Hz')
                 ax[i, j].axis('off')
-            else: 
+            else:
                 ax[i, j].remove()
                 ax[i, j] = None
             ctr+=1

{femagtools-1.2.5.dist-info → femagtools-1.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.2.5
+Version: 1.2.6
 Summary: Python API for FEMAG
 Author-email: Ronald Tanner <tar@semafor.ch>, Dapu Zhang <d.zhan@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.2.5.dist-info → femagtools-1.2.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-femagtools/__init__.py,sha256=6nPwSuuZacpF-COfLjFgCTidgp4EOEx0rPKLRi4z3Qw,1630
+femagtools/__init__.py,sha256=D8otEc8xuOdu07QoHG52Sy0kZeiKTeAr_zSFfuJoaoE,1630
 femagtools/airgap.py,sha256=E3VywQpzJ5aaw7StGaf0xgbDqrWqO7vWhFXPh0I76bY,2250
 femagtools/amazon.py,sha256=r9RRZVjKe6A7HUoRHmVpP-y1zfgJNvcPgW7mmeukvpk,12122
 femagtools/amela.py,sha256=3z5X0DIF560CjrKH9xUeejDzCVyBkbCUg6ZbK5uoU1Q,9741
@@ -31,14 +31,14 @@ femagtools/mcv.py,sha256=SgrwppH61dJ653TTtTdjuvKZMOZBt9Tf3-8ApV_NK8s,38043
 femagtools/me.py,sha256=XNK0l-aroNYfKyxV_uslE8q3vJb_KuntAYTWd-4FQaQ,1833
 femagtools/model.py,sha256=OtQDZGGr4GlrprWbOPf1TJ-VF65kq2ix-02yFv7QD_g,14106
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
-femagtools/multiproc.py,sha256=sKA9XttvyaR4SdI8J-n9ugoEQ-tSb0UzYnragUTkfng,7958
+femagtools/multiproc.py,sha256=WWx0Tmm9O5VqF5nKH7n_9cqSuvXZ95i4VJ26MzTYI0c,8265
 femagtools/mxw2msh.py,sha256=6FytyRtxMAO5vWRgZRWCQs04RFq7qiRy6hjOGb8NwpM,1841
 femagtools/nc.py,sha256=o2-pjhl6EBh0ffriYkAVkvxQYwcmeEv_tlaeQ9ZD1X4,12781
 femagtools/netlist.py,sha256=CSCl8setLZ_L8DCnNWaNA3-wLe1yo-fmzARZoVvYfaA,2052
 femagtools/ntib.py,sha256=76g1ZO3Fq_kN-HTMBvaKvJmMMlJMyEPFeNAcJPq3w7Y,3099
 femagtools/opt.py,sha256=Oak-C1_5iFZonwokB3ezB52fcZi5yiUEffjG1Tmgag8,8685
-femagtools/parstudy.py,sha256=b1BhWHkZ7hQRXB4DchHI1oOXzZpBjmAWCU9NDByCMuI,18327
-femagtools/plot.py,sha256=uaAcwoshLfjSxrk4bUNkSgO1PyJKrbMxrsm7EriksDY,57800
+femagtools/parstudy.py,sha256=pxK3nBtYTSA9fbVdLUYB7Ic5N34bv7vl2qD8h3GnDSM,18733
+femagtools/plot.py,sha256=b0FFLK3s72FhM1NVaGnytdSq7VfyAI7ZF_pba2eSQu0,57795
 femagtools/poc.py,sha256=MN5DRL4vHycNzXSTt9kjuZP1yZ2I02NmrKQFsmRcbF0,6536
 femagtools/tks.py,sha256=jgQ5dpKNPZg0ydwNGLBVjsL5WRsjfk9FtkZt3eoX79I,5791
 femagtools/ts.py,sha256=vm3GzLG6lzkg_Z84U-ZCgYHhev-PPtNuGs1q-CKJ4rA,47280
@@ -58,9 +58,9 @@ femagtools/dxfsl/machine.py,sha256=nSWp0CaGrqBNSXEUDZ5qbuSVw5zUTsb7H1LfnNj0syY,2
 femagtools/dxfsl/plotrenderer.py,sha256=f7ZTnD0HCLBzurUsVAqqZskTzLeKfhqtfHL32mXZcA4,12311
 femagtools/dxfsl/shape.py,sha256=Y8P30bCHwUFsL4j-dy2hFiKi_1SPH9b6pNFI3vt9b0A,43088
 femagtools/machine/__init__.py,sha256=xGjvNHfqZAuReCN98-6CpqwRIyfXPQAMZiSqAdqo9V8,5613
-femagtools/machine/effloss.py,sha256=Oslf991lwfQ2d5sXSVt2FFM-wCORwSRf89V8SNzuU6U,5477
+femagtools/machine/effloss.py,sha256=UyoGT4UJkhQH8XLeNNp2z1HeojSeNTyj28D-PSV7ZWs,5604
 femagtools/machine/im.py,sha256=hZlt66sf8x9H2Z5jdSzYoLPVUE11i1G1frPpYYuDi64,34847
-femagtools/machine/pm.py,sha256=DoNCXnH97xUm6mO8WrBowY2jifL05QSCd45CB5bRyaU,30632
+femagtools/machine/pm.py,sha256=MfVYidX4ds2m0k9xt9iKf_H6csriwQOB0MK-WWH15kA,30631
 femagtools/machine/sizing.py,sha256=4y4nShJYHBJTepl70tGUNqKhR2rd1bY5jZ0wektiDng,21743
 femagtools/machine/sm.py,sha256=tYGqTuA49GUUsqGKurxUhgH5oCBNF0kjZ8SOjViN7Kc,14584
 femagtools/machine/utils.py,sha256=QPmc7KbH6WuIMfroVO5h70LLcAPx2ioejxEvsS2cZzs,16143
@@ -129,9 +129,9 @@ femagtools/templates/statorRing.mako,sha256=sDgDmk71EoE8d4e9cmyqKqRldfC8uKMmpHEj
 femagtools/templates/statorRotor3.mako,sha256=ipLrcve3Fjf3kWJB3hGmeoMgxmqLlX3gEfCuO3Zi2HI,4073
 femagtools/templates/stator_msh.mako,sha256=Neze1ielMCk7TrARyhOra91fFQVT8Phsgk2Omt_aMG8,1799
 femagtools/templates/torq_calc.mako,sha256=9Dxrf8XeMhA7mz2orBRGq8s1RG6Tn2RTAdDaBQkqzxg,1761
-femagtools-1.2.5.dist-info/LICENSE,sha256=V5OED7AzEaOtvbfgNheKOSUeNtijvKQuo84FtSJNkJU,1316
-femagtools-1.2.5.dist-info/METADATA,sha256=nJmyL0kgqDhFN2dC180gPsSP2DeA1-20qBABP1DTWMA,5714
-femagtools-1.2.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-femagtools-1.2.5.dist-info/entry_points.txt,sha256=FZpd7JumQdJo-AZUyRA8-aJthK85jg37_qjRoDTY-Mo,191
-femagtools-1.2.5.dist-info/top_level.txt,sha256=DScrn5RiUYKtaEVgcG3AMSWDUd2N8uqxk-gZY-2CaYk,11
-femagtools-1.2.5.dist-info/RECORD,,
+femagtools-1.2.6.dist-info/LICENSE,sha256=V5OED7AzEaOtvbfgNheKOSUeNtijvKQuo84FtSJNkJU,1316
+femagtools-1.2.6.dist-info/METADATA,sha256=nT7PaH7xSrJ5H-52OGi3GhSptzzoKLyeky-W2SzpIH4,5714
+femagtools-1.2.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+femagtools-1.2.6.dist-info/entry_points.txt,sha256=FZpd7JumQdJo-AZUyRA8-aJthK85jg37_qjRoDTY-Mo,191
+femagtools-1.2.6.dist-info/top_level.txt,sha256=DScrn5RiUYKtaEVgcG3AMSWDUd2N8uqxk-gZY-2CaYk,11
+femagtools-1.2.6.dist-info/RECORD,,