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

femagtools/__init__.py

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

femagtools/bch.py

@@ -70,7 +70,7 @@ def sttylosses(losses):
         except KeyError:
             pass
         return d
-
+    
     if sregs == {'StYoke', 'StTeeth'}:
         return hysteddy('StYoke', 'StTeeth', losses)
     if sregs == {'StJo', 'StZa'}:
@@ -95,6 +95,21 @@ def sttylosses(losses):
         return l
     return {}
 
+def losses_mapping_external_rotor(losses): 
+    styoke = 'rotor'
+    rotor = 'Iron'    
+    d = {}
+    try:
+        d['styoke_hyst'] = losses[styoke+'_hyst']
+        d['rotor_hyst'] = losses[rotor+'_hyst']
+        d['styoke_eddy'] = losses[styoke+'_eddy']
+        d['rotor_eddy'] = losses[rotor+'_eddy']
+        d['styoke_excess'] = losses[styoke+'_excess']
+        d['rotor_excess'] = losses[rotor+'_excess']
+    except KeyError:
+        pass
+    return d
+
 
 def _readSections(f):
     """return list of bch sections
@@ -1150,6 +1165,10 @@ class Reader:
         m = []
         subregs = [name.split()[-1]
                    for name in content[2].split('\t') if name][2:]
+        # outer rotor motor
+        if 'Iron' in subregs and \
+            'Rotor' in subregs: 
+            self.external_rotor = True
         logger.info("Stator Subregions: %s", subregs)
         speed = float(content[0].split()[-1])/60.
         logger.info('losses for speed %f', speed)
@@ -1209,7 +1228,10 @@ class Reader:
                                          (nrows, ncols)).T.tolist()
                            for k, v in zip(cols, m[2:])})
         ls['speed'] = speed
-        ls.update(sttylosses(ls))
+        if self.external_rotor: 
+            ls.update(losses_mapping_external_rotor(ls))
+        else: 
+            ls.update(sttylosses(ls))
         if self.ldq:
             self.ldq['losses'] = ls
         elif self.psidq:
@@ -1464,6 +1486,10 @@ class Reader:
     def __read_losses(self, content):
         losses = {}
         i = 0
+        # check if external rotor 
+        if self.weights[0][1] == 0.0 and \
+            self.weights[0][-1] > 0: 
+            self.external_rotor = True
         # find results for angle:
         while True:
             try:
@@ -1521,8 +1547,12 @@ class Reader:
                     losses['total'] += losses['staza']+losses['stajo']
                 elif len(rec) == 1:
                     t = l.split(':')[-1].strip()
-                    if t == 'Iron':
-                        losses['staza'] = floatnan(rec[0])
+                    if t == 'Iron': 
+                        if self.external_rotor: 
+                            losses['rotfe'] = floatnan(rec[0])
+                            losses['total'] += losses['rotfe']
+                        else:
+                            losses['staza'] = floatnan(rec[0])
                     else:
                         losses['stajo'] += floatnan(rec[0])
                     losses['total'] += losses['staza']+losses['stajo']
@@ -1530,11 +1560,17 @@ class Reader:
                 continue
 
             if _rotloss.search(l):
+                if l.find('StZa') > -1: 
+                    self.external_rotor = True
                 rec = self.__findNums(content[i+2])
                 if len(rec) == 1:
-                    rotfe = floatnan(rec[0])
-                    losses['rotfe'] += rotfe
-                    losses['total'] += rotfe
+                    if self.external_rotor: 
+                        losses['staza'] = floatnan(rec[0])
+                        losses['total'] += losses['staza']
+                    else: 
+                        rotfe = floatnan(rec[0])
+                        losses['rotfe'] += rotfe
+                        losses['total'] += rotfe
                 i += 3
                 continue
 
@@ -1565,6 +1601,10 @@ class Reader:
                     if content[i+1].split() == ['rotf', '----']:
                         losses['rotfe'] = sum([floatnan(x) for x in rec])
                         losses['total'] += losses['rotfe']
+                    
+                    if content[i+1].split() == ['Iron', '----']: # external rotor
+                        losses['rotfe'] = sum([floatnan(x) for x in rec])
+                        losses['total'] += losses['rotfe']
                 i += 4
                 continue
 
@@ -1622,7 +1662,10 @@ class Reader:
                     l.find('RoZa') > -1:
                 k = 'staza'
             elif l.find('Iron') > -1 and l.find('Stator') > -1:
-                k = 'staza'
+                if self.external_rotor:
+                    k = 'rotor'
+                else:
+                    k = 'staza'
             elif l.find('Iron') > -1:
                 if self.external_rotor:
                     k = 'staza'

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/fslrenderer.py

@@ -550,7 +550,7 @@ class FslRenderer(object):
                     'ndt(agndst)',
                     'r1 = m.fc_radius - ag/6',
                     'x1, y1 = pr2c(r1, alfa)',
-                    'n = math.floor(r1*alfa/agndst + 1.5)',
+                    'n = math.floor(m.fc_radius*alfa/agndst + 1.5)',
                     'nc_circle_m(r1, 0, x1, y1, 0.0, 0.0, n)\n',
                     'r2 = m.fc_radius + ag/6',
                     'x2, y2 = pr2c(r2, alfa)',

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/pm.py

@@ -569,10 +569,9 @@ class PmRelMachine(object):
             if abs(du) > 0.1:
                 logger.debug('oops? iqd_imax_umax one more torque reduction')
                 if with_tmech:
-                    iq, id = self.iqd_tmech(torque, w1/2/np.pi/self.p,
-                                            iq, id)[:2]
+                    iq, id = self.iqd_tmech_umax(torque, w1, u1max)[:2]
                 else:
-                    iq, id = self.iqd_torque(torque)[:2]
+                    iq, id = self.iqd_torque_umax(torque, w1, u1max)[:2]
         if with_mtpv:
             try:
                 if with_tmech:
@@ -779,7 +778,7 @@ class PmRelMachine(object):
                                           maxtorque=T > 0)[:2])
                     w, _, ier, _ = so.fsolve(voltw1, wx, full_output=True)
                     logger.debug("fsolve ier %d T %f w %f w1 %f", ier, T, w, wx)
-                    if ier in (1, 4, 5):
+                    if ier == 1: #in (1, 4, 5):
                         if abs(w[0]) <= wx:
                             self.check_extrapolation = True
                             return [w/2/np.pi/self.p
@@ -788,6 +787,8 @@ class PmRelMachine(object):
                             wl += (wu-wl)/4
                         else:
                             wl = w[0]
+                    else:
+                        break
                 except ValueError as e:
                     logger.debug("%s: wx %f wl %f wu %f", e, wx, wl, wu)
                     wl = wx

femagtools/machine/sizing.py

@@ -5,6 +5,8 @@
 """
 import numpy as np
 import logging
