Merge branch 'V8_2_BR'

[tools/medcoupling.git] / src / MEDLoader / Swig / MEDLoaderTest3.py

diff --git a/src/MEDLoader/Swig/MEDLoaderTest3.py b/src/MEDLoader/Swig/MEDLoaderTest3.py
index a6f7022579a5bbdc68f5128e07e568479f6ba3c2..f84a7cfcd9da4dc243ffa82527fe2c3754ef3b95 100644 (file)
--- a/src/MEDLoader/Swig/MEDLoaderTest3.py
+++ b/src/MEDLoader/Swig/MEDLoaderTest3.py
@@ -1528,7 +1528,7 @@ class MEDLoaderTest3(unittest.TestCase):
         fname="Pyfile46.med"
         m=MEDLoaderDataForTest.build2DMesh_3()
         m=m[:10] ; m.setName("mesh")
-        f=m.getMeasureField(ON_CELLS)
+        f=m.getMeasureField(False)
         f=f.buildNewTimeReprFromThis(ONE_TIME,False)
         f.setTime(5.5,3,4)
         f.setName("SemiPartialField")
@@ -2142,7 +2142,7 @@ class MEDLoaderTest3(unittest.TestCase):
         m.setCoords(arr,arr)
         m=m.buildUnstructured()
         m.setName("mm")
-        f=m.getMeasureField(ON_CELLS)
+        f=m.getMeasureField(False)
         self.assertIn(m.getHeapMemorySize(),xrange(3552-100,3552+100+4*strMulFac))
         self.assertIn(f.getHeapMemorySize(),xrange(4215-100,4215+100+8*strMulFac))
         #
@@ -3903,7 +3903,7 @@ class MEDLoaderTest3(unittest.TestCase):
         arr[:,0]=range(25)
         arr[:,1]=range(100,125)
         f.setArray(arr)
-        WriteField(fileName,f,2)
+        WriteField(fileName,f,True)
         f=MEDCouplingFieldDouble(ON_NODES,ONE_TIME) ; f.setMesh(m)
         f.setName("FieldNode")
         arr=DataArrayDouble(36,2) ; arr.setInfoOnComponents(compos)
@@ -3968,7 +3968,7 @@ class MEDLoaderTest3(unittest.TestCase):
         arr[:,0]=range(25)
         arr[:,1]=range(100,125)
         f.setArray(arr)
-        WriteField(fileName,f,2)
+        WriteField(fileName,f,True)
         f=MEDCouplingFieldDouble(ON_NODES,ONE_TIME) ; f.setMesh(m)
         f.setName("FieldNode")
         arr=DataArrayDouble(36,2) ; arr.setInfoOnComponents(compos)
@@ -5901,6 +5901,15 @@ class MEDLoaderTest3(unittest.TestCase):
         f1ts6=cPickle.loads(st)
         self.assertTrue(isinstance(f1ts6,MEDFileIntField1TS))
         self.assertTrue(f1ts6.field(ms4[0]).isEqual((fs4[0][0]).field(ms4[0]),1e-12,1e-12))
+        # MEDFileParameters
+        self.testParameters1()# generates Pyfile56.med
+        params=MEDFileParameters("Pyfile56.med")
+        st=cPickle.dumps(params,cPickle.HIGHEST_PROTOCOL)
+        params7=cPickle.loads(st)
+        self.assertEqual(len(params),len(params7))
+        for i in xrange(len(params)):
+            self.assertTrue(params[i].isEqual(params7[i],1e-12)[0])
+            pass
         pass
     
     pass