femagtools 1.7.9__py3-none-any.whl → 1.8.1__py3-none-any.whl

femagtools/me.py

@@ -3,8 +3,8 @@ Postprocessing FEMAG-ME results
 """
 __author__ = 'dapu zhang'
 
-import re 
-import numpy as np 
+import re
+import numpy as np
 import matplotlib.pyplot as plt
 import logging
 
@@ -16,33 +16,33 @@ def get_eigenvectors(filelist, psfiles):
     eigenvecs = {}
     eigenfreq = []
     ps_data = []
-    temp = [] 
+    temp = []
     temp_arr = []
     read_fig = False
 
     if len(psfiles) > 0: read_fig = True
     if len(filelist) == 0: return []
-    
-    for k, kk in zip(filelist, range(len(filelist))): 
+
+    for k, kk in zip(filelist, range(len(filelist))):
         # read ps file
         if read_fig: ps_data.append(plt.imread(psfiles[kk]))
         eigenvecs[str(kk)] = {}
-        with open(k, 'r') as f: 
+        with open(k, 'r') as f:
             data = f.read().split('\n')
-        eigenval = float(re.split('\s+', data[0].strip())[2])
+        eigenval = float(re.split(r'\s+', data[0].strip())[2])
         eigenfreq.append(eigenval/2/np.pi)
-        
-        for i in range(len(data[1:-1])): 
-            for j in data[2+i].strip().split(' '): 
+
+        for i in range(len(data[1:-1])):
+            for j in data[2+i].strip().split(' '):
                 if j != '':
                     temp.append(float(j))
 
         temp_arr = np.array(temp).reshape(-1, 5)
         idx_collect = []
         # remove the index, at which the dof equals zero
-        for c in range(temp_arr.shape[0]): 
+        for c in range(temp_arr.shape[0]):
             if np.abs(temp_arr[c, 1]) < 1e-15 and \
-            np.abs(temp_arr[c, 2]) < 1e-15: 
+            np.abs(temp_arr[c, 2]) < 1e-15:
                 idx_collect.append(c)
         # prepare the data from the further calculation
         temp_arr = np.delete(temp_arr, np.array(idx_collect), axis=0)
@@ -52,4 +52,4 @@ def get_eigenvectors(filelist, psfiles):
         # return node position
         if kk == 0: eigenvecs.update({'node_pos': temp_arr[:, 4::]})
 
-    return [ps_data, eigenfreq, eigenvecs] 
+    return [ps_data, eigenfreq, eigenvecs]

femagtools/model.py

@@ -392,7 +392,7 @@ class MachineModel(Model):
                         for k in thkeys_shaft:
                             rotor[k+'_shaft'] = mshaft[k]
                         rotor['spmaweight_shaft'] = rotor['rho_shaft']
-                    
+
                     self.stator['mcvkey_shaft_name'] = mcv
                     names.append((mcv, 1.0))
                 else:
@@ -442,7 +442,7 @@ class MachineModel(Model):
 
     def is_complete(self):
         """check completeness of models"""
-        if self.is_dxffile():
+        if self.is_dxffile() or self.is_svgfile():
             return True
         try:
             self.statortype()
@@ -460,6 +460,12 @@ class MachineModel(Model):
                 return True
         return False
 
+    def is_svgfile(self):
+        if 'svgfile' in self.__dict__:
+            if isinstance(self.svgfile, dict):
+                return True
+        return False
+
     def has_magnet(self):  # either rotor or magnet
         return hasattr(self, 'magnet')
 

femagtools/plot/fieldlines.py

@@ -4,7 +4,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 import matplotlib.lines as mpl
 
-rgbpat = re.compile('rgb\((\d+),(\d+),(\d+)\)')
+rgbpat = re.compile(r'rgb\((\d+),(\d+),(\d+)\)')
 
 def fieldlines(svgfilename, ax=0):
     """plot fieldlines from svg file"""

femagtools/plot/mcv.py

@@ -37,10 +37,12 @@ def mcv_hbj(mcv, log=True, ax=0):
             label = 'Flux Density ({0}°)'.format(mcv.mc1_angle[k])
         if log:
             ax.semilogx(hi, bi, label=label)
+            ax.semilogx(hi, bi, 'k.')
             if ji:
                 ax.semilogx(hi, ji, label='Polarisation')
         else:
             ax.plot(hi, bi, label=label)
+            ax.plot(hi, bi, 'k.')
             if ji:
                 ax.plot(hi, ji, label='Polarisation')
     ax.set_xlabel('H / kA/m')
@@ -59,10 +61,26 @@ def mcv_muer(mcv, ax=0):
     if ax == 0:
         ax = plt.gca()
     ax.plot(bi, ur)
+    ax.plot(bi, ur, 'k.')
     ax.set_xlabel('B / T')
     ax.set_title('rel. Permeability')
     ax.grid()
 
+def mcv_nuer(mcv, ax=0):
+    """plot rel. reluctivity vs. B of mcv dict"""
+    MUE0 = 4e-7*np.pi
+    bi, ur = zip(*[(bx, bx/hx/MUE0)
+                   for bx, hx in zip(mcv['curve'][0]['bi'],
+                                     mcv['curve'][0]['hi']) if not hx == 0])
+    if ax == 0:
+        ax = plt.gca()
+    nuer = 1/np.array(ur)
+    ax.plot(bi, 1/np.array(ur))
+    ax.plot(bi, nuer, 'k.')
+    ax.set_xlabel('B / T')
+    ax.set_title('rel. Reluctivity')
+    ax.grid()
+
 
 def felosses(losses, coeffs, title='', log=True, ax=0):
     """plot iron losses with steinmetz or jordan approximation