+from ..windings import Winding
+from .utils import wdg_resistance
 
 logger = logging.getLogger("femagools.machine.sizing")
 
@@ -14,7 +16,7 @@ PM_DEFAULTS = dict(
     eta=0.92,  # efficiency
     cos_phi=0.95,  # power factor
     m=3,  # number of phases
-    ui_u=0.62,  # U ind / U
+    ui_u=0.64,  # U ind / U
     lda=1.33,  # length/taup ratio 0.5 .. sqrt(p)
     J=3.8e6,  # current density 3 .. 6 A/mm²
     sigmas=17e3,  # shear force 10 .. 45 kN/m2
@@ -25,10 +27,10 @@ PM_DEFAULTS = dict(
     mag_width=0.8,  # rel magnet width 0.6 .. 1
     Hc=700,  # max. coercitive field strength, 500 .. 900 kA/m
     brem=1.15,  # remanence 0.3 .. 1.3 T
-    demag=1.5,  # safety factor for demagnetisation
+    demag=6,  # safety factor for demagnetisation (nom current)
     external_rotor=False,
     coil_span=0,
-    hfe=1e-3  # iron height between magnet and airgap (IPM)
+    hfe=1.5e-3  # iron height between magnet and airgap (IPM)
 )
 """default sizing parameters for PM"""
 
@@ -88,10 +90,10 @@ def iron_losses(dy, lfe, hy, wt, ht, q1, B, f):
     return Wfe * dens*vol
 
 
-def wdg_resistance(w1, l, d):
-    S = 56e6  # conductivity of copper 1/Ohm m
-    a = np.pi*d**2/4
-    return 2*w1*l/S/a
+#def wdg_resistance(w1, l, d):
+#    S = 56e6  # conductivity of copper 1/Ohm m
+#    a = np.pi*d**2/4
+#    return 2*w1*l/S/a
 
 
 def check_symmetry_conditions(Q1, p, layers, m):
@@ -202,18 +204,22 @@ def _stator_slots(par, slots):
         par['Q1'] = Q1
         r = get_stator_dimensions(par)
         hb = r['hns']/r['bns']
+        logging.debug(f"Q1 {Q1} hs/bs {hb}")
         if hb > 5:
             break
-        if hb > 3:
-            q.append((Q1, Q1//np.gcd(Q1, p), abs(4-hb), r['kw']))
+        if hb > 2.5:
+            # ideal height/width ratio: 3.2
+            q.append((Q1, Q1//np.gcd(Q1, p), abs(3.2-hb), r['kw']))
 
     if q:
         qhbmin = np.argmin(q, axis=0)
-        logger.debug("q %s", q)
-        # check sim factor, height/width ratio, winding factor
+        logger.debug("q %s qhbmin %s", q, qhbmin)
+         # check sim factor, height/width ratio
         if qhbmin[1] == len(q)-1:
-            return q[qhbmin[1]][0]
+            # last has smallest sim factor
+             return q[qhbmin[1]][0]
         elif q[qhbmin[1]][2] < q[qhbmin[1]+1][2]:
+            # select ideal height/width ratio (3.2)
             return q[qhbmin[1]][0]
         return q[qhbmin[1]+1][0]
     return slotset[0]
@@ -222,7 +228,6 @@ def _stator_slots(par, slots):
 def get_stator_dimensions(par, slots=[]):
     # Check symmetry
     if 'Q1' in par:
-        from ..windings import Winding
         wdg = Winding({'Q': par['Q1'], 'p': par['p'], 'm': 3})
     # nominal (rated) operating parameters
     pnom = par['pnom']
@@ -237,7 +242,8 @@ def get_stator_dimensions(par, slots=[]):
 
     # pole width
     taup = np.pi * Da/(2*p)
-    lfe = taup*lda
+    lfe_q = par.get('lfe_q', 0.001)
+    lfe = lfe_q * round(taup*lda/lfe_q)
 
     if 'udc' in par:
         u1nom = 0.9*par['udc']/np.sqrt(2)/np.sqrt(3)  # phase voltage
@@ -254,8 +260,6 @@ def get_stator_dimensions(par, slots=[]):
     else:
         Q1 = par['Q1']
     coil_span = par.get('coil_span', 0)
-    if np.gcd(Q1, 2*p) == coil_span:
-        coil_span = 0
     layers = 1 if coil_span == 0 else 2
     req_poles = np.gcd(Q1, 2*p)
     if req_poles != 2*p:
@@ -282,7 +286,7 @@ def get_stator_dimensions(par, slots=[]):
     kw = kwz * kws
 
     # flux density amplitude of base harmonic
-    if 'brem' in par:
+    if 'mag_width' in par:
         mag_width = par['mag_width']
         Bd1 = 4.0/np.pi*Ba*np.sin(np.pi/2.0*mag_width)
     else:
@@ -293,8 +297,36 @@ def get_stator_dimensions(par, slots=[]):
     # stator winding
     psi1 = 2.0/np.pi*taup*lfe*Bd1
 
+    # number of turns per phase, first estimation
     Ui = Ui_U * u1nom
-    N = round(np.sqrt(2)*Ui/(2*np.pi*f1nom*kw*psi1), 1)
+    N = np.sqrt(2)*Ui/(2*np.pi*f1nom*kw*psi1)
+
+    # coils per phase and pole
+    # q = Q/2/p/m
+    # num wires per coil side (number of coil groups a)
+    # n = a*N / 2 / p / q
+
+    # feasible number of turns per coil...
+    ncoils = Q1 // 2 // m * layers
+    ngroups = [1] + [g for g in range(2, layers*p + 1) if layers * p % g == 0]
+    ndiff = [abs(N - ncoils // a * a * round(N / ncoils))
+             for a in ngroups]
+    logger.debug("N %f ngroups %s ndiffs %s",
+                 N, ngroups, ndiff)
+    a_calc = ngroups[np.argmin(ndiff)]
+    a = par.get("a", a_calc)
+    if not a in ngroups:
+        logger.warning("Check given number %s of parallel wdg groups. Valid ngroups are: %s",
+                       a, ngroups)
+    num_wires = round(a * N / ncoils)
+
+    # correction of number of turns per phase
+    N_old = N
+    N = num_wires * ncoils / a
+
+    # correction of voltage
+    Ui = Ui/N_old*N
+    u1nom = Ui/Ui_U
 
     # current loading
     # A = np.sqrt(2)*sigmas/kw/Ba
@@ -310,8 +342,14 @@ 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
 
+    aw = ans * kq / layers / num_wires
+    # round wire: pi*d²/4
+    dwire = 2 * np.sqrt(aw/np.pi)
+    wdg = Winding({'Q': Q1, 'p': p, 'm': 3, 'yd': coil_span, 'l': layers})
+    r1 = wdg_resistance(wdg, num_wires, a, aw, Da, hns, lfe)
+    relculen = 1.4
     # airgap and yoke diameter
     airgap = par['airgap']
     if par['external_rotor']:
@@ -336,9 +374,11 @@ def get_stator_dimensions(par, slots=[]):
         trv=round(1e-3*pnom/(2*np.pi*speednom)/(np.pi*Da1**2/4*lfe), 1),
         w1=int(N),
         kw=round(kw, 4),
-        q=qt,
+        q=wdg.q,
         i1=round(I1, 3),  # np.pi*Da1*A/2/m/N
-        psi1=round(psi1, 5))
+        psi1=round(psi1, 5),
+        u1=u1nom,
+        ui=Ui)
 
     slotwidth = np.floor(0.3*np.pi*Da1/Q1*2000+0.5)/2000.0
     tw = bds  # np.pi*(Da1+hns)/Q1 - bns
@@ -375,25 +415,14 @@ def get_stator_dimensions(par, slots=[]):
             wedge_width1=0,  # bns1,
             wedge_width2=0,
             middle_line=0 if layers < 2 else middle_line))
-    # coils per phase and pole
-    # q = Q/2/p/m
-    # num wires per coil side (number of coil groups a)
-    # n = a*N / 2 / p / q
-    ncoils = Q1//2//m*layers
-    ngroups = [1] + [g for g in range(2, p+1) if p%g == 0]
-    a = ngroups[np.argmin([abs(N-ncoils//a*round(a*N/ncoils))
-                           for a in ngroups])]
-    num_wires = round(a*N/ncoils)
-    dwire = 2*np.sqrt(ans*kq/layers/np.pi/num_wires)
-    relculen = 1.4
-    r1 = wdg_resistance(N, relculen*lfe, dwire)/a
+
     r['pcu'] = round(m*r1*I1**2, 1)
 
     r['winding'] = dict(
         wire_diam=round(dwire, 5),
         num_phases=m,
         cufilfact=kq,
-        culength=1.4,
+        culength=relculen,
         num_par_wdgs=a,
         num_layers=layers,
         resistance=round(r1, 4),
@@ -413,8 +442,7 @@ def _get_magnet_height(I1, N, kw, par):
     Hc = Hc*1e3  # unit kA/m
     # Safety Factor for demagnetization
     demag = par['demag']
-    I1max = 4*I1
-    THETA1 = m/np.pi*np.sqrt(2)*I1max*N*kw/p
+    THETA1 = m/np.pi*np.sqrt(2)*I1*N*kw/p
     # minimal magnet height with safety factor
     hM = THETA1/Hc*demag
     Br = par['brem']
@@ -698,6 +726,7 @@ def ipm(pnom: float, speed: float, p: int, **kwargs) -> dict:
         pnom=pnom, speed=speed, p=p)
     par.update(kwargs)
     _set_pm_defaults(par)
+    par.pop('mag_width')
 
     # stator and magnet parameters of interior mounted magnet machine
     r = get_stator_dimensions(par)

femagtools/machine/sm.py

@@ -102,6 +102,8 @@ def parident(workdir, engine, machine,
                 num_cur_steps=kwargs.get('num_cur_steps', 5),
                 num_beta_steps=kwargs.get('num_beta_steps', 13),
                 num_par_wdgs=machine[wdgk].get('num_par_wdgs', 1),
+                skew_angle=kwargs.get('skew_angle', 0.0),
+                num_skew_steps=kwargs.get('num_skew_steps', 0.0),
                 period_frac=kwargs.get('period_frac', 6),
                 speed=kwargs.get('speed', 50))
 
@@ -338,9 +340,9 @@ class SynchronousMachine(object):
     def torquemax(self, i1, iex):
         "returns maximum torque of i1, iex (nan if i1 out of range)"
         def torquei1b(b):
-            return -self.torque_iqd(*iqd(b[0], i1), iex)
+            return self.torque_iqd(*iqd(b[0], i1), iex)
         res = so.minimize(torquei1b, (0,))
-        return -res.fun
+        return res.fun
 
     def torquemin(self, i1, iex):
         "returns minimum torque of i1, iex (nan if i1 out of range)"
@@ -576,7 +578,7 @@ class SynchronousMachine(object):
         i1max: max. phase current (RMS)
         """
         if kwargs.get('i1max', 0):
-                w1type, T = self.w1_imax_umax(kwargs['i1max'], u1max)
+            w1type, T = self.w1_imax_umax(kwargs['i1max'], u1max)
         try:
             iq, id, iex = self.iqd_torque(T)
         except ValueError:

femagtools/nc.py

@@ -195,7 +195,7 @@ class Reader(object):
                 grp.variables['delta_node_angle'].getValue().data)
             self.poles_sim = int(grp.variables['poles_sim'].getValue().data)
             self.slots = int(grp.variables['num_slots'].getValue().data)
-            self.arm_length = int(grp.variables['arm_length'].getValue().data)
+            self.arm_length = float(grp.variables['arm_length'].getValue().data)
         except:
             pass
 
@@ -281,10 +281,10 @@ class Reader(object):
                 cw = float(mcgrp.variables['cw'][i].data)
                 cw_freq_exp = float(mcgrp.variables['cw_exp'][i].data)
                 cw_ind_exp = float(mcgrp.variables['ind_exp'][i].data)
-                try: 
+                try:
                     ce = float(mcgrp.variables['ce'][i].data)
                     cw_ind_beta_exp = float(mcgrp.variables['ind_beta_exp'][i].data)
-                except: 
+                except:
                     pass
                 spec_weight = float(mcgrp.variables['spec_weight'][i].data)
                 fillfactor = float(mcgrp.variables['fillfac'][i].data)

femagtools/plot/forcedens.py

@@ -8,7 +8,17 @@
 """
 import numpy as np
 import matplotlib.pyplot as plt
-from matplotlib import colormaps
+try:
+    from matplotlib import colormaps
+    cmap_viridis = colormaps['viridis']
+    cmap_jet = colormaps['jet']
+    cmap_YlOrBr = colormaps['YlOrBr']
+except:  # older matplotlib
+    from matplotlib import cm
+    cmap_viridis = cm.viridis
+    cmap_jet = cm.jet
+    cmap_YlOrBr = cm.YlOrBr
+
 
 def _create_3d_axis():
     """creates a subplot with 3d projection if one does not already exist"""
@@ -24,7 +34,7 @@ def _create_3d_axis():
         plt.subplot(111, projection='3d')
 
 
-def _plot_surface(ax, x, y, z, labels, azim=None, cmap=colormaps['viridis']):
+def _plot_surface(ax, x, y, z, labels, azim=None, cmap=cmap_viridis):
     """helper function for surface plots"""
     # ax.tick_params(axis='both', which='major', pad=-3)
     assert np.size(x) > 1 and np.size(y) > 1 and np.size(z) > 1
@@ -60,7 +70,7 @@ def forcedens(title, pos, fdens, ax=0):
     ax.set_ylabel('Force Density / kN/m²')
 
 
-def forcedens_surface(fdens, attr='FN', ax=0, cmap=colormaps['jet']):
+def forcedens_surface(fdens, attr='FN', ax=0, cmap=cmap_jet):
     if ax == 0:
         _create_3d_axis()
         ax = plt.gca()
@@ -72,7 +82,7 @@ def forcedens_surface(fdens, attr='FN', ax=0, cmap=colormaps['jet']):
                   ('Rotor pos/°', 'Pos/°', f'{attr} / kN/m²'),
                   cmap=cmap)
 
-def forcedens_contour(fdens, attr='FN', ax=0, cmap=colormaps['jet']):
+def forcedens_contour(fdens, attr='FN', ax=0, cmap=cmap_jet):
     if ax == 0:
         ax = plt.gca()
     z = 1e-3*np.array(getattr(fdens, attr))
@@ -91,7 +101,7 @@ def forcedens_contour(fdens, attr='FN', ax=0, cmap=colormaps['jet']):
     cbar.ax.set_ylabel('kN/m²')
 
 def forcedens_fft(title, fdens, harmmax=(), #(200, 40),
-                  cmap=colormaps['YlOrBr'],
+                  cmap=cmap_YlOrBr,
                   ax=0):
     """plot force densities FFT
     Args:

femagtools/tks.py

@@ -21,6 +21,17 @@ numPattern = re.compile(r'([+-]?\d+(?:\.\d+)?(?:[eE][+-]\d+)?)')
 HBpattern = re.compile(r'H.+\s+B')
 BPpattern = re.compile(r'B.+\s+P')
 
+_tranlate = {
+    "ch": "Hysteresis Loss Factor", 
+    "cw": "Eddy Current Loss Factor", 
+    "ce": "Excess Loss Factor", 
+    "ch_freq": "Hyteresis Exponent", 
+    "cw_freq": "Eddy Current Exponent", 
+    "b_coeff": "Induction Loss Exponent", 
+    "alpha": "Induction Loss Exponent (Bertotti)",
+    "Bo": "Reference Induction", 
+    "fo": "Reference Frequency", 
+}
 
 def readlist(section):
     x = []
@@ -109,7 +120,8 @@ class Reader(object):
             self.cw = z[2]
             self.cw_freq = z[3]
             self.b_coeff = z[4]
-
+            self.jordan = {'ch': z[0], 'cw': z[2], 'ch_freq': z[1], 'cw_freq': z[3], 'b_coeff': z[4],
+                            'Bo': self.Bo, 'fo': self.fo}
             z = lc.fitsteinmetz(
                 self.losses['f'],
                 self.losses['B'],
@@ -122,11 +134,15 @@ class Reader(object):
             self.losses['cw_freq'] = z[1]
             self.losses['b_coeff'] = z[2]
 
+            self.steinmetz = {'cw': z[0], 'cw_freq': z[1], 'b_coeff': z[2], 
+                              'Bo': self.Bo, 'fo': self.fo}
+
             self.losses['Bo'] = self.Bo
             self.losses['fo'] = self.fo
             z = lc.fit_bertotti(self.losses['f'],
                                 self.losses['B'], pfe)
-            self.bertotti = {'ch': z[0], 'alpha': 2.0, 'cw': z[1], 'ce': z[2]}
+            self.bertotti = {'ch': z[0], 'cw': z[1], 'ce': z[2], 
+                             'alpha': 2.0, 'Bo': 1, 'fo': 1}
             logger.info("Bertotti loss coeffs %s", z)
 
             # must normalize pfe matrix:
@@ -156,7 +172,27 @@ class Reader(object):
             'b_coeff': self.b_coeff,
             'rho': self.rho,
             'losses': self.losses}
-
+    
+def tableview(Reader): 
+    """pretty print loss coeff table"""
+    losscoeff = [Reader.jordan, Reader.steinmetz, Reader.bertotti]
+    # Title
+    strlen = 101
+    print('='*strlen)
+    print('| {:^34} '.format(' ') + '| {:^18} | {:^18} | {:^18} |'.format(*["Jordan", "Steinmetz", 'Bertotti']))
+    print('='*strlen)
+    # data 
+    for key, item in _tranlate.items(): 
+        fout = ''
+        for i in losscoeff: 
+            if key in i: 
+                fout += '| ' + f'{i[key]:^18.8e} '
+            else: 
+                tmp = '-'
+                fout += '| ' + f'{tmp:^18} '
+        print(f'| {item:^34}' + ' ' + fout + '|')
+        print('='*strlen)
+    return 
 
 def read(filename, filecontent=None):
     """read Thyssen File TKS and return mc dict"""

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

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

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=EYWHBDOxDAUDvC6zezPTQAc32r4rSi4VgkvM4coG6f8,1600
+femagtools/__init__.py,sha256=ndVtdwfscAu-jgdCzn_dAXiywoE6BRKaYEF9FkFp7s0,1600
 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=-TBHcXNf6bSvcDxi0qnVJV7ZQryDrsY6SCwwQLRyRQo,71680
+femagtools/bch.py,sha256=a0Ak4xN5yYlt-0QCjLymYfVmsdYBNBCp7ZNORcaKWTs,73375
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
 femagtools/condor.py,sha256=J8z9iBdvrGu3I1eFNoyKV8AXzRoTEPGLSak6cXUQxAM,10766
 femagtools/conductor.py,sha256=rXO7c7Qh_s7JpgILmLd4IbG64vP6Eh143YF9u25Mdwg,1076
@@ -34,34 +34,34 @@ femagtools/model.py,sha256=7_LWgUQY3W-n4RBvPXbTY2FhfgiR0xlSSKTv2JqUX08,15618
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
 femagtools/multiproc.py,sha256=7mJF-VU1NrJkENyg8eHtDrDRNBwLPK43phZv3ehm9BU,8435
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
-femagtools/nc.py,sha256=TC7LY1FAL43ntA0IlGzUXhUsB05-xWzeZ1yP0q4L0A4,14532
+femagtools/nc.py,sha256=6O3lWuX2SX8IuVM0rr55L2UywrI1MmXzJOgUtUmcg4A,14532
 femagtools/netlist.py,sha256=CSCl8setLZ_L8DCnNWaNA3-wLe1yo-fmzARZoVvYfaA,2052
 femagtools/ntib.py,sha256=76g1ZO3Fq_kN-HTMBvaKvJmMMlJMyEPFeNAcJPq3w7Y,3099
 femagtools/opt.py,sha256=snQlPNT5hksCgj0TBjFBhSCERMHHGMv1xc4uFSxptfQ,8687
 femagtools/parstudy.py,sha256=K78fd7ILhYjGgkauTXc_M8Plnynee0WFH20iyuoMXSo,19523
 femagtools/poc.py,sha256=wMwOxMhPLFRiGPMsKQwWWuGr6UZPzRBajhfVMfXptNU,6794
-femagtools/tks.py,sha256=UQMgOsPTGPiK9V0-e6wapmdSdiSGAlkBvoqnVKbSRI0,6049
+femagtools/tks.py,sha256=xStMu6P1xsc36tS53FKnbL6i2ZTVnCNXyTVw8_gjepo,7436
 femagtools/ts.py,sha256=x9aCMVASjdBZuyI2pJGMyi1dveGFd_pWQ20cZ-l_moc,47216
 femagtools/utils.py,sha256=1SX5s21xyW8u0NF_Hjs7DByyCTdLm9VRArLburTyHR0,1581
 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/fslrenderer.py,sha256=ftI-nHv76ghAm3fkg_7ZAj-p-sWlIHYt7SbbsFvYWyY,24988
 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
@@ -69,9 +69,9 @@ femagtools/machine/__init__.py,sha256=U8W65K7jr7jDdC1KnJh0WjYd8DFaLnIFVvlh-TKcV9
 femagtools/machine/afpm.py,sha256=hNyDFRLGmCuWRPZl_u1ztJ4pA-Y_mxLaVvg3UJkzRuE,24766
 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/sm.py,sha256=ubS7mK2dibhwUpGwyY-23hoZbLrVqAtPeXVmqF657lg,37781
+femagtools/machine/pm.py,sha256=JQn2vnPBvGF9mUnqnKiVisHZnjhpzIbaBkqUxKN5leE,58589
+femagtools/machine/sizing.py,sha256=nWCfxbyWfbw5-7xu0qZ6zjWNquEPn3fUH-fQeGb6QUc,24307
+femagtools/machine/sm.py,sha256=G4fHmZngQSRN9Dum7mHaf36b_CvD-u_AQogIFixlnys,37899
 femagtools/machine/utils.py,sha256=ckPOfaaieRbThMKkBtCtoCMsehdbePH8xNoWPmNoS3Y,18782
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
 femagtools/moo/algorithm.py,sha256=lNEf0Bur4yFpIJeLtAC3oIus8sOMWTb7jepFlD28YzE,5445
@@ -85,7 +85,7 @@ femagtools/plot/bch.py,sha256=4f9Q-JZtj9WMjxFUXMXNaSdWdDXN_Be4-F9kOU45xns,28525
 femagtools/plot/char.py,sha256=SB40YJ5seVQmWTAdrfDQZiEZH3jIB11HUY5SJL_HJcY,12032
 femagtools/plot/fieldlines.py,sha256=QtKF4nhnQ_FHHGh9Qez3GVmym0CLhW1ZyIKtk4pzos4,1136
 femagtools/plot/fluxdens.py,sha256=NlexRJ3f_8CgKoWrV82ZIsAXPrLhwj98uOe8_fUks7A,1082
-femagtools/plot/forcedens.py,sha256=aBxMUnMkE5Ost5BQuAYI28aN9bC2gWZN65xHqwFsuhw,3849
+femagtools/plot/forcedens.py,sha256=Vloi9czy7qbGXI-Vm7Cow6IfHTsFhCLI1YWduFOR55c,4075
 femagtools/plot/mcv.py,sha256=NwDBe40PQgKqWh_rM89k-vsxRmvyjetv4y7elXzTPZU,3099
 femagtools/plot/nc.py,sha256=yq-uYppAEUePbo1SAaBKNKla3cyqdLh5z9ArhtwPYZY,9548
 femagtools/plot/phasor.py,sha256=5QG1GkXKVksc8P6Q4thKADf6W1l8rDKeArIHFYvbXlw,4858
@@ -166,7 +166,7 @@ tests/test_afpm.py,sha256=OE-ULFcp_fBQ7SyRacDmDGbq8ULFHLbXXx3MHJN1C1c,11031
 tests/test_airgap_induction.py,sha256=cmpy1og59oWEyCO4oF_zDuc1DUwCbdeebNL1ujpZza4,1065
 tests/test_amela.py,sha256=IsGah_O8qWsudZOnWL0pjH9S40O03oH_XfDtLgnzBMk,637
 tests/test_asm.py,sha256=NAMJ2Km4zi6byhooq5E7GZbkFeSNSTaLpJWt-jQF5cE,1398
-tests/test_bchreader.py,sha256=byqjDa_329cCgQFhLHLOgxiwZ0UMzvWb-rVjvN9wFQA,15497
+tests/test_bchreader.py,sha256=yFpjN0MIv_o_OD8XH9HxlOpcNtL79K_3bXMeupxO648,16843
 tests/test_conductor.py,sha256=T7bmuSdI2Fowwm2Ht-8D0Qnfs1_lx1aoi9RhC2p5nYU,332
 tests/test_convert.py,sha256=oseuhm3Iw-9b4WzBjA_Og2lgXPqKYicLUnfadq5Yick,6497
 tests/test_dxfsl.py,sha256=DBAjtwNAwcB7VYZBjul7xf4ovu14n3Z0fxyreVzAW4A,383
@@ -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=ThgH3xscoDDqDsyECXQzsU16xOeUOx83_K2RFwRBeiw,1133
 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.2.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.7.2.dist-info/METADATA,sha256=lsExsTeOX67OhhhQnuXXoRqoNYGVLvjtHkKqTonSFsk,6147
+femagtools-1.7.2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+femagtools-1.7.2.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.7.2.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.7.2.dist-info/RECORD,,

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

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

tests/test_bchreader.py

@@ -317,6 +317,25 @@ class BchReaderTest(unittest.TestCase):
         self.assertEqual(bch.psidq['losses']['styoke_excess'][0],  [2.235, 2.235, 2.839])
         self.assertEqual(bch.psidq['losses']['stteeth_excess'][0],  [6.58, 6.576, 7.176])
         self.assertEqual(bch.psidq['losses']['rotor_excess'][0],  [0.0, 0.0, 0.0])
-        
+    
+    def test_read_pm_sym_outer_rotor(self): 
+        bch = self.read_bch('pm_sym_fast_outer_rotor.BATCH')
+        self.assertEqual(bch.losses[-1]['staza'],  54.219)
+        self.assertEqual(bch.losses[-1]['stajo'],  8.853)
+        self.assertEqual(bch.losses[-1]['rotfe'],  0.091)
+        self.assertEqual(list(bch.losses[-1]['fft']['rotor']['order_mech']),  [12, 24])
+        self.assertEqual(list(bch.losses[-1]['fft']['rotor']['eddy']),  [0.057, 0.033])
+        self.assertEqual(list(bch.losses[-1]['fft']['staza']['order_mech']),  [4, 12, 20, 28, 36, 44, 52])
+        self.assertEqual(list(bch.losses[-1]['fft']['staza']['eddy']),  [45.215, 4.582, 2.881, 0.839, 0.425, 0.197, 0.059])
+        self.assertEqual(list(bch.losses[-1]['fft']['stajo']['order_mech']),  [4, 12, 20, 28, 36])
+        self.assertEqual(list(bch.losses[-1]['fft']['stajo']['eddy']),  [7.845, 0.64, 0.311, 0.044, 0.011])
+
+    def test_read_ldlq_outer_rotor(self): 
+        bch = self.read_bch('ldlq_outer_rotor.BATCH')
+        self.assertEqual(bch.ldq['losses']['styoke_eddy'][0],  [63.32, 39.69, 42.85, 65.62])
+        self.assertEqual(bch.ldq['losses']['styoke_hyst'][0],  [0.0, 0.0, 0.0, 0.0])
+        self.assertEqual(bch.ldq['losses']['rotor_eddy'][0],  [0.05937, 0.4195, 1.74, 2.705])
+        self.assertEqual(bch.ldq['losses']['rotor_hyst'][0],  [0.0, 0.0, 0.0, 0.0])
+
 if __name__ == '__main__':
     unittest.main()

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
 
 
@@ -31,9 +31,9 @@ def test_spm():
 
     r = femagtools.machine.sizing.spm(P, n, p, udc=udc,
                                       Hc=700, sigmas=fs, brem=1.1, Ba=0.77,
-                                      cos_phi=0.7, eta=0.8, demag=1.7,
+                                      cos_phi=0.7, eta=0.8, demag=6.8,
                                       lda=0.9)
-    assert round(r['outer_diam'], 3) == 0.19
+    assert round(r['outer_diam'], 3) == 0.181
     assert r['stator']['num_slots'] == 24