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

femagtools/__init__.py

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

femagtools/bch.py

@@ -100,6 +100,7 @@ def losses_mapping_external_rotor(losses):
     rotor = 'Iron'    
     d = {}
     try:
+        d['styoke'] = losses[styoke]
         d['styoke_hyst'] = losses[styoke+'_hyst']
         d['rotor_hyst'] = losses[rotor+'_hyst']
         d['styoke_eddy'] = losses[styoke+'_eddy']

femagtools/dxfsl/converter.py

@@ -643,7 +643,8 @@ def convert(dxfile,
             params['agndst'] = agndst(params.get('da1'),
                                       params.get('da2'),
                                       params.get('tot_num_slot'),
-                                      params.get('num_poles'), 1)
+                                      params.get('num_poles'),
+                                      params.get('nodedist'))
 
             if params['external_rotor']:
                 conv['fsl_magnet'] = outer

femagtools/dxfsl/fslrenderer.py

@@ -35,6 +35,7 @@ def agndst(da1, da2, Q, p, nodedist=1):
         num_nodes = [i*lcm for i in range(nmin, nmax) if i*lcm%6==0]
         dagset = [2*np.pi/p/i for i in num_nodes]
         i = max(np.argmin(np.abs(np.array(dagset) - np.arctan2(ag, r))), 1)
+        # nodedist 0.5, 2, 4, 6
     nd = min(round(nodedist), i)
     try:
         logger.info("Num nodes/p %d Num nodes/slot %g nodedist %g",

femagtools/fsl.py

@@ -352,7 +352,7 @@ class Builder:
                     '-- thermal properties in airgap',
                     'ag_cond = 0.063',
                     'thcap = 1007',
-                    'beta = np.pi*m.npols_gen/m.num_poles + m.zeroangl/180*np.pi',
+                    'beta = math.pi*m.npols_gen/m.num_poles + m.zeroangl/180*math.pi',
                     'xai, yai = pr2c((da1+da2)/4, beta)',
                     'def_mat_therm(xai,yai,"cyan",1.19,ag_cond,thcap,1)',
                     'xai, yai = pr2c((da1+da2)/4-ag/4, beta)',
@@ -540,7 +540,7 @@ class Builder:
                                model.get('bore_diam') - 2*ag,
                                model.stator.get('num_slots'),
                                model.get('poles'),
-                               model.stator.get('nodedist') or 1.0))
+                               model.dxffile.get('nodedist')))
 
                 logger.info(" num poles %d num slots %d outer diameter %.4f m",
                             model.poles, model.stator['num_slots'],
@@ -553,14 +553,17 @@ class Builder:
                 self.prepare_diameter(model)
                 if self.fsl_stator and model.get('num_agnodes', 0) == 0:
                     from femagtools.dxfsl.fslrenderer import agndst
-                    ag = model.get('airgap')
-                    model.set_value(
-                        'agndst',
-                        agndst(model.get('bore_diam'),
-                               model.get('bore_diam') - 2*ag,
-                               model.stator.get('num_slots'),
-                               model.get('poles'),
-                               model.stator.get('nodedist') or 1.0))
+                    if model.get('agndst'): 
+                        pass
+                    else: 
+                        ag = model.get('airgap')
+                        model.set_value(
+                            'agndst',
+                            agndst(model.get('bore_diam'),
+                                model.get('bore_diam') - 2*ag,
+                                model.stator.get('num_slots'),
+                                model.get('poles'),
+                                model.stator.get('nodedist') or 1.0))
 
                 model.set_num_slots_gen()
             if hasattr(model, 'magnet'):

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

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

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=ndVtdwfscAu-jgdCzn_dAXiywoE6BRKaYEF9FkFp7s0,1600
+femagtools/__init__.py,sha256=1YBODQdBsY7HA7g3S83zDtocMsCpScKv1hPGDi2rydw,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=a0Ak4xN5yYlt-0QCjLymYfVmsdYBNBCp7ZNORcaKWTs,73375
+femagtools/bch.py,sha256=wvkVbxmikjwsOzJ_vB690Dqtm2X1DGXCFM4vy07eDNU,73412
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
 femagtools/condor.py,sha256=J8z9iBdvrGu3I1eFNoyKV8AXzRoTEPGLSak6cXUQxAM,10766
 femagtools/conductor.py,sha256=rXO7c7Qh_s7JpgILmLd4IbG64vP6Eh143YF9u25Mdwg,1076
@@ -17,7 +17,7 @@ femagtools/ecloss.py,sha256=gaZ8JmlFVoP6IYe79YXPXvZSULm8IZr6bPBdKuyKaIo,12832
 femagtools/erg.py,sha256=IXKq76P9qLt_ssNOP78v8Qizk3J2Zg80yaKDSjzwoJE,1224
 femagtools/femag.py,sha256=RUkjvkHe5gBElawh4-cbwueplXA5Tjvnu28CPVw6f74,44123
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
-femagtools/fsl.py,sha256=Fm9x6x6RPZdhxHKLLmd5NGmw_13wKo380aafqE78EU0,34100
+femagtools/fsl.py,sha256=hFoxjFmVEbahsYp7cGcoNXtZHXeAsxk02VIOx8p2NXs,34219
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
 femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
@@ -51,12 +51,12 @@ femagtools/dxfsl/area.py,sha256=cYnDtnEuwuDW5R1NKV0s8PUzzQzxhgCUktFqHAjP9K8,5658
 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=ZxOfF3bUQ2VXRjnUwDaAis3eRI-SiNEuM0UnSDpwda8,32353
+femagtools/dxfsl/converter.py,sha256=BRIzgg15gqnO-FJ6maVJ1YI3i-elY6Dwbs_-dNTiL94,32412
 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=ftI-nHv76ghAm3fkg_7ZAj-p-sWlIHYt7SbbsFvYWyY,24988
+femagtools/dxfsl/fslrenderer.py,sha256=0PItgL6Hjt1ovkDYy97lK9VN0LvPNxOLd0Bt-zPLmqE,25020
 femagtools/dxfsl/functions.py,sha256=F0AjzHfIfq3v-mhDzUOeq3zeYQCEsJl1-XpEyJQsSnQ,11805
 femagtools/dxfsl/geom.py,sha256=-hPErBLyAsDh-aq2s54psFqG2AaNr9jVeKMeEVUQF5E,165356
 femagtools/dxfsl/journal.py,sha256=S17B7wsrq5QzIUbjgg0ntvnpgH0thHq9aQXO7GdYlQQ,4265
@@ -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.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.3.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.7.3.dist-info/METADATA,sha256=5GcEXNzJvRLKKCuYpIHm4iU83DECYp9U6LQoh1EnjLQ,6147
+femagtools-1.7.3.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+femagtools-1.7.3.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.7.3.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.7.3.dist-info/RECORD,,

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

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