Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MEDCouplingFieldTemplate is pickable + fix of memory leak in python wrapping linked...
[tools/medcoupling.git]
/
src
/
MEDCoupling_Swig
/
MEDCouplingPickleTest.py
diff --git
a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
index d6135c6746fa84b84a0be50c90bfe07abd80ef4d..e5f6bb732227071af260d0bf08a921b354555900 100644
(file)
--- a/
src/MEDCoupling_Swig/MEDCouplingPickleTest.py
+++ b/
src/MEDCoupling_Swig/MEDCouplingPickleTest.py
@@
-1,5
+1,5
@@
# -*- coding: iso-8859-1 -*-
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-201
6
CEA/DEN, EDF R&D
+# Copyright (C) 2007-201
9
CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-18,7
+18,12
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+ from MEDCouplingCompat import *
+else:
+ from medcoupling import *
from MEDCouplingDataForTest import MEDCouplingDataForTest
if MEDCouplingHasNumPyBindings():
from MEDCouplingDataForTest import MEDCouplingDataForTest
if MEDCouplingHasNumPyBindings():
@@
-67,7
+72,7
@@
class MEDCouplingPickleTest(unittest.TestCase):
xx=pickle.loads(pickled)
self.assertTrue(xx.isEqual(x))
pass
xx=pickle.loads(pickled)
self.assertTrue(xx.isEqual(x))
pass
-
+
@unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
def test3(self):
""" Test of a MEDCouplingUMesh pickeling."""
@unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
def test3(self):
""" Test of a MEDCouplingUMesh pickeling."""
@@
-84,7
+89,7
@@
class MEDCouplingPickleTest(unittest.TestCase):
@unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
def test4(self):
@unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
def test4(self):
- """ Idem test3 except that here serialization/deserialization is done explicit
e
ly."""
+ """ Idem test3 except that here serialization/deserialization is done explicitly."""
arr=DataArrayDouble(10) ; arr.iota()
m=MEDCouplingCMesh() ; m.setCoords(arr,arr,arr)
m=m.buildUnstructured()
arr=DataArrayDouble(10) ; arr.iota()
m=MEDCouplingCMesh() ; m.setCoords(arr,arr,arr)
m=m.buildUnstructured()
@@
-114,7
+119,7
@@
class MEDCouplingPickleTest(unittest.TestCase):
self.assertTrue(m2.isEqual(m,1e-16))
self.assertTrue(m2.getCoordsAt(0).isEqual(arrX,1e-16))
pass
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."""
@unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
def test6(self):
""" Test of a MEDCoupling1SGTUMesh pickeling."""
@@
-126,7
+131,7
@@
class MEDCouplingPickleTest(unittest.TestCase):
m2=pickle.loads(st)
self.assertTrue(m2.isEqual(m,1e-16))
pass
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."""
@unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
def test7(self):
""" Test of a MEDCoupling1DGTUMesh pickeling."""
@@
-204,6
+209,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))
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")
pass
@unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
@@
-284,6
+293,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))
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):
pass
def test13(self):
@@
-343,7
+356,7
@@
class MEDCouplingPickleTest(unittest.TestCase):
self.assertTrue(f2.isEqual(f,1e-16,0))
self.assertTrue(f2.getMesh().isEqual(f.getMesh(),1e-16))
pass
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. """
@unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
def test17(self):
""" Test of MEDCouplingFieldInt lying on MEDCouplingCMesh pickeling. """