X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling_Swig%2FMEDCouplingPickleTest.py;h=8407b5ef7ff348b39967854b15f04737ff966dca;hb=662a2a2393a25baef77e42f74204b11b70a9646c;hp=e89cc529685044855d3b92a24246e00b67442996;hpb=9727e779d56acece98be02cdccd0f99cc5ef0fa2;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py index e89cc5296..8407b5ef7 100644 --- a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py +++ b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2019 CEA/DEN, EDF R&D +# Copyright (C) 2007-2023 CEA, EDF # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,10 +20,7 @@ import sys -if sys.platform == "win32": - from MEDCouplingCompat import * -else: - from MEDCoupling import * +from medcoupling import * from MEDCouplingDataForTest import MEDCouplingDataForTest if MEDCouplingHasNumPyBindings(): @@ -72,7 +69,7 @@ class MEDCouplingPickleTest(unittest.TestCase): xx=pickle.loads(pickled) self.assertTrue(xx.isEqual(x)) pass - + @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy") def test3(self): """ Test of a MEDCouplingUMesh pickeling.""" @@ -119,7 +116,7 @@ class MEDCouplingPickleTest(unittest.TestCase): self.assertTrue(m2.isEqual(m,1e-16)) self.assertTrue(m2.getCoordsAt(0).isEqual(arrX,1e-16)) pass - + @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy") def test6(self): """ Test of a MEDCoupling1SGTUMesh pickeling.""" @@ -131,7 +128,7 @@ class MEDCouplingPickleTest(unittest.TestCase): m2=pickle.loads(st) self.assertTrue(m2.isEqual(m,1e-16)) pass - + @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy") def test7(self): """ Test of a MEDCoupling1DGTUMesh pickeling.""" @@ -209,6 +206,10 @@ class MEDCouplingPickleTest(unittest.TestCase): f2=pickle.loads(st) self.assertTrue(f2.isEqual(f,1e-16,1e-16)) self.assertTrue(f2.getMesh().isEqual(f.getMesh(),1e-16)) + ### + ft=MEDCouplingFieldTemplate(f) + ft2=pickle.loads(pickle.dumps(ft,pickle.HIGHEST_PROTOCOL)) + self.assertTrue(ft2.isEqual(ft,1e-16)) pass @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy") @@ -289,6 +290,10 @@ class MEDCouplingPickleTest(unittest.TestCase): f2=pickle.loads(st) self.assertTrue(f2.isEqual(f,1e-16,1e-16)) self.assertTrue(f2.getMesh().isEqual(f.getMesh(),1e-16)) + ### + ft=MEDCouplingFieldTemplate(f) + ft2=pickle.loads(pickle.dumps(ft,pickle.HIGHEST_PROTOCOL)) + self.assertTrue(ft2.isEqual(ft,1e-16)) pass def test13(self): @@ -339,7 +344,7 @@ class MEDCouplingPickleTest(unittest.TestCase): f.setName("aname") a=f.getArray() b=a[:] ; b.iota(7000) - f.setArray(DataArrayInt.Meld(a,b)) + f.setArray(DataArrayInt32.Meld(a,b)) f.getArray().setInfoOnComponents(["u1","vv2"]) f.checkConsistencyLight(); # @@ -348,7 +353,7 @@ class MEDCouplingPickleTest(unittest.TestCase): self.assertTrue(f2.isEqual(f,1e-16,0)) self.assertTrue(f2.getMesh().isEqual(f.getMesh(),1e-16)) pass - + @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy") def test17(self): """ Test of MEDCouplingFieldInt lying on MEDCouplingCMesh pickeling. """