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

femagtools/nc.py

@@ -23,6 +23,7 @@ class Reader(object):
 
     def __init__(self, filename):
         ds = netCDF4.Dataset(filename)
+        node_temperature = None
         self.POINT_ISA_POINT_REC_PT_CO_X = []
         self.POINT_ISA_POINT_REC_PT_CO_Y = []
         self.LINE_ISA_LINE_REC_LN_PNT_1 = []
@@ -54,6 +55,11 @@ class Reader(object):
              grp.variables[k][:-1]
              for k in ('bnd_cnd', 'bnd_cnd', 'per_nod',
                        'co_1', 'co_2', 'co_rad', 'co_phi', 'vp_re', 'vp_im')]
+        try:
+            node_temperature = grp.variables['temperature'][:-1]
+        except:
+            pass
+
         logger.debug('Nodes: %d', len(self.NODE_ISA_NODE_REC_ND_CO_1))
 
         grp = ds.groups['node_elements']
@@ -198,9 +204,15 @@ class Reader(object):
             self.poles_sim = int(grp.variables['poles_sim'].getValue().data)
             self.slots = int(grp.variables['num_slots'].getValue().data)
             self.arm_length = float(grp.variables['arm_length'].getValue().data)
+            self.state_of_problem = int(grp.variables['state_of_problem'].getValue().data)
         except:
             pass
 
+        if hasattr(self, 'state_of_problem'):
+            if self.state_of_problem == 5:
+                # th simulation
+                if node_temperature is not None:
+                    self.NODE_ISA_NODE_REC_ND_VP_IM = node_temperature
         self.MAGN_TEMPERATURE = 20
         self.BR_TEMP_COEF = 0
         try:

femagtools/plot/__init__.py

@@ -16,5 +16,5 @@ from .nc import spel, mesh, demag, demag_pos, \
     airgap_flux_density_pos, loss_density
 from .mcv import mcv_hbj, mcv_muer, felosses
 from .phasor import i1beta_phasor, iqd_phasor, phasor
-from .wdg import mmf, mmf_fft, zoneplan, winding_factors, winding
+from .wdg import mmf, mmf_fft, zoneplan, winding_factors, winding, currdist
 from .fieldlines import fieldlines

femagtools/plot/nc.py

@@ -35,19 +35,19 @@ def spel(isa, superelements=[], with_axis=False, ax=0):
                             color=isa.color[se.color], lw=0))
         try:
             # draw wire direction
-            if se.subregion: 
-                if se.subregion.curdir != 0: 
+            if se.subregion:
+                if se.subregion.curdir != 0:
                         wkey = se.subregion.winding.key
-                        if se.subregion.curdir < 0: 
+                        if se.subregion.curdir < 0:
                             label = str(se.subregion.curdir*wkey)
-                        else: 
+                        else:
                             label = '+'+str(se.subregion.curdir*wkey)
 
                         xy = np.array([n.xy
                             for nc in se.nodechains
                             for n in nc.nodes])
                         cx, cy = np.mean(np.unique(xy[:, 0])), np.mean(np.unique(xy[:, -1]))
