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

femagtools/__init__.py

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

femagtools/bch.py

@@ -53,7 +53,7 @@ def sttylosses(losses):
     """map losses of stator subregions to stteeth and styoke"""
     # extract stator subregion names
     sregs = set([k for k in losses.keys()
-                 if k.split('_')[-1] not in {'hyst', 'eddy'} and
+                 if k.split('_')[-1] not in {'hyst', 'eddy', 'excess'} and
                  k not in {'rotor', 'magnet', 'speed'}])
 
     def hysteddy(yoke, teeth, losses):
@@ -65,6 +65,8 @@ def sttylosses(losses):
             d['stteeth_hyst'] = losses[teeth+'_hyst']
             d['styoke_eddy'] = losses[yoke+'_eddy']
             d['stteeth_eddy'] = losses[teeth+'_eddy']
+            d['styoke_excess'] = losses[yoke+'_excess']
+            d['stteeth_excess'] = losses[teeth+'_excess']
         except KeyError:
             pass
         return d
@@ -87,6 +89,7 @@ def sttylosses(losses):
         try:
             l['stteeth_eddy'] += losses['STTP_eddy']
             l['stteeth_hyst'] += losses['STTP_hyst']
+            l['stteeth_excess'] += losses['STTP_excess']
         except KeyError:
             pass
         return l
@@ -1168,6 +1171,12 @@ class Reader:
         for s in subregs[:-2] + ['rotor', 'magnet']:
             cols += [s+'_hyst', s+'_eddy']
         if m:
+            # FEMAG-2024.2
+            if len(m[0]) > len(subregs[:-1])*2+2: 
+                cols = []
+                for s in subregs[:-2] + ['rotor', 'magnet']:
+                    cols += [s+'_hyst', s+'_eddy', s+'_excess']
+
             m = np.array(m).T
             if self.ldq:
                 ls.update({k: np.reshape(v[:mlen],
@@ -1570,6 +1579,8 @@ class Reader:
                             x[0] = int(x[0])
                             if len(losses[part][k][0]) == 4:
                                 cols = ('order_el', 'freq', 'hyst', 'eddy')
+                            if len(losses[part][k][0]) == 6:
+                                cols = ('order_mech', 'order_el', 'freq', 'hyst', 'eddy', 'excess')
                             if losses[part][k]:
                                 self.losses[-1][part][k] = {
                                     k1: l
@@ -1619,6 +1630,8 @@ class Reader:
                     elif len(rec) == 5:  # FEMAG Rel 8.3 with el/mech order
                         losses[part][k].append([floatnan(x)
                                                 for i, x in enumerate(rec)])
+                    elif len(rec) == 6:
+                        losses[part][k].append([floatnan(x) for x in rec])
                     else:
                         part = 'fft'
 

femagtools/dxfsl/area.py

@@ -8,7 +8,6 @@
   Authors: Ronald Tanner, beat Holm
 """
 from __future__ import print_function
-import sys
 import numpy as np
 import networkx as nx
 import logging
@@ -103,7 +102,7 @@ class Area(object):
         except ValueError as e:
             logger.error("list_of_nodes(): FATAL ERROR: %s", e)
             return
-        except Exception as e:
+        except Exception:
             return
 
     def list_of_elements(self):
@@ -132,7 +131,7 @@ class Area(object):
         except ValueError as e:
             logger.error("list_of_elements(): FATAL ERROR: %s", e)
             return
-        except Exception as e:
+        except Exception:
             return
 
     def has_fsl(self):

femagtools/dxfsl/converter.py

@@ -142,19 +142,25 @@ def convert(dxfile,
             logger.warn("distance yoke (dy) ignored")
             dy = 0.0
 
+    split_ini = split
+    split_cpy = False
+    if not (part or view_only):
+        split_ini = False
+        split_cpy = split
+
     try:
         if dxfile.split('.')[-1] == 'fem':
             basegeom = Geometry(femshapes(dxfile),
                                 rtol=rtol,
                                 atol=atol,
-                                split=split)
+                                split=split_ini)
         else:
             basegeom = Geometry(dxfshapes(dxfile,
                                           mindist=mindist,
                                           layers=layers),
                                 rtol=rtol,
                                 atol=atol,
-                                split=split)
+                                split=split_ini)
     except FileNotFoundError as ex:
         logger.error(ex)
         return dict()
@@ -230,6 +236,7 @@ def convert(dxfile,
                                      endangle=2*np.pi,
                                      airgap=True,
                                      inside=True,
+                                     split=split_cpy,
                                      delete_appendices=True)
 
         machine_inner = symmetry_search(machine_inner,
@@ -248,6 +255,7 @@ def convert(dxfile,
                                      endangle=2*np.pi,
                                      airgap=True,
                                      inside=False,
+                                     split=split_cpy,
                                      delete_appendices=True)
 
         machine_outer = symmetry_search(machine_outer,

femagtools/dxfsl/fslrenderer.py

@@ -151,7 +151,7 @@ class FslRenderer(object):
 
         n = 0
         for d, e in el_sorted:
-            d_percent = min( 1.0, d / dist)
+            d_percent = min(1.0, d / dist)
             if ndt_list[n][0] < d_percent:
                 self.agndst = ndt_list[n][1] * self.agndst
                 self.content.append(u'\nndt({}*agndst)\n'.
@@ -356,7 +356,6 @@ class FslRenderer(object):
                                  geom.end_corners[0][0],
                                  geom.end_corners[0][1])]  # min xy4
 
-
         self.content.append(u'if parts_gen > 1 then')
         if geom.corners_dont_match():
             txt = [u'  -- Warning: corners dont match',

femagtools/dxfsl/functions.py

@@ -148,6 +148,10 @@ def area_size(points):
 def middle_point_of_arc(center, radius, p1, p2, rtol=1e-3, atol=1e-8):
     alpha_p1 = alpha_line(center, p1)
     alpha_p2 = alpha_line(center, p2)
+    if alpha_p1 < 0.0:
+        alpha_p1 += np.pi * 2.0
+    if alpha_p2 < 0.0:
+        alpha_p2 += np.pi * 2.0
 
     if np.isclose(alpha_p1, alpha_p2, rtol, atol):
         return p1
@@ -167,23 +171,13 @@ def middle_point_of_arc(center, radius, p1, p2, rtol=1e-3, atol=1e-8):
 
 
 def middle_angle(alpha1, alpha2):
-    a1 = normalise_angle(alpha1)
-    a2 = normalise_angle(alpha2)
-
-    if np.isclose(a1, a2):
-        return a1
-
-    if greater_equal(a1, 0.0):
-        if a2 < a1:
-            a2 += 2.0*np.pi
-    else:
-        if less_equal(a2, a1):
-            a1 += 2.0*np.pi
-
-    if np.isclose(a1, a2):
-        return copy.copy(a1)
-
-    return (a1+a2)/2.0
+    if alpha1 < 0.0:
+        alpha1 += np.pi * 2.0
+    if alpha2 < 0.0:
+        alpha2 += np.pi * 2.0
+    if alpha2 < alpha1:
+        alpha2 += np.pi * 2.0
+    return normalise_angle((alpha1 + alpha2) / 2.0)
 
 
 def third_angle(alpha1, alpha2):
@@ -203,7 +197,7 @@ def third_angle(alpha1, alpha2):
     if np.isclose(a1, a2):
         return copy.copy(a1)
 
-    return (a1+a2)/3.0
+    return normalise_angle((a1+a2)/3.0)
 
 
 def middle_point_of_line(p1, p2):
@@ -324,21 +318,21 @@ def gcd(x, y):
     return x+y
 
 
-def is_angle_outside(startangle, endangle, alpha):
-    return not is_angle_inside(startangle, endangle, alpha)
+def is_angle_outside(startangle, endangle, alpha, rtol=1e-08, atol=1e-08):
+    return not is_angle_inside(startangle, endangle, alpha, rtol=rtol, atol=atol)
 
 
-def is_angle_inside(startangle, endangle, alpha):
+def is_angle_inside(startangle, endangle, alpha, rtol=1e-08, atol=1e-08):
     start = normalise_angle(startangle)
     end = normalise_angle(endangle)
     mid = normalise_angle(alpha)
 
-    if np.isclose(start, end, 1e-08):
+    if np.isclose(start, end, rtol=rtol, atol=atol):
         # In diesem Fall ist alles 'inside'
         return True
-    if np.isclose(mid, start, 1e-08):
+    if np.isclose(mid, start, rtol=rtol, atol=atol):
         return True
-    if np.isclose(mid, end, 1e-08):
+    if np.isclose(mid, end, rtol=rtol, atol=atol):
         return True
 
     if end < start:
@@ -352,7 +346,8 @@ def is_angle_inside(startangle, endangle, alpha):
 
 
 def is_point_outside_region(p, center, inner_radius, outer_radius,
-                            startangle, endangle):
+                            startangle, endangle,
+                            rtol=1e-08, atol=1e-08):
     alpha = alpha_line(center, p)
     if is_angle_outside(startangle, endangle, alpha):
         return True
@@ -362,10 +357,12 @@ def is_point_outside_region(p, center, inner_radius, outer_radius,
 
 def is_point_inside_region(p, center,
                            inner_radius, outer_radius,
-                           startangle, endangle):
+                           startangle, endangle,
+                           rtol=1e-08, atol=1e-08):
     return not is_point_outside_region(p, center,
                                        inner_radius, outer_radius,
-                                       startangle, endangle)
+                                       startangle, endangle,
+                                       rtol=rtol, atol=atol)
 
 
 def get_angle_of_arc(startangle, endangle):