femagtools 1.7.4__tar.gz → 1.7.5__tar.gz

{femagtools-1.7.4/src/femagtools.egg-info → femagtools-1.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.7.4
+Version: 1.7.5
 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.4 → femagtools-1.7.5}/src/femagtools/__init__.py

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

{femagtools-1.7.4 → femagtools-1.7.5}/src/femagtools/bch.py

@@ -613,6 +613,7 @@ class Reader:
 
     def __read_general_machine_data(self, content):
         mcfiles = []
+        slotsides = 1
         for l in content:
             try:
                 if l.find('Armature Length') > -1:
@@ -631,8 +632,10 @@ class Reader:
                     self.machine['p_sim'] = int(l.split()[-1])
                 elif l.find('Total Number of Slots') > -1:
                     self.machine['Q'] = int(l.split()[-1])
+                elif l.find('Total Number of Slot-Sides') > -1:
+                    slotsides = int(l.split()[-1])
                 elif l.find('Number of Slot-Sides sim.') > -1:
-                    self.machine['qs_sim'] = int(l.split()[-1])
+                    self.machine['qs_sim'] = int(l.split()[-1])*self.machine['Q']//slotsides
                 elif l.find('POC-File used in calculation') > -1:
                     self.machine['pocfile'] = l.split(
                         ':')[-1].strip().replace('\\', '\\\\')

{femagtools-1.7.4 → femagtools-1.7.5}/src/femagtools/dxfsl/area.py

@@ -84,6 +84,7 @@ class Area(object):
         self.is_child = False
         self.areas_inside = {}
         self.areas_of_group = []
+        self.group_is_inside = False
 
     def identifier(self):
         return "{}-{}".format(self.id, self.type)

{femagtools-1.7.4 → femagtools-1.7.5}/src/femagtools/dxfsl/geom.py

@@ -2478,7 +2478,8 @@ class Geometry(object):
             groups_inside = {g.id: g for g in grouplist}
             area.areas_inside = groups_inside
             areas_outside.append(area)
-            for g in  grouplist:
+            for g in grouplist:
+                g.group_is_inside = True
                 alist = groups.get(g.id, [])
                 alist.append(area)
                 groups[g.id] = alist
@@ -2532,6 +2533,11 @@ class Geometry(object):
             for area in area_list:
                 if self.create_aux_lines(area, rightangle, leftangle):
                     done = True
+            main_groups = [g for g in self.areagroup_list
+                           if not g.group_is_inside]
+            if len(main_groups) > 1:
+                if self.create_outside_aux_lines(main_groups):
+                    done = True
         else:
             logger.debug("-> start create_auxiliary_lines")
             self.set_areas_inside_for_all_areas()
@@ -2856,6 +2862,38 @@ class Geometry(object):
                      area.get_id())
         return done
 
+    def create_outside_aux_lines(self, grouplist):
+        done = False
+        aux_color = 'blue'
+        aux_linestyle = 'dotted'
+
+        i = 0
+        gaps = []
+        for group in grouplist:
+            i += 1
+            for g in grouplist[i:]:
+                gaps += group.get_lowest_gap_list(g,
+                                                  self.center, self.max_radius,
+                                                  None, None)
+        gaps.sort()
+
+        l = len(grouplist) -1
+        for d, points, token, id in gaps[:l]:
+            logger.info("Token %s", token)
+            line = Line(Element(start=points[0],
+                                end=points[1]),
+                                color=aux_color,
+                                linestyle=aux_linestyle,
+                                attr='outside_auxline')
+            n1 = self.find_the_node(line.node1(ndec))
+            n2 = self.find_the_node(line.node2(ndec))
+            if n1 and n2:
+                self.add_element(line,
+                                 rtol=self.rtol,
+                                 atol=self.atol)
+                done = True
+        return done
+
     def set_rotor(self):
         self.sym_counterpart = 1
         self.sym_part = 0

{femagtools-1.7.4 → femagtools-1.7.5}/src/femagtools/machine/pm.py

@@ -1496,10 +1496,11 @@ class PmRelMachinePsidq(PmRelMachine):
 
         tshort = 0
         w1 = 2*np.pi*self.p*speed
+        i0 = self.iqd_torque(tload)
         res = so.minimize(
-            lambda iqd: np.linalg.norm(iqd), self.io, method='SLSQP',
+            np.linalg.norm, i0, method='SLSQP',
             constraints=(
-                {'type': 'eq',
+                {'type': 'ineq',
                  'fun': lambda iqd: self.tmech_iqd(*iqd, speed) - tload},
                 {'type': 'ineq',
                  'fun': lambda iqd: np.sqrt(2)*u1

{femagtools-1.7.4 → femagtools-1.7.5/src/femagtools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.7.4
+Version: 1.7.5
 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