-                        ax.text(cx, cy, label, rotation=np.arctan2(cy, cx)/np.pi*180-90, 
+                        ax.text(cx, cy, label, rotation=np.arctan2(cy, cx)/np.pi*180-90,
                                 horizontalalignment='center', verticalalignment='center')
         except:
             pass
@@ -296,3 +296,20 @@ def loss_density(isa, subreg=[], cmap=DEFAULT_CMAP, ax=0):
     elements = [e for e in __elements_of_subreg(isa, subreg)]
     lossd = np.array([e.loss_density*1e-3 for e in elements])
     _contour(ax, 'Loss Density kW/m³', elements, lossd, '', cmap)
+
+def temperature_distribution(isa, ax=0, cmap='plasma'):
+    """plot temperature distribution of NC/I7/ISA7 model
+
+    Args:
+        isa: Isa7/NC object
+    """
+    temp = []
+    elements = [e for e in isa.elements]
+    for e in isa.elements:
+        tmp = 0
+        ctr = 1
+        for n in e.vertices:
+            tmp += n.vpot[-1]
+            ctr = ctr + 1
+        temp.append(tmp/ctr)
+    _contour(ax, 'Temperature in K', elements, temp, '', cmap)

femagtools/plot/wdg.py

@@ -9,14 +9,38 @@ import numpy as np
 import matplotlib.pyplot as plt
 
 
+def currdist(wdg, title='', k='all', phi=0, ax=0):
+    """plot current distribution  of winding
+    Arguments:
+          k: (int) winding key (all if 0 or 'all', default all)
+          phi: (float) current angle (default 0)
+    """
+    if ax == 0:
+        ax = plt.gca()
+    if title:
+        ax.set_title(title)
+    cdist = wdg.currdist(k=k, phi=phi)
+    taus = 360/wdg.Q
+    c = np.sum([cdist[j] for j in cdist], axis=0)
+    pos = np.arange(0, len(cdist[1]))*taus + taus/2
+    cbars = ax.bar(pos, c/np.max(c), width=taus/4)
+    ax.set_xlabel("Position / Deg")
+    ax.grid()
+    return cbars
+
+
 def mmf(f, title='', ax=0):
-    """plot magnetomotive force (mmf) of winding"""
+    """plot magnetomotive force (mmf) of winding
+    Arguments
+      f: (dict) windings mmf
+      title: (str) plot title
+    """
     if ax == 0:
         ax = plt.gca()
     if title:
         ax.set_title(title)
-    ax.plot(np.array(f['pos'])/np.pi*180, f['mmf'])
-    ax.plot(np.array(f['pos_fft'])/np.pi*180, f['mmf_fft'])
+    yphi = ax.plot(np.array(f['pos'])/np.pi*180, f['mmf'])
+    yfft = ax.plot(np.array(f['pos_fft'])/np.pi*180, f['mmf_fft'])
     ax.set_xlabel('Position / Deg')
 
     phi = [f['alfa0']/np.pi*180, f['alfa0']/np.pi*180]
@@ -28,7 +52,7 @@ def mmf(f, title='', ax=0):
     ax.annotate(f"", xy=(phi[0], y[0]),
                 xytext=(0, y[0]), arrowprops=dict(arrowstyle="->"))
     ax.grid()
-
+    return yphi, yfft
 
 def mmf_fft(f, title='', mmfmin=1e-2, ax=0):
     """plot winding mmf harmonics"""
@@ -37,7 +61,16 @@ def mmf_fft(f, title='', mmfmin=1e-2, ax=0):
     if title:
         ax.set_title(title)
     else:
-        ax.set_title('MMF Harmonics (per phase)')
+        def single_phase(f):
+            try:
+                return len(f['currdens']) == 1
+            except KeyError:
+                return True
+        if single_phase(f):
+            ax.set_title('MMF Harmonics (single phase)')
+        else:
+            ax.set_title('MMF Harmonics')
+
     ax.grid(True)
     order, mmf = np.array([(n, m) for n, m in zip(f['nue'],
                                                   f['mmf_nue']) if m > mmfmin]).T

femagtools/svgfsl/converter.py

@@ -20,6 +20,11 @@ def main():
                            help='stator without airgap in/out',
                            dest='stator',
                            default='')
+    argparser.add_argument('--EESM',
+                           help='Electric Excited Synchronous Motor',
+                           dest='EESM',
+                           action="store_true",
+                           default=False)
     argparser.add_argument('-p', '--plot',
                            help='show plots',
                            dest='show_plots',
@@ -61,6 +66,7 @@ def main():
 
     res = convert(args.svgfile,  # SVG-Filename
                   part=part,
+                  EESM=EESM,
                   view_only=args.view,
                   show_plots=args.show_plots,
                   show_areas=args.show_areas,

femagtools/templates/gen_winding.mako

@@ -88,6 +88,12 @@ m.num_poles       =  ${model.poles}
 
 % if 'thcap' in model.winding:
 -- Thermal Material properties
+
+conductor_density = ${model.winding['spmaweight']*1e3}
+conductor_thcond = ${model.winding['thcond']}
+conductor_thcap = ${model.winding['thcap']}
+
+--[[
 if m.slot_height ~= nil then
   -- FEMAG slot model
   -- TODO: slot model from user
@@ -100,9 +106,9 @@ if m.slot_height ~= nil then
     dr = 1
   end
 
-  density = ${model.windings['spmaweight']*1e3}
-  lam = ${model.windings['thcond']}
-  cap = ${model.windings['thcap']}
+  density = ${model.winding['spmaweight']*1e3}
+  lam = ${model.winding['thcond']}
+  cap = ${model.winding['thcap']}
 
   for i=1,m.num_sl_gen do
     a = (2*i-1)*math.pi/m.tot_num_sl + m.zeroangl/180*math.pi
@@ -114,4 +120,5 @@ if m.slot_height ~= nil then
     end
   end
 end
+]]--
 %endif

femagtools/templates/magnetIron.mako

@@ -1,4 +1,3 @@
-
 m.magn_rad       = da2/2
 m.yoke_rad       = dy2/2
 
@@ -39,58 +38,43 @@ for i = 0, m.npols_gen-1 do
     end
 end
 %endif
-%if model.get('thcond', 0) and model.get('thcap', 0):
+
+%if model.get('thcond', 0) and model.get('thcap', 0) and model.get('density', 0):
+if m.shaft_rad == nil then 
+    m.shaft_rad = dy2/2
+end 
+if m.shaft_rad > dy2/2 then 
+    m.shaft_rad = dy2/2
+end 
 beta = math.pi/m.num_poles
-xrb,yrb = pr2c(m.yoke_rad+0.1, beta)  -- rotor lamination
-thcond = ${model['thcond']}
-thcap = ${model['thcap']}
-density = ${model.get('density')*1e3}
-def_mat_therm(xrb,yrb,'blue',density,thcond,thcap,1)
+rotor_thcond = ${model['thcond']}
+rotor_thcap = ${model['thcap']}
+rotor_density = ${model.get('density')*1e3}
 
 %if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
 if m.shaft_rad < m.yoke_rad then
-   thcond = ${model['thcond_shaft']}
-   thcap = ${model['thcap_shaft']}
-   density = ${model['spmaweight_shaft']*1e3}
-   def_mat_therm(m.yoke_rad/2,0.1,'blue',density,thcond,thcap,1) -- Shaft
+   shaft_thcond = ${model['thcond_shaft']}
+   shaft_thcap = ${model['thcap_shaft']}
+   shaft_density = ${model['spmaweight_shaft']*1e3}
+   r_shaft = (m.shaft_rad + m.yoke_rad)/2
+   x0_shaft, y0_shaft = pd2c(r_shaft, beta/2)
 end
 %endif
-rm = m.magn_rad*math.cos(beta)
-density = ${model['spmaweight_magnet']*1e3}
-thcond = ${model.get('thcond_magnet', 8)}
-thcap = ${model.get('thcap_magnet', 440)}
-for i = 1,m.npols_gen do -- Magnete
-  alfa = (2*i-1) * beta
-  xmx,ymx = pr2c(rm,alfa)
-  def_mat_therm(xmx,ymx,darkgreen-i%2,density,thcond,thcap,1)
-end
-
-if m.air_triangle > 0 then
-  rs = math.sqrt(rm^2 + m.magn_width^2/4)
-  gam = math.atan(m.magn_width/2, rm)
-  for i = 1,m.npols_gen do -- air triangle
-    alfa = (2*i-1) * beta
-    xsx,ysx = pr2c(rs,alfa + gam + 1e-2)
-    def_mat_therm(xsx,ysx,skyblue,1.12,0.026,1007,1)
-    xsx,ysx = pr2c(rs,alfa - gam - 1e-2)
-    def_mat_therm(xsx,ysx,skyblue,1.12,0.026,1007,1)
-  end
-end
-
 
--- add air layer (inside) for heat transfer
-h = 3.8
-beta = 360*m.npols_gen/m.num_poles
+if x0_shaft == nil then
+   -- add air layer (inside) for heat transfer
+   h = 3.8
+   beta = 360*m.npols_gen/m.num_poles
 
-
-x0, y0 = pd2c(m.shaft_rad, m.zeroangl)
-x1, y1 = pd2c(m.shaft_rad-h, m.zeroangl)
-x2, y2 = pd2c(m.shaft_rad-h, beta+m.zeroangl)
-x3, y3 = pd2c(m.shaft_rad, beta+m.zeroangl)
-nc_line(x0, y0, x1, y1, 0)
-nc_circle(x1, y1, x2, y2, 0)
-nc_line(x2, y2, x3, y3, 0)
-x0, y0 = pd2c(m.shaft_rad-h/2, beta/2+m.zeroangl)
-create_mesh_se(x0, y0)
+   x0, y0 = pd2c(m.shaft_rad, m.zeroangl)
+   x1, y1 = pd2c(m.shaft_rad-h, m.zeroangl)
+   x2, y2 = pd2c(m.shaft_rad-h, beta+m.zeroangl)
+   x3, y3 = pd2c(m.shaft_rad, beta+m.zeroangl)
+   nc_line(x0, y0, x1, y1, 0)
+   nc_circle(x1, y1, x2, y2, 0)
+   nc_line(x2, y2, x3, y3, 0)
+   x0, y0 = pd2c(m.shaft_rad-h/2, beta/2+m.zeroangl)
+   create_mesh_se(x0, y0)
+end
 
 %endif

femagtools/templates/magnetIron2.mako

@@ -41,3 +41,42 @@ for i = 0, m.npols_gen-1 do
     end
 end
 %endif
+%if model.get('thcond', 0) and model.get('thcap', 0) and model.get('density', 0):
+if m.shaft_rad == nil then 
+    m.shaft_rad = dy2/2
+end 
+if m.shaft_rad > dy2/2 then 
+    m.shaft_rad = dy2/2
+end 
+beta = math.pi/m.num_poles
+rotor_thcond = ${model['thcond']}
+rotor_thcap = ${model['thcap']}
+rotor_density = ${model.get('density')*1e3}
+
+%if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
+if m.shaft_rad < m.yoke_rad then
+   shaft_thcond = ${model['thcond_shaft']}
+   shaft_thcap = ${model['thcap_shaft']}
+   shaft_density = ${model['spmaweight_shaft']*1e3}
+   r_shaft = (m.shaft_rad + m.yoke_rad)/2
+   x0_shaft, y0_shaft = pd2c(r_shaft, beta/2)
+end
+%endif
+
+if x0_shaft == nil then
+   -- add air layer (inside) for heat transfer
+   h = 3.8
+   beta = 360*m.npols_gen/m.num_poles
+
+   x0, y0 = pd2c(m.shaft_rad, m.zeroangl)
+   x1, y1 = pd2c(m.shaft_rad-h, m.zeroangl)
+   x2, y2 = pd2c(m.shaft_rad-h, beta+m.zeroangl)
+   x3, y3 = pd2c(m.shaft_rad, beta+m.zeroangl)
+   nc_line(x0, y0, x1, y1, 0)
+   nc_circle(x1, y1, x2, y2, 0)
+   nc_line(x2, y2, x3, y3, 0)
+   x0, y0 = pd2c(m.shaft_rad-h/2, beta/2+m.zeroangl)
+   create_mesh_se(x0, y0)
+end
+
+%endif

femagtools/templates/magnetIron3.mako

@@ -65,3 +65,42 @@ end
 end
 
 %endif
+%if model.get('thcond', 0) and model.get('thcap', 0) and model.get('density', 0):
+if m.shaft_rad == nil then 
+    m.shaft_rad = dy2/2
+end 
+if m.shaft_rad > dy2/2 then 
+    m.shaft_rad = dy2/2
+end 
+beta = math.pi/m.num_poles
+rotor_thcond = ${model['thcond']}
+rotor_thcap = ${model['thcap']}
+rotor_density = ${model.get('density')*1e3}
+
+%if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
+if m.shaft_rad < m.yoke_rad then
+   shaft_thcond = ${model['thcond_shaft']}
+   shaft_thcap = ${model['thcap_shaft']}
+   shaft_density = ${model['spmaweight_shaft']*1e3}
+   r_shaft = (m.shaft_rad + m.yoke_rad)/2
+   x0_shaft, y0_shaft = pd2c(r_shaft, beta/2)
+end
+%endif
+
+if x0_shaft == nil then
+   -- add air layer (inside) for heat transfer
+   h = 3.8
+   beta = 360*m.npols_gen/m.num_poles
+
+   x0, y0 = pd2c(m.shaft_rad, m.zeroangl)
+   x1, y1 = pd2c(m.shaft_rad-h, m.zeroangl)
+   x2, y2 = pd2c(m.shaft_rad-h, beta+m.zeroangl)
+   x3, y3 = pd2c(m.shaft_rad, beta+m.zeroangl)
+   nc_line(x0, y0, x1, y1, 0)
+   nc_circle(x1, y1, x2, y2, 0)
+   nc_line(x2, y2, x3, y3, 0)
+   x0, y0 = pd2c(m.shaft_rad-h/2, beta/2+m.zeroangl)
+   create_mesh_se(x0, y0)
+end
+
+%endif

femagtools/templates/magnetIron4.mako

@@ -40,3 +40,42 @@ for i = 0, m.npols_gen-1 do
     end
 end
 %endif
+%if model.get('thcond', 0) and model.get('thcap', 0):
+if m.shaft_rad == nil then 
+    m.shaft_rad = dy2/2
+end 
+if m.shaft_rad > dy2/2 then 
+    m.shaft_rad = dy2/2
+end 
+beta = math.pi/m.num_poles
+rotor_thcond = ${model['thcond']}
+rotor_thcap = ${model['thcap']}
+rotor_density = ${model.get('density')*1e3}
+
+%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
+   shaft_thcond = ${model['thcond_shaft']}
+   shaft_thcap = ${model['thcap_shaft']}
+   shaft_density = ${model['spmaweight_shaft']*1e3}
+   r_shaft = (m.shaft_rad + m.yoke_rad)/2
+   x0_shaft, y0_shaft = pd2c(r_shaft, beta/2)
+end
+%endif
+
+if x0_shaft == nil then
+   -- add air layer (inside) for heat transfer
+   h = 3.8
+   beta = 360*m.npols_gen/m.num_poles
+
+   x0, y0 = pd2c(m.shaft_rad, m.zeroangl)
+   x1, y1 = pd2c(m.shaft_rad-h, m.zeroangl)
+   x2, y2 = pd2c(m.shaft_rad-h, beta+m.zeroangl)
+   x3, y3 = pd2c(m.shaft_rad, beta+m.zeroangl)
+   nc_line(x0, y0, x1, y1, 0)
+   nc_circle(x1, y1, x2, y2, 0)
+   nc_line(x2, y2, x3, y3, 0)
+   x0, y0 = pd2c(m.shaft_rad-h/2, beta/2+m.zeroangl)
+   create_mesh_se(x0, y0)
+end
+
+%endif

femagtools/templates/magnetIron5.mako

@@ -40,3 +40,42 @@ for i = 0, m.npols_gen-1 do
     end
 end
 %endif
+%if model.get('thcond', 0) and model.get('thcap', 0) and model.get('density', 0):
+if m.shaft_rad == nil then 
+    m.shaft_rad = dy2/2
+end 
+if m.shaft_rad > dy2/2 then 
+    m.shaft_rad = dy2/2
+end 
+beta = math.pi/m.num_poles
+rotor_thcond = ${model['thcond']}
+rotor_thcap = ${model['thcap']}
+rotor_density = ${model.get('density')*1e3}
+
+%if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
+if m.shaft_rad < m.yoke_rad then
+   shaft_thcond = ${model['thcond_shaft']}
+   shaft_thcap = ${model['thcap_shaft']}
+   shaft_density = ${model['spmaweight_shaft']*1e3}
+   r_shaft = (m.shaft_rad + m.yoke_rad)/2
+   x0_shaft, y0_shaft = pd2c(r_shaft, beta/2)
+end
+%endif
+
+if x0_shaft == nil then
+   -- add air layer (inside) for heat transfer
+   h = 3.8
+   beta = 360*m.npols_gen/m.num_poles
+
+   x0, y0 = pd2c(m.shaft_rad, m.zeroangl)
+   x1, y1 = pd2c(m.shaft_rad-h, m.zeroangl)
+   x2, y2 = pd2c(m.shaft_rad-h, beta+m.zeroangl)
+   x3, y3 = pd2c(m.shaft_rad, beta+m.zeroangl)
+   nc_line(x0, y0, x1, y1, 0)
+   nc_circle(x1, y1, x2, y2, 0)
+   nc_line(x2, y2, x3, y3, 0)
+   x0, y0 = pd2c(m.shaft_rad-h/2, beta/2+m.zeroangl)
+   create_mesh_se(x0, y0)
+end
+
+%endif

femagtools/templates/magnetIronV.mako

@@ -68,62 +68,42 @@ for i = 0, m.npols_gen-1 do
 end
 %endif
 
-%if model.get('thcond', 0) and model.get('thcap', 0):
-beta = math.pi/m.num_poles + m.zeroangl/180*math.pi
-xrb,yrb = pr2c(m.yoke_rad+0.1, beta)  -- rotor lamination
-thcond = ${model['thcond']}
-thcap = ${model['thcap']}
-def_mat_therm(xrb,yrb,'blue',7700,thcond,thcap,1)
---def_mat_therm(m.yoke_rad/2,0.1,'blue',7700,thcond,thcap,1) -- Shaft
-
-gam = m.magn_angle/2/180*math.pi
-y = m.rotor_rad*math.sin(beta)
-x = m.rotor_rad*math.cos(beta)
-rr = y/math.sin(gam)
-xx = x - math.sqrt(rr^2 - y^2)
-rm = xx/(math.cos(beta/2) - math.sin(beta/2)/math.tan(gam))
-thcon = 8
-thcap = 440
-for i = 1,m.npols_gen do -- Magnets
-  alfa = (2*i-1) * beta
-  xmx,ymx = pr2c(rm,alfa-beta/2)
-  def_mat_therm(xmx,ymx,darkgreen-i%2,7500,thcond,thcap,1)
-  xmx,ymx = pr2c(rm,alfa+beta/2)
-  def_mat_therm(xmx,ymx,darkgreen-i%2,7500,thcond,thcap,1)
+%if model.get('thcond', 0) and model.get('thcap', 0) and model.get('density', 0):
+if m.shaft_rad == nil then 
+    m.shaft_rad = dy2/2
+end 
+if m.shaft_rad > dy2/2 then 
+    m.shaft_rad = dy2/2
+end 
+beta = math.pi/m.num_poles
+rotor_thcond = ${model['thcond']}
+rotor_thcap = ${model['thcap']}
+rotor_density = ${model.get('density')*1e3}
+
+%if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
+if m.shaft_rad < m.yoke_rad then
+   shaft_thcond = ${model['thcond_shaft']}
+   shaft_thcap = ${model['thcap_shaft']}
+   shaft_density = ${model['spmaweight_shaft']*1e3}
+   r_shaft = (m.shaft_rad + m.yoke_rad)/2
+   x0_shaft, y0_shaft = pd2c(r_shaft, beta/2)
 end
+%endif
 
-thcond = 0.026   -- air
-thcap = 1007
-get_spel_keys("sekeys")      -- Get all subregions of the model
-for i=1, #sekeys do
-  srkey =  get_spel_data("srkey", sekeys[i])
-  if srkey > 0 then
-    srname = get_sreg_data("name",srkey)
-    if srname == '    ' then
-      srkey = 0
-    end
-  end
-  if srkey == 0 then
-    elkeys = get_spel_data("elkeys", sekeys[i])
-    Ex, Ey = get_elem_data("xycp", elkeys[1])
-    r, phi = c2pr(Ex, Ey)
-    if r < m.rotor_rad then -- rotor only
-      def_mat_therm(Ex,Ey,'skyblue',1.12,thcond,thcap,1)
-    end
-  end
+if x0_shaft == nil then
+   -- add air layer (inside) for heat transfer
+   h = 3.8
+   beta = 360*m.npols_gen/m.num_poles
+
+   x0, y0 = pd2c(m.shaft_rad, m.zeroangl)
+   x1, y1 = pd2c(m.shaft_rad-h, m.zeroangl)
+   x2, y2 = pd2c(m.shaft_rad-h, beta+m.zeroangl)
+   x3, y3 = pd2c(m.shaft_rad, beta+m.zeroangl)
+   nc_line(x0, y0, x1, y1, 0)
+   nc_circle(x1, y1, x2, y2, 0)
+   nc_line(x2, y2, x3, y3, 0)
+   x0, y0 = pd2c(m.shaft_rad-h/2, beta/2+m.zeroangl)
+   create_mesh_se(x0, y0)
 end
 
--- add air layer (inside) for heat transfer
-h = 3.8
-beta = 360*m.npols_gen/m.num_poles
-x0, y0 = pd2c(dy2/2, m.zeroangl)
-x1, y1 = pd2c(dy2/2-h, m.zeroangl)
-x2, y2 = pd2c(dy2/2-h, beta+m.zeroangl)
-x3, y3 = pd2c(dy2/2, beta+m.zeroangl)
-nc_line(x0, y0, x1, y1, 0)
-nc_circle(x1, y1, x2, y2, 0)
-nc_line(x2, y2, x3, y3, 0)
-x0, y0 = pd2c(dy2/2-h/2, beta/2+m.zeroangl)
-create_mesh_se(x0, y0)
-
 %endif

femagtools/templates/magnetSector.mako

@@ -68,55 +68,40 @@ for i = 0, m.npols_gen-1 do
     end
 end
 %endif
-%if model.get('thcond', 0) and model.get('thcap', 0):
-beta = math.pi/m.num_poles + m.zeroangl/180*math.pi
-xrb,yrb = pr2c(m.yoke_rad+0.1, beta)  -- rotor lamination
-thcond = 24 -- ${model['thcond']}
-thcap = 480 -- ${model['thcap']}
-def_mat_therm(xrb,yrb,'blue',7700,thcond,thcap,1)
---def_mat_therm(m.yoke_rad/2,0.1,'blue',7700,thcond,thcap,1) -- Shaft
+%if model.get('thcond', 0) and model.get('thcap', 0) and model.get('density', 0):
+if m.shaft_rad == nil then 
+    m.shaft_rad = m.condshaft_r
+end 
+if m.shaft_rad > dy2/2 then 
+    m.shaft_rad = dy2/2
+end 
+beta = math.pi/m.num_poles
+rotor_thcond = ${model['thcond']}
+rotor_thcap = ${model['thcap']}
+rotor_density = ${model.get('density')*1e3}
 
-rm = m.rotor_rad - m.magn_height/2
-thcond = 8
-thcap = 440
-for i = 1,m.npols_gen do -- Magnets
-  alfa = (2*i-1) * beta
-  xmx,ymx = pr2c(rm,alfa-beta/2)
-  def_mat_therm(xmx,ymx,darkgreen-i%2,7500,thcond,thcap,1)
+%if model.get('thcond_shaft', 0) and model.get('thcap_shaft', 0):
+if m.shaft_rad < m.yoke_rad then
+   shaft_thcond = ${model['thcond_shaft']}
+   shaft_thcap = ${model['thcap_shaft']}
+   shaft_density = ${model['spmaweight_shaft']*1e3}
+   r_shaft = (m.shaft_rad + m.yoke_rad)/2
+   x0_shaft, y0_shaft = pd2c(r_shaft, beta/2)
 end
+%endif
+if x0_shaft == nil then
+   -- add air layer (inside) for heat transfer
+   h = 3.8
+   beta = 360*m.npols_gen/m.num_poles
 
-thcond = 0.026   -- air
-thcap = 1007
-get_spel_keys("sekeys")      -- Get all subregions of the model
-for i=1, #sekeys do
-  srkey =  get_spel_data("srkey", sekeys[i])
-  if srkey > 0 then
-    srname = get_sreg_data("name",srkey)
-    if srname == '    ' then
-      srkey = 0
-    end
-  end
-  if srkey == 0 then
-    elkeys = get_spel_data("elkeys", sekeys[i])
-    Ex, Ey = get_elem_data("xycp", elkeys[1])
-    r, phi = c2pr(Ex, Ey)
-    if r < m.rotor_rad then -- rotor only
-      def_mat_therm(Ex,Ey,'skyblue',1.12,thcond,thcap,1)
-    end
-  end
+   x0, y0 = pd2c(m.shaft_rad, m.zeroangl)
+   x1, y1 = pd2c(m.shaft_rad-h, m.zeroangl)
+   x2, y2 = pd2c(m.shaft_rad-h, beta+m.zeroangl)
+   x3, y3 = pd2c(m.shaft_rad, beta+m.zeroangl)
+   nc_line(x0, y0, x1, y1, 0)
+   nc_circle(x1, y1, x2, y2, 0)
+   nc_line(x2, y2, x3, y3, 0)
+   x0, y0 = pd2c(m.shaft_rad-h/2, beta/2+m.zeroangl)
+   create_mesh_se(x0, y0)
 end
---[[
--- add air layer (inside) for heat transfer
-h = 3.8
-beta = 360*m.npols_gen/m.num_poles
-x0, y0 = pd2c(dy2/2, m.zeroangl)
-x1, y1 = pd2c(dy2/2-h, m.zeroangl)
-x2, y2 = pd2c(dy2/2-h, beta+m.zeroangl)
-x3, y3 = pd2c(dy2/2, beta+m.zeroangl)
-nc_line(x0, y0, x1, y1, 0)
-nc_circle(x1, y1, x2, y2, 0)
-nc_line(x2, y2, x3, y3, 0)
-x0, y0 = pd2c(dy2/2-h/2, beta/2+m.zeroangl)
-create_mesh_se(x0, y0)
---]]
 %endif