femagtools 1.7.3__tar.gz → 1.7.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.7.3
+Version: 1.7.4
 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
@@ -37,7 +37,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy
+Requires-Dist: numpy<=1.26.4
 Requires-Dist: scipy
 Requires-Dist: mako
 Requires-Dist: six

{femagtools-1.7.3 → femagtools-1.7.4}/pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
     "Topic :: Scientific/Engineering"
 ]
 dependencies = [
-    'numpy',
+    'numpy<=1.26.4', # lmfit restriction
     'scipy',
     'mako',
     'six',

{femagtools-1.7.3 → femagtools-1.7.4}/src/femagtools/__init__.py

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

{femagtools-1.7.3 → femagtools-1.7.4}/src/femagtools/airgap.py

@@ -52,3 +52,14 @@ def read(filename, pmod=0):
         return(dict())
 
     return fft(bag[0], bag[1], pmod)
+
+if __name__ == '__main__':
+    import sys
+    import matplotlib.pyplot as plt
+    import femagtools.plot.fluxdens
+    ag = read(sys.argv[1])
+    fig, axs = plt.subplots(nrows=2)
+    femagtools.plot.fluxdens.airgap(ag, ax=axs[0])
+    femagtools.plot.fluxdens.airgap_fft(ag, ax=axs[1])
+    fig.tight_layout()
+    plt.show()

{femagtools-1.7.3 → femagtools-1.7.4}/src/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,9 +95,9 @@ def sttylosses(losses):
         return l
     return {}
 
-def losses_mapping_external_rotor(losses): 
+def losses_mapping_external_rotor(losses):
     styoke = 'rotor'
-    rotor = 'Iron'    
+    rotor = 'Iron'
     d = {}
     try:
         d['styoke'] = losses[styoke]
@@ -1046,7 +1046,7 @@ class Reader:
         '''
         diff = np.floor(np.abs(np.diff(idList)))
         if idList[-1] == 0 and len(idList) > 2 and \
-           not np.all(diff == diff[0]):
+           diff[-1] == 0:
             idList = idList[:-1]
         return idList
 
@@ -1062,7 +1062,8 @@ class Reader:
                 m.append([floatnan(x) for x in rec])
 
         m = np.array(m).T
-        ncols = np.argmax(np.abs(m[1][1:]-m[1][:-1]))+1
+        d = np.diff(m[1])
+        ncols = (len(d)+1)//(len(d[d < 0])+1)
         if ncols == 1 and len(m[1]) > 1 and m[1][0] != m[1][1]:  # simple correction
             ncols = 2
         iq = np.reshape(m[1], (-1, ncols))[0]
@@ -1071,7 +1072,8 @@ class Reader:
             ncols = ncols-1
 
         id = np.reshape(m[0], (-1, ncols)).T[0]
-        id = self.__removeTrailingZero(id)
+        if id[0] >= 0:
+            id = self.__removeTrailingZero(id)
         nrows = len(id)
         if nrows > 1 and id[nrows-1] < id[nrows-2]:
             nrows = nrows-1
@@ -1096,7 +1098,8 @@ class Reader:
                 m.append([floatnan(x) for x in rec])
 
         m = np.array(m).T
-        ncols = np.argmax(np.abs(m[1][1:]-m[1][:-1]))+1
+        d = np.diff(m[1])
+        ncols = (len(d)+1)//(len(d[d < 0])+1)
         if ncols == 1 and len(m[1]) > 1 and m[1][0] != m[1][1]:  # simple correction
             ncols = 2
         iq = np.linspace(np.min(m[1]), np.max(m[1]), ncols)
@@ -1105,7 +1108,8 @@ class Reader:
             ncols = ncols-1
 
         id = np.reshape(m[0], (-1, ncols)).T[0]
-        id = self.__removeTrailingZero(id)
+        if id[0] >= 0:
+            id = self.__removeTrailingZero(id)
         nrows = len(id)
         if nrows > 1 and id[nrows-1] < id[nrows-2]:
             nrows = nrows-1
@@ -1168,7 +1172,7 @@ class Reader:
                    for name in content[2].split('\t') if name][2:]
         # outer rotor motor
         if 'Iron' in subregs and \
-            'Rotor' in subregs: 
+            'Rotor' in subregs:
             self.external_rotor = True
         logger.info("Stator Subregions: %s", subregs)
         speed = float(content[0].split()[-1])/60.
@@ -1184,7 +1188,11 @@ class Reader:
         if not m:
             return
         m = np.array(m).T
-        ncols = np.argmax(np.abs(m[1][1:]-m[1][:-1]))+1
+        d = np.diff(m[1])
+        if self.ldq:
+            ncols = (len(d)+1)//(len(d[d > 0])+1)
+        else:
+            ncols = (len(d)+1)//(len(d[d < 0])+1)
         if ncols == 1 and len(m[1]) > 1 and m[1][0] != m[1][1]:
             ncols = 2
         id = np.reshape(m[0], (-1, ncols)).T[0]
@@ -1229,9 +1237,9 @@ class Reader:
                                          (nrows, ncols)).T.tolist()
                            for k, v in zip(cols, m[2:])})
         ls['speed'] = speed
-        if self.external_rotor: 
+        if self.external_rotor:
             ls.update(losses_mapping_external_rotor(ls))
-        else: 
+        else:
             ls.update(sttylosses(ls))
         if self.ldq:
             self.ldq['losses'] = ls
@@ -1487,9 +1495,9 @@ class Reader:
     def __read_losses(self, content):
         losses = {}
         i = 0
-        # check if external rotor 
+        # check if external rotor
         if self.weights[0][1] == 0.0 and \
-            self.weights[0][-1] > 0: 
+            self.weights[0][-1] > 0:
             self.external_rotor = True
         # find results for angle:
         while True:
@@ -1548,8 +1556,8 @@ class Reader:
                     losses['total'] += losses['staza']+losses['stajo']
                 elif len(rec) == 1:
                     t = l.split(':')[-1].strip()
-                    if t == 'Iron': 
-                        if self.external_rotor: 
+                    if t == 'Iron':
+                        if self.external_rotor:
                             losses['rotfe'] = floatnan(rec[0])
                             losses['total'] += losses['rotfe']
                         else:
@@ -1561,14 +1569,14 @@ class Reader:
                 continue
 
             if _rotloss.search(l):
-                if l.find('StZa') > -1: 
+                if l.find('StZa') > -1:
                     self.external_rotor = True
                 rec = self.__findNums(content[i+2])
                 if len(rec) == 1:
-                    if self.external_rotor: 
+                    if self.external_rotor:
                         losses['staza'] = floatnan(rec[0])
                         losses['total'] += losses['staza']
-                    else: 
+                    else:
                         rotfe = floatnan(rec[0])
                         losses['rotfe'] += rotfe
                         losses['total'] += rotfe
@@ -1602,7 +1610,7 @@ 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']

{femagtools-1.7.3 → femagtools-1.7.4}/src/femagtools/dxfsl/fslrenderer.py

@@ -189,7 +189,7 @@ class FslRenderer(object):
                          '-- min_corner = {}, {}'.format(
                              geom.start_min_corner(0),
                              geom.start_min_corner(1)),
-                         '-- max_corner = {}, {}'.format(
+                         '-- max_corner start = {}, {}'.format(
                              geom.start_max_corner(0),
                              geom.start_max_corner(1)),
                          '\n']
@@ -211,11 +211,12 @@ class FslRenderer(object):
                 'r, phi = c2pr(x0, y0)',
                 'x1, y1 = pr2c(r1, phi)',
                 'x2, y2 = pr2c(r1, {}*math.pi/parts)'.format(slice),
+                f'r = {geom.dist_end_max_corner()}',
                 'x3, y3 = pr2c(r, {}*math.pi/parts)'.format(slice),
                 'nc_line(x0, y0, x1, y1, 0)',
                 'nc_circle_m(x1, y1, x2, y2, 0.0, 0.0, 0)',
                 'nc_line(x2, y2, x3, y3, 0)',
-                'x0, y0 = pr2c(r1 - hair/2, math.pi/parts)',
+                'x0, y0 = pr2c(r1 - hair/2, math.pi/parts/2)',
                 'create_mesh_se(x0, y0)',
                 '\n',
                 'outer_da_start = {}'.format(

{femagtools-1.7.3 → femagtools-1.7.4}/src/femagtools/fsl.py

@@ -106,6 +106,7 @@ class Builder:
         params['show_plots'] = model.stator[templ].get('plot', False)
         params['write_fsl'] = True
         params['airgap'] = -1.0
+        params['nodedist'] = model.stator.get('nodedist', 1)
         pos = 'in' if model.external_rotor else 'out'
         params['part'] = ('stator', pos)
         conv = convert(model.stator['dxffile']['name'], **params)
@@ -491,6 +492,11 @@ class Builder:
         if not hasattr(model, 'stator'):
             setattr(model, 'stator', {})
         model.stator['num_slots'] = conv.get('tot_num_slot')
+        if model.get('num_agnodes', 0) == 0:
+            model.set_value('agndst', conv['agndst']*1e-3)
+            logger.info("num poles %d num slots %d outer diameter %.4f m agndst %.4f mm",
+                        model.poles, model.stator['num_slots'],
+                        model.outer_diam, model.agndst*1e3)
         if params['full_model']:
             model.stator['num_slots_gen'] = model.stator['num_slots']
         else:
@@ -531,21 +537,6 @@ class Builder:
             logger.info("create new model '%s'", model.name)
             if model.is_dxffile():
                 self.prepare_model_with_dxf(model)
-                if 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.dxffile.get('nodedist')))
-
-                logger.info(" num poles %d num slots %d outer diameter %.4f m",
-                            model.poles, model.stator['num_slots'],
-                            model.outer_diam)
-
             else:
                 self.prepare_stator(model)
                 if hasattr(model, 'magnet'):
@@ -553,9 +544,9 @@ class Builder:
                 self.prepare_diameter(model)
                 if self.fsl_stator and model.get('num_agnodes', 0) == 0:
                     from femagtools.dxfsl.fslrenderer import agndst
-                    if model.get('agndst'): 
+                    if model.get('agndst',0):
                         pass
-                    else: 
+                    else:
                         ag = model.get('airgap')
                         model.set_value(
                             'agndst',