femagtools 1.8.16__tar.gz → 1.8.17__tar.gz

{femagtools-1.8.16/src/femagtools.egg-info → femagtools-1.8.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: femagtools
-Version: 1.8.16
+Version: 1.8.17
 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.8.16 → femagtools-1.8.17}/src/femagtools/__init__.py

@@ -2,7 +2,7 @@
 
 """
 __title__ = 'femagtools'
-__version__ = '1.8.16'
+__version__ = '1.8.17'
 __author__ = 'Ronald Tanner'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2023-2025 Gamma Technology'

{femagtools-1.8.16 → femagtools-1.8.17}/src/femagtools/dxfsl/area.py

@@ -958,6 +958,23 @@ class Area(object):
             return False
         return True
 
+    def is_line_inside(self, p1, p2):
+        if self.is_point_inside(p1):
+            if self.is_point_inside(p2):
+                logger.debug("Border: Type of area %s is %s",
+                             self.identifier(), self.type)
+                return True
+            if self.the_point_is_inside_area(p2):
+                logger.debug("Inside: Type of area %s is %s",
+                             self.identifier(), self.type)
+                return True
+        elif self.is_point_inside(p2):
+            if self.the_point_is_inside_area(p1):
+                logger.debug("Inside: Type of area %s is %s",
+                             self.identifier(), self.type)
+                return True
+        return False
+
     def get_best_point_inside(self, geom):
         px1 = self.min_x - 5
         px2 = self.max_x + 5

{femagtools-1.8.16 → femagtools-1.8.17}/src/femagtools/dxfsl/converter.py

@@ -202,6 +202,18 @@ def build_machine_rotor(machine, inner, mindist, plt, EESM=False, single=False):
                   title="Rotor Magnet Slice after Rebuild")
 
     rebuild = False
+    if machine_temp.magnets_missing(EESM):
+        mag = machine_temp.looking_for_one_possible_magnet()
+        if mag:
+            if machine.is_mirrored():
+                rebuild = machine_temp.create_mirror_lines_outside_magnets()
+                if machine_temp.create_auxiliary_lines():
+                    rebuild = True
+                if rebuild:
+                    machine_temp.rebuild_subregions(EESM, single=single)
+                    machine_temp.geom.force_area_as_magnet(mag)
+            return machine_temp
+
     if machine_temp.has_magnets_in_the_middle():
         logger.debug("Magnets cut")
         rebuild = machine_temp.create_mirror_lines_outside_magnets()
@@ -432,10 +444,10 @@ def convert(dxfile,
             return dict(error='unknown location {}'.format(part[1]))
     else:
         if da:
-            logger.warn("distance airgap (da) ignored")
+            logger.warning("distance airgap (da) ignored")
             da = 0.0
         if dy:
-            logger.warn("distance yoke (dy) ignored")
+            logger.warning("distance yoke (dy) ignored")
             dy = 0.0
 
     split_ini = split
@@ -1064,7 +1076,7 @@ def create_femag_parameters_stator(motor, position):
         params['da1'] = 2*motor.geom.min_radius
     params['slot_area'] = motor.slot_area()
     params['stator'] = _create_stator_parameters(motor)
-    params['machine'] = motor
+    #params['machine'] = motor
     return params
 
 
@@ -1080,5 +1092,5 @@ def create_femag_parameters_rotor(motor, position):
         params['da1'] = 2*motor.geom.min_radius
     params['slot_area'] = motor.slot_area()
     params['rotor'] = _create_rotor_parameters(motor)
-    params['machine'] = motor
+    #params['machine'] = motor
     return params

{femagtools-1.8.16 → femagtools-1.8.17}/src/femagtools/dxfsl/fslrenderer.py

@@ -270,7 +270,7 @@ class FslRenderer(object):
         for area in geom.list_of_areas():
             if area.number_of_elements() > 1:
                 p = area.get_point_inside(geom)
-                if p:
+                if p and area.type > 0:
                     self.content.append("x0, y0 = {}, {}".format(p[0], p[1]))
                     # self.content.append("point(x0, y0, red, 4)")  # for debugging
                     self.content.append("create_mesh_se(x0, y0)")
@@ -324,7 +324,7 @@ class FslRenderer(object):
                         self.content.append(
                             'x0_shaft, y0_shaft = x0, y0')
 
-                self.content.append("\n")
+        self.content.append("create_mesh(x0, y0)\n")
 
         txt = ["if x0_iron_yoke > 0.0 then",
                "  if mcvkey_yoke ~= 'dummy' then",

{femagtools-1.8.16 → femagtools-1.8.17}/src/femagtools/dxfsl/geom.py

@@ -2612,6 +2612,7 @@ class Geometry(object):
             areas_inside = [a for a in self.area_list
                             if area.is_inside(a, self)]
             if not areas_inside:
+                area.areas_inside = {}
                 continue
 
             areas_notouch = {a.identifier(): a for a in areas_inside
@@ -3748,6 +3749,41 @@ class Geometry(object):
 
         logger.debug("end of search_unknown_subregions")
 
+    def possible_magnet_in_the_middle(self, midangle):
+        self.set_areas_inside_for_all_areas()
+        mags = []
+        for n, a in enumerate(self.list_of_areas()):
+            if a.areas_inside:
+                continue
+            if a.close_to_startangle or a.close_to_endangle:
+                continue
+            if np.isclose(a.min_dist, self.min_radius):
+                continue
+            if np.isclose(a.max_dist, self.max_radius):
+                continue
+
+            a_midangle = a.get_mid_angle(self.center)
+            if np.isclose(midangle, a_midangle, atol=1e-2, rtol=1e-2):
+                s = a.area_size()
+                mags.append([s, n, a])
+
+        if not mags:
+            return False
+        mags.sort(reverse=True)
+        s, n, a = mags[0]
+        a.set_type(AREA.TYPE_MAGNET_AIRGAP)
+        a.phi = midangle
+        a.mag_width = (a.max_dist - a.min_dist) * 0.9
+        return a
+
+    def force_area_as_magnet(self, area):
+        for a in self.list_of_areas():
+            if a.is_equal(area, 1e-2):
+                a.set_type(area.type)
+                a.phi = area.phi
+                a.mag_width = area.mag_width
+                return
+
     def magnets_in_the_middle(self, midangle):
         mag_areas = [a for a in self.list_of_areas()
                      if a.is_magnet()]
@@ -4188,28 +4224,11 @@ class Geometry(object):
                         return True
         return False
 
-    def _line_inside_magnets(self, p1, p2):
-        for area in self.list_of_areas():
-            if area.is_magnet():
-                if area.is_point_inside(p1):
-                    if area.is_point_inside(p2):
-                        return True
-        return False
-
-    def _line_inside_air(self, p1, p2):
-        for area in self.list_of_areas():
-            if area.is_air():
-                if area.is_point_inside(p1):
-                    if area.is_point_inside(p2):
-                        return True
-        return False
-
     def _line_inside_not_iron(self, p1, p2):
         for area in self.list_of_areas():
             if area.is_shaft() or area.is_air() or area.is_magnet():
-                if area.is_point_inside(p1):
-                    if area.is_point_inside(p2):
-                        return True
+                if area.is_line_inside(p1, p2):
+                    return True
         return False
 
     def inside_area_list(self, p):

{femagtools-1.8.16 → femagtools-1.8.17}/src/femagtools/dxfsl/machine.py

@@ -1259,6 +1259,11 @@ class Machine(object):
     def has_magnets(self):
         return self.geom.has_magnets
 
+    def magnets_missing(self, EESM):
+        if EESM:
+            return False
+        return not self.has_magnets()
+
     def delete_tiny_elements(self, mindist):
         return self.geom.delete_tiny_elements(mindist)
 
@@ -1320,6 +1325,11 @@ class Machine(object):
                                 self.endangle)
         return self.geom.magnets_in_the_middle(midangle)
 
+    def looking_for_one_possible_magnet(self):
+        midangle = middle_angle(self.startangle,
+                                self.endangle)
+        return self.geom.possible_magnet_in_the_middle(midangle)
+
     def create_mirror_lines_outside_windings(self):
         logger.debug("create_mirror_lines_outside_windings")
 

{femagtools-1.8.16 → femagtools-1.8.17/src/femagtools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: femagtools
-Version: 1.8.16
+Version: 1.8.17
 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