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

femagtools/machine/utils.py

@@ -21,9 +21,9 @@ def K(d):
     returns transformation matrix
     """
     return np.array((
-        (-np.cos(d), np.sin(d)),
-        (-np.cos(d-2*np.pi/3), np.sin(d-2*np.pi/3)),
-        (-np.cos(d+2*np.pi/3), np.sin(d+2*np.pi/3))))
+        (np.cos(d), -np.sin(d)),
+        (np.cos(d-2*np.pi/3), -np.sin(d-2*np.pi/3)),
+        (np.cos(d+2*np.pi/3), -np.sin(d+2*np.pi/3))))
 
 
 def T(d):
@@ -34,9 +34,9 @@ def T(d):
 
     returns transformation matrix
     """
-    return np.array((
-        (-np.cos(d), -np.cos(d-2*np.pi/3), -np.cos(d+2*np.pi/3)),
-        (np.sin(d), np.sin(d-2*np.pi/3), np.sin(d+2*np.pi/3))))/3*2
+    return 2/3*np.array((
+        (np.cos(d), np.cos(d-2*np.pi/3), np.cos(d+2*np.pi/3)),
+        (-np.sin(d), -np.sin(d-2*np.pi/3), -np.sin(d+2*np.pi/3))))
 
 
 def invpark(a, q, d):
@@ -49,9 +49,9 @@ def invpark(a, q, d):
         q: value in quadrature axis
     """
     if np.isscalar(a) and np.isscalar(q) and np.isscalar(d):
-        return np.dot(K(a), (q, d))
+        return np.dot(K(a), (d, q))
     if np.isscalar(q) and np.isscalar(d):
-        return np.array([K(x).dot((q, d)) for x in a]).T
+        return np.array([K(x).dot((d, q)) for x in a]).T
     return np.array([K(x).dot((y, z)) for x, y, z in zip(a, d, q)]).T
 
 
@@ -284,12 +284,17 @@ def dqpar_interpol(xfit, dqpars, ipkey='temperature'):
       dqpars -- list of dict with id, iq (or i1, beta), Psid and Psiq values
       ipkey -- key (string) to interpolate
     """
-    # check current range
-    ckeys = (('i1', 'beta'), ('id', 'iq'))
-    dqtype = 0
-    fpip = {k: dqpars[0][k] for k in ckeys[dqtype]}
+    dqtype = ''
+    if set(('i1', 'beta')).issubset(dqpars[0]):
+        dqtype = 'ldq'
+    elif set(('id', 'iq')).issubset(dqpars[0]):
+        dqtype = 'psidq'
+    else:
+        raise ValueError("missing current in dqpars parameter")
+    ckeys = ('i1', 'beta') if dqtype == 'ldq' else ('id', 'iq')
+    fpip = {k: dqpars[0][k] for k in ckeys}
     fpip['losses'] = dict()
-    for k in ckeys[dqtype]:
+    for k in ckeys:
         curr = np.array([f[k] for f in dqpars], dtype=object)
         shape = curr.shape
         if curr.shape != (len(dqpars), len(curr[0])):
@@ -421,13 +426,27 @@ def dqparident(workdir, engine, temp, machine,
         r1 = 0  # cannot calc winding resistance
 
     n = len(temp)
-    parvardef = {
-        "decision_vars": [
-            {"values": sorted(2*temp), "name": "magn_temp"},
-            {"values": n*[0, -90], "name": "beta_max"},
-            {"values": n*[-90, -180], "name": "beta_min"}
-        ]
-    }
+    dqtype = kwargs.get('dqtype', 'ldq')
+    num_cur_steps = kwargs.get('num_cur_steps', 5)
+    if dqtype == 'ldq':
+        parvardef = {
+            "decision_vars": [
+                {"values": sorted(2*temp), "name": "magn_temp"},
+                {"values": n*[0, -90], "name": "beta_max"},
+                {"values": n*[-90, -180], "name": "beta_min"}
+            ]
+        }
+    else:
+        delta = round(i1_max*np.sqrt(2)/num_cur_steps)
+        iqmax = num_cur_steps*delta
+        idmin = -iqmax
+        parvardef = {
+            "decision_vars": [
+                {"values": sorted(2*temp), "name": "magn_temp"},
+                {"values": n*[0, -iqmax], "name": "miniq"},
+                {"values": n*[iqmax, 0], "name": "maxiq"}
+            ]
+        }
 
     parvar = parstudy.List(
         workdir, condMat=condMat,
@@ -441,23 +460,40 @@ def dqparident(workdir, engine, temp, machine,
     if machine.get('external_rotor', False):
         period_frac = 1  # TODO: missing femag support
 
-    simulation = dict(
-        calculationMode='ld_lq_fast',
-        i1_max=kwargs.get('i1_max', i1_max),
-        magn_temp=20,
-        wind_temp=20,
-        beta_max=0,
-        beta_min=-90,
-        num_move_steps=26,
-        num_par_wdgs=machine[wdgk].get('num_par_wdgs', 1),
-        num_cur_steps=kwargs.get('num_cur_steps', 5),
-        num_beta_steps=kwargs.get('num_beta_steps', 7),
-        speed=kwargs.get('speed', defspeed),
-        period_frac=period_frac)
+    if dqtype == 'ldq':
+        simulation = dict(
+            calculationMode='ld_lq_fast',
+            i1_max=kwargs.get('i1_max', i1_max),
+            magn_temp=20,
+            wind_temp=20,
+            beta_max=0,
+            beta_min=-90,
+            num_move_steps=kwargs.get('num_move_steps', 26),
+            num_par_wdgs=machine[wdgk].get('num_par_wdgs', 1),
+            num_cur_steps=num_cur_steps,
+            num_beta_steps=kwargs.get('num_beta_steps', 7),
+            speed=kwargs.get('speed', defspeed),
+            period_frac=period_frac)
+    else:
+        simulation = dict(
+            calculationMode='psd_psq_fast',
+            magn_temp=20,
+            wind_temp=20,
+            maxiq=0,
+            miniq=0,
+            maxid=0,
+            minid=idmin,
+            num_move_steps=kwargs.get('num_move_steps', 26),
+            num_par_wdgs=machine[wdgk].get('num_par_wdgs', 1),
+            delta_id=delta,
+            delta_iq=delta,
+            speed=kwargs.get('speed', defspeed),
+            period_frac=period_frac)
 
     # TODO: cleanup()  # remove previously created files in workdir
     # start calculation
     results = parvar(parvardef, machine, simulation, engine)
+
     if 'poles' not in machine:  # dxf model?
         machine['poles'] = 2*results['f'][0]['machine']['p']
         da1 = 2*results['f'][0]['machine']['fc_radius']
@@ -475,18 +511,34 @@ def dqparident(workdir, engine, temp, machine,
     except KeyError:
         rotor_mass = 0  # need femag classic > rel-9.3.x-48-gca42bbd0
 
-    ldq = []
-    for i in range(0, len(results['f']), 2):
-        d = dict(i1=results['f'][i]['ldq']['i1'],
-                 beta=results['f'][i+1]['ldq']['beta'][:-1] + results['f'][i]['ldq']['beta'])
-        d.update(
-            {k: np.vstack((np.array(results['f'][i+1]['ldq'][k])[:-1, :],
-                           np.array(results['f'][i]['ldq'][k]))).tolist()
-             for k in ('psid', 'psiq', 'torque', 'ld', 'lq', 'psim')})
-        ldq.append(d)
+    dq = []
+    if dqtype == 'ldq':
+        for i in range(0, len(results['f']), 2):
+            d = dict(i1=results['f'][i]['ldq']['i1'],
+                     beta=(results['f'][i+1]['ldq']['beta'][:-1]
+                           + results['f'][i]['ldq']['beta']))
+            d.update(
+                {k: np.vstack((np.array(results['f'][i+1]['ldq'][k])[:-1, :],
+                               np.array(results['f'][i]['ldq'][k]))).tolist()
+                 for k in ('psid', 'psiq', 'torque', 'ld', 'lq', 'psim')})
+            dq.append(d)
+    else:
+        for i in range(0, len(results['f']), 2):
+            d = dict(id=results['f'][i]['psidq']['id'],
+                     iq=(results['f'][i+1]['psidq']['iq'][:-1]
+                         + results['f'][i]['psidq']['iq']))
+            d.update(
+                {k: np.vstack((np.array(results['f'][i+1]['psidq'][k])[:-1, :],
+                               np.array(results['f'][i]['psidq'][k]))).tolist()
+                 for k in ('psid', 'psiq', 'torque')})
+            d.update(
+                {k: np.vstack((np.array(results['f'][i+1]['psidq_ldq'][k])[:-1, :],
+                               np.array(results['f'][i]['psidq_ldq'][k]))).tolist()
+                 for k in ('ld', 'lq', 'psim')})
+            dq.append(d)
     # collect existing losses only
     losskeymap = {'magnet': 'magnet'}
-    losskeys = [k for k in results['f'][0]['ldq']['losses']
+    losskeys = [k for k in results['f'][0][dqtype]['losses']
                 if len(k.split('_')) > 1] + ['magnet']
     for k in losskeys:
         if k.find('_') > -1:
@@ -499,21 +551,27 @@ def dqparident(workdir, engine, temp, machine,
                 losskeymap[k] = k
     for i in range(0, len(results['f']), 2):
         j = i//2
-        ldq[j]['temperature'] = results['x'][0][i]
-        ldq[j]['losses'] = {losskeymap[k]: np.vstack(
-            (np.array(results['f'][i+1]['ldq']['losses'][k])[:-1, :],
-             np.array(results['f'][i]['ldq']['losses'][k]))).tolist()
-                            for k in losskeys}
-        ldq[j]['losses']['speed'] = results['f'][i]['ldq']['losses']['speed']
+        dq[j]['temperature'] = results['x'][0][i]
+        if dqtype == 'ldq':
+            dq[j]['losses'] = {losskeymap[k]: np.vstack(
+                (np.array(results['f'][i+1][dqtype]['losses'][k])[:-1, :],
+                 np.array(results['f'][i][dqtype]['losses'][k]))).tolist()
+                               for k in losskeys}
+        else:
+            dq[j]['losses'] = {losskeymap[k]: np.hstack(
+                (np.array(results['f'][i+1][dqtype]['losses'][k])[:, :-1],
+                 np.array(results['f'][i][dqtype]['losses'][k]))).T.tolist()
+                               for k in losskeys}
+        dq[j]['losses']['speed'] = results['f'][i][dqtype]['losses']['speed']
         for k in ('hf', 'ef'):
-            ldq[j]['losses'][k] = results['f'][i]['lossPar'][k]
+            dq[j]['losses'][k] = results['f'][i]['lossPar'][k]
 
     dqpars = {
         'm': machine[wdgk]['num_phases'],
         'p': machine['poles']//2,
         'ls1': ls1,
         "rotor_mass": rotor_mass, "kfric_b": 1,
-        'ldq': ldq}
+        dqtype: dq}
     if 'resistance' in machine[wdgk]:
         dqpars['r1'] = machine[wdgk]['resistance']
     else:

femagtools/model.py

@@ -275,7 +275,7 @@ class MachineModel(Model):
         """
         names = []
         missing = []
-
+        thkeys = 'thcap', 'thcond'
         mcv = 0
         if 'stator' in self.__dict__:
             fillfac = self.stator.get('fillfac', 1.0)
@@ -292,6 +292,12 @@ class MachineModel(Model):
                                     mcv, fillfac)
                                 names.append((mcv, fillfac))
                                 self.stator[mcvname] = mcv
+                                m = magcurves.find_by_name(mcv)
+                                if m and set(thkeys).issubset(m.keys()):
+                                    for k in thkeys:
+                                        self.stator[k] = m[k]
+                                    logger.info('stator mcv %s set therm prop in stator',
+                                                mcv)
                             else:
                                 missing.append(self.stator[k])
                                 logger.error('stator mcv %s not found',
@@ -327,6 +333,11 @@ class MachineModel(Model):
                     rotor['mcvkey_yoke'] = magcurves.fix_name(
                         mcv, fillfac)
                     rotor['mcvkey_yoke_name'] = mcv
+                    m = magcurves.find_by_name(mcv)
+                    if m and set(thkeys).issubset(m.keys()):
+                        for k in thkeys:
+                            rotor[k] = m[k]
+                        logger.debug('stator mcv %s set therm prop in rotor', mcv)
                     names.append((mcv, fillfac))
                 else:
                     missing.append(rotor['mcvkey_yoke'])

femagtools/parstudy.py

@@ -186,11 +186,6 @@ class ParameterStudy(object):
         except AttributeError: #  if dxf or pure fsl model
             simulation['range_phi'] = 0.0
         simulation.update(model.winding)
-        if 'pocfilename' not in simulation:
-            simulation['pocfilename'] = f"{model.name}.poc"
-        if simulation['calculationMode'] == 'psd_psq_fast':
-            simulation['pocfilename'] = f"{model.name}_{model.get('poles')}p.poc"
-
         fea = femagtools.model.FeaModel(simulation)
 
         prob = femagtools.moproblem.FemagMoProblem(decision_vars,
@@ -214,6 +209,8 @@ class ParameterStudy(object):
                     except:
                         pass
         job = engine.create_job(self.femag.workdir)
+        if self.femag.cmd:
+            engine.cmd = [self.femag.cmd]
         # for progress logger
         job.num_cur_steps = fea.get_num_cur_steps()
 
@@ -225,6 +222,8 @@ class ParameterStudy(object):
         if hasattr(fea, 'poc'):
             fea.poc.pole_pitch = 2*360/model.get('poles')
             fea.pocfilename = fea.poc.filename()
+        if not hasattr(fea, 'pocfilename'):
+            fea.pocfilename = f"{model.name}_{model.get('poles')}p.poc"
         elapsedTime = 0
         self.bchmapper_data = []  # clear bch data
         # split x value (par_range) array in handy chunks:

femagtools/plot/char.py

@@ -296,7 +296,10 @@ def _plot_contour(speed, torque, z, ax, title='', levels=[],
     from matplotlib.patches import PathPatch
     x = 60*np.asarray(speed)
     y = np.asarray(torque)
-
+    tunit = 'Nm'
+    if max(np.abs(y)) > 10e3:
+        y *=1e-3
+        tunit = 'kNm'
     x, xscale = _normalize10(x, **kwargs)
     y, yscale = _normalize10(y, **kwargs)
 
@@ -344,7 +347,7 @@ def _plot_contour(speed, torque, z, ax, title='', levels=[],
             return round(yscale*tick_val)
         ax.yaxis.set_major_formatter(format_fn)
 
-    ax.set_ylabel('Torque / Nm')
+    ax.set_ylabel(f'Torque / {tunit}')
     ax.set_xlabel('Speed / rpm')
     ax.set_title(title)
     if cbar:

femagtools/templates/basic_modpar.mako

@@ -109,6 +109,8 @@ else
   agndst = 1 -- last resort
 end
 % endif
+% elif hasattr(model, 'agndst'):
+  agndst = ${model.agndst*1e3}
 % endif
 % if hasattr(model, 'afmtype'):
 m.model_type      =  "${model['afmtype']}"

femagtools/templates/{therm-static.mako → therm_static.mako}

@@ -7,18 +7,18 @@ state_of_problem("therm_static")
 
 beta = 360*slots_gen/num_slots
 m.zeroangl = 0
--- heat transfer outside
-heat_transfer_coefficient = ${model['heat_transfer_coefficient'][0]}
-area_factor = 1
-dy1 = ${model['outer_diam']*1e3}
-x,y = pd2c(dy1/2+0.05, beta/2+m.zeroangl)
-def_heat_transfer(x,y,yellow,heat_transfer_coefficient, area_factor)
--- heat transfer inside
+
+heat_transfer_coefficient = ${model['heat_transfer_coefficient']}
+area_factor = 5
+
 % if 'inner_diam' in model and len(model['heat_transfer_coefficient'])>1:
-dy2 = ${model['inner_diam']*1e3}
-heat_transfer_coefficient = ${model['heat_transfer_coefficient'][1]}
-area_factor = 1
-x,y = pd2c(dy2/2-0.05, beta/2+m.zeroangl)
+  -- heat transfer inside
+  dy2 = ${model['inner_diam']*1e3}
+  x,y = pd2c(dy2/2-0.05, beta/2+m.zeroangl)
+% else:
+  -- heat transfer outside
+  dy1 = ${model['outer_diam']*1e3}
+  x,y = pd2c(dy1/2+0.05, beta/2+m.zeroangl)
 def_heat_transfer(x,y,yellow,heat_transfer_coefficient, area_factor)
 %endif
 ---------------------------------------------
@@ -36,8 +36,10 @@ def_losses ( x,y,'red', ${i[1]})
 %endfor
 %endif
 
-color_gradation_th(0,0,tot,Losses,0,0,model.."_losses.svg")
+color_gradation_th(0,0,tot,Losses,0,0, "losses.svg")
 
 ---------------------------------------------
 calc_therm_field()
-color_gradation_th(0,0,tot,Temp,0.0,0,model.."_temp.svg")
+color_gradation_th(0,0,tot,Temp,0.0,0, "temp.svg")
+
+state_of_problem("mag_static")

femagtools/windings.py

@@ -74,7 +74,10 @@ class Winding(object):
         if hasattr(self, 'windings'):
             # calculate coil width yd and num layers l
             taus = 360/self.Q
-            ngen = 0
+            try:
+                ngen = arg.machine.get('qs_sim', 0)
+            except AttributeError:
+                ngen = 0
             if 'slots' in self.windings[1]:  # custom winding def
                 for k in self.windings:
                     w = self.windings[k]
@@ -96,7 +99,7 @@ class Winding(object):
 
             slots = [round((x-taus/2)/taus)
                      for x in self.windings[1]['PHI']]
-            self.l = 2
+            self.l = 1
             if len(slots) > ngen//self.m:
                 self.l = 2
             return

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

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

@@ -1,9 +1,9 @@
-femagtools/__init__.py,sha256=1YBODQdBsY7HA7g3S83zDtocMsCpScKv1hPGDi2rydw,1600
-femagtools/airgap.py,sha256=ZCIZTYf6BbuNYx68y9fUDBQo3taN8RuGl8q-jJ7ygiA,1577
+femagtools/__init__.py,sha256=z_m3ZYsmxn72xMFMzy-WxDxEWeieBELwuwUF3kzJssE,1600
+femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
 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=wvkVbxmikjwsOzJ_vB690Dqtm2X1DGXCFM4vy07eDNU,73412
+femagtools/bch.py,sha256=FYpQsbCaJB6GJHwUto4aCq94Yz1DtYAbaj7l-gGjmY4,73716
 femagtools/bchxml.py,sha256=KrRjAdrUPZXmiWvonu9HhpG_NvImMBpiXWTL4iSr4kE,3142
 femagtools/condor.py,sha256=J8z9iBdvrGu3I1eFNoyKV8AXzRoTEPGLSak6cXUQxAM,10766
 femagtools/conductor.py,sha256=rXO7c7Qh_s7JpgILmLd4IbG64vP6Eh143YF9u25Mdwg,1076
@@ -17,11 +17,12 @@ 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=hFoxjFmVEbahsYp7cGcoNXtZHXeAsxk02VIOx8p2NXs,34219
+femagtools/fsl.py,sha256=htSzZkguxDsVvIBXi6VK3YRqUbYAlQ_R4jLRfcOmIzw,33872
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
 femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
 femagtools/grid.py,sha256=s7LfKKLm2H4-cza2kSEANq6vwxq10Su3TJl3kHShHRA,1561
+femagtools/heat_source_network.py,sha256=dz3nTK084SR2fyy1167wlpBlGrzv54OqCCGKPNWqpsU,16836
 femagtools/hxy.py,sha256=PkiZ_-CRhtvtpkmLAP8iMtwvzh7CjKGGcAbOhFb4Nls,6275
 femagtools/isa7.py,sha256=HnD_NZ5-Oj98kw8e3o3tdHt07kfEL-d0N6KmqkoeTeU,58332
 femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
@@ -30,7 +31,7 @@ femagtools/losscoeffs.py,sha256=Nil2fvkkS6-T29OnHIsdVbegCHyl23iZg8rMVbbA5wY,6785
 femagtools/magnet.py,sha256=Nuk060bT4Wa3lX74HdefqTTtUxLaERDSBYTTpbi6KP4,1093
 femagtools/mcv.py,sha256=Y5tCBEhm6k64m9xQ-salId5e-U29nNTz-iH4MHTbE5Y,40673
 femagtools/me.py,sha256=XNK0l-aroNYfKyxV_uslE8q3vJb_KuntAYTWd-4FQaQ,1833
-femagtools/model.py,sha256=7_LWgUQY3W-n4RBvPXbTY2FhfgiR0xlSSKTv2JqUX08,15618
+femagtools/model.py,sha256=bv6U2wBnJejTA8zHQD-hSZETkEZr4UF73gbPLmtsaRI,16328
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
 femagtools/multiproc.py,sha256=7mJF-VU1NrJkENyg8eHtDrDRNBwLPK43phZv3ehm9BU,8435
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
@@ -38,16 +39,16 @@ femagtools/nc.py,sha256=6O3lWuX2SX8IuVM0rr55L2UywrI1MmXzJOgUtUmcg4A,14532
 femagtools/netlist.py,sha256=CSCl8setLZ_L8DCnNWaNA3-wLe1yo-fmzARZoVvYfaA,2052
 femagtools/ntib.py,sha256=76g1ZO3Fq_kN-HTMBvaKvJmMMlJMyEPFeNAcJPq3w7Y,3099
 femagtools/opt.py,sha256=snQlPNT5hksCgj0TBjFBhSCERMHHGMv1xc4uFSxptfQ,8687
-femagtools/parstudy.py,sha256=K78fd7ILhYjGgkauTXc_M8Plnynee0WFH20iyuoMXSo,19523
+femagtools/parstudy.py,sha256=IkWffdFLhLACSvqJ6_ho4Pi4RC6AapLThoktVTXnVJE,19461
 femagtools/poc.py,sha256=wMwOxMhPLFRiGPMsKQwWWuGr6UZPzRBajhfVMfXptNU,6794
 femagtools/tks.py,sha256=xStMu6P1xsc36tS53FKnbL6i2ZTVnCNXyTVw8_gjepo,7436
 femagtools/ts.py,sha256=x9aCMVASjdBZuyI2pJGMyi1dveGFd_pWQ20cZ-l_moc,47216
 femagtools/utils.py,sha256=1SX5s21xyW8u0NF_Hjs7DByyCTdLm9VRArLburTyHR0,1581
 femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
-femagtools/windings.py,sha256=6ioABZRWQ3xA4kmEz2NUkXh-C-FmW9YYkjQKs5YakQs,22197
+femagtools/windings.py,sha256=-PDqzatXJUaMTR4hI1bbY__AAb3fjwfjiS9FEuR-8N8,22305
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
-femagtools/dxfsl/area.py,sha256=cYnDtnEuwuDW5R1NKV0s8PUzzQzxhgCUktFqHAjP9K8,56581
+femagtools/dxfsl/area.py,sha256=VTRYoIRDFM0bp5nWZF3_DtyUNA86ZwtD4eYfb3mnGY4,56618
 femagtools/dxfsl/areabuilder.py,sha256=Siu11yRcNJiSCWwc865-OvuVhSmLtRQWysbe1-rUcN0,34197
 femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
 femagtools/dxfsl/conv.py,sha256=GeRYUvbdcP5vKtNm5S5gU1yyMboGkGNyOqzkHpYbEEo,10086
@@ -56,9 +57,9 @@ femagtools/dxfsl/corner.py,sha256=-XPBcnEau-2-SRHLYzlBqCQGaFfgm_DH2qR1mSaFoAs,13
 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=0PItgL6Hjt1ovkDYy97lK9VN0LvPNxOLd0Bt-zPLmqE,25020
+femagtools/dxfsl/fslrenderer.py,sha256=PBy3KUlNIqItcxCFnWC-d3OrSrsNFj5vDLLGZW2oq3Q,25081
 femagtools/dxfsl/functions.py,sha256=F0AjzHfIfq3v-mhDzUOeq3zeYQCEsJl1-XpEyJQsSnQ,11805
-femagtools/dxfsl/geom.py,sha256=-hPErBLyAsDh-aq2s54psFqG2AaNr9jVeKMeEVUQF5E,165356
+femagtools/dxfsl/geom.py,sha256=-yIlxM1Mb93qdqTYwNYgs-RUI0-9qf9MB7f58q-bKFw,166805
 femagtools/dxfsl/journal.py,sha256=S17B7wsrq5QzIUbjgg0ntvnpgH0thHq9aQXO7GdYlQQ,4265
 femagtools/dxfsl/machine.py,sha256=3leWkjdMCLX2HgMhw8gNdxTKROhNCKU7KQrDVbBQ8DI,49337
 femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6R_c,13823
@@ -69,10 +70,10 @@ femagtools/machine/__init__.py,sha256=U8W65K7jr7jDdC1KnJh0WjYd8DFaLnIFVvlh-TKcV9
 femagtools/machine/afpm.py,sha256=hNyDFRLGmCuWRPZl_u1ztJ4pA-Y_mxLaVvg3UJkzRuE,24766
 femagtools/machine/effloss.py,sha256=sLB8AXYVAE_AL1Ca41A2EDbn9_7u6xNjaYFjmRPoTDg,13578
 femagtools/machine/im.py,sha256=3Y54AHMZfAjkvgexx2E-5jxNWzaVQ-SyaETCh7gNBYA,38008
-femagtools/machine/pm.py,sha256=JQn2vnPBvGF9mUnqnKiVisHZnjhpzIbaBkqUxKN5leE,58589
+femagtools/machine/pm.py,sha256=njWa9YRV2W80xqjT9Dj9Jro73Y3zJtg0HYdJ75Ye0Vk,61720
 femagtools/machine/sizing.py,sha256=nWCfxbyWfbw5-7xu0qZ6zjWNquEPn3fUH-fQeGb6QUc,24307
 femagtools/machine/sm.py,sha256=G4fHmZngQSRN9Dum7mHaf36b_CvD-u_AQogIFixlnys,37899
-femagtools/machine/utils.py,sha256=ckPOfaaieRbThMKkBtCtoCMsehdbePH8xNoWPmNoS3Y,18782
+femagtools/machine/utils.py,sha256=zi659wCszhXEioKXtRdeyQik2etRFGpoykqfOGiLtTo,21223
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
 femagtools/moo/algorithm.py,sha256=lNEf0Bur4yFpIJeLtAC3oIus8sOMWTb7jepFlD28YzE,5445
 femagtools/moo/population.py,sha256=qGEsm-2Ys_pTkVQv3Zv36HzOlqUxtMvM6NqY_KytsUE,10060
@@ -82,7 +83,7 @@ femagtools/moo/test/PopulationTest.py,sha256=lG9NeWo0xrslfQRa4tgy1Nj23VJMFIlg_vQ
 femagtools/moo/test/ProblemTest.py,sha256=r5XEfY4LPscDb35TxxPd0lbP3nUmL6_G6vrRo1I3RSg,505
 femagtools/plot/__init__.py,sha256=dD_wvo6sGc8jvJYD1b0Z7oxCE4O9uQ3Igb5DeAjZDWU,939
 femagtools/plot/bch.py,sha256=4f9Q-JZtj9WMjxFUXMXNaSdWdDXN_Be4-F9kOU45xns,28525
-femagtools/plot/char.py,sha256=SB40YJ5seVQmWTAdrfDQZiEZH3jIB11HUY5SJL_HJcY,12032
+femagtools/plot/char.py,sha256=iDvrKp_Hz10W7qLjWCtYajKjY01fZbwf_kITDGisPaY,12123
 femagtools/plot/fieldlines.py,sha256=QtKF4nhnQ_FHHGh9Qez3GVmym0CLhW1ZyIKtk4pzos4,1136
 femagtools/plot/fluxdens.py,sha256=NlexRJ3f_8CgKoWrV82ZIsAXPrLhwj98uOe8_fUks7A,1082
 femagtools/plot/forcedens.py,sha256=Vloi9czy7qbGXI-Vm7Cow6IfHTsFhCLI1YWduFOR55c,4075
@@ -96,7 +97,7 @@ femagtools/templates/afm_rotor.mako,sha256=fY-dlZvRLN9UAy5V6Q_inWghkSUe8pzrCYjJd
 femagtools/templates/afm_stator.mako,sha256=l1xEwxffZ1jyx5wuJ3rhVbVlZirJzD2K8n4i5Dvbxuc,5344
 femagtools/templates/airgapinduc.mako,sha256=aCMLZ7P4vjeSGikIetkwymgDjESdftPN_aYx2LfjfsY,246
 femagtools/templates/asyn_motor.mako,sha256=vvZ0SIJj4ORaCbE1Hl5NeCU_j2CWdOltVpSKP7ESJTQ,2879
-femagtools/templates/basic_modpar.mako,sha256=RqCazMbcRkDeOGT7o3EGvdvhoJhJT8pN-C3Nu5y4sQs,3259
+femagtools/templates/basic_modpar.mako,sha256=IlUbc5A0yrVF-kSTUgC8PM_PdzSbX_bzeAwiKN17msc,3323
 femagtools/templates/bertotti.mako,sha256=o0OjzIIliVy2oHtDx4QzsDBodfsUQhdln4DmPNcIHnQ,1346
 femagtools/templates/calc_field_ts.mako,sha256=hNs7INzk92U8LljQvQHnKf20fD2HU6igtx1rhsOvPkc,1911
 femagtools/templates/calc_therm_field.mako,sha256=Q1aAulucLjrtNiCnFGin3ObK13R1KG6dWjJTWwdfxds,1600
@@ -159,7 +160,7 @@ femagtools/templates/statorRing.mako,sha256=sDgDmk71EoE8d4e9cmyqKqRldfC8uKMmpHEj
 femagtools/templates/statorRotor3.mako,sha256=MrU_JCSH8tJEUH09fftJJslkbEeIwOB1WGBSxXqUqeI,4942
 femagtools/templates/stator_msh.mako,sha256=Neze1ielMCk7TrARyhOra91fFQVT8Phsgk2Omt_aMG8,1799
 femagtools/templates/therm-dynamic.mako,sha256=pEz7jrUpopK1-RqgulNnrkSaCZDjfLelsVo6cBqmpac,3142
-femagtools/templates/therm-static.mako,sha256=9L-AypN8tfnZnwSqXeni5wyJzAEOYFRJGma8hbwlBNc,1427
+femagtools/templates/therm_static.mako,sha256=ulevp4AP-kZ1_qdScPMaX9tLqvvP0t9lFflWTXgUxaE,1310
 femagtools/templates/torq_calc.mako,sha256=89IVD1L1Ep7kYaKVrNYYAurUidnbR7LdcP2aLF2hdYo,2264
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_afpm.py,sha256=OE-ULFcp_fBQ7SyRacDmDGbq8ULFHLbXXx3MHJN1C1c,11031
@@ -175,13 +176,14 @@ tests/test_erg.py,sha256=kRVzpXa6JDdbxTss18HUWKny9Dx8IMx9uGTrbQCnHwg,523
 tests/test_femag.py,sha256=55cCx90tJ1BEeu_-DOit37y26hFGVSYwkT81s9-p28E,1934
 tests/test_forcedens.py,sha256=Yzl3SAmJNkZN9dA3aLxRvwY8fKsw077Fl0iJm6zJ5Sk,536
 tests/test_fsl.py,sha256=H2doNSNLx9FmcHsq-Ng8mEwV7qZtAdIK4bFCyhFDUTw,16623
+tests/test_heat_source_network.py,sha256=TC-Gl4iy9jnMGfsY_24XjwlP-SDxP345JKVT8xRwsFo,690
 tests/test_hxy.py,sha256=pVb6ZfDhBy5-DXa3gh7RQmLFG8p5cSYB8gdGLC8kjAk,640
 tests/test_im.py,sha256=55wfCoA8_PuogI_RsC3AjUQCpR84T-HddtHuU1NxfPc,662
 tests/test_isa7.py,sha256=GJhRj2nncrUpNTIlM4jvG4kKZS7cK19hhQg9KbM3b5Q,3001
 tests/test_jhb.py,sha256=aDzwr2ZaXlizrPnlLlcI_IT3OpSxuKu-FzBBkIALEDg,824
 tests/test_job.py,sha256=1tCTPqd2LUeeVNuzC07lsPz4ffr0WAVX_BykyXQ2mZY,981
 tests/test_losscoeffs.py,sha256=3EKmDFRuvn88z_8r0HxKFdB0lNXNnhEgaFshL8BkDjE,2012
-tests/test_machine.py,sha256=t81TTMcAbZWLkkpDK3n3dRtctKKQzRhJlxRHrr0BmZo,12881
+tests/test_machine.py,sha256=Woha6nfKaYQCxxoG57sUztpnpU6K9imXwn9B_KMhanw,12906
 tests/test_magncurv.py,sha256=wPf1dNACZ1BkqKHSqJxiNi6Dq8JP3QCRBY4ql_0YCyU,2608
 tests/test_magnet.py,sha256=BUHG_8SEi4d8j6yV9BSzcpYc2-UVMRFv50P_jgTTXoQ,276
 tests/test_mcv.py,sha256=qV52S82BAN3GRyD-z73RgOBK9-fQCKvrT4T9MXzArn0,283
@@ -210,9 +212,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.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.5.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.7.5.dist-info/METADATA,sha256=IK9wuI7T0Bxd3Vo1nyzRSRZ1rKqncHaJwlAP57Uk5Tg,6156
+femagtools-1.7.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+femagtools-1.7.5.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.7.5.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.7.5.dist-info/RECORD,,

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

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

tests/test_heat_source_network.py

@@ -0,0 +1,21 @@
+import femagtools.heat_source_network as hsn
+import pathlib
+import pytest
+
+
+@pytest.fixture
+def data_dir():
+    return pathlib.Path(__file__).with_name('data')
+
+
+def test_heat_source_network(data_dir):
+    model = hsn.read(str(data_dir / 'temp_model.hsn'))
+    assert [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13] == model.nodes
+    names = model.get_node_names()
+    assert ['StZa', 'outs', 'StJo', 'Slot',
+            'Shaf', 'Iron', 'PMag', 'PMag',
+            'W1  ', 'W2  ', 'W3  '] == names
+    T = model.solve()
+    # [130.22552926,  56.75737966, 116.12788806, 150.18881253,
+    #   175.77455152, 175.77455152, 175.77526274, 175.77455152,
+    #   126.04691063, 122.49609205, 125.27401647])

tests/test_machine.py

@@ -272,10 +272,10 @@ def test_invpark():
     iq = 1
     id = 0
     ia, ib, ic = femagtools.machine.invpark(w1t, iq, id)
-    assert ia[0] == pytest.approx(-1.0)
-    assert ib[0] == pytest.approx(0.5)
-    assert ic[0] == pytest.approx(0.5)
-    assert ic[-1] == pytest.approx(-0.5, rel=1e-3)
+    assert ia[0] == pytest.approx(0.0)
+    assert ib[0] == pytest.approx(0.866, rel=1e-3)
+    assert ic[0] == pytest.approx(-0.866, rel=1e-3)
+    assert ic[-1] == pytest.approx(0.866, rel=1e-3)
 
 
 def test_psidq_create():