femagtools 1.6.2a0__tar.gz → 1.6.2a1__tar.gz

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

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

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

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

@@ -154,10 +154,6 @@ class PmRelMachine(object):
                 return torque - self.mtpa(i1)[2]
             i1 = so.fsolve(func, res.x[0])[0]
             return self.mtpa(i1)[:2]
-        def func(iq):
-            return torque - self.torque_iqd(iq, 0)
-        return so.fsolve(func, 0)[0]
-
 
         def tqiq(iq):
             return torque - self.torque_iqd(float(iq), 0)
@@ -169,29 +165,36 @@ class PmRelMachine(object):
         if np.abs(torque) < 1e-2:
             return (0, 0)
         if np.isscalar(iqd0):
-            i0 = self.io
+            tx = self.tmech_iqd(self.io[0], 0, n)
+            iq0 = min(0.9*self.i1range[1]/np.sqrt(2),
+                      np.abs(torque)/tx*self.io[0])
+            if torque < 0:
+                i0 = (-iq0, 0)
+            else:
+                i0 = (iq0, 0)
+            logger.debug("initial guess i0 %f -> %s tx %f torque %f",
+                        self.io[0], i0, tx, torque)
         else:
             i0 = iqd0
 
         if with_mtpa:
-            res = so.minimize(
-                lambda iqd: la.norm(iqd), i0, method='SLSQP',
-                constraints=({'type': 'eq',
-                              'fun': lambda iqd:
-                              self.tmech_iqd(*iqd, n) - torque}))
-            if res.success:
-                return res.x
-
-            #logger.warning("n: %s, torque %s: %s %s",
-            #                   60*n, torque, res.message, i0)
-            # try a different approach:
-            #raise ValueError(
-            #    f'Torque {torque:.1f} speed {60*n:.1f} {res.message}')
-            def func(i1):
-                return torque - self.mtpa_tmech(i1, n)[2]
-            i1 = so.fsolve(func, res.x[0])[0]
-            return self.mtpa_tmech(i1, n)[:2]
-
+            k=0
+            while k < 5:
+                res = so.minimize(
+                    lambda iqd: la.norm(iqd), i0, method='SLSQP',
+                    constraints=({'type': 'eq',
+                                  'fun': lambda iqd:
+                                  self.tmech_iqd(*iqd, n) - torque}))
+                if res.success:
+                    return res.x
+                # make new initial guess:
+                tx = self.tmech_iqd(*i0, n)
+                logger.debug("k %d new guess i0 %s tx %f torque %f",
+                            k, i0, tx, torque)
+                i0=(min(0.9*self.i1range[1]/np.sqrt(2), torque/tx*i0[0]), 0)
+                k += 1
+            raise ValueError(
+                f'Torque {torque} speed {n} {i0} {res.message}')
         def tqiq(iq):
             return torque - self.tmech_iqd(float(iq), 0, n)
         iq = so.fsolve(tqiq, (i0[0],))[0]
@@ -351,13 +354,13 @@ class PmRelMachine(object):
                                    beta)[0], i1)
 
             res = so.minimize(lambda iqd: np.linalg.norm(iqd), i0, method='SLSQP',
-                          constraints=(
-                              {'type': 'eq',
-                               'fun': lambda iqd:
-                               self.tmech_iqd(*iqd, n) - torque},
-                              {'type': 'ineq',
-                               'fun': lambda iqd:
-                               np.sqrt(2)*u1max - la.norm(self.uqd(w1, *iqd))}))
+                              constraints=(
+                                  {'type': 'eq',
+                                   'fun': lambda iqd:
+                                   self.tmech_iqd(*iqd, n) - torque},
+                                  {'type': 'ineq',
+                                   'fun': lambda iqd:
+                                   np.sqrt(2)*u1max - la.norm(self.uqd(w1, *iqd))}))
             iq, id = res.x
         else:
             iq, id = i0
@@ -365,12 +368,15 @@ class PmRelMachine(object):
             try:
                 log((iq,id))
             except:
-                pass  # logger is not correct
-        logger.debug("iqd_tmech_umax w1=%f torque=%f %f iq=%f id=%f u1 u1 %f %f",
+                pass
+        logger.debug("iqd_tmech_umax w1=%f torque=%f %f iq=%f id=%f u1 %f %f",
                      w1, torque, self.torque_iqd(iq, id), iq, id,
                      u1max, np.linalg.norm(
                          self.uqd(w1, iq, id))/np.sqrt(2))
-        return iq, id, self.tmech_iqd(iq, id, n)
+        u1 = np.linalg.norm(
+            self.uqd(w1, iq, id))/np.sqrt(2)
+        tq = self.tmech_iqd(iq, id, n)
+        return iq, id, tq
 
     def iqd_torque_umax(self, torque, w1, u1max, log=0, with_mtpa=True):
         """return d-q current and torque at stator frequency and max voltage
@@ -1143,7 +1149,11 @@ class PmRelMachineLdq(PmRelMachine):
         if np.any(beta[beta > np.pi]):
             beta[beta > np.pi] = beta - 2*np.pi
 
-        self.io = iqd((np.min(beta)+max(beta))/2, np.max(i1)/2)
+        self.betarange = min(beta), max(beta)
+        if min(beta) < -np.pi/2 and max(beta) > -np.pi/2:
+            self.io = iqd(-np.pi/4, np.max(i1)/2)
+        else:
+            self.io = iqd((np.min(beta)+max(beta))/2, np.max(i1)/2)
         kx = ky = 3
         if len(i1) < 4:
             ky = len(i1)-1
@@ -1165,7 +1175,6 @@ class PmRelMachineLdq(PmRelMachine):
             logger.warning("loss map missing: %s", e)
             pass
         if 'psid' in kwargs:
-            self.betarange = min(beta), max(beta)
             self.i1range = (0, np.max(i1))
             self.psid = ip.RectBivariateSpline(
                 beta, i1, np.sqrt(2)*np.asarray(kwargs['psid']),

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

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