femagtools 1.6.4__py3-none-any.whl → 1.6.6__py3-none-any.whl

femagtools/machine/utils.py

@@ -169,12 +169,12 @@ def wdg_leakage_inductances(machine):
     from ..windings import Winding
     wdg = Winding(
         {'Q': machine['stator']['num_slots'],
-         'm': machine['winding']['num_phases'],
+         'm': machine['windings']['num_phases'],
          'p': machine['poles']//2,
-         'l': machine['winding']['num_layers'],
-         'yd': machine['winding']['coil_span']})
-    n1 = wdg.turns_per_phase(machine['winding']['num_wires'],
-                             machine['winding']['num_par_wdgs'])
+         'l': machine['windings']['num_layers'],
+         'yd': machine['windings']['coil_span']})
+    n1 = wdg.turns_per_phase(machine['windings']['num_wires'],
+                             machine['windings']['num_par_wdgs'])
     m = wdg.m
     p = wdg.p
     Q = wdg.Q

femagtools/plot/nc.py

@@ -149,8 +149,7 @@ def __elements_of_subreg(isa, subreg):
         else:
             sr = [subreg]
         for s in sr:
-            for e in isa.get_subregion(s).elements():
-                yield e
+            yield from isa.get_subregion(s).elements()
     else:
         for e in isa.elements:
             yield e