femagtools/plot/wdg.py

@@ -153,11 +153,11 @@ def winding_factors(wdg, n=8, ax=0):
                                   wdg.kwd(n),
                                   wdg.kw(n))]).T
     try:
-        markerline1, stemlines1, _ = ax.stem(order-1, kwp,
+        markerline1, stemlines1, _ = ax.stem(order-0.5, kwp,
                                              'C1:', basefmt=" ",
                                              markerfmt='C1.',
                                              label='Pitch')
-        markerline2, stemlines2, _ = ax.stem(order+1, kwd,
+        markerline2, stemlines2, _ = ax.stem(order+0.5, kwd,
                                              'C2:', basefmt=" ",
                                              markerfmt='C2.',
                                              label='Distribution')

femagtools/svgfsl/converter.py

@@ -66,7 +66,7 @@ def main():
 
     res = convert(args.svgfile,  # SVG-Filename
                   part=part,
-                  EESM=EESM,
+                  EESM=args.EESM,
                   view_only=args.view,
                   show_plots=args.show_plots,
                   show_areas=args.show_areas,

femagtools/templates/afm_rotor.mako

@@ -91,7 +91,11 @@ m.nodedist        = ${model.get('nodedist', 1)}
   x,y = (P22.x+P32.x)/2,(P21.y+P22.y)/2
   if m.remanenc == nil then
     m.remanenc = 1.2
+  end
+  if m.relperm == nil then
     m.relperm = 1.05
+  end
+  if m.rlen == nil then
     m.rlen = 100
   end
   for i = 1,m.npols_gen do

femagtools/templates/gen_hairpin_winding.mako

@@ -1,9 +1,13 @@
 -- hairpin winding template
 
-rcoil, phi_coil = c2pd(m.xcoil_1, m.ycoil_1)
-
 slot_div_angle = 360/m.tot_num_slot
 
+if m.xcoil_1 ~= nil and m.ycoil_1 ~= nil then 
+  rcoil, phi_coil = c2pd(m.xcoil_1, m.ycoil_1)
+else
+  rcoil, phi_coil = da1/2 + m.slot_height/2, slot_div_angle/2
+end 
+
 -- delete existing mesh in the slot
 for i = 1, m.num_sl_gen do
     xc, yc = pd2c(rcoil, phi_coil+(i-1)*slot_div_angle)
@@ -12,7 +16,7 @@ end
 -- wire params
 wire_height = ${model['wire']["wire_height"]*1e3}
 wire_width = ${model['wire']["wire_width"]*1e3}
-wire_corner_r = ${model['wire']["corner_radius"]*1e3}
+wire_corner_r = 0.0
 wire_gap = ${model['wire']["wire_separation"]*1e3}
 TH1 = ${model['wire']["wire_th1"]*1e3} -- distance to the bore radius
 nwires = ${model['wire']["num_layers"]}
@@ -128,7 +132,7 @@ for j = 1, m.num_sl_gen do
    end
 end
 
-ndt(agndst)
+ndt(agndst*1.5)
 for j = 1, m.num_sl_gen do
   for i = 1, nwires do
     dx, dy = x0+(wire_gap+wire_height)*(i-1), y0
@@ -142,8 +146,8 @@ create_mesh()
 
 -- create winding
 
-widfile = io.open("wid.fsl", 'r')
-
+--widfile = io.open("wid.fsl", 'r')
+widfile = io.open("wid.txt", 'r')
 nrows = 1
 winding = {}
 
@@ -158,52 +162,39 @@ for i in widfile:lines() do
 end
 
 --[[
-
 winding table
-
-1  slot_go pos_in_slot slot_ret pos_in_slot
-
+key slot layer dir
 ]]--
 dir = 'wi'
 cols = {"green", "yellow", "cyan"}
 wk = 1
 for i = 1, #winding do
-    idx = winding[i][2]
-    idxp = winding[i][3]
-    idy = winding[i][4]
-    idyp = winding[i][5]
-
-   if i == 1 then
-        if idx <= m.num_sl_gen then
-            wkey = def_new_wdg(wire_xy[idx][idxp].x, wire_xy[idx][idxp].y, cols[winding[i][1]], "Phase"..winding[i][1], 1, 0, 0, dir)
-        end
-
-        if math.abs(idy) <= m.num_sl_gen then
-            add_to_wdg (wire_xy[math.abs(idy)][idyp].x, wire_xy[math.abs(idy)][idyp].y, "wsamekey", "wo", "wser")
-        end
-   else
-        if winding[i][1] == winding[i-1][1] and winding[i][1] == wk then
-            if idx <= m.num_sl_gen then
-                add_to_wdg (wire_xy[idx][idxp].x, wire_xy[idx][idxp].y, "wsamekey", dir, "wser")
-            end
-            if math.abs(idy) <= m.num_sl_gen then
-                add_to_wdg (wire_xy[math.abs(idy)][idyp].x, wire_xy[math.abs(idy)][idyp].y, "wsamekey", "wo", "wser")
-            end
-        else
-            if idx <= m.num_sl_gen then
-                wkey = def_new_wdg(wire_xy[idx][idxp].x, wire_xy[idx][idxp].y, cols[winding[i][1]], "Phase"..winding[i][1], 1, 0, 0, dir)
-                wk = wk + 1
-            end
-            if math.abs(idy) <= m.num_sl_gen then
-                if wk == winding[i][1] then
-                  add_to_wdg (wire_xy[math.abs(idy)][idyp].x, wire_xy[math.abs(idy)][idyp].y, "wsamekey", "wo", "wser")
-                else
-                  wkey = def_new_wdg(wire_xy[math.abs(idy)][idyp].x, wire_xy[math.abs(idy)][idyp].y, cols[winding[i][1]], "Phase"..winding[i][1], 1, 0, 0, "wo")
+    windingskey = winding[i][1]
+    slot_nr = winding[i][2]
+    layer = winding[i][3]
+    direction = winding[i][4]
+    if direction < 0 then 
+      dir = 'wo'
+    else
+      dir = 'wi'
+    end 
+    if i == 1 then
+          if slot_nr <= m.num_sl_gen then
+              wkey = def_new_wdg(wire_xy[slot_nr][layer].x, wire_xy[slot_nr][layer].y, cols[winding[i][1]], "Phase"..winding[i][1], 1, 0, 0, dir)
+          end
+
+    else
+          if winding[i][1] == winding[i-1][1] and winding[i][1] == wk then
+              if slot_nr <= m.num_sl_gen then
+                  add_to_wdg (wire_xy[slot_nr][layer].x, wire_xy[slot_nr][layer].y, "wsamekey", dir, "wser")
+              end
+            
+          else
+              if slot_nr <= m.num_sl_gen then
+                  wkey = def_new_wdg(wire_xy[slot_nr][layer].x, wire_xy[slot_nr][layer].y, cols[winding[i][1]], "Phase"..winding[i][1], 1, 0, 0, dir)
                   wk = wk + 1
-                end
-            end
-        end
+              end
+          end
    end
 end
-
 m.num_par_wdgs = ${model.get('num_par_wdgs', 1)}

femagtools/templates/magnetIron.mako

@@ -49,7 +49,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIron2.mako

@@ -51,7 +51,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIron3.mako

@@ -75,7 +75,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIron4.mako

@@ -50,7 +50,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0) and model.get('density', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIron5.mako

@@ -50,7 +50,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetIronV.mako

@@ -78,7 +78,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/magnetSector.mako

@@ -78,7 +78,7 @@ end
 beta = math.pi/m.num_poles
 rotor_thcond = ${model['thcond']}
 rotor_thcap = ${model['thcap']}
-rotor_density = ${model.get('density')*1e3}
+rotor_density = ${model.get('density')}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then

femagtools/templates/mesh-airgap.mako

@@ -34,20 +34,26 @@ if not airgap_created then
     if inner_da_start == nil then
       inner_da_start = da2/2
     end
-    nc_line(r1, 0.0, r2, 0.0, 2)
+    x1, y1 = pr2c(inner_da_start, 0.0)
+    nc_line(x1, y1, r1, 0.0, 0.0)
 
     if outer_da_start == nil then
       outer_da_start = da1/2
     end
-    nc_line(r2, 0.0, outer_da_start, 0.0, 0)
+    x2, y2 = pr2c(outer_da_start, 0.0)
+    nc_line(r2, 0.0, x2, y2, 0.0)
 
     if m.tot_num_slot > m.num_sl_gen then
-      x4, y4 = pr2c(outer_da_start, alfa)
-      nc_line(x1, y1, x2, y2, 2)
-      nc_line(x4, y4, x2, y2, 0)
+      x3, y3 = pr2c(inner_da_end, alfa)
+      x4, y4 = pr2c(r1, alfa)
+      nc_line(x3, y3, x4, y4, 0, 0)
+
+      x3, y3 = pr2c(outer_da_end, alfa)
+      x4, y4 = pr2c(r2, alfa)
+      nc_line(x3, y3, x4, y4, 0, 0)
     end
 
-    x0, y0 = pr2c(r2-ag/6, alfa/2)
+    x0, y0 = pr2c(r1-ag/6, alfa/2)
     create_mesh_se(x0, y0)
     x0, y0 = pr2c(r2+ag/6, alfa/2)
     create_mesh_se(x0, y0)