femagtools 1.6.2__tar.gz → 1.6.2a0__tar.gz

{femagtools-1.6.2/src/femagtools.egg-info → femagtools-1.6.2a0}/PKG-INFO

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

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

{femagtools-1.6.2 → femagtools-1.6.2a0}/src/femagtools/machine/pm.py

@@ -681,17 +681,23 @@ class PmRelMachine(object):
             iq, id, T = self.mtpa(i1max)
             w1type = self.w1_umax(u1max, iq, id)
         Pmax = w1type/self.p*T
-        w1max = 2*np.pi*speedmax*self.p
-        # check max speed:
-        if with_pmconst:
-            iq, id, tq = self.iqd_pmech_imax_umax(
-                speedmax, Pmax, i1max, u1max,
-                with_mtpa, with_tmech)
-        else:
-            iq, id, tq = self.iqd_imax_umax(
-                i1max, w1max, u1max,
-                T, with_mtpv=False,
-                with_tmech=with_tmech)
+        sp = speedmax
+        while sp > w1type/2/np.pi/self.p:
+            w1max = 2*np.pi*sp*self.p
+            try:
+                if with_pmconst:
+                    iq, id, tq = self.iqd_pmech_imax_umax(
+                        sp, Pmax, i1max, u1max,
+                        with_mtpa, with_tmech)
+                else:
+                    iq, id, tq = self.iqd_imax_umax(
+                        i1max, w1max, u1max,
+                        T, with_mtpv=False,
+                        with_tmech=with_tmech)
+                break
+            except ValueError:
+                sp -= 5e-2*speedmax
+        speedmax = sp
         i1 = betai1(iq, id)[1]
         if (abs(i1max) >= i1
             and round(u1max, 1) >= round(np.linalg.norm(
@@ -922,6 +928,8 @@ class PmRelMachine(object):
 
             if speedrange[-1] < speedrange[-2]:
                 speedrange = speedrange[:-1]
+            if speedrange[-1] < nmax:
+                logger.warning("adjusted nmax %f -> %f", nmax, speedrange[-1])
             logger.info("Speedrange T=%g Nm %s", Tf, speedrange)
             n3 = speedrange[-1]
             nstab = [int(nsamples*(x1-x2)/n3)
@@ -1264,10 +1272,10 @@ class PmRelMachineLdq(PmRelMachine):
         r = self._losses['magnet'](beta, i1)*(f1/self.fo)**2
         try:
             idx = np.argwhere(r < 0)
-            if len(idx.squeeze()): 
+            if len(idx.squeeze()):
                 r[idx.squeeze()] = 0.0
-        except: 
-            pass 
+        except:
+            pass
         return r
 
     def iqd_plmag(self, iq, id, f1):

{femagtools-1.6.2 → femagtools-1.6.2a0/src/femagtools.egg-info}/PKG-INFO

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