OK thanks to INV !

[modules/med.git] / src / MEDCoupling_Swig / MEDCouplingBasicsTest.py

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
index c8d01311f8b6b2daf88f85e743be66713fb5144c..0f7e74cf0787044b4ce83628eef6ba0ab701c653 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
@@ -1832,11 +1832,8 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(1, len(dis));
         self.assertEqual(NORM_HEXA8, dis[0][0]);
         self.assertEqual(27, dis[0][1]);
-        self.assertEqual(0, dis[0][2]);
+        self.assertEqual(-1, dis[0][2]);
         
-        idsPerType=[]
-        self.assertRaises(InterpKernelException, mesh1.checkTypeConsistencyAndContig, dis, idsPerType);
-        dis[0][2]=-1;
         idsPerType=[]
         self.assertTrue(not mesh1.checkTypeConsistencyAndContig(dis, idsPerType));
         dis[0][0]=NORM_QUAD4;
@@ -7885,10 +7882,10 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(2,len(code));
         self.assertEqual(3,code[0][0]);
         self.assertEqual(2,code[0][1]);
-        self.assertEqual(0,code[0][2]);
+        self.assertEqual(-1,code[0][2]);
         self.assertEqual(4,code[1][0]);
         self.assertEqual(3,code[1][1]);
-        self.assertEqual(0,code[1][2]);
+        self.assertEqual(-1,code[1][2]);
         pass
 
     def testNorm2_1(self):
@@ -13044,7 +13041,7 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(m.getTypeOfCell(3),NORM_QUAD4)
         self.assertRaises(InterpKernelException,m.getTypeOfCell,5)
         self.assertEqual(m.getAllGeoTypes(),[NORM_QUAD4])
-        self.assertEqual(m.getDistributionOfTypes(),[[NORM_QUAD4,5,0]])
+        self.assertEqual(m.getDistributionOfTypes(),[[NORM_QUAD4,5,-1]])
         ##
         pfl1=DataArrayInt([1,3,4])
         a,b,c=m.splitProfilePerType(pfl1)
@@ -13356,6 +13353,43 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertTrue(b is None)
         pass
 
+    def testSwig2DADAreIncludedInMe1(self):
+        a=DataArrayDouble(30) ; a.iota() ; a.rearrange(3)
+        p=DataArrayInt([5,2,1,9])
+        b,c=a.areIncludedInMe(a[p],1e-12)
+        self.assertTrue(b)
+        self.assertTrue(c.isEqual(p))
+        d=a[p]
+        d.setIJ(3,1,28.1)
+        b,c=a.areIncludedInMe(d,1e-12)
+        self.assertTrue(not b)
+        self.assertTrue(c.isEqual(DataArrayInt([5,2,1,10])))
+        pass
+
+    def testSwig2DADesallocate1(self):
+        d=DataArrayDouble([(1,2),(6,7),(6,8)]) ; d.setInfoOnComponents(["aa","bbb"])
+        self.assertTrue(d.isAllocated())
+        d.checkAllocated()
+        self.assertEqual(d.getInfoOnComponents(),["aa","bbb"])
+        ref=d.getHeapMemorySize()
+        d.desallocate()
+        self.assertEqual(ref-d.getHeapMemorySize(),6*8)
+        self.assertTrue(not d.isAllocated())
+        self.assertEqual(d.getInfoOnComponents(),["aa","bbb"])
+        self.assertRaises(InterpKernelException,d.checkAllocated)
+        #
+        d=DataArrayInt([(1,2),(6,7),(6,8)]) ; d.setInfoOnComponents(["aa","bbb"])
+        self.assertTrue(d.isAllocated())
+        d.checkAllocated()
+        self.assertEqual(d.getInfoOnComponents(),["aa","bbb"])
+        ref=d.getHeapMemorySize()
+        d.desallocate()
+        self.assertEqual(ref-d.getHeapMemorySize(),6*4)
+        self.assertTrue(not d.isAllocated())
+        self.assertEqual(d.getInfoOnComponents(),["aa","bbb"])
+        self.assertRaises(InterpKernelException,d.checkAllocated)
+        pass
+
     def setUp(self):
         pass
     pass