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
Fix computation height of isocel triangle with base equal zero : NaN
[tools/medcoupling.git]
/
src
/
MEDCoupling_Swig
/
MEDCouplingPickleTest.py
diff --git
a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
index 8ce564d4367686007a356b73ff1863f556b3aee6..8407b5ef7ff348b39967854b15f04737ff966dca 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-20
19 CEA/DEN, EDF R&D
+# Copyright (C) 2007-20
23 CEA, EDF
#
# 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
@@
-20,10
+20,7
@@
import sys
import sys
-if sys.platform == "win32":
- from MEDCouplingCompat import *
-else:
- from medcoupling import *
+from medcoupling import *
from MEDCouplingDataForTest import MEDCouplingDataForTest
if MEDCouplingHasNumPyBindings():
from MEDCouplingDataForTest import MEDCouplingDataForTest
if MEDCouplingHasNumPyBindings():
@@
-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))
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")
@@
-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))
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):
@@
-339,7
+344,7
@@
class MEDCouplingPickleTest(unittest.TestCase):
f.setName("aname")
a=f.getArray()
b=a[:] ; b.iota(7000)
f.setName("aname")
a=f.getArray()
b=a[:] ; b.iota(7000)
- f.setArray(DataArrayInt.Meld(a,b))
+ f.setArray(DataArrayInt
32
.Meld(a,b))
f.getArray().setInfoOnComponents(["u1","vv2"])
f.checkConsistencyLight();
#
f.getArray().setInfoOnComponents(["u1","vv2"])
f.checkConsistencyLight();
#