femagtools 1.7.4__py3-none-any.whl → 1.7.5__py3-none-any.whl

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/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/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/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/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.dist-info → femagtools-1.7.5.dist-info}/METADATA

@@ -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.dist-info → femagtools-1.7.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=LQSh6OjWbECaFlDSZXzy-njc7_TUylPuMfvbQVJYH9I,1600
+femagtools/__init__.py,sha256=z_m3ZYsmxn72xMFMzy-WxDxEWeieBELwuwUF3kzJssE,1600
 femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
 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=aWTOQ8Hq2ygLPQpf5k9W0nWUPK0UXe0YewArrPI7IBk,73550
+femagtools/bch.py,sha256=FYpQsbCaJB6GJHwUto4aCq94Yz1DtYAbaj7l-gGjmY4,73716
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
 femagtools/condor.py,sha256=J8z9iBdvrGu3I1eFNoyKV8AXzRoTEPGLSak6cXUQxAM,10766
 femagtools/conductor.py,sha256=rXO7c7Qh_s7JpgILmLd4IbG64vP6Eh143YF9u25Mdwg,1076
@@ -48,7 +48,7 @@ femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
 femagtools/windings.py,sha256=-PDqzatXJUaMTR4hI1bbY__AAb3fjwfjiS9FEuR-8N8,22305
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
-femagtools/dxfsl/area.py,sha256=cYnDtnEuwuDW5R1NKV0s8PUzzQzxhgCUktFqHAjP9K8,56581
+femagtools/dxfsl/area.py,sha256=VTRYoIRDFM0bp5nWZF3_DtyUNA86ZwtD4eYfb3mnGY4,56618
 femagtools/dxfsl/areabuilder.py,sha256=Siu11yRcNJiSCWwc865-OvuVhSmLtRQWysbe1-rUcN0,34197
 femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
 femagtools/dxfsl/conv.py,sha256=GeRYUvbdcP5vKtNm5S5gU1yyMboGkGNyOqzkHpYbEEo,10086
@@ -59,7 +59,7 @@ femagtools/dxfsl/dxfparser.py,sha256=kyXG0kZfNyOgn96MqBgP8RhOQhppfB5NbyRNNybs1C0
 femagtools/dxfsl/femparser.py,sha256=O8940Q1Mz8MKng6W8M3s9KfTvhDLJ56tfQWtZEW3xMM,2134
 femagtools/dxfsl/fslrenderer.py,sha256=PBy3KUlNIqItcxCFnWC-d3OrSrsNFj5vDLLGZW2oq3Q,25081
 femagtools/dxfsl/functions.py,sha256=F0AjzHfIfq3v-mhDzUOeq3zeYQCEsJl1-XpEyJQsSnQ,11805
-femagtools/dxfsl/geom.py,sha256=-hPErBLyAsDh-aq2s54psFqG2AaNr9jVeKMeEVUQF5E,165356
+femagtools/dxfsl/geom.py,sha256=-yIlxM1Mb93qdqTYwNYgs-RUI0-9qf9MB7f58q-bKFw,166805
 femagtools/dxfsl/journal.py,sha256=S17B7wsrq5QzIUbjgg0ntvnpgH0thHq9aQXO7GdYlQQ,4265
 femagtools/dxfsl/machine.py,sha256=3leWkjdMCLX2HgMhw8gNdxTKROhNCKU7KQrDVbBQ8DI,49337
 femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6R_c,13823
@@ -70,7 +70,7 @@ 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=4gqYLWACE7C9FzmiHVwh6M2WT7ofNezEIazkAxLae8Q,61704
+femagtools/machine/pm.py,sha256=njWa9YRV2W80xqjT9Dj9Jro73Y3zJtg0HYdJ75Ye0Vk,61720
 femagtools/machine/sizing.py,sha256=nWCfxbyWfbw5-7xu0qZ6zjWNquEPn3fUH-fQeGb6QUc,24307
 femagtools/machine/sm.py,sha256=G4fHmZngQSRN9Dum7mHaf36b_CvD-u_AQogIFixlnys,37899
 femagtools/machine/utils.py,sha256=zi659wCszhXEioKXtRdeyQik2etRFGpoykqfOGiLtTo,21223
@@ -212,9 +212,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.4.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
-femagtools-1.7.4.dist-info/METADATA,sha256=mDq3sIVGX9_9OYQa4NObTZud2BH92rKQUJe7GR9bZNM,6156
-femagtools-1.7.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-femagtools-1.7.4.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.7.4.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.7.4.dist-info/RECORD,,
+femagtools-1.7.5.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.7.5.dist-info/METADATA,sha256=IK9wuI7T0Bxd3Vo1nyzRSRZ1rKqncHaJwlAP57Uk5Tg,6156
+femagtools-1.7.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+femagtools-1.7.5.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.7.5.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.7.5.dist-info/RECORD,,