femagtools 1.8.0__py3-none-any.whl → 1.8.2__py3-none-any.whl

femagtools/model.py

@@ -136,14 +136,15 @@ class MachineModel(Model):
         name = 'DRAFT'
         if isinstance(parameters, str):
             name = parameters
+            self.connect_full = False  # no matter
         else:
             if 'name' in parameters:
                 name = parameters['name']
             if 'windings' in parameters:
                 self.winding = self.windings
 
-        # connect model even for complete model (see fsl connect_models)
-        self.connect_full = True
+            # connect model even for complete model (see fsl connect_models)
+            self.connect_full = parameters.get('afmtype', '') == ''
         # must sanitize name to prevent femag complaints
         self.name = ''.join([n
                              for n in name.strip()
@@ -410,7 +411,7 @@ class MachineModel(Model):
             missing += m
             names += n
         if missing:
-            raise MCerror("MC pars missing: {}".format(
+            raise MCerror("Material properties missing: {}".format(
                 ', '.join(set(missing))))
         return set(names)
 

femagtools/parstudy.py

@@ -325,7 +325,7 @@ class ParameterStudy(object):
                                 shutil.copy(ff, repdir)
                         calcid += 1
                     if isinstance(r, dict) and 'error' in r:
-                        logger.warn("job %d failed: %s", k, r['error'])
+                        logger.warning("job %d failed: %s", k, r['error'])
                         if objective_vars:
                             f.append([float('nan')]*len(objective_vars))
                         else:

femagtools/plot/nc.py

@@ -14,7 +14,7 @@ DEFAULT_CMAP='viridis'
 """default colormap (see https://matplotlib.org/stable/users/explain/colors/colormaps.html)"""
 
 
-def spel(isa, superelements=[], with_axis=False, ax=0):
+def spel(isa, superelements=[], with_axis=False, with_wiredir=False, ax=0):
     """plot super elements of I7/ISA7 model
     Args:
       isa: Isa7 object
@@ -35,7 +35,7 @@ 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 and with_wiredir:
                 if se.subregion.curdir != 0:
                         wkey = se.subregion.winding.key
                         if se.subregion.curdir < 0:

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/prepare_thermal.mako

@@ -40,12 +40,12 @@ shaft_spel = {} ---- lightgrey, 16
 magnet_spel = {} -- black, 8
 outer_air = {} -- darkred, 10
 inner_air = {} -- lightgrey, 16
-rotor_air = {} 
+rotor_air = {}
 stator_air = {} -- black, 8
 airgap = {} -- white, 8
 magnet_pocket_spel = {}  -- red, 1
 non_uniform_airgap = {} -- white, 8
-slot_opening = {} 
+slot_opening = {}
 slot_sreg_exist = 0
 -- search all components
 for i =1,  #spel_keys do
@@ -74,7 +74,7 @@ for i =1,  #spel_keys do
 %if model.get('htc_outer', 0):
               def_heat_transfer(xc,yc,yellow,${model['htc_outer']}, 1.0)
 %endif
-              color_spel(spel_keys[i], 10) 
+              color_spel(spel_keys[i], 10)
 
            elseif rc > dy2/2 and rc < da2/2 then
               -- rotor air
@@ -87,14 +87,14 @@ for i =1,  #spel_keys do
               -- stator air
               table.insert(stator_air, spel_keys[i])
               def_mat_therm(xc, yc, 'yellow', 1.19,0.15,1007, 1)
-              color_spel(spel_keys[i], 8) 
+              color_spel(spel_keys[i], 8)
               key_exist_sl = get_sreg_key(xc, yc)
-              if key_exist_sl <= 0 and slot_sreg_exist == 0 then 
+              if key_exist_sl <= 0 and slot_sreg_exist == 0 then
                   def_new_sreg(xc, yc, 'Slot', 'yellow')
                   slot_sreg_exist = 1
-              else 
+              else
                   add_to_sreg(xc, yc, 'Slot')
-              end        
+              end
            elseif rc > da2/2 and rc < da1/2 then
               table.insert(airgap, spel_keys[i])
               def_mat_therm(xc, yc, 'yellow', 1.19,0.15,1007, 1)
@@ -139,83 +139,83 @@ end
 
 function is_exist(arr, val)
    local i
-   if #arr == 0 then 
-      return false 
-   end 
-   for i = 1, #arr do 
-      if arr[i] == val then 
+   if #arr == 0 then
+      return false
+   end
+   for i = 1, #arr do
+      if arr[i] == val then
          return true
-      end 
-   end 
+      end
+   end
    return false
-end 
--- identify magnet air pocket 
+end
+-- identify magnet air pocket
 
-for i = 1, #magnet_spel do 
+for i = 1, #magnet_spel do
     bkeys = get_spel_data ( "bndkeys", magnet_spel[i])
-    for j = 1, #bkeys do 
+    for j = 1, #bkeys do
          elks = get_node_data ( "elkeys", bkeys[j] )
-         for k = 1, #elks do 
+         for k = 1, #elks do
             p1, p2 = get_elem_data("perm", elks[k])
             sek = get_elem_data("sekey", elks[k])
-            if p1 == 1.0 then 
-                  if (not is_exist(magnet_pocket_spel, sek)) and (not is_exist(airgap, sek)) then  
+            if p1 == 1.0 then
+                  if (not is_exist(magnet_pocket_spel, sek)) and (not is_exist(airgap, sek)) then
                      table.insert(magnet_pocket_spel, sek)
                      els = get_spel_data('elkeys', sek)
                      xc, yc = get_xy(els[1])
                      def_mat_therm(xc, yc, 'red', 1.12,0.026,1007, 1)
                      --table.remove(rotor_air, sek)
                      color_spel(sek, 1)
-                  end 
-            end 
-         end 
-    end 
-end 
+                  end
+            end
+         end
+    end
+end
 
 
 
-for i = 1, #rotor_air do 
-  if rotor_air[i] ~= nil then 
+for i = 1, #rotor_air do
+  if rotor_air[i] ~= nil then
     bkeys = get_spel_data ( "bndkeys", rotor_air[i])
-    for j = 1, #bkeys do 
+    for j = 1, #bkeys do
       x, y = get_node_data ( "xy", bkeys[j] )
-      r, phi = c2pd(x, y) 
-      if math.abs(r - da2/2) < 1e-5 then 
-        if not is_exist(non_uniform_airgap,rotor_air[i]) then 
+      r, phi = c2pd(x, y)
+      if math.abs(r - da2/2) < 1e-5 then
+        if not is_exist(non_uniform_airgap,rotor_air[i]) then
           table.insert(non_uniform_airgap, rotor_air[i])
           els = get_spel_data('elkeys', rotor_air[i])
           xc, yc = get_xy(els[1])
           def_mat_therm(xc, yc, 'yellow', 1.19,1.15,1007, 1)
           add_to_sreg(xc, yc, 'Slot')
           color_spel(rotor_air[i], 7)
-        end 
-      end 
-    end 
-  end 
-end 
+        end
+      end
+    end
+  end
+end
 
-for i = 1, #rotor_air do 
-  if rotor_air[i] ~= nil then 
-    if is_exist(non_uniform_airgap, rotor_air[i]) then 
+for i = 1, #rotor_air do
+  if rotor_air[i] ~= nil then
+    if is_exist(non_uniform_airgap, rotor_air[i]) then
       rotor_air[i] = nil
-    end    
-  end 
-end 
+    end
+  end
+end
 
-for i = 1, #rotor_air do 
-   if is_exist(magnet_pocket_spel, rotor_air[i]) then 
+for i = 1, #rotor_air do
+   if is_exist(magnet_pocket_spel, rotor_air[i]) then
      rotor_air[i] = nil
-   end 
- end 
- 
+   end
+ end
 
-for i = 1, #rotor_air do 
-   if rotor_air[i] ~= nil then 
+
+for i = 1, #rotor_air do
+   if rotor_air[i] ~= nil then
       els = get_spel_data('elkeys', rotor_air[i])
       xc, yc = get_xy(els[1])
       def_mat_therm(xc, yc, 'red', 1.12,0.026,1007, 1)
-   end 
-end 
+   end
+end
 
 
 save_metafile(model..'.ps')
@@ -322,7 +322,10 @@ end
 
 
 rn, phin = get_boundary_node(m.tot_num_slot)
-thickness = ${model.get('slot_insul', 0.15)}
+thickness = ${model.windings.get('slot_insulation_thickness', 0.15e-3)*1e3}
+if thickness == 0.0 then 
+   thickness = 0.15
+end 
 conductivity = ${model.get('slot_insul_cond', 0.31)}
 
 for i = 1,m.num_sl_gen do
@@ -331,7 +334,7 @@ y = {}
 
 for j = 1, #rn do
    x[j], y[j] = pd2c(rn[j], phin[j] + (i-1)*360/m.tot_num_slot)
-   point(x[j], y[j],"black","x") 
+   point(x[j], y[j],"black","x")
 end
 
 def_insulation_by_nodechain(thickness,conductivity,

{femagtools-1.8.0.dist-info → femagtools-1.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: femagtools
-Version: 1.8.0
+Version: 1.8.2
 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

{femagtools-1.8.0.dist-info → femagtools-1.8.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-femagtools/__init__.py,sha256=LOLIDnRqx1rFlY3VW2IB1PaBPwEYtzPgv2UIqP0QKZU,1600
+femagtools/__init__.py,sha256=kRVLeU7jCmB8MUrNUdzChKl4fzai9F9XlN-SHUMQXTo,1600
 femagtools/airgap.py,sha256=hELJXe52yUw82JwZ1tGUXUtRhMG2_WSUBVeGkTZSAM8,1900
 femagtools/amazon.py,sha256=O1ICuv21XDAJi1qK1Sigs2TdS6hDZP19OzvmE2t76wU,12069
 femagtools/amela.py,sha256=RFTuQ5EcX19G2YJchnktr6j62mNptrdTreShQDOeuKA,13874
@@ -13,11 +13,11 @@ femagtools/dakota.py,sha256=L2zZdACdhso7szwN_s5tsmeEbcuUygE2JK4SxwtL79w,6901
 femagtools/dakota_femag.py,sha256=ipmMUMTK1mvMpfHJJjwHa_4kx7BItYO3ha8MeYJTyy8,4068
 femagtools/dakotaout.py,sha256=6nn0PXsB40mPKiQLenqAtHy0KXCO7kvqqQ-aD2JhQvw,5573
 femagtools/docker.py,sha256=XDVmLBB0z4sZZpcrx7Wbm84xl4ksj7aqn5-ZOPxdxm4,7460
-femagtools/ecloss.py,sha256=0nD2_R7ISl6OGG_l8FLi27ynLG9SlzhJBy13sBoR8Ts,33743
+femagtools/ecloss.py,sha256=kTsE9Lx6nt6Ez9PBfD58hPMcnH2PxSc95zJaYMCQd5Q,33957
 femagtools/erg.py,sha256=IXKq76P9qLt_ssNOP78v8Qizk3J2Zg80yaKDSjzwoJE,1224
-femagtools/femag.py,sha256=5zOcfUHkAgdhWsOROuAijLaTQMt7JF5xpszwQR_G7Zs,45990
+femagtools/femag.py,sha256=m8mfMjzjkL_R-iqyInxM7y7F4jgKg6ZI7FfTQlbxtng,46988
 femagtools/forcedens.py,sha256=7NNv75Vg9vQ_fy8W4kM2rlSO970zaSmeurhPmdAxsOU,8485
-femagtools/fsl.py,sha256=Ap-U7g3BO8uBGUyElkwRgaHHK0WK5XDRC7NfdXaK8lk,36182
+femagtools/fsl.py,sha256=PU4t8wBvtVckv4f8ozg5_exxspuToW0W0O95jZZ5IU4,36924
 femagtools/getset.py,sha256=yJ6Em35DeWK7WNZW0qjjS5s7LUkVh5mbgxF59HHm5FM,3017
 femagtools/gmsh.py,sha256=IKhNiviIBji4cMxAhxaYXNqBRMNAPSKsBGdnGyxkyQw,3903
 femagtools/google.py,sha256=ugRyHY1zBjHR4aNfbA7GeF-ZU_NgleuVTZaWpi_XLT4,17144
@@ -29,9 +29,9 @@ femagtools/jhb.py,sha256=stJxkmzHpfUIBVcFw7jWbV5KN9_EFqzOCgacyhUqWvM,1779
 femagtools/job.py,sha256=sIRVXsyoupfRXqGsWyOHMetcKlWIyggxfVURjM8aD54,11322
 femagtools/losscoeffs.py,sha256=Nil2fvkkS6-T29OnHIsdVbegCHyl23iZg8rMVbbA5wY,6785
 femagtools/magnet.py,sha256=Nuk060bT4Wa3lX74HdefqTTtUxLaERDSBYTTpbi6KP4,1093
-femagtools/mcv.py,sha256=jZrlWHvTlHzHFjk0zr2aGkHtE5ahuzhDE-SVtey6xnQ,40554
+femagtools/mcv.py,sha256=CAv-8bRm9aQJR5LVVXuLGGw1id_uu0m-fMiPMYX9Z-o,40488
 femagtools/me.py,sha256=z6RJkvSbgMmorCQTxKvq44uIYKh82uYYExjkNePJCmE,1813
-femagtools/model.py,sha256=sqv2qdcL3MHv_6hcwsAtO03UHbteRipY60BcaHGGfcU,17863
+femagtools/model.py,sha256=dk9x-iqRzgOTdTCeU_ynUZGb1bt4FvU1ZGMPXytMbUg,17965
 femagtools/moproblem.py,sha256=kOP8pRdD8YXz28_M2WKnFgl3eeJ7tqg49ohoazsmUOg,2825
 femagtools/multiproc.py,sha256=7mJF-VU1NrJkENyg8eHtDrDRNBwLPK43phZv3ehm9BU,8435
 femagtools/mxw2msh.py,sha256=CIIqAvfs8U-A0OfuOAoDaqNSmoMSHSI_tW1CPFRCP5E,2151
@@ -39,7 +39,7 @@ femagtools/nc.py,sha256=bAj3iurE9WaovoCi76ry2aJZJ6rC1zO6xWrfsSD6lrc,15160
 femagtools/netlist.py,sha256=CSCl8setLZ_L8DCnNWaNA3-wLe1yo-fmzARZoVvYfaA,2052
 femagtools/ntib.py,sha256=76g1ZO3Fq_kN-HTMBvaKvJmMMlJMyEPFeNAcJPq3w7Y,3099
 femagtools/opt.py,sha256=wBU0yh3hZlNti_zfIvtKcPg1EJrnE3I1BqmVxLGWixU,8753
-femagtools/parstudy.py,sha256=IkWffdFLhLACSvqJ6_ho4Pi4RC6AapLThoktVTXnVJE,19461
+femagtools/parstudy.py,sha256=OXAqRGSvOZHNZTx_bXSgXpKv_ABB6zHOU-dJLJjrhBI,19464
 femagtools/poc.py,sha256=wMwOxMhPLFRiGPMsKQwWWuGr6UZPzRBajhfVMfXptNU,6794
 femagtools/tks.py,sha256=xStMu6P1xsc36tS53FKnbL6i2ZTVnCNXyTVw8_gjepo,7436
 femagtools/ts.py,sha256=x9aCMVASjdBZuyI2pJGMyi1dveGFd_pWQ20cZ-l_moc,47216
@@ -48,32 +48,32 @@ femagtools/vbf.py,sha256=9XGfhftmD9carU8ByQ5DwqoR4daq5mJ39eMqruwml0Q,2444
 femagtools/vtu.py,sha256=Sf83dHIfCKY2km-MIUHKKoj-JKN4PDX7kkPLZXyIYY4,10723
 femagtools/windings.py,sha256=OYoEFIQci3f3sYJkcyRjBpBpDRtX2Y2aHZiRXOEgsls,23497
 femagtools/dxfsl/__init__.py,sha256=MywcCdpKPKs4qJBJJgeDsikJFJ2P48dbTuNk303f5pM,76
-femagtools/dxfsl/area.py,sha256=74VwDSvBLrxpIo_oxU3FGbg3ef_4L8F2IJTG-dJArz8,65208
-femagtools/dxfsl/areabuilder.py,sha256=Siu11yRcNJiSCWwc865-OvuVhSmLtRQWysbe1-rUcN0,34197
+femagtools/dxfsl/area.py,sha256=C0mPWeer2kleh3x5GHibMSjegEjfmEZHTHTB9WVHIPg,67005
+femagtools/dxfsl/areabuilder.py,sha256=6dfWryYjXzGIVDOsX2zb1VKIhUzmpL43XhF-wtdesAg,35882
 femagtools/dxfsl/concat.py,sha256=F6scwesxyOmfmKQ5kGspNCxA71Yz6QgxFL7lTj3hsaI,13385
-femagtools/dxfsl/conv.py,sha256=TaYqaeRwrK98mPh9uH33SmpmVW48U2v-qnDKs2cjcj8,10600
-femagtools/dxfsl/converter.py,sha256=B0r9MWZbsiIWukHotZ7NMq8rse1FadAaOblxbvDDyw4,34490
+femagtools/dxfsl/conv.py,sha256=-d03mQiDWF_MD4T0TIH7k-zNa6p7w9rtc6QE2Bz1Q7s,10362
+femagtools/dxfsl/converter.py,sha256=YXesbeqHbwtr97xPMJTNSsxe_kVJycJQfrKrIQVoJQw,36425
 femagtools/dxfsl/corner.py,sha256=-XPBcnEau-2-SRHLYzlBqCQGaFfgm_DH2qR1mSaFoAs,1311
 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=Z6jLpwuDCwUyQFf9YinSnJ7u_9WAb71MIgSOugdt0-8,27540
+femagtools/dxfsl/fslrenderer.py,sha256=d2a_HXml2CqS8FkmSbFXsUtOLIfSI14C4qGQd0Xj-c4,27961
 femagtools/dxfsl/functions.py,sha256=teJHtVxoViGs66AB8_4BxRrFQx9SbPT2azIrKyhJHOc,12005
-femagtools/dxfsl/geom.py,sha256=iHrHdC8yOTfE1bRSbsM2hVd0LH_sx7Ws42-SX0TBSzM,172502
+femagtools/dxfsl/geom.py,sha256=CuaW4aa0Xb3dTYX_HSHpMxqOXGztT35_ISHh0Dj-FJE,173525
 femagtools/dxfsl/journal.py,sha256=4LMSW5wCYlETzid6SIF8b5DH-DCgtH4nFx-xIxjtbfg,4265
-femagtools/dxfsl/machine.py,sha256=M6KzOzmeb3Al2Hp3BjlgYWKGpbRrOPwKeN5VFXS2qF8,50415
+femagtools/dxfsl/machine.py,sha256=8KG0jIcK7vYFTXqIwYNOecGaYgvhZ9UjrRHJQZ9kjHE,56514
 femagtools/dxfsl/plotrenderer.py,sha256=q2cORuxJEf1Ws6oCY9c0gF6N3kDrcI6WOz3u5Vl6R_c,13823
-femagtools/dxfsl/shape.py,sha256=kz68mPsK1m5jRnE-5iNS3FX2IkpSHOe0X3OdEklGR80,59970
-femagtools/dxfsl/svgparser.py,sha256=FE8Jk3pV6e4AtJlrJuUxz89_JZC9buS0wwTBsX52O1g,3762
-femagtools/dxfsl/symmetry.py,sha256=0WeDq_z42A_cjG4m_vREDWyx-wqHqXDkoCT2eXh2EMo,38084
-femagtools/machine/__init__.py,sha256=U8W65K7jr7jDdC1KnJh0WjYd8DFaLnIFVvlh-TKcV94,7174
-femagtools/machine/afpm.py,sha256=3hJTmQxeYDyfTelr_sMEFOB6CsTIFTqmnNH3SfiZQzU,24956
+femagtools/dxfsl/shape.py,sha256=-hUphAYwhja_6FyWHjUbBlNSPh6tWZCKYdz7aDplqWk,61566
+femagtools/dxfsl/svgparser.py,sha256=RY2TU9MK6gOaNmI6w6RNqcw7H9YGmK-NUwvdylKBcsE,3763
+femagtools/dxfsl/symmetry.py,sha256=DPZ-y-UjEshNlOdC90kGhpAitsIwrvCN6gZeNGp5DJU,41120
+femagtools/machine/__init__.py,sha256=B7yeRZzf29NWCWy8C8iJFdTr9bszAoMRcVEpblhCeg4,7256
+femagtools/machine/afpm.py,sha256=wMyfdGDaBAt6knDSzw04Oxy_oDuBCEi06f6WaKZoRGw,25918
 femagtools/machine/effloss.py,sha256=GV_bc5f1ysBi1Ng7FR3fD1xh5KXa6ACc55iWfsltMBI,13663
 femagtools/machine/im.py,sha256=3Y54AHMZfAjkvgexx2E-5jxNWzaVQ-SyaETCh7gNBYA,38008
 femagtools/machine/pm.py,sha256=C4vDdPIsIRUKtzY3b1RNT1v37p1uP3pMUduftNejcPc,68129
-femagtools/machine/sizing.py,sha256=nWCfxbyWfbw5-7xu0qZ6zjWNquEPn3fUH-fQeGb6QUc,24307
-femagtools/machine/sm.py,sha256=y_zPZN0gGKUQL8RCyhyyfeJE_cSRPK5Mmk93HQPzTFM,39379
-femagtools/machine/utils.py,sha256=CRTY5qwlaN_Zp5SZgxicXTfZyVU5fjtm4XKEA-peNCc,20856
+femagtools/machine/sizing.py,sha256=YhsT5Iki7_zW1BBKB1dD_q6qHI-kvjb3_68881Q71LU,30039
+femagtools/machine/sm.py,sha256=Y6g4KPm-2bhzMYjGarojokEzaNgOmFR2G4DIKBtVQOs,39210
+femagtools/machine/utils.py,sha256=VswrQuGB_uGE4cYWIQSXLSEVJKrmSwNJdGlme7RPEno,20912
 femagtools/moo/__init__.py,sha256=zinmWEOrsEz6DmMX0Dbn4t6_1UR-p4bEGqyR1wUQk_Q,175
 femagtools/moo/algorithm.py,sha256=e-Cgp2rp_hG9DXqWqluzQGNIWvCfthUgLD8O-aVPofA,5763
 femagtools/moo/population.py,sha256=krIl8tOJXPhCgBemkqn-jwvZg1VzsGniqMN_KAFxbuw,10203
@@ -88,12 +88,12 @@ femagtools/plot/fieldlines.py,sha256=_7ykKhnQLeS4fz34pnzovH1gIhcUSKJ3gl1GUgWYix8
 femagtools/plot/fluxdens.py,sha256=NlexRJ3f_8CgKoWrV82ZIsAXPrLhwj98uOe8_fUks7A,1082
 femagtools/plot/forcedens.py,sha256=Vloi9czy7qbGXI-Vm7Cow6IfHTsFhCLI1YWduFOR55c,4075
 femagtools/plot/mcv.py,sha256=ijZg6KPwZC7sDxEzGEUfVWvDoSEfgcaH-hzQMt7E90I,3671
-femagtools/plot/nc.py,sha256=S_Rb0ax4O0pFVzcL4JctwfXl6-uQFHUJwoeQMftibJM,10839
+femagtools/plot/nc.py,sha256=kfTifzAMReQZu4UmbHZo1caAK0n7N51lkPj7BU7l1lU,10876
 femagtools/plot/phasor.py,sha256=5QG1GkXKVksc8P6Q4thKADf6W1l8rDKeArIHFYvbXlw,4858
 femagtools/plot/wdg.py,sha256=Orw2XGThHpOuJ_raSRnQTzj5tOmwllNWweByoOXbA7I,9820
 femagtools/svgfsl/converter.py,sha256=5q4LognshXNTpUWLnU5rtgCfAwZnEuPzqsgyeRYC-VM,3019
 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_rotor.mako,sha256=4yoEA4fOq9FRcwxOMRw1oX4Bs_jcrtyHOY6kHPYJ5MY,3175
 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
@@ -143,7 +143,7 @@ femagtools/templates/plots.mako,sha256=6xfmncVbzDiJLF6V0B6fha23H19R7P26DvcTTwzJ5
 femagtools/templates/pm_sym_f_cur.mako,sha256=KlskcNx5Y_HNwt2crA7CqHN5TIaKBb14T6cFg2vghl0,1464
 femagtools/templates/pm_sym_fast.mako,sha256=NOSbuWSEM2XGY5-JweGxSr32mXGBVSas_aSOQyK4uEU,2361
 femagtools/templates/pm_sym_loss.mako,sha256=dh0o3ZamZuWs7sHc-jS7ohKsqeZCA0tRaqkaFmXlRS0,1009
-femagtools/templates/prepare_thermal.mako,sha256=H8YRqE8i5AiRPl-dE3obiMhiuO9vm5L7ASeqPJoUozg,9521
+femagtools/templates/prepare_thermal.mako,sha256=V3W6BGW7gjY8Lg2qzvGDi8rxx3JvPzrWoABDvHKyq54,9539
 femagtools/templates/psd_psq_fast.mako,sha256=7DQUZI6KOjdKQMFLKySGUlWXo4U_rZuHXFzLxiA1GGc,1339
 femagtools/templates/ring.mako,sha256=Cuc_FuCPWZM-g3TxHqzTdjknYEJSUgP-y64gp8pekDI,643
 femagtools/templates/rot_hsm.mako,sha256=eh50TbpWNUALK9_7wOOJ7KPewHos7JExAfMACbPlXYc,973
@@ -188,7 +188,7 @@ tests/test_losscoeffs.py,sha256=3EKmDFRuvn88z_8r0HxKFdB0lNXNnhEgaFshL8BkDjE,2012
 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=BdFdCkBL_tM88G2z_hbLsVlOaq7T83flS4m8YYLLPnc,4574
+tests/test_mcv.py,sha256=cPgijMjDxSt1CwN6syE4r4WWAlUSruZDQsTK_oNhfg4,4570
 tests/test_mcvreader.py,sha256=3cgq22b_iaWLrs4WWOUNHqJREnv0YoFivNpAb4teEJs,2118
 tests/test_me.py,sha256=En00OrOhZclBO4u74q5Os0FgVP4TGFLzz99LF0QHXHA,196
 tests/test_model.py,sha256=kYjjFgZPIex3foX3skiOdD5MCcmA2JP7oDDuE9txv_U,2698
@@ -213,9 +213,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.8.0.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
-femagtools-1.8.0.dist-info/METADATA,sha256=qZkw13rq-jo1WT373nahzfRdxT1VvBAnMgKBhiDK_5A,6198
-femagtools-1.8.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-femagtools-1.8.0.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
-femagtools-1.8.0.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
-femagtools-1.8.0.dist-info/RECORD,,
+femagtools-1.8.2.dist-info/LICENSE,sha256=NaQe4uvkszQPJmiRPHecfk-Ab9VSRXo8xQLGNVHTeFo,1362
+femagtools-1.8.2.dist-info/METADATA,sha256=yH0fPdMTzP_mojxKfekWdoGkrj_tvA0WrEpRVt_XYlc,6198
+femagtools-1.8.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+femagtools-1.8.2.dist-info/entry_points.txt,sha256=jrvOkZPiN44u1sASeu271VRaVIv5V-uRpN0_N5U_R8c,248
+femagtools-1.8.2.dist-info/top_level.txt,sha256=Ri4YWtU8MZTzNje9IKyXhTakNbsrCynuWdon4Yq94Dc,17
+femagtools-1.8.2.dist-info/RECORD,,

tests/test_mcv.py

@@ -33,7 +33,7 @@ def test_write_mcv_orient_crv(tmpdir):
     mcvr = femagtools.mcv.Reader()
     mcvr.readMcv(filename+ext)
     assert mcvr['version_mc_curve'] == 1
-    assert mcvr['ctype'] == femagtools.mcv.ORIENT_CRV
+    assert mcvr['ctype'] == femagtools.mcv.MAGCRV
     assert mcvr['curve'][0]['bi'] == pytest.approx(B, 1e-3)
     assert mcvr['curve'][0]['hi'] == pytest.approx(H, 1e-3)
     assert mcvr['curve'][1]['bi'] == pytest.approx(B, 1e-3)