@@ -232,7 +231,8 @@ def flux_density_pos(isa, ipos, subreg=[], icur=-1, ibeta=-1, cmap=DEFAULT_CMAP,
         ibeta: beta angle index or last index if -1
 
     """
-    elements = [e for e in __elements_of_subreg(isa, subreg)]
+    elements = [e for e in __elements_of_subreg(isa, subreg)
+                if e not in isa.airgap_center_elements]
     b = []
     for e in elements:
         fd = isa.flux_density(e, icur, ibeta)

femagtools/svgfsl/converter.py

@@ -0,0 +1,74 @@
+
+
+if __name__ == '__main__':
+    import pathlib
+    import argparse
+    import logging
+    import logging.config
+    from femagtools.dxfsl.converter import convert
+
+    logger = logging.getLogger(__name__)
+    argparser = argparse.ArgumentParser(
+        description='Process SVG file and create a plot or FSL file.')
+    argparser.add_argument('svgfile',
+                           help='name of SVG file')
+    argparser.add_argument('--rotor',
+                           help='rotor without airgap in/out',
+                           dest='rotor',
+                           default='')
+    argparser.add_argument('--stator',
+                           help='stator without airgap in/out',
+                           dest='stator',
+                           default='')
+    argparser.add_argument('-p', '--plot',
+                           help='show plots',
+                           dest='show_plots',
+                           action="store_true")
+    argparser.add_argument('--areas',
+                           help='show all areas',
+                           dest='show_areas',
+                           action="store_true")
+    argparser.add_argument('--id',
+                           help='write id of areas',
+                           dest='write_id',
+                           action="store_true")
+    argparser.add_argument('-f', '--fsl',
+                           help='create fsl',
+                           dest='write_fsl',
+                           action="store_true")
+    argparser.add_argument('-v', '--view',
+                           help='show a view only',
+                           dest='view',
+                           action="store_true")
+    args = argparser.parse_args()
+
+    loglevel = logging.INFO
+    logging.basicConfig(level=loglevel,
+                        format='%(asctime)s %(message)s',
+                        filemode='w')
+    part = ()
+    if args.stator:
+        if args.rotor:
+            logger.error("Stator or Rotor expected")
+            sys.exit(1)
+        part = ('stator', args.stator)
+    elif args.rotor:
+        part = ('rotor', args.rotor)
+
+    if not args.write_fsl:
+        if not (args.show_plots or args.show_areas or args.view):
+            args.write_fsl = True
+
+    res = convert(args.svgfile,  # SVG-Filename
+                  part=part,
+                  view_only=args.view,
+                  show_plots=args.show_plots,
+                  show_areas=args.show_areas,
+                  write_fsl=args.write_fsl,
+                  write_id=args.write_id)
+
+    if args.write_fsl:
+        if res is not None:
+            p = pathlib.Path(args.svgfile)
+            basename = p.stem
+            pathlib.Path(basename + '.fsl').write_text('\n'.join(res['fsl']))

{femagtools-1.6.4.dist-info → femagtools-1.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.6.4
+Version: 1.6.6
 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
@@ -49,6 +49,10 @@ Provides-Extra: meshio
 Requires-Dist: meshio ; extra == 'meshio'
 Provides-Extra: mplot
 Requires-Dist: matplotlib ; extra == 'mplot'
+Provides-Extra: svgfsl
+Requires-Dist: dxfgrabber ; extra == 'svgfsl'
+Requires-Dist: networkx ; extra == 'svgfsl'
+Requires-Dist: lxml ; extra == 'svgfsl'
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'
 Provides-Extra: vtk

{femagtools-1.6.4.dist-info → femagtools-1.6.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-femagtools/__init__.py,sha256=_2dfCbz4VR0j0Yiigc3W81KwRxyJJebitfFhHDctC9o,1615
+femagtools/__init__.py,sha256=lJNqlV6QzIM5MGG7uASKr5ZDeIiKRDYFtLqJu1GYyRQ,1615
 femagtools/airgap.py,sha256=ZCIZTYf6BbuNYx68y9fUDBQo3taN8RuGl8q-jJ7ygiA,1577
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
 femagtools/amela.py,sha256=pHjfXzpANI-7oz8MtrqNcyDZ6PxVM91vCJuvYhHy1rk,13891
@@ -23,7 +23,7 @@ femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
 femagtools/grid.py,sha256=s7LfKKLm2H4-cza2kSEANq6vwxq10Su3TJl3kHShHRA,1561
 femagtools/hxy.py,sha256=PkiZ_-CRhtvtpkmLAP8iMtwvzh7CjKGGcAbOhFb4Nls,6275
-femagtools/isa7.py,sha256=cUZx9fpxZgkw2G-cnveR-X-_lWP7Z1Q88MCysLl9MFI,58336
+femagtools/isa7.py,sha256=HnD_NZ5-Oj98kw8e3o3tdHt07kfEL-d0N6KmqkoeTeU,58332
 femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
 femagtools/job.py,sha256=dOatzr10nIda76CjVRSS0SfEWC8_BAw0kowli523qbY,11320
 femagtools/losscoeffs.py,sha256=dlSYDS13RqpPHLdv_EPWIA9liwhqjbxUiN7t7GFPZhw,5397
@@ -47,28 +47,32 @@ 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=5LmTort_vp1JhrJUg4xiPAUHL-UjL6cZofOyhki3DAs,57998
-femagtools/dxfsl/areabuilder.py,sha256=Mcs0IhbSADfbjkWbnhw82bmrzpJ6Xed_Ja62i80aG_Q,20849
-femagtools/dxfsl/concat.py,sha256=8jtFFOSWslr9I3RCemsvzHyypSI_P2Y8QQgDlgmbcts,13381
+femagtools/dxfsl/area.py,sha256=cbg3Vi3UUutiofvX9-L0OGmW4u1XmI8PjnY54Lq372M,58872
+femagtools/dxfsl/areabuilder.py,sha256=gaSdJe-LImcn-rCe-9hXTVO6uJZMMEnV9hzft-MDTHs,26928
+femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
 femagtools/dxfsl/conv.py,sha256=j17gjZ7XjoP6QmEO50ZMA-jyYrcMQEgpDH0hZN26RbM,9236
-femagtools/dxfsl/converter.py,sha256=6BCwlVp0PiSZ4Wj-YDgl7ynWNN2SBuwxw5VnNQ55Y9w,20821
+femagtools/dxfsl/converter.py,sha256=41eyMSMad8YXiYSrTGrr9YuTPXHRIczh1fGX0MT9NZ8,21322
 femagtools/dxfsl/corner.py,sha256=UI1MLlVmiTBURywsOnXnXV7eBABoENc6ortkW_3GYH8,1266
 femagtools/dxfsl/dumprenderer.py,sha256=n4AvInjvGIaC2iKZtQaYXXDyJVSQ3uEOFOLD4-xfKRY,1861
+femagtools/dxfsl/dxfparser.py,sha256=kyXG0kZfNyOgn96MqBgP8RhOQhppfB5NbyRNNybs1C0,13451
+femagtools/dxfsl/femparser.py,sha256=DKRGzrJ4LFFsaNmxl6kiRR4A2y_Xv9Wp6jGYSg0Dz10,2120
 femagtools/dxfsl/fslrenderer.py,sha256=C4oonLPzKb_9IKvpm-fMvbhQZqtP_7xWG5bzpq8P1CY,23377
 femagtools/dxfsl/functions.py,sha256=bQftVRqGVndG48SPkjkOIULjcnB40Voz0lgDQ4uBMk8,11705
-femagtools/dxfsl/geom.py,sha256=ymXZS9kQfWkAC-ZFduz--flQOH3BydonqpjhbH4VBcU,164336
-femagtools/dxfsl/journal.py,sha256=VlbKKQr29UKDyz3DXFulLjHZcrMbPscHIgFZ4Vgl5PI,3567
-femagtools/dxfsl/machine.py,sha256=ftqLiwCyrzekUSvAOVD9AIM4hrPrIpId7PhLKwvSpWs,42158
+femagtools/dxfsl/geom.py,sha256=m7IaejPCPDXHAaa2qE0YWLB3FjBVvnP9peeVikPdXWY,149449
+femagtools/dxfsl/journal.py,sha256=7PQ4TZ5uKX1c_Xo7JvGdyw7PH_6ydqxgHdElqTBVSds,3239
+femagtools/dxfsl/machine.py,sha256=a6kq7SXRp_u8sIH-aSRT_tnr3bpdvZItLvhNVm_TC5s,42548
 femagtools/dxfsl/plotrenderer.py,sha256=dIOM8p3UNTlqypxuPcLCegOaK19j3-ahelZ8hneLJ6k,12710
-femagtools/dxfsl/shape.py,sha256=4onAfXaVUWxC9C2WXVLYi3UH6w2lhUHxuLjdFgQOqks,48302
+femagtools/dxfsl/shape.py,sha256=5M5vbT-W_nZCamlbuCixi0hlAOOUIlubsJT57TB-jS0,48608
+femagtools/dxfsl/svgparser.py,sha256=R8V2V5jE6JyVfzshJVaPgsSuMlQf_pwJTFvrTrKDxZ0,2905
+femagtools/dxfsl/symmetry.py,sha256=pLuGLPRCHLSQiMe7HeDcZr7IR-QJqJX49Rag_S408T8,13835
 femagtools/machine/__init__.py,sha256=U8W65K7jr7jDdC1KnJh0WjYd8DFaLnIFVvlh-TKcV94,7174
 femagtools/machine/afpm.py,sha256=hNyDFRLGmCuWRPZl_u1ztJ4pA-Y_mxLaVvg3UJkzRuE,24766
-femagtools/machine/effloss.py,sha256=I8s2Fog6klhgcRYw3448qfGvzaQ0AQUJXFdNoeDyhfE,13138
-femagtools/machine/im.py,sha256=ScIOLrlc4CPLYFNx2MmJqkpmbky_HXxFGZbMWUNGBrk,37881
-femagtools/machine/pm.py,sha256=-mPkUY4-og1blVeIdipSx6Ff178gtZnU6A6oDDvoUQk,56229
+femagtools/machine/effloss.py,sha256=630JZnLBCIo_XKXkhXWg74hxHv18wy4f8hXNv5xiDwc,13151
+femagtools/machine/im.py,sha256=8cA7aNr-OkrMlmFaqtnZkDrCQtqSKOFYePwcmZW3oAM,37925
+femagtools/machine/pm.py,sha256=CpJpZDsbVXbJZSyxByI-DH1C9CFJZQ2zCDgIuXxsmR8,58517
 femagtools/machine/sizing.py,sha256=aN_OahewjTTBHnpRNfLh1AGFhqnoeZVuMBeb_3MCIVI,23096
-femagtools/machine/sm.py,sha256=pkik913kU41PPiUpwDy_6BEKfCIhvY6FEp-fbU2Lqew,34320
-femagtools/machine/utils.py,sha256=g9q4j9KxUWdb_iUOUQDuaAwwJx8XM0kZMpgnwsNz8hU,18616
+femagtools/machine/sm.py,sha256=3QBnufKiQe85ELWyD9HwnXxvMmoYi-w7rpvCXAXOw10,34398
+femagtools/machine/utils.py,sha256=rZNqrw0VkwEhexd_idffHyoodaID5cIDmteyIVF1MJ8,18621
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
 femagtools/moo/algorithm.py,sha256=lNEf0Bur4yFpIJeLtAC3oIus8sOMWTb7jepFlD28YzE,5445
 femagtools/moo/population.py,sha256=gi8PSVUXkYY5vzgAwWvxfMbH_z51fN58O4-NKoarwzI,10100
@@ -83,9 +87,10 @@ femagtools/plot/fieldlines.py,sha256=QtKF4nhnQ_FHHGh9Qez3GVmym0CLhW1ZyIKtk4pzos4
 femagtools/plot/fluxdens.py,sha256=NlexRJ3f_8CgKoWrV82ZIsAXPrLhwj98uOe8_fUks7A,1082
 femagtools/plot/forcedens.py,sha256=37FQLViGsjCh20tSlWlVfLTsvtjzdK_pEQGC2KcQ-xI,2996
 femagtools/plot/mcv.py,sha256=AKbWhJd20Kcec8Hv9dX32G5yTLPkcWorQS7-3P6m-mQ,2960
-femagtools/plot/nc.py,sha256=CU-6420EYq6S4ZzyqxCOyxrbHIeJ8_aBVxDPM3E2oD4,9516
+femagtools/plot/nc.py,sha256=yq-uYppAEUePbo1SAaBKNKla3cyqdLh5z9ArhtwPYZY,9548
 femagtools/plot/phasor.py,sha256=5iqxCQi_idkdqYALJjQb6YFr_Zv5xsUayDoKL5HzsdE,4765
 femagtools/plot/wdg.py,sha256=UooR1K8JDoVjKWEox_AfkBY40L87jk2L9OdIFz4O-OY,8462
+femagtools/svgfsl/converter.py,sha256=EKPQZwvV-jFDOceitt_sMhF5IxbWflj-4QU1xZrkwQM,2738
 femagtools/templates/FE-losses.mako,sha256=Rql5_8Q6_uthpr-uFXMUo7tdHehfZYND-7M-ohJXVU8,874
 femagtools/templates/afm_rotor.mako,sha256=fY-dlZvRLN9UAy5V6Q_inWghkSUe8pzrCYjJdNgfNXs,3112
 femagtools/templates/afm_stator.mako,sha256=l1xEwxffZ1jyx5wuJ3rhVbVlZirJzD2K8n4i5Dvbxuc,5344
@@ -163,6 +168,7 @@ tests/test_asm.py,sha256=NAMJ2Km4zi6byhooq5E7GZbkFeSNSTaLpJWt-jQF5cE,1398
 tests/test_bchreader.py,sha256=byqjDa_329cCgQFhLHLOgxiwZ0UMzvWb-rVjvN9wFQA,15497
 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
 tests/test_effloss.py,sha256=-kJJNgS5c6saHXjNuhAe5GdWfr9mEYpPo8fE8OtjsNA,1142
 tests/test_erg.py,sha256=kRVzpXa6JDdbxTss18HUWKny9Dx8IMx9uGTrbQCnHwg,523
 tests/test_femag.py,sha256=55cCx90tJ1BEeu_-DOit37y26hFGVSYwkT81s9-p28E,1934
@@ -203,9 +209,9 @@ tests/moo/__init__.py,sha256=l8HD-AY8EwxOoo_VrG3HgEZb2MaHypvnhKCVSkR-DTA,808
 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.6.4.dist-info/LICENSE,sha256=V5OED7AzEaOtvbfgNheKOSUeNtijvKQuo84FtSJNkJU,1316
-femagtools-1.6.4.dist-info/METADATA,sha256=ZXGbgC8exuvvRMnb1nl3VAObHDq3S-veE4ZdJRU8a3w,5685
-femagtools-1.6.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-femagtools-1.6.4.dist-info/entry_points.txt,sha256=UXpu6KnrykN89sCUaFAIIzn_dYwuxizUS0GcPdoekro,195
-femagtools-1.6.4.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.6.4.dist-info/RECORD,,
+femagtools-1.6.6.dist-info/LICENSE,sha256=V5OED7AzEaOtvbfgNheKOSUeNtijvKQuo84FtSJNkJU,1316
+femagtools-1.6.6.dist-info/METADATA,sha256=cBqOE9Ki2As_lrqQtRRHaOlUzo8FqxihyLNB7SdGjxU,5838
+femagtools-1.6.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+femagtools-1.6.6.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.6.6.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.6.6.dist-info/RECORD,,

{femagtools-1.6.4.dist-info → femagtools-1.6.6.dist-info}/entry_points.txt

@@ -3,3 +3,4 @@ femagtools-bchxml = femagtools.bchxml:main
 femagtools-convert = femagtools.convert:main
 femagtools-dxfsl = femagtools.dxfsl.conv:main
 femagtools-plot = femagtools.plot.bch:main
+femagtools-svgfsl = femagtools.svgfsl.converter:main

tests/test_dxfsl.py

@@ -0,0 +1,12 @@
+import pathlib
+from femagtools.dxfsl.converter import convert
+
+def test_convert():
+    p = pathlib.Path(__file__).parent / 'data' / 'IPM-130-4.dxf'
+    r = convert(str(p))
+
+    assert r['num_poles'] == 4
+    assert r['tot_num_slot'] == 12
+    totnumsl = [l for l in r['fsl'] if l.startswith('m.tot_num_slot')]
+    assert len(totnumsl) == 1
+    assert totnumsl[0].split()[-1] == '12'