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

femagtools/__init__.py

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

femagtools/bch.py

@@ -284,7 +284,7 @@ class Reader:
                 nue = np.arange(0, 5*n).tolist()
                 order, tq = np.array(
                     [(n, b)
-                     for n, b in zip(nue, f['nue'])]).T
+                     for n, b in zip(nue, f['nue']) if b > 1e-15 and 2*n % poles == 0]).T
                 self.torque_fft = [
                     {'order': order.tolist(),
                      'torque': tq.tolist()}]
@@ -1028,7 +1028,7 @@ class Reader:
         e.g. : idList[-450, -350, -250, -150, -50, 0]
                idList[-500, -400, -300, -200, -100, 0, 0]
         '''
-        diff = np.around(np.abs(np.diff(idList[1:]) - np.diff(idList)[:-1]), 1)
+        diff = np.floor(np.abs(np.diff(idList)))
         if idList[-1] == 0 and len(idList) > 2 and \
            not np.all(diff == diff[0]):
             idList = idList[:-1]

femagtools/dxfsl/functions.py

@@ -11,6 +11,7 @@ from __future__ import print_function
 import logging
 import numpy as np
 import copy
+import time
 
 logger = logging.getLogger('femagtools.functions')
 
@@ -112,9 +113,11 @@ def round_point(p, n):
     return (round(p[0], n), round(p[1], n))
 
 
-def line_m(p1, p2):
+def line_m(p1, p2, none_val=None, dec=0):
     if np.isclose(p2[0]-p1[0], 0.0):
-        return None
+        return none_val
+    if dec > 0:
+        return round((p2[1]-p1[1]) / (p2[0]-p1[0]), dec)
     return (p2[1]-p1[1]) / (p2[0]-p1[0])
 
 
@@ -241,6 +244,14 @@ def points_are_close(p1, p2, rtol=1e-05, atol=1e-08):
             np.isclose(p1[1], p2[1], rtol, atol))
 
 
+def point_greater_equal(p1, p2, rtol=1e-05, atol=1e-08):
+    if not (p1 and p2):
+        return False
+    if np.isclose(p1[0], p2[0], rtol, atol):  # x equal
+        return greater_equal(p1[1], p2[1], rtol, atol)  # y >= equal
+    return greater_equal(p1[0], p2[0], rtol, atol)  # x >= equal
+
+
 def nodes_are_equal(n1, n2):
     if not (n1 and n2):
         return False
@@ -275,6 +286,14 @@ def normalise_angle(alpha):
     return alpha
 
 
+def positive_angle(alpha):
+    """ returns a positive value for angle alpha
+    """
+    while alpha < 0.0:
+        alpha += 2*np.pi
+    return alpha
+
+
 def is_same_angle(angle1, angle2, atol=0.001):
     """ returns true if angles are equal
     """
@@ -404,3 +423,31 @@ def points_on_arc(center, radius, startangle, endangle, parts=8):
     for alpha in angles_on_arc(start, end, parts=parts):
         yield (center[0] + radius * np.cos(alpha),
                center[1] + radius * np.sin(alpha))
+
+
+class Timer(object):
+    def __init__(self, start_it=False):
+        self.starttime = None
+        if start_it:
+            self.start()
+
+    def __str__(self):
+        if self.starttime is None:
+            return "Timer is not running"
+        stop = time.perf_counter()
+        return "Timer is already running for %0.4f seconds" % (stop - self.starttime)
+
+    def start(self):
+        if self.starttime is not None:
+            logger.error("Timer is already on")
+        self.starttime = time.perf_counter()
+
+    def stop(self, fmt=None):
+        if self.starttime is None:
+            logger.error("Timer is not running")
+        stop = time.perf_counter()
+        sec = stop - self.starttime
+        self.starttime = None
+        if fmt:
+            logger.info(fmt, sec)
+        return sec

femagtools/dxfsl/machine.py

@@ -271,10 +271,18 @@ class Machine(object):
     def undo_mirror(self):
         assert(self.is_mirrored())
         assert(self.previous_machine)
-        self.set_alfa_and_corners()
+        self.previous_machine.clear_mirror()
+        self.previous_machine.set_alfa_and_corners()
         self.previous_machine.set_kind(self.geom.kind)
         return self.previous_machine
 
+    def clear_mirror(self):
+        self.mirror_orig_geom = None
+        self.mirror_geom = None
+        self.mirror_startangle = 0.0
+        self.mirror_endangle = 0.0
+        self.geom.mirror_corners = []
+
     def rotate_to(self, new_startangle):
         if np.isclose(new_startangle, self.startangle):
             return
@@ -328,9 +336,12 @@ class Machine(object):
 
         if len(self.airgaps) > 0:
             airgap_candidates = []
+            prv_radius = 0
             for g in self.airgaps:
                 gap_radius = round((g[0]+g[1])/2.0, 6)
                 gap_dist = g[1] - g[0]
+                prv_dist = g[0] - prv_radius
+                prv_radius = g[1]
                 circle = Circle(Element(center=self.center,
                                         radius=gap_radius))
                 ok, borders = self.geom.is_airgap(self.center,
@@ -341,12 +352,10 @@ class Machine(object):
                 if not ok:
                     logger.error("FATAL: No Airgap with radius {}".
                                  format(gap_radius))
-                    print("FATAL: No Airgap with radius {}".
-                          format(gap_radius))
                     self.geom.airgaps.append(circle)
                     return True  # bad exit
 
-                airgap_candidates.append((borders, circle, gap_dist))
+                airgap_candidates.append((borders, circle, gap_dist, prv_dist))
                 self.geom.airgaps.append(circle)
 
                 if correct_airgap > 0.0:
@@ -379,7 +388,7 @@ class Machine(object):
             logger.debug("end airgap: radius=%s", self.airgap_radius)
             return False  # correct airgap set
 
-        gaps = [c for b, c, d in airgap_candidates if b == 0]
+        gaps = [c for b, c, d, prv_d in airgap_candidates if b == 0]
 
         if len(gaps) == 1:  # one candidate without border intersection
             self.airgap_radius = gaps[0].radius
@@ -407,7 +416,7 @@ class Machine(object):
         dist = 999
         circle = None
         pos_list = []
-        for b, c, d in airgap_candidates:
+        for b, c, d, prv_d in airgap_candidates:
             if get_one:
                 logger.info(" --- {}   (width={})".format(c.radius, d))
             else:
@@ -419,10 +428,14 @@ class Machine(object):
             inner_pc = (c.radius - self.geom.min_radius) / \
                        (self.geom.max_radius - self.geom.min_radius)
             pos = np.abs(inner_pc * 100 - 50)
-            logger.debug("Abstand Mitte = {} %".format(pos))
+            logger.debug("Abstand Mitte in % = {}".format(pos))
+            prv_dist_percent = int(round(prv_d / self.geom.max_radius, 2) * 100)
+            logger.debug("Abstand Vorheriger abs=%s in prz=%s (%s)",
+                         prv_d, prv_dist_percent, self.geom.max_radius)
             if pos < 20:
                 pos_list.append([pos, d, c])
-
+            elif prv_dist_percent <= 1:
+                pos_list.append([prv_dist_percent, d, c])
         if get_one:
             if pos_list:
                 dist_list = [[d, c] for pos, d, c in pos_list]

femagtools/isa7.py

@@ -868,9 +868,17 @@ class Isa7(object):
         except AttributeError:
             pass
 
-        try:
-            el_fe_ind = [np.array(reader.el_fe_induction_1).T/1000,
-                         np.array(reader.el_fe_induction_2).T/1000]
+        try: 
+            flx_fac = 1000
+            if isinstance(reader.el_fe_induction_1, list): 
+                pass
+            else: 
+                if reader.el_fe_induction_1.dtype == 'int16': 
+                    flx_fac = 1000
+                else: 
+                    flx_fac = 1
+            el_fe_ind = [np.array(reader.el_fe_induction_1).T/flx_fac,
+                        np.array(reader.el_fe_induction_2).T/flx_fac]
             eddy_cu_vpot = np.array(reader.eddy_cu_vpot).T/1000
             if len(el_fe_ind[0].shape) == 4:
                 pdim = self.pos_el_fe_induction.shape[0]
@@ -891,8 +899,9 @@ class Isa7(object):
                         n += 1
                     if n > 0:
                         shape.append(n)
-            el_fe_ind = [np.array([[reader.el_fe_induction_1[0][0][:shape[0]]]]).T/1000,
-                         np.array([[reader.el_fe_induction_2[0][0][:shape[0]]]]).T/1000]
+
+            el_fe_ind = [np.array([[reader.el_fe_induction_1[0][0][:shape[0]]]]).T/flx_fac,
+                        np.array([[reader.el_fe_induction_2[0][0][:shape[0]]]]).T/flx_fac]
             eddy_cu_vpot = np.array([[reader.eddy_cu_vpot[0][0][:shape[0]]]]).T/1000
 
         self.el_fe_induction_1 = el_fe_ind[0]

femagtools/machine/__init__.py

@@ -33,7 +33,7 @@ def create_from_eecpars(temp, eecpars, lfe=1, wdg=1):
     rlfe = lfe
     rwdg = wdg
     opts = {k: eecpars[k] for k in ('zeta1', 'gam', 'kh', 'kpfe',
-                                    'kfric_b') if k in eecpars}
+                                    'kfric_b', 'kpmag') if k in eecpars}
     try:
         opts['rotor_mass'] = rlfe*eecpars['rotor_mass']
     except KeyError:

femagtools/machine/effloss.py

@@ -309,7 +309,7 @@ def efficiency_losses_map(eecpars, u1, T, temp, n, npoints=(60, 40),
     if isinstance(m, (PmRelMachine, SynchronousMachine)):
         plfe1 = m.kpfe*m.iqd_plfe1(*iqd, f1)
         plfe2 = m.kpfe*m.iqd_plfe2(iqd[0], iqd[1], f1)
-        plmag = m.iqd_plmag(iqd[0], iqd[1], f1)
+        plmag = m.kpmag*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)
         tfric = m.tfric

femagtools/machine/pm.py

@@ -203,7 +203,7 @@ class PmRelMachine(object):
         if n > 1e-3:
             f1 = self.p*n
             plfe = self.kpfe * (self.iqd_plfe1(iq, id, f1) + self.iqd_plfe2(iq, id, f1))
-            pmag = self.iqd_plmag(iq, id, f1)
+            pmag = self.kpmag * self.iqd_plmag(iq, id, f1)
             return (plfe + pmag + self.pfric(n))/(2*np.pi*n)
         return 0
 
@@ -1261,7 +1261,14 @@ class PmRelMachineLdq(PmRelMachine):
         return self.betai1_plfe2(*betai1(iq, id), f1)
 
     def betai1_plmag(self, beta, i1, f1):
-        return self._losses['magnet'](beta, i1)*(f1/self.fo)**2
+        r = self._losses['magnet'](beta, i1)*(f1/self.fo)**2
+        try:
+            idx = np.argwhere(r < 0)
+            if len(idx.squeeze()): 
+                r[idx.squeeze()] = 0.0
+        except: 
+            pass 
+        return r
 
     def iqd_plmag(self, iq, id, f1):
         return self.betai1_plmag(*betai1(iq, id), f1)

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

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

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=Rw6Z2_8l-e7ExzcB5j-qNHtHUxu2HC_SbKQaDRTOQLQ,1615
+femagtools/__init__.py,sha256=UUpTqpPxTE9-KNmWFDhqdB2Sy56sR68HZdRSYl0X3BA,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=gDQnL6xxW5e-BeWwIqLm6dLTMzfU6_3oDQhoUeHihSA,71677
+femagtools/bch.py,sha256=lw90KDHoC2NNHLYBupUXrJQRt-8yDeV-7usH4ZwkFJk,71680
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
 femagtools/condor.py,sha256=J8z9iBdvrGu3I1eFNoyKV8AXzRoTEPGLSak6cXUQxAM,10766
 femagtools/conductor.py,sha256=rXO7c7Qh_s7JpgILmLd4IbG64vP6Eh143YF9u25Mdwg,1076
@@ -23,7 +23,7 @@ femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
 femagtools/grid.py,sha256=s7LfKKLm2H4-cza2kSEANq6vwxq10Su3TJl3kHShHRA,1561
 femagtools/hxy.py,sha256=PkiZ_-CRhtvtpkmLAP8iMtwvzh7CjKGGcAbOhFb4Nls,6275
-femagtools/isa7.py,sha256=5v0f2wF9quf3ZTFSbLnQuQW1kIETvVwSVHwhMi0PNTk,58044
+femagtools/isa7.py,sha256=cUZx9fpxZgkw2G-cnveR-X-_lWP7Z1Q88MCysLl9MFI,58336
 femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
 femagtools/job.py,sha256=dOatzr10nIda76CjVRSS0SfEWC8_BAw0kowli523qbY,11320
 femagtools/losscoeffs.py,sha256=dlSYDS13RqpPHLdv_EPWIA9liwhqjbxUiN7t7GFPZhw,5397
@@ -53,16 +53,16 @@ femagtools/dxfsl/converter.py,sha256=6BCwlVp0PiSZ4Wj-YDgl7ynWNN2SBuwxw5VnNQ55Y9w
 femagtools/dxfsl/corner.py,sha256=UI1MLlVmiTBURywsOnXnXV7eBABoENc6ortkW_3GYH8,1266
 femagtools/dxfsl/dumprenderer.py,sha256=n4AvInjvGIaC2iKZtQaYXXDyJVSQ3uEOFOLD4-xfKRY,1861
 femagtools/dxfsl/fslrenderer.py,sha256=C4oonLPzKb_9IKvpm-fMvbhQZqtP_7xWG5bzpq8P1CY,23377
-femagtools/dxfsl/functions.py,sha256=Y861cXEWTLVpC5iKOSDqRQ4Idbk4OqQQD-qFK-s8_20,10107
+femagtools/dxfsl/functions.py,sha256=5G1MSAVaC4NOpQ_YBZ1SHPsmnvbQsnmg3rLjN3d5mBs,11463
 femagtools/dxfsl/geom.py,sha256=bAZtk_GIO7anaBeZKZhWHGyt9L-t_F1YglCgRc0oU48,163051
-femagtools/dxfsl/machine.py,sha256=RxUjn4Ak2o4ThwjYK7AkKuSK7SyqYFZDUOnMe9yFEBE,41543
+femagtools/dxfsl/machine.py,sha256=ftqLiwCyrzekUSvAOVD9AIM4hrPrIpId7PhLKwvSpWs,42158
 femagtools/dxfsl/plotrenderer.py,sha256=dIOM8p3UNTlqypxuPcLCegOaK19j3-ahelZ8hneLJ6k,12710
 femagtools/dxfsl/shape.py,sha256=4onAfXaVUWxC9C2WXVLYi3UH6w2lhUHxuLjdFgQOqks,48302
-femagtools/machine/__init__.py,sha256=xMypyugPeEe7qHBAn2UWjiHdVYYfP6eoO56k1ZIEBss,7165
+femagtools/machine/__init__.py,sha256=U8W65K7jr7jDdC1KnJh0WjYd8DFaLnIFVvlh-TKcV94,7174
 femagtools/machine/afpm.py,sha256=hNyDFRLGmCuWRPZl_u1ztJ4pA-Y_mxLaVvg3UJkzRuE,24766
-femagtools/machine/effloss.py,sha256=aaSmmxKd_KWMasHUHipYDcZOw-fvTHNa38MWFnpVock,13130
+femagtools/machine/effloss.py,sha256=I8s2Fog6klhgcRYw3448qfGvzaQ0AQUJXFdNoeDyhfE,13138
 femagtools/machine/im.py,sha256=ScIOLrlc4CPLYFNx2MmJqkpmbky_HXxFGZbMWUNGBrk,37881
-femagtools/machine/pm.py,sha256=cGOdcUzMyBYJotQB8_tj93_2pwK9tml4GuSet80HgnM,56042
+femagtools/machine/pm.py,sha256=R8RWzQrMI_fNaUU7ruHnQxg3-Lubh1vp-6EG6z5QbRk,56229
 femagtools/machine/sizing.py,sha256=aN_OahewjTTBHnpRNfLh1AGFhqnoeZVuMBeb_3MCIVI,23096
 femagtools/machine/sm.py,sha256=pkik913kU41PPiUpwDy_6BEKfCIhvY6FEp-fbU2Lqew,34320
 femagtools/machine/utils.py,sha256=g9q4j9KxUWdb_iUOUQDuaAwwJx8XM0kZMpgnwsNz8hU,18616
@@ -200,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.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,,
+femagtools-1.6.2.dist-info/LICENSE,sha256=V5OED7AzEaOtvbfgNheKOSUeNtijvKQuo84FtSJNkJU,1316
+femagtools-1.6.2.dist-info/METADATA,sha256=_Fn2D61D0C-a96X_49iBhYauUSoeaM6AAR28-QDL1is,5685
+femagtools-1.6.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+femagtools-1.6.2.dist-info/entry_points.txt,sha256=UXpu6KnrykN89sCUaFAIIzn_dYwuxizUS0GcPdoekro,195
+femagtools-1.6.2.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.6.2.dist-info/RECORD,,