femagtools 1.7.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

femagtools/__init__.py

@@ -2,7 +2,7 @@
 
 """
 __title__ = 'femagtools'
-__version__ = '1.7.0'
+__version__ = '1.7.1'
 __author__ = 'Ronald Tanner'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2023-2024 Gamma Technology'

femagtools/dxfsl/area.py

@@ -81,6 +81,7 @@ class Area(object):
         global area_number
         area_number += 1
         self.id = area_number
+        self.is_child = False
         self.areas_inside = {}
         self.areas_of_group = []
 
@@ -431,12 +432,14 @@ class Area(object):
                 d = distance(p1, p2)
                 gap_list.append((d, (p1, p2), dist_id, a.get_id()))
 
-        d, p1, p2 = a.get_nearest_point(center, radius, rightangle)
-        if p1:
-            gap_list.append((d, (p1, p2), dist_id, a.get_id()))
-        d, p1, p2 = a.get_nearest_point(center, radius, leftangle)
-        if p1:
-            gap_list.append((d, (p1, p2), dist_id, a.get_id()))
+        if rightangle is not None:
+            d, p1, p2 = a.get_nearest_point(center, radius, rightangle)
+            if p1:
+                gap_list.append((d, (p1, p2), dist_id, a.get_id()))
+        if leftangle is not None:
+            d, p1, p2 = a.get_nearest_point(center, radius, leftangle)
+            if p1:
+                gap_list.append((d, (p1, p2), dist_id, a.get_id()))
         if not gap_list:
             return []
         gap_list.sort()
@@ -1553,74 +1556,6 @@ class Area(object):
             for i in a.nested_areas_inside():
                 yield i
 
-    def crunch_area(self, geom):
-        n1_prev = None
-        e_prev = None
-        logger.debug("crunch area %s", self.identifier())
-
-        if self.is_circle():
-            return 0
-
-        c = 0
-        for n1, n2, e in self.list_of_elements():
-            if e_prev is not None:
-                if len([nbr for nbr in geom.g.neighbors(n1)]) == 2:
-                    e_new = e_prev.concatenate(n1_prev, n2, e)
-                    if e_new is not None:
-                        e_prev_dict = geom.g.get_edge_data(n1_prev, n1)
-                        e_dict = geom.g.get_edge_data(n1, n2)
-
-                        logger.debug("--> remove from %s to %s [%s, %s, %s]",
-                                     n1_prev,
-                                     n1,
-                                     e_prev_dict[0],
-                                     e_prev_dict[1],
-                                     e_prev_dict[2])
-                        logger.debug("    remove %s", e_prev)
-                        geom.remove_edge(e_prev)
-
-                        logger.debug("--> remove from %s to %s [%s, %s, %s]",
-                                     n1,
-                                     n2,
-                                     e_dict[0],
-                                     e_dict[1],
-                                     e_dict[2])
-                        logger.debug("    remove %s", e)
-                        if e.get_node_number(n1) == 1:
-                            flag1 = e_dict[1]
-                            flag2 = e_dict[2]
-                        else:
-                            flag1 = e_dict[2]
-                            flag2 = e_dict[1]
-                        geom.remove_edge(e)
-
-                        logger.debug("--> add from %s to %s",
-                                     n1_prev,
-                                     n2)
-                        logger.debug("    add %s", e_new)
-                        geom.add_edge(n1_prev, n2, e_new)
-
-                        e_new_dict = geom.g.get_edge_data(n1_prev, n2)
-                        e_new_dict[0] = True
-                        if e_new.get_node_number(n1_prev) == 1:
-                            e_new_dict[1] = flag1
-                            e_new_dict[2] = flag2
-                        else:
-                            e_new_dict[1] = flag2
-                            e_new_dict[2] = flag1
-
-                        logger.debug("    new dict: [%s, %s, %s]",
-                                     e_new_dict[0],
-                                     e_new_dict[1],
-                                     e_new_dict[2])
-                        e_prev = e_new
-                        c += 1
-                        continue
-
-            n1_prev = n1
-            e_prev = e
-        return c
-
     def __str__(self):
         return "Area {}\n".format(self.id) + \
             "distance...............: from {} to {}\n".\

femagtools/dxfsl/areabuilder.py

@@ -33,7 +33,7 @@ def disable_logging():
     logger.debug("Logging level %s disabled", original_log_level)
 
     # Set the log level to a higher level, e.g., WARNING or CRITICAL
-    logging.disable(logging.CRITICAL)
+    logging.disable(logging.ERROR)
 
 
 def enable_logging():
@@ -338,7 +338,11 @@ class EdgeInfo(object):
         return True  # two lines
 
     def arc_line_direction_lefthand(self, start_edge, line_edge, builder):
-        logger.debug("begin of arc_line_direction_lefthand")
+        logger.info("begin of arc_line_direction_lefthand")
+        if not self.is_arc():
+            logger.critical("FATAL: unexpected %s at position %s", self.classname(), self.n1)
+            sys.exit(1)
+
         assert(self.is_arc())
         assert(line_edge.is_line())
         start_edge.log_edge(":::: start")
@@ -844,10 +848,12 @@ class AreaBuilder(object):
         logger.debug("=== Area Group List ===")
         self.set_edge_attributes()
         errors = 0
+        disable_logging()
         for k in group_keys:
             if not self.build_group_area(group_list[k]):
                 logger.warning("Creation of an areagroup failed")
                 errors += 1
+        enable_logging()
 
         t = timer.stop("areagroups created in %0.4f seconds")
         logger.debug("end of create_area_groups: %s groups created",

femagtools/dxfsl/converter.py

@@ -26,6 +26,9 @@ def plot_geom(doit, plt, geom, title="Plot", areas=True):
     logger.info("Prepare Plot %s", title)
     plt.render_elements(geom, Shape,
                         draw_inside=areas,
+                        draw_groups=False,
+                        draw_phi=True,
+                        critical=True,
                         title=title,
                         show=True,
                         with_corners=True,
@@ -165,6 +168,7 @@ def build_machine_rotor(machine, inner, mindist, plt, single=False):
     if machine.is_mirrored():
         logger.debug("Rotor is mirrored")
         machine_temp = machine.undo_mirror()
+        machine_temp.delete_tiny_elements(mindist)
         machine_temp.geom.set_rotor()
         machine_temp.search_rotor_subregions(single=single)
     else:
@@ -198,7 +202,6 @@ def build_machine_rotor(machine, inner, mindist, plt, single=False):
         machine_temp.rebuild_subregions(single=single)
 
     machine_temp.geom.recalculate_magnet_orientation()
-    machine_temp.delete_tiny_elements(mindist)
     if inner:
         machine_temp.create_inner_corner_areas()
 
@@ -220,6 +223,7 @@ def build_machine_stator(machine, inner, mindist, plt, single=False):
     if machine.has_mirrored_windings():
         logger.debug("undo mirrored windings")
         machine_temp = machine.undo_mirror()
+        machine_temp.delete_tiny_elements(mindist)
         machine_temp.geom.set_stator()
         machine_temp.search_stator_subregions(single=single)
         machine_temp.create_mirror_lines_outside_windings()
@@ -228,7 +232,6 @@ def build_machine_stator(machine, inner, mindist, plt, single=False):
     if machine_temp.create_auxiliary_lines():
         machine_temp.rebuild_subregions(single=single)
 
-    machine_temp.delete_tiny_elements(mindist)
     if inner:
         machine_temp.create_inner_corner_areas()
 
@@ -245,7 +248,7 @@ def build_machine_stator(machine, inner, mindist, plt, single=False):
 def convert(dxfile,
             rtol=1e-04,
             atol=1e-03,
-            mindist=0.0,
+            mindist=0.01,
             symtol=0.001,
             sympart=0,
             split=False,
@@ -271,9 +274,13 @@ def convert(dxfile,
     conv = {}
 
     input_file = Path(dxfile)
+    if not input_file.is_file():
+        logger.error("File %s is not available", input_file)
+        sys.exit(1)
+
     basename = input_file.stem
     if part:
-        logger.info("***** start processing %s *****", basename)
+        logger.info("***** start processing %s (%s) *****", basename, part)
     else:
         logger.info("***** start processing %s *****", basename)
     timer = Timer(start_it=True)
@@ -281,7 +288,8 @@ def convert(dxfile,
     journal = getJournal(name='converter', aktiv=debug_mode)
     journal.get_journal(input_file.name)
     journal.put_filename(str(input_file.resolve()))
-    journal.put('success', False)
+    journal.set('success', False)
+    journal.write_journal()
 
     if part:
         if part[0] not in ('rotor', 'stator'):
@@ -527,6 +535,9 @@ def convert(dxfile,
                                                  p)
         machine_inner.sync_with_counterpart(machine_outer)
 
+        machine_inner.search_critical_elements(mindist)
+        machine_outer.search_critical_elements(mindist)
+
         logger.info("***** END of work: %s *****", basename)
 
         if machine_inner.geom.is_rotor():
@@ -674,6 +685,7 @@ def convert(dxfile,
                                   rows=3,  # rows
                                   cols=2,  # cols
                                   num=3)   # start num
+        machine.delete_tiny_elements(mindist)
 
         if da > 0.0 or dy > 0.0:
             if inner:
@@ -709,7 +721,6 @@ def convert(dxfile,
         else:
             machine.search_subregions(single=True)
 
-        machine.delete_tiny_elements(mindist)
         machine.create_inner_corner_areas()
 
         logger.info("***** END of work: %s *****", basename)
@@ -727,6 +738,7 @@ def convert(dxfile,
                               with_nodes=False,
                               neighbors=False,
                               write_id=write_id,
+                              draw_phi=True,
                               fill_areas=True)
         elif small_plots:
             #p.figure().suptitle(input_file.name, fontsize=16)
@@ -737,6 +749,7 @@ def convert(dxfile,
                               with_nodes=False,
                               neighbors=False,
                               write_id=write_id,
+                              draw_phi=True,
                               fill_areas=True)
 
         if show_plots or small_plots:
@@ -765,11 +778,12 @@ def convert(dxfile,
             fslrenderer = FslRenderer(basename)
             conv['fsl'] = fslrenderer.render(machine, inner, outer)
 
-    conv.update(params)
+    if params is not None:
+        conv.update(params)
     conv['name'] = basename
     t = timer.stop("-- all done in %0.4f seconds --", info=True)
     journal.put('time_total', t)
-    journal.put('success', True)
+    journal.set('success', True)
     return conv
 
 

femagtools/dxfsl/geom.py

@@ -283,6 +283,7 @@ class Geometry(object):
         self.has_magnets = False
         self.journal = getJournal()
         self.area_errors = 0
+        self.critical_points = []
         i = 0
 
         logger.debug("Geometry(split=%s, concat=%s, connect=%s, delete=%s, adjust=%s, main=%s,",
@@ -1829,6 +1830,10 @@ class Geometry(object):
         for area in magnets:
             area.render_magnet_phi(renderer, length)
 
+    def render_critical(self, renderer):
+        for e in self.critical_points:
+            e.render(renderer, 'darkred')
+
     def get_points_in_iron(self):
         points = []
         for area in self.list_of_areas():
@@ -2459,6 +2464,49 @@ class Geometry(object):
         #        logger.info(" ++ %s", id)
         logger.debug("end set_areas_inside_for_all_areas")
 
+    def set_groups_inside_for_all_areas(self):
+        logger.debug("begin set_groups_inside_for_all_areas")
+
+        groups_inside = {}
+        groups = {}
+        areas_outside = []
+        for area in self.list_of_areas():
+            grouplist = [a for a in self.areagroup_list
+                         if area.is_inside(a, self)]
+            if not grouplist:
+                continue
+            groups_inside = {g.id: g for g in grouplist}
+            area.areas_inside = groups_inside
+            areas_outside.append(area)
+            for g in  grouplist:
+                alist = groups.get(g.id, [])
+                alist.append(area)
+                groups[g.id] = alist
+
+        outside_id = [a.id for a in areas_outside]
+        logger.debug("Areas outside: %s", outside_id)
+
+        for id in groups.keys():
+            if len(groups[id]) > 1:
+                logger.warning("Attention: nested groups of areas")
+                self.journal.put("warning", "nested groups of areas")
+                areas = groups[id]
+                main_area = areas[0]
+                main_size = main_area.area_size()
+                for a in areas[1:]:
+                    sz = a.area_size()
+                    if sz < main_size:
+                        main_area = a
+                        main_size = sz
+                assert(main_area is not None)
+                main_area.is_child = True
+                for area in areas:
+                    if area.id != main_area.id:
+                        del area.areas_inside[id]
+
+        logger.debug("end set_areas_inside_for_all_areas")
+        return areas_outside
+
     def get_minmax_magnet(self):
         logger.debug("get_minmax_magnet")
         maglist = [a for a in self.list_of_areas() if a.is_magnet()]
@@ -2472,21 +2520,26 @@ class Geometry(object):
     def create_auxiliary_lines(self, rightangle, leftangle):
         logger.debug("begin of create_auxiliary_lines")
         timer = Timer(start_it=True)
+        done = False
 
-        # for future (next release)
-        # area_list = self.list_of_areas()
-        # builder = AreaBuilder(geom=self)
-        # builder.create_area_groups(area_list)
-        # self.areagroup_list = builder.area_list
-
-        self.set_areas_inside_for_all_areas()
-
-        logger.debug("-> start create_auxiliary_lines")
+        if True:  # new style
+            logger.debug("-> start create_auxiliary_lines")
+            area_list = self.list_of_areas()
+            builder = AreaBuilder(geom=self)
+            builder.create_area_groups(area_list)
+            self.areagroup_list = builder.area_list
+            area_list = self.set_groups_inside_for_all_areas()
+            for area in area_list:
+                if self.create_aux_lines(area, rightangle, leftangle):
+                    done = True
+        else:
+            logger.debug("-> start create_auxiliary_lines")
+            self.set_areas_inside_for_all_areas()
+            done = False
+            for area in self.list_of_areas():
+                if self.create_aux_lines(area, rightangle, leftangle):
+                    done = True
 
-        done = False
-        for area in self.list_of_areas():
-            if self.create_aux_lines(area, rightangle, leftangle):
-                done = True
         t = timer.stop("-- auxiliary lines in %0.4f seconds --")
         self.journal.put('time_auxiliary_lines', t)
         logger.debug("end of create_auxiliary_lines")
@@ -2505,6 +2558,10 @@ class Geometry(object):
 
         aux_color = 'red'
         aux_linestyle = 'dotted'
+        if area.is_child:
+            logger.debug("Area %s is a child of another nested area", area.id)
+            rightangle = None
+            leftangle = None
 
         areas_border = {a.get_id(): a for a in areas_inside
                         if area.has_connection(self, a, ndec)}
@@ -2861,7 +2918,7 @@ class Geometry(object):
         edges = self.search_tiny_elements(mindist)
         if not edges:
             logger.debug("-- no tiny elements found")
-            return
+            return 0
 
         deleted = 0
         for edge in edges:
@@ -2901,8 +2958,27 @@ class Geometry(object):
 
         if deleted:
             logger.debug("%s tiny elements deleted", deleted)
+            self.journal.put("tiny_elements_deleted", deleted)
         logger.debug("end of delete_tiny_elements")
-        return
+        return deleted
+
+    def search_critical_elements(self, mindist):
+        for n in self.g.nodes():
+            nbrs = self.get_neighbors(n)
+            if len(nbrs) < 3:
+                continue
+            critical_point = False
+            critical_dist = 9999
+            for nbr in nbrs:
+                e = self.get_edge_element(n, nbr)
+                if e.is_tiny(mindist):
+                    critical_point = True
+                    critical_dist = min(critical_dist, e.length())
+            if critical_point:
+                logger.debug("Warning: maybe critical point %s", n)
+                self.journal.put("maybe_critical_points", (n, critical_dist))
+                c = Circle(Element(center=n, radius=1))
+                self.critical_points.append(c)
 
     def check_shaft_area(self, shaft):
         for a in self.list_of_areas():
@@ -3319,7 +3395,8 @@ class Geometry(object):
         if builder.create_area_groups(areas):
             return  # bad
         group_list = builder.area_list
-        self.areagroup_list = group_list
+        # for debugging
+        # self.areagroup_list = group_list
         for group in group_list:
             if not group.is_magnet_rectangle():
                 logger.debug("Warning: group is not a rectangle")

femagtools/dxfsl/journal.py

@@ -102,6 +102,11 @@ class Journal(object):
         if self.get_total('appendices_deleted') > 0:
             self.put_warning("Problem with appendices")
 
+    def set(self, name, val):
+        if not self.data:
+            return
+        self.data[name] = val
+
     def put(self, name, val):
         if not self.data:
             return

femagtools/dxfsl/machine.py

@@ -1069,7 +1069,10 @@ class Machine(object):
         return self.geom.has_magnets
 
     def delete_tiny_elements(self, mindist):
-        self.geom.delete_tiny_elements(mindist)
+        return self.geom.delete_tiny_elements(mindist)
+
+    def search_critical_elements(self, mindist):
+        self.geom.search_critical_elements(mindist)
 
     def create_arc(self, radius,
                    color='red', linestyle='dotted',

femagtools/dxfsl/plotrenderer.py

@@ -207,6 +207,7 @@ class PlotRenderer(object):
         draw_inside = kwargs.get('draw_inside', False)
         draw_groups = kwargs.get('draw_groups', False)
         draw_phi = kwargs.get('draw_phi', False)
+        critical = kwargs.get('critical', False)
         fill_areas = kwargs.get('fill_areas', False)
         write_id = kwargs.get('write_id', False)
         with_legend = kwargs.get('with_legend', True)
@@ -308,6 +309,9 @@ class PlotRenderer(object):
         if draw_phi:
             geom.render_magnet_phi(self)
 
+        if critical:
+            geom.render_critical(self)
+
         if with_center and geom.center:
             self.point(geom.center, 'o', color='darkgreen')
             x_min = min(x_min, geom.center[0]-5)

femagtools/machine/sizing.py

@@ -310,7 +310,7 @@ def get_stator_dimensions(par, slots=[]):
     bns = taus*(Da+2*hs1) - bds
 
     hns = (-bns + np.sqrt(bns**2 + 4*ans*np.tan(taus)))/2/np.tan(taus)
-    hys = psi1/2/lfe*By
+    hys = psi1/2/lfe/By
 
     # airgap and yoke diameter
     airgap = par['airgap']

{femagtools-1.7.0.dist-info → femagtools-1.7.1.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-femagtools/__init__.py,sha256=EYWHBDOxDAUDvC6zezPTQAc32r4rSi4VgkvM4coG6f8,1600
+femagtools/__init__.py,sha256=J7PZIYNxvDe7bKOlKKN7KqkIMJCh3y9ziNTJ9-b6-xY,1600
 femagtools/airgap.py,sha256=ZCIZTYf6BbuNYx68y9fUDBQo3taN8RuGl8q-jJ7ygiA,1577
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
 femagtools/amela.py,sha256=pHjfXzpANI-7oz8MtrqNcyDZ6PxVM91vCJuvYhHy1rk,13891
@@ -47,21 +47,21 @@ femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
 femagtools/windings.py,sha256=6ioABZRWQ3xA4kmEz2NUkXh-C-FmW9YYkjQKs5YakQs,22197
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
-femagtools/dxfsl/area.py,sha256=tfkTwnrkFcw9OVYGXFvrsDMAka06Ed_mplJ8Cp5FaIg,59234
-femagtools/dxfsl/areabuilder.py,sha256=QBjfFyAnhZQN5LmqkNnxauPRLhiAGar0S1nsf4NT6y8,34001
+femagtools/dxfsl/area.py,sha256=cYnDtnEuwuDW5R1NKV0s8PUzzQzxhgCUktFqHAjP9K8,56581
+femagtools/dxfsl/areabuilder.py,sha256=Siu11yRcNJiSCWwc865-OvuVhSmLtRQWysbe1-rUcN0,34197
 femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
 femagtools/dxfsl/conv.py,sha256=GeRYUvbdcP5vKtNm5S5gU1yyMboGkGNyOqzkHpYbEEo,10086
-femagtools/dxfsl/converter.py,sha256=ihWGlLyuE5CmQL9lk-KilgbcMhzvKUltTHyHOoLG95g,31835
+femagtools/dxfsl/converter.py,sha256=ZxOfF3bUQ2VXRjnUwDaAis3eRI-SiNEuM0UnSDpwda8,32353
 femagtools/dxfsl/corner.py,sha256=-XPBcnEau-2-SRHLYzlBqCQGaFfgm_DH2qR1mSaFoAs,1311
 femagtools/dxfsl/dumprenderer.py,sha256=n4AvInjvGIaC2iKZtQaYXXDyJVSQ3uEOFOLD4-xfKRY,1861
 femagtools/dxfsl/dxfparser.py,sha256=kyXG0kZfNyOgn96MqBgP8RhOQhppfB5NbyRNNybs1C0,13451
 femagtools/dxfsl/femparser.py,sha256=O8940Q1Mz8MKng6W8M3s9KfTvhDLJ56tfQWtZEW3xMM,2134
 femagtools/dxfsl/fslrenderer.py,sha256=DBE7qDlwIE5K8qD8ne7iNyaEVwHrpyis2TX1spteLsA,24979
 femagtools/dxfsl/functions.py,sha256=F0AjzHfIfq3v-mhDzUOeq3zeYQCEsJl1-XpEyJQsSnQ,11805
-femagtools/dxfsl/geom.py,sha256=1IQGcPj7Fjj88EKqjd_UadoOCqeLraR9R0hOcbEkEIQ,162242
-femagtools/dxfsl/journal.py,sha256=_ZNBnM1gtl0eW6eV_sZ6nCpBNOsF_rnla0st8bKbeks,4159
-femagtools/dxfsl/machine.py,sha256=0NjJ9-ar820rkKV3lqCJ95-4iiAEdn5WhsmoD3w2bps,49228
-femagtools/dxfsl/plotrenderer.py,sha256=xoDT2Xh2N-OONACGOL8K6LHTHH5aRQ4EvohGt--EOD0,13713
+femagtools/dxfsl/geom.py,sha256=-hPErBLyAsDh-aq2s54psFqG2AaNr9jVeKMeEVUQF5E,165356
+femagtools/dxfsl/journal.py,sha256=S17B7wsrq5QzIUbjgg0ntvnpgH0thHq9aQXO7GdYlQQ,4265
+femagtools/dxfsl/machine.py,sha256=3leWkjdMCLX2HgMhw8gNdxTKROhNCKU7KQrDVbBQ8DI,49337
+femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6R_c,13823
 femagtools/dxfsl/shape.py,sha256=ZmWw7VTSJs5rcY1Lh99MKo804mO7dSGHdKMIh-nVBow,59904
 femagtools/dxfsl/svgparser.py,sha256=R8V2V5jE6JyVfzshJVaPgsSuMlQf_pwJTFvrTrKDxZ0,2905
 femagtools/dxfsl/symmetry.py,sha256=0WeDq_z42A_cjG4m_vREDWyx-wqHqXDkoCT2eXh2EMo,38084
@@ -70,7 +70,7 @@ femagtools/machine/afpm.py,sha256=hNyDFRLGmCuWRPZl_u1ztJ4pA-Y_mxLaVvg3UJkzRuE,24
 femagtools/machine/effloss.py,sha256=sLB8AXYVAE_AL1Ca41A2EDbn9_7u6xNjaYFjmRPoTDg,13578
 femagtools/machine/im.py,sha256=3Y54AHMZfAjkvgexx2E-5jxNWzaVQ-SyaETCh7gNBYA,38008
 femagtools/machine/pm.py,sha256=N4UEpOEYpvJzGjWt4SLOpgMrjzoSYyuxpi-8wlT1U5A,58565
-femagtools/machine/sizing.py,sha256=YsvQye2hN-v_GLDeODmFrHkNQlkNWpQ9CkrZ0maS93k,23328
+femagtools/machine/sizing.py,sha256=BYaPEWrU1IDbnyRzC2MlQBA0MXaiK8sx1wD7Pn21XX8,23328
 femagtools/machine/sm.py,sha256=ubS7mK2dibhwUpGwyY-23hoZbLrVqAtPeXVmqF657lg,37781
 femagtools/machine/utils.py,sha256=ckPOfaaieRbThMKkBtCtoCMsehdbePH8xNoWPmNoS3Y,18782
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
@@ -193,7 +193,7 @@ tests/test_nc.py,sha256=kIFUOlFy_jQUjLnS9wuy6c2YkPOrKyXlMtGxDIJnXsw,4205
 tests/test_parident.py,sha256=WWCyRgqqX3bcp0Q7Pwxz4dN2kklIm5E7kBvqkO9m718,1340
 tests/test_parstudy.py,sha256=wk7WfYQrx5dtv6MnmWCfNAEInvRKsbVXYEUIIR9zLbQ,3200
 tests/test_pocfile.py,sha256=eiMLBRQxDnHIGiqku6EXcQ3fb7wGIxhXmb20iyLlPRU,5816
-tests/test_sizing.py,sha256=8tIT8DG1c28aSwkPD4qPryKk3sU2JhXWLYYxhmDQMbM,1131
+tests/test_sizing.py,sha256=NJ0FPlHx88lvqITSJ0sypE9HENd09WOMRRWea6a7zrk,1132
 tests/test_sm.py,sha256=FjcAbx4n7kLH00kjnKoGMk6t4_V9TJzIaxM21MkrOjE,83524
 tests/test_tksreader.py,sha256=8QtPAzxPJbkpxd1Nw2I7ggaTaKaL4WY55JJBHkZAzus,766
 tests/test_ts.py,sha256=tR2x5cKU9gw2fUprzaPgPbCvmDOHDO36JUPCCoTlY7Y,1833
@@ -210,9 +210,9 @@ tests/moo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.7.0.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
-femagtools-1.7.0.dist-info/METADATA,sha256=g4DD1r1-fho5dUKJw-PG64StC94fHJCUiBpqT0c0Js8,6147
-femagtools-1.7.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-femagtools-1.7.0.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.7.0.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.7.0.dist-info/RECORD,,
+femagtools-1.7.1.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.7.1.dist-info/METADATA,sha256=nm1a5JYXOmQ6qXk7AgIZES-VbkKq9kVeSqok7Jx3u7I,6147
+femagtools-1.7.1.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+femagtools-1.7.1.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.7.1.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.7.1.dist-info/RECORD,,

{femagtools-1.7.0.dist-info → femagtools-1.7.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_sizing.py

@@ -16,7 +16,7 @@ def test_im():
                                      sigmas=fs, Ba=0.77,
                                      cos_phi=0.8, eta=0.8,
                                      lda=0.9, rtype='statorRotor3')
-    assert round(r['outer_diam'], 3) == 0.19
+    assert round(r['outer_diam'], 3) == 0.182
     assert r['stator']['num_slots'] == 36
 
 
@@ -33,7 +33,7 @@ def test_spm():
                                       Hc=700, sigmas=fs, brem=1.1, Ba=0.77,
                                       cos_phi=0.7, eta=0.8, demag=1.7,
                                       lda=0.9)
-    assert round(r['outer_diam'], 3) == 0.19
+    assert round(r['outer_diam'], 3) == 0.18
     assert r['stator']['num_slots'] == 24