Salome HOME
projects / tools / medcoupling.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
warning hunting in swig
[tools/medcoupling.git] / src / MEDCoupling_Swig / MEDCouplingExamplesTest.py
diff --git a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
index 30d458d5b792caef9b4b1d1a5f9064965ee5dcf5..221a7e61acaba33bec8037bb583d3f441b79ff75 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
@@ -1,10 +1,10 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -371,7 +371,7 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         #! [PySnippet_MEDCouplingFieldDouble_getValueOnMulti_1]
         #! [PySnippet_MEDCouplingFieldDouble_getValueOnMulti_2]
         bc = mesh.getBarycenterAndOwner() # field values are located at cell barycenters
-        valArray = field.getValueOnMulti( bc.getValues() )
+        valArray = field.getValueOnMulti( bc )
         self.assertTrue( valArray.isEqual( field.getArray(), 1e-13 ))
         #! [PySnippet_MEDCouplingFieldDouble_getValueOnMulti_2]
         return
@@ -387,8 +387,8 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         #! [PySnippet_MEDCouplingFieldDouble_getValueOn_2]
         bc = mesh.getBarycenterAndOwner() # field values are located at cell barycenters
         vals = [] # array to collect values returned by getValueOn()
-        for i in range( bc.getNumberOfTuples() ):
-            vals.extend( field.getValueOn( bc.getTuple( i )))
+        for i,tupl in enumerate( bc ):
+            vals.extend( field.getValueOn( tupl ) )
         self.assertTrue( vals == field.getArray().getValues() )
         #! [PySnippet_MEDCouplingFieldDouble_getValueOn_2]
         return
@@ -622,9 +622,9 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         #! [PySnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_1]
         #! [PySnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_2]
         fixedCells = mesh.findAndCorrectBadOriented3DExtrudedCells()
-        assert len( fixedCells.getValues() ) == 2 # 2 cells fixed
+        assert len( fixedCells ) == 2 # 2 cells fixed
         fixedCells = mesh.findAndCorrectBadOriented3DExtrudedCells()
-        assert len( fixedCells.getValues() ) == 0 # no bad cells
+        assert len( fixedCells ) == 0 # no bad cells
         #! [PySnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_2]
         return
 
@@ -655,12 +655,12 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         #! [PySnippet_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented_1]
         #! [PySnippet_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented_2]
         badCells = mesh.arePolyhedronsNotCorrectlyOriented()
-        assert len( badCells.getValues() ) == 1 # one polyhedron is KO
+        assert len( badCells ) == 1 # one polyhedron is KO
         # fix invalid rolyherdons
         mesh.orientCorrectlyPolyhedrons()
         # re-check the orientation
         badCells = mesh.arePolyhedronsNotCorrectlyOriented()
-        assert len( badCells.getValues() ) == 0 # connectivity is OK
+        assert len( badCells ) == 0 # connectivity is OK
         #! [PySnippet_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented_2]
         return
 
@@ -729,11 +729,11 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         mesh.setMeshDimension(2);
         mesh.allocateCells(5);
         conn=[0,3,4,1, 1,2,4, 4,5,2, 6,7,4,3, 7,8,5,4];
-        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);   # 0
-        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);   # 1
-        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]);  # 2
-        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]); # 3
-        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]); # 4
+        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]); 
+        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]);
+        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]);
         mesh.finishInsertingCells();
         coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 ];
         coordsArr=DataArrayDouble.New();
@@ -880,11 +880,11 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         mesh.setMeshDimension(2);
         mesh.allocateCells(5);
         conn=[0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4];
-        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);   # 0
-        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);   # 1
-        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]);  # 2
-        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]); # 3
-        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]); # 4
+        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]); 
+        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]);
+        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]);
         mesh.finishInsertingCells();
         coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 ];
         coordsArr=DataArrayDouble.New();
@@ -903,11 +903,11 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         mesh.setMeshDimension(2);
         mesh.allocateCells(5);
         conn=[0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4];
-        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);   # 0
-        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);   # 1
-        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]);  # 2
-        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]); # 3
-        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]); # 4
+        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]); 
+        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]);
+        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]);
         mesh.finishInsertingCells();
         coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 ];
         coordsArr=DataArrayDouble.New();
@@ -1012,11 +1012,11 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         mesh.setMeshDimension(2);
         mesh.allocateCells(5);
         conn=[0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4];
-        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);   # 0
-        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);   # 1
-        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]);  # 2
-        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]); # 3
-        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]); # 4
+        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]); 
+        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]);
+        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]);
         mesh.finishInsertingCells();
         coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 ];
         coordsArr=DataArrayDouble.New();
@@ -1134,11 +1134,11 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         mesh.setMeshDimension(2);
         mesh.allocateCells(5);
         conn=[0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4];
-        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);   # 0
-        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);   # 1
-        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]);  # 2
-        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]); # 3
-        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]); # 4
+        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]); 
+        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]);
+        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]);
         mesh.finishInsertingCells();
         coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 ];
         coordsArr=DataArrayDouble.New();
@@ -1160,11 +1160,11 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         mesh.setMeshDimension(2);
         mesh.allocateCells(5);
         conn=[0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4];
-        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);   # 0
-        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);   # 1
-        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]);  # 2
-        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]); # 3
-        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]); # 4
+        mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[4:7]);  
+        mesh.insertNextCell(NORM_TRI3,3, conn[7:10]); 
+        mesh.insertNextCell(NORM_QUAD4,4,conn[10:14]);
+        mesh.insertNextCell(NORM_QUAD4,4,conn[14:18]);
         mesh.finishInsertingCells();
         coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 ];
         coordsArr=DataArrayDouble.New();
@@ -1405,9 +1405,9 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         #! [PySnippet_MEDCouplingPointSet_rotate_3]
         #! [PySnippet_MEDCouplingPointSet_rotate_4]
         mesh.changeSpaceDimension(2)
-        coords2 = mesh.getCoords().getValues()
+        coords2 = mesh.getCoords()
         for i,c in enumerate( coords ):
-            self.assertAlmostEqual( c, coords2[i], 13 )
+            self.assertAlmostEqual( c, coords2.getIJ(0,i), 13 )
         #! [PySnippet_MEDCouplingPointSet_rotate_4]
         return
 
@@ -2100,9 +2100,9 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         for i in xrange(8):#8 is not an error
             self.assertAlmostEqual(expected2[i],m2C.getCoords().getIJ(0,i),12)
             pass
-        self.assertEqual(expected3[:4],list(m2C.getNodalConnectivity().getValues())[4:])
-        self.assertEqual(expected3[4:8],list(m2C.getNodalConnectivity().getValues())[:4])
-        self.assertEqual(expected4[:3],list(m2C.getNodalConnectivityIndex().getValues()))
+        self.assertEqual(expected3[:4],[int(i) for i in m2C.getNodalConnectivity()][4:])
+        self.assertEqual(expected3[4:8],[int(i) for i in m2C.getNodalConnectivity()][:4])
+        self.assertEqual(expected4[:3],[int(i) for i in m2C.getNodalConnectivityIndex()])
         #idem previous because nodes of cell#4 are not fully present in part3
         part3=[1,2]
         arrr=DataArrayInt.New()
@@ -2122,9 +2122,9 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         for i in xrange(8):#8 is not an error
             self.assertAlmostEqual(expected2[i],m2C.getCoords().getIJ(0,i),12)
             pass
-        self.assertEqual(expected3[:4],list(m2C.getNodalConnectivity().getValues())[4:8])
-        self.assertEqual(expected3[4:8],list(m2C.getNodalConnectivity().getValues())[:4])
-        self.assertEqual(expected4[:3],list(m2C.getNodalConnectivityIndex().getValues()))
+        self.assertEqual(expected3[:4],[int(i) for i in m2C.getNodalConnectivity()][4:8])
+        self.assertEqual(expected3[4:8],[int(i) for i in m2C.getNodalConnectivity()][:4])
+        self.assertEqual(expected4[:3],m2C.getNodalConnectivityIndex().getValues())
         part4=[1,2,4]
         f2=f1.buildSubPart(part4)
         self.assertEqual(6,f2.getNumberOfTuples())
@@ -2142,10 +2142,12 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         for i in xrange(12):
             self.assertAlmostEqual(expected2[i],m2C.getCoords().getIJ(0,i),12)
             pass
-        self.assertEqual(expected3[0:4],list(m2C.getNodalConnectivity().getValues())[4:8])
-        self.assertEqual(expected3[4:8],list(m2C.getNodalConnectivity().getValues())[0:4])
-        self.assertEqual(expected3[8:13],list(m2C.getNodalConnectivity().getValues())[8:13])
-        self.assertEqual(expected4,list(m2C.getNodalConnectivityIndex().getValues()))
+        self.assertEqual(expected3[0:4],m2C.getNodalConnectivity().getValues()[4:8])
+        self.assertEqual(expected3[4:8],m2C.getNodalConnectivity().getValues()[0:4])
+        self.assertEqual(expected3[8:13],m2C.getNodalConnectivity().getValues()[8:13])
+        self.assertEqual(expected4,m2C.getNodalConnectivityIndex().getValues())
+        # previous line equivalent to
+        self.assertEqual(expected4,[int(i) for i in m2C.getNodalConnectivityIndex()])
         return
 
     def testExampleUMeshStdBuild1(self):
SALOME MedCoupling library

Copyright © 2005–2024 Open CASCADE.
All rights reserved.
Legal